diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-01-19 21:55:41 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-01-19 21:55:41 +0000 |
| commit | 6fd0ac9dcd8225b060c0038ee0cd5440040a57ef (patch) | |
| tree | efd171a8781c38109669281f28b114e399b39cd5 /channels | |
| parent | ddf421bd5c45b94ac31c34c6699f21cf067ab3d1 (diff) | |
Eliminates doubling the :port part of SIP Notify Message-Account headers.
This patch prevents the domain string from getting mangled during the initreqprep
step by moving the initialization to before its immediate use. It also documents
this pitfall for the ast_sockaddr_stringify functions.
(issue ASTERISK-19057)
Reported by: Yuri
Review: https://reviewboard.asterisk.org/r/1678/
........
Merged revisions 351559 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 351560 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@351561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index abf535782..43a9d8bfe 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12994,7 +12994,7 @@ static int transmit_notify_with_mwi(struct sip_pvt *p, int newmsgs, int oldmsgs, struct sip_request req; struct ast_str *out = ast_str_alloca(500); int ourport = (p->fromdomainport) ? p->fromdomainport : ast_sockaddr_port(&p->ourip); - const char *domain = S_OR(p->fromdomain, ast_sockaddr_stringify_host_remote(&p->ourip)); + const char *domain; const char *exten = S_OR(vmexten, default_vmexten); initreqprep(&req, p, SIP_NOTIFY, NULL); @@ -13002,6 +13002,8 @@ static int transmit_notify_with_mwi(struct sip_pvt *p, int newmsgs, int oldmsgs, add_header(&req, "Content-Type", default_notifymime); ast_str_append(&out, 0, "Messages-Waiting: %s\r\n", newmsgs ? "yes" : "no"); + /* domain initialization occurs here because initreqprep changes ast_sockaddr_stringify string. */ + domain = S_OR(p->fromdomain, ast_sockaddr_stringify_host_remote(&p->ourip)); if (!sip_standard_port(p->socket.type, ourport)) { if (p->socket.type == SIP_TRANSPORT_UDP) { |