kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_sip: Support nat=auto_comedia or nat=force_rport,auto_comedia."

Browse Source
This commit is contained in:
Joshua Colp
2016-10-19 11:06:41 -05:00
committed by Gerrit Code Review
parent f14ef51ead 4f7f8a7e95
commit 1843b7fa0c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_sip.c
View File

@@ -30477,9 +30477,10 @@ static struct ast_channel *sip_request_call(const char *type, struct ast_format_
if (p->relatedpeer) { if (p->relatedpeer) {
if (!ast_strlen_zero(p->relatedpeer->fullcontact) && !p->natdetected && if (!ast_strlen_zero(p->relatedpeer->fullcontact) && !p->natdetected &&
(ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_RPORT) && !ast_test_flag(&p->flags[0], SIP_NAT_FORCE_RPORT))) { ((ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_RPORT) && !ast_test_flag(&p->flags[0], SIP_NAT_FORCE_RPORT)) ||
(ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_COMEDIA) && !ast_test_flag(&p->flags[1], SIP_PAGE2_SYMMETRICRTP)))) {
/* We need to make an attempt to determine if a peer is behind NAT /* We need to make an attempt to determine if a peer is behind NAT
if the peer has the auto_force_rport flag set. */ if the peer has the flags auto_force_rport or auto_comedia set. */
struct ast_sockaddr tmpaddr; struct ast_sockaddr tmpaddr;
__set_address_from_contact(p->relatedpeer->fullcontact, &tmpaddr, 0); __set_address_from_contact(p->relatedpeer->fullcontact, &tmpaddr, 0);