dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 293341 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r293341 | rmudgett | 2010-10-29 19:46:41 -0500 (Fri, 29 Oct 2010) | 16 lines
  
  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/trunk@293342 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2010-10-30 00:50:32 +00:00
parent 7e84e96403
commit 3c6c903736
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_dahdi.c
View File

@ -8236,16 +8236,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 */

13
channels/sig_analog.c
View File

@ -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;