[svn-commits] mattf: branch 1.2 r389 - /branches/1.2/q931.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Mon Jan 22 16:20:59 2007
New Revision: 389

URL: http://svn.digium.com/view/libpri?view=rev&rev=389
Log:
Make sure we send DISCONNECT if we reached the active state and a call is disconnected, regardless of cause code.

Modified:
    branches/1.2/q931.c

Modified: branches/1.2/q931.c
URL: http://svn.digium.com/view/libpri/branches/1.2/q931.c?view=diff&rev=389&r1=388&r2=389
==============================================================================
--- branches/1.2/q931.c (original)
+++ branches/1.2/q931.c Mon Jan 22 16:20:59 2007
@@ -2912,8 +2912,6 @@
 		/* sent CONNECT */
 	case Q931_CALL_STATE_INCOMING_CALL_PROCEEDING:
 		/* we sent CALL_PROCEEDING */
-	case Q931_CALL_STATE_ACTIVE:
-		/* received CONNECT */
 	case Q931_CALL_STATE_OVERLAP_RECEIVING:
 		/* received SETUP_ACKNOWLEDGE */
 		/* send DISCONNECT in general */
@@ -2926,6 +2924,10 @@
 				q931_release(pri,c,cause);
 		} else 
 			pri_error(pri, "Wierd, doing nothing but this shouldn't happen, ourstate %s, peerstate %s\n",callstate2str(c->ourcallstate),callstate2str(c->peercallstate));
+		break;
+	case Q931_CALL_STATE_ACTIVE:
+		/* received CONNECT */
+		q931_disconnect(pri,c,cause);
 		break;
 	case Q931_CALL_STATE_DISCONNECT_REQUEST:
 		/* sent DISCONNECT */