[svn-commits] mattf: trunk r393 - in /trunk: ./ q931.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Tue Jan 23 16:02:44 2007
New Revision: 393

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

................
r390 | mattf | 2007-01-22 16:29:24 -0600 (Mon, 22 Jan 2007) | 10 lines

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:
    trunk/   (props changed)
    trunk/q931.c

Propchange: trunk/
------------------------------------------------------------------------------
    branch-1.2-merged = /branches/1.2:1-332,385,389

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jan 23 16:02:44 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386
+/branches/1.4:1-372,386,390

Modified: trunk/q931.c
URL: http://svn.digium.com/view/libpri/trunk/q931.c?view=diff&rev=393&r1=392&r2=393
==============================================================================
--- trunk/q931.c (original)
+++ trunk/q931.c Tue Jan 23 16:02:44 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 */