[svn-commits] mattf: trunk r173 - in /trunk: isup.c mtp2.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri May 30 12:35:06 2008
New Revision: 173

URL: http://svn.digium.com/view/libss7?view=rev&rev=173
Log:
Remove duplicate error message, also make sure we print message type and CIC before erroring out of ISUP dump

Modified:
    trunk/isup.c
    trunk/mtp2.c

Modified: trunk/isup.c
URL: http://svn.digium.com/view/libss7/trunk/isup.c?view=diff&rev=173&r1=172&r2=173
==============================================================================
--- trunk/isup.c (original)
+++ trunk/isup.c Fri May 30 12:35:06 2008
@@ -2466,6 +2466,12 @@
 	} else {
 		cic = mh->cic[0] | ((mh->cic[1] & 0x3f) << 8);
 	}
+
+	ss7_message(ss7, "\t\tCIC: %d\n", cic);
+	ss7_dump_buf(ss7, 2, buf, 2);
+	ss7_message(ss7, "\t\tMessage Type: %s (0x%x)\n", message2str(mh->type), mh->type & 0xff);
+	ss7_dump_buf(ss7, 2, &buf[2], 1);
+
 	/* Find us in the message list */
 	for (x = 0; x < sizeof(messages)/sizeof(struct message_data); x++)
 		if (messages[x].messagetype == mh->type)
@@ -2475,11 +2481,6 @@
 		ss7_error(ss7, "!! Unable to handle message of type 0x%x\n", mh->type);
 		return -1;
 	}
-
-	ss7_message(ss7, "\t\tCIC: %d\n", cic);
-	ss7_dump_buf(ss7, 2, buf, 2);
-	ss7_message(ss7, "\t\tMessage Type: %s\n", message2str(mh->type), mh->type & 0xff);
-	ss7_dump_buf(ss7, 2, &buf[2], 1);
 
 	fixedparams = messages[ourmessage].mand_fixed_params;
 	varparams = messages[ourmessage].mand_var_params;

Modified: trunk/mtp2.c
URL: http://svn.digium.com/view/libss7/trunk/mtp2.c?view=diff&rev=173&r1=172&r2=173
==============================================================================
--- trunk/mtp2.c (original)
+++ trunk/mtp2.c Fri May 30 12:35:06 2008
@@ -692,8 +692,6 @@
 	/* The big function */
 	res = mtp3_receive(link->master, link, h->data, len - MTP2_SU_HEAD_SIZE);
 
-	if (res < 0) /* Problem in higher layer */
-		mtp_error(link->master, "Received error from mtp3 layer: %d\n", res);
 	return res;
 }