Add TCAP ssn

svn path=/trunk/; revision=17376

3 files changed, 54 insertions, 8 deletions

diff --git a/asn1/rnsap/Makefile.nmake b/asn1/rnsap/Makefile.nmake
index b1d75f5890..1001f90598 100644
--- a/asn1/rnsap/Makefile.nmake
+++ b/asn1/rnsap/Makefile.nmake
@@ -22,7 +22,7 @@ $(DISSECTOR_FILES): ../../tools/asn2eth.py rnsap.asn packet-rnsap-template.c pac
 !ENDIF
 
 clean:
-	rm -f parsetab.py $(DISSECTOR_FILES)
+	rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES)
 
 # Fix EOL in generated dissectors. Cygwin's python generates files with 
 # mixed EOL styles, which can't be commited to the SVN repository.
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 339474a914..9d75fb5507 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -3,7 +3,7 @@
  * UTRAN Iur interface Radio Network Subsystem
  * Application Part (RNSAP) signalling
  * (3GPP TS 25.423 version 6.7.0 Release 6) packet dissection
- * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2005 - 2006, Anders Broman <anders.broman@ericsson.com>
  *
  * $Id$
  *
@@ -47,6 +47,8 @@
 #define PSNAME "RNSAP"
 #define PFNAME "rnsap"
 
+#define SCCP_SSN_RNSAP 143
+
 #define RNSAP_FDD 1
 /* Procedure codes */
 #define	RNSAP_ID_COMMONTRANSPORTCHANNELRESOURCESINITIALISATION			 0
@@ -2263,6 +2265,8 @@ static int dissect_rnsap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, packet_
 	BYTE_ALIGN_OFFSET(offset);	
 	return offset;
 }
+
+
 static void
 dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
@@ -2281,6 +2285,19 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
 }
+/*
+static gboolean
+dissect_sccp_rnsap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    guint8 temp;
+
+	dissect_rnsap(tvb, pinfo, tree);
+     * Is it a rnsap packet?
+     *
+	 * 
+	return TRUE;
+}
+/*
 /*--- proto_register_rnsap -------------------------------------------*/
 void proto_register_rnsap(void) {
 
@@ -2326,6 +2343,12 @@ proto_reg_handoff_rnsap(void)
 {
 
 	rnsap_handle = find_dissector("rnsap");
+	dissector_add("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
+	/* Add heuristic dissector
+	 * Perhaps we want a preference whether the heuristic dissector
+	 * is or isn't enabled
+	 */
+	/*heur_dissector_add("sccp", dissect_sccp_rnsap_heur, proto_rnsap); */
 
 }
 
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index a43dd93c2e..098d03f642 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -11,7 +11,7 @@
  * UTRAN Iur interface Radio Network Subsystem
  * Application Part (RNSAP) signalling
  * (3GPP TS 25.423 version 6.7.0 Release 6) packet dissection
- * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2005 - 2006, Anders Broman <anders.broman@ericsson.com>
  *
  * $Id$
  *
@@ -55,6 +55,8 @@
 #define PSNAME "RNSAP"
 #define PFNAME "rnsap"
 
+#define SCCP_SSN_RNSAP 143
+
 #define RNSAP_FDD 1
 /* Procedure codes */
 #define	RNSAP_ID_COMMONTRANSPORTCHANNELRESOURCESINITIALISATION			 0
@@ -2284,7 +2286,7 @@ static int hf_rnsap_privateIEid = -1;             /* PrivateIE_ID */
 static int hf_rnsap_privateIEvalue = -1;          /* PrivateIEvalue */
 
 /*--- End of included file: packet-rnsap-hf.c ---*/
-#line 557 "packet-rnsap-template.c"
+#line 559 "packet-rnsap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_rnsap = -1;
@@ -3146,7 +3148,7 @@ static gint ett_rnsap_PrivateIE_Container = -1;
 static gint ett_rnsap_PrivateIE_Field = -1;
 
 /*--- End of included file: packet-rnsap-ett.c ---*/
-#line 566 "packet-rnsap-template.c"
+#line 568 "packet-rnsap-template.c"
 
 /* Global variables */
 static proto_tree *top_tree;
@@ -30279,7 +30281,7 @@ static void dissect_RNSAP_PDU_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
 /*--- End of included file: packet-rnsap-fn.c ---*/
-#line 589 "packet-rnsap-template.c"
+#line 591 "packet-rnsap-template.c"
 
 
 static int dissect_rnsap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree){
@@ -31957,6 +31959,8 @@ static int dissect_rnsap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, packet_
 	BYTE_ALIGN_OFFSET(offset);	
 	return offset;
 }
+
+
 static void
 dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
@@ -31975,6 +31979,19 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
 }
+/*
+static gboolean
+dissect_sccp_rnsap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    guint8 temp;
+
+	dissect_rnsap(tvb, pinfo, tree);
+     * Is it a rnsap packet?
+     *
+	 * 
+	return TRUE;
+}
+/*
 /*--- proto_register_rnsap -------------------------------------------*/
 void proto_register_rnsap(void) {
 
@@ -38864,7 +38881,7 @@ void proto_register_rnsap(void) {
         "PrivateIE-Field/privateIEvalue", HFILL }},
 
 /*--- End of included file: packet-rnsap-hfarr.c ---*/
-#line 2297 "packet-rnsap-template.c"
+#line 2314 "packet-rnsap-template.c"
   };
 
   /* List of subtrees */
@@ -39727,7 +39744,7 @@ void proto_register_rnsap(void) {
     &ett_rnsap_PrivateIE_Field,
 
 /*--- End of included file: packet-rnsap-ettarr.c ---*/
-#line 2307 "packet-rnsap-template.c"
+#line 2324 "packet-rnsap-template.c"
   };
 
 
@@ -39750,6 +39767,12 @@ proto_reg_handoff_rnsap(void)
 {
 
 	rnsap_handle = find_dissector("rnsap");
+	dissector_add("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
+	/* Add heuristic dissector
+	 * Perhaps we want a preference whether the heuristic dissector
+	 * is or isn't enabled
+	 */
+	/*heur_dissector_add("sccp", dissect_sccp_rnsap_heur, proto_rnsap); */
 
 }