diff options
| -rw-r--r-- | channels/chan_dahdi.c | 11 | ||||
| -rw-r--r-- | channels/sig_analog.c | 14 |
2 files changed, 1 insertions, 24 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index ad183744b..64bfd3295 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8193,17 +8193,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) dahdi_enable_ec(p); ast_hangup(chan); } else { - struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[SUB_REAL].owner); - } else - way3bridge = 1; - - if (p->subs[SUB_THREEWAY].owner->cdr) - cdr3way = 1; - ast_verb(3, "Started three way call on channel %d\n", p->channel); /* Start music on hold if appropriate */ diff --git a/channels/sig_analog.c b/channels/sig_analog.c index d63f5aa84..1d68889be 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -3113,20 +3113,8 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ analog_set_echocanceller(p, 1); ast_hangup(chan); } else { - struct ast_channel *other = ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[ANALOG_SUB_REAL].owner); - } else { - way3bridge = 1; - } - - if (p->subs[ANALOG_SUB_THREEWAY].owner->cdr) { - cdr3way = 1; - } - ast_verb(3, "Started three way call on channel %d\n", p->channel); + /* Start music on hold if appropriate */ if (ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner)) { ast_queue_control_data(p->subs[ANALOG_SUB_THREEWAY].owner, AST_CONTROL_HOLD, |