PER Enumerated is working now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18165 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index e0576883e3f40af3fea3dee8ade2645ccfb60f1d..6b7087e8226166fd1e0011f239e7eb6c7907303b 100644 (file)
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -82,17 +82,6 @@ tvbuff_t *nas_pdu_tvb=NULL;
                return offset;
        dissect_e212_mcc_mnc(parameter_tvb, tree, 0);
 
-#.FN_BODY PagingCause
-# Remove once asn2eth is fixed to handle PER Enummeration extensions
-  offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index,
-                                                                       5, NULL, NULL, TRUE, 1, NULL);
-
-#.FN_BODY Event
-# Remove once asn2eth is fixed to handle PER Enummeration extensions
-  offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index,
-                                                                       3, NULL, NULL, TRUE, 1, NULL);
-
-
 #.END
 #.TYPE_ATTR
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(ranap_ProtocolIE_ID_vals)
\ No newline at end of file

diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 582ec96caa5de4b546bbbc55c22f49bcdbd26e26..76d97dd24a504f25ed28023d8911966bc73780ad 100644 (file)
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -6455,11 +6455,8 @@ static const value_string ranap_PagingCause_vals[] = {
 
 static int
 dissect_ranap_PagingCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-#line 87 "ranap.cnf"
   offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index,
-                                                                       5, NULL, NULL, TRUE, 1, NULL);
-
-
+                                     5, NULL, NULL, TRUE, 1, NULL);
 
   return offset;
 }
@@ -8466,12 +8463,8 @@ static const value_string ranap_Event_vals[] = {
 
 static int
 dissect_ranap_Event(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-#line 92 "ranap.cnf"
   offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index,
-                                                                       3, NULL, NULL, TRUE, 1, NULL);
-
-
-
+                                     3, NULL, NULL, TRUE, 1, NULL);
 
   return offset;
 }

diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h
index 84f09c2299836ff2f1f0ebeefed6742a80ce617b..95373a4904cf24c9d31db88dcde72fc8533ad3c9 100644 (file)
--- a/epan/dissectors/packet-ranap.h
+++ b/epan/dissectors/packet-ranap.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* .\packet-ranap.h                                                           */
-/* ../../tools/asn2eth.py -X -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */
+/* ../../tools/asn2eth.py -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */
 
 /* Input file: packet-ranap-template.h */