Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv9114
Modified Files:
channel.c
Log Message:
add channel CLID info in manager Link event (bug #4548 with minor mod)
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- channel.c 21 Jun 2005 01:16:18 -0000 1.206
+++ channel.c 21 Jun 2005 23:10:29 -0000 1.207
@@ -3051,8 +3051,11 @@
"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 @@
"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 @@
!(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 @@
}
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;
}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
