diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-11 05:21:03 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-11 05:21:03 +0000 |
| commit | 4942fd94d2201b92eed4c08d88313a98dab0ff2d (patch) | |
| tree | 9f490e2ba326942057ba3c47d35929f6493f077c | |
| parent | 4aba5a78d9fb2746e6218dc40d9049c87d9ce9c4 (diff) | |
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
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | include/asterisk/rtp.h | 2 | ||||
| -rw-r--r-- | main/rtp.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2707f0ca0..010a4085d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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; diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index 2edff8cad..85f3b1903 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -186,6 +186,8 @@ char *ast_rtp_lookup_mime_multiple(char *buf, size_t size, const int capability, void ast_rtp_setnat(struct ast_rtp *rtp, int nat); +int ast_rtp_getnat(struct ast_rtp *rtp); + /*! \brief Indicate whether this RTP session is carrying DTMF or not */ void ast_rtp_setdtmf(struct ast_rtp *rtp, int dtmf); diff --git a/main/rtp.c b/main/rtp.c index b4c37087d..e80cb3ead 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -591,6 +591,11 @@ void ast_rtp_setnat(struct ast_rtp *rtp, int nat) rtp->nat = nat; } +int ast_rtp_getnat(struct ast_rtp *rtp) +{ + return ast_test_flag(rtp, FLAG_NAT_ACTIVE); +} + void ast_rtp_setdtmf(struct ast_rtp *rtp, int dtmf) { ast_set2_flag(rtp, dtmf ? 1 : 0, FLAG_HAS_DTMF); |