Report CallerID change during a masquerade.

Reported by: markster

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

diff --git a/main/channel.c b/main/channel.c
index 98e9c3f37fd2135289577f7230d08001796a1ee8..67aa766364319734871ce40d123e87e9e75364b9 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3717,6 +3717,26 @@ static void clone_variables(struct ast_channel *original, struct ast_channel *cl
        }
 }
 
+/*!
+ * \pre chan is locked
+ */
+static void report_new_callerid(const struct ast_channel *chan)
+{
+       manager_event(EVENT_FLAG_CALL, "Newcallerid",
+                               "Channel: %s\r\n"
+                               "CallerID: %s\r\n"
+                               "CallerIDName: %s\r\n"
+                               "Uniqueid: %s\r\n"
+                               "CID-CallingPres: %d (%s)\r\n",
+                               chan->name,
+                               S_OR(chan->cid.cid_num, "<Unknown>"),
+                               S_OR(chan->cid.cid_name, "<Unknown>"),
+                               chan->uniqueid,
+                               chan->cid.cid_pres,
+                               ast_describe_caller_presentation(chan->cid.cid_pres)
+                               );
+}
+
 /*!
   \brief Masquerade a channel
 
@@ -3918,7 +3938,8 @@ int ast_do_masquerade(struct ast_channel *original)
        tmpcid = original->cid;
        original->cid = clone->cid;
        clone->cid = tmpcid;
-       
+       report_new_callerid(original);
+
        /* Restore original timing file descriptor */
        original->fds[AST_TIMING_FD] = original->timingfd;
        
@@ -4019,20 +4040,9 @@ void ast_set_callerid(struct ast_channel *chan, const char *callerid, const char
                        free(chan->cid.cid_ani);
                chan->cid.cid_ani = ast_strdup(ani);
        }
-       manager_event(EVENT_FLAG_CALL, "Newcallerid",
-                               "Channel: %s\r\n"
-                               "CallerID: %s\r\n"
-                               "CallerIDName: %s\r\n"
-                               "Uniqueid: %s\r\n"
-                               "CID-CallingPres: %d (%s)\r\n",
-                               chan->name,
-                               S_OR(chan->cid.cid_num, "<Unknown>"),
-                               S_OR(chan->cid.cid_name, "<Unknown>"),
-                               chan->uniqueid,
-                               chan->cid.cid_pres,
-                               ast_describe_caller_presentation(chan->cid.cid_pres)
-                               );
-       
+
+       report_new_callerid(chan);
+
        ast_channel_unlock(chan);
 }