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

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Sep  8 13:51:46 2011
New Revision: 334951

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334951
Log:
Fixed changes discussed with rmudgett

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

Modified: team/mjordan/AST_17288/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/chan_sip.c?view=diff&rev=334951&r1=334950&r2=334951
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/chan_sip.c (original)
+++ team/mjordan/AST_17288/1.8/channels/chan_sip.c Thu Sep  8 13:51:46 2011
@@ -6689,7 +6689,7 @@
 			ast_softhangup_nolock(ast, AST_SOFTHANGUP_DEV);
 			break;
 		}
-		res = -1;
+		res = 0;
 		break;
 	case AST_CONTROL_PROCEEDING:
 		if ((ast->_state != AST_STATE_UP) &&

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=334951&r1=334950&r2=334951
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/sig_pri.c (original)
+++ team/mjordan/AST_17288/1.8/channels/sig_pri.c Thu Sep  8 13:51:46 2011
@@ -6923,13 +6923,14 @@
 		res = 0;
 		break;
 	case AST_CONTROL_INCOMPLETE:
-		/* If we support overlap dialing, wait for additional digits */
-		if (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING) {
+		/* If we are connected or if we support overlap dialing, wait for additional digits */
+		if (p->call_level == SIG_PRI_CALL_LEVEL_CONNECT && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) {
 			res = 0;
 			break;
 		}
-		/* Otherwise, treat as congestion (falls through) */
+		/* Otherwise, treat as congestion */
 		chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
+		/* Falls through */
 	case AST_CONTROL_CONGESTION:
 		if (p->priindication_oob || p->no_b_channel) {
 			/* There are many cause codes that generate an AST_CONTROL_CONGESTION. */

Modified: team/mjordan/AST_17288/1.8/channels/sig_ss7.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/AST_17288/1.8/channels/sig_ss7.c?view=diff&rev=334951&r1=334950&r2=334951
==============================================================================
--- team/mjordan/AST_17288/1.8/channels/sig_ss7.c (original)
+++ team/mjordan/AST_17288/1.8/channels/sig_ss7.c Thu Sep  8 13:51:46 2011
@@ -1560,6 +1560,11 @@
 		res = 0;
 		break;
 	case AST_CONTROL_INCOMPLETE:
+		/* If the channel is connected, wait for additional input */
+		if (p->call_level == SIG_SS7_CALL_LEVEL_CONNECT) {
+			res = 0;
+			break;
+		}
 		chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
 		break;
 	case AST_CONTROL_CONGESTION: