Author: rmudgett
Date: Thu Aug 15 10:12:16 2013
New Revision: 396734
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396734
Log:
Remove some dead code dealing with: AST_BRIDGE_REC_CHANNEL_0,
AST_BRIDGE_REC_CHANNEL_1, and AST_BRIDGE_IGNORE_SIGS.
Modified:
trunk/channels/chan_iax2.c
trunk/channels/chan_vpb.cc
trunk/include/asterisk/channel.h
trunk/main/features.c
Modified: trunk/channels/chan_iax2.c
URL:
http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=396734&r1=396733&r2=396734
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Thu Aug 15 10:12:16 2013
@@ -5513,8 +5513,7 @@
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;
Modified: trunk/channels/chan_vpb.cc
URL:
http://svnview.digium.com/svn/asterisk/trunk/channels/chan_vpb.cc?view=diff&rev=396734&r1=396733&r2=396734
==============================================================================
--- trunk/channels/chan_vpb.cc (original)
+++ trunk/channels/chan_vpb.cc Thu Aug 15 10:12:16 2013
@@ -1033,15 +1033,7 @@
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 @@
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;
}
Modified: trunk/include/asterisk/channel.h
URL:
http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=396734&r1=396733&r2=396734
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Aug 15 10:12:16 2013
@@ -1976,12 +1976,6 @@
#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)
/*!
Modified: trunk/main/features.c
URL:
http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=396734&r1=396733&r2=396734
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Aug 15 10:12:16 2013
@@ -397,9 +397,6 @@
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)) {
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
