its suppress.. but we still support the supress variant.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9380 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/sip_profiles/internal-ipv6.xml b/conf/sip_profiles/internal-ipv6.xml
index f2d83d72df13b9a6f740bf00b153e586c248c2f4..dd5d99fede821c59e7a9346fd5c401e96c718021 100644 (file)
--- a/conf/sip_profiles/internal-ipv6.xml
+++ b/conf/sip_profiles/internal-ipv6.xml
@@ -73,8 +73,8 @@
     <!-- accept any authentication without actually checking (not a good feature for most people) -->
     <!-- <param name="accept-blind-auth" value="true"/> -->
     
-    <!-- supress CNG on this profile or per call with the 'supress_cng' variable -->
-    <!-- <param name="supress-cng" value="true"/> -->
+    <!-- suppress CNG on this profile or per call with the 'suppress_cng' variable -->
+    <!-- <param name="suppress-cng" value="true"/> -->
     
     <!--TTL for nonce in sip auth-->
     <param name="nonce-ttl" value="60"/>

diff --git a/conf/sip_profiles/internal.xml b/conf/sip_profiles/internal.xml
index 2d9e45a72a04abbe357c56f251639f6fc90d833a..442091a37c49ac8b69b46ba0926d04be40cdb44f 100644 (file)
--- a/conf/sip_profiles/internal.xml
+++ b/conf/sip_profiles/internal.xml
@@ -91,8 +91,8 @@
     <!-- accept any authentication without actually checking (not a good feature for most people) -->
     <!-- <param name="accept-blind-auth" value="true"/> -->
     
-    <!-- supress CNG on this profile or per call with the 'supress_cng' variable -->
-    <!-- <param name="supress-cng" value="true"/> -->
+    <!-- suppress CNG on this profile or per call with the 'suppress_cng' variable -->
+    <!-- <param name="suppress-cng" value="true"/> -->
     
     <!--TTL for nonce in sip auth-->
     <param name="nonce-ttl" value="60"/>

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index b3b0e756a24639ed9d2ab60b9248696d2b55588d..260d989ff74d96224beffcb54298d69d5fcaa7f0 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -145,7 +145,7 @@ typedef enum {
        PFLAG_RESPAWN = (1 << 9),
        PFLAG_GREEDY = (1 << 10),
        PFLAG_MULTIREG = (1 << 11),
-       PFLAG_SUPRESS_CNG = (1 << 12),
+       PFLAG_SUPPRESS_CNG = (1 << 12),
        PFLAG_TLS = (1 << 13),
        PFLAG_CHECKUSER = (1 << 14),
        PFLAG_SECURE = (1 << 15),

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 984b3be9dc1c542edb2c1f71a256f8085654f980..0d5ae0f2b95fd9e28f155b3b961e32ff3db17e84 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1155,11 +1155,11 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
                                                } else {
                                                        profile->pflags &= ~PFLAG_MULTIREG;
                                                }
-                                       } else if (!strcasecmp(var, "supress-cng")) {
+                                       } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) {
                                                if (switch_true(val)) {
-                                                       profile->pflags |= PFLAG_SUPRESS_CNG;
+                                                       profile->pflags |= PFLAG_SUPPRESS_CNG;
                                                } else {
-                                                       profile->pflags &= ~PFLAG_SUPRESS_CNG;
+                                                       profile->pflags &= ~PFLAG_SUPPRESS_CNG;
                                                }
                                        } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) {
                                                if (switch_true(val)) {
@@ -1585,9 +1585,9 @@ switch_status_t config_sofia(int reload, char *profile_name)
                                                if (switch_true(val)) {
                                                        profile->pflags |= PFLAG_MULTIREG;
                                                }
-                                       } else if (!strcasecmp(var, "supress-cng")) {
+                                       } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) {
                                                if (switch_true(val)) {
-                                                       profile->pflags |= PFLAG_SUPRESS_CNG;
+                                                       profile->pflags |= PFLAG_SUPPRESS_CNG;
                                                }
                                        } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) {
                                                if (switch_true(val)) {
@@ -1727,7 +1727,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
                                        }
                                }
 
-                               if ((!profile->cng_pt) && (!sofia_test_pflag(profile, PFLAG_SUPRESS_CNG))) {
+                               if ((!profile->cng_pt) && (!sofia_test_pflag(profile, PFLAG_SUPPRESS_CNG))) {
                                        profile->cng_pt = SWITCH_RTP_CNG_PAYLOAD;
                                }
 

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 40539f7bb899d32e10c8ed33af73a7e47d0f1957..5e07f26d49a86336554f3c3115ade29b595a84cc 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -48,8 +48,9 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
        const char *pass_fmtp = switch_channel_get_variable(tech_pvt->channel, "sip_video_fmtp");
        const char *ov_fmtp = switch_channel_get_variable(tech_pvt->channel, "sip_force_video_fmtp");
 
-       if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPRESS_CNG) ||
-               ((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val))) {
+       if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) ||
+               ((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val)) ||
+               ((val = switch_channel_get_variable(tech_pvt->channel, "suppress_cng")) && switch_true(val))) {
                use_cng = 0;
        }