kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report CallerID change during a masquerade.

Browse Source 
Reported by: markster


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@202496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-22 20:08:53 +00:00
parent dcfd8d7c7c
commit 72b285ed96
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main/channel.c
View File

@@ -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);
}