Author: brian Date: Thu Aug 28 12:32:06 2008 New Revision: 9380 Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: its suppress.. but we still support the supress variant. Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Thu Aug 28 12:32:06 2008 @@ -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"/> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu Aug 28 12:32:06 2008 @@ -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"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Aug 28 12:32:06 2008 @@ -145,7 +145,7 @@ 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), Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Aug 28 12:32:06 2008 @@ -1155,11 +1155,11 @@ } 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 @@ 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 @@ } } - 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; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Aug 28 12:32:06 2008 @@ -48,8 +48,9 @@ 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; }