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

add channel CLID info in manager Link event (bug #4548 with minor mod)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-21 23:10:29 +00:00
parent d66913bea2
commit 85091ab68d
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
channel.c
View File

@@ -3051,8 +3051,11 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
"Channel1: %s\r\n" "Channel1: %s\r\n"
"Channel2: %s\r\n" "Channel2: %s\r\n"
"Uniqueid1: %s\r\n" "Uniqueid1: %s\r\n"
"Uniqueid2: %s\r\n", "Uniqueid2: %s\r\n"
c0->name, c1->name, c0->uniqueid, c1->uniqueid); "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; o1nativeformats = c1->nativeformats;
o0nativeformats = c0->nativeformats; o0nativeformats = c0->nativeformats;
for (/* ever */;;) { for (/* ever */;;) {
@@ -3132,8 +3135,10 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
"Channel1: %s\r\n" "Channel1: %s\r\n"
"Channel2: %s\r\n" "Channel2: %s\r\n"
"Uniqueid1: %s\r\n" "Uniqueid1: %s\r\n"
"Uniqueid2: %s\r\n", "Uniqueid2: %s\r\n"
c0->name, c1->name, c0->uniqueid, c1->uniqueid); "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_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(c0, AST_FLAG_NBRIDGE);
ast_clear_flag(c1, 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)) { !(c0->generator || c1->generator)) {
if (ast_channel_make_compatible(c0, c1)) { if (ast_channel_make_compatible(c0, c1)) {
ast_log(LOG_WARNING, "Can't make %s and %s compatible\n", c0->name, c1->name); ast_log(LOG_WARNING, "Can't make %s and %s compatible\n", c0->name, c1->name);
manager_event(EVENT_FLAG_CALL, "Unlink", manager_event(EVENT_FLAG_CALL, "Unlink",
"Channel1: %s\r\n" "Channel1: %s\r\n"
"Channel2: %s\r\n" "Channel2: %s\r\n"
"Uniqueid1: %s\r\n" "Uniqueid1: %s\r\n"
"Uniqueid2: %s\r\n", "Uniqueid2: %s\r\n"
c0->name, c1->name, c0->uniqueid, c1->uniqueid); "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; return -1;
} }
o0nativeformats = c0->nativeformats; o0nativeformats = c0->nativeformats;
@@ -3177,12 +3184,14 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
} }
c0->_bridge = NULL; c0->_bridge = NULL;
c1->_bridge = NULL; c1->_bridge = NULL;
manager_event(EVENT_FLAG_CALL, "Unlink", manager_event(EVENT_FLAG_CALL, "Unlink",
"Channel1: %s\r\n" "Channel1: %s\r\n"
"Channel2: %s\r\n" "Channel2: %s\r\n"
"Uniqueid1: %s\r\n" "Uniqueid1: %s\r\n"
"Uniqueid2: %s\r\n", "Uniqueid2: %s\r\n"
c0->name, c1->name, c0->uniqueid, c1->uniqueid); "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); ast_log(LOG_DEBUG, "Bridge stops bridging channels %s and %s\n",c0->name,c1->name);
return res; return res;
} }

2
doc/manager.txt
View File

@@ -175,6 +175,8 @@ Some standard AMI headers:
CallerID: -- CallerID number CallerID: -- CallerID number
Number or "<unknown>" or "unknown" Number or "<unknown>" or "unknown"
(should change to "<unknown>" in app_queue) (should change to "<unknown>" in app_queue)
CallerID1: -- Channel 1 CallerID (Link event)
CallerID2: -- Channel 2 CallerID (Link event)
CallerIDName: -- CallerID name CallerIDName: -- CallerID name
Name or "<unknown>" or "unknown" Name or "<unknown>" or "unknown"
(should change to "<unknown>" in app_queue) (should change to "<unknown>" in app_queue)