[Asterisk-cvs] asterisk channel.c,1.139.2.10,1.139.2.11
russell
russell
Thu Aug 4 19:58:07 CDT 2005
Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv3878
Modified Files:
Tag: v1-0
channel.c
Log Message:
copy the monitor over when masquerading (bug #3809)
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.139.2.10
retrieving revision 1.139.2.11
diff -u -d -r1.139.2.10 -r1.139.2.11
--- channel.c 14 Jun 2005 18:41:48 -0000 1.139.2.10
+++ channel.c 5 Aug 2005 00:02:09 -0000 1.139.2.11
@@ -2211,6 +2211,7 @@
struct ast_frame *cur, *prev;
struct ast_channel_pvt *p;
struct ast_channel *clone = original->masq;
+ struct ast_channel_monitor *monitor;
int rformat = original->readformat;
int wformat = original->writeformat;
char newn[100];
@@ -2318,6 +2319,11 @@
/* Update the type. */
original->type = clone->type;
+
+ /* copy the monitor */
+ monitor = original->monitor;
+ original->monitor = clone->monitor;
+ clone->monitor = monitor;
/* Keep the same language. */
strncpy(original->language, clone->language, sizeof(original->language));
More information about the svn-commits
mailing list