Author: anthm Date: Wed Oct 22 13:12:04 2008 New Revision: 10111 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: apply patch from lele for proxy mode+sip to not kill T38 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 Wed Oct 22 13:12:04 2008 @@ -651,6 +651,13 @@ return status; } + /* Fast PASS! */ + if (switch_test_flag((&tech_pvt->read_frame), SFF_PROXY_PACKET)) { + switch_clear_flag_locked(tech_pvt, TFLAG_READING); + *frame = &tech_pvt->read_frame; + return SWITCH_STATUS_SUCCESS; + } + payload = tech_pvt->read_frame.payload; if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Oct 22 13:12:04 2008 @@ -1308,6 +1308,13 @@ } } + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { + /* Fast PASS! */ + *flags |= SFF_PROXY_PACKET; + ret = (int) bytes; + goto end; + } + if (bytes) { rtp_session->missed_count = 0; @@ -1321,13 +1328,6 @@ } } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { - /* Fast PASS! */ - *flags |= SFF_PROXY_PACKET; - ret = (int) bytes; - goto end; - } - if (!bytes && (io_flags & SWITCH_IO_FLAG_NOBLOCK)) { return_cng_frame(); }