[libss7-commits] mattf: trunk r93 - in /trunk: isup.c ss7linktest.c

[SVN commits to the libss7 project]

Author: mattf
Date: Thu Jun 28 15:31:32 2007
New Revision: 93

URL: http://svn.digium.com/view/libss7?view=rev&rev=93
Log:
Make sure when we match we match on dpc as well as cic

Modified:
    trunk/isup.c
    trunk/ss7linktest.c

Modified: trunk/isup.c
URL: http://svn.digium.com/view/libss7/trunk/isup.c?view=diff&rev=93&r1=92&r2=93
==============================================================================
--- trunk/isup.c (original)
+++ trunk/isup.c Thu Jun 28 15:31:32 2007
@@ -769,7 +769,7 @@
 
 	cur = ss7->calls;
 	while (cur) {
-		if (cur->cic == cic) {
+		if ((cur->cic == cic) && (cur->dpc == opc)) {
 			winner = cur;
 			break;
 		}

Modified: trunk/ss7linktest.c
URL: http://svn.digium.com/view/libss7/trunk/ss7linktest.c?view=diff&rev=93&r1=92&r2=93
==============================================================================
--- trunk/ss7linktest.c (original)
+++ trunk/ss7linktest.c Thu Jun 28 15:31:32 2007
@@ -144,7 +144,7 @@
 						break;
 					case ISUP_EVENT_GRA:
 						printf("Got GRA from cic %d to %d.\n", e->gra.startcic, e->gra.endcic);
-						//ss7_call(ss7);
+						ss7_call(ss7);
 						break;
 					case ISUP_EVENT_BLO:
 						isup_bla(ss7, e->blo.cic, dpc);
@@ -177,7 +177,7 @@
 						break;
 					case ISUP_EVENT_RLC:
 						printf("Got RLC for cic %d\n", e->rlc.cic);
-						//ss7_call(ss7);
+						ss7_call(ss7);
 						break;
 					default:
 						printf("Unknown event %d\n", e->e);
@@ -264,7 +264,7 @@
 
 	ss7_set_message(myprintf);
 	ss7_set_error(myprintf);
-	ss7_set_network_ind(ss7, 0x0);
+	ss7_set_network_ind(ss7, SS7_NI_NAT);
 
 	ss7_set_debug(ss7, 0xfffffff);
 	if ((ss7_add_link(ss7, fd))) {