Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv23134
Modified Files:
ChangeLog channel.c
Log Message:
native bridging changes
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog 1 Nov 2005 22:11:55 -0000 1.11
+++ ChangeLog 2 Nov 2005 17:20:35 -0000 1.12
@@ -1,3 +1,7 @@
+2005-11-02 Kevin P. Fleming <[EMAIL PROTECTED]>
+
+ * channel.c (ast_channel_bridge): simplify native-bridge return logic,
remove 'unsuccessful' message since it causes too many questions :-)
+
2005-11-01 Kevin P. Fleming <[EMAIL PROTECTED]>
* stdtime/localtime.c: fix build failure on uClibc systems (issue #5558)
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- channel.c 1 Nov 2005 21:11:56 -0000 1.257
+++ channel.c 2 Nov 2005 17:20:35 -0000 1.258
@@ -3460,14 +3460,10 @@
} else {
ast_clear_flag(c0, AST_FLAG_NBRIDGE);
ast_clear_flag(c1, AST_FLAG_NBRIDGE);
- ast_verbose(VERBOSE_PREFIX_3 "Native bridge of
%s and %s was unsuccessful\n", c0->name, c1->name);
}
- if (res == AST_BRIDGE_RETRY)
- continue;
switch (res) {
case AST_BRIDGE_RETRY:
-/* continue; */
- break;
+ continue;
default:
ast_log(LOG_WARNING, "Private bridge between %s
and %s failed\n", c0->name, c1->name);
/* fallthrough */
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
