Author: mikej Date: Thu Oct 23 01:52:05 2008 New Revision: 10130 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: revert, give up for the night Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 23 01:52:05 2008 @@ -2116,14 +2116,6 @@ sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { - if (tech_pvt->bcng_pt) { - tech_pvt->cng_pt = tech_pvt->bcng_pt; - } else if (!tech_pvt->cng_pt) { - tech_pvt->cng_pt = profile->cng_pt; - } - } - if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); if (profile->pres_type) { 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 Oct 23 01:52:05 2008 @@ -413,6 +413,14 @@ tech_pvt->dtmf_type = profile->dtmf_type; + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (tech_pvt->bcng_pt) { + tech_pvt->cng_pt = tech_pvt->bcng_pt; + } else if (!tech_pvt->cng_pt) { + tech_pvt->cng_pt = profile->cng_pt; + } + } + tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt);