From 2eaf0582cf2fcfdffc7812bc1dd5786b82b80212 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Mon, 6 Jan 2025 23:05:34 +0100
Subject: [PATCH 1/3] fix(sofia.conf.xml): replace deprecated
 rtp-hold-timeout-sec with media_hold_timeout

---
 src/mod/endpoints/mod_sofia/conf/sofia.conf.xml      | 4 ++--
 src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
index 4999681cdda..7e66b9254b9 100644
--- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
@@ -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"/> -->
diff --git a/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml b/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
index fa626af93ed..528212827a4 100644
--- a/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
+++ b/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
@@ -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"/>

From deccd64010c9d1bebedac2e5de7c6faa29ec2a92 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Sat, 24 May 2025 03:21:32 +0100
Subject: [PATCH 2/3] PR concern

---
 conf/insideout/sip_profiles/external.xml             |  6 +++---
 conf/insideout/sip_profiles/internal-ipv6.xml        |  4 ++--
 conf/insideout/sip_profiles/internal.xml             |  4 ++--
 conf/sbc/sbc_profiles/external.xml                   |  6 +++---
 conf/sbc/sbc_profiles/internal-ipv6.xml              |  4 ++--
 conf/sbc/sbc_profiles/internal.xml                   |  4 ++--
 conf/softphone/freeswitch.xml                        |  4 ++--
 conf/testing/sip_profiles/external-ipv6.xml          |  4 ++--
 conf/testing/sip_profiles/external.xml               |  4 ++--
 conf/testing/sip_profiles/internal-ipv6.xml          |  4 ++--
 conf/testing/sip_profiles/internal.xml               |  4 ++--
 conf/vanilla/sip_profiles/external-ipv6.xml          |  4 ++--
 conf/vanilla/sip_profiles/external.xml               |  4 ++--
 conf/vanilla/sip_profiles/internal-ipv6.xml          |  4 ++--
 conf/vanilla/sip_profiles/internal.xml               |  4 ++--
 fscomm/conf/freeswitch.xml                           |  4 ++--
 .../mod_sofia/test/conf-nuafail/freeswitch.xml       |  6 +++---
 .../mod_sofia/test/conf-sipp/freeswitch.xml          | 12 ++++++------
 tests/unit/conf_eavesdrop/freeswitch.xml             |  8 ++++----
 tests/unit/conf_sip/freeswitch.xml                   |  8 ++++----
 tests/unit/conf_sofia/freeswitch.xml                 |  8 ++++----
 tests/unit/conf_test/freeswitch.xml                  |  8 ++++----
 22 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/conf/insideout/sip_profiles/external.xml b/conf/insideout/sip_profiles/external.xml
