diff options
| author | Olle Johansson <oej@edvina.net> | 2006-10-07 15:38:18 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2006-10-07 15:38:18 +0000 |
| commit | 64aae4a8877c9c06b1caa5c38eaf32cf7fbbae1c (patch) | |
| tree | 3a0969fb04fa25014d1adde080ed52acc2add9ec | |
| parent | 1ed8fb571f83cd8a5d9f50ca950643dd9bae9965 (diff) | |
Do *NOT* use DEFAULT_SIP_PORT in these comparisions, since users may change
that, but the protocol clearly states that if we DO NOT mention a port it
is 5060. DEFAULT_SIP_PORT is whatever we default to listen to.
I believe it's the third time I revert a patch like this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 316c26f1a..2cbd6b7dc 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6291,7 +6291,7 @@ static void extract_uri(struct sip_pvt *p, struct sip_request *req) static void build_contact(struct sip_pvt *p) { /* Construct Contact: header */ - if (ourport != DEFAULT_SIP_PORT) /* Needs to be 5060, according to the RFC */ + if (ourport != 5060) /* Needs to be 5060, according to the RFC (NOT DEFAULT_SIP_PORT!!!!) */ ast_string_field_build(p, our_contact, "<sip:%s%s%s:%d>", p->exten, ast_strlen_zero(p->exten) ? "" : "@", ast_inet_ntoa(p->ourip), ourport); else ast_string_field_build(p, our_contact, "<sip:%s%s%s>", p->exten, ast_strlen_zero(p->exten) ? "" : "@", ast_inet_ntoa(p->ourip)); @@ -6450,7 +6450,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho l = tmp2; } - if (ourport != DEFAULT_SIP_PORT && ast_strlen_zero(p->fromdomain)) /* Needs to be 5060 */ + if (ourport != 5060 && ast_strlen_zero(p->fromdomain)) /* Needs to be 5060 */ snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s:%d>;tag=%s", n, l, S_OR(p->fromdomain, ast_inet_ntoa(p->ourip)), ourport, p->tag); else snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s>;tag=%s", n, l, S_OR(p->fromdomain, ast_inet_ntoa(p->ourip)), p->tag); @@ -6471,7 +6471,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho ast_build_string(&invite, &invite_max, "%s@", n); } ast_build_string(&invite, &invite_max, "%s", p->tohost); - if (ntohs(p->sa.sin_port) != DEFAULT_SIP_PORT) /* Needs to be 5060 */ + if (ntohs(p->sa.sin_port) != 5060) /* Needs to be 5060 */ ast_build_string(&invite, &invite_max, ":%d", ntohs(p->sa.sin_port)); ast_build_string(&invite, &invite_max, "%s", urioptions); } |