Skip to content

Commit a19e445

Browse files
seurosseuros
committed
PR concern
1 parent 9965ac5 commit a19e445

File tree

22 files changed

+59
-59
lines changed

22 files changed

+59
-59
lines changed

‎conf/insideout/sip_profiles/external.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<param name="inbound-codec-negotiation" value="generous"/>
4747
<param name="nonce-ttl" value="60"/>
4848
<param name="auth-calls" value="false"/>
49-
<param name="rtp-timeout-sec" value="1800"/>
49+
<param name="media_timeout" value="1800"/>
5050
<param name="inbound-late-negotiation" value="true"/>
5151
<!--
5252
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
@@ -55,8 +55,8 @@
5555
<param name="sip-ip" value="$${local_ip_v4}"/>
5656
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
5757
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
58-
<param name="rtp-timeout-sec" value="300"/>
59-
<param name="rtp-hold-timeout-sec" value="1800"/>
58+
<param name="media_timeout" value="300"/>
59+
<param name="media_hold_timeout" value="1800"/>
6060
<!--<param name="enable-3pcc" value="true"/>-->
6161

6262
<!-- TLS: disabled by default, set to "true" to enable -->

‎conf/insideout/sip_profiles/internal-ipv6.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
9696
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
9797
<!-- rtp inactivity timeout -->
98-
<param name="rtp-timeout-sec" value="300"/>
99-
<param name="rtp-hold-timeout-sec" value="1800"/>
98+
<param name="media_timeout" value="300"/>
99+
<param name="media_hold_timeout" value="1800"/>
100100
<!-- VAD choose one (out is a good choice); -->
101101
<!-- <param name="vad" value="in"/> -->
102102
<!-- <param name="vad" value="out"/> -->

‎conf/insideout/sip_profiles/internal.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
136136
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
137137
<!-- rtp inactivity timeout -->
138-
<param name="rtp-timeout-sec" value="300"/>
139-
<param name="rtp-hold-timeout-sec" value="1800"/>
138+
<param name="media_timeout" value="300"/>
139+
<param name="media_hold_timeout" value="1800"/>
140140
<!-- VAD choose one (out is a good choice); -->
141141
<!-- <param name="vad" value="in"/> -->
142142
<!-- <param name="vad" value="out"/> -->

‎conf/sbc/sbc_profiles/external.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<param name="inbound-codec-negotiation" value="generous"/>
4848
<param name="nonce-ttl" value="60"/>
4949
<param name="auth-calls" value="false"/>
50-
<param name="rtp-timeout-sec" value="1800"/>
50+
<param name="media_timeout" value="1800"/>
5151
<param name="inbound-late-negotiation" value="true"/>
5252
<!--
5353
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
@@ -56,8 +56,8 @@
5656
<param name="sip-ip" value="$${local_ip_v4}"/>
5757
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
5858
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
59-
<param name="rtp-timeout-sec" value="300"/>
60-
<param name="rtp-hold-timeout-sec" value="1800"/>
59+
<param name="media_timeout" value="300"/>
60+
<param name="media_hold_timeout" value="1800"/>
6161
<!--<param name="enable-3pcc" value="true"/>-->
6262

6363
<!-- TLS: disabled by default, set to "true" to enable -->

‎conf/sbc/sbc_profiles/internal-ipv6.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
9595
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
9696
<!-- rtp inactivity timeout -->
97-
<param name="rtp-timeout-sec" value="300"/>
98-
<param name="rtp-hold-timeout-sec" value="1800"/>
97+
<param name="media_timeout" value="300"/>
98+
<param name="media_hold_timeout" value="1800"/>
9999
<!-- VAD choose one (out is a good choice); -->
100100
<!-- <param name="vad" value="in"/> -->
101101
<!-- <param name="vad" value="out"/> -->

‎conf/sbc/sbc_profiles/internal.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
138138
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
139139
<!-- rtp inactivity timeout -->
140-
<param name="rtp-timeout-sec" value="300"/>
141-
<param name="rtp-hold-timeout-sec" value="1800"/>
140+
<param name="media_timeout" value="300"/>
141+
<param name="media_hold_timeout" value="1800"/>
142142
<!-- VAD choose one (out is a good choice); -->
143143
<!-- <param name="vad" value="in"/> -->
144144
<!-- <param name="vad" value="out"/> -->

