diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-03 17:00:01 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-03 17:00:01 +0000 |
commit | 777abded5cb9b855fcad13b033ece785fe4a4971 (patch) | |
tree | 53f036ed4fef4d76e541d45d13f478ec1e049f92 /channels | |
parent | ccf5352c19d37cb8f227e226d0a5ca15b2910430 (diff) |
backport rport scanning fix from trunk (bug #6071)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7738 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 08400df22..057081575 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6796,7 +6796,7 @@ static int get_also_info(struct sip_pvt *p, struct sip_request *oreq) return -1; } -/*! \brief check_via: check Via: headers ---*/ +/*! \brief check Via: header for hostname, port and rport request/answer */ static int check_via(struct sip_pvt *p, struct sip_request *req) { char via[256]; @@ -6806,9 +6806,16 @@ static int check_via(struct sip_pvt *p, struct sip_request *req) struct ast_hostent ahp; ast_copy_string(via, get_header(req, "Via"), sizeof(via)); + + /* Check for rport */ + c = strstr(via, ";rport"); + if (c && (c[6] != '=')) /* rport query, not answer */ + ast_set_flag(p, SIP_NAT_ROUTE); + c = strchr(via, ';'); if (c) *c = '\0'; + c = strchr(via, ' '); if (c) { *c = '\0'; @@ -6829,9 +6836,7 @@ static int check_via(struct sip_pvt *p, struct sip_request *req) p->sa.sin_family = AF_INET; memcpy(&p->sa.sin_addr, hp->h_addr, sizeof(p->sa.sin_addr)); p->sa.sin_port = htons(pt ? atoi(pt) : DEFAULT_SIP_PORT); - c = strstr(via, ";rport"); - if (c && (c[6] != '=')) /* rport query, not answer */ - ast_set_flag(p, SIP_NAT_ROUTE); + if (sip_debug_test_pvt(p)) { c = (ast_test_flag(p, SIP_NAT) & SIP_NAT_ROUTE) ? "NAT" : "non-NAT"; ast_verbose("Sending to %s : %d (%s)\n", ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port), c); |