[svn-commits] mattf: branch 1.4 r390 - in /branches/1.4: ./ q931.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Mon Jan 22 16:29:24 2007
New Revision: 390

URL: http://svn.digium.com/view/libpri?view=rev&rev=390
Log:
Merged revisions 389 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r389 | mattf | 2007-01-22 16:20:59 -0600 (Mon, 22 Jan 2007) | 2 lines

Make sure we send DISCONNECT if we reached the active state and a call is disconnected, regardless of cause code.

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/q931.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Mon Jan 22 16:29:24 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-332,385
+/branches/1.2:1-332,385,389

Modified: branches/1.4/q931.c
URL: http://svn.digium.com/view/libpri/branches/1.4/q931.c?view=diff&rev=390&r1=389&r2=390
==============================================================================
--- branches/1.4/q931.c (original)
+++ branches/1.4/q931.c Mon Jan 22 16:29:24 2007
@@ -2963,8 +2963,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 */
@@ -2977,6 +2975,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 */