‎conf/softphone/freeswitch.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@
175175
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
176176
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
177177
<!-- rtp inactivity timeout -->
178-
<param name="rtp-timeout-sec" value="300"/>
179-
<param name="rtp-hold-timeout-sec" value="1800"/>
178+
<param name="media_timeout" value="300"/>
179+
<param name="media_hold_timeout" value="1800"/>
180180
<!-- VAD choose one (out is a good choice); -->
181181
<!-- <param name="vad" value="in"/> -->
182182
<!-- <param name="vad" value="out"/> -->

‎conf/testing/sip_profiles/external-ipv6.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<param name="sip-ip" value="$${local_ip_v6}"/>
5959
<param name="ext-rtp-ip" value="auto-nat"/>
6060
<param name="ext-sip-ip" value="auto-nat"/>
61-
<param name="rtp-timeout-sec" value="300"/>
62-
<param name="rtp-hold-timeout-sec" value="1800"/>
61+
<param name="media_timeout" value="300"/>
62+
<param name="media_hold_timeout" value="1800"/>
6363
<!--<param name="enable-3pcc" value="true"/>-->
6464

6565
<!-- TLS: disabled by default, set to "true" to enable -->

‎conf/testing/sip_profiles/external.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<param name="sip-ip" value="$${local_ip_v4}"/>
6565
<param name="ext-rtp-ip" value="auto-nat"/>
6666
<param name="ext-sip-ip" value="auto-nat"/>
67-
<param name="rtp-timeout-sec" value="300"/>
68-
<param name="rtp-hold-timeout-sec" value="1800"/>
67+
<param name="media_timeout" value="300"/>
68+
<param name="media_hold_timeout" value="1800"/>
6969
<!--<param name="enable-3pcc" value="true"/>-->
7070

7171
<!-- TLS: disabled by default, set to "true" to enable -->

‎conf/testing/sip_profiles/internal-ipv6.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
9797
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
9898
<!-- rtp inactivity timeout -->
99-
<param name="rtp-timeout-sec" value="300"/>
100-
<param name="rtp-hold-timeout-sec" value="1800"/>
99+
<param name="media_timeout" value="300"/>
100+
<param name="media_hold_timeout" value="1800"/>
101101
<!-- VAD choose one (out is a good choice); -->
102102
<!-- <param name="vad" value="in"/> -->
103103
<!-- <param name="vad" value="out"/> -->

‎conf/testing/sip_profiles/internal.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@
292292
<param name="ext-sip-ip" value="auto-nat"/>
293293

294294
<!-- rtp inactivity timeout -->
295-
<param name="rtp-timeout-sec" value="300"/>
296-
<param name="rtp-hold-timeout-sec" value="1800"/>
295+
<param name="media_timeout" value="300"/>
296+
<param name="media_hold_timeout" value="1800"/>
297297
<!-- VAD choose one (out is a good choice); -->
298298
<!-- <param name="vad" value="in"/> -->
299299
<!-- <param name="vad" value="out"/> -->

‎conf/vanilla/sip_profiles/external-ipv6.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<!-- Shouldn't set these on IPv6 -->
6666
<!--<param name="ext-rtp-ip" value="auto-nat"/>-->
6767
<!--<param name="ext-sip-ip" value="auto-nat"/>-->
68-
<param name="rtp-timeout-sec" value="300"/>
69-
<param name="rtp-hold-timeout-sec" value="1800"/>
68+
<param name="media_timeout" value="300"/>
69+
<param name="media_hold_timeout" value="1800"/>
7070
<!--<param name="enable-3pcc" value="true"/>-->
7171

7272
<!-- TLS: disabled by default, set to "true" to enable -->

‎conf/vanilla/sip_profiles/external.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<param name="sip-ip" value="$${local_ip_v4}"/>
6565
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
6666
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
67-
<param name="rtp-timeout-sec" value="300"/>
68-
<param name="rtp-hold-timeout-sec" value="1800"/>
67+
<param name="media_timeout" value="300"/>
68+
<param name="media_hold_timeout" value="1800"/>
6969
<!--<param name="enable-3pcc" value="true"/>-->
7070

7171
<!-- TLS: disabled by default, set to "true" to enable -->

