[asterisk-commits] mjordan: branch mjordan/AST_17288 r334573 - in /team/mjordan/AST_17288/1.8: a...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Sep 6 18:59:51 CDT 2011
Author: mjordan
Date: Tue Sep 6 18:59:47 2011
New Revision: 334573
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334573
Log:
Review 2
Modified:
team/mjordan/AST_17288/1.8/addons/chan_ooh323.c
team/mjordan/AST_17288/1.8/channels/chan_dahdi.c
team/mjordan/AST_17288/1.8/channels/chan_h323.c
team/mjordan/AST_17288/1.8/channels/chan_mgcp.c
team/mjordan/AST_17288/1.8/channels/chan_misdn.c
team/mjordan/AST_17288/1.8/channels/chan_skinny.c
team/mjordan/AST_17288/1.8/channels/chan_unistim.c
team/mjordan/AST_17288/1.8/channels/sig_pri.c
team/mjordan/AST_17288/1.8/main/features.c
Modified: team/mjordan/AST_17288/1.8/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/addons/chan_ooh323.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/addons/chan_ooh323.c (original)
+++ team/mjordan/AST_17288/1.8/addons/chan_ooh323.c Tue Sep 6 18:59:47 2011
@@ -1226,6 +1226,10 @@
ast_mutex_lock(&p->lock);
switch (condition) {
+ case AST_CONTROL_INCOMPLETE:
+ /* While h323 does support overlapped dialing, this channel driver does not
+ * at this time. Treat a response of Incomplete as if it were congestion.
+ */
case AST_CONTROL_CONGESTION:
if (!ast_test_flag(p, H323_ALREADYGONE)) {
ooHangCall(callToken, OO_REASON_LOCAL_CONGESTED, AST_CAUSE_SWITCH_CONGESTION);
@@ -1235,15 +1239,6 @@
case AST_CONTROL_BUSY:
if (!ast_test_flag(p, H323_ALREADYGONE)) {
ooHangCall(callToken, OO_REASON_LOCAL_BUSY, AST_CAUSE_USER_BUSY);
- ast_set_flag(p, H323_ALREADYGONE);
- }
- break;
- case AST_CONTROL_INCOMPLETE:
- /* While h323 does support overlapped dialing, this channel driver does not
- * at this time. Treat a response of Incomplete as if it were congestion.
- */
- if (!ast_test_flag(p, H323_ALREADYGONE)) {
- ooHangCall(callToken, OO_REASON_LOCAL_CONGESTED, AST_CAUSE_SWITCH_CONGESTION);
ast_set_flag(p, H323_ALREADYGONE);
}
break;
Modified: team/mjordan/AST_17288/1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_dahdi.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_dahdi.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_dahdi.c Tue Sep 6 18:59:47 2011
@@ -9316,17 +9316,17 @@
}
break;
case AST_CONTROL_INCOMPLETE:
- ast_debug(1, "Received AST_CONTROL_INCOMPLETE on %s\n",chan->name);
+ ast_debug(1, "Received AST_CONTROL_INCOMPLETE on %s\n", chan->name);
/* act as a progress or proceeding, allowing the caller to enter additional numbers */
res = 0;
break;
case AST_CONTROL_PROCEEDING:
- ast_debug(1, "Received AST_CONTROL_PROCEEDING on %s\n",chan->name);
+ ast_debug(1, "Received AST_CONTROL_PROCEEDING on %s\n", chan->name);
/* don't continue in ast_indicate */
res = 0;
break;
case AST_CONTROL_PROGRESS:
- ast_debug(1, "Received AST_CONTROL_PROGRESS on %s\n",chan->name);
+ ast_debug(1, "Received AST_CONTROL_PROGRESS on %s\n", chan->name);
/* don't continue in ast_indicate */
res = 0;
break;
Modified: team/mjordan/AST_17288/1.8/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_h323.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_h323.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_h323.c Tue Sep 6 18:59:47 2011
@@ -893,17 +893,6 @@
res = 0;
}
break;
- case AST_CONTROL_INCOMPLETE:
- /* While h323 does support overlapped calling, that feature is not implemented in
- * Asterisk for h323 at this time. If we receive an Incomplete result from whatever
- * we are dialing, inform the h323 gateway that we have been hung up on.
- */
- if (c->_state != AST_STATE_UP) {
- h323_answering_call(token, 1);
- ast_softhangup_nolock(c, AST_SOFTHANGUP_DEV);
- res = 0;
- }
- break;
case AST_CONTROL_BUSY:
if (c->_state != AST_STATE_UP) {
h323_answering_call(token, 1);
@@ -911,6 +900,10 @@
res = 0;
}
break;
+ case AST_CONTROL_INCOMPLETE:
+ /* While h323 does support overlapped dialing, this channel driver does not
+ * at this time. Treat a response of Incomplete as if it were congestion.
+ */
case AST_CONTROL_CONGESTION:
if (c->_state != AST_STATE_UP) {
h323_answering_call(token, 1);
Modified: team/mjordan/AST_17288/1.8/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_mgcp.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_mgcp.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_mgcp.c Tue Sep 6 18:59:47 2011
@@ -1457,10 +1457,10 @@
case AST_CONTROL_BUSY:
transmit_notify_request(sub, "L/bz");
break;
- /* We do not currently support resetting of the Interdigit Timer, so treat
- * Incomplete control frames as a congestion response
- */
case AST_CONTROL_INCOMPLETE:
+ /* We do not currently support resetting of the Interdigit Timer, so treat
+ * Incomplete control frames as a congestion response
+ */
case AST_CONTROL_CONGESTION:
transmit_notify_request(sub, sub->parent->ncs ? "L/cg" : "G/cg");
break;
Modified: team/mjordan/AST_17288/1.8/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_misdn.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_misdn.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_misdn.c Tue Sep 6 18:59:47 2011
@@ -6986,7 +6986,7 @@
case AST_CONTROL_INCOMPLETE:
chan_misdn_log(1, p->bc->port, " --> *\tincomplete pid:%d\n", p->bc->pid);
if (!p->overlap_dial) {
- /* Overlapped dialing not supported - send hangup */
+ /* Overlapped dialing not enabled - send hangup */
p->bc->out_cause = AST_CAUSE_INVALID_NUMBER_FORMAT;
start_bc_tones(p);
misdn_lib_send_event(p->bc, EVENT_DISCONNECT);
Modified: team/mjordan/AST_17288/1.8/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_skinny.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_skinny.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_skinny.c Tue Sep 6 18:59:47 2011
@@ -4425,6 +4425,8 @@
}
}
return -1; /* Tell asterisk to provide inband signalling */
+ case AST_CONTROL_INCOMPLETE:
+ /* Support for incomplete not supported for chan_skinny; treat as congestion */
case AST_CONTROL_CONGESTION:
if (ast->_state != AST_STATE_UP) {
if (!d->earlyrtp) {
@@ -4438,20 +4440,6 @@
}
}
return -1; /* Tell asterisk to provide inband signalling */
- case AST_CONTROL_INCOMPLETE:
- /* Support for incomplete not supported for chan_skinny; treat as congestion */
- if (ast->_state != AST_STATE_UP) {
- if (!d->earlyrtp) {
- transmit_start_tone(d, SKINNY_REORDER, l->instance, sub->callid);
- }
- transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_CONGESTION);
- sub->alreadygone = 1;
- ast_softhangup_nolock(ast, AST_SOFTHANGUP_DEV);
- if (!d->earlyrtp) {
- break;
- }
- }
- return -1;
case AST_CONTROL_PROGRESS:
if ((ast->_state != AST_STATE_UP) && !sub->progress && !sub->outgoing) {
if (!d->earlyrtp) {
Modified: team/mjordan/AST_17288/1.8/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_unistim.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_unistim.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_unistim.c Tue Sep 6 18:59:47 2011
@@ -4186,14 +4186,6 @@
/* Overlapped dialing is not currently supported for UNIStim. Treat an indication
* of incomplete as congestion
*/
- if (ast->_state != AST_STATE_UP) {
- sub->alreadygone = 1;
- send_text(TEXT_LINE2, TEXT_NORMAL, s, "Congestion");
- in_band_indication(ast, l->parent->tz, "congestion");
- s->device->missed_call = -1;
- break;
- }
- return -1;
case AST_CONTROL_CONGESTION:
if (ast->_state != AST_STATE_UP) {
sub->alreadygone = 1;
Modified: team/mjordan/AST_17288/1.8/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/sig_pri.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/sig_pri.c (original)
+++ team/mjordan/AST_17288/1.8/channels/sig_pri.c Tue Sep 6 18:59:47 2011
@@ -6923,11 +6923,8 @@
res = 0;
break;
case AST_CONTROL_INCOMPLETE:
- /*
- * If we do not support overlap dialing and are past the point where we could receive
- * additional digits, treat as a hangup
- */
- if (!((p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) && (p->call_level != SIG_PRI_CALL_LEVEL_OVERLAP))) {
+ /* If we do not support overlap dialing treat as a hangup */
+ if (!(p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) {
if (p->priindication_oob || p->no_b_channel) {
chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
chan->_softhangup |= AST_SOFTHANGUP_DEV;
@@ -6948,7 +6945,6 @@
pri_rel(p->pri);
}
}
- break;
}
break;
case AST_CONTROL_CONGESTION:
Modified: team/mjordan/AST_17288/1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/main/features.c?view=diff&rev=334573&r1=334572&r2=334573
==============================================================================
--- team/mjordan/AST_17288/1.8/main/features.c (original)
+++ team/mjordan/AST_17288/1.8/main/features.c Tue Sep 6 18:59:47 2011
@@ -3407,7 +3407,6 @@
break;
} else if (f->subclass.integer == AST_CONTROL_INCOMPLETE) {
ast_verb(3, "%s dialed incomplete extension %s; ignoring\n", chan->name, chan->exten);
- break;
} else if (f->subclass.integer == AST_CONTROL_CONGESTION) {
state = f->subclass.integer;
ast_verb(3, "%s is congested\n", chan->name);
More information about the asterisk-commits
mailing list