From Jeff Morriss: New protocol SCCP-Management

svn path=/trunk/; revision=6309

4 files changed, 348 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 006f2c48f3..f23950ff91 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -810,6 +810,7 @@ Jeff Morriss <jeff.morriss[AT]ulticom.com> {
 	M2PA support
 	Support for ANSI flavor of MTP3
 	SCCP support
+	SCCP Management support
 }
 
 Aamer Akhter <aakhter[AT]cisco.com> {
diff --git a/Makefile.am b/Makefile.am
index 763f6eba57..ee6a2dbed2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.501 2002/09/17 09:38:02 sahlberg Exp $
+# $Id: Makefile.am,v 1.502 2002/09/20 09:22:42 sahlberg Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -305,6 +305,7 @@ DISSECTOR_SRC = \
 	packet-sadmind.c \
 	packet-sap.c   \
 	packet-sccp.c  \
+	packet-sccpmg.c  \
 	packet-scsi.c  \
 	packet-sctp.c  \
 	packet-sdp.c   \
diff --git a/Makefile.nmake b/Makefile.nmake
index 8b519f266a..ecf2970235 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.238 2002/09/17 09:38:02 sahlberg Exp $
+# $Id: Makefile.nmake,v 1.239 2002/09/20 09:22:46 sahlberg Exp $
 
 include config.nmake
 include <win32.mak>
@@ -245,6 +245,7 @@ DISSECTOR_SRC = \
 	packet-sadmind.c \
 	packet-sap.c   \
 	packet-sccp.c  \
+	packet-sccpmg.c  \
 	packet-scsi.c  \
 	packet-sctp.c  \
 	packet-sdp.c   \
diff --git a/packet-sccpmg.c b/packet-sccpmg.c
new file mode 100755
index 0000000000..ff53350bcb
--- /dev/null
+++ b/packet-sccpmg.c
@@ -0,0 +1,343 @@
+/* packet-sccp.c
+ * Routines for Signalling Connection Control Part (SCCP) Management dissection
+ * It is hopefully compliant to:
+ *   ANSI T1.112.3-1996
+ *   ITU-T Q.713 7/1996
+ *
+ * Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
+ *
+ * $Id: packet-sccpmg.c,v 1.1 2002/09/20 09:22:46 sahlberg Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "epan/packet.h"
+#include "packet-mtp3.h"
+
+#define SCCPMG_SSN 1
+
+#define SCCPMG_MESSAGE_TYPE_SSA 0x01
+#define SCCPMG_MESSAGE_TYPE_SSP 0x02
+#define SCCPMG_MESSAGE_TYPE_SST 0x03
+#define SCCPMG_MESSAGE_TYPE_SOR 0x04
+#define SCCPMG_MESSAGE_TYPE_SOG 0x05
+/* SSC is ITU only */
+#define SCCPMG_MESSAGE_TYPE_SSC 0x06
+/* Below are ANSI only */
+#define SCCPMG_MESSAGE_TYPE_SBR 0xfd
+#define SCCPMG_MESSAGE_TYPE_SNR 0xfe
+#define SCCPMG_MESSAGE_TYPE_SRT 0xff
+
+/* Same as below but with names typed out */
+static const value_string sccpmg_message_type_values[] = {
+  { SCCPMG_MESSAGE_TYPE_SSA,   "SubSystem Allowed" },
+  { SCCPMG_MESSAGE_TYPE_SSP,   "SubSystem Prohibited" },
+  { SCCPMG_MESSAGE_TYPE_SST,   "Subsystem Status Test" },
+  { SCCPMG_MESSAGE_TYPE_SOR,   "Subsystem Out of service Request" },
+  { SCCPMG_MESSAGE_TYPE_SOG,   "Subsystem Out of service Grant" },
+  { SCCPMG_MESSAGE_TYPE_SSC,   "SubSystem Congested (ITU)" },
+  { SCCPMG_MESSAGE_TYPE_SBR,   "Subsystem Backup Routing (ANSI)" },
+  { SCCPMG_MESSAGE_TYPE_SNR,   "Subsystem Normal Routing (ANSI)" },
+  { SCCPMG_MESSAGE_TYPE_SRT,   "Subsystem Routing status Test (ANSI)" },
+  { 0,                       NULL } };
+
+/* Same as above but in acronym for (for the Info column) */
+static const value_string sccpmg_message_type_acro_values[] = {
+  { SCCPMG_MESSAGE_TYPE_SSA,   "SSA" },
+  { SCCPMG_MESSAGE_TYPE_SSP,   "SSP" },
+  { SCCPMG_MESSAGE_TYPE_SST,   "SST" },
+  { SCCPMG_MESSAGE_TYPE_SOR,   "SOR" },
+  { SCCPMG_MESSAGE_TYPE_SOG,   "SOG" },
+  { SCCPMG_MESSAGE_TYPE_SSC,   "SSC" },
+  { SCCPMG_MESSAGE_TYPE_SBR,   "SBR" },
+  { SCCPMG_MESSAGE_TYPE_SNR,   "SNR" },
+  { SCCPMG_MESSAGE_TYPE_SRT,   "SRT" },
+  { 0,                       NULL } };
+
+
+#define SCCPMG_MESSAGE_TYPE_OFFSET 0
+#define SCCPMG_MESSAGE_TYPE_LENGTH 1
+
+#define SCCPMG_AFFECTED_SSN_OFFSET SCCPMG_MESSAGE_TYPE_LENGTH
+#define SCCPMG_AFFECTED_SSN_LENGTH 1
+
+#define SCCPMG_AFFECTED_PC_OFFSET (SCCPMG_AFFECTED_SSN_OFFSET + SCCPMG_AFFECTED_SSN_LENGTH)
+#define ITU_SCCPMG_AFFECTED_PC_LENGTH 2
+#define ANSI_SCCPMG_AFFECTED_PC_LENGTH 3
+
+#define ITU_SCCPMG_SMI_OFFSET (SCCPMG_AFFECTED_PC_OFFSET + ITU_SCCPMG_AFFECTED_PC_LENGTH)
+#define ANSI_SCCPMG_SMI_OFFSET (SCCPMG_AFFECTED_PC_OFFSET + ANSI_SCCPMG_AFFECTED_PC_LENGTH)
+#define SCCPMG_SMI_LENGTH 1
+#define SCCPMG_SMI_MASK 0x3
+
+#define ITU_SCCPMG_CONGESTION_OFFSET (ITU_SCCPMG_SMI_OFFSET + SCCPMG_SMI_LENGTH)
+#define ITU_SCCPMG_CONGESTION_LENGTH 1
+#define ITU_SCCPMG_CONGESTION_MASK 0x0f
+
+#define SCCPMG_SSN_LENGTH    1
+
+/* Initialize the protocol and registered fields */
+static int proto_sccpmg = -1;
+static int hf_sccpmg_message_type = -1;
+static int hf_sccpmg_affected_ssn = -1;
+static int hf_sccpmg_affected_pc = -1;
+static int hf_sccpmg_affected_pc_member = -1;
+static int hf_sccpmg_affected_pc_cluster = -1;
+static int hf_sccpmg_affected_pc_network = -1;
+static int hf_sccpmg_smi = -1;
+static int hf_sccpmg_congestion_level = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_sccpmg = -1;
+static gint ett_sccpmg_affected_pc = -1;
+
+static void
+dissect_sccpmg_unknown_message(tvbuff_t *message_tvb, proto_tree *sccpmg_tree)
+{
+	guint32 message_length;
+
+	message_length = tvb_length(message_tvb);
+
+	proto_tree_add_text(sccpmg_tree, message_tvb, 0, message_length,
+			    "Unknown message (%u byte%s)", message_length,
+			    plurality(message_length, "", "s"));
+}
+
+static void
+dissect_sccpmg_affected_ssn(tvbuff_t *tvb, proto_tree *sccpmg_tree)
+{
+	proto_tree_add_item(sccpmg_tree, hf_sccpmg_affected_ssn, tvb,
+			    SCCPMG_AFFECTED_SSN_OFFSET, SCCPMG_SSN_LENGTH,
+			    FALSE);
+}
+
+static void
+dissect_sccpmg_affected_pc(tvbuff_t *tvb, proto_tree *sccpmg_tree)
+{
+	proto_item *pc_item = 0;
+	proto_tree *pc_tree = 0;
+	guint32 dpc;
+	guint8 offset = SCCPMG_AFFECTED_PC_OFFSET;
+
+	if (mtp3_standard == ITU_STANDARD) {
+		proto_tree_add_item(sccpmg_tree, hf_sccpmg_affected_pc, tvb,
+				    offset, ITU_PC_LENGTH, TRUE);
+	} else if (mtp3_standard == ANSI_STANDARD) {
+		/* create the DPC tree; modified from that in packet-sccp.c */
+		dpc = tvb_get_ntoh24(tvb, offset);
+		pc_item = proto_tree_add_text(sccpmg_tree, tvb, offset,
+					      ANSI_PC_LENGTH, "PC (%d-%d-%d)",
+					      (dpc & ANSI_NETWORK_MASK),
+					      ((dpc & ANSI_CLUSTER_MASK) >> 8),
+					      ((dpc & ANSI_MEMBER_MASK) >> 16));
+
+		pc_tree = proto_item_add_subtree(pc_item,
+						 ett_sccpmg_affected_pc);
+
+		proto_tree_add_uint(pc_tree, hf_sccpmg_affected_pc_member, tvb,
+				    offset, ANSI_NCM_LENGTH, dpc);
+		offset += ANSI_NCM_LENGTH;
+		proto_tree_add_uint(pc_tree, hf_sccpmg_affected_pc_cluster, tvb,
+				    offset, ANSI_NCM_LENGTH, dpc);
+		offset += ANSI_NCM_LENGTH;
+		proto_tree_add_uint(pc_tree, hf_sccpmg_affected_pc_network,
+				    tvb, offset, ANSI_NCM_LENGTH, dpc);
+	}
+}
+
+static void
+dissect_sccpmg_smi(tvbuff_t *tvb, proto_tree *sccpmg_tree)
+{
+	guint8 offset = 0;
+
+	if (mtp3_standard == ITU_STANDARD)
+		offset = ITU_SCCPMG_SMI_OFFSET;
+	else
+		offset = ANSI_SCCPMG_SMI_OFFSET;
+
+	proto_tree_add_item(sccpmg_tree, hf_sccpmg_smi, tvb, offset,
+			    SCCPMG_SMI_LENGTH, FALSE);
+}
+
+static void
+dissect_sccpmg_congestion_level(tvbuff_t *tvb, proto_tree *sccpmg_tree)
+{
+	proto_tree_add_item(sccpmg_tree, hf_sccpmg_congestion_level, tvb,
+			    ITU_SCCPMG_CONGESTION_OFFSET,
+			    ITU_SCCPMG_CONGESTION_LENGTH, FALSE);
+}
+
+static void
+dissect_sccpmg_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccpmg_tree)
+{
+	guint8 message_type;
+	guint8 offset = 0;
+
+	/* Extract the message type;  all other processing is based on this */
+	message_type   = tvb_get_guint8(tvb, SCCPMG_MESSAGE_TYPE_OFFSET);
+	offset = SCCPMG_MESSAGE_TYPE_LENGTH;
+
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+		col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ",
+				val_to_str(message_type,
+					   sccpmg_message_type_acro_values,
+					   "Unknown"));
+	}
+
+	if (sccpmg_tree) {
+		/* add the message type to the protocol tree */
+		proto_tree_add_uint(sccpmg_tree, hf_sccpmg_message_type, tvb,
+				    SCCPMG_MESSAGE_TYPE_OFFSET,
+				    SCCPMG_MESSAGE_TYPE_LENGTH, message_type);
+	}
+
+	switch(message_type) {
+	case SCCPMG_MESSAGE_TYPE_SBR:
+	case SCCPMG_MESSAGE_TYPE_SNR:
+	case SCCPMG_MESSAGE_TYPE_SRT:
+		if (mtp3_standard == ITU_STANDARD)
+		{
+			dissect_sccpmg_unknown_message(tvb, sccpmg_tree);
+			break;
+		}
+		/* else fallthrough */
+	case SCCPMG_MESSAGE_TYPE_SSA:
+	case SCCPMG_MESSAGE_TYPE_SSP:
+	case SCCPMG_MESSAGE_TYPE_SST:
+	case SCCPMG_MESSAGE_TYPE_SOR:
+	case SCCPMG_MESSAGE_TYPE_SOG:
+		dissect_sccpmg_affected_ssn(tvb, sccpmg_tree);
+		dissect_sccpmg_affected_pc(tvb, sccpmg_tree);
+		dissect_sccpmg_smi(tvb, sccpmg_tree);
+
+		break;
+	case SCCPMG_MESSAGE_TYPE_SSC:
+		if (mtp3_standard == ITU_STANDARD)
+		{
+			dissect_sccpmg_affected_ssn(tvb, sccpmg_tree);
+			dissect_sccpmg_affected_pc(tvb, sccpmg_tree);
+			dissect_sccpmg_smi(tvb, sccpmg_tree);
+			dissect_sccpmg_congestion_level(tvb, sccpmg_tree);
+		}
+		/* else fallthrough */
+
+	default:
+		dissect_sccpmg_unknown_message(tvb, sccpmg_tree);
+	}
+}
+
+static void
+dissect_sccpmg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	proto_item *sccpmg_item;
+	proto_tree *sccpmg_tree = NULL;
+
+	/* Make entry in the Protocol column on summary display */
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCPMG");
+
+	/* In the interest of speed, if "tree" is NULL, don't do any work not
+	   necessary to generate protocol tree items. */
+	if (tree) {
+		/* create the sccpmg protocol tree */
+		sccpmg_item = proto_tree_add_item(tree, proto_sccpmg, tvb, 0,
+						  -1, FALSE);
+		sccpmg_tree = proto_item_add_subtree(sccpmg_item, ett_sccpmg);
+	}
+
+	/* dissect the message */
+	dissect_sccpmg_message(tvb, pinfo, sccpmg_tree);
+}
+
+/* Register the protocol with Ethereal */
+void
+proto_register_sccpmg(void)
+{
+	/* Setup list of header fields */
+	static hf_register_info hf[] = {
+	  { &hf_sccpmg_message_type,
+	    { "Message Type", "sccpmg.message_type",
+	    FT_UINT8, BASE_HEX, VALS(sccpmg_message_type_values), 0x0,
+	    "", HFILL}},
+	  { &hf_sccpmg_affected_ssn,
+	    { "Affected SubSystem Number", "sccpmg.ssn",
+	    FT_UINT8, BASE_DEC, NULL, 0x0,
+	    "", HFILL}},
+	  { &hf_sccpmg_affected_pc,
+	    { "Affected Point Code", "sccpmg.pc",
+	    FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
+	    "", HFILL}},
+	  { &hf_sccpmg_affected_pc_network,
+	    { "Affected PC Network",
+	    "sccpmg.network",
+	    FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
+	    "", HFILL}},
+	  { &hf_sccpmg_affected_pc_cluster,
+	    { "Affected PC Cluster",
+	    "sccpmg.cluster",
+	    FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
+	    "", HFILL}},
+	  { &hf_sccpmg_affected_pc_member,
+	    { "Affected PC Member",
+	    "sccpmg.member",
+	    FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
+	    "", HFILL}},
+	  { &hf_sccpmg_smi,
+	    { "Subsystem Multiplicity Indicator",
+	    "sccpmg.smi",
+	    FT_UINT8, BASE_DEC, NULL, SCCPMG_SMI_MASK,
+	    "", HFILL}},
+	  { &hf_sccpmg_congestion_level,
+	    { "SCCP Congestionl Level (ITU)",
+	    "sccpmg.congestion",
+	    FT_UINT8, BASE_DEC, NULL, ITU_SCCPMG_CONGESTION_MASK,
+	    "", HFILL}}
+	};
+
+	/* Setup protocol subtree array */
+	static gint *ett[] = {
+		&ett_sccpmg,
+		&ett_sccpmg_affected_pc
+	};
+
+	/* Register the protocol name and description */
+	proto_sccpmg = proto_register_protocol("Signalling Connection Control Part Management",
+					       "SCCPMG", "sccpmg");
+
+	/* Required function calls to register the header fields and subtrees
+	   used */
+	proto_register_field_array(proto_sccpmg, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_sccpmg(void)
+{
+	dissector_handle_t sccpmg_handle;
+
+	sccpmg_handle = create_dissector_handle(dissect_sccpmg, proto_sccpmg);
+
+	/* Register for SCCP SSN=1 messages */
+	dissector_add("sccp.ssn", SCCPMG_SSN, sccpmg_handle);
+}
+