index be38318432e..fab11db76da 100644
--- a/conf/insideout/sip_profiles/external.xml
+++ b/conf/insideout/sip_profiles/external.xml
@@ -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!
@@ -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 -->
diff --git a/conf/insideout/sip_profiles/internal-ipv6.xml b/conf/insideout/sip_profiles/internal-ipv6.xml
index 64dac272c38..37f230e44e8 100644
--- a/conf/insideout/sip_profiles/internal-ipv6.xml
+++ b/conf/insideout/sip_profiles/internal-ipv6.xml
@@ -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"/> -->
diff --git a/conf/insideout/sip_profiles/internal.xml b/conf/insideout/sip_profiles/internal.xml
index 63ea3504494..e493c3c6d4e 100644
--- a/conf/insideout/sip_profiles/internal.xml
+++ b/conf/insideout/sip_profiles/internal.xml
@@ -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"/> -->
diff --git a/conf/sbc/sbc_profiles/external.xml b/conf/sbc/sbc_profiles/external.xml
index 1cb91e8dab1..f3a15332694 100644
--- a/conf/sbc/sbc_profiles/external.xml
+++ b/conf/sbc/sbc_profiles/external.xml
@@ -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!
@@ -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 -->
diff --git a/conf/sbc/sbc_profiles/internal-ipv6.xml b/conf/sbc/sbc_profiles/internal-ipv6.xml
index e433da14251..41156e869e1 100644
--- a/conf/sbc/sbc_profiles/internal-ipv6.xml
+++ b/conf/sbc/sbc_profiles/internal-ipv6.xml
@@ -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"/> -->
diff --git a/conf/sbc/sbc_profiles/internal.xml b/conf/sbc/sbc_profiles/internal.xml
index 8263a826684..ae0764c94c8 100644
--- a/conf/sbc/sbc_profiles/internal.xml
+++ b/conf/sbc/sbc_profiles/internal.xml
@@ -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"/> -->
diff --git a/conf/softphone/freeswitch.xml b/conf/softphone/freeswitch.xml
index 5fbc0cbd39c..ffaf3f5e2bc 100644
--- a/conf/softphone/freeswitch.xml
+++ b/conf/softphone/freeswitch.xml
@@ -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"/> -->
diff --git a/conf/testing/sip_profiles/external-ipv6.xml b/conf/testing/sip_profiles/external-ipv6.xml
index 1ac8414731f..225b472f010 100644
--- a/conf/testing/sip_profiles/external-ipv6.xml
+++ b/conf/testing/sip_profiles/external-ipv6.xml
@@ -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 -->
diff --git a/conf/testing/sip_profiles/external.xml b/conf/testing/sip_profiles/external.xml
index 4d12b0f5b3d..69a3db78f37 100644
--- a/conf/testing/sip_profiles/external.xml
+++ b/conf/testing/sip_profiles/external.xml
@@ -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 -->
diff --git a/conf/testing/sip_profiles/internal-ipv6.xml b/conf/testing/sip_profiles/internal-ipv6.xml
index 46e60d4ad93..7933fd82c1a 100644
--- a/conf/testing/sip_profiles/internal-ipv6.xml
+++ b/conf/testing/sip_profiles/internal-ipv6.xml
@@ -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"/> -->
diff --git a/conf/testing/sip_profiles/internal.xml b/conf/testing/sip_profiles/internal.xml
index 62f52af63fe..a513d30b613 100644
--- a/conf/testing/sip_profiles/internal.xml
+++ b/conf/testing/sip_profiles/internal.xml
@@ -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"/> -->
diff --git a/conf/vanilla/sip_profiles/external-ipv6.xml b/conf/vanilla/sip_profiles/external-ipv6.xml
index 1b9d0c857d1..6afaaa49886 100644
--- a/conf/vanilla/sip_profiles/external-ipv6.xml
+++ b/conf/vanilla/sip_profiles/external-ipv6.xml
@@ -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 -->
diff --git a/conf/vanilla/sip_profiles/external.xml b/conf/vanilla/sip_profiles/external.xml
index 57ec4a6e742..fcebad11c52 100644
--- a/conf/vanilla/sip_profiles/external.xml
+++ b/conf/vanilla/sip_profiles/external.xml
@@ -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 -->
diff --git a/conf/vanilla/sip_profiles/internal-ipv6.xml b/conf/vanilla/sip_profiles/internal-ipv6.xml
index 26c891ba980..3b0f0fd3858 100644
--- a/conf/vanilla/sip_profiles/internal-ipv6.xml
+++ b/conf/vanilla/sip_profiles/internal-ipv6.xml
@@ -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"/> -->
diff --git a/conf/vanilla/sip_profiles/internal.xml b/conf/vanilla/sip_profiles/internal.xml
index eb07779f430..277d8b66a7f 100644
--- a/conf/vanilla/sip_profiles/internal.xml
+++ b/conf/vanilla/sip_profiles/internal.xml
@@ -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"/> -->
diff --git a/fscomm/conf/freeswitch.xml b/fscomm/conf/freeswitch.xml
index 94c154b007d..41545ec1325 100644
--- a/fscomm/conf/freeswitch.xml
+++ b/fscomm/conf/freeswitch.xml
@@ -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"/> -->
diff --git a/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml b/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
index d7184b304aa..879ef9a6a6b 100644
--- a/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
+++ b/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
@@ -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"/>
@@ -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>
diff --git a/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml b/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
index 0c1c01bf5cd..c48c1c787e7 100644
--- a/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
+++ b/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
@@ -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"/>
@@ -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"/>
@@ -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 -->
diff --git a/tests/unit/conf_eavesdrop/freeswitch.xml b/tests/unit/conf_eavesdrop/freeswitch.xml
index b74d21a4990..c49907635c7 100644
--- a/tests/unit/conf_eavesdrop/freeswitch.xml
+++ b/tests/unit/conf_eavesdrop/freeswitch.xml
@@ -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"/>
@@ -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"/>
diff --git a/tests/unit/conf_sip/freeswitch.xml b/tests/unit/conf_sip/freeswitch.xml
index 9a992a817b3..b4dd91c603f 100644
--- a/tests/unit/conf_sip/freeswitch.xml
+++ b/tests/unit/conf_sip/freeswitch.xml
@@ -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"/>
@@ -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"/>
diff --git a/tests/unit/conf_sofia/freeswitch.xml b/tests/unit/conf_sofia/freeswitch.xml
index be3113cfaf9..797ac84ee2b 100644
--- a/tests/unit/conf_sofia/freeswitch.xml
+++ b/tests/unit/conf_sofia/freeswitch.xml
@@ -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"/>
@@ -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"/>
diff --git a/tests/unit/conf_test/freeswitch.xml b/tests/unit/conf_test/freeswitch.xml
index 9097246041a..7faaa072fb1 100644
--- a/tests/unit/conf_test/freeswitch.xml
+++ b/tests/unit/conf_test/freeswitch.xml
@@ -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"/>
@@ -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"/>

