aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x420.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-x420.c')
-rw-r--r--epan/dissectors/packet-x420.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 7e189ea79b..179e656c51 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -37,7 +37,6 @@
#include <glib.h>
#include <epan/packet.h>
-#include <epan/conversation.h>
#include <epan/oids.h>
#include <epan/asn1.h>
@@ -477,7 +476,7 @@ static int hf_x420_RecipientSecurityRequest_ipn_non_repudiation = -1;
static int hf_x420_RecipientSecurityRequest_ipn_proof = -1;
/*--- End of included file: packet-x420-hf.c ---*/
-#line 90 "packet-x420-template.c"
+#line 89 "packet-x420-template.c"
/* Initialize the subtree pointers */
static gint ett_x420 = -1;
@@ -611,7 +610,7 @@ static gint ett_x420_T_body_part_token_choice = -1;
static gint ett_x420_T_choice = -1;
/*--- End of included file: packet-x420-ett.c ---*/
-#line 94 "packet-x420-template.c"
+#line 93 "packet-x420-template.c"
/*--- Included file: packet-x420-fn.c ---*/
@@ -4280,7 +4279,7 @@ static void dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pi
/*--- End of included file: packet-x420-fn.c ---*/
-#line 96 "packet-x420-template.c"
+#line 95 "packet-x420-template.c"
/*
* Dissect X420 PDUs inside a PPDU.
@@ -5827,7 +5826,7 @@ void proto_register_x420(void) {
"", HFILL }},
/*--- End of included file: packet-x420-hfarr.c ---*/
-#line 130 "packet-x420-template.c"
+#line 129 "packet-x420-template.c"
};
/* List of subtrees */
@@ -5963,7 +5962,7 @@ void proto_register_x420(void) {
&ett_x420_T_choice,
/*--- End of included file: packet-x420-ettarr.c ---*/
-#line 136 "packet-x420-template.c"
+#line 135 "packet-x420-template.c"
};
/* Register protocol */
@@ -6083,7 +6082,7 @@ void proto_reg_handoff_x420(void) {
/*--- End of included file: packet-x420-dis-tab.c ---*/
-#line 152 "packet-x420-template.c"
+#line 151 "packet-x420-template.c"
register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)");
register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)");