diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-08-15 15:12:16 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-15 15:12:16 +0000 |
| commit | 6d24165deef959b5eed2733497da524958ce82b5 (patch) | |
| tree | a08c620c5bfd897c345abe1c0cacf6733b094178 /channels | |
| parent | 5f40a6625dcd128092d18533b6d4586d11aadccb (diff) | |
Remove some dead code dealing with: AST_BRIDGE_REC_CHANNEL_0, AST_BRIDGE_REC_CHANNEL_1, and AST_BRIDGE_IGNORE_SIGS.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 3 | ||||
| -rw-r--r-- | channels/chan_vpb.cc | 17 |
2 files changed, 3 insertions, 17 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1c53da7c6..786b4617b 100644 --- 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 408776c1c..f031ad55d 100644 --- 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; } |