‎conf/vanilla/sip_profiles/internal-ipv6.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
100100
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
101101
<!-- rtp inactivity timeout -->
102-
<param name="rtp-timeout-sec" value="300"/>
103-
<param name="rtp-hold-timeout-sec" value="1800"/>
102+
<param name="media_timeout" value="300"/>
103+
<param name="media_hold_timeout" value="1800"/>
104104
<!-- VAD choose one (out is a good choice); -->
105105
<!-- <param name="vad" value="in"/> -->
106106
<!-- <param name="vad" value="out"/> -->

‎conf/vanilla/sip_profiles/internal.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@
297297
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
298298

299299
<!-- rtp inactivity timeout -->
300-
<param name="rtp-timeout-sec" value="300"/>
301-
<param name="rtp-hold-timeout-sec" value="1800"/>
300+
<param name="media_timeout" value="300"/>
301+
<param name="media_hold_timeout" value="1800"/>
302302
<!-- VAD choose one (out is a good choice); -->
303303
<!-- <param name="vad" value="in"/> -->
304304
<!-- <param name="vad" value="out"/> -->

‎fscomm/conf/freeswitch.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
181181
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
182182
<!-- rtp inactivity timeout -->
183-
<param name="rtp-timeout-sec" value="300"/>
184-
<param name="rtp-hold-timeout-sec" value="1800"/>
183+
<param name="media_timeout" value="300"/>
184+
<param name="media_hold_timeout" value="1800"/>
185185
<!-- VAD choose one (out is a good choice); -->
186186
<!-- <param name="vad" value="in"/> -->
187187
<!-- <param name="vad" value="out"/> -->

‎src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<param name="sip-ip" value="170.0.0.1"/>
7070
<param name="ext-rtp-ip" value="170.0.0.1"/>
7171
<param name="ext-sip-ip" value="170.0.0.1"/>
72-
<param name="rtp-timeout-sec" value="300"/>
73-
<param name="rtp-hold-timeout-sec" value="1800"/>
72+
<param name="media_timeout" value="300"/>
73+
<param name="media_hold_timeout" value="1800"/>
7474
<param name="session-timeout" value="600"/>
7575
<param name="minimum-session-expires" value="90"/>
7676
<param name="tls" value="false"/>
@@ -94,7 +94,7 @@
9494
<action application="set" data="absolute_codec_string=PCMU@20i"/>
9595
<action application="info"/>
9696
<action application="answer"/>
97-
<action application="park""/>
97+
<action application="park"/>
9898
</condition>
9999
</extension>
100100
</context>

‎src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@
390390
<param name="sip-ip" value="$${local_ip_v4}"/>
391391
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
392392
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
393-
<param name="rtp-timeout-sec" value="300"/>
394-
<param name="rtp-hold-timeout-sec" value="1800"/>
393+
<param name="media_timeout" value="300"/>
394+
<param name="media_hold_timeout" value="1800"/>
395395
<param name="session-timeout" value="600"/>
396396
<param name="minimum-session-expires" value="90"/>
397397
<param name="tls" value="false"/>
@@ -431,8 +431,8 @@
431431
<param name="sip-ip" value="$${local_ip_v4}"/>
432432
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
433433
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
434-
<param name="rtp-timeout-sec" value="300"/>
435-
<param name="rtp-hold-timeout-sec" value="1800"/>
434+
<param name="media_timeout" value="300"/>
435+
<param name="media_hold_timeout" value="1800"/>
436436
<param name="session-timeout" value="600"/>
437437
<param name="minimum-session-expires" value="90"/>
438438
<param name="tls" value="false"/>
@@ -521,8 +521,8 @@
521521
<!-- Shouldn't set these on IPv6 -->
522522
<!--<param name="ext-rtp-ip" value="auto-nat"/>-->
523523
<!--<param name="ext-sip-ip" value="auto-nat"/>-->
524-
<param name="rtp-timeout-sec" value="300"/>
525-
<param name="rtp-hold-timeout-sec" value="1800"/>
524+
<param name="media_timeout" value="300"/>
525+
<param name="media_hold_timeout" value="1800"/>
526526
<!--<param name="enable-3pcc" value="true"/>-->
527527

528528
<!-- TLS: disabled by default, set to "true" to enable -->

