[svn-commits] kmoore: branch 1.0 r297 - in /branches/1.0: isup.c mtp3.c ss7.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed May 30 15:52:43 2012
New Revision: 297

URL: http://svnview.digium.com/svn/libss7?view=rev&rev=297
Log:
Address some compilation issues and complete ss7_event2str

There were a few variables that were set but unused that were causing
compilation errors due to the compilation flags used (-Werror).  These
are now corrected.

This patch also finishes out the functionality of ss7_event2str so that
it returns the correct name for all event types it knows about.  This
change is related to the Asterisk 11 Who Hung Up? work.

Modified:
    branches/1.0/isup.c
    branches/1.0/mtp3.c
    branches/1.0/ss7.c

Modified: branches/1.0/isup.c
URL: http://svnview.digium.com/svn/libss7/branches/1.0/isup.c?view=diff&rev=297&r1=296&r2=297
==============================================================================
--- branches/1.0/isup.c (original)
+++ branches/1.0/isup.c Wed May 30 15:52:43 2012
@@ -2295,13 +2295,9 @@
 	int x;
 	int len = 0;
 	int totalparms = sizeof(parms)/sizeof(struct parm_func);
-	char *parmname = "Unknown Parm";
 
 	for (x = 0; x < totalparms; x++) {
 		if (parms[x].parm == parm) {
-			if (parms[x].name)
-				parmname = parms[x].name;
-
 			ss7_message(ss7, "\t\t%s:\n", parms[x].name ? parms[x].name : "Unknown");
 
 			if (parms[x].dump) {

Modified: branches/1.0/mtp3.c
URL: http://svnview.digium.com/svn/libss7/branches/1.0/mtp3.c?view=diff&rev=297&r1=296&r2=297
==============================================================================
--- branches/1.0/mtp3.c (original)
+++ branches/1.0/mtp3.c Wed May 30 15:52:43 2012
@@ -475,12 +475,10 @@
 int mtp3_transmit(struct ss7 *ss7, unsigned char userpart, unsigned char sls, struct ss7_msg *m)
 {
 	unsigned char *sio;
-	unsigned char *sif;
 	struct mtp2 *winner;
 	int priority = 3;
 
 	sio = m->buf + MTP2_SIZE;
-	sif = sio + 1;
 
 	if (userpart != SIG_ISUP)
 		winner = slc_to_link(ss7, sls);

Modified: branches/1.0/ss7.c
URL: http://svnview.digium.com/svn/libss7/branches/1.0/ss7.c?view=diff&rev=297&r1=296&r2=297
==============================================================================
--- branches/1.0/ss7.c (original)
+++ branches/1.0/ss7.c Wed May 30 15:52:43 2012
@@ -295,6 +295,10 @@
 			return "SS7_EVENT_UP";
 		case SS7_EVENT_DOWN:
 			return "SS7_EVENT_DOWN";
+		case MTP2_LINK_UP:
+			return "MTP2_LINK_UP";
+		case MTP2_LINK_DOWN:
+			return "MTP2_LINK_DOWN";
 		case ISUP_EVENT_IAM:
 			return "ISUP_EVENT_IAM";
 		case ISUP_EVENT_ACM:
@@ -311,6 +315,44 @@
 			return "ISUP_EVENT_GRA";
 		case ISUP_EVENT_CON:
 			return "ISUP_EVENT_CON";
+		case ISUP_EVENT_COT:
+			return "ISUP_EVENT_COT";
+		case ISUP_EVENT_CCR:
+			return "ISUP_EVENT_CCR";
+		case ISUP_EVENT_BLO:
+			return "ISUP_EVENT_BLO";
+		case ISUP_EVENT_UBL:
+			return "ISUP_EVENT_UBL";
+		case ISUP_EVENT_BLA:
+			return "ISUP_EVENT_BLA";
+		case ISUP_EVENT_UBA:
+			return "ISUP_EVENT_UBA";
+		case ISUP_EVENT_CGB:
+			return "ISUP_EVENT_CGB";
+		case ISUP_EVENT_CGU:
+			return "ISUP_EVENT_CGU";
+		case ISUP_EVENT_RSC:
+			return "ISUP_EVENT_RSC";
+		case ISUP_EVENT_CPG:
+			return "ISUP_EVENT_CPG";
+		case ISUP_EVENT_UCIC:
+			return "ISUP_EVENT_UCIC";
+		case ISUP_EVENT_LPA:
+			return "ISUP_EVENT_LPA";
+		case ISUP_EVENT_CQM:
+			return "ISUP_EVENT_CQM";
+		case ISUP_EVENT_FAR:
+			return "ISUP_EVENT_FAR";
+		case ISUP_EVENT_FAA:
+			return "ISUP_EVENT_FAA";
+		case ISUP_EVENT_CVT:
+			return "ISUP_EVENT_CVT";
+		case ISUP_EVENT_CVR:
+			return "ISUP_EVENT_CVR";
+		case ISUP_EVENT_SUS:
+			return "ISUP_EVENT_SUS";
+		case ISUP_EVENT_RES:
+			return "ISUP_EVENT_RES";
 		default:
 			return "Unknown Event";
 	}