Update of /usr/cvsroot/asterisk/channels In directory mongoose.digium.com:/tmp/cvs-serv32174/channels
Modified Files:
chan_zap.c
Log Message:
make zap-transfers to busy/congestion channels behave more reasonably (bug
#4495)
Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -d -r1.460 -r1.461
--- chan_zap.c 7 Jun 2005 21:13:35 -0000 1.460
+++ chan_zap.c 9 Jun 2005 22:23:21 -0000 1.461
@@ -3486,13 +3486,24 @@
/* In any case
this isn't a threeway call anymore */
p->subs[SUB_REAL].inthreeway = 0;
p->subs[SUB_THREEWAY].inthreeway = 0;
- if ((res =
attempt_transfer(p)) < 0)
-
p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV;
- else if (res) {
- /*
Don't actually hang up at this point */
- if
(p->subs[SUB_THREEWAY].owner)
-
ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock);
- break;
+
if((p->owner->_state == AST_STATE_RINGING) ||
+
(p->owner->_state == AST_STATE_UP)){
+ /* Only
attempt transfer if the phone is ringing; why transfer to busy tone eh? */
+ if
((res = attempt_transfer(p)) < 0)
+
p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV;
+ else if
(res) {
+
/* Don't actually hang up at this point */
+
if (p->subs[SUB_THREEWAY].owner)
+
ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock);
+
break;
+ }
+ } else {
+
ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock);
+ /* Swap
subs and dis-own channel */
+
swap_subs(p, SUB_THREEWAY, SUB_REAL);
+
p->owner = NULL;
+ /* Ring
the phone */
+
zt_ring_phone(p);
}
} else
p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV;
@@ -3803,8 +3814,11 @@
p->subs[SUB_THREEWAY].inthreeway = 0;
} else {
/* Lets see what we're
up to */
- if ((ast->pbx) ||
-
(ast->_state == AST_STATE_UP)) {
+ if (((ast->pbx) ||
(ast->_state == AST_STATE_UP)) &&
+ /* Only
conference if it's ringing or answered */
+
((p->owner->_state == AST_STATE_RINGING) ||
+
(p->owner->_state == AST_STATE_UP))){
+
int otherindex
= SUB_THREEWAY;
if
(option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Building conference on call on %s and %s\n",
p->subs[SUB_THREEWAY].owner->name, p->subs[SUB_REAL].owner->name);
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
