From: Brian West Date: Fri, 7 Nov 2014 00:26:28 +0000 (-0600) Subject: Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch X-Git-Tag: v1.4.14~2^2~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e9c4378deed78a30f8485679a0a2aa9fbe0066b;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch --- 9e9c4378deed78a30f8485679a0a2aa9fbe0066b diff --cc src/mod/endpoints/mod_sofia/sofia_glue.c index 49079f106d,f20f1a1e8c..0aafd19789 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@@ -1233,12 -1233,8 +1233,12 @@@ switch_status_t sofia_glue_do_invite(sw switch_channel_get_name(tech_pvt->channel), switch_version_full_human(), tech_pvt->mparams.local_sdp_str ? tech_pvt->mparams.local_sdp_str : "NO SDP PRESENT\n"); - tech_pvt->sent_invites++; + + if (switch_channel_get_private(tech_pvt->channel, "t38_options")) { + sofia_clear_flag(tech_pvt, TFLAG_ENABLE_SOA); + } + if (sofia_use_soa(tech_pvt)) { nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0),