#include <string.h> and/or #include <stdio.h> not needed.

[obnox/wireshark/wip.git] / epan / dissectors / packet-wlancertextn.c

diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index e0e4e68061550d71a17b5e85234ed1793d89c269..1514101cc36cce1e3fd5b351f7a6b27093804e17 100644 (file)
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-wlancertextn.c                                                    */
-/* ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */
+/* packet-wlancertextn.c                                                      */
+/* ../../tools/asn2wrs.py -b -p wlancertextn -c ./wlancertextn.cnf -s ./packet-wlancertextn-template -D . WLANCERTEXTN.asn */
 
 /* Input file: packet-wlancertextn-template.c */
 
@@ -37,10 +37,8 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
-
-#include <stdio.h>
-#include <string.h>
+#include <epan/oids.h>
+#include <epan/asn1.h>
 
 #include "packet-ber.h"
 #include "packet-wlancertextn.h"
@@ -53,7 +51,7 @@
 #define PFNAME "wlancertextn"
 
 /* Initialize the protocol and registered fields */
-int proto_wlancertextn = -1;
+static int proto_wlancertextn = -1;
 
 /*--- Included file: packet-wlancertextn-hf.c ---*/
 #line 1 "packet-wlancertextn-hf.c"
@@ -61,7 +59,7 @@ static int hf_wlancertextn_SSIDList_PDU = -1;     /* SSIDList */
 static int hf_wlancertextn_SSIDList_item = -1;    /* SSID */
 
 /*--- End of included file: packet-wlancertextn-hf.c ---*/
-#line 50 "packet-wlancertextn-template.c"
+#line 48 "packet-wlancertextn-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -70,35 +68,29 @@ static int hf_wlancertextn_SSIDList_item = -1;    /* SSID */
 static gint ett_wlancertextn_SSIDList = -1;
 
 /*--- End of included file: packet-wlancertextn-ett.c ---*/
-#line 53 "packet-wlancertextn-template.c"
+#line 51 "packet-wlancertextn-template.c"
 
 
 /*--- Included file: packet-wlancertextn-fn.c ---*/
 #line 1 "packet-wlancertextn-fn.c"
-/*--- Fields for imported types ---*/
-
-
 
 
 static int
-dissect_wlancertextn_SSID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+dissect_wlancertextn_SSID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        NULL);
 
   return offset;
 }
-static int dissect_SSIDList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_wlancertextn_SSID(FALSE, tvb, offset, pinfo, tree, hf_wlancertextn_SSIDList_item);
-}
 
 
 static const ber_sequence_t SSIDList_sequence_of[1] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SSIDList_item },
+  { &hf_wlancertextn_SSIDList_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_wlancertextn_SSID },
 };
 
 static int
-dissect_wlancertextn_SSIDList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+dissect_wlancertextn_SSIDList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
                                       SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
 
   return offset;
@@ -106,13 +98,15 @@ dissect_wlancertextn_SSIDList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 
 /*--- PDUs ---*/
 
-static void dissect_SSIDList_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-  dissect_wlancertextn_SSIDList(FALSE, tvb, 0, pinfo, tree, hf_wlancertextn_SSIDList_PDU);
+static void dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  dissect_wlancertextn_SSIDList(FALSE, tvb, 0, &asn1_ctx, tree, hf_wlancertextn_SSIDList_PDU);
 }
 
 
 /*--- End of included file: packet-wlancertextn-fn.c ---*/
-#line 55 "packet-wlancertextn-template.c"
+#line 53 "packet-wlancertextn-template.c"
 
 
 /*--- proto_register_wlancertextn ----------------------------------------------*/
@@ -126,14 +120,14 @@ void proto_register_wlancertextn(void) {
     { &hf_wlancertextn_SSIDList_PDU,
       { "SSIDList", "wlancertextn.SSIDList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SSIDList", HFILL }},
+        "wlancertextn.SSIDList", HFILL }},
     { &hf_wlancertextn_SSIDList_item,
-      { "Item", "wlancertextn.SSIDList_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "SSIDList/_item", HFILL }},
+      { "SSID", "wlancertextn.SSID",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "wlancertextn.SSID", HFILL }},
 
 /*--- End of included file: packet-wlancertextn-hfarr.c ---*/
-#line 63 "packet-wlancertextn-template.c"
+#line 61 "packet-wlancertextn-template.c"
   };
 
   /* List of subtrees */
@@ -144,7 +138,7 @@ void proto_register_wlancertextn(void) {
     &ett_wlancertextn_SSIDList,
 
 /*--- End of included file: packet-wlancertextn-ettarr.c ---*/
-#line 68 "packet-wlancertextn-template.c"
+#line 66 "packet-wlancertextn-template.c"
   };
 
   /* Register protocol */
@@ -167,8 +161,8 @@ void proto_reg_handoff_wlancertextn(void) {
 
 
 /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/
-#line 83 "packet-wlancertextn-template.c"
-  register_ber_oid_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP");
-  register_ber_oid_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN");
+#line 81 "packet-wlancertextn-template.c"
+  oid_add_from_string("id-kp-eapOverPPP","1.3.6.1.5.5.7.3.13");
+  oid_add_from_string("id-kp-eapOverLAN","1.3.6.1.5.5.7.3.14");
 }