[svn-commits] rmudgett: branch 1.4 r2204 - in /branches/1.4: pri_facility.c rose.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Feb 17 11:50:20 2011
New Revision: 2204

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=2204
Log:
* Added switchtype to ROSE invoke operation not handled message.

* Reordered NI2 ROSE message table so any conflicts with the pirated Q.SIG
messages will be in favor of the NI2 specific messages.  This is
precautionary only.

Modified:
    branches/1.4/pri_facility.c
    branches/1.4/rose.c

Modified: branches/1.4/pri_facility.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/pri_facility.c?view=diff&rev=2204&r1=2203&r2=2204
==============================================================================
--- branches/1.4/pri_facility.c (original)
+++ branches/1.4/pri_facility.c Thu Feb 17 11:50:20 2011
@@ -5528,9 +5528,10 @@
 #endif	/* Not handled yet */
 	default:
 		if (ctrl->debug & PRI_DEBUG_APDU) {
-			pri_message(ctrl, "!! ROSE invoke operation not handled! %s\n",
-				rose_operation2str(invoke->operation));
-		}
-		break;
-	}
-}
+			pri_message(ctrl,
+				"!! ROSE invoke operation not handled on switchtype:%s! %s\n",
+				pri_switch2str(ctrl->switchtype), rose_operation2str(invoke->operation));
+		}
+		break;
+	}
+}

Modified: branches/1.4/rose.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/rose.c?view=diff&rev=2204&r1=2203&r2=2204
==============================================================================
--- branches/1.4/rose.c (original)
+++ branches/1.4/rose.c Thu Feb 17 11:50:20 2011
@@ -1292,6 +1292,19 @@
  *			encode_invoke_args,                     encode_result_args,
  *			decode_invoke_args,                     decode_result_args
  */
+	{
+		ROSE_NI2_InformationFollowing,				&rose_ni2_oid, 4,
+			rose_enc_ni2_InformationFollowing_ARG,	NULL,
+			rose_dec_ni2_InformationFollowing_ARG,	NULL
+	},
+
+	/* Also used by PRI_SWITCH_ATT4ESS and PRI_SWITCH_LUCENT5E */
+	{
+		ROSE_NI2_InitiateTransfer,					&rose_ni2_oid, 8,
+			rose_enc_ni2_InitiateTransfer_ARG,		NULL,
+			rose_dec_ni2_InitiateTransfer_ARG,		NULL
+	},
+
 	/* NI2 seems to have pirated several Q.SIG messages */
 	/*
 	 * localValue's from Q.SIG Name-Operations
@@ -1316,19 +1329,6 @@
 		ROSE_QSIG_BusyName,							NULL, 3,
 			rose_enc_qsig_BusyName_ARG,				NULL,
 			rose_dec_qsig_BusyName_ARG,				NULL
-	},
-
-	{
-		ROSE_NI2_InformationFollowing,				&rose_ni2_oid, 4,
-			rose_enc_ni2_InformationFollowing_ARG,	NULL,
-			rose_dec_ni2_InformationFollowing_ARG,	NULL
-	},
-
-	/* Also used by PRI_SWITCH_ATT4ESS and PRI_SWITCH_LUCENT5E */
-	{
-		ROSE_NI2_InitiateTransfer,					&rose_ni2_oid, 8,
-			rose_enc_ni2_InitiateTransfer_ARG,		NULL,
-			rose_dec_ni2_InitiateTransfer_ARG,		NULL
 	},
 /* *INDENT-ON* */
 };