From 96daf857f688bd3016548c145d54032527ac0f25 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 2 Jul 2025 16:19:55 +0100
Subject: [PATCH 3/3] Address @ticpu's comment

---
 conf/insideout/sip_profiles/external.xml             |  6 +++---
 conf/insideout/sip_profiles/internal-ipv6.xml        |  4 ++--
 conf/insideout/sip_profiles/internal.xml             |  4 ++--
 conf/sbc/sbc_profiles/external.xml                   |  6 +++---
 conf/sbc/sbc_profiles/internal-ipv6.xml              |  4 ++--
 conf/sbc/sbc_profiles/internal.xml                   |  4 ++--
 conf/softphone/freeswitch.xml                        |  4 ++--
 conf/testing/sip_profiles/external-ipv6.xml          |  4 ++--
 conf/testing/sip_profiles/external.xml               |  4 ++--
 conf/testing/sip_profiles/internal-ipv6.xml          |  4 ++--
 conf/testing/sip_profiles/internal.xml               |  4 ++--
 conf/vanilla/sip_profiles/external-ipv6.xml          |  4 ++--
 conf/vanilla/sip_profiles/external.xml               |  4 ++--
 conf/vanilla/sip_profiles/internal-ipv6.xml          |  4 ++--
 conf/vanilla/sip_profiles/internal.xml               |  4 ++--
 fscomm/conf/freeswitch.xml                           |  4 ++--
 src/mod/endpoints/mod_sofia/conf/sofia.conf.xml      |  4 ++--
 .../mod_sofia/test/conf-nuafail/freeswitch.xml       |  4 ++--
 .../mod_sofia/test/conf-sipp/freeswitch.xml          | 12 ++++++------
 src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml |  4 ++--
 tests/unit/conf_eavesdrop/freeswitch.xml             |  8 ++++----
 tests/unit/conf_sip/freeswitch.xml                   |  8 ++++----
 tests/unit/conf_sofia/freeswitch.xml                 |  8 ++++----
 tests/unit/conf_test/freeswitch.xml                  |  8 ++++----
 24 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/conf/insideout/sip_profiles/external.xml b/conf/insideout/sip_profiles/external.xml
