Skip to content

fix(sofia.conf.xml): replace deprecated rtp-hold-timeout-sec #2697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conf/insideout/sip_profiles/external.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<param name="inbound-codec-negotiation" value="generous"/>
<param name="nonce-ttl" value="60"/>
<param name="auth-calls" value="false"/>
<param name="rtp-timeout-sec" value="1800"/>
<param name="media_timeout" value="1800"/>
<param name="inbound-late-negotiation" value="true"/>
<!--
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
Expand All @@ -55,8 +55,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions conf/insideout/sip_profiles/internal-ipv6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/insideout/sip_profiles/internal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
6 changes: 3 additions & 3 deletions conf/sbc/sbc_profiles/external.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<param name="inbound-codec-negotiation" value="generous"/>
<param name="nonce-ttl" value="60"/>
<param name="auth-calls" value="false"/>
<param name="rtp-timeout-sec" value="1800"/>
<param name="media_timeout" value="1800"/>
<param name="inbound-late-negotiation" value="true"/>
<!--
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
Expand All @@ -56,8 +56,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions conf/sbc/sbc_profiles/internal-ipv6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/sbc/sbc_profiles/internal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/softphone/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/testing/sip_profiles/external-ipv6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<param name="sip-ip" value="$${local_ip_v6}"/>
<param name="ext-rtp-ip" value="auto-nat"/>
<param name="ext-sip-ip" value="auto-nat"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions conf/testing/sip_profiles/external.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="auto-nat"/>
<param name="ext-sip-ip" value="auto-nat"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions conf/testing/sip_profiles/internal-ipv6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/testing/sip_profiles/internal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@
<param name="ext-sip-ip" value="auto-nat"/>

<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/vanilla/sip_profiles/external-ipv6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<!-- Shouldn't set these on IPv6 -->
<!--<param name="ext-rtp-ip" value="auto-nat"/>-->
<!--<param name="ext-sip-ip" value="auto-nat"/>-->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions conf/vanilla/sip_profiles/external.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions conf/vanilla/sip_profiles/internal-ipv6.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
<!-- <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> -->
<!-- <param name="ext-sip-ip" value="$${external_sip_ip}"/> -->
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions conf/vanilla/sip_profiles/internal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@
<param name="ext-sip-ip" value="$${external_sip_ip}"/>

<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions fscomm/conf/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@
<param name="ext-rtp-ip" value="$${external_rtp_ip}"/>
<param name="ext-sip-ip" value="$${external_sip_ip}"/>
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
4 changes: 2 additions & 2 deletions src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@
<param name="ext-sip-ip" value="auto-nat"/>

<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!-- VAD choose one (out is a good choice); -->
<!-- <param name="vad" value="in"/> -->
<!-- <param name="vad" value="out"/> -->
Expand Down
6 changes: 3 additions & 3 deletions src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<param name="sip-ip" value="170.0.0.1"/>
<param name="ext-rtp-ip" value="170.0.0.1"/>
<param name="ext-sip-ip" value="170.0.0.1"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand All @@ -94,7 +94,7 @@
<action application="set" data="absolute_codec_string=PCMU@20i"/>
<action application="info"/>
<action application="answer"/>
<action application="park""/>
<action application="park"/>
</condition>
</extension>
</context>
Expand Down
12 changes: 6 additions & 6 deletions src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down Expand Up @@ -431,8 +431,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down Expand Up @@ -521,8 +521,8 @@
<!-- Shouldn't set these on IPv6 -->
<!--<param name="ext-rtp-ip" value="auto-nat"/>-->
<!--<param name="ext-sip-ip" value="auto-nat"/>-->
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->

<!-- TLS: disabled by default, set to "true" to enable -->
Expand Down
4 changes: 2 additions & 2 deletions src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/conf_eavesdrop/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down Expand Up @@ -122,8 +122,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/conf_sip/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down Expand Up @@ -123,8 +123,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/conf_sofia/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down Expand Up @@ -105,8 +105,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/conf_test/freeswitch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down Expand Up @@ -123,8 +123,8 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="$${local_ip_v4}"/>
<param name="ext-sip-ip" value="$${local_ip_v4}"/>
<param name="rtp-timeout-sec" value="300"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<param name="media_timeout" value="300"/>
<param name="media_hold_timeout" value="1800"/>
<param name="session-timeout" value="600"/>
<param name="minimum-session-expires" value="90"/>
<param name="tls" value="false"/>
Expand Down