Set the Caller ID "tag" on peers even if remote party information is present.

On incoming calls, we were setting the cid_tag on the dialog only if there was
no remote party information (Remote-Party-ID or P-Asserted-Identity) present.
The Caller ID tag is an invented parameter, though, and should be set no matter
the circumstance.

(closes issue ASTERISK-19859)
Reported by Thomas Arimont
(closes issue AST-884)
Reported by Trey Blancher

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 30a4b09ee4383f058cfcbf12943f893a617a0367..cd0edacefb1181e7f20f74c478d73855a2328ac1 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16116,11 +16116,12 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
                        }
                        if (!ast_strlen_zero(peer->cid_name))
                                ast_string_field_set(p, cid_name, peer->cid_name);
-                       if (!ast_strlen_zero(peer->cid_tag))
-                               ast_string_field_set(p, cid_tag, peer->cid_tag);
                        if (peer->callingpres)
                                p->callingpres = peer->callingpres;
                }
+               if (!ast_strlen_zero(peer->cid_tag)) {
+                       ast_string_field_set(p, cid_tag, peer->cid_tag);
+               }
                ast_string_field_set(p, fullcontact, peer->fullcontact);
 
                if (!ast_strlen_zero(peer->context)) {