diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-31 10:26:16 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-31 10:26:16 +0000 |
| commit | 972f6f432d58ccc2b01686c53f807cd156254a3f (patch) | |
| tree | db25be4f0fb51597c40fb0c2497e9bce91d6d864 | |
| parent | 0eab0b96505d21b6d4092c133eec238c85253624 (diff) | |
Support ;rport when we're supposed to support ;rport. Issue #7473.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@46628 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 6 | ||||
| -rw-r--r-- | configs/sip.conf.sample | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b5f15cff4..0b1d7d1e9 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5265,7 +5265,8 @@ static int copy_via_headers(struct sip_pvt *p, struct sip_request *req, const st if (rport && *(rport+6) == '=') rport = NULL; /* We already have a parameter to rport */ - if (rport && ast_test_flag(&p->flags[0], SIP_NAT) == SIP_NAT_ALWAYS) { + /* Check rport if NAT=yes or NAT=rfc3581 (which is the default setting) */ + if (rport && ((ast_test_flag(&p->flags[0], SIP_NAT) == SIP_NAT_ALWAYS) || (ast_test_flag(&p->flags[0], SIP_NAT) == SIP_NAT_RFC3581))) { /* We need to add received port - rport */ char tmp[256], *end; @@ -5282,9 +5283,6 @@ static int copy_via_headers(struct sip_pvt *p, struct sip_request *req, const st } /* Add rport to first VIA header if requested */ - /* Whoo hoo! Now we can indicate port address translation too! Just - another RFC (RFC3581). I'll leave the original comments in for - posterity. */ snprintf(new, sizeof(new), "%s;received=%s;rport=%d", tmp, ast_inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port)); diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index ef4fa2cda..eb5334693 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -243,7 +243,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; ;nat=no ; Global NAT settings (Affects all peers and users) ; yes = Always ignore info and assume NAT - ; no = Use NAT mode only according to RFC3581 + ; no = Use NAT mode only according to RFC3581 (;rport) ; never = Never attempt NAT mode or RFC3581 support ; route = Assume NAT, don't send rport ; (work around more UNIDEN bugs) |