From 4644a07334778ee85f8e97b1b12c4f8d2711ebe3 Mon Sep 17 00:00:00 2001 From: Joshua Colp <jcolp@digium.com> Date: Mon, 24 Mar 2014 21:37:26 +0000 Subject: [PATCH] chan_sip: Always use fromdomain if set for domain, even if callerid is set to restricted. (closes issue ASTERISK-20841) Reported by: Kelly Goedert ........ Merged revisions 411021 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@411022 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e5814860be..3eb3eae4dd 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13819,7 +13819,9 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho snprintf(p->lastmsg, sizeof(p->lastmsg), "Init: %s", sip_methods[sipmethod].text); - d = S_OR(p->fromdomain, ast_sockaddr_stringify_host_remote(&p->ourip)); + if (ast_strlen_zero(p->fromdomain)) { + d = ast_sockaddr_stringify_host_remote(&p->ourip); + } if (p->owner) { connected_id = ast_channel_connected_effective_id(p->owner); @@ -13870,6 +13872,12 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho else /* Save for any further attempts */ ast_string_field_set(p, fromname, n); + /* Allow domain to be overridden */ + if (!ast_strlen_zero(p->fromdomain)) + d = p->fromdomain; + else /* Save for any further attempts */ + ast_string_field_set(p, fromdomain, d); + ast_copy_string(tmp_l, l, sizeof(tmp_l)); if (sip_cfg.pedanticsipchecking) { ast_escape_quoted(n, tmp_n, sizeof(tmp_n)); -- GitLab