index fab11db76da..b16b74c9ad9 100644
--- a/conf/insideout/sip_profiles/external.xml
+++ b/conf/insideout/sip_profiles/external.xml
@@ -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="media_timeout" value="1800"/>
+    <param name="media_timeout" value="1800000"/>
     <param name="inbound-late-negotiation" value="true"/>
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/conf/insideout/sip_profiles/internal-ipv6.xml b/conf/insideout/sip_profiles/internal-ipv6.xml
index 37f230e44e8..ba66a9ed7bd 100644
--- a/conf/insideout/sip_profiles/internal-ipv6.xml
+++ b/conf/insideout/sip_profiles/internal-ipv6.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/insideout/sip_profiles/internal.xml b/conf/insideout/sip_profiles/internal.xml
index e493c3c6d4e..73047fc4233 100644
--- a/conf/insideout/sip_profiles/internal.xml
+++ b/conf/insideout/sip_profiles/internal.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/sbc/sbc_profiles/external.xml b/conf/sbc/sbc_profiles/external.xml
index f3a15332694..95968b5d8ea 100644
--- a/conf/sbc/sbc_profiles/external.xml
+++ b/conf/sbc/sbc_profiles/external.xml
@@ -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="media_timeout" value="1800"/>
+    <param name="media_timeout" value="1800000"/>
     <param name="inbound-late-negotiation" value="true"/>
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/conf/sbc/sbc_profiles/internal-ipv6.xml b/conf/sbc/sbc_profiles/internal-ipv6.xml
index 41156e869e1..5131160971f 100644
--- a/conf/sbc/sbc_profiles/internal-ipv6.xml
+++ b/conf/sbc/sbc_profiles/internal-ipv6.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/sbc/sbc_profiles/internal.xml b/conf/sbc/sbc_profiles/internal.xml
index ae0764c94c8..85cbb80e435 100644
--- a/conf/sbc/sbc_profiles/internal.xml
+++ b/conf/sbc/sbc_profiles/internal.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/softphone/freeswitch.xml b/conf/softphone/freeswitch.xml
index ffaf3f5e2bc..b5754ec0053 100644
--- a/conf/softphone/freeswitch.xml
+++ b/conf/softphone/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-	    <param name="media_hold_timeout" value="1800"/>
+	    <param name="media_timeout" value="300000"/>
+	    <param name="media_hold_timeout" value="1800000"/>
 	    <!-- VAD choose one (out is a good choice); -->
 	    <!-- <param name="vad" value="in"/> -->
 	    <!-- <param name="vad" value="out"/> -->
diff --git a/conf/testing/sip_profiles/external-ipv6.xml b/conf/testing/sip_profiles/external-ipv6.xml
index 225b472f010..a3ac2b9edcf 100644
--- a/conf/testing/sip_profiles/external-ipv6.xml
+++ b/conf/testing/sip_profiles/external-ipv6.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/conf/testing/sip_profiles/external.xml b/conf/testing/sip_profiles/external.xml
index 69a3db78f37..a0f976cedce 100644
--- a/conf/testing/sip_profiles/external.xml
+++ b/conf/testing/sip_profiles/external.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/conf/testing/sip_profiles/internal-ipv6.xml b/conf/testing/sip_profiles/internal-ipv6.xml
index 7933fd82c1a..5d8d043a254 100644
--- a/conf/testing/sip_profiles/internal-ipv6.xml
+++ b/conf/testing/sip_profiles/internal-ipv6.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/testing/sip_profiles/internal.xml b/conf/testing/sip_profiles/internal.xml
index a513d30b613..ad1c1af71ea 100644
--- a/conf/testing/sip_profiles/internal.xml
+++ b/conf/testing/sip_profiles/internal.xml
@@ -292,8 +292,8 @@
     <param name="ext-sip-ip" value="auto-nat"/>
 
     <!-- rtp inactivity timeout -->
-    <param name="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/vanilla/sip_profiles/external-ipv6.xml b/conf/vanilla/sip_profiles/external-ipv6.xml
index 6afaaa49886..71d02943645 100644
--- a/conf/vanilla/sip_profiles/external-ipv6.xml
+++ b/conf/vanilla/sip_profiles/external-ipv6.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/conf/vanilla/sip_profiles/external.xml b/conf/vanilla/sip_profiles/external.xml
index fcebad11c52..c826e341958 100644
--- a/conf/vanilla/sip_profiles/external.xml
+++ b/conf/vanilla/sip_profiles/external.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/conf/vanilla/sip_profiles/internal-ipv6.xml b/conf/vanilla/sip_profiles/internal-ipv6.xml
index 3b0f0fd3858..0711c3ffc64 100644
--- a/conf/vanilla/sip_profiles/internal-ipv6.xml
+++ b/conf/vanilla/sip_profiles/internal-ipv6.xml
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/conf/vanilla/sip_profiles/internal.xml b/conf/vanilla/sip_profiles/internal.xml
index 277d8b66a7f..0834368de29 100644
--- a/conf/vanilla/sip_profiles/internal.xml
+++ b/conf/vanilla/sip_profiles/internal.xml
@@ -297,8 +297,8 @@
     <param name="ext-sip-ip" value="$${external_sip_ip}"/>
 
     <!-- rtp inactivity timeout -->
