[svn-commits] mattf: branch mattf/libpri-1.4-ntptmp r1071 - /team/mattf/libpri-1.4-ntptmp/

[SVN commits to the Digium repositories]

Author: mattf
Date: Tue Sep  8 10:18:33 2009
New Revision: 1071

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1071
Log:
Add in a couple of additional cleanups that I hadn't committed, like the fake clearing flag indiction

Modified:
    team/mattf/libpri-1.4-ntptmp/pri_internal.h
    team/mattf/libpri-1.4-ntptmp/q931.c

Modified: team/mattf/libpri-1.4-ntptmp/pri_internal.h
URL: http://svn.asterisk.org/svn-view/libpri/team/mattf/libpri-1.4-ntptmp/pri_internal.h?view=diff&rev=1071&r1=1070&r2=1071
==============================================================================
--- team/mattf/libpri-1.4-ntptmp/pri_internal.h (original)
+++ team/mattf/libpri-1.4-ntptmp/pri_internal.h Tue Sep  8 10:18:33 2009
@@ -282,6 +282,7 @@
 
 	int hangupinitiated;
 	int outboundbroadcast;
+	int performing_fake_clearing;
 	/* These valid in slave call only */
 	struct q931_call *master_call;
 

Modified: team/mattf/libpri-1.4-ntptmp/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/mattf/libpri-1.4-ntptmp/q931.c?view=diff&rev=1071&r1=1070&r2=1071
==============================================================================
--- team/mattf/libpri-1.4-ntptmp/q931.c (original)
+++ team/mattf/libpri-1.4-ntptmp/q931.c Tue Sep  8 10:18:33 2009
@@ -3454,6 +3454,7 @@
 	struct q931_call *c = data;
 	struct pri *ctrl = c->pri;
 
+	c->performing_fake_clearing = 1;
 	if (pri_internal_clear(c) == Q931_RES_HAVEEVENT)
 		ctrl->schedev = 1;
 }
@@ -3611,7 +3612,7 @@
 
 			call->hangupinitiated = 1;
 
-			if (!slaves && (call->master_call->pri_winner < 0)) {
+			if ((!slaves && (call->master_call->pri_winner < 0)) || (call->performing_fake_clearing)) {
 				__q931_hangup(ctrl, call, cause);
 			}
 			pri_error(ctrl, "%s: Slaves %d\n", __FUNCTION__, slaves);
@@ -4042,8 +4043,6 @@
 			nt_ptmp_handle_q931_message(ctrl, mh, c, &allow_event, &allow_posthandle);
 		}
 
-		//allow_event = allow_posthandle = 1;
-	
 		if (allow_posthandle) {
 			res = post_handle_q931_message(ctrl, mh, c, missingmand);