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

[SVN commits to the libss7 project]

Author: mattf
Date: Fri Jun 29 17:21:11 2007
New Revision: 95

URL: http://svn.digium.com/view/libss7?view=rev&rev=95
Log:
Current iteration of debug enhancements.  Still have more to do.

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

Modified: trunk/isup.c
URL: http://svn.digium.com/view/libss7/trunk/isup.c?view=diff&rev=95&r1=94&r2=95
==============================================================================
--- trunk/isup.c (original)
+++ trunk/isup.c Fri Jun 29 17:21:11 2007
@@ -882,18 +882,26 @@
 						len = parms[x].dump(ss7, message, parmbuf, maxlen);
 						break;
 					case PARM_TYPE_VARIABLE:
-						len = 1 + parms[x].dump(ss7, message, parmbuf + 1, parmbuf[0]);
+						parms[x].dump(ss7, message, parmbuf + 1, parmbuf[0]);
+						len = 1 + parmbuf[0];
 						break;
 					case PARM_TYPE_OPTIONAL:
 						optparm = (struct isup_parm_opt *)parmbuf;
-						len = 2 + parms[x].dump(ss7, message, optparm->data, optparm->len);
+						parms[x].dump(ss7, message, optparm->data, optparm->len);
+						len = 2 + optparm->len;
 						break;
 				}
 
 			} else {
-				optparm = (struct isup_parm_opt *)parmbuf;
-				ss7_dump_buf(ss7, 2, optparm->data, optparm->len);
-				return optparm->len + 2;
+				switch (parmtype) {
+					case PARM_TYPE_VARIABLE:
+						len = parmbuf[0] + 1;
+						break;
+					case PARM_TYPE_OPTIONAL:
+						optparm = (struct isup_parm_opt *)parmbuf;
+						len = optparm->len + 2;
+						break;
+				}
 			}
 
 			ss7_dump_buf(ss7, 2, parmbuf, len);
@@ -901,7 +909,7 @@
 		}
 	}
 
-	/* This is if we don't find it.... It's going to be either an unknown message or an unknown optional parameter */
+	/* This is if we don't find it....  */
 	ss7_message(ss7, "\t\tParm: Unknown");
 	optparm = (struct isup_parm_opt *)parmbuf;
 	ss7_dump_buf(ss7, 2, optparm->data, optparm->len);

Modified: trunk/ss7linktest.c
URL: http://svn.digium.com/view/libss7/trunk/ss7linktest.c?view=diff&rev=95&r1=94&r2=95
==============================================================================
--- trunk/ss7linktest.c (original)
+++ trunk/ss7linktest.c Fri Jun 29 17:21:11 2007
@@ -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);