-    <param name="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!-- VAD choose one (out is a good choice); -->
     <!-- <param name="vad" value="in"/> -->
     <!-- <param name="vad" value="out"/> -->
diff --git a/fscomm/conf/freeswitch.xml b/fscomm/conf/freeswitch.xml
index 41545ec1325..d4a3f4e0073 100644
--- a/fscomm/conf/freeswitch.xml
+++ b/fscomm/conf/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-                                                <param name="media_hold_timeout" value="1800"/>
+                                                <param name="media_timeout" value="300000"/>
+                                                <param name="media_hold_timeout" value="1800000"/>
                                                 <!-- VAD choose one (out is a good choice); -->
                                                 <!-- <param name="vad" value="in"/> -->
                                                 <!-- <param name="vad" value="out"/> -->
diff --git a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
index 7e66b9254b9..e01a6e9ceb0 100644
--- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
@@ -350,8 +350,8 @@
         <param name="ext-sip-ip" value="auto-nat"/>
 
         <!-- rtp inactivity timeout -->
-        <param name="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <!-- VAD choose one (out is a good choice); -->
         <!-- <param name="vad" value="in"/> -->
         <!-- <param name="vad" value="out"/> -->
diff --git a/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml b/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
index 879ef9a6a6b..815bf1a749b 100644
--- a/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
+++ b/src/mod/endpoints/mod_sofia/test/conf-nuafail/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
diff --git a/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml b/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
index c48c1c787e7..7ca3c6310ba 100644
--- a/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
+++ b/src/mod/endpoints/mod_sofia/test/conf-sipp/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
@@ -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="media_timeout" value="300"/>
-    <param name="media_hold_timeout" value="1800"/>
+    <param name="media_timeout" value="300000"/>
+    <param name="media_hold_timeout" value="1800000"/>
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml b/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
index 528212827a4..9239422d3e7 100644
--- a/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
+++ b/src/mod/endpoints/mod_sofia/test/conf/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-            <param name="media_hold_timeout" value="1800"/>
+            <param name="media_timeout" value="300000"/>
+            <param name="media_hold_timeout" value="1800000"/>
             <param name="session-timeout" value="600"/>
             <param name="minimum-session-expires" value="90"/>
             <param name="tls" value="false"/>
diff --git a/tests/unit/conf_eavesdrop/freeswitch.xml b/tests/unit/conf_eavesdrop/freeswitch.xml
index c49907635c7..03b3a965730 100644
--- a/tests/unit/conf_eavesdrop/freeswitch.xml
+++ b/tests/unit/conf_eavesdrop/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
diff --git a/tests/unit/conf_sip/freeswitch.xml b/tests/unit/conf_sip/freeswitch.xml
index b4dd91c603f..69df6a7bc73 100644
--- a/tests/unit/conf_sip/freeswitch.xml
+++ b/tests/unit/conf_sip/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
diff --git a/tests/unit/conf_sofia/freeswitch.xml b/tests/unit/conf_sofia/freeswitch.xml
index 797ac84ee2b..c1efe0456aa 100644
--- a/tests/unit/conf_sofia/freeswitch.xml
+++ b/tests/unit/conf_sofia/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
diff --git a/tests/unit/conf_test/freeswitch.xml b/tests/unit/conf_test/freeswitch.xml
index 7faaa072fb1..b26cd83df43 100644
--- a/tests/unit/conf_test/freeswitch.xml
+++ b/tests/unit/conf_test/freeswitch.xml
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>
@@ -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="media_timeout" value="300"/>
-        <param name="media_hold_timeout" value="1800"/>
+        <param name="media_timeout" value="300000"/>
+        <param name="media_hold_timeout" value="1800000"/>
         <param name="session-timeout" value="600"/>
         <param name="minimum-session-expires" value="90"/>
         <param name="tls" value="false"/>