Remove some dead code dealing with: AST_BRIDGE_REC_CHANNEL_0, AST_BRIDGE_REC_CHANNEL_...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396734 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1c53da7c6bee83291790c471feb6759f1458b524..786b4617b980ecc2d46171faa14b80abc396bd08 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5513,8 +5513,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
                if ((f->frametype == AST_FRAME_CONTROL)) {
                        if (f->subclass.integer == AST_CONTROL_PVT_CAUSE_CODE) {
                                ast_channel_hangupcause_hash_set(other, f->data.ptr, f->datalen);
-                       } else if (!(flags & AST_BRIDGE_IGNORE_SIGS)
-                               && (f->subclass.integer != AST_CONTROL_SRCUPDATE)) {
+                       } else if (f->subclass.integer != AST_CONTROL_SRCUPDATE) {
                                *fo = f;
                                *rc = who;
                                res =  AST_BRIDGE_COMPLETE;

diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 408776c1caafbc0d63058057b8ecc920b25fb4f0..f031ad55dd05f717e1d06fa330d0426a7310889d 100644 (file)
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -1033,15 +1033,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e)
                        break;
 
                case AST_FRAME_CONTROL:
-                       if (!(p->bridge->flags & AST_BRIDGE_IGNORE_SIGS)) {
-                       #if 0
-                       if (f.subclass == AST_CONTROL_BUSY ||
-                       f.subclass == AST_CONTROL_CONGESTION ||
-                       f.subclass == AST_CONTROL_HANGUP ||
-                       f.subclass == AST_CONTROL_FLASH)
-                       #endif
-                               endbridge = 1;
-                       }
+                       endbridge = 1;
                        break;
 
                default:
@@ -2263,12 +2255,7 @@ static void *do_chanreads(void *pvt)
                ast_verb(5, "%s: chanreads: Starting cycle ...\n", p->dev);
                ast_verb(5, "%s: chanreads: Checking bridge \n", p->dev);
                if (p->bridge) {
-                       if (p->bridge->c0 == p->owner && (p->bridge->flags & AST_BRIDGE_REC_CHANNEL_0))
-                               bridgerec = 1;
-                       else if (p->bridge->c1 == p->owner && (p->bridge->flags & AST_BRIDGE_REC_CHANNEL_1))
-                               bridgerec = 1;
-                       else 
-                               bridgerec = 0;
+                       bridgerec = 0;
                } else {
                        bridgerec = ast_channel_is_bridged(p->owner) ? 1 : 0;
                }

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 488004fe22e5e57133cb77896b124bed35bede51..0175d678c4e8cb387cf30d87f770e9931ea6c26f 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1976,12 +1976,6 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in
 #define AST_BRIDGE_DTMF_CHANNEL_0              (1 << 0)
 /*! \brief Report DTMF on channel 1 */
 #define AST_BRIDGE_DTMF_CHANNEL_1              (1 << 1)
-/*! \brief Return all voice frames on channel 0 */
-#define AST_BRIDGE_REC_CHANNEL_0               (1 << 2)
-/*! \brief Return all voice frames on channel 1 */
-#define AST_BRIDGE_REC_CHANNEL_1               (1 << 3)
-/*! \brief Ignore all signal frames except NULL */
-#define AST_BRIDGE_IGNORE_SIGS                 (1 << 4)
 
 
 /*!

diff --git a/main/features.c b/main/features.c
index 3df0555af4c77cf336ba44fe2592ddeb40294e73..85dd413023479b107e8dba50e9e91ce5c86e473e 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -397,9 +397,6 @@ static int builtin_feature_get_exten(struct ast_channel *chan, const char *featu
 
 static void set_config_flags(struct ast_channel *chan, struct ast_bridge_config *config)
 {
-/* BUGBUG there is code that checks AST_BRIDGE_IGNORE_SIGS but no code to set it. */
-/* BUGBUG there is code that checks AST_BRIDGE_REC_CHANNEL_0 but no code to set it. */
-/* BUGBUG there is code that checks AST_BRIDGE_REC_CHANNEL_1 but no code to set it. */
        ast_clear_flag(config, AST_FLAGS_ALL);
 
        if (ast_test_flag(&config->features_caller, AST_FEATURE_DTMF_MASK)) {