From 6b46e27bb4121b872e9e8ecaf5be906dcbd4d9b4 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 19 Jan 2006 04:58:43 +0000 Subject: [PATCH] Merged revisions 8242 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r8242 | russell | 2006-01-18 23:56:48 -0500 (Wed, 18 Jan 2006) | 3 lines fix Message-Account header to use the ip address if the fromdomain isn't set (issue #6278) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8243 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3942c4c544..c95279f782 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5192,13 +5192,14 @@ static int transmit_notify_with_mwi(struct sip_pvt *p, int newmsgs, int oldmsgs, char tmp[500]; char *t = tmp; size_t maxbytes = sizeof(tmp); + char iabuf[INET_ADDRSTRLEN]; initreqprep(&req, p, SIP_NOTIFY); add_header(&req, "Event", "message-summary"); add_header(&req, "Content-Type", default_notifymime); ast_build_string(&t, &maxbytes, "Messages-Waiting: %s\r\n", newmsgs ? "yes" : "no"); - ast_build_string(&t, &maxbytes, "Message-Account: sip:%s@%s\r\n", !ast_strlen_zero(vmexten) ? vmexten : global_vmexten, p->fromdomain); + ast_build_string(&t, &maxbytes, "Message-Account: sip:%s@%s\r\n", !ast_strlen_zero(vmexten) ? vmexten : global_vmexten, ast_strlen_zero(p->fromdomain) ? ast_inet_ntoa(iabuf, sizeof(iabuf), p->ourip) : p->fromdomain); ast_build_string(&t, &maxbytes, "Voice-Message: %d/%d (0/0)\r\n", newmsgs, oldmsgs); if (t > tmp + sizeof(tmp))