kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "Dial" event to link callerid, src and destination channel (bug #3494)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-07 15:19:34 +00:00
parent 82a9a22e99
commit 73b299843e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_dial.c
View File

@@ -27,6 +27,7 @@
#include <asterisk/utils.h> #include <asterisk/utils.h>
#include <asterisk/app.h> #include <asterisk/app.h>
#include <asterisk/causes.h> #include <asterisk/causes.h>
#include <asterisk/manager.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
@@ -240,6 +241,20 @@ static char *get_cid_name(char *name, int namelen, struct ast_channel *chan)
return ""; return "";
} }
static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
{
manager_event(EVENT_FLAG_CALL, "Dial",
"Source: %s\r\n"
"Destination: %s\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
"SrcUniqueID: %s\r\n"
"DestUniqueID: %s\r\n",
src->name, dst->name, src->cid.cid_num ? src->cid.cid_num : "<unknown>",
src->cid.cid_name ? src->cid.cid_name : "<unknown>", src->uniqueid,
dst->uniqueid);
}
static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localuser *outgoing, int *to, struct ast_flags *peerflags, int *sentringing, char *status, size_t statussize, int busystart, int nochanstart, int congestionstart, int *result) static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localuser *outgoing, int *to, struct ast_flags *peerflags, int *sentringing, char *status, size_t statussize, int busystart, int nochanstart, int congestionstart, int *result)
{ {
struct localuser *o; struct localuser *o;
@@ -405,6 +420,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
o->chan = NULL; o->chan = NULL;
numnochan++; numnochan++;
} else { } else {
senddialevent(in, o->chan);
/* After calling, set callerid to extension */ /* After calling, set callerid to extension */
if (!ast_test_flag(peerflags, DIAL_PRESERVE_CALLERID)) if (!ast_test_flag(peerflags, DIAL_PRESERVE_CALLERID))
ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, get_cid_name(cidname, sizeof(cidname), in), NULL); ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, get_cid_name(cidname, sizeof(cidname), in), NULL);
@@ -1016,6 +1032,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
cur = rest; cur = rest;
continue; continue;
} else { } else {
senddialevent(chan, tmp->chan);
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst); ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
if (!ast_test_flag(peerflags, DIAL_PRESERVE_CALLERID)) if (!ast_test_flag(peerflags, DIAL_PRESERVE_CALLERID))