Merged revisions 293341 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Sat, 30 Oct 2010 00:50:32 +0000 (00:50 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Sat, 30 Oct 2010 00:50:32 +0000 (00:50 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@293342 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c
channels/sig_analog.c

index 57ddae1..ad18374 100644 (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 */
index 005f193..d63f5aa 100644 (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;