Merged revisions 50466 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50466 | file | 2007-01-11 00:19:39 -0500 (Thu, 11 Jan 2007) | 2 lines

Add support to see whether NAT was detected (yay symmetric RTP) and also add a check in chan_sip so that if NAT has been detected and the reinvite behind nat option has been turned off, then just do partial bridge. (issue #8655 reported by mnicholson)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-11 05:21:03 +00:00
parent 4aba5a78d9
commit 4942fd94d2
3 changed files with 10 additions and 1 deletions

View File

@@ -16894,7 +16894,9 @@ static enum ast_rtp_get_result sip_get_rtp_peer(struct ast_channel *chan, struct
*rtp = p->rtp;
if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
if (ast_rtp_getnat(*rtp) && !ast_test_flag(&p->flags[0], SIP_CAN_REINVITE_NAT))
res = AST_RTP_TRY_PARTIAL;
else if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
res = AST_RTP_TRY_NATIVE;
else if (ast_test_flag(&global_jbconf, AST_JB_FORCED))
res = AST_RTP_GET_FAILED;