[svn-commits] rmudgett: trunk r393241 - in /trunk: include/asterisk/bridging.h main/bridging.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Jun 28 19:31:00 2013
New Revision: 393241

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393241
Log:
Tweak after bridge callback reason to string strings.

Modified:
    trunk/include/asterisk/bridging.h
    trunk/main/bridging.c

Modified: trunk/include/asterisk/bridging.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/bridging.h?view=diff&rev=393241&r1=393240&r2=393241
==============================================================================
--- trunk/include/asterisk/bridging.h (original)
+++ trunk/include/asterisk/bridging.h Fri Jun 28 19:31:00 2013
@@ -1653,7 +1653,7 @@
 	AST_AFTER_BRIDGE_CB_REASON_REPLACED,
 	/*! The callback was removed because of a masquerade. (fixup) */
 	AST_AFTER_BRIDGE_CB_REASON_MASQUERADE,
-	/*! The channel departed bridge. */
+	/*! The channel was departed from the bridge. */
 	AST_AFTER_BRIDGE_CB_REASON_DEPART,
 	/*! Was explicitly removed by external code. */
 	AST_AFTER_BRIDGE_CB_REASON_REMOVED,

Modified: trunk/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridging.c?view=diff&rev=393241&r1=393240&r2=393241
==============================================================================
--- trunk/main/bridging.c (original)
+++ trunk/main/bridging.c Fri Jun 28 19:31:00 2013
@@ -3309,16 +3309,18 @@
 }
 
 const char *reason_strings[] = {
-	[AST_AFTER_BRIDGE_CB_REASON_DESTROY] = "Bridge Destroyed",
-	[AST_AFTER_BRIDGE_CB_REASON_REPLACED] = "Channel replaced",
+	[AST_AFTER_BRIDGE_CB_REASON_DESTROY] = "Channel destroyed (hungup)",
+	[AST_AFTER_BRIDGE_CB_REASON_REPLACED] = "Callback was replaced",
 	[AST_AFTER_BRIDGE_CB_REASON_MASQUERADE] = "Channel masqueraded",
-	[AST_AFTER_BRIDGE_CB_REASON_DEPART] = "Channel departed",
-	[AST_AFTER_BRIDGE_CB_REASON_REMOVED] = "Channel removed",
+	[AST_AFTER_BRIDGE_CB_REASON_DEPART] = "Channel was departed from bridge",
+	[AST_AFTER_BRIDGE_CB_REASON_REMOVED] = "Callback was removed",
 };
 
 const char *ast_after_bridge_cb_reason_string(enum ast_after_bridge_cb_reason reason)
 {
-	if (reason < AST_AFTER_BRIDGE_CB_REASON_DESTROY || reason > AST_AFTER_BRIDGE_CB_REASON_REMOVED) {
+	if (reason < AST_AFTER_BRIDGE_CB_REASON_DESTROY
+		|| AST_AFTER_BRIDGE_CB_REASON_REMOVED < reason
+		|| !reason_strings[reason]) {
 		return "Unknown";
 	}