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
........

Merged revisions 411022 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@411023 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 80e96a2417e555c0ecd214f9e336fdfae5e918e9..a9c6f033bd55807a7da4a9ccd112991a8b11502b 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13979,7 +13979,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);
 
@@ -14030,6 +14032,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));