[asterisk-commits] mjordan: branch mjordan/AST_17288 r334805 - /team/mjordan/AST_17288/1.8/chann...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Sep  7 11:19:45 2011
New Revision: 334805

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334805
Log:
Modified handling to simply fall through to congestion if overlapped dialing isn't enabled

Modified:
    team/mjordan/AST_17288/1.8/channels/sig_pri.c

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=334805&r1=334804&r2=334805
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/sig_pri.c (original)
+++ team/mjordan/AST_17288/1.8/channels/sig_pri.c Wed Sep  7 11:19:45 2011
@@ -6923,30 +6923,13 @@
 		res = 0;
 		break;
 	case AST_CONTROL_INCOMPLETE:
-		/* 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;
-				res = 0;
-				break;
-			}
-			res = sig_pri_play_tone(p, SIG_PRI_TONE_CONGESTION);
-			if (p->call_level < SIG_PRI_CALL_LEVEL_ALERTING && !p->outgoing) {
-				chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
-				p->progress = 1; /* No need to send plain PROGRESS after this. */
-				if (p->pri && p->pri->pri) {
-					pri_grab(p, p->pri);
-#ifdef HAVE_PRI_PROG_W_CAUSE
-					pri_progress_with_cause(p->pri->pri, p->call, PVT_TO_CHANNEL(p), 1, chan->hangupcause);
-#else
-					pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1);
-#endif
-					pri_rel(p->pri);
-				}
-			}
-		}
-		break;
+		/* If we support overlap dialing, wait for additional digits */
+		if (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) {
+			res = 0;
+			break;
+		}
+		/* Otherwise, treat as congestion (falls through) */
+		chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
 	case AST_CONTROL_CONGESTION:
 		if (p->priindication_oob || p->no_b_channel) {
 			/* There are many cause codes that generate an AST_CONTROL_CONGESTION. */