‎tests/unit/conf_eavesdrop/freeswitch.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<param name="sip-ip" value="$${local_ip_v4}"/>
8282
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
8383
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
84-
<param name="rtp-timeout-sec" value="300"/>
85-
<param name="rtp-hold-timeout-sec" value="1800"/>
84+
<param name="media_timeout" value="300"/>
85+
<param name="media_hold_timeout" value="1800"/>
8686
<param name="session-timeout" value="600"/>
8787
<param name="minimum-session-expires" value="90"/>
8888
<param name="tls" value="false"/>
@@ -122,8 +122,8 @@
122122
<param name="sip-ip" value="$${local_ip_v4}"/>
123123
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
124124
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
125-
<param name="rtp-timeout-sec" value="300"/>
126-
<param name="rtp-hold-timeout-sec" value="1800"/>
125+
<param name="media_timeout" value="300"/>
126+
<param name="media_hold_timeout" value="1800"/>
127127
<param name="session-timeout" value="600"/>
128128
<param name="minimum-session-expires" value="90"/>
129129
<param name="tls" value="false"/>

‎tests/unit/conf_sip/freeswitch.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<param name="sip-ip" value="$${local_ip_v4}"/>
8383
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
8484
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
85-
<param name="rtp-timeout-sec" value="300"/>
86-
<param name="rtp-hold-timeout-sec" value="1800"/>
85+
<param name="media_timeout" value="300"/>
86+
<param name="media_hold_timeout" value="1800"/>
8787
<param name="session-timeout" value="600"/>
8888
<param name="minimum-session-expires" value="90"/>
8989
<param name="tls" value="false"/>
@@ -123,8 +123,8 @@
123123
<param name="sip-ip" value="$${local_ip_v4}"/>
124124
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
125125
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
126-
<param name="rtp-timeout-sec" value="300"/>
127-
<param name="rtp-hold-timeout-sec" value="1800"/>
126+
<param name="media_timeout" value="300"/>
127+
<param name="media_hold_timeout" value="1800"/>
128128
<param name="session-timeout" value="600"/>
129129
<param name="minimum-session-expires" value="90"/>
130130
<param name="tls" value="false"/>

‎tests/unit/conf_sofia/freeswitch.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<param name="sip-ip" value="$${local_ip_v4}"/>
6565
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
6666
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
67-
<param name="rtp-timeout-sec" value="300"/>
68-
<param name="rtp-hold-timeout-sec" value="1800"/>
67+
<param name="media_timeout" value="300"/>
68+
<param name="media_hold_timeout" value="1800"/>
6969
<param name="session-timeout" value="600"/>
7070
<param name="minimum-session-expires" value="90"/>
7171
<param name="tls" value="false"/>
@@ -105,8 +105,8 @@
105105
<param name="sip-ip" value="$${local_ip_v4}"/>
106106
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
107107
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
108-
<param name="rtp-timeout-sec" value="300"/>
109-
<param name="rtp-hold-timeout-sec" value="1800"/>
108+
<param name="media_timeout" value="300"/>
109+
<param name="media_hold_timeout" value="1800"/>
110110
<param name="session-timeout" value="600"/>
111111
<param name="minimum-session-expires" value="90"/>
112112
<param name="tls" value="false"/>

‎tests/unit/conf_test/freeswitch.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<param name="sip-ip" value="$${local_ip_v4}"/>
8383
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
8484
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
85-
<param name="rtp-timeout-sec" value="300"/>
86-
<param name="rtp-hold-timeout-sec" value="1800"/>
85+
<param name="media_timeout" value="300"/>
86+
<param name="media_hold_timeout" value="1800"/>
8787
<param name="session-timeout" value="600"/>
8888
<param name="minimum-session-expires" value="90"/>
8989
<param name="tls" value="false"/>
@@ -123,8 +123,8 @@
123123
<param name="sip-ip" value="$${local_ip_v4}"/>
124124
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
125125
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
126-
<param name="rtp-timeout-sec" value="300"/>
127-
<param name="rtp-hold-timeout-sec" value="1800"/>
126+
<param name="media_timeout" value="300"/>
127+
<param name="media_hold_timeout" value="1800"/>
128128
<param name="session-timeout" value="600"/>
129129
<param name="minimum-session-expires" value="90"/>
130130
<param name="tls" value="false"/>

0 commit comments

Comments
 (0)