From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 5 Mar 2012 22:22:21 +0000 (+0000)
Subject: Drop SS7 call if not connected yet when INCOMPLETE/BUSY/CONGESTION.
X-Git-Tag: 1.8.10.1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c9168a4c7c7a8aa37e199992bc0434c3a394cda;p=thirdparty%2Fasterisk.git

Drop SS7 call if not connected yet when INCOMPLETE/BUSY/CONGESTION.

SS7 is a trunk protocol and should clear a failed call as soon as
possible.

* Made SS7 hangup a call immediately if it has not connected yet for
INCOMPLETE/BUSY/CONGESTION causes.  Otherwise, play an appropriate inband
tone.

(closes issue ASTERISK-19372)
Reported by: Igor Nikolaev


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@358278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c
index 5763eeb076..0f9febcd8c 100644
--- a/channels/sig_ss7.c
+++ b/channels/sig_ss7.c
@@ -1661,6 +1661,12 @@ int sig_ss7_indicate(struct sig_ss7_chan *p, struct ast_channel *chan, int condi
 
 	switch (condition) {
 	case AST_CONTROL_BUSY:
+		if (p->call_level < SIG_SS7_CALL_LEVEL_CONNECT) {
+			chan->hangupcause = AST_CAUSE_USER_BUSY;
+			chan->_softhangup |= AST_SOFTHANGUP_DEV;
+			res = 0;
+			break;
+		}
 		res = sig_ss7_play_tone(p, SIG_SS7_TONE_BUSY);
 		break;
 	case AST_CONTROL_RINGING:
@@ -1719,15 +1725,23 @@ int sig_ss7_indicate(struct sig_ss7_chan *p, struct ast_channel *chan, int condi
 		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) {
+		if (p->call_level < SIG_SS7_CALL_LEVEL_CONNECT) {
+			chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
+			chan->_softhangup |= AST_SOFTHANGUP_DEV;
 			res = 0;
 			break;
 		}
-		chan->hangupcause = AST_CAUSE_INVALID_NUMBER_FORMAT;
+		/* Wait for DTMF digits to complete the dialed number. */
+		res = 0;
 		break;
 	case AST_CONTROL_CONGESTION:
-		chan->hangupcause = AST_CAUSE_CONGESTION;
+		if (p->call_level < SIG_SS7_CALL_LEVEL_CONNECT) {
+			chan->hangupcause = AST_CAUSE_CONGESTION;
+			chan->_softhangup |= AST_SOFTHANGUP_DEV;
+			res = 0;
+			break;
+		}
+		res = sig_ss7_play_tone(p, SIG_SS7_TONE_CONGESTION);
 		break;
 	case AST_CONTROL_HOLD:
 		ast_moh_start(chan, data, p->mohinterpret);