diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-30 00:46:41 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-30 00:46:41 +0000 |
| commit | 89a85247ab7394864a407421532f6644b1194a51 (patch) | |
| tree | 2be42f089b7e26f0b810e426ef2a2281d968abe0 | |
| parent | 76ff509978e61b2ff2a963e517d3c7b52d85ae76 (diff) | |
Merged revisions 293340 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r293340 | rmudgett | 2010-10-29 19:40:10 -0500 (Fri, 29 Oct 2010) | 9 lines
Merged revisions 293339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r293339 | rmudgett | 2010-10-29 19:34:12 -0500 (Fri, 29 Oct 2010) | 1 line
Remove some code that serves no purpose.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@293341 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 10 | ||||
| -rw-r--r-- | channels/sig_analog.c | 13 |
2 files changed, 0 insertions, 23 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index de3c0c237..d09424eaa 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8211,16 +8211,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) if (((ast->pbx) || (ast->_state == AST_STATE_UP)) && (p->transfertobusy || (ast->_state != AST_STATE_BUSY))) { int otherindex = SUB_THREEWAY; - 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, "Building conference on call on %s and %s\n", p->subs[SUB_THREEWAY].owner->name, p->subs[SUB_REAL].owner->name); /* Put them in the threeway, and flip */ diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 005f193f3..d63f5aa84 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -3172,19 +3172,6 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ /* Lets see what we're up to */ if (((ast->pbx) || (ast->_state == AST_STATE_UP)) && (p->transfertobusy || (ast->_state != AST_STATE_BUSY))) { - 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, "Building conference on call on %s and %s\n", p->subs[ANALOG_SUB_THREEWAY].owner->name, p->subs[ANALOG_SUB_REAL].owner->name); /* Put them in the threeway, and flip */ p->subs[ANALOG_SUB_THREEWAY].inthreeway = 1; |