[libpri-commits] rmudgett: branch group/ccss r1425 - /team/group/ccss/pri_facility.c

[SVN commits to the libpri project]

Author: rmudgett
Date: Mon Jan 18 22:00:52 2010
New Revision: 1425

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1425
Log:
Look for the original invocation message on the broadcast dummy call reference call first.

Modified:
    team/group/ccss/pri_facility.c

Modified: team/group/ccss/pri_facility.c
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/pri_facility.c?view=diff&rev=1425&r1=1424&r2=1425
==============================================================================
--- team/group/ccss/pri_facility.c (original)
+++ team/group/ccss/pri_facility.c Mon Jan 18 22:00:52 2010
@@ -3309,26 +3309,25 @@
 		 */
 		return;
 	}
-	apdu = pri_call_apdu_find(call, reject->invoke_id);
-	if (!apdu) {
-		if (!q931_is_dummy_call(call) || !BRI_NT_PTMP(ctrl)) {
-			return;
-		}
+	orig_call = NULL;/* To make some compilers happy. */
+	apdu = NULL;
+	if (q931_is_dummy_call(call)) {
 		/*
-		 * The message might have been sent on the broadcast dummy call reference call
+		 * The message was likely sent on the broadcast dummy call reference call
 		 * and the reject came in on a specific dummy call reference call.
 		 * Look for the original invocation message on the
-		 * broadcast dummy call reference call.
+		 * broadcast dummy call reference call first.
 		 */
 		orig_call = PRI_MASTER(ctrl)->dummy_call;
-		if (!orig_call) {
-			return;
-		}
-		apdu = pri_call_apdu_find(orig_call, reject->invoke_id);
+		if (orig_call) {
+			apdu = pri_call_apdu_find(orig_call, reject->invoke_id);
+		}
+	}
+	if (!apdu) {
+		apdu = pri_call_apdu_find(call, reject->invoke_id);
 		if (!apdu) {
 			return;
 		}
-	} else {
 		orig_call = call;
 	}
 	msg.response.reject = reject;
@@ -3394,26 +3393,25 @@
 		break;
 	}
 
-	apdu = pri_call_apdu_find(call, error->invoke_id);
-	if (!apdu) {
-		if (!q931_is_dummy_call(call) || !BRI_NT_PTMP(ctrl)) {
-			return;
-		}
+	orig_call = NULL;/* To make some compilers happy. */
+	apdu = NULL;
+	if (q931_is_dummy_call(call)) {
 		/*
-		 * The message might have been sent on the broadcast dummy call reference call
+		 * The message was likely sent on the broadcast dummy call reference call
 		 * and the error came in on a specific dummy call reference call.
 		 * Look for the original invocation message on the
-		 * broadcast dummy call reference call.
+		 * broadcast dummy call reference call first.
 		 */
 		orig_call = PRI_MASTER(ctrl)->dummy_call;
-		if (!orig_call) {
-			return;
-		}
-		apdu = pri_call_apdu_find(orig_call, error->invoke_id);
+		if (orig_call) {
+			apdu = pri_call_apdu_find(orig_call, error->invoke_id);
+		}
+	}
+	if (!apdu) {
+		apdu = pri_call_apdu_find(call, error->invoke_id);
 		if (!apdu) {
 			return;
 		}
-	} else {
 		orig_call = call;
 	}
 	msg.response.error = error;
@@ -3471,26 +3469,25 @@
 		break;
 	}
 
-	apdu = pri_call_apdu_find(call, result->invoke_id);
-	if (!apdu) {
-		if (!q931_is_dummy_call(call) || !BRI_NT_PTMP(ctrl)) {
-			return;
-		}
+	orig_call = NULL;/* To make some compilers happy. */
+	apdu = NULL;
+	if (q931_is_dummy_call(call)) {
 		/*
-		 * The message might have been sent on the broadcast dummy call reference call
+		 * The message was likely sent on the broadcast dummy call reference call
 		 * and the result came in on a specific dummy call reference call.
 		 * Look for the original invocation message on the
-		 * broadcast dummy call reference call.
+		 * broadcast dummy call reference call first.
 		 */
 		orig_call = PRI_MASTER(ctrl)->dummy_call;
-		if (!orig_call) {
-			return;
-		}
-		apdu = pri_call_apdu_find(orig_call, result->invoke_id);
+		if (orig_call) {
+			apdu = pri_call_apdu_find(orig_call, result->invoke_id);
+		}
+	}
+	if (!apdu) {
+		apdu = pri_call_apdu_find(call, result->invoke_id);
 		if (!apdu) {
 			return;
 		}
-	} else {
 		orig_call = call;
 	}
 	msg.response.result = result;