From 85091ab68deee4b2a647bff50b8f43e481ba98c4 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 21 Jun 2005 23:10:29 +0000 Subject: add channel CLID info in manager Link event (bug #4548 with minor mod) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5963 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 35 ++++++++++++++++++++++------------- doc/manager.txt | 2 ++ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/channel.c b/channel.c index 620f8cf97..f7f90b90d 100755 --- a/channel.c +++ b/channel.c @@ -3051,8 +3051,11 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as "Channel1: %s\r\n" "Channel2: %s\r\n" "Uniqueid1: %s\r\n" - "Uniqueid2: %s\r\n", - c0->name, c1->name, c0->uniqueid, c1->uniqueid); + "Uniqueid2: %s\r\n" + "CallerID1: %s\r\n" + "CallerID2: %s\r\n", + c0->name, c1->name, c0->uniqueid, c1->uniqueid, c0->cid.cid_num, c1->cid.cid_num); + o1nativeformats = c1->nativeformats; o0nativeformats = c0->nativeformats; for (/* ever */;;) { @@ -3132,8 +3135,10 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as "Channel1: %s\r\n" "Channel2: %s\r\n" "Uniqueid1: %s\r\n" - "Uniqueid2: %s\r\n", - c0->name, c1->name, c0->uniqueid, c1->uniqueid); + "Uniqueid2: %s\r\n" + "CallerID1: %s\r\n" + "CallerID2: %s\r\n", + c0->name, c1->name, c0->uniqueid, c1->uniqueid, c0->cid.cid_num, c1->cid.cid_num); ast_log(LOG_DEBUG, "Returning from native bridge, channels: %s, %s\n",c0->name ,c1->name); ast_clear_flag(c0, AST_FLAG_NBRIDGE); ast_clear_flag(c1, AST_FLAG_NBRIDGE); @@ -3160,12 +3165,14 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as !(c0->generator || c1->generator)) { if (ast_channel_make_compatible(c0, c1)) { ast_log(LOG_WARNING, "Can't make %s and %s compatible\n", c0->name, c1->name); - manager_event(EVENT_FLAG_CALL, "Unlink", - "Channel1: %s\r\n" - "Channel2: %s\r\n" - "Uniqueid1: %s\r\n" - "Uniqueid2: %s\r\n", - c0->name, c1->name, c0->uniqueid, c1->uniqueid); + manager_event(EVENT_FLAG_CALL, "Unlink", + "Channel1: %s\r\n" + "Channel2: %s\r\n" + "Uniqueid1: %s\r\n" + "Uniqueid2: %s\r\n" + "CallerID1: %s\r\n" + "CallerID2: %s\r\n", + c0->name, c1->name, c0->uniqueid, c1->uniqueid, c0->cid.cid_num, c1->cid.cid_num); return -1; } o0nativeformats = c0->nativeformats; @@ -3177,12 +3184,14 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as } c0->_bridge = NULL; c1->_bridge = NULL; - manager_event(EVENT_FLAG_CALL, "Unlink", + manager_event(EVENT_FLAG_CALL, "Unlink", "Channel1: %s\r\n" "Channel2: %s\r\n" "Uniqueid1: %s\r\n" - "Uniqueid2: %s\r\n", - c0->name, c1->name, c0->uniqueid, c1->uniqueid); + "Uniqueid2: %s\r\n" + "CallerID1: %s\r\n" + "CallerID2: %s\r\n", + c0->name, c1->name, c0->uniqueid, c1->uniqueid, c0->cid.cid_num, c1->cid.cid_num); ast_log(LOG_DEBUG, "Bridge stops bridging channels %s and %s\n",c0->name,c1->name); return res; } diff --git a/doc/manager.txt b/doc/manager.txt index 7769d7a96..1e4549caa 100755 --- a/doc/manager.txt +++ b/doc/manager.txt @@ -175,6 +175,8 @@ Some standard AMI headers: CallerID: -- CallerID number Number or "" or "unknown" (should change to "" in app_queue) + CallerID1: -- Channel 1 CallerID (Link event) + CallerID2: -- Channel 2 CallerID (Link event) CallerIDName: -- CallerID name Name or "" or "unknown" (should change to "" in app_queue) -- cgit v1.2.3