From a174aa73f6cd4fd23b3612a205b84cc6b81289c9 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Sat, 29 Jun 2013 00:31:00 +0000
Subject: [PATCH] Tweak after bridge callback reason to string strings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/bridging.h | 2 +-
main/bridging.c | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/asterisk/bridging.h b/include/asterisk/bridging.h
index 2fde0488b9..e03bfd0cdb 100644
--- a/include/asterisk/bridging.h
+++ b/include/asterisk/bridging.h
@@ -1653,7 +1653,7 @@ enum ast_after_bridge_cb_reason {
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,
diff --git a/main/bridging.c b/main/bridging.c
index 5dcd580f0a..2dc2ec124d 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -3309,16 +3309,18 @@ int ast_after_bridge_callback_set(struct ast_channel *chan, ast_after_bridge_cb
}
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";
}
--
GitLab