diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-10-30 01:55:15 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-10-30 01:55:15 +0000 |
| commit | 8e45c743d1e1192bd32d2fa5b780be02e359f136 (patch) | |
| tree | 1d32c6c5add6f1fabb3f9bf55cd7b4cc02d8d363 /channels/chan_dahdi.c | |
| parent | 611b8d72c9e4df75a236082dc358fe03b6c9d518 (diff) | |
Merged revisions 293418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r293418 | rmudgett | 2010-10-29 20:53:29 -0500 (Fri, 29 Oct 2010) | 16 lines
Merged revisions 293417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r293417 | rmudgett | 2010-10-29 20:49:15 -0500 (Fri, 29 Oct 2010) | 9 lines
Merged revisions 293416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r293416 | rmudgett | 2010-10-29 20:45:49 -0500 (Fri, 29 Oct 2010) | 1 line
Remove some more code that serves no purpose.
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 11 |
1 files changed, 0 insertions, 11 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 */ |