From 4b0bf62791c093e242565739aa0ec7a5ad335dfe Mon Sep 17 00:00:00 2001 From: Joakim Karlsson Date: Wed, 30 Nov 2022 13:23:33 +0100 Subject: asn2wrs: disable template line directive by default Same as with !8955, To debug with line directive build with -DENABLE_DEBUG_A2W=ON flag --- epan/dissectors/packet-HI2Operations.c | 33 --------------- epan/dissectors/packet-acp133.c | 39 ----------------- epan/dissectors/packet-acp133.h | 3 -- epan/dissectors/packet-acse.c | 33 --------------- epan/dissectors/packet-acse.h | 9 ---- epan/dissectors/packet-ain.c | 51 ----------------------- epan/dissectors/packet-ansi_map.c | 33 --------------- epan/dissectors/packet-ansi_map.h | 3 -- epan/dissectors/packet-ansi_tcap.c | 33 --------------- epan/dissectors/packet-ansi_tcap.h | 3 -- epan/dissectors/packet-atn-cm.c | 33 --------------- epan/dissectors/packet-atn-cpdlc.c | 33 --------------- epan/dissectors/packet-atn-ulcs.c | 33 --------------- epan/dissectors/packet-atn-ulcs.h | 3 -- epan/dissectors/packet-c1222.c | 33 --------------- epan/dissectors/packet-c1222.h | 3 -- epan/dissectors/packet-camel.c | 57 ------------------------- epan/dissectors/packet-camel.h | 3 -- epan/dissectors/packet-cbrs-oids.c | 27 ------------ epan/dissectors/packet-cdt.c | 39 ----------------- epan/dissectors/packet-cdt.h | 9 ---- epan/dissectors/packet-charging_ase.c | 33 --------------- epan/dissectors/packet-charging_ase.h | 9 ---- epan/dissectors/packet-cmip.c | 51 ----------------------- epan/dissectors/packet-cmip.h | 9 ---- epan/dissectors/packet-cmp.c | 39 ----------------- epan/dissectors/packet-cmp.h | 9 ---- epan/dissectors/packet-cms.c | 39 ----------------- epan/dissectors/packet-cms.h | 9 ---- epan/dissectors/packet-credssp.c | 33 --------------- epan/dissectors/packet-credssp.h | 9 ---- epan/dissectors/packet-crmf.c | 39 ----------------- epan/dissectors/packet-crmf.h | 9 ---- epan/dissectors/packet-dap.c | 57 ------------------------- epan/dissectors/packet-dap.h | 9 ---- epan/dissectors/packet-disp.c | 39 ----------------- epan/dissectors/packet-disp.h | 9 ---- epan/dissectors/packet-dop.c | 39 ----------------- epan/dissectors/packet-dop.h | 9 ---- epan/dissectors/packet-dsp.c | 39 ----------------- epan/dissectors/packet-dsp.h | 9 ---- epan/dissectors/packet-e1ap.c | 45 -------------------- epan/dissectors/packet-e1ap.h | 9 ---- epan/dissectors/packet-e2ap.c | 45 -------------------- epan/dissectors/packet-ess.c | 45 -------------------- epan/dissectors/packet-ess.h | 9 ---- epan/dissectors/packet-f1ap.c | 45 -------------------- epan/dissectors/packet-f1ap.h | 9 ---- epan/dissectors/packet-ftam.c | 33 --------------- epan/dissectors/packet-ftam.h | 9 ---- epan/dissectors/packet-gdt.c | 33 --------------- epan/dissectors/packet-gdt.h | 3 -- epan/dissectors/packet-glow.c | 33 --------------- epan/dissectors/packet-goose.c | 33 --------------- epan/dissectors/packet-gprscdr.c | 33 --------------- epan/dissectors/packet-gprscdr.h | 9 ---- epan/dissectors/packet-gsm_map.c | 51 ----------------------- epan/dissectors/packet-gsm_map.h | 9 ---- epan/dissectors/packet-h225.c | 33 --------------- epan/dissectors/packet-h225.h | 9 ---- epan/dissectors/packet-h235.c | 33 --------------- epan/dissectors/packet-h235.h | 9 ---- epan/dissectors/packet-h245.c | 39 ----------------- epan/dissectors/packet-h245.h | 9 ---- epan/dissectors/packet-h248.c | 33 --------------- epan/dissectors/packet-h248.h | 3 -- epan/dissectors/packet-h282.c | 33 --------------- epan/dissectors/packet-h283.c | 33 --------------- epan/dissectors/packet-h323.c | 33 --------------- epan/dissectors/packet-h323.h | 3 -- epan/dissectors/packet-h450-ros.c | 33 --------------- epan/dissectors/packet-h450-ros.h | 9 ---- epan/dissectors/packet-h450.c | 57 ------------------------- epan/dissectors/packet-h460.c | 33 --------------- epan/dissectors/packet-h501.c | 33 --------------- epan/dissectors/packet-hnbap.c | 45 -------------------- epan/dissectors/packet-idmp.c | 33 --------------- epan/dissectors/packet-idmp.h | 3 -- epan/dissectors/packet-ieee1609dot2.c | 33 --------------- epan/dissectors/packet-ieee1609dot2.h | 15 ------- epan/dissectors/packet-ilp.c | 39 ----------------- epan/dissectors/packet-inap.c | 51 ----------------------- epan/dissectors/packet-inap.h | 9 ---- epan/dissectors/packet-isdn-sup.c | 69 ------------------------------- epan/dissectors/packet-its.c | 33 --------------- epan/dissectors/packet-its.h | 15 ------- epan/dissectors/packet-kerberos.c | 39 ----------------- epan/dissectors/packet-kerberos.h | 9 ---- epan/dissectors/packet-lcsap.c | 45 -------------------- epan/dissectors/packet-lcsap.h | 9 ---- epan/dissectors/packet-ldap.c | 39 ----------------- epan/dissectors/packet-ldap.h | 3 -- epan/dissectors/packet-lix2.c | 33 --------------- epan/dissectors/packet-lnpdqp.c | 33 --------------- epan/dissectors/packet-logotypecertextn.c | 39 ----------------- epan/dissectors/packet-logotypecertextn.h | 3 -- epan/dissectors/packet-lpp.c | 39 ----------------- epan/dissectors/packet-lpp.h | 9 ---- epan/dissectors/packet-lppa.c | 45 -------------------- epan/dissectors/packet-lppa.h | 9 ---- epan/dissectors/packet-lppe.c | 39 ----------------- epan/dissectors/packet-lte-rrc.c | 45 -------------------- epan/dissectors/packet-lte-rrc.h | 9 ---- epan/dissectors/packet-m2ap.c | 45 -------------------- epan/dissectors/packet-m3ap.c | 45 -------------------- epan/dissectors/packet-mms.c | 33 --------------- epan/dissectors/packet-mms.h | 9 ---- epan/dissectors/packet-mpeg-audio.c | 33 --------------- epan/dissectors/packet-mpeg-pes.c | 33 --------------- epan/dissectors/packet-mudurl.c | 27 ------------ epan/dissectors/packet-nbap.c | 45 -------------------- epan/dissectors/packet-nbap.h | 3 -- epan/dissectors/packet-ngap.c | 45 -------------------- epan/dissectors/packet-ngap.h | 9 ---- epan/dissectors/packet-nist-csor.c | 39 ----------------- epan/dissectors/packet-nist-csor.h | 9 ---- epan/dissectors/packet-novell_pkis.c | 39 ----------------- epan/dissectors/packet-nr-rrc.c | 45 -------------------- epan/dissectors/packet-nr-rrc.h | 9 ---- epan/dissectors/packet-nrppa.c | 45 -------------------- epan/dissectors/packet-nrppa.h | 9 ---- epan/dissectors/packet-ns_cert_exts.c | 39 ----------------- epan/dissectors/packet-ocsp.c | 39 ----------------- epan/dissectors/packet-ocsp.h | 3 -- epan/dissectors/packet-p1.c | 63 ---------------------------- epan/dissectors/packet-p1.h | 15 ------- epan/dissectors/packet-p22.c | 45 -------------------- epan/dissectors/packet-p22.h | 9 ---- epan/dissectors/packet-p7.c | 63 ---------------------------- epan/dissectors/packet-p7.h | 9 ---- epan/dissectors/packet-p772.c | 45 -------------------- epan/dissectors/packet-p772.h | 3 -- epan/dissectors/packet-pcap.c | 45 -------------------- epan/dissectors/packet-pkcs1.c | 39 ----------------- epan/dissectors/packet-pkcs1.h | 9 ---- epan/dissectors/packet-pkcs10.c | 39 ----------------- epan/dissectors/packet-pkcs10.h | 9 ---- epan/dissectors/packet-pkcs12.c | 39 ----------------- epan/dissectors/packet-pkcs12.h | 3 -- epan/dissectors/packet-pkinit.c | 39 ----------------- epan/dissectors/packet-pkinit.h | 9 ---- epan/dissectors/packet-pkix1explicit.c | 39 ----------------- epan/dissectors/packet-pkix1explicit.h | 9 ---- epan/dissectors/packet-pkix1implicit.c | 39 ----------------- epan/dissectors/packet-pkix1implicit.h | 9 ---- epan/dissectors/packet-pkixac.c | 45 -------------------- epan/dissectors/packet-pkixac.h | 3 -- epan/dissectors/packet-pkixproxy.c | 39 ----------------- epan/dissectors/packet-pkixproxy.h | 3 -- epan/dissectors/packet-pkixqualified.c | 39 ----------------- epan/dissectors/packet-pkixqualified.h | 3 -- epan/dissectors/packet-pkixtsp.c | 39 ----------------- epan/dissectors/packet-pkixtsp.h | 3 -- epan/dissectors/packet-pres.c | 33 --------------- epan/dissectors/packet-pres.h | 3 -- epan/dissectors/packet-q932-ros.c | 33 --------------- epan/dissectors/packet-q932.c | 33 --------------- epan/dissectors/packet-q932.h | 9 ---- epan/dissectors/packet-qsig.c | 57 ------------------------- epan/dissectors/packet-qsig.h | 9 ---- epan/dissectors/packet-ranap.c | 45 -------------------- epan/dissectors/packet-ranap.h | 9 ---- epan/dissectors/packet-rnsap.c | 45 -------------------- epan/dissectors/packet-ros.c | 33 --------------- epan/dissectors/packet-ros.h | 9 ---- epan/dissectors/packet-rrc.c | 45 -------------------- epan/dissectors/packet-rrc.h | 9 ---- epan/dissectors/packet-rrlp.c | 39 ----------------- epan/dissectors/packet-rtse.c | 33 --------------- epan/dissectors/packet-rtse.h | 9 ---- epan/dissectors/packet-rua.c | 45 -------------------- epan/dissectors/packet-s1ap.c | 45 -------------------- epan/dissectors/packet-s1ap.h | 9 ---- epan/dissectors/packet-sabp.c | 45 -------------------- epan/dissectors/packet-sbc-ap.c | 45 -------------------- epan/dissectors/packet-smrse.c | 33 --------------- epan/dissectors/packet-smrse.h | 3 -- epan/dissectors/packet-snmp.c | 33 --------------- epan/dissectors/packet-snmp.h | 3 -- epan/dissectors/packet-spnego.c | 33 --------------- epan/dissectors/packet-sv.c | 33 --------------- epan/dissectors/packet-sv.h | 3 -- epan/dissectors/packet-t124.c | 33 --------------- epan/dissectors/packet-t124.h | 9 ---- epan/dissectors/packet-t125.c | 33 --------------- epan/dissectors/packet-t38.c | 33 --------------- epan/dissectors/packet-t38.h | 9 ---- epan/dissectors/packet-tcap.c | 39 ----------------- epan/dissectors/packet-tcap.h | 9 ---- epan/dissectors/packet-tcg-cp-oids.c | 39 ----------------- epan/dissectors/packet-tcg-cp-oids.h | 9 ---- epan/dissectors/packet-tetra.c | 33 --------------- epan/dissectors/packet-tetra.h | 3 -- epan/dissectors/packet-ulp.c | 39 ----------------- epan/dissectors/packet-wlancertextn.c | 39 ----------------- epan/dissectors/packet-wlancertextn.h | 3 -- epan/dissectors/packet-x2ap.c | 45 -------------------- epan/dissectors/packet-x2ap.h | 9 ---- epan/dissectors/packet-x509af.c | 39 ----------------- epan/dissectors/packet-x509af.h | 9 ---- epan/dissectors/packet-x509ce.c | 39 ----------------- epan/dissectors/packet-x509ce.h | 9 ---- epan/dissectors/packet-x509if.c | 39 ----------------- epan/dissectors/packet-x509if.h | 9 ---- epan/dissectors/packet-x509sat.c | 45 -------------------- epan/dissectors/packet-x509sat.h | 9 ---- epan/dissectors/packet-xnap.c | 45 -------------------- epan/dissectors/packet-xnap.h | 9 ---- epan/dissectors/packet-z3950.c | 39 ----------------- 209 files changed, 5505 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index 9199021251..e7ab0f601c 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -3,9 +3,6 @@ /* packet-HI2Operations.c */ /* asn2wrs.py -b -L -p HI2Operations -c ./HI2Operations.cnf -s ./packet-HI2Operations-template -D . -O ../.. HI2Operations_ver11.asn HI3CCLinkData.asn UmtsHI2Operations.asn TS101909201.asn PCESP.asn EN301040.asn */ -/* Input file: packet-HI2Operations-template.c */ - -#line 1 "./asn1/HI2Operations/packet-HI2Operations-template.c" /* packet-HI2Operations.c * Routines for HI2 (ETSI TS 101 671 V3.5.1 (2009-11)) * Erwin van Eijk 2010 @@ -37,9 +34,6 @@ void proto_reg_handoff_HI2Operations(void); /* Initialize the protocol and registered fields */ int proto_HI2Operations = -1; - -/*--- Included file: packet-HI2Operations-hf.c ---*/ -#line 1 "./asn1/HI2Operations/packet-HI2Operations-hf.c" static int hf_HI2Operations_IRIsContent_PDU = -1; /* IRIsContent */ static int hf_HI2Operations_UUS1_Content_PDU = -1; /* UUS1_Content */ static int hf_HI2Operations_iRIContent = -1; /* IRIContent */ @@ -365,13 +359,7 @@ static int hf_HI2Operations_lai = -1; /* LocationAreaType */ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ -/*--- End of included file: packet-HI2Operations-hf.c ---*/ -#line 33 "./asn1/HI2Operations/packet-HI2Operations-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-HI2Operations-ett.c ---*/ -#line 1 "./asn1/HI2Operations/packet-HI2Operations-ett.c" static gint ett_HI2Operations_IRIsContent = -1; static gint ett_HI2Operations_IRISequence = -1; static gint ett_HI2Operations_IRIContent = -1; @@ -477,12 +465,6 @@ static gint ett_HI2Operations_LocationType_en301040 = -1; static gint ett_HI2Operations_TETRACGIType = -1; static gint ett_HI2Operations_TSIType = -1; -/*--- End of included file: packet-HI2Operations-ett.c ---*/ -#line 36 "./asn1/HI2Operations/packet-HI2Operations-template.c" - - -/*--- Included file: packet-HI2Operations-fn.c ---*/ -#line 1 "./asn1/HI2Operations/packet-HI2Operations-fn.c" static int @@ -3920,18 +3902,12 @@ static int dissect_UUS1_Content_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-HI2Operations-fn.c ---*/ -#line 38 "./asn1/HI2Operations/packet-HI2Operations-template.c" - /*--- proto_register_HI2Operations ----------------------------------------------*/ void proto_register_HI2Operations(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-HI2Operations-hfarr.c ---*/ -#line 1 "./asn1/HI2Operations/packet-HI2Operations-hfarr.c" { &hf_HI2Operations_IRIsContent_PDU, { "IRIsContent", "HI2Operations.IRIsContent", FT_UINT32, BASE_DEC, VALS(HI2Operations_IRIsContent_vals), 0, @@ -5228,16 +5204,10 @@ void proto_register_HI2Operations(void) { { "ssi", "HI2Operations.ssi", FT_BYTES, BASE_NONE, NULL, 0, "SSIType", HFILL }}, - -/*--- End of included file: packet-HI2Operations-hfarr.c ---*/ -#line 46 "./asn1/HI2Operations/packet-HI2Operations-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-HI2Operations-ettarr.c ---*/ -#line 1 "./asn1/HI2Operations/packet-HI2Operations-ettarr.c" &ett_HI2Operations_IRIsContent, &ett_HI2Operations_IRISequence, &ett_HI2Operations_IRIContent, @@ -5342,9 +5312,6 @@ void proto_register_HI2Operations(void) { &ett_HI2Operations_LocationType_en301040, &ett_HI2Operations_TETRACGIType, &ett_HI2Operations_TSIType, - -/*--- End of included file: packet-HI2Operations-ettarr.c ---*/ -#line 51 "./asn1/HI2Operations/packet-HI2Operations-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index fb80bc199b..9750db09bb 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -3,9 +3,6 @@ /* packet-acp133.c */ /* asn2wrs.py -b -L -p acp133 -c ./acp133.cnf -s ./packet-acp133-template -D . -O ../.. acp133.asn MHSDirectoryObjectsAndAttributes.asn */ -/* Input file: packet-acp133-template.c */ - -#line 1 "./asn1/acp133/packet-acp133-template.c" /* packet-acp133.c * Routines for ACP133 specific syntaxes in X.500 packet dissection * Graeme Lunt 2005 @@ -44,9 +41,6 @@ void proto_reg_handoff_acp133(void); static int proto_acp133 = -1; - -/*--- Included file: packet-acp133-hf.c ---*/ -#line 1 "./asn1/acp133/packet-acp133-hf.c" static int hf_acp133_ACPPreferredDelivery_PDU = -1; /* ACPPreferredDelivery */ static int hf_acp133_ALType_PDU = -1; /* ALType */ static int hf_acp133_Community_PDU = -1; /* Community */ @@ -135,14 +129,8 @@ static int hf_acp133_OnSupported_acp127_nn = -1; static int hf_acp133_OnSupported_acp127_pn = -1; static int hf_acp133_OnSupported_acp127_tn = -1; -/*--- End of included file: packet-acp133-hf.c ---*/ -#line 40 "./asn1/acp133/packet-acp133-template.c" - /* Initialize the subtree pointers */ static gint ett_acp133 = -1; - -/*--- Included file: packet-acp133-ett.c ---*/ -#line 1 "./asn1/acp133/packet-acp133-ett.c" static gint ett_acp133_OnSupported = -1; static gint ett_acp133_Addressees = -1; static gint ett_acp133_MonthlyUKMs = -1; @@ -164,12 +152,6 @@ static gint ett_acp133_SET_OF_Capability = -1; static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; -/*--- End of included file: packet-acp133-ett.c ---*/ -#line 44 "./asn1/acp133/packet-acp133-template.c" - - -/*--- Included file: packet-acp133-fn.c ---*/ -#line 1 "./asn1/acp133/packet-acp133-fn.c" static const value_string acp133_ACPPreferredDelivery_vals[] = { { 0, "smtp" }, @@ -1207,9 +1189,6 @@ static int dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-acp133-fn.c ---*/ -#line 46 "./asn1/acp133/packet-acp133-template.c" - /*--- proto_register_acp133 -------------------------------------------*/ void proto_register_acp133(void) { @@ -1217,9 +1196,6 @@ void proto_register_acp133(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-acp133-hfarr.c ---*/ -#line 1 "./asn1/acp133/packet-acp133-hfarr.c" { &hf_acp133_ACPPreferredDelivery_PDU, { "ACPPreferredDelivery", "acp133.ACPPreferredDelivery", FT_UINT32, BASE_DEC, VALS(acp133_ACPPreferredDelivery_vals), 0, @@ -1564,17 +1540,11 @@ void proto_register_acp133(void) { { "acp127-tn", "acp133.OnSupported.acp127.tn", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 55 "./asn1/acp133/packet-acp133-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_acp133, - -/*--- Included file: packet-acp133-ettarr.c ---*/ -#line 1 "./asn1/acp133/packet-acp133-ettarr.c" &ett_acp133_OnSupported, &ett_acp133_Addressees, &ett_acp133_MonthlyUKMs, @@ -1595,9 +1565,6 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_Capability, &ett_acp133_Capability, &ett_acp133_SET_OF_ExtendedContentType, - -/*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 61 "./asn1/acp133/packet-acp133-template.c" }; /* Register protocol */ @@ -1613,9 +1580,6 @@ void proto_register_acp133(void) { /*--- proto_reg_handoff_acp133 --- */ void proto_reg_handoff_acp133(void) { - -/*--- Included file: packet-acp133-dis-tab.c ---*/ -#line 1 "./asn1/acp133/packet-acp133-dis-tab.c" register_ber_oid_dissector("2.6.5.2.4", dissect_DLSubmitPermission_PDU, proto_acp133, "id-at-mhs-dl-submit-permissions"); register_ber_oid_dissector("2.6.5.2.13", dissect_DLPolicy_PDU, proto_acp133, "id-at-mhs-dl-policy"); register_ber_oid_dissector("2.6.5.2.16", dissect_AddressCapabilities_PDU, proto_acp133, "id-at-mhs-or-addresses-with-capabilities"); @@ -1668,9 +1632,6 @@ void proto_reg_handoff_acp133(void) { register_ber_oid_dissector("2.16.840.1.101.2.2.1.189", dissect_ACPNoAttachments_PDU, proto_acp133, "id-at-aCPNoAttachments"); -/*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 77 "./asn1/acp133/packet-acp133-template.c" - /* X.402 Object Classes */ oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); oid_add_from_string("id-oc-mhs-message-store","2.6.5.1.1"); diff --git a/epan/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h index b2ff35a9eb..0933a180db 100644 --- a/epan/dissectors/packet-acp133.h +++ b/epan/dissectors/packet-acp133.h @@ -3,9 +3,6 @@ /* packet-acp133.h */ /* asn2wrs.py -b -L -p acp133 -c ./acp133.cnf -s ./packet-acp133-template -D . -O ../.. acp133.asn MHSDirectoryObjectsAndAttributes.asn */ -/* Input file: packet-acp133-template.h */ - -#line 1 "./asn1/acp133/packet-acp133-template.h" /* packet-acp133.h * Routines for ACP133 specific syntaxes in X.500 packet dissection * Graeme Lunt 2005 diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 123486f93e..3772683adb 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -3,9 +3,6 @@ /* packet-acse.c */ /* asn2wrs.py -b -C -L -p acse -c ./acse.cnf -s ./packet-acse-template -D . -O ../.. acse.asn */ -/* Input file: packet-acse-template.c */ - -#line 1 "./asn1/acse/packet-acse-template.c" /*XXX There is a bug in asn2wrs that it can not yet handle tagged assignments such as EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE { @@ -60,9 +57,6 @@ int proto_clacse = -1; - -/*--- Included file: packet-acse-hf.c ---*/ -#line 1 "./asn1/acse/packet-acse-hf.c" static int hf_acse_direct_reference = -1; /* T_direct_reference */ static int hf_acse_indirect_reference = -1; /* T_indirect_reference */ static int hf_acse_data_value_descriptor = -1; /* ObjectDescriptor */ @@ -171,16 +165,10 @@ static int hf_acse_ACSE_requirements_authentication = -1; static int hf_acse_ACSE_requirements_aSO_context_negotiation = -1; static int hf_acse_ACSE_requirements_higher_level_association = -1; static int hf_acse_ACSE_requirements_nested_association = -1; - -/*--- End of included file: packet-acse-hf.c ---*/ -#line 56 "./asn1/acse/packet-acse-template.c" static gint hf_acse_user_data = -1; /* Initialize the subtree pointers */ static gint ett_acse = -1; - -/*--- Included file: packet-acse-ett.c ---*/ -#line 1 "./asn1/acse/packet-acse-ett.c" static gint ett_acse_EXTERNALt_U = -1; static gint ett_acse_T_encoding = -1; static gint ett_acse_ACSE_apdu = -1; @@ -217,9 +205,6 @@ static gint ett_acse_T_presentation_data_values = -1; static gint ett_acse_Authentication_value_other = -1; static gint ett_acse_Authentication_value = -1; -/*--- End of included file: packet-acse-ett.c ---*/ -#line 61 "./asn1/acse/packet-acse-template.c" - static expert_field ei_acse_dissector_not_available = EI_INIT; static expert_field ei_acse_malformed = EI_INIT; static expert_field ei_acse_invalid_oid = EI_INIT; @@ -284,9 +269,6 @@ find_oid_by_ctx_id(packet_info *pinfo _U_, guint32 idx) # endif /* NOT_NEEDED */ -/*--- Included file: packet-acse-fn.c ---*/ -#line 1 "./asn1/acse/packet-acse-fn.c" - static int dissect_acse_T_direct_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1634,9 +1616,6 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ } -/*--- End of included file: packet-acse-fn.c ---*/ -#line 126 "./asn1/acse/packet-acse-template.c" - /* * Dissect ACSE PDUs inside a PPDU. @@ -1747,9 +1726,6 @@ void proto_register_acse(void) { { "User data", "acse.user_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-acse-hfarr.c ---*/ -#line 1 "./asn1/acse/packet-acse-hfarr.c" { &hf_acse_direct_reference, { "direct-reference", "acse.direct_reference", FT_OID, BASE_NONE, NULL, 0, @@ -2178,17 +2154,11 @@ void proto_register_acse(void) { { "nested-association", "acse.ACSE.requirements.nested.association", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-acse-hfarr.c ---*/ -#line 238 "./asn1/acse/packet-acse-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_acse, - -/*--- Included file: packet-acse-ettarr.c ---*/ -#line 1 "./asn1/acse/packet-acse-ettarr.c" &ett_acse_EXTERNALt_U, &ett_acse_T_encoding, &ett_acse_ACSE_apdu, @@ -2224,9 +2194,6 @@ void proto_register_acse(void) { &ett_acse_T_presentation_data_values, &ett_acse_Authentication_value_other, &ett_acse_Authentication_value, - -/*--- End of included file: packet-acse-ettarr.c ---*/ -#line 244 "./asn1/acse/packet-acse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h index 8ac6f2831c..7505cc3ba8 100644 --- a/epan/dissectors/packet-acse.h +++ b/epan/dissectors/packet-acse.h @@ -3,9 +3,6 @@ /* packet-acse.h */ /* asn2wrs.py -b -C -L -p acse -c ./acse.cnf -s ./packet-acse-template -D . -O ../.. acse.asn */ -/* Input file: packet-acse-template.h */ - -#line 1 "./asn1/acse/packet-acse-template.h" /* packet-acse.h * Routines for ACSE packet dissection * Ronnie Sahlberg 2005 @@ -21,9 +18,6 @@ #define PACKET_ACSE_H #include - -/*--- Included file: packet-acse-exp.h ---*/ -#line 1 "./asn1/acse/packet-acse-exp.h" extern const value_string acse_AP_title_vals[]; extern const value_string acse_ASO_qualifier_vals[]; extern const value_string acse_AE_title_vals[]; @@ -35,8 +29,5 @@ int dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs int dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_acse_AP_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-acse-exp.h ---*/ -#line 17 "./asn1/acse/packet-acse-template.h" - #endif /* PACKET_ACSE_H */ diff --git a/epan/dissectors/packet-ain.c b/epan/dissectors/packet-ain.c index 6f7eeb15f5..b27c6d846b 100644 --- a/epan/dissectors/packet-ain.c +++ b/epan/dissectors/packet-ain.c @@ -3,9 +3,6 @@ /* packet-ain.c */ /* asn2wrs.py -b -L -p ain -c ./ain.cnf -s ./packet-ain-template -D . -O ../.. AIN-Operations.asn AIN-Errors.asn AIN-Parameters.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-ain-template.c */ - -#line 1 "./asn1/ain/packet-ain-template.c" /* packet-ain-template.c * Routines for AIN * Copyright 2018, Anders Broman @@ -54,14 +51,8 @@ static int proto_ain = -1; static dissector_handle_t ain_handle; /* include constants */ - -/*--- Included file: packet-ain-val.h ---*/ -#line 1 "./asn1/ain/packet-ain-val.h" #define noInvokeId NULL -/*--- End of included file: packet-ain-val.h ---*/ -#line 50 "./asn1/ain/packet-ain-template.c" - static int hf_ain_ext_type_oid = -1; static int hf_ain_odd_even_indicator = -1; static int hf_ain_nature_of_address = -1; @@ -73,9 +64,6 @@ static int hf_ain_nr_digits = -1; static int hf_ain_carrier_bcd_digits = -1; static int hf_ain_amaslpid = -1; - -/*--- Included file: packet-ain-hf.c ---*/ -#line 1 "./asn1/ain/packet-ain-hf.c" static int hf_ain_CallInfoFromResourceArg_PDU = -1; /* CallInfoFromResourceArg */ static int hf_ain_CloseArg_PDU = -1; /* CloseArg */ static int hf_ain_CTRClearArg_PDU = -1; /* CTRClearArg */ @@ -561,18 +549,12 @@ static int hf_ain_Request6_delayInterval = -1; static int hf_ain_RequestMemorySlot_incoming = -1; static int hf_ain_RequestMemorySlot_outgoing = -1; -/*--- End of included file: packet-ain-hf.c ---*/ -#line 63 "./asn1/ain/packet-ain-template.c" - /* Initialize the subtree pointers */ static int ett_ain = -1; static int ett_ain_digits = -1; static int ett_ain_carrierformat = -1; static int ett_ain_amaslpid = -1; - -/*--- Included file: packet-ain-ett.c ---*/ -#line 1 "./asn1/ain/packet-ain-ett.c" static gint ett_ain_CallInfoFromResourceArg = -1; static gint ett_ain_CloseArg = -1; static gint ett_ain_CTRClearArg = -1; @@ -748,9 +730,6 @@ static gint ett_ain_Reject = -1; static gint ett_ain_T_problem = -1; static gint ett_ain_InvokeId = -1; -/*--- End of included file: packet-ain-ett.c ---*/ -#line 71 "./asn1/ain/packet-ain-template.c" - static expert_field ei_ain_unknown_invokeData = EI_INIT; static expert_field ei_ain_unknown_returnResultData = EI_INIT; static expert_field ei_ain_unknown_returnErrorData = EI_INIT; @@ -804,9 +783,6 @@ static const value_string ain_nature_of_carrier_vals[] = { }; -/*--- Included file: packet-ain-table.c ---*/ -#line 1 "./asn1/ain/packet-ain-table.c" - /* AIN OPERATIONS */ const value_string ain_opr_code_strings[] = { { 26116 , "callInfoFromResource" }, @@ -883,12 +859,6 @@ static const value_string ain_err_code_string_vals[] = { }; -/*--- End of included file: packet-ain-table.c ---*/ -#line 125 "./asn1/ain/packet-ain-template.c" - - -/*--- Included file: packet-ain-fn.c ---*/ -#line 1 "./asn1/ain/packet-ain-fn.c" static int @@ -9015,12 +8985,6 @@ static int dissect_PAR_failureReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } -/*--- End of included file: packet-ain-fn.c ---*/ -#line 127 "./asn1/ain/packet-ain-template.c" - - -/*--- Included file: packet-ain-table2.c ---*/ -#line 1 "./asn1/ain/packet-ain-table2.c" static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { @@ -9283,9 +9247,6 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a } -/*--- End of included file: packet-ain-table2.c ---*/ -#line 129 "./asn1/ain/packet-ain-template.c" - static int dissect_ain(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) @@ -9401,9 +9362,6 @@ void proto_register_ain(void) { FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, - -/*--- Included file: packet-ain-hfarr.c ---*/ -#line 1 "./asn1/ain/packet-ain-hfarr.c" { &hf_ain_CallInfoFromResourceArg_PDU, { "CallInfoFromResourceArg", "ain.CallInfoFromResourceArg_element", FT_NONE, BASE_NONE, NULL, 0, @@ -11336,9 +11294,6 @@ void proto_register_ain(void) { { "outgoing", "ain.RequestMemorySlot.outgoing", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-ain-hfarr.c ---*/ -#line 246 "./asn1/ain/packet-ain-template.c" }; /* List of subtrees */ @@ -11347,9 +11302,6 @@ void proto_register_ain(void) { &ett_ain_digits, &ett_ain_carrierformat, &ett_ain_amaslpid, - -/*--- Included file: packet-ain-ettarr.c ---*/ -#line 1 "./asn1/ain/packet-ain-ettarr.c" &ett_ain_CallInfoFromResourceArg, &ett_ain_CloseArg, &ett_ain_CTRClearArg, @@ -11524,9 +11476,6 @@ void proto_register_ain(void) { &ett_ain_Reject, &ett_ain_T_problem, &ett_ain_InvokeId, - -/*--- End of included file: packet-ain-ettarr.c ---*/ -#line 255 "./asn1/ain/packet-ain-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 757642f241..d06408b51a 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -3,9 +3,6 @@ /* packet-ansi_map.c */ /* asn2wrs.py -b -L -p ansi_map -c ./ansi_map.cnf -s ./packet-ansi_map-template -D . -O ../.. ansi_map.asn */ -/* Input file: packet-ansi_map-template.c */ - -#line 1 "./asn1/ansi_map/packet-ansi_map-template.c" /* packet-ansi_map.c * Routines for ANSI 41 Mobile Application Part (IS41 MAP) dissection * Specications from 3GPP2 (www.3gpp2.org) @@ -323,9 +320,6 @@ static int hf_ansi_map_point_code = -1; static int hf_ansi_map_SSN = -1; static int hf_ansi_map_win_trigger_list = -1; - -/*--- Included file: packet-ansi_map-hf.c ---*/ -#line 1 "./asn1/ansi_map/packet-ansi_map-hf.c" static int hf_ansi_map_electronicSerialNumber = -1; /* ElectronicSerialNumber */ static int hf_ansi_map_msid = -1; /* MSID */ static int hf_ansi_map_authenticationAlgorithmVersion = -1; /* AuthenticationAlgorithmVersion */ @@ -874,9 +868,6 @@ static int hf_ansi_map_statusRequestRes = -1; /* StatusRequestRes */ static int hf_ansi_map_interSystemSMSDeliveryPointToPointRes = -1; /* InterSystemSMSDeliveryPointToPointRes */ static int hf_ansi_map_qualificationRequest2Res = -1; /* QualificationRequest2Res */ -/*--- End of included file: packet-ansi_map-hf.c ---*/ -#line 319 "./asn1/ansi_map/packet-ansi_map-template.c" - /* Initialize the subtree pointers */ static gint ett_ansi_map = -1; static gint ett_mintype = -1; @@ -907,9 +898,6 @@ static gint ett_cdmaserviceoption = -1; static gint ett_systemcapabilities = -1; static gint ett_sms_originationrestrictions = -1; - -/*--- Included file: packet-ansi_map-ett.c ---*/ -#line 1 "./asn1/ansi_map/packet-ansi_map-ett.c" static gint ett_ansi_map_AuthenticationDirective_U = -1; static gint ett_ansi_map_AuthenticationDirectiveRes_U = -1; static gint ett_ansi_map_AuthenticationDirectiveForward_U = -1; @@ -1134,9 +1122,6 @@ static gint ett_ansi_map_NewlyAssignedMSID = -1; static gint ett_ansi_map_InvokeData = -1; static gint ett_ansi_map_ReturnData = -1; -/*--- End of included file: packet-ansi_map-ett.c ---*/ -#line 351 "./asn1/ansi_map/packet-ansi_map-template.c" - static expert_field ei_ansi_map_nr_not_used = EI_INIT; static expert_field ei_ansi_map_unknown_invokeData_blob = EI_INIT; static expert_field ei_ansi_map_no_data = EI_INIT; @@ -4390,9 +4375,6 @@ static const value_string ansi_map_VoicePrivacyReport_vals[] = { -/*--- Included file: packet-ansi_map-fn.c ---*/ -#line 1 "./asn1/ansi_map/packet-ansi_map-fn.c" - static int dissect_ansi_map_ElectronicSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -15159,9 +15141,6 @@ dissect_ansi_map_QualificationRequest2Res(gboolean implicit_tag _U_, tvbuff_t *t -/*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3605 "./asn1/ansi_map/packet-ansi_map-template.c" - /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 */ @@ -16929,9 +16908,6 @@ void proto_register_ansi_map(void) { FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - -/*--- Included file: packet-ansi_map-hfarr.c ---*/ -#line 1 "./asn1/ansi_map/packet-ansi_map-hfarr.c" { &hf_ansi_map_electronicSerialNumber, { "electronicSerialNumber", "ansi_map.electronicSerialNumber", FT_BYTES, BASE_NONE, NULL, 0, @@ -19120,9 +19096,6 @@ void proto_register_ansi_map(void) { { "qualificationRequest2Res", "ansi_map.qualificationRequest2Res_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5374 "./asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19155,9 +19128,6 @@ void proto_register_ansi_map(void) { &ett_cdmaserviceoption, &ett_sms_originationrestrictions, &ett_systemcapabilities, - -/*--- Included file: packet-ansi_map-ettarr.c ---*/ -#line 1 "./asn1/ansi_map/packet-ansi_map-ettarr.c" &ett_ansi_map_AuthenticationDirective_U, &ett_ansi_map_AuthenticationDirectiveRes_U, &ett_ansi_map_AuthenticationDirectiveForward_U, @@ -19381,9 +19351,6 @@ void proto_register_ansi_map(void) { &ett_ansi_map_NewlyAssignedMSID, &ett_ansi_map_InvokeData, &ett_ansi_map_ReturnData, - -/*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5407 "./asn1/ansi_map/packet-ansi_map-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ansi_map.h b/epan/dissectors/packet-ansi_map.h index 09e84537cf..ec99de46ef 100644 --- a/epan/dissectors/packet-ansi_map.h +++ b/epan/dissectors/packet-ansi_map.h @@ -3,9 +3,6 @@ /* packet-ansi_map.h */ /* asn2wrs.py -b -L -p ansi_map -c ./ansi_map.cnf -s ./packet-ansi_map-template -D . -O ../.. ansi_map.asn */ -/* Input file: packet-ansi_map-template.h */ - -#line 1 "./asn1/ansi_map/packet-ansi_map-template.h" /* packet-ansi_map.h * Routines for ansi_map packet dissection * Copyright 2005, Anders Broman diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 32d8cc1033..444558271d 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -3,9 +3,6 @@ /* packet-ansi_tcap.c */ /* asn2wrs.py -b -L -p ansi_tcap -c ./ansi_tcap.cnf -s ./packet-ansi_tcap-template -D . -O ../.. TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ -/* Input file: packet-ansi_tcap-template.c */ - -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" /* packet-ansi_tcap-template.c * Routines for ANSI TCAP * Copyright 2007 Anders Broman @@ -59,9 +56,6 @@ static int hf_ansi_tcap_bit_h = -1; static int hf_ansi_tcap_op_family = -1; static int hf_ansi_tcap_op_specifier = -1; - -/*--- Included file: packet-ansi_tcap-hf.c ---*/ -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-hf.c" static int hf_ansi_tcap_national = -1; /* T_national */ static int hf_ansi_tcap_private = -1; /* T_private */ static int hf_ansi_tcap_national_01 = -1; /* INTEGER_M128_127 */ @@ -114,9 +108,6 @@ static int hf_ansi_tcap_reject_parameter = -1; /* T_reject_parameter */ static int hf_ansi_tcap_paramSequence = -1; /* T_paramSequence */ static int hf_ansi_tcap_paramSet = -1; /* T_paramSet */ -/*--- End of included file: packet-ansi_tcap-hf.c ---*/ -#line 55 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" - /* Initialize the subtree pointers */ static gint ett_tcap = -1; static gint ett_param = -1; @@ -136,9 +127,6 @@ static struct tcaphash_context_t * gp_tcap_context=NULL; /* Note the high bit should be masked off when registering in this table (0x7fff)*/ static dissector_table_t ansi_tcap_national_opcode_table; /* National Operation Codes */ - -/*--- Included file: packet-ansi_tcap-ett.c ---*/ -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-ett.c" static gint ett_ansi_tcap_OperationCode = -1; static gint ett_ansi_tcap_ErrorCode = -1; static gint ett_ansi_tcap_PackageType = -1; @@ -162,9 +150,6 @@ static gint ett_ansi_tcap_T_reject_parameter = -1; static gint ett_ansi_tcap_T_paramSequence = -1; static gint ett_ansi_tcap_T_paramSet = -1; -/*--- End of included file: packet-ansi_tcap-ett.c ---*/ -#line 76 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" - #define MAX_SSN 254 extern gboolean gtcap_PersistentSRT; @@ -393,9 +378,6 @@ find_tcap_subdissector(tvbuff_t *tvb, asn1_ctx_t *actx, proto_tree *tree){ } -/*--- Included file: packet-ansi_tcap-fn.c ---*/ -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-fn.c" - static int dissect_ansi_tcap_T_national(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1327,9 +1309,6 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -/*--- End of included file: packet-ansi_tcap-fn.c ---*/ -#line 305 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" - @@ -1464,9 +1443,6 @@ proto_register_ansi_tcap(void) FT_UINT16, BASE_DEC, NULL, 0x00ff, NULL, HFILL } }, - -/*--- Included file: packet-ansi_tcap-hfarr.c ---*/ -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-hfarr.c" { &hf_ansi_tcap_national, { "national", "ansi_tcap.national", FT_INT32, BASE_DEC, NULL, 0, @@ -1671,9 +1647,6 @@ proto_register_ansi_tcap(void) { "paramSet", "ansi_tcap.paramSet_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-ansi_tcap-hfarr.c ---*/ -#line 441 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" }; /* Setup protocol subtree array */ @@ -1684,9 +1657,6 @@ proto_register_ansi_tcap(void) &ett_dtid, &ett_ansi_tcap_stat, &ett_ansi_tcap_op_code_nat, - -/*--- Included file: packet-ansi_tcap-ettarr.c ---*/ -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-ettarr.c" &ett_ansi_tcap_OperationCode, &ett_ansi_tcap_ErrorCode, &ett_ansi_tcap_PackageType, @@ -1709,9 +1679,6 @@ proto_register_ansi_tcap(void) &ett_ansi_tcap_T_reject_parameter, &ett_ansi_tcap_T_paramSequence, &ett_ansi_tcap_T_paramSet, - -/*--- End of included file: packet-ansi_tcap-ettarr.c ---*/ -#line 452 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ansi_tcap.h b/epan/dissectors/packet-ansi_tcap.h index 05c9af47fe..ed2f7f198b 100644 --- a/epan/dissectors/packet-ansi_tcap.h +++ b/epan/dissectors/packet-ansi_tcap.h @@ -3,9 +3,6 @@ /* packet-ansi_tcap.h */ /* asn2wrs.py -b -L -p ansi_tcap -c ./ansi_tcap.cnf -s ./packet-ansi_tcap-template -D . -O ../.. TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ -/* Input file: packet-ansi_tcap-template.h */ - -#line 1 "./asn1/ansi_tcap/packet-ansi_tcap-template.h" /* packet-ansi_tcap.h * * Copyright 2007 Anders Broman diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c index bb1f8dcbf8..52b7e9002e 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -3,9 +3,6 @@ /* packet-atn-cm.c */ /* asn2wrs.py -u -L -p atn-cm -c ./atn-cm.cnf -s ./packet-atn-cm-template -D . -O ../.. atn-cm.asn */ -/* Input file: packet-atn-cm-template.c */ - -#line 1 "./asn1/atn-cm/packet-atn-cm-template.c" /* packet-atn-cm.c * By Mathias Guettler * Copyright 2013 @@ -47,9 +44,6 @@ void proto_register_atn_cm(void); void proto_reg_handoff_atn_cm(void); - -/*--- Included file: packet-atn-cm-hf.c ---*/ -#line 1 "./asn1/atn-cm/packet-atn-cm-hf.c" static int hf_atn_cm_CMAircraftMessage_PDU = -1; /* CMAircraftMessage */ static int hf_atn_cm_CMGroundMessage_PDU = -1; /* CMGroundMessage */ static int hf_atn_cm_cmLogonRequest = -1; /* CMLogonRequest */ @@ -91,12 +85,6 @@ static int hf_atn_cm_locSysNselTsel = -1; /* OCTET_STRING_SIZE_10_11 */ static int hf_atn_cm_hours = -1; /* Timehours */ static int hf_atn_cm_minutes = -1; /* Timeminutes */ -/*--- End of included file: packet-atn-cm-hf.c ---*/ -#line 43 "./asn1/atn-cm/packet-atn-cm-template.c" - - -/*--- Included file: packet-atn-cm-ett.c ---*/ -#line 1 "./asn1/atn-cm/packet-atn-cm-ett.c" static gint ett_atn_cm_CMAircraftMessage = -1; static gint ett_atn_cm_CMGroundMessage = -1; static gint ett_atn_cm_APAddress = -1; @@ -112,15 +100,9 @@ static gint ett_atn_cm_DateTime = -1; static gint ett_atn_cm_LongTsap = -1; static gint ett_atn_cm_ShortTsap = -1; static gint ett_atn_cm_Time = -1; - -/*--- End of included file: packet-atn-cm-ett.c ---*/ -#line 45 "./asn1/atn-cm/packet-atn-cm-template.c" static gint ett_atn_cm = -1; -/*--- Included file: packet-atn-cm-fn.c ---*/ -#line 1 "./asn1/atn-cm/packet-atn-cm-fn.c" - static int dissect_atn_cm_AircraftFlightIdentification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -615,9 +597,6 @@ static int dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ return offset; } - -/*--- End of included file: packet-atn-cm-fn.c ---*/ -#line 48 "./asn1/atn-cm/packet-atn-cm-template.c" static int proto_atn_cm = -1; static int @@ -752,9 +731,6 @@ dissect_atn_cm_heur( void proto_register_atn_cm (void) { static hf_register_info hf_atn_cm[] = { - -/*--- Included file: packet-atn-cm-hfarr.c ---*/ -#line 1 "./asn1/atn-cm/packet-atn-cm-hfarr.c" { &hf_atn_cm_CMAircraftMessage_PDU, { "CMAircraftMessage", "atn-cm.CMAircraftMessage", FT_UINT32, BASE_DEC, VALS(atn_cm_CMAircraftMessage_vals), 0, @@ -915,14 +891,8 @@ void proto_register_atn_cm (void) { "minutes", "atn-cm.minutes", FT_UINT32, BASE_DEC, NULL, 0, "Timeminutes", HFILL }}, - -/*--- End of included file: packet-atn-cm-hfarr.c ---*/ -#line 183 "./asn1/atn-cm/packet-atn-cm-template.c" }; static gint *ett[] = { - -/*--- Included file: packet-atn-cm-ettarr.c ---*/ -#line 1 "./asn1/atn-cm/packet-atn-cm-ettarr.c" &ett_atn_cm_CMAircraftMessage, &ett_atn_cm_CMGroundMessage, &ett_atn_cm_APAddress, @@ -938,9 +908,6 @@ void proto_register_atn_cm (void) &ett_atn_cm_LongTsap, &ett_atn_cm_ShortTsap, &ett_atn_cm_Time, - -/*--- End of included file: packet-atn-cm-ettarr.c ---*/ -#line 186 "./asn1/atn-cm/packet-atn-cm-template.c" &ett_atn_cm }; diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index 9b4a8c4eb4..bbf6a7ba11 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -3,9 +3,6 @@ /* packet-atn-cpdlc.c */ /* asn2wrs.py -u -L -p atn-cpdlc -c ./atn-cpdlc.cnf -s ./packet-atn-cpdlc-template -D . -O ../.. atn-cpdlc.asn */ -/* Input file: packet-atn-cpdlc-template.c */ - -#line 1 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /* packet-atn-cpdlc-template.c * By Mathias Guettler * Copyright 2013 @@ -89,9 +86,6 @@ static int dissect_ProtectedAircraftPDUs_PDU( proto_tree *tree _U_, void *data _U_); - -/*--- Included file: packet-atn-cpdlc-hf.c ---*/ -#line 1 "./asn1/atn-cpdlc/packet-atn-cpdlc-hf.c" static int hf_atn_cpdlc_GroundPDUs_PDU = -1; /* GroundPDUs */ static int hf_atn_cpdlc_AircraftPDUs_PDU = -1; /* AircraftPDUs */ static int hf_atn_cpdlc_ProtectedGroundPDUs_PDU = -1; /* ProtectedGroundPDUs */ @@ -694,12 +688,6 @@ static int hf_atn_cpdlc_winds_speed = -1; /* WindSpeed */ static int hf_atn_cpdlc_windSpeedEnglish = -1; /* WindSpeedEnglish */ static int hf_atn_cpdlc_windSpeedMetric = -1; /* WindSpeedMetric */ -/*--- End of included file: packet-atn-cpdlc-hf.c ---*/ -#line 85 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" - - -/*--- Included file: packet-atn-cpdlc-ett.c ---*/ -#line 1 "./asn1/atn-cpdlc/packet-atn-cpdlc-ett.c" static gint ett_atn_cpdlc_GroundPDUs = -1; static gint ett_atn_cpdlc_UplinkMessage = -1; static gint ett_atn_cpdlc_AircraftPDUs = -1; @@ -842,15 +830,9 @@ static gint ett_atn_cpdlc_VerticalRate = -1; static gint ett_atn_cpdlc_WaypointSpeedLevel = -1; static gint ett_atn_cpdlc_Winds = -1; static gint ett_atn_cpdlc_WindSpeed = -1; - -/*--- End of included file: packet-atn-cpdlc-ett.c ---*/ -#line 87 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" static gint ett_atn_cpdlc = -1; -/*--- Included file: packet-atn-cpdlc-fn.c ---*/ -#line 1 "./asn1/atn-cpdlc/packet-atn-cpdlc-fn.c" - static const value_string atn_cpdlc_CPDLCUserAbortReason_vals[] = { { 0, "undefined" }, { 1, "no-message-identification-numbers-available" }, @@ -5294,9 +5276,6 @@ static int dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pin } -/*--- End of included file: packet-atn-cpdlc-fn.c ---*/ -#line 90 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" - /* Wireshark ID of CPDLC protocol */ static int proto_atn_cpdlc = -1; @@ -5510,9 +5489,6 @@ dissect_atn_cpdlc_heur( void proto_register_atn_cpdlc (void) { static hf_register_info hf_atn_cpdlc[] = { - -/*--- Included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 1 "./asn1/atn-cpdlc/packet-atn-cpdlc-hfarr.c" { &hf_atn_cpdlc_GroundPDUs_PDU, { "GroundPDUs", "atn-cpdlc.GroundPDUs", FT_UINT32, BASE_DEC, VALS(atn_cpdlc_GroundPDUs_vals), 0, @@ -7917,15 +7893,9 @@ void proto_register_atn_cpdlc (void) { "windSpeedMetric", "atn-cpdlc.windSpeedMetric", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 305 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" }; static gint *ett[] = { - -/*--- Included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 1 "./asn1/atn-cpdlc/packet-atn-cpdlc-ettarr.c" &ett_atn_cpdlc_GroundPDUs, &ett_atn_cpdlc_UplinkMessage, &ett_atn_cpdlc_AircraftPDUs, @@ -8068,9 +8038,6 @@ void proto_register_atn_cpdlc (void) &ett_atn_cpdlc_WaypointSpeedLevel, &ett_atn_cpdlc_Winds, &ett_atn_cpdlc_WindSpeed, - -/*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 309 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" &ett_atn_cpdlc }; diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index 1d79fdaccc..f496649199 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -3,9 +3,6 @@ /* packet-atn-ulcs.c */ /* asn2wrs.py -u -L -p atn-ulcs -c ./atn-ulcs.cnf -s ./packet-atn-ulcs-template -D . -O ../.. atn-ulcs.asn */ -/* Input file: packet-atn-ulcs-template.c */ - -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" /* packet-atn-ulcs.c * By Mathias Guettler * Copyright 2013 @@ -182,9 +179,6 @@ static gint dissect_atn_ulcs( proto_tree *tree, void *data _U_); - -/*--- Included file: packet-atn-ulcs-hf.c ---*/ -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-hf.c" static int hf_atn_ulcs_Fully_encoded_data_PDU = -1; /* Fully_encoded_data */ static int hf_atn_ulcs_ACSE_apdu_PDU = -1; /* ACSE_apdu */ static int hf_atn_ulcs_Fully_encoded_data_item = -1; /* PDV_list */ @@ -259,12 +253,6 @@ static int hf_atn_ulcs_T_aare_apdu_protocol_version_version1 = -1; static int hf_atn_ulcs_ACSE_requirements_authentication = -1; static int hf_atn_ulcs_ACSE_requirements_application_context_negotiation = -1; -/*--- End of included file: packet-atn-ulcs-hf.c ---*/ -#line 178 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" - - -/*--- Included file: packet-atn-ulcs-ett.c ---*/ -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-ett.c" static gint ett_atn_ulcs_Fully_encoded_data = -1; static gint ett_atn_ulcs_PDV_list = -1; static gint ett_atn_ulcs_T_presentation_data_values = -1; @@ -290,16 +278,10 @@ static gint ett_atn_ulcs_Name = -1; static gint ett_atn_ulcs_RDNSequence = -1; static gint ett_atn_ulcs_RelativeDistinguishedName = -1; static gint ett_atn_ulcs_AttributeTypeAndValue = -1; - -/*--- End of included file: packet-atn-ulcs-ett.c ---*/ -#line 180 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" static gint ett_atn_ulcs = -1; static gint ett_atn_acse = -1; -/*--- Included file: packet-atn-ulcs-fn.c ---*/ -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-fn.c" - static int dissect_atn_ulcs_Transfer_syntax_name(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1617,9 +1599,6 @@ static int dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } -/*--- End of included file: packet-atn-ulcs-fn.c ---*/ -#line 184 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" - #if 0 /* re-implementing external data: packet-per.c */ static const value_string per_External_encoding_vals[] = { @@ -2210,9 +2189,6 @@ static gboolean dissect_atn_ulcs_heur( void proto_register_atn_ulcs (void) { static hf_register_info hf_atn_ulcs[] = { - -/*--- Included file: packet-atn-ulcs-hfarr.c ---*/ -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-hfarr.c" { &hf_atn_ulcs_Fully_encoded_data_PDU, { "Fully-encoded-data", "atn-ulcs.Fully_encoded_data", FT_UINT32, BASE_DEC, NULL, 0, @@ -2501,9 +2477,6 @@ void proto_register_atn_ulcs (void) { "application-context-negotiation", "atn.ulcs.ACSE.requirements.application.context.negotiation", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-atn-ulcs-hfarr.c ---*/ -#line 776 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" {&hf_atn_ses_type, { "SPDU Type", "atn-ulcs.ses.type", @@ -2559,9 +2532,6 @@ void proto_register_atn_ulcs (void) }; static gint *ett[] = { - -/*--- Included file: packet-atn-ulcs-ettarr.c ---*/ -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-ettarr.c" &ett_atn_ulcs_Fully_encoded_data, &ett_atn_ulcs_PDV_list, &ett_atn_ulcs_T_presentation_data_values, @@ -2587,9 +2557,6 @@ void proto_register_atn_ulcs (void) &ett_atn_ulcs_RDNSequence, &ett_atn_ulcs_RelativeDistinguishedName, &ett_atn_ulcs_AttributeTypeAndValue, - -/*--- End of included file: packet-atn-ulcs-ettarr.c ---*/ -#line 832 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" &ett_atn_ses, &ett_atn_pres, &ett_atn_acse, diff --git a/epan/dissectors/packet-atn-ulcs.h b/epan/dissectors/packet-atn-ulcs.h index bf46344735..4d73a5d578 100644 --- a/epan/dissectors/packet-atn-ulcs.h +++ b/epan/dissectors/packet-atn-ulcs.h @@ -3,9 +3,6 @@ /* packet-atn-ulcs.h */ /* asn2wrs.py -u -L -p atn-ulcs -c ./atn-ulcs.cnf -s ./packet-atn-ulcs-template -D . -O ../.. atn-ulcs.asn */ -/* Input file: packet-atn-ulcs-template.h */ - -#line 1 "./asn1/atn-ulcs/packet-atn-ulcs-template.h" /* packet-atn-ulcs.h * Definitions for atn packet disassembly structures and routines * diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 42d0ba8a65..311006e36e 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -3,9 +3,6 @@ /* packet-c1222.c */ /* asn2wrs.py -b -L -p c1222 -c ./c1222.cnf -s ./packet-c1222-template -D . -O ../.. c1222.asn */ -/* Input file: packet-c1222-template.c */ - -#line 1 "./asn1/c1222/packet-c1222-template.c" /* packet-c1222.c * Routines for ANSI C12.22 packet dissection * Copyright 2010, Edward J. Beroset, edward.beroset@elster.com @@ -80,9 +77,6 @@ static dissector_handle_t c1222_udp_handle=NULL; /* Initialize the protocol and registered fields */ static int proto_c1222 = -1; - -/*--- Included file: packet-c1222-hf.c ---*/ -#line 1 "./asn1/c1222/packet-c1222-hf.c" static int hf_c1222_MESSAGE_PDU = -1; /* MESSAGE */ static int hf_c1222_aSO_context = -1; /* ASO_qualifier */ static int hf_c1222_called_AP_title = -1; /* Called_AP_title */ @@ -108,9 +102,6 @@ static int hf_c1222_iv_element = -1; /* Iv_element */ static int hf_c1222_c1221_auth_identification = -1; /* OCTET_STRING_SIZE_CONSTR001 */ static int hf_c1222_c1221_auth_request = -1; /* OCTET_STRING_SIZE_1_255 */ static int hf_c1222_c1221_auth_response = -1; /* OCTET_STRING_SIZE_CONSTR002 */ - -/*--- End of included file: packet-c1222-hf.c ---*/ -#line 76 "./asn1/c1222/packet-c1222-template.c" /* These are the EPSEM pieces */ /* first, the flag components */ static int hf_c1222_epsem_flags = -1; @@ -218,9 +209,6 @@ static guint32 calling_AP_title_allocated = 0; static guint32 key_id_element_allocated = 0; static guint32 iv_element_allocated = 0; - -/*--- Included file: packet-c1222-ett.c ---*/ -#line 1 "./asn1/c1222/packet-c1222-ett.c" static gint ett_c1222_MESSAGE_U = -1; static gint ett_c1222_Called_AP_title = -1; static gint ett_c1222_Calling_AP_title = -1; @@ -230,9 +218,6 @@ static gint ett_c1222_Calling_authentication_value_single_asn1 = -1; static gint ett_c1222_Calling_authentication_value_c1222_U = -1; static gint ett_c1222_Calling_authentication_value_c1221_U = -1; -/*--- End of included file: packet-c1222-ett.c ---*/ -#line 184 "./asn1/c1222/packet-c1222-template.c" - static expert_field ei_c1222_command_truncated = EI_INIT; static expert_field ei_c1222_bad_checksum = EI_INIT; static expert_field ei_c1222_epsem_missing = EI_INIT; @@ -1122,9 +1107,6 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ } -/*--- Included file: packet-c1222-fn.c ---*/ -#line 1 "./asn1/c1222/packet-c1222-fn.c" - static int dissect_c1222_ASO_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1565,9 +1547,6 @@ static int dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-c1222-fn.c ---*/ -#line 1074 "./asn1/c1222/packet-c1222-template.c" - /** * Dissects a a full (reassembled) C12.22 message. * @@ -1871,9 +1850,6 @@ void proto_register_c1222(void) { NULL, 0x0, "True: crypto bad; False: crypto ok or not checked", HFILL } }, - -/*--- Included file: packet-c1222-hfarr.c ---*/ -#line 1 "./asn1/c1222/packet-c1222-hfarr.c" { &hf_c1222_MESSAGE_PDU, { "MESSAGE", "c1222.MESSAGE_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1974,9 +1950,6 @@ void proto_register_c1222(void) { { "c1221-auth-response", "c1222.c1221_auth_response", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_CONSTR002", HFILL }}, - -/*--- End of included file: packet-c1222-hfarr.c ---*/ -#line 1379 "./asn1/c1222/packet-c1222-template.c" }; /* List of subtrees */ @@ -1986,9 +1959,6 @@ void proto_register_c1222(void) { &ett_c1222_flags, &ett_c1222_crypto, &ett_c1222_cmd, - -/*--- Included file: packet-c1222-ettarr.c ---*/ -#line 1 "./asn1/c1222/packet-c1222-ettarr.c" &ett_c1222_MESSAGE_U, &ett_c1222_Called_AP_title, &ett_c1222_Calling_AP_title, @@ -1997,9 +1967,6 @@ void proto_register_c1222(void) { &ett_c1222_Calling_authentication_value_single_asn1, &ett_c1222_Calling_authentication_value_c1222_U, &ett_c1222_Calling_authentication_value_c1221_U, - -/*--- End of included file: packet-c1222-ettarr.c ---*/ -#line 1389 "./asn1/c1222/packet-c1222-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-c1222.h b/epan/dissectors/packet-c1222.h index d843e21244..5f6c5f8fc8 100644 --- a/epan/dissectors/packet-c1222.h +++ b/epan/dissectors/packet-c1222.h @@ -3,9 +3,6 @@ /* packet-c1222.h */ /* asn2wrs.py -b -L -p c1222 -c ./c1222.cnf -s ./packet-c1222-template -D . -O ../.. c1222.asn */ -/* Input file: packet-c1222-template.h */ - -#line 1 "./asn1/c1222/packet-c1222-template.h" /* packet-c1222.h * Routines for ANSI C12.22 packet dissection * Copyright 2010, Edward J. Beroset, edward.beroset@elster.com diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 02f8d0b0d2..43d77bc6e0 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -3,9 +3,6 @@ /* packet-camel.c */ /* asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . -O ../.. CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn CamelV2diff.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-camel-template.c */ - -#line 1 "./asn1/camel/packet-camel-template.c" /* packet-camel-template.c * Routines for Camel * Copyright 2004, Tim Endean @@ -108,9 +105,6 @@ static int hf_camelsrt_DeltaTime35=-1; static int hf_camelsrt_DeltaTime80=-1; static int hf_camel_timeandtimezone_bcd = -1; - -/*--- Included file: packet-camel-hf.c ---*/ -#line 1 "./asn1/camel/packet-camel-hf.c" static int hf_camel_PAR_cancelFailed_PDU = -1; /* PAR_cancelFailed */ static int hf_camel_PAR_requestedInfoError_PDU = -1; /* PAR_requestedInfoError */ static int hf_camel_UnavailableNetworkResource_PDU = -1; /* UnavailableNetworkResource */ @@ -598,9 +592,6 @@ static int hf_camel_returnErrorProblem = -1; /* ReturnErrorProblem */ static int hf_camel_present = -1; /* INTEGER */ static int hf_camel_InvokeId_present = -1; /* InvokeId_present */ -/*--- End of included file: packet-camel-hf.c ---*/ -#line 104 "./asn1/camel/packet-camel-template.c" - static struct camelsrt_info_t * gp_camelsrt_info; /* Forward declarations */ @@ -642,9 +633,6 @@ static gint ett_camel_number = -1; static gint ett_camel_digitsResponse = -1; static gint ett_camel_timeandtimezone = -1; - -/*--- Included file: packet-camel-ett.c ---*/ -#line 1 "./asn1/camel/packet-camel-ett.c" static gint ett_camel_AChChargingAddress = -1; static gint ett_camel_AOCBeforeAnswer = -1; static gint ett_camel_AOCGPRS = -1; @@ -842,9 +830,6 @@ static gint ett_camel_Reject = -1; static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; -/*--- End of included file: packet-camel-ett.c ---*/ -#line 147 "./asn1/camel/packet-camel-template.c" - static expert_field ei_camel_unknown_invokeData = EI_INIT; static expert_field ei_camel_unknown_returnResultData = EI_INIT; static expert_field ei_camel_unknown_returnErrorData = EI_INIT; @@ -1001,9 +986,6 @@ static const value_string camel_ectTreatmentIndicator_values[] = { { 0, NULL } }; - -/*--- Included file: packet-camel-val.h ---*/ -#line 1 "./asn1/camel/packet-camel-val.h" #define tc_Messages "0.0.17.773.2.1.3" #define tc_NotationExtensions "0.0.17.775.2.4.1" #define ros_InformationObjects "2.4.5.0" @@ -1185,12 +1167,6 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define id_CAP_U_ABORT_Reason "0.4.0.0.1.1.2.2" #define noInvokeId NULL -/*--- End of included file: packet-camel-val.h ---*/ -#line 305 "./asn1/camel/packet-camel-template.c" - - -/*--- Included file: packet-camel-table.c ---*/ -#line 1 "./asn1/camel/packet-camel-table.c" /* CAMEL OPERATIONS */ const value_string camel_opr_code_strings[] = { @@ -1275,9 +1251,6 @@ static const value_string camel_err_code_string_vals[] = { }; -/*--- End of included file: packet-camel-table.c ---*/ -#line 307 "./asn1/camel/packet-camel-template.c" - /* * DEBUG fonctions */ @@ -1378,9 +1351,6 @@ dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len, static int dissect_camel_InitialDPArgExtensionV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- Included file: packet-camel-fn.c ---*/ -#line 1 "./asn1/camel/packet-camel-fn.c" - static int dissect_camel_AccessPointName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -7276,12 +7246,6 @@ static int dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } -/*--- End of included file: packet-camel-fn.c ---*/ -#line 408 "./asn1/camel/packet-camel-template.c" - - -/*--- Included file: packet-camel-table2.c ---*/ -#line 1 "./asn1/camel/packet-camel-table2.c" static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { @@ -7483,9 +7447,6 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a } -/*--- End of included file: packet-camel-table2.c ---*/ -#line 410 "./asn1/camel/packet-camel-template.c" - /* * Functions needed for Hash-Table */ @@ -8358,15 +8319,9 @@ void proto_reg_handoff_camel(void) { register_ber_oid_dissector_handle("0.4.0.0.1.23.3.61", camel_v4_handle, proto_camel, "cap4-sms-AC"); - -/*--- Included file: packet-camel-dis-tab.c ---*/ -#line 1 "./asn1/camel/packet-camel-dis-tab.c" register_ber_oid_dissector("0.4.0.0.1.1.5.2", dissect_CAP_GPRS_ReferenceNumber_PDU, proto_camel, "id-CAP-GPRS-ReferenceNumber"); register_ber_oid_dissector("0.4.0.0.1.1.2.2", dissect_CAP_U_ABORT_REASON_PDU, proto_camel, "id-CAP-U-ABORT-Reason"); - -/*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 1284 "./asn1/camel/packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback, NULL); wmem_free(wmem_epan_scope(), ssn_range); @@ -8544,9 +8499,6 @@ void proto_register_camel(void) { }, #ifdef REMOVED #endif - -/*--- Included file: packet-camel-hfarr.c ---*/ -#line 1 "./asn1/camel/packet-camel-hfarr.c" { &hf_camel_PAR_cancelFailed_PDU, { "PAR-cancelFailed", "camel.PAR_cancelFailed_element", FT_NONE, BASE_NONE, NULL, 0, @@ -10491,9 +10443,6 @@ void proto_register_camel(void) { { "InvokeId.present", "camel.InvokeId_present", FT_INT32, BASE_DEC, NULL, 0, "InvokeId_present", HFILL }}, - -/*--- End of included file: packet-camel-hfarr.c ---*/ -#line 1462 "./asn1/camel/packet-camel-template.c" }; /* List of subtrees */ @@ -10521,9 +10470,6 @@ void proto_register_camel(void) { &ett_camel_digitsResponse, &ett_camel_timeandtimezone, - -/*--- Included file: packet-camel-ettarr.c ---*/ -#line 1 "./asn1/camel/packet-camel-ettarr.c" &ett_camel_AChChargingAddress, &ett_camel_AOCBeforeAnswer, &ett_camel_AOCGPRS, @@ -10720,9 +10666,6 @@ void proto_register_camel(void) { &ett_camel_Reject, &ett_camel_T_problem, &ett_camel_InvokeId, - -/*--- End of included file: packet-camel-ettarr.c ---*/ -#line 1490 "./asn1/camel/packet-camel-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index df1dbb4a4d..ab27894db2 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -3,9 +3,6 @@ /* packet-camel.h */ /* asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . -O ../.. CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn CamelV2diff.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-camel-template.h */ - -#line 1 "./asn1/camel/packet-camel-template.h" /* packet-camel-template.h * Routines for Camel * Copyright 2004, Tim Endean diff --git a/epan/dissectors/packet-cbrs-oids.c b/epan/dissectors/packet-cbrs-oids.c index b7f3dd48b0..bd545b1540 100644 --- a/epan/dissectors/packet-cbrs-oids.c +++ b/epan/dissectors/packet-cbrs-oids.c @@ -3,9 +3,6 @@ /* packet-cbrs-oids.c */ /* asn2wrs.py -b -L -p cbrs-oids -c ./cbrs-oids.cnf -s ./packet-cbrs-oids-template -D . -O ../.. cbrs-oids.asn */ -/* Input file: packet-cbrs-oids-template.c */ - -#line 1 "./asn1/cbrs-oids/packet-cbrs-oids-template.c" /* packet-cbrs-oids.c * * Citizens Broadband Radio Service - Object Identifiers @@ -40,9 +37,6 @@ void proto_reg_handoff_cbrs_oids(void); /* Initialize the protocol and registered fields */ static int proto_cbrs_oids = -1; - -/*--- Included file: packet-cbrs-oids-hf.c ---*/ -#line 1 "./asn1/cbrs-oids/packet-cbrs-oids-hf.c" static int hf_cbrs_oids_ZONE_PDU = -1; /* ZONE */ static int hf_cbrs_oids_FREQUENCY_PDU = -1; /* FREQUENCY */ static int hf_cbrs_oids_FCCID_PDU = -1; /* FCCID */ @@ -50,16 +44,10 @@ static int hf_cbrs_oids_SERIAL_PDU = -1; /* SERIAL */ static int hf_cbrs_oids_FRN_PDU = -1; /* FRN */ static int hf_cbrs_oids_CPIRID_PDU = -1; /* CPIRID */ static int hf_cbrs_oids_TEST_PDU = -1; /* TEST */ - -/*--- End of included file: packet-cbrs-oids-hf.c ---*/ -#line 36 "./asn1/cbrs-oids/packet-cbrs-oids-template.c" static int hf_cbrs_oids_UTF8String_PDU = -1; /* Initialize the subtree pointers */ -/*--- Included file: packet-cbrs-oids-fn.c ---*/ -#line 1 "./asn1/cbrs-oids/packet-cbrs-oids-fn.c" - static int dissect_cbrs_oids_ZONE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -189,9 +177,6 @@ static int dissect_TEST_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } -/*--- End of included file: packet-cbrs-oids-fn.c ---*/ -#line 40 "./asn1/cbrs-oids/packet-cbrs-oids-template.c" - /*--- proto_register_cbrs_oids ----------------------------------------------*/ void proto_register_cbrs_oids(void) { @@ -201,9 +186,6 @@ void proto_register_cbrs_oids(void) { { "UTF8String", "cbrs-oids.UTF8String", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-cbrs-oids-hfarr.c ---*/ -#line 1 "./asn1/cbrs-oids/packet-cbrs-oids-hfarr.c" { &hf_cbrs_oids_ZONE_PDU, { "ZONE", "cbrs-oids.ZONE", FT_STRING, BASE_NONE, NULL, 0, @@ -232,9 +214,6 @@ void proto_register_cbrs_oids(void) { { "TEST", "cbrs-oids.TEST", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-cbrs-oids-hfarr.c ---*/ -#line 51 "./asn1/cbrs-oids/packet-cbrs-oids-template.c" }; /* Register protocol */ @@ -247,9 +226,6 @@ void proto_register_cbrs_oids(void) { /*--- proto_reg_handoff_cbrs_oids -------------------------------------------*/ void proto_reg_handoff_cbrs_oids(void) { - -/*--- Included file: packet-cbrs-oids-dis-tab.c ---*/ -#line 1 "./asn1/cbrs-oids/packet-cbrs-oids-dis-tab.c" register_ber_oid_dissector("1.3.6.1.4.1.46609.1.2", dissect_ZONE_PDU, proto_cbrs_oids, "CBRS_PAL_ZONE"); register_ber_oid_dissector("1.3.6.1.4.1.46609.1.3", dissect_FREQUENCY_PDU, proto_cbrs_oids, "CBRS_PAL_FREQUENCY"); register_ber_oid_dissector("1.3.6.1.4.1.46609.1.4", dissect_FCCID_PDU, proto_cbrs_oids, "CBRS_CBSD_FCCID"); @@ -258,9 +234,6 @@ void proto_reg_handoff_cbrs_oids(void) { register_ber_oid_dissector("1.3.6.1.4.1.46609.1.7", dissect_CPIRID_PDU, proto_cbrs_oids, "CBRS_installer_CPIR-ID"); register_ber_oid_dissector("1.3.6.1.4.1.46609.1.8", dissect_TEST_PDU, proto_cbrs_oids, "CBRS_TEST"); - -/*--- End of included file: packet-cbrs-oids-dis-tab.c ---*/ -#line 64 "./asn1/cbrs-oids/packet-cbrs-oids-template.c" oid_add_from_string("CBRS Policy Documents","1.3.6.1.4.1.46609.2"); oid_add_from_string("CBRS Certificates issued pursuant to CPS","1.3.6.1.4.1.46609.2.1"); oid_add_from_string("CBRS ROLE","1.3.6.1.4.1.46609.1.1"); diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index 7f1d91dfff..cbd7894f4f 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -3,9 +3,6 @@ /* packet-cdt.c */ /* asn2wrs.py -b -L -p cdt -c ./cdt.cnf -s ./packet-cdt-template -D . -O ../.. cdt.asn */ -/* Input file: packet-cdt-template.c */ - -#line 1 "./asn1/cdt/packet-cdt-template.c" /* packet-cdt.c * * Routines for Compressed Data Type packet dissection. @@ -53,9 +50,6 @@ static guint32 content_type = 0; /* Initialize the protocol and registered fields */ static int proto_cdt = -1; - -/*--- Included file: packet-cdt-hf.c ---*/ -#line 1 "./asn1/cdt/packet-cdt-hf.c" static int hf_cdt_CompressedData_PDU = -1; /* CompressedData */ static int hf_cdt_compressionAlgorithm = -1; /* CompressionAlgorithmIdentifier */ static int hf_cdt_compressedContentInfo = -1; /* CompressedContentInfo */ @@ -66,28 +60,16 @@ static int hf_cdt_contentType_ShortForm = -1; /* ContentType_ShortForm */ static int hf_cdt_contentType_OID = -1; /* T_contentType_OID */ static int hf_cdt_compressedContent = -1; /* CompressedContent */ -/*--- End of included file: packet-cdt-hf.c ---*/ -#line 49 "./asn1/cdt/packet-cdt-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-cdt-ett.c ---*/ -#line 1 "./asn1/cdt/packet-cdt-ett.c" static gint ett_cdt_CompressedData = -1; static gint ett_cdt_CompressionAlgorithmIdentifier = -1; static gint ett_cdt_CompressedContentInfo = -1; static gint ett_cdt_T_contentType = -1; -/*--- End of included file: packet-cdt-ett.c ---*/ -#line 52 "./asn1/cdt/packet-cdt-template.c" - static expert_field ei_cdt_unable_compress_content = EI_INIT; static expert_field ei_cdt_unable_uncompress_content = EI_INIT; -/*--- Included file: packet-cdt-fn.c ---*/ -#line 1 "./asn1/cdt/packet-cdt-fn.c" - static const value_string cdt_AlgorithmID_ShortForm_vals[] = { { 0, "zlibCompress" }, { 0, NULL } @@ -313,9 +295,6 @@ static int dissect_CompressedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-cdt-fn.c ---*/ -#line 57 "./asn1/cdt/packet-cdt-template.c" - /*--- proto_register_cdt -------------------------------------------*/ @@ -346,9 +325,6 @@ void proto_register_cdt (void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-cdt-hfarr.c ---*/ -#line 1 "./asn1/cdt/packet-cdt-hfarr.c" { &hf_cdt_CompressedData_PDU, { "CompressedData", "cdt.CompressedData_element", FT_NONE, BASE_NONE, NULL, 0, @@ -385,23 +361,14 @@ void proto_register_cdt (void) { { "compressedContent", "cdt.compressedContent", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-cdt-hfarr.c ---*/ -#line 89 "./asn1/cdt/packet-cdt-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-cdt-ettarr.c ---*/ -#line 1 "./asn1/cdt/packet-cdt-ettarr.c" &ett_cdt_CompressedData, &ett_cdt_CompressionAlgorithmIdentifier, &ett_cdt_CompressedContentInfo, &ett_cdt_T_contentType, - -/*--- End of included file: packet-cdt-ettarr.c ---*/ -#line 94 "./asn1/cdt/packet-cdt-template.c" }; static ei_register_info ei[] = { @@ -424,12 +391,6 @@ void proto_register_cdt (void) { /*--- proto_reg_handoff_cdt ---------------------------------------*/ void proto_reg_handoff_cdt (void) { - -/*--- Included file: packet-cdt-dis-tab.c ---*/ -#line 1 "./asn1/cdt/packet-cdt-dis-tab.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.2", dissect_CompressedData_PDU, proto_cdt, "cdt"); - -/*--- End of included file: packet-cdt-dis-tab.c ---*/ -#line 117 "./asn1/cdt/packet-cdt-template.c" } diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h index d9a9cf1a6d..052b3f48a0 100644 --- a/epan/dissectors/packet-cdt.h +++ b/epan/dissectors/packet-cdt.h @@ -3,9 +3,6 @@ /* packet-cdt.h */ /* asn2wrs.py -b -L -p cdt -c ./cdt.cnf -s ./packet-cdt-template -D . -O ../.. cdt.asn */ -/* Input file: packet-cdt-template.h */ - -#line 1 "./asn1/cdt/packet-cdt-template.h" /* packet-cdt.h * * Routines for Compressed Data Type packet dissection. @@ -23,13 +20,7 @@ #define PACKET_CDT_H void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); - -/*--- Included file: packet-cdt-exp.h ---*/ -#line 1 "./asn1/cdt/packet-cdt-exp.h" int dissect_cdt_CompressedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-cdt-exp.h ---*/ -#line 19 "./asn1/cdt/packet-cdt-template.h" - #endif /* PACKET_CDT_H */ diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index e33d1e6ca2..e8ca9da8d7 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -3,9 +3,6 @@ /* packet-charging_ase.c */ /* asn2wrs.py -b -L -p charging_ase -c ./charging_ase.cnf -s ./packet-charging_ase-template -D . -O ../.. Tariffing-Data-Types.asn */ -/* Input file: packet-charging_ase-template.c */ - -#line 1 "./asn1/charging_ase/packet-charging_ase-template.c" /* packet-charging_ase-template.c * Copyright 2009 , Anders Broman * @@ -36,9 +33,6 @@ void proto_reg_handoff_charging_ase(void); /* Define the Charging ASE proto */ static int proto_charging_ase = -1; - -/*--- Included file: packet-charging_ase-hf.c ---*/ -#line 1 "./asn1/charging_ase/packet-charging_ase-hf.c" static int hf_charging_ase_charging_ase_ChargingMessageType_PDU = -1; /* ChargingMessageType */ static int hf_charging_ase_crgt = -1; /* ChargingTariffInformation */ static int hf_charging_ase_aocrg = -1; /* AddOnChargingInformation */ @@ -102,13 +96,7 @@ static int hf_charging_ase_SubTariffControl_oneTimeCharge = -1; static int hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff = -1; static int hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff = -1; -/*--- End of included file: packet-charging_ase-hf.c ---*/ -#line 32 "./asn1/charging_ase/packet-charging_ase-template.c" - static int ett_charging_ase = -1; - -/*--- Included file: packet-charging_ase-ett.c ---*/ -#line 1 "./asn1/charging_ase/packet-charging_ase-ett.c" static gint ett_charging_ase_ChargingMessageType = -1; static gint ett_charging_ase_ChargingAcknowledgementInformation = -1; static gint ett_charging_ase_T_acknowledgementIndicators = -1; @@ -140,17 +128,11 @@ static gint ett_charging_ase_SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunic static gint ett_charging_ase_T_tariffControlIndicators_01 = -1; static gint ett_charging_ase_ChargingReferenceIdentification = -1; -/*--- End of included file: packet-charging_ase-ett.c ---*/ -#line 35 "./asn1/charging_ase/packet-charging_ase-template.c" - static expert_field ei_charging_ase_extensions_not_dissected = EI_INIT; static dissector_handle_t charging_ase_handle; -/*--- Included file: packet-charging_ase-fn.c ---*/ -#line 1 "./asn1/charging_ase/packet-charging_ase-fn.c" - static int * const ChargingControlIndicators_bits[] = { &hf_charging_ase_ChargingControlIndicators_subscriberCharge, &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff, @@ -826,9 +808,6 @@ int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info } -/*--- End of included file: packet-charging_ase-fn.c ---*/ -#line 41 "./asn1/charging_ase/packet-charging_ase-template.c" - static int dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -851,9 +830,6 @@ proto_register_charging_ase(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-charging_ase-hfarr.c ---*/ -#line 1 "./asn1/charging_ase/packet-charging_ase-hfarr.c" { &hf_charging_ase_charging_ase_ChargingMessageType_PDU, { "ChargingMessageType", "charging_ase.ChargingMessageType", FT_UINT32, BASE_DEC, VALS(charging_ase_ChargingMessageType_vals), 0, @@ -1098,17 +1074,11 @@ proto_register_charging_ase(void) { "non-cyclicTariff", "charging.ase.T.tariffControlIndicators.01.non.cyclicTariff", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, - -/*--- End of included file: packet-charging_ase-hfarr.c ---*/ -#line 65 "./asn1/charging_ase/packet-charging_ase-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_charging_ase, - -/*--- Included file: packet-charging_ase-ettarr.c ---*/ -#line 1 "./asn1/charging_ase/packet-charging_ase-ettarr.c" &ett_charging_ase_ChargingMessageType, &ett_charging_ase_ChargingAcknowledgementInformation, &ett_charging_ase_T_acknowledgementIndicators, @@ -1139,9 +1109,6 @@ proto_register_charging_ase(void) &ett_charging_ase_SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTariffNum_OF_CommunicationChargePulse, &ett_charging_ase_T_tariffControlIndicators_01, &ett_charging_ase_ChargingReferenceIdentification, - -/*--- End of included file: packet-charging_ase-ettarr.c ---*/ -#line 71 "./asn1/charging_ase/packet-charging_ase-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-charging_ase.h b/epan/dissectors/packet-charging_ase.h index 37beb16431..1fed5f2e86 100644 --- a/epan/dissectors/packet-charging_ase.h +++ b/epan/dissectors/packet-charging_ase.h @@ -3,9 +3,6 @@ /* packet-charging_ase.h */ /* asn2wrs.py -b -L -p charging_ase -c ./charging_ase.cnf -s ./packet-charging_ase-template -D . -O ../.. Tariffing-Data-Types.asn */ -/* Input file: packet-charging_ase-template.h */ - -#line 1 "./asn1/charging_ase/packet-charging_ase-template.h" /* packet-charging_ase-template.h * Copyright 2009, Anders Broman * @@ -19,14 +16,8 @@ #ifndef PACKET_CHARGING_ASE_H #define PACKET_CHARGING_ASE_H - -/*--- Included file: packet-charging_ase-exp.h ---*/ -#line 1 "./asn1/charging_ase/packet-charging_ase-exp.h" extern const value_string charging_ase_ChargingMessageType_vals[]; int dissect_charging_ase_ChargingMessageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-charging_ase-exp.h ---*/ -#line 15 "./asn1/charging_ase/packet-charging_ase-template.h" - #endif /* PACKET_CHARGING_ASE_H */ diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index c892d94113..ccfba12311 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -3,9 +3,6 @@ /* packet-cmip.c */ /* asn2wrs.py -b -L -p cmip -c ./cmip.cnf -s ./packet-cmip-template -D . -O ../.. CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-cmip-template.c */ - -#line 1 "./asn1/cmip/packet-cmip-template.c" /* packet-cmip.c * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 @@ -47,9 +44,6 @@ static int hf_cmip_eventType_OID = -1; static int hf_cmip_attributeId_OID = -1; static int hf_cmip_errorId_OID = -1; - -/*--- Included file: packet-cmip-hf.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-hf.c" static int hf_cmip_BaseManagedObjectId_PDU = -1; /* BaseManagedObjectId */ static int hf_cmip_EventTypeId_PDU = -1; /* EventTypeId */ static int hf_cmip_ObjectClass_PDU = -1; /* ObjectClass */ @@ -327,14 +321,8 @@ static int hf_cmip_T_daysOfWeek_thursday = -1; static int hf_cmip_T_daysOfWeek_friday = -1; static int hf_cmip_T_daysOfWeek_saturday = -1; -/*--- End of included file: packet-cmip-hf.c ---*/ -#line 43 "./asn1/cmip/packet-cmip-template.c" - /* Initialize the subtree pointers */ static gint ett_cmip = -1; - -/*--- Included file: packet-cmip-ett.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-ett.c" static gint ett_cmip_PAR_missingAttributeValue = -1; static gint ett_cmip_ActionArgument = -1; static gint ett_cmip_ActionError = -1; @@ -457,9 +445,6 @@ static gint ett_cmip_SET_OF_AttributeId = -1; static gint ett_cmip_T_modificationList = -1; static gint ett_cmip_T_modificationList_item = -1; -/*--- End of included file: packet-cmip-ett.c ---*/ -#line 47 "./asn1/cmip/packet-cmip-template.c" - static expert_field ei_wrong_spdu_type = EI_INIT; static guint32 opcode; @@ -470,9 +455,6 @@ static dissector_handle_t cmip_handle = NULL; static dissector_table_t attribute_id_dissector_table; -/*--- Included file: packet-cmip-table.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-table.c" - /* CMIP OPERATIONS */ static const value_string cmip_Opcode_vals[] = { { 6, "m_Action" }, @@ -520,9 +502,6 @@ static const value_string cmip_error_code_vals[] = { }; -/*--- End of included file: packet-cmip-table.c ---*/ -#line 58 "./asn1/cmip/packet-cmip-template.c" - static int opcode_type; #define OPCODE_INVOKE 1 #define OPCODE_RETURN_RESULT 2 @@ -531,9 +510,6 @@ static int opcode_type; static const char *object_identifier_id; - -/*--- Included file: packet-cmip-val.h ---*/ -#line 1 "./asn1/cmip/packet-cmip-val.h" #define smi2AttributeID "2.9.3.2.7" #define smi2AttributeGroup "2.9.3.2.8" #define arfProbableCause "2.9.3.2.0.0" @@ -618,12 +594,6 @@ static const char *object_identifier_id; #define unspecifiedReason securityAlarmCause".18" #define defaultDiscriminatorConstruct [] #define noInvokeId NULL - -/*--- End of included file: packet-cmip-val.h ---*/ -#line 68 "./asn1/cmip/packet-cmip-template.c" - -/*--- Included file: packet-cmip-fn.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-fn.c" /*--- Cyclic dependencies ---*/ /* CMISFilter -> CMISFilter/and -> CMISFilter */ @@ -4395,9 +4365,6 @@ static int dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-cmip-fn.c ---*/ -#line 69 "./asn1/cmip/packet-cmip-template.c" - @@ -4472,9 +4439,6 @@ void proto_register_cmip(void) { FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-cmip-hfarr.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-hfarr.c" { &hf_cmip_BaseManagedObjectId_PDU, { "BaseManagedObjectId", "cmip.BaseManagedObjectId_element", FT_NONE, BASE_NONE, NULL, 0, @@ -5575,17 +5539,11 @@ void proto_register_cmip(void) { { "saturday", "cmip.T.daysOfWeek.saturday", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, - -/*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 145 "./asn1/cmip/packet-cmip-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_cmip, - -/*--- Included file: packet-cmip-ettarr.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-ettarr.c" &ett_cmip_PAR_missingAttributeValue, &ett_cmip_ActionArgument, &ett_cmip_ActionError, @@ -5707,9 +5665,6 @@ void proto_register_cmip(void) { &ett_cmip_SET_OF_AttributeId, &ett_cmip_T_modificationList, &ett_cmip_T_modificationList_item, - -/*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 151 "./asn1/cmip/packet-cmip-template.c" }; static ei_register_info ei[] = { @@ -5728,9 +5683,6 @@ void proto_register_cmip(void) { expert_cmip = expert_register_protocol(proto_cmip); expert_register_field_array(expert_cmip, ei, array_length(ei)); - -/*--- Included file: packet-cmip-dis-tab.c ---*/ -#line 1 "./asn1/cmip/packet-cmip-dis-tab.c" register_ber_oid_dissector("2.9.2.21.7.13", dissect_BaseManagedObjectId_PDU, proto_cmip, "BaseManagedObjectId(13)"); register_ber_oid_dissector("2.9.3.2.7.1", dissect_SimpleNameType_PDU, proto_cmip, "discriminatorId(1)"); register_ber_oid_dissector("2.9.3.2.7.2", dissect_SimpleNameType_PDU, proto_cmip, "logId(2)"); @@ -5802,9 +5754,6 @@ void proto_register_cmip(void) { register_ber_oid_dissector("2.9.3.2.7.71", dissect_WeekMask_PDU, proto_cmip, "weekMask(71)"); register_ber_oid_dissector("2.9.3.2.7.115", dissect_LifecycleState_PDU, proto_cmip, "lifecycleState(115)"); - -/*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 170 "./asn1/cmip/packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", proto_cmip, FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index 9b514c24c4..66939a92f0 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -3,9 +3,6 @@ /* packet-cmip.h */ /* asn2wrs.py -b -L -p cmip -c ./cmip.cnf -s ./packet-cmip-template -D . -O ../.. CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-cmip-template.h */ - -#line 1 "./asn1/cmip/packet-cmip-template.h" /* packet-cmip.h * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 @@ -20,9 +17,6 @@ #ifndef PACKET_CMIP_H #define PACKET_CMIP_H - -/*--- Included file: packet-cmip-exp.h ---*/ -#line 1 "./asn1/cmip/packet-cmip-exp.h" extern const value_string cmip_ObjectClass_vals[]; extern const value_string cmip_ObjectInstance_vals[]; extern const value_string cmip_AdministrativeState_vals[]; @@ -42,8 +36,5 @@ int dissect_cmip_AvailabilityStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ int dissect_cmip_ProbableCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_cmip_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-cmip-exp.h ---*/ -#line 16 "./asn1/cmip/packet-cmip-template.h" - #endif /* PACKET_CMIP_H */ diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 25cddb05d9..674102de2e 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -3,9 +3,6 @@ /* packet-cmp.c */ /* asn2wrs.py -b -L -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . -O ../.. CMP.asn */ -/* Input file: packet-cmp-template.c */ - -#line 1 "./asn1/cmp/packet-cmp-template.c" /* packet-cmp.c * * Routines for RFC2510 Certificate Management Protocol packet dissection @@ -60,9 +57,6 @@ static int hf_cmp_tcptrans_next_poll_ref = -1; static int hf_cmp_tcptrans_ttcb = -1; static int hf_cmp_tcptrans10_version = -1; static int hf_cmp_tcptrans10_flags = -1; - -/*--- Included file: packet-cmp-hf.c ---*/ -#line 1 "./asn1/cmp/packet-cmp-hf.c" static int hf_cmp_PBMParameter_PDU = -1; /* PBMParameter */ static int hf_cmp_DHBMParameter_PDU = -1; /* DHBMParameter */ static int hf_cmp_CAProtEncCertValue_PDU = -1; /* CAProtEncCertValue */ @@ -223,14 +217,8 @@ static int hf_cmp_PKIFailureInfo_systemUnavail = -1; static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; -/*--- End of included file: packet-cmp-hf.c ---*/ -#line 56 "./asn1/cmp/packet-cmp-template.c" - /* Initialize the subtree pointers */ static gint ett_cmp = -1; - -/*--- Included file: packet-cmp-ett.c ---*/ -#line 1 "./asn1/cmp/packet-cmp-ett.c" static gint ett_cmp_CMPCertificate = -1; static gint ett_cmp_PKIMessage = -1; static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CMPCertificate = -1; @@ -278,12 +266,6 @@ static gint ett_cmp_PollReqContent = -1; static gint ett_cmp_PollReqContent_item = -1; static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; - -/*--- End of included file: packet-cmp-ett.c ---*/ -#line 60 "./asn1/cmp/packet-cmp-template.c" - -/*--- Included file: packet-cmp-fn.c ---*/ -#line 1 "./asn1/cmp/packet-cmp-fn.c" /*--- Cyclic dependencies ---*/ /* PKIMessage -> PKIBody -> NestedMessageContent -> PKIMessages -> PKIMessage */ @@ -1456,9 +1438,6 @@ static int dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } -/*--- End of included file: packet-cmp-fn.c ---*/ -#line 61 "./asn1/cmp/packet-cmp-template.c" - static int dissect_cmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -1699,9 +1678,6 @@ void proto_register_cmp(void) { { "Flags", "cmp.tcptrans10.flags", FT_UINT8, BASE_DEC, NULL, 0, "TCP transport flags", HFILL }}, - -/*--- Included file: packet-cmp-hfarr.c ---*/ -#line 1 "./asn1/cmp/packet-cmp-hfarr.c" { &hf_cmp_PBMParameter_PDU, { "PBMParameter", "cmp.PBMParameter_element", FT_NONE, BASE_NONE, NULL, 0, @@ -2334,17 +2310,11 @@ void proto_register_cmp(void) { { "duplicateCertReq", "cmp.PKIFailureInfo.duplicateCertReq", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 303 "./asn1/cmp/packet-cmp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_cmp, - -/*--- Included file: packet-cmp-ettarr.c ---*/ -#line 1 "./asn1/cmp/packet-cmp-ettarr.c" &ett_cmp_CMPCertificate, &ett_cmp_PKIMessage, &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CMPCertificate, @@ -2392,9 +2362,6 @@ void proto_register_cmp(void) { &ett_cmp_PollReqContent_item, &ett_cmp_PollRepContent, &ett_cmp_PollRepContent_item, - -/*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 309 "./asn1/cmp/packet-cmp-template.c" }; module_t *cmp_module; @@ -2459,9 +2426,6 @@ void proto_reg_handoff_cmp(void) { oid_add_from_string("HMAC TIGER","1.3.6.1.5.5.8.1.3"); oid_add_from_string("HMAC RIPEMD-160","1.3.6.1.5.5.8.1.4"); - -/*--- Included file: packet-cmp-dis-tab.c ---*/ -#line 1 "./asn1/cmp/packet-cmp-dis-tab.c" register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_cmp, "id-PasswordBasedMac"); register_ber_oid_dissector("1.2.640.113533.7.66.30", dissect_DHBMParameter_PDU, proto_cmp, "id-DHBasedMac"); register_ber_oid_dissector("1.3.6.1.5.5.7.4.1", dissect_CAProtEncCertValue_PDU, proto_cmp, "id-it-caProtEncCert"); @@ -2479,9 +2443,6 @@ void proto_reg_handoff_cmp(void) { register_ber_oid_dissector("1.3.6.1.5.5.7.4.15", dissect_OrigPKIMessageValue_PDU, proto_cmp, "id-it-origPKIMessage"); register_ber_oid_dissector("1.3.6.1.5.5.7.4.16", dissect_SuppLangTagsValue_PDU, proto_cmp, "id-it-suppLangTags"); - -/*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 374 "./asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index b5b3226844..fc421a04bf 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -3,9 +3,6 @@ /* packet-cmp.h */ /* asn2wrs.py -b -L -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . -O ../.. CMP.asn */ -/* Input file: packet-cmp-template.h */ - -#line 1 "./asn1/cmp/packet-cmp-template.h" /* packet-cmp.h * Routines for RFC2510 Certificate Management Protocol packet dissection * Ronnie Sahlberg 2004 @@ -22,16 +19,10 @@ void proto_reg_handoff_cmp(void); - -/*--- Included file: packet-cmp-exp.h ---*/ -#line 1 "./asn1/cmp/packet-cmp-exp.h" int dissect_cmp_PKIMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_cmp_ProtectedPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_cmp_OOBCertHash(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-cmp-exp.h ---*/ -#line 18 "./asn1/cmp/packet-cmp-template.h" - #endif /* PACKET_CMP_H */ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 5f4278fe95..c6a9da78fe 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -3,9 +3,6 @@ /* packet-cms.c */ /* asn2wrs.py -b -C -L -p cms -c ./cms.cnf -s ./packet-cms-template -D . -O ../.. CryptographicMessageSyntax.asn AttributeCertificateVersion1.asn CMSFirmwareWrapper.asn */ -/* Input file: packet-cms-template.c */ - -#line 1 "./asn1/cms/packet-cms-template.c" /* packet-cms.c * Routines for RFC5652 Cryptographic Message Syntax packet dissection * Ronnie Sahlberg 2004 @@ -44,9 +41,6 @@ void proto_reg_handoff_cms(void); /* Initialize the protocol and registered fields */ static int proto_cms = -1; static int hf_cms_ci_contentType = -1; - -/*--- Included file: packet-cms-hf.c ---*/ -#line 1 "./asn1/cms/packet-cms-hf.c" static int hf_cms_ContentInfo_PDU = -1; /* ContentInfo */ static int hf_cms_ContentType_PDU = -1; /* ContentType */ static int hf_cms_SignedData_PDU = -1; /* SignedData */ @@ -222,13 +216,7 @@ static int hf_cms_config = -1; /* SEQUENCE_OF_CurrentFWConfig static int hf_cms_config_item = -1; /* CurrentFWConfig */ static int hf_cms_msgDigest = -1; /* OCTET_STRING */ -/*--- End of included file: packet-cms-hf.c ---*/ -#line 40 "./asn1/cms/packet-cms-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-cms-ett.c ---*/ -#line 1 "./asn1/cms/packet-cms-ett.c" static gint ett_cms_ContentInfo = -1; static gint ett_cms_SignedData = -1; static gint ett_cms_DigestAlgorithmIdentifiers = -1; @@ -306,9 +294,6 @@ static gint ett_cms_CurrentFWConfig = -1; static gint ett_cms_HardwareModuleName = -1; static gint ett_cms_FirmwarePackageMessageDigest = -1; -/*--- End of included file: packet-cms-ett.c ---*/ -#line 43 "./asn1/cms/packet-cms-template.c" - static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */ struct cms_private_data { @@ -380,9 +365,6 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff } -/*--- Included file: packet-cms-fn.c ---*/ -#line 1 "./asn1/cms/packet-cms-fn.c" - int dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -2528,9 +2510,6 @@ static int dissect_FirmwarePackageMessageDigest_PDU(tvbuff_t *tvb _U_, packet_in } -/*--- End of included file: packet-cms-fn.c ---*/ -#line 115 "./asn1/cms/packet-cms-template.c" - /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -2540,9 +2519,6 @@ void proto_register_cms(void) { { "contentType", "cms.contentInfo.contentType", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-cms-hfarr.c ---*/ -#line 1 "./asn1/cms/packet-cms-hfarr.c" { &hf_cms_ContentInfo_PDU, { "ContentInfo", "cms.ContentInfo_element", FT_NONE, BASE_NONE, NULL, 0, @@ -3239,16 +3215,10 @@ void proto_register_cms(void) { { "msgDigest", "cms.msgDigest", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - -/*--- End of included file: packet-cms-hfarr.c ---*/ -#line 126 "./asn1/cms/packet-cms-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-cms-ettarr.c ---*/ -#line 1 "./asn1/cms/packet-cms-ettarr.c" &ett_cms_ContentInfo, &ett_cms_SignedData, &ett_cms_DigestAlgorithmIdentifiers, @@ -3325,9 +3295,6 @@ void proto_register_cms(void) { &ett_cms_CurrentFWConfig, &ett_cms_HardwareModuleName, &ett_cms_FirmwarePackageMessageDigest, - -/*--- End of included file: packet-cms-ettarr.c ---*/ -#line 131 "./asn1/cms/packet-cms-template.c" }; /* Register protocol */ @@ -3350,9 +3317,6 @@ void proto_register_cms(void) { /*--- proto_reg_handoff_cms -------------------------------------------*/ void proto_reg_handoff_cms(void) { dissector_handle_t content_info_handle; - -/*--- Included file: packet-cms-dis-tab.c ---*/ -#line 1 "./asn1/cms/packet-cms-dis-tab.c" register_ber_oid_dissector("1.2.840.113549.1.9.16.1.6", dissect_ContentInfo_PDU, proto_cms, "id-ct-contentInfo"); register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_SignedData_PDU, proto_cms, "id-signedData"); register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_EnvelopedData_PDU, proto_cms, "id-envelopedData"); @@ -3402,9 +3366,6 @@ void proto_reg_handoff_cms(void) { register_ber_oid_dissector("1.2.840.113549.1.9.16.2.41", dissect_FirmwarePackageMessageDigest_PDU, proto_cms, "id-aa-fwPkgMessageDigest"); -/*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 154 "./asn1/cms/packet-cms-template.c" - /* RFC 3370 [CMS-ASN} section 4.3.1 */ register_ber_oid_dissector("1.2.840.113549.1.9.16.3.6", dissect_ber_oid_NULL_callback, proto_cms, "id-alg-CMS3DESwrap"); diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index 191096c29f..48b7e05439 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -3,9 +3,6 @@ /* packet-cms.h */ /* asn2wrs.py -b -C -L -p cms -c ./cms.cnf -s ./packet-cms-template -D . -O ../.. CryptographicMessageSyntax.asn AttributeCertificateVersion1.asn CMSFirmwareWrapper.asn */ -/* Input file: packet-cms-template.h */ - -#line 1 "./asn1/cms/packet-cms-template.h" /* packet-cms.h * Routines for RFC5652 Cryptographic Message Syntax packet dissection * Ronnie Sahlberg 2004 @@ -21,9 +18,6 @@ #ifndef PACKET_CMS_H #define PACKET_CMS_H - -/*--- Included file: packet-cms-exp.h ---*/ -#line 1 "./asn1/cms/packet-cms-exp.h" extern const value_string cms_SignerIdentifier_vals[]; int dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -43,8 +37,5 @@ int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _ int dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_cms_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-cms-exp.h ---*/ -#line 17 "./asn1/cms/packet-cms-template.h" - #endif /* PACKET_CMS_H */ diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c index 070d161a6c..fa9d356767 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -3,9 +3,6 @@ /* packet-credssp.c */ /* asn2wrs.py -b -C -L -p credssp -c ./credssp.cnf -s ./packet-credssp-template -D . -O ../.. CredSSP.asn */ -/* Input file: packet-credssp-template.c */ - -#line 1 "./asn1/credssp/packet-credssp-template.c" /* packet-credssp.c * Routines for CredSSP (Credential Security Support Provider) packet dissection * Graeme Lunt 2011 @@ -67,9 +64,6 @@ static int hf_credssp_TSSmartCardCreds = -1; /* TSSmartCardCreds */ static int hf_credssp_TSRemoteGuardCreds = -1;/* TSRemoteGuardCreds */ static int hf_credssp_TSCredentials = -1; /* TSCredentials */ static int hf_credssp_decr_PublicKeyAuth = -1;/* decr_PublicKeyAuth */ - -/*--- Included file: packet-credssp-hf.c ---*/ -#line 1 "./asn1/credssp/packet-credssp-hf.c" static int hf_credssp_TSRequest_PDU = -1; /* TSRequest */ static int hf_credssp_NegoData_item = -1; /* NegoData_item */ static int hf_credssp_negoToken = -1; /* T_negoToken */ @@ -99,16 +93,10 @@ static int hf_credssp_pubKeyAuth = -1; /* T_pubKeyAuth */ static int hf_credssp_errorCode = -1; /* T_errorCode */ static int hf_credssp_clientNonce = -1; /* T_clientNonce */ -/*--- End of included file: packet-credssp-hf.c ---*/ -#line 63 "./asn1/credssp/packet-credssp-template.c" - /* Initialize the subtree pointers */ static gint ett_credssp = -1; static gint ett_credssp_RGC_CredBuffer = -1; - -/*--- Included file: packet-credssp-ett.c ---*/ -#line 1 "./asn1/credssp/packet-credssp-ett.c" static gint ett_credssp_NegoData = -1; static gint ett_credssp_NegoData_item = -1; static gint ett_credssp_TSPasswordCreds = -1; @@ -120,12 +108,6 @@ static gint ett_credssp_SEQUENCE_OF_TSRemoteGuardPackageCred = -1; static gint ett_credssp_TSCredentials = -1; static gint ett_credssp_TSRequest = -1; -/*--- End of included file: packet-credssp-ett.c ---*/ -#line 69 "./asn1/credssp/packet-credssp-template.c" - - -/*--- Included file: packet-credssp-fn.c ---*/ -#line 1 "./asn1/credssp/packet-credssp-fn.c" static int @@ -513,9 +495,6 @@ static int dissect_TSRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } -/*--- End of included file: packet-credssp-fn.c ---*/ -#line 71 "./asn1/credssp/packet-credssp-template.c" - /* * Dissect CredSSP PDUs */ @@ -610,9 +589,6 @@ void proto_register_credssp(void) { { "Decrypted PublicKeyAuth (sha256)", "credssp.decr_PublicKeyAuth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-credssp-hfarr.c ---*/ -#line 1 "./asn1/credssp/packet-credssp-hfarr.c" { &hf_credssp_TSRequest_PDU, { "TSRequest", "credssp.TSRequest_element", FT_NONE, BASE_NONE, NULL, 0, @@ -725,18 +701,12 @@ void proto_register_credssp(void) { { "clientNonce", "credssp.clientNonce", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-credssp-hfarr.c ---*/ -#line 167 "./asn1/credssp/packet-credssp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_credssp, &ett_credssp_RGC_CredBuffer, - -/*--- Included file: packet-credssp-ettarr.c ---*/ -#line 1 "./asn1/credssp/packet-credssp-ettarr.c" &ett_credssp_NegoData, &ett_credssp_NegoData_item, &ett_credssp_TSPasswordCreds, @@ -747,9 +717,6 @@ void proto_register_credssp(void) { &ett_credssp_SEQUENCE_OF_TSRemoteGuardPackageCred, &ett_credssp_TSCredentials, &ett_credssp_TSRequest, - -/*--- End of included file: packet-credssp-ettarr.c ---*/ -#line 174 "./asn1/credssp/packet-credssp-template.c" }; diff --git a/epan/dissectors/packet-credssp.h b/epan/dissectors/packet-credssp.h index 928bc3d68e..feebe3fc93 100644 --- a/epan/dissectors/packet-credssp.h +++ b/epan/dissectors/packet-credssp.h @@ -3,9 +3,6 @@ /* packet-credssp.h */ /* asn2wrs.py -b -C -L -p credssp -c ./credssp.cnf -s ./packet-credssp-template -D . -O ../.. CredSSP.asn */ -/* Input file: packet-credssp-template.h */ - -#line 1 "./asn1/credssp/packet-credssp-template.h" /* packet-credssp.h * Routines for CredSSP (Credential Security Support Provider) packet dissection * Graeme Lunt 2011 @@ -21,12 +18,6 @@ #define PACKET_CREDSSP_H -/*--- Included file: packet-credssp-val.h ---*/ -#line 1 "./asn1/credssp/packet-credssp-val.h" - -/*--- End of included file: packet-credssp-val.h ---*/ -#line 16 "./asn1/credssp/packet-credssp-template.h" - void proto_reg_handoff_credssp(void); void proto_register_credssp(void); diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 4a7456ab73..bc908f3bda 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -3,9 +3,6 @@ /* packet-crmf.c */ /* asn2wrs.py -b -L -p crmf -c ./crmf.cnf -s ./packet-crmf-template -D . -O ../.. CRMF.asn */ -/* Input file: packet-crmf-template.c */ - -#line 1 "./asn1/crmf/packet-crmf-template.c" /* packet-crmf.c * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 @@ -39,9 +36,6 @@ void proto_reg_handoff_crmf(void); /* Initialize the protocol and registered fields */ static int proto_crmf = -1; static int hf_crmf_type_oid = -1; - -/*--- Included file: packet-crmf-hf.c ---*/ -#line 1 "./asn1/crmf/packet-crmf-hf.c" static int hf_crmf_PBMParameter_PDU = -1; /* PBMParameter */ static int hf_crmf_RegToken_PDU = -1; /* RegToken */ static int hf_crmf_Authenticator_PDU = -1; /* Authenticator */ @@ -123,13 +117,7 @@ static int hf_crmf_privateKey = -1; /* OCTET_STRING */ static int hf_crmf_attributes = -1; /* Attributes */ static int hf_crmf_Attributes_item = -1; /* Attribute */ -/*--- End of included file: packet-crmf-hf.c ---*/ -#line 35 "./asn1/crmf/packet-crmf-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-crmf-ett.c ---*/ -#line 1 "./asn1/crmf/packet-crmf-ett.c" static gint ett_crmf_CertReqMessages = -1; static gint ett_crmf_CertReqMsg = -1; static gint ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue = -1; @@ -157,12 +145,6 @@ static gint ett_crmf_T_identifier = -1; static gint ett_crmf_PrivateKeyInfo = -1; static gint ett_crmf_Attributes = -1; -/*--- End of included file: packet-crmf-ett.c ---*/ -#line 38 "./asn1/crmf/packet-crmf-template.c" - -/*--- Included file: packet-crmf-fn.c ---*/ -#line 1 "./asn1/crmf/packet-crmf-fn.c" - static int dissect_crmf_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -898,9 +880,6 @@ static int dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-crmf-fn.c ---*/ -#line 39 "./asn1/crmf/packet-crmf-template.c" - /*--- proto_register_crmf ----------------------------------------------*/ void proto_register_crmf(void) { @@ -911,9 +890,6 @@ void proto_register_crmf(void) { { "Type", "crmf.type.oid", FT_STRING, BASE_NONE, NULL, 0, "Type of AttributeTypeAndValue", HFILL }}, - -/*--- Included file: packet-crmf-hfarr.c ---*/ -#line 1 "./asn1/crmf/packet-crmf-hfarr.c" { &hf_crmf_PBMParameter_PDU, { "PBMParameter", "crmf.PBMParameter_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1234,16 +1210,10 @@ void proto_register_crmf(void) { { "Attribute", "crmf.Attribute_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-crmf-hfarr.c ---*/ -#line 51 "./asn1/crmf/packet-crmf-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-crmf-ettarr.c ---*/ -#line 1 "./asn1/crmf/packet-crmf-ettarr.c" &ett_crmf_CertReqMessages, &ett_crmf_CertReqMsg, &ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue, @@ -1270,9 +1240,6 @@ void proto_register_crmf(void) { &ett_crmf_T_identifier, &ett_crmf_PrivateKeyInfo, &ett_crmf_Attributes, - -/*--- End of included file: packet-crmf-ettarr.c ---*/ -#line 56 "./asn1/crmf/packet-crmf-template.c" }; /* Register protocol */ @@ -1290,9 +1257,6 @@ void proto_reg_handoff_crmf(void) { oid_add_from_string("id-pkip","1.3.6.1.5.5.7.5"); oid_add_from_string("id-regCtrl","1.3.6.1.5.5.7.5.1"); oid_add_from_string("id-regInfo","1.3.6.1.5.5.7.5.2"); - -/*--- Included file: packet-crmf-dis-tab.c ---*/ -#line 1 "./asn1/crmf/packet-crmf-dis-tab.c" register_ber_oid_dissector("1.2.840.113549.1.9.16.1.21", dissect_EncKeyWithID_PDU, proto_crmf, "id-ct-encKeyWithID"); register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_crmf, "PasswordBasedMac"); register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.1", dissect_RegToken_PDU, proto_crmf, "id-regCtrl-regToken"); @@ -1304,8 +1268,5 @@ void proto_reg_handoff_crmf(void) { register_ber_oid_dissector("1.3.6.1.5.5.7.5.2.1", dissect_UTF8Pairs_PDU, proto_crmf, "id-regInfo-utf8Pairs"); register_ber_oid_dissector("1.3.6.1.5.5.7.5.2.2", dissect_CertReq_PDU, proto_crmf, "id-regInfo-certReq"); - -/*--- End of included file: packet-crmf-dis-tab.c ---*/ -#line 74 "./asn1/crmf/packet-crmf-template.c" } diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h index e068ce95d8..1cf3951a8d 100644 --- a/epan/dissectors/packet-crmf.h +++ b/epan/dissectors/packet-crmf.h @@ -3,9 +3,6 @@ /* packet-crmf.h */ /* asn2wrs.py -b -L -p crmf -c ./crmf.cnf -s ./packet-crmf-template -D . -O ../.. CRMF.asn */ -/* Input file: packet-crmf-template.h */ - -#line 1 "./asn1/crmf/packet-crmf-template.h" /* packet-crmf.h * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 @@ -20,9 +17,6 @@ #ifndef PACKET_CRMF_H #define PACKET_CRMF_H - -/*--- Included file: packet-crmf-exp.h ---*/ -#line 1 "./asn1/crmf/packet-crmf-exp.h" int dissect_crmf_CertReqMessages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_crmf_CertTemplate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_crmf_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -30,8 +24,5 @@ int dissect_crmf_PKIPublicationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ int dissect_crmf_EncryptedValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_crmf_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-crmf-exp.h ---*/ -#line 16 "./asn1/crmf/packet-crmf-template.h" - #endif /* PACKET_CRMF_H */ diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 2f9fb59e55..47661a9079 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -3,9 +3,6 @@ /* packet-dap.c */ /* asn2wrs.py -b -L -p dap -c ./dap.cnf -s ./packet-dap-template -D . -O ../.. dap.asn DirectoryAccessProtocol.asn */ -/* Input file: packet-dap-template.c */ - -#line 1 "./asn1/dap/packet-dap-template.c" /* packet-dap.c * Routines for X.511 (X.500 Directory Asbtract Service) and X.519 DAP packet dissection * Graeme Lunt 2005 @@ -53,9 +50,6 @@ void proto_reg_handoff_dap(void); static int proto_dap = -1; - -/*--- Included file: packet-dap-hf.c ---*/ -#line 1 "./asn1/dap/packet-dap-hf.c" static int hf_dap_DirectoryBindArgument_PDU = -1; /* DirectoryBindArgument */ static int hf_dap_DirectoryBindResult_PDU = -1; /* DirectoryBindResult */ static int hf_dap_DirectoryBindError_PDU = -1; /* DirectoryBindError */ @@ -462,14 +456,8 @@ static int hf_dap_SearchControlOptions_useSubset = -1; static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; -/*--- End of included file: packet-dap-hf.c ---*/ -#line 49 "./asn1/dap/packet-dap-template.c" - /* Initialize the subtree pointers */ static gint ett_dap = -1; - -/*--- Included file: packet-dap-ett.c ---*/ -#line 1 "./asn1/dap/packet-dap-ett.c" static gint ett_dap_ServiceControls = -1; static gint ett_dap_T_manageDSAITPlaneRef = -1; static gint ett_dap_ServiceControlOptions = -1; @@ -641,14 +629,8 @@ static gint ett_dap_T_attributeInfo_item = -1; static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; -/*--- End of included file: packet-dap-ett.c ---*/ -#line 53 "./asn1/dap/packet-dap-template.c" - static expert_field ei_dap_anonymous = EI_INIT; - -/*--- Included file: packet-dap-val.h ---*/ -#line 1 "./asn1/dap/packet-dap-val.h" #define id_opcode_read 1 #define id_opcode_compare 2 #define id_opcode_abandon 3 @@ -668,12 +650,6 @@ static expert_field ei_dap_anonymous = EI_INIT; #define id_errcode_updateError 8 #define id_errcode_dsaReferral 9 -/*--- End of included file: packet-dap-val.h ---*/ -#line 57 "./asn1/dap/packet-dap-template.c" - - -/*--- Included file: packet-dap-table.c ---*/ -#line 1 "./asn1/dap/packet-dap-table.c" /* DAP OPERATIONS */ const value_string dap_opr_code_string_vals[] = { @@ -706,12 +682,6 @@ static const value_string dap_err_code_string_vals[] = { }; -/*--- End of included file: packet-dap-table.c ---*/ -#line 59 "./asn1/dap/packet-dap-template.c" - - -/*--- Included file: packet-dap-fn.c ---*/ -#line 1 "./asn1/dap/packet-dap-fn.c" /*--- Cyclic dependencies ---*/ /* FamilyEntries -> FamilyEntries/familyEntries -> FamilyEntry -> FamilyEntry/family-info -> FamilyEntries */ @@ -4753,12 +4723,6 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr } -/*--- End of included file: packet-dap-fn.c ---*/ -#line 61 "./asn1/dap/packet-dap-template.c" - - -/*--- Included file: packet-dap-table11.c ---*/ -#line 1 "./asn1/dap/packet-dap-table11.c" static const ros_opr_t dap_opr_tab[] = { /* directoryBind */ @@ -4785,12 +4749,6 @@ static const ros_opr_t dap_opr_tab[] = { }; -/*--- End of included file: packet-dap-table11.c ---*/ -#line 63 "./asn1/dap/packet-dap-template.c" - -/*--- Included file: packet-dap-table21.c ---*/ -#line 1 "./asn1/dap/packet-dap-table21.c" - static const ros_err_t dap_err_tab[] = { /* directoryBindError*/ { err_ros_bind, dissect_DirectoryBindError_PDU }, @@ -4814,9 +4772,6 @@ static const ros_err_t dap_err_tab[] = { }; -/*--- End of included file: packet-dap-table21.c ---*/ -#line 64 "./asn1/dap/packet-dap-template.c" - static const ros_info_t dap_ros_info = { "DAP", &proto_dap, @@ -4834,9 +4789,6 @@ void proto_register_dap(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-dap-hfarr.c ---*/ -#line 1 "./asn1/dap/packet-dap-hfarr.c" { &hf_dap_DirectoryBindArgument_PDU, { "DirectoryBindArgument", "dap.DirectoryBindArgument_element", FT_NONE, BASE_NONE, NULL, 0, @@ -6453,17 +6405,11 @@ void proto_register_dap(void) { { "searchFamily", "dap.SearchControlOptions.searchFamily", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-dap-hfarr.c ---*/ -#line 83 "./asn1/dap/packet-dap-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_dap, - -/*--- Included file: packet-dap-ettarr.c ---*/ -#line 1 "./asn1/dap/packet-dap-ettarr.c" &ett_dap_ServiceControls, &ett_dap_T_manageDSAITPlaneRef, &ett_dap_ServiceControlOptions, @@ -6634,9 +6580,6 @@ void proto_register_dap(void) { &ett_dap_T_attributeInfo_item, &ett_dap_UpdateError, &ett_dap_T_signedUpdateError, - -/*--- End of included file: packet-dap-ettarr.c ---*/ -#line 89 "./asn1/dap/packet-dap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-dap.h b/epan/dissectors/packet-dap.h index c5b50cac19..c969171af2 100644 --- a/epan/dissectors/packet-dap.h +++ b/epan/dissectors/packet-dap.h @@ -3,9 +3,6 @@ /* packet-dap.h */ /* asn2wrs.py -b -L -p dap -c ./dap.cnf -s ./packet-dap-template -D . -O ../.. dap.asn DirectoryAccessProtocol.asn */ -/* Input file: packet-dap-template.h */ - -#line 1 "./asn1/dap/packet-dap-template.h" /* packet-dap.h * Routines for X.511 (X.500 Directory Access Protocol) packet dissection * Graeme Lunt 2005 @@ -20,9 +17,6 @@ #ifndef PACKET_DAP_H #define PACKET_DAP_H - -/*--- Included file: packet-dap-exp.h ---*/ -#line 1 "./asn1/dap/packet-dap-exp.h" extern const value_string dap_FamilyGrouping_vals[]; extern const value_string dap_ContextSelection_vals[]; extern const value_string dap_Filter_vals[]; @@ -93,7 +87,4 @@ int dissect_dap_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in int dissect_dap_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_dap_UpdateError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-dap-exp.h ---*/ -#line 16 "./asn1/dap/packet-dap-template.h" - #endif /* PACKET_DAP_H */ diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index ef7e72d3cb..4b96ef3fdd 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -3,9 +3,6 @@ /* packet-disp.c */ /* asn2wrs.py -b -L -p disp -c ./disp.cnf -s ./packet-disp-template -D . -O ../.. disp.asn */ -/* Input file: packet-disp-template.c */ - -#line 1 "./asn1/disp/packet-disp-template.c" /* packet-disp.c * Routines for X.525 (X.500 Directory Shadow Asbtract Service) and X.519 DISP packet dissection * Graeme Lunt 2005 @@ -53,9 +50,6 @@ void proto_reg_handoff_disp(void); /* Initialize the protocol and registered fields */ static int proto_disp = -1; - -/*--- Included file: packet-disp-hf.c ---*/ -#line 1 "./asn1/disp/packet-disp-hf.c" static int hf_disp_EstablishParameter_PDU = -1; /* EstablishParameter */ static int hf_disp_ModificationParameter_PDU = -1; /* ModificationParameter */ static int hf_disp_ShadowingAgreementInfo_PDU = -1; /* ShadowingAgreementInfo */ @@ -164,14 +158,8 @@ static int hf_disp_unsignedShadowError = -1; /* ShadowErrorData */ static int hf_disp_signedShadowError = -1; /* T_signedShadowError */ static int hf_disp_shadowError = -1; /* ShadowErrorData */ -/*--- End of included file: packet-disp-hf.c ---*/ -#line 49 "./asn1/disp/packet-disp-template.c" - /* Initialize the subtree pointers */ static gint ett_disp = -1; - -/*--- Included file: packet-disp-ett.c ---*/ -#line 1 "./asn1/disp/packet-disp-ett.c" static gint ett_disp_ModificationParameter = -1; static gint ett_disp_SET_OF_SupplierAndConsumers = -1; static gint ett_disp_ShadowingAgreementInfo = -1; @@ -227,9 +215,6 @@ static gint ett_disp_ShadowErrorData = -1; static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; -/*--- End of included file: packet-disp-ett.c ---*/ -#line 53 "./asn1/disp/packet-disp-template.c" - static expert_field ei_disp_unsupported_opcode = EI_INIT; static expert_field ei_disp_unsupported_errcode = EI_INIT; static expert_field ei_disp_unsupported_pdu = EI_INIT; @@ -237,9 +222,6 @@ static expert_field ei_disp_zero_pdu = EI_INIT; static dissector_handle_t disp_handle = NULL; - -/*--- Included file: packet-disp-fn.c ---*/ -#line 1 "./asn1/disp/packet-disp-fn.c" /*--- Cyclic dependencies ---*/ /* Subtree -> Subtree/subtree -> Subtree */ @@ -1452,9 +1434,6 @@ static int dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *pi } -/*--- End of included file: packet-disp-fn.c ---*/ -#line 62 "./asn1/disp/packet-disp-template.c" - /* * Dissect DISP PDUs inside a ROS PDUs */ @@ -1578,9 +1557,6 @@ void proto_register_disp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-disp-hfarr.c ---*/ -#line 1 "./asn1/disp/packet-disp-hfarr.c" { &hf_disp_EstablishParameter_PDU, { "EstablishParameter", "disp.EstablishParameter_element", FT_NONE, BASE_NONE, NULL, 0, @@ -2009,17 +1985,11 @@ void proto_register_disp(void) { { "shadowError", "disp.shadowError_element", FT_NONE, BASE_NONE, NULL, 0, "ShadowErrorData", HFILL }}, - -/*--- End of included file: packet-disp-hfarr.c ---*/ -#line 187 "./asn1/disp/packet-disp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_disp, - -/*--- Included file: packet-disp-ettarr.c ---*/ -#line 1 "./asn1/disp/packet-disp-ettarr.c" &ett_disp_ModificationParameter, &ett_disp_SET_OF_SupplierAndConsumers, &ett_disp_ShadowingAgreementInfo, @@ -2074,9 +2044,6 @@ void proto_register_disp(void) { &ett_disp_ShadowErrorData, &ett_disp_ShadowError, &ett_disp_T_signedShadowError, - -/*--- End of included file: packet-disp-ettarr.c ---*/ -#line 193 "./asn1/disp/packet-disp-template.c" }; static ei_register_info ei[] = { @@ -2114,9 +2081,6 @@ void proto_register_disp(void) { /*--- proto_reg_handoff_disp --- */ void proto_reg_handoff_disp(void) { - -/*--- Included file: packet-disp-dis-tab.c ---*/ -#line 1 "./asn1/disp/packet-disp-dis-tab.c" dissector_add_string("dop.oid", "agreement.2.5.19.1", create_dissector_handle(dissect_ShadowingAgreementInfo_PDU, proto_disp)); dissector_add_string("dop.oid", "establish.rolea.2.5.19.1", create_dissector_handle(dissect_EstablishParameter_PDU, proto_disp)); dissector_add_string("dop.oid", "establish.roleb.2.5.19.1", create_dissector_handle(dissect_EstablishParameter_PDU, proto_disp)); @@ -2124,9 +2088,6 @@ void proto_reg_handoff_disp(void) { dissector_add_string("dop.oid", "modify.roleb.2.5.19.1", create_dissector_handle(dissect_ModificationParameter_PDU, proto_disp)); -/*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 231 "./asn1/disp/packet-disp-template.c" - /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-shadow-consumer-initiated","2.5.3.4"); diff --git a/epan/dissectors/packet-disp.h b/epan/dissectors/packet-disp.h index f5e68cbab3..8f927d6705 100644 --- a/epan/dissectors/packet-disp.h +++ b/epan/dissectors/packet-disp.h @@ -3,9 +3,6 @@ /* packet-disp.h */ /* asn2wrs.py -b -L -p disp -c ./disp.cnf -s ./packet-disp-template -D . -O ../.. disp.asn */ -/* Input file: packet-disp-template.h */ - -#line 1 "./asn1/disp/packet-disp-template.h" /* packet-disp.h * Routines for X.525 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 @@ -20,12 +17,6 @@ #ifndef PACKET_DISP_H #define PACKET_DISP_H - -/*--- Included file: packet-disp-exp.h ---*/ -#line 1 "./asn1/disp/packet-disp-exp.h" int dissect_disp_AgreementID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-disp-exp.h ---*/ -#line 16 "./asn1/disp/packet-disp-template.h" - #endif /* PACKET_DISP_H */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index fc35b7cfb4..581317b15b 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -3,9 +3,6 @@ /* packet-dop.c */ /* asn2wrs.py -b -L -p dop -c ./dop.cnf -s ./packet-dop-template -D . -O ../.. dop.asn */ -/* Input file: packet-dop-template.c */ - -#line 1 "./asn1/dop/packet-dop-template.c" /* packet-dop.c * Routines for X.501 (DSA Operational Attributes) packet dissection * Graeme Lunt 2005 @@ -53,9 +50,6 @@ static const char *binding_type = NULL; /* binding_type */ static int call_dop_oid_callback(const char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, const char *col_info, void* data); - -/*--- Included file: packet-dop-hf.c ---*/ -#line 1 "./asn1/dop/packet-dop-hf.c" static int hf_dop_DSEType_PDU = -1; /* DSEType */ static int hf_dop_SupplierInformation_PDU = -1; /* SupplierInformation */ static int hf_dop_ConsumerInformation_PDU = -1; /* ConsumerInformation */ @@ -249,15 +243,9 @@ static int hf_dop_GrantsAndDenials_denyFilterMatch = -1; static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; -/*--- End of included file: packet-dop-hf.c ---*/ -#line 49 "./asn1/dop/packet-dop-template.c" - /* Initialize the subtree pointers */ static gint ett_dop = -1; static gint ett_dop_unknown = -1; - -/*--- Included file: packet-dop-ett.c ---*/ -#line 1 "./asn1/dop/packet-dop-ett.c" static gint ett_dop_DSEType = -1; static gint ett_dop_SupplierOrConsumer = -1; static gint ett_dop_SET_OF_ProtocolInformation = -1; @@ -326,9 +314,6 @@ static gint ett_dop_AuthenticationLevel = -1; static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; -/*--- End of included file: packet-dop-ett.c ---*/ -#line 54 "./asn1/dop/packet-dop-template.c" - static expert_field ei_dop_unknown_binding_parameter = EI_INIT; static expert_field ei_dop_unsupported_opcode = EI_INIT; static expert_field ei_dop_unsupported_errcode = EI_INIT; @@ -349,9 +334,6 @@ static void append_oid(packet_info *pinfo, const char *oid) } -/*--- Included file: packet-dop-fn.c ---*/ -#line 1 "./asn1/dop/packet-dop-fn.c" - static int * const DSEType_bits[] = { &hf_dop_DSEType_root, &hf_dop_DSEType_glue, @@ -1988,9 +1970,6 @@ static int dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-dop-fn.c ---*/ -#line 75 "./asn1/dop/packet-dop-template.c" - static int call_dop_oid_callback(const char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, const char *col_info, void* data) { @@ -2141,9 +2120,6 @@ void proto_register_dop(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-dop-hfarr.c ---*/ -#line 1 "./asn1/dop/packet-dop-hfarr.c" { &hf_dop_DSEType_PDU, { "DSEType", "dop.DSEType", FT_BYTES, BASE_NONE, NULL, 0, @@ -2908,18 +2884,12 @@ void proto_register_dop(void) { { "denyInvoke", "dop.GrantsAndDenials.denyInvoke", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-dop-hfarr.c ---*/ -#line 227 "./asn1/dop/packet-dop-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_dop, &ett_dop_unknown, - -/*--- Included file: packet-dop-ettarr.c ---*/ -#line 1 "./asn1/dop/packet-dop-ettarr.c" &ett_dop_DSEType, &ett_dop_SupplierOrConsumer, &ett_dop_SET_OF_ProtocolInformation, @@ -2987,9 +2957,6 @@ void proto_register_dop(void) { &ett_dop_AuthenticationLevel, &ett_dop_T_basicLevels, &ett_dop_GrantsAndDenials, - -/*--- End of included file: packet-dop-ettarr.c ---*/ -#line 234 "./asn1/dop/packet-dop-template.c" }; static ei_register_info ei[] = { @@ -3032,9 +2999,6 @@ void proto_register_dop(void) { /*--- proto_reg_handoff_dop --- */ void proto_reg_handoff_dop(void) { - -/*--- Included file: packet-dop-dis-tab.c ---*/ -#line 1 "./asn1/dop/packet-dop-dis-tab.c" register_ber_oid_dissector("2.5.12.0", dissect_DSEType_PDU, proto_dop, "id-doa-dseType"); register_ber_oid_dissector("2.5.12.5", dissect_SupplierInformation_PDU, proto_dop, "id-doa-supplierKnowledge"); register_ber_oid_dissector("2.5.12.6", dissect_ConsumerInformation_PDU, proto_dop, "id-doa-consumerKnowledge"); @@ -3053,9 +3017,6 @@ void proto_reg_handoff_dop(void) { register_ber_oid_dissector("2.5.24.5", dissect_ACIItem_PDU, proto_dop, "id-aca-entryACI"); register_ber_oid_dissector("2.5.24.6", dissect_ACIItem_PDU, proto_dop, "id-aca-subentryACI"); - -/*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 277 "./asn1/dop/packet-dop-template.c" /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3"); diff --git a/epan/dissectors/packet-dop.h b/epan/dissectors/packet-dop.h index c609879bd4..3ebd4bda2f 100644 --- a/epan/dissectors/packet-dop.h +++ b/epan/dissectors/packet-dop.h @@ -3,9 +3,6 @@ /* packet-dop.h */ /* asn2wrs.py -b -L -p dop -c ./dop.cnf -s ./packet-dop-template -D . -O ../.. dop.asn */ -/* Input file: packet-dop-template.h */ - -#line 1 "./asn1/dop/packet-dop-template.h" /* packet-x501.h * Routines for X.501 (DSA Operational Attributes) packet dissection * Graeme Lunt 2005 @@ -20,14 +17,8 @@ #ifndef PACKET_X501_H #define PACKET_X501_H - -/*--- Included file: packet-dop-exp.h ---*/ -#line 1 "./asn1/dop/packet-dop-exp.h" int dissect_dop_DSEType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_dop_SupplierAndConsumers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_dop_OperationalBindingID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-dop-exp.h ---*/ -#line 16 "./asn1/dop/packet-dop-template.h" - #endif /* PACKET_X501_H */ diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 1d59e9b361..46e0b10d01 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -3,9 +3,6 @@ /* packet-dsp.c */ /* asn2wrs.py -b -L -p dsp -c ./dsp.cnf -s ./packet-dsp-template -D . -O ../.. dsp.asn */ -/* Input file: packet-dsp-template.c */ - -#line 1 "./asn1/dsp/packet-dsp-template.c" /* packet-dsp.c * Routines for X.518 (X.500 Distributed Operations) packet dissection * Graeme Lunt 2005 @@ -47,9 +44,6 @@ void proto_reg_handoff_dsp(void); /* Initialize the protocol and registered fields */ static int proto_dsp = -1; - -/*--- Included file: packet-dsp-hf.c ---*/ -#line 1 "./asn1/dsp/packet-dsp-hf.c" static int hf_dsp_AccessPoint_PDU = -1; /* AccessPoint */ static int hf_dsp_MasterAndShadowAccessPoints_PDU = -1; /* MasterAndShadowAccessPoints */ static int hf_dsp_DitBridgeKnowledge_PDU = -1; /* DitBridgeKnowledge */ @@ -188,14 +182,8 @@ static int hf_dsp_localQualifier = -1; /* INTEGER */ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ -/*--- End of included file: packet-dsp-hf.c ---*/ -#line 43 "./asn1/dsp/packet-dsp-template.c" - /* Initialize the subtree pointers */ static gint ett_dsp = -1; - -/*--- Included file: packet-dsp-ett.c ---*/ -#line 1 "./asn1/dsp/packet-dsp-ett.c" static gint ett_dsp_ChainedReadArgumentData = -1; static gint ett_dsp_ChainedReadArgument = -1; static gint ett_dsp_T_signedChainedReadArgument = -1; @@ -268,18 +256,12 @@ static gint ett_dsp_SET_OF_AccessPointInformation = -1; static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; -/*--- End of included file: packet-dsp-ett.c ---*/ -#line 47 "./asn1/dsp/packet-dsp-template.c" - static expert_field ei_dsp_unsupported_opcode = EI_INIT; static expert_field ei_dsp_unsupported_errcode = EI_INIT; static expert_field ei_dsp_unsupported_pdu = EI_INIT; static expert_field ei_dsp_zero_pdu = EI_INIT; -/*--- Included file: packet-dsp-fn.c ---*/ -#line 1 "./asn1/dsp/packet-dsp-fn.c" - static int dissect_dsp_DSASystemBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1675,9 +1657,6 @@ static int dissect_DitBridgeKnowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } -/*--- End of included file: packet-dsp-fn.c ---*/ -#line 54 "./asn1/dsp/packet-dsp-template.c" - static dissector_handle_t dsp_handle; /* @@ -1881,9 +1860,6 @@ void proto_register_dsp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-dsp-hfarr.c ---*/ -#line 1 "./asn1/dsp/packet-dsp-hfarr.c" { &hf_dsp_AccessPoint_PDU, { "AccessPoint", "dsp.AccessPoint_element", FT_NONE, BASE_NONE, NULL, 0, @@ -2432,17 +2408,11 @@ void proto_register_dsp(void) { { "other", "dsp.other_element", FT_NONE, BASE_NONE, NULL, 0, "EXTERNAL", HFILL }}, - -/*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 259 "./asn1/dsp/packet-dsp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_dsp, - -/*--- Included file: packet-dsp-ettarr.c ---*/ -#line 1 "./asn1/dsp/packet-dsp-ettarr.c" &ett_dsp_ChainedReadArgumentData, &ett_dsp_ChainedReadArgument, &ett_dsp_T_signedChainedReadArgument, @@ -2514,9 +2484,6 @@ void proto_register_dsp(void) { &ett_dsp_SET_OF_AccessPointInformation, &ett_dsp_AuthenticationLevel, &ett_dsp_T_basicLevels, - -/*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 265 "./asn1/dsp/packet-dsp-template.c" }; static ei_register_info ei[] = { { &ei_dsp_unsupported_opcode, { "dsp.unsupported_opcode", PI_UNDECODED, PI_WARN, "Unsupported DSP opcode", EXPFILL }}, @@ -2554,9 +2521,6 @@ void proto_register_dsp(void) { /*--- proto_reg_handoff_dsp --- */ void proto_reg_handoff_dsp(void) { - -/*--- Included file: packet-dsp-dis-tab.c ---*/ -#line 1 "./asn1/dsp/packet-dsp-dis-tab.c" register_ber_oid_dissector("2.5.12.1", dissect_AccessPoint_PDU, proto_dsp, "id-doa-myAccessPoint"); register_ber_oid_dissector("2.5.12.2", dissect_AccessPoint_PDU, proto_dsp, "id-doa-superiorKnowledge"); register_ber_oid_dissector("2.5.12.3", dissect_MasterAndShadowAccessPoints_PDU, proto_dsp, "id-doa-specificKnowledge"); @@ -2564,9 +2528,6 @@ void proto_reg_handoff_dsp(void) { register_ber_oid_dissector("2.5.12.8", dissect_DitBridgeKnowledge_PDU, proto_dsp, "id-doa-ditBridgeKnowledge"); -/*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 303 "./asn1/dsp/packet-dsp-template.c" - /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-directory-system","2.5.3.2"); diff --git a/epan/dissectors/packet-dsp.h b/epan/dissectors/packet-dsp.h index d0b23117c5..92b83466d8 100644 --- a/epan/dissectors/packet-dsp.h +++ b/epan/dissectors/packet-dsp.h @@ -3,9 +3,6 @@ /* packet-dsp.h */ /* asn2wrs.py -b -L -p dsp -c ./dsp.cnf -s ./packet-dsp-template -D . -O ../.. dsp.asn */ -/* Input file: packet-dsp-template.h */ - -#line 1 "./asn1/dsp/packet-dsp-template.h" /* packet-dsp.h * Routines for X.511 (X.500 Directory Access Protocol) packet dissection * Graeme Lunt 2005 @@ -20,9 +17,6 @@ #ifndef PACKET_DSP_H #define PACKET_DSP_H - -/*--- Included file: packet-dsp-exp.h ---*/ -#line 1 "./asn1/dsp/packet-dsp-exp.h" extern const value_string dsp_ReferenceType_vals[]; int dissect_dsp_OperationProgress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_dsp_ReferenceType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -32,7 +26,4 @@ WS_DLL_PUBLIC int dissect_dsp_AccessPointInformation(gboolean implicit_tag _U_, int dissect_dsp_Exclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_dsp_ContinuationReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-dsp-exp.h ---*/ -#line 16 "./asn1/dsp/packet-dsp-template.h" - #endif /* PACKET_DSP_H */ diff --git a/epan/dissectors/packet-e1ap.c b/epan/dissectors/packet-e1ap.c index a4e6df80a1..48649557d3 100644 --- a/epan/dissectors/packet-e1ap.c +++ b/epan/dissectors/packet-e1ap.c @@ -3,9 +3,6 @@ /* packet-e1ap.c */ /* asn2wrs.py -L -p e1ap -c ./e1ap.cnf -s ./packet-e1ap-template -D . -O ../.. E1AP-CommonDataTypes.asn E1AP-Constants.asn E1AP-Containers.asn E1AP-IEs.asn E1AP-PDU-Contents.asn E1AP-PDU-Descriptions.asn */ -/* Input file: packet-e1ap-template.c */ - -#line 1 "./asn1/e1ap/packet-e1ap-template.c" /* packet-e1ap.c * Routines for E-UTRAN E1 Application Protocol (E1AP) packet dissection * Copyright 2018-2022, Pascal Quantin @@ -43,9 +40,6 @@ void proto_register_e1ap(void); void proto_reg_handoff_e1ap(void); - -/*--- Included file: packet-e1ap-val.h ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -308,9 +302,6 @@ typedef enum _ProtocolIE_ID_enum { id_MCForwardingResourceReleaseIndication = 183 } ProtocolIE_ID_enum; -/*--- End of included file: packet-e1ap-val.h ---*/ -#line 39 "./asn1/e1ap/packet-e1ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_e1ap = -1; @@ -331,9 +322,6 @@ static int hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic = -1; static int hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic = -1; static int hf_e1ap_ReportCharacteristics_Reserved = -1; static int hf_e1ap_tcp_pdu_len = -1; - -/*--- Included file: packet-e1ap-hf.c ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-hf.c" static int hf_e1ap_ActivityInformation_PDU = -1; /* ActivityInformation */ static int hf_e1ap_ActivityNotificationLevel_PDU = -1; /* ActivityNotificationLevel */ static int hf_e1ap_AdditionalHandoverInfo_PDU = -1; /* AdditionalHandoverInfo */ @@ -1099,9 +1087,6 @@ static int hf_e1ap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_e1ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_e1ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-e1ap-hf.c ---*/ -#line 61 "./asn1/e1ap/packet-e1ap-template.c" - /* Initialize the subtree pointers */ static gint ett_e1ap = -1; static gint ett_e1ap_PLMN_Identity = -1; @@ -1110,9 +1095,6 @@ static gint ett_e1ap_InterfacesToTrace = -1; static gint ett_e1ap_MeasurementsToActivate = -1; static gint ett_e1ap_ReportCharacteristics = -1; static gint ett_e1ap_BurstArrivalTime = -1; - -/*--- Included file: packet-e1ap-ett.c ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-ett.c" static gint ett_e1ap_PrivateIE_ID = -1; static gint ett_e1ap_ProtocolIE_Container = -1; static gint ett_e1ap_ProtocolIE_Field = -1; @@ -1532,9 +1514,6 @@ static gint ett_e1ap_InitiatingMessage = -1; static gint ett_e1ap_SuccessfulOutcome = -1; static gint ett_e1ap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-e1ap-ett.c ---*/ -#line 71 "./asn1/e1ap/packet-e1ap-template.c" - enum{ INITIATING_MESSAGE, SUCCESSFUL_OUTCOME, @@ -1601,9 +1580,6 @@ e1ap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-e1ap-fn.c ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-fn.c" - static const value_string e1ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -13582,9 +13558,6 @@ static int dissect_E1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-e1ap-fn.c ---*/ -#line 138 "./asn1/e1ap/packet-e1ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { e1ap_ctx_t e1ap_ctx; @@ -13748,9 +13721,6 @@ void proto_register_e1ap(void) { { "TCP PDU length", "e1ap.tcp_pdu_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - -/*--- Included file: packet-e1ap-hfarr.c ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-hfarr.c" { &hf_e1ap_ActivityInformation_PDU, { "ActivityInformation", "e1ap.ActivityInformation", FT_UINT32, BASE_DEC, VALS(e1ap_ActivityInformation_vals), 0, @@ -16807,9 +16777,6 @@ void proto_register_e1ap(void) { { "value", "e1ap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-e1ap-hfarr.c ---*/ -#line 303 "./asn1/e1ap/packet-e1ap-template.c" }; /* List of subtrees */ @@ -16821,9 +16788,6 @@ void proto_register_e1ap(void) { &ett_e1ap_MeasurementsToActivate, &ett_e1ap_ReportCharacteristics, &ett_e1ap_BurstArrivalTime, - -/*--- Included file: packet-e1ap-ettarr.c ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-ettarr.c" &ett_e1ap_PrivateIE_ID, &ett_e1ap_ProtocolIE_Container, &ett_e1ap_ProtocolIE_Field, @@ -17242,9 +17206,6 @@ void proto_register_e1ap(void) { &ett_e1ap_InitiatingMessage, &ett_e1ap_SuccessfulOutcome, &ett_e1ap_UnsuccessfulOutcome, - -/*--- End of included file: packet-e1ap-ettarr.c ---*/ -#line 315 "./asn1/e1ap/packet-e1ap-template.c" }; /* Register protocol */ @@ -17271,9 +17232,6 @@ proto_reg_handoff_e1ap(void) dissector_add_uint_with_preference("sctp.port", SCTP_PORT_E1AP, e1ap_handle); dissector_add_uint_with_preference("tcp.port", 0, e1ap_tcp_handle); dissector_add_uint("sctp.ppi", E1AP_PROTOCOL_ID, e1ap_handle); - -/*--- Included file: packet-e1ap-dis-tab.c ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-dis-tab.c" dissector_add_uint("e1ap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_e1ap)); dissector_add_uint("e1ap.ies", id_CriticalityDiagnostics, create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_e1ap)); dissector_add_uint("e1ap.ies", id_gNB_CU_CP_UE_E1AP_ID, create_dissector_handle(dissect_GNB_CU_CP_UE_E1AP_ID_PDU, proto_e1ap)); @@ -17530,9 +17488,6 @@ proto_reg_handoff_e1ap(void) dissector_add_uint("e1ap.proc.sout", id_MCBearerContextRelease, create_dissector_handle(dissect_MCBearerContextReleaseComplete_PDU, proto_e1ap)); dissector_add_uint("e1ap.proc.imsg", id_MCBearerContextReleaseRequest, create_dissector_handle(dissect_MCBearerContextReleaseRequest_PDU, proto_e1ap)); - -/*--- End of included file: packet-e1ap-dis-tab.c ---*/ -#line 342 "./asn1/e1ap/packet-e1ap-template.c" } /* diff --git a/epan/dissectors/packet-e1ap.h b/epan/dissectors/packet-e1ap.h index 07d8cac480..81a2fd9dc9 100644 --- a/epan/dissectors/packet-e1ap.h +++ b/epan/dissectors/packet-e1ap.h @@ -3,9 +3,6 @@ /* packet-e1ap.h */ /* asn2wrs.py -L -p e1ap -c ./e1ap.cnf -s ./packet-e1ap-template -D . -O ../.. E1AP-CommonDataTypes.asn E1AP-Constants.asn E1AP-Containers.asn E1AP-IEs.asn E1AP-PDU-Contents.asn E1AP-PDU-Descriptions.asn */ -/* Input file: packet-e1ap-template.h */ - -#line 1 "./asn1/e1ap/packet-e1ap-template.h" /* packet-e1ap.h * Routines for E-UTRAN E1 Application Protocol (E1AP) packet dissection * @@ -28,12 +25,6 @@ typedef struct { -/*--- Included file: packet-e1ap-exp.h ---*/ -#line 1 "./asn1/e1ap/packet-e1ap-exp.h" - -/*--- End of included file: packet-e1ap-exp.h ---*/ -#line 23 "./asn1/e1ap/packet-e1ap-template.h" - #endif /* PACKET_E1AP_H */ /* diff --git a/epan/dissectors/packet-e2ap.c b/epan/dissectors/packet-e2ap.c index 538b44a5f3..e8317834fe 100644 --- a/epan/dissectors/packet-e2ap.c +++ b/epan/dissectors/packet-e2ap.c @@ -3,9 +3,6 @@ /* packet-e2ap.c */ /* asn2wrs.py -L -p e2ap -c ./e2ap.cnf -s ./packet-e2ap-template -D . -O ../.. E2AP-CommonDataTypes.asn E2AP-Constants.asn E2AP-Containers.asn E2AP-IEs.asn E2AP-PDU-Contents.asn E2AP-PDU-Descriptions.asn e2sm-v2.01.asn e2sm-ric-v1.02.asn e2sm-kpm-v2.02.asn */ -/* Input file: packet-e2ap-template.c */ - -#line 1 "./asn1/e2ap/packet-e2ap-template.c" /* packet-e2ap.c * Routines for E2APApplication Protocol (e2ap) packet dissection * Copyright 2021, Martin Mathieson @@ -47,9 +44,6 @@ void proto_reg_handoff_e2ap(void); static dissector_handle_t e2ap_handle; - -/*--- Included file: packet-e2ap-val.h ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-val.h" #define maxProtocolIEs 65535 #define maxnoofErrors 256 #define maxofE2nodeComponents 1024 @@ -175,14 +169,8 @@ typedef enum _ProtocolIE_ID_enum { id_RICsubscription_withCause_Item = 61 } ProtocolIE_ID_enum; -/*--- End of included file: packet-e2ap-val.h ---*/ -#line 43 "./asn1/e2ap/packet-e2ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_e2ap = -1; - -/*--- Included file: packet-e2ap-hf.c ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-hf.c" static int hf_e2ap_Cause_PDU = -1; /* Cause */ static int hf_e2ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ static int hf_e2ap_GlobalE2node_ID_PDU = -1; /* GlobalE2node_ID */ @@ -863,9 +851,6 @@ static int hf_e2ap_ric_ReportStyle_List_item_01 = -1; /* RIC_ReportStyle_Item * static int hf_e2ap_ric_ActionFormat_Type = -1; /* RIC_Format_Type */ static int hf_e2ap_measInfo_Action_List = -1; /* MeasurementInfo_Action_List */ -/*--- End of included file: packet-e2ap-hf.c ---*/ -#line 47 "./asn1/e2ap/packet-e2ap-template.c" - static int hf_e2ap_unmapped_ran_function_id = -1; static int hf_e2ap_ran_function_name_not_recognised = -1; static int hf_e2ap_ran_function_setup_frame = -1; @@ -878,9 +863,6 @@ static gint ett_e2ap = -1; static expert_field ei_e2ap_ran_function_names_no_match = EI_INIT; static expert_field ei_e2ap_ran_function_id_not_mapped = EI_INIT; - -/*--- Included file: packet-e2ap-ett.c ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-ett.c" static gint ett_e2ap_ProtocolIE_Container = -1; static gint ett_e2ap_ProtocolIE_Field = -1; static gint ett_e2ap_Cause = -1; @@ -1284,9 +1266,6 @@ static gint ett_e2ap_SEQUENCE_SIZE_1_maxnoofRICStyles_OF_RIC_ReportStyle_Item = static gint ett_e2ap_RIC_EventTriggerStyle_Item = -1; static gint ett_e2ap_RIC_ReportStyle_Item = -1; -/*--- End of included file: packet-e2ap-ett.c ---*/ -#line 61 "./asn1/e2ap/packet-e2ap-template.c" - /* Forward declarations */ static int dissect_E2SM_KPM_EventTriggerDefinition_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -1561,9 +1540,6 @@ static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, pro static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); - -/*--- Included file: packet-e2ap-fn.c ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-fn.c" /*--- Cyclic dependencies ---*/ /* RANParameter-Testing-Item -> RANParameter-Testing-Item/ranParameter-Type -> RANParameter-Testing-Item-Choice-List -> RANParameter-Testing-LIST -> RANParameter-Testing-Item */ @@ -11103,9 +11079,6 @@ static int dissect_E2SM_KPM_RANfunction_Description_PDU(tvbuff_t *tvb _U_, packe } -/*--- End of included file: packet-e2ap-fn.c ---*/ -#line 337 "./asn1/e2ap/packet-e2ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { e2ap_ctx_t e2ap_ctx; @@ -11184,9 +11157,6 @@ proto_reg_handoff_e2ap(void) { dissector_add_uint_with_preference("sctp.port", SCTP_PORT_E2AP, e2ap_handle); - -/*--- Included file: packet-e2ap-dis-tab.c ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-dis-tab.c" dissector_add_uint("e2ap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_e2ap)); dissector_add_uint("e2ap.ies", id_CriticalityDiagnostics, create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_e2ap)); dissector_add_uint("e2ap.ies", id_GlobalE2node_ID, create_dissector_handle(dissect_GlobalE2node_ID_PDU, proto_e2ap)); @@ -11275,9 +11245,6 @@ proto_reg_handoff_e2ap(void) dissector_add_uint("e2ap.proc.imsg", id_E2removal, create_dissector_handle(dissect_E2RemovalRequest_PDU, proto_e2ap)); dissector_add_uint("e2ap.proc.sout", id_E2removal, create_dissector_handle(dissect_E2RemovalResponse_PDU, proto_e2ap)); - -/*--- End of included file: packet-e2ap-dis-tab.c ---*/ -#line 417 "./asn1/e2ap/packet-e2ap-template.c" } @@ -11288,9 +11255,6 @@ void proto_register_e2ap(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-e2ap-hfarr.c ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-hfarr.c" { &hf_e2ap_Cause_PDU, { "Cause", "e2ap.Cause", FT_UINT32, BASE_DEC, VALS(e2ap_Cause_vals), 0, @@ -14007,9 +13971,6 @@ void proto_register_e2ap(void) { { "measInfo-Action-List", "e2ap.measInfo_Action_List", FT_UINT32, BASE_DEC, NULL, 0, "MeasurementInfo_Action_List", HFILL }}, - -/*--- End of included file: packet-e2ap-hfarr.c ---*/ -#line 428 "./asn1/e2ap/packet-e2ap-template.c" { &hf_e2ap_unmapped_ran_function_id, { "Unmapped RANfunctionID", "e2ap.unmapped-ran-function-id", FT_NONE, BASE_NONE, NULL, 0x0, @@ -14027,9 +13988,6 @@ void proto_register_e2ap(void) { /* List of subtrees */ static gint *ett[] = { &ett_e2ap, - -/*--- Included file: packet-e2ap-ettarr.c ---*/ -#line 1 "./asn1/e2ap/packet-e2ap-ettarr.c" &ett_e2ap_ProtocolIE_Container, &ett_e2ap_ProtocolIE_Field, &ett_e2ap_Cause, @@ -14432,9 +14390,6 @@ void proto_register_e2ap(void) { &ett_e2ap_SEQUENCE_SIZE_1_maxnoofRICStyles_OF_RIC_ReportStyle_Item, &ett_e2ap_RIC_EventTriggerStyle_Item, &ett_e2ap_RIC_ReportStyle_Item, - -/*--- End of included file: packet-e2ap-ettarr.c ---*/ -#line 446 "./asn1/e2ap/packet-e2ap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 1547d44f09..3e2a6a1c9d 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -3,9 +3,6 @@ /* packet-ess.c */ /* asn2wrs.py -b -k -C -L -p ess -c ./ess.cnf -s ./packet-ess-template -D . -O ../.. ExtendedSecurityServices.asn */ -/* Input file: packet-ess-template.c */ - -#line 1 "./asn1/ess/packet-ess-template.c" /* packet-ess.c * Routines for RFC 2634 and RFC 5035 Extended Security Services packet * dissection @@ -55,9 +52,6 @@ static int hf_ess_Category_attribute = -1; static gint ett_Category_attributes = -1; - -/*--- Included file: packet-ess-hf.c ---*/ -#line 1 "./asn1/ess/packet-ess-hf.c" static int hf_ess_ReceiptRequest_PDU = -1; /* ReceiptRequest */ static int hf_ess_ContentIdentifier_PDU = -1; /* ContentIdentifier */ static int hf_ess_Receipt_PDU = -1; /* Receipt */ @@ -129,12 +123,6 @@ static int hf_ess_issuerSerial = -1; /* IssuerSerial */ static int hf_ess_issuer = -1; /* GeneralNames */ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ -/*--- End of included file: packet-ess-hf.c ---*/ -#line 51 "./asn1/ess/packet-ess-template.c" - - -/*--- Included file: packet-ess-val.h ---*/ -#line 1 "./asn1/ess/packet-ess-val.h" #define ub_receiptsTo 16 #define id_aa_receiptRequest "1.2.840.113549.1.9.16.2.1" #define id_aa_contentIdentifier "1.2.840.113549.1.9.16.2.7" @@ -153,13 +141,7 @@ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ #define id_aa_signingCertificateV2 "1.2.840.113549.1.9.16.2.47" #define id_sha256 "2.16.840.1.101.3.4.2.1" -/*--- End of included file: packet-ess-val.h ---*/ -#line 53 "./asn1/ess/packet-ess-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-ess-ett.c ---*/ -#line 1 "./asn1/ess/packet-ess-ett.c" static gint ett_ess_ReceiptRequest = -1; static gint ett_ess_SEQUENCE_SIZE_1_ub_receiptsTo_OF_GeneralNames = -1; static gint ett_ess_ReceiptsFrom = -1; @@ -192,9 +174,6 @@ static gint ett_ess_ESSCertIDv2 = -1; static gint ett_ess_ESSCertID = -1; static gint ett_ess_IssuerSerial = -1; -/*--- End of included file: packet-ess-ett.c ---*/ -#line 56 "./asn1/ess/packet-ess-template.c" - static const char *object_identifier_id; UAT_CSTRING_CB_DEF(ess_category_attributes, oid, ess_category_attributes_t) @@ -265,9 +244,6 @@ ess_dissect_attribute_flags (tvbuff_t *tvb, asn1_ctx_t *actx) } -/*--- Included file: packet-ess-fn.c ---*/ -#line 1 "./asn1/ess/packet-ess-fn.c" - static int dissect_ess_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1128,9 +1104,6 @@ static int dissect_SigningCertificateV2_PDU(tvbuff_t *tvb _U_, packet_info *pinf } -/*--- End of included file: packet-ess-fn.c ---*/ -#line 127 "./asn1/ess/packet-ess-template.c" - /*--- proto_register_ess ----------------------------------------------*/ void proto_register_ess(void) { @@ -1142,9 +1115,6 @@ void proto_register_ess(void) { { &hf_ess_Category_attribute, { "Attribute", "ess.attribute", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-ess-hfarr.c ---*/ -#line 1 "./asn1/ess/packet-ess-hfarr.c" { &hf_ess_ReceiptRequest_PDU, { "ReceiptRequest", "ess.ReceiptRequest_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1425,17 +1395,11 @@ void proto_register_ess(void) { { "serialNumber", "ess.serialNumber", FT_BYTES, BASE_NONE, NULL, 0, "CertificateSerialNumber", HFILL }}, - -/*--- End of included file: packet-ess-hfarr.c ---*/ -#line 140 "./asn1/ess/packet-ess-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_Category_attributes, - -/*--- Included file: packet-ess-ettarr.c ---*/ -#line 1 "./asn1/ess/packet-ess-ettarr.c" &ett_ess_ReceiptRequest, &ett_ess_SEQUENCE_SIZE_1_ub_receiptsTo_OF_GeneralNames, &ett_ess_ReceiptsFrom, @@ -1467,9 +1431,6 @@ void proto_register_ess(void) { &ett_ess_ESSCertIDv2, &ett_ess_ESSCertID, &ett_ess_IssuerSerial, - -/*--- End of included file: packet-ess-ettarr.c ---*/ -#line 146 "./asn1/ess/packet-ess-template.c" }; static uat_field_t attributes_flds[] = { @@ -1515,9 +1476,6 @@ void proto_register_ess(void) { /*--- proto_reg_handoff_ess -------------------------------------------*/ void proto_reg_handoff_ess(void) { - -/*--- Included file: packet-ess-dis-tab.c ---*/ -#line 1 "./asn1/ess/packet-ess-dis-tab.c" register_ber_oid_dissector("1.2.840.113549.1.9.16.2.1", dissect_ReceiptRequest_PDU, proto_ess, "id-aa-receiptRequest"); register_ber_oid_dissector("1.2.840.113549.1.9.16.2.7", dissect_ContentIdentifier_PDU, proto_ess, "id-aa-contentIdentifier"); register_ber_oid_dissector("1.2.840.113549.1.9.16.1.1", dissect_Receipt_PDU, proto_ess, "id-ct-receipt"); @@ -1535,8 +1493,5 @@ void proto_reg_handoff_ess(void) { register_ber_oid_dissector("2.16.840.1.101.2.1.8.3.3", dissect_InformativeTag_PDU, proto_ess, "id-informativeAttributes"); register_ber_oid_dissector("2.16.840.1.101.2.1.8.3.4", dissect_EnumeratedTag_PDU, proto_ess, "id-enumeratedRestrictiveAttributes"); - -/*--- End of included file: packet-ess-dis-tab.c ---*/ -#line 192 "./asn1/ess/packet-ess-template.c" } diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h index 4bd5099566..56f7673f60 100644 --- a/epan/dissectors/packet-ess.h +++ b/epan/dissectors/packet-ess.h @@ -3,9 +3,6 @@ /* packet-ess.h */ /* asn2wrs.py -b -k -C -L -p ess -c ./ess.cnf -s ./packet-ess-template -D . -O ../.. ExtendedSecurityServices.asn */ -/* Input file: packet-ess-template.h */ - -#line 1 "./asn1/ess/packet-ess-template.h" /* packet-ess.h * Routines for RFC5035 Extended Security Services packet dissection * Ronnie Sahlberg 2004 @@ -21,13 +18,7 @@ #ifndef PACKET_ESS_H #define PACKET_ESS_H - -/*--- Included file: packet-ess-exp.h ---*/ -#line 1 "./asn1/ess/packet-ess-exp.h" int dissect_ess_ESSSecurityLabel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-ess-exp.h ---*/ -#line 17 "./asn1/ess/packet-ess-template.h" - #endif /* PACKET_ESS_H */ diff --git a/epan/dissectors/packet-f1ap.c b/epan/dissectors/packet-f1ap.c index 2870eac5bf..96d3156acc 100644 --- a/epan/dissectors/packet-f1ap.c +++ b/epan/dissectors/packet-f1ap.c @@ -3,9 +3,6 @@ /* packet-f1ap.c */ /* asn2wrs.py -L -p f1ap -c ./f1ap.cnf -s ./packet-f1ap-template -D . -O ../.. F1AP-CommonDataTypes.asn F1AP-Constants.asn F1AP-Containers.asn F1AP-IEs.asn F1AP-PDU-Contents.asn F1AP-PDU-Descriptions.asn */ -/* Input file: packet-f1ap-template.c */ - -#line 1 "./asn1/f1ap/packet-f1ap-template.c" /* packet-f1ap.c * Routines for E-UTRAN F1 Application Protocol (F1AP) packet dissection * Copyright 2018-2022, Pascal Quantin @@ -46,9 +43,6 @@ void proto_register_f1ap(void); void proto_reg_handoff_f1ap(void); - -/*--- Included file: packet-f1ap-val.h ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -939,9 +933,6 @@ typedef enum _ProtocolIE_ID_enum { id_UL_GapFR2_Config = 677 } ProtocolIE_ID_enum; -/*--- End of included file: packet-f1ap-val.h ---*/ -#line 42 "./asn1/f1ap/packet-f1ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_f1ap = -1; @@ -969,9 +960,6 @@ static int hf_f1ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1 static int hf_f1ap_ReportCharacteristics_HWLoadIndPeriodic = -1; static int hf_f1ap_ReportCharacteristics_NumberOfActiveUEs = -1; static int hf_f1ap_ReportCharacteristics_Reserved = -1; - -/*--- Included file: packet-f1ap-hf.c ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-hf.c" static int hf_f1ap_AbortTransmission_PDU = -1; /* AbortTransmission */ static int hf_f1ap_Activated_Cells_to_be_Updated_List_PDU = -1; /* Activated_Cells_to_be_Updated_List */ static int hf_f1ap_ActivationRequestType_PDU = -1; /* ActivationRequestType */ @@ -3027,9 +3015,6 @@ static int hf_f1ap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_f1ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_f1ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-f1ap-hf.c ---*/ -#line 71 "./asn1/f1ap/packet-f1ap-template.c" - /* Initialize the subtree pointers */ static gint ett_f1ap = -1; static gint ett_f1ap_ResourceCoordinationTransferContainer = -1; @@ -3107,9 +3092,6 @@ static gint ett_f1ap_SidelinkConfigurationContainer = -1; static gint ett_f1ap_SRSPosRRCInactiveConfig = -1; static gint ett_f1ap_successfulHOReportContainer = -1; static gint ett_f1ap_UL_GapFR2_Config = -1; - -/*--- Included file: packet-f1ap-ett.c ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-ett.c" static gint ett_f1ap_PrivateIE_ID = -1; static gint ett_f1ap_ProtocolIE_Container = -1; static gint ett_f1ap_ProtocolIE_Field = -1; @@ -4118,9 +4100,6 @@ static gint ett_f1ap_InitiatingMessage = -1; static gint ett_f1ap_SuccessfulOutcome = -1; static gint ett_f1ap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-f1ap-ett.c ---*/ -#line 150 "./asn1/f1ap/packet-f1ap-template.c" - enum{ INITIATING_MESSAGE, SUCCESSFUL_OUTCOME, @@ -4528,9 +4507,6 @@ add_nr_pdcp_meta_data(packet_info *pinfo, guint8 direction, guint8 srb_id) } -/*--- Included file: packet-f1ap-fn.c ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-fn.c" - static const value_string f1ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -36788,9 +36764,6 @@ static int dissect_F1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-f1ap-fn.c ---*/ -#line 558 "./asn1/f1ap/packet-f1ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { f1ap_ctx_t f1ap_ctx; @@ -36999,9 +36972,6 @@ void proto_register_f1ap(void) { { "Reserved", "f1ap.ReportCharacteristics.Reserved", FT_UINT32, BASE_HEX, NULL, 0x07ffffff, NULL, HFILL }}, - -/*--- Included file: packet-f1ap-hfarr.c ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-hfarr.c" { &hf_f1ap_AbortTransmission_PDU, { "AbortTransmission", "f1ap.AbortTransmission", FT_UINT32, BASE_DEC, VALS(f1ap_AbortTransmission_vals), 0, @@ -45218,9 +45188,6 @@ void proto_register_f1ap(void) { { "value", "f1ap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-f1ap-hfarr.c ---*/ -#line 768 "./asn1/f1ap/packet-f1ap-template.c" }; /* List of subtrees */ @@ -45301,9 +45268,6 @@ void proto_register_f1ap(void) { &ett_f1ap_SRSPosRRCInactiveConfig, &ett_f1ap_successfulHOReportContainer, &ett_f1ap_UL_GapFR2_Config, - -/*--- Included file: packet-f1ap-ettarr.c ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-ettarr.c" &ett_f1ap_PrivateIE_ID, &ett_f1ap_ProtocolIE_Container, &ett_f1ap_ProtocolIE_Field, @@ -46311,9 +46275,6 @@ void proto_register_f1ap(void) { &ett_f1ap_InitiatingMessage, &ett_f1ap_SuccessfulOutcome, &ett_f1ap_UnsuccessfulOutcome, - -/*--- End of included file: packet-f1ap-ettarr.c ---*/ -#line 849 "./asn1/f1ap/packet-f1ap-template.c" }; /* Register protocol */ @@ -46349,9 +46310,6 @@ proto_reg_handoff_f1ap(void) stats_tree_register("f1ap", "f1ap", "F1AP", 0, f1ap_stats_tree_packet, f1ap_stats_tree_init, NULL); - -/*--- Included file: packet-f1ap-dis-tab.c ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-dis-tab.c" dissector_add_uint("f1ap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_f1ap)); dissector_add_uint("f1ap.ies", id_Cells_Failed_to_be_Activated_List, create_dissector_handle(dissect_Cells_Failed_to_be_Activated_List_PDU, proto_f1ap)); dissector_add_uint("f1ap.ies", id_Cells_Failed_to_be_Activated_List_Item, create_dissector_handle(dissect_Cells_Failed_to_be_Activated_List_Item_PDU, proto_f1ap)); @@ -47148,9 +47106,6 @@ proto_reg_handoff_f1ap(void) dissector_add_uint("f1ap.proc.imsg", id_measurementActivation, create_dissector_handle(dissect_MeasurementActivation_PDU, proto_f1ap)); dissector_add_uint("f1ap.proc.imsg", id_QoEInformationTransfer, create_dissector_handle(dissect_QoEInformationTransfer_PDU, proto_f1ap)); - -/*--- End of included file: packet-f1ap-dis-tab.c ---*/ -#line 885 "./asn1/f1ap/packet-f1ap-template.c" } /* diff --git a/epan/dissectors/packet-f1ap.h b/epan/dissectors/packet-f1ap.h index 67be93708b..2a9aca478a 100644 --- a/epan/dissectors/packet-f1ap.h +++ b/epan/dissectors/packet-f1ap.h @@ -3,9 +3,6 @@ /* packet-f1ap.h */ /* asn2wrs.py -L -p f1ap -c ./f1ap.cnf -s ./packet-f1ap-template -D . -O ../.. F1AP-CommonDataTypes.asn F1AP-Constants.asn F1AP-Containers.asn F1AP-IEs.asn F1AP-PDU-Contents.asn F1AP-PDU-Descriptions.asn */ -/* Input file: packet-f1ap-template.h */ - -#line 1 "./asn1/f1ap/packet-f1ap-template.h" /* packet-f1ap.h * Routines for E-UTRAN F1 Application Protocol (F1AP) packet dissection * @@ -19,14 +16,8 @@ #ifndef PACKET_F1AP_H #define PACKET_F1AP_H - -/*--- Included file: packet-f1ap-exp.h ---*/ -#line 1 "./asn1/f1ap/packet-f1ap-exp.h" int dissect_f1ap_NRPRACHConfig_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-f1ap-exp.h ---*/ -#line 15 "./asn1/f1ap/packet-f1ap-template.h" - #endif /* PACKET_F1AP_H */ /* diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index fc1719f1aa..5d2e606364 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -3,9 +3,6 @@ /* packet-ftam.c */ /* asn2wrs.py -b -L -p ftam -c ./ftam.cnf -s ./packet-ftam-template -D . -O ../.. ISO8571-FTAM.asn */ -/* Input file: packet-ftam-template.c */ - -#line 1 "./asn1/ftam/packet-ftam-template.c" /* packet-ftam_asn1.c * Routine to dissect OSI ISO 8571 FTAM Protocol packets * based on the ASN.1 specification from http://www.itu.int/ITU-T/asn1/database/iso/8571-4/1988/ @@ -48,9 +45,6 @@ static int dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int off static int hf_ftam_unstructured_text = -1; /* ISO FTAM unstructured text */ static int hf_ftam_unstructured_binary = -1; /* ISO FTAM unstructured binary */ - -/*--- Included file: packet-ftam-hf.c ---*/ -#line 1 "./asn1/ftam/packet-ftam-hf.c" static int hf_ftam_fTAM_Regime_PDU = -1; /* FTAM_Regime_PDU */ static int hf_ftam_file_PDU = -1; /* File_PDU */ static int hf_ftam_bulk_Data_PDU = -1; /* Bulk_Data_PDU */ @@ -470,14 +464,8 @@ static int hf_ftam_Attribute_Names_read_path_access_control = -1; static int hf_ftam_Attribute_Names_spare_bit22 = -1; static int hf_ftam_Attribute_Names_read_Child_objects = -1; -/*--- End of included file: packet-ftam-hf.c ---*/ -#line 44 "./asn1/ftam/packet-ftam-template.c" - /* Initialize the subtree pointers */ static gint ett_ftam = -1; - -/*--- Included file: packet-ftam-ett.c ---*/ -#line 1 "./asn1/ftam/packet-ftam-ett.c" static gint ett_ftam_PDU = -1; static gint ett_ftam_FTAM_Regime_PDU = -1; static gint ett_ftam_F_INITIALIZE_request = -1; @@ -641,15 +629,9 @@ static gint ett_ftam_Path_Access_Passwords_item = -1; static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; -/*--- End of included file: packet-ftam-ett.c ---*/ -#line 48 "./asn1/ftam/packet-ftam-template.c" - static expert_field ei_ftam_zero_pdu = EI_INIT; -/*--- Included file: packet-ftam-fn.c ---*/ -#line 1 "./asn1/ftam/packet-ftam-fn.c" - static int * const Protocol_Version_U_bits[] = { &hf_ftam_Protocol_Version_U_version_1, &hf_ftam_Protocol_Version_U_version_2, @@ -4720,9 +4702,6 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a } -/*--- End of included file: packet-ftam-fn.c ---*/ -#line 52 "./asn1/ftam/packet-ftam-template.c" - /* * Dissect FTAM unstructured text */ @@ -4788,9 +4767,6 @@ void proto_register_ftam(void) { { &hf_ftam_unstructured_binary, { "ISO FTAM unstructured binary", "ftam.unstructured_binary", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - -/*--- Included file: packet-ftam-hfarr.c ---*/ -#line 1 "./asn1/ftam/packet-ftam-hfarr.c" { &hf_ftam_fTAM_Regime_PDU, { "fTAM-Regime-PDU", "ftam.fTAM_Regime_PDU", FT_UINT32, BASE_DEC, VALS(ftam_FTAM_Regime_PDU_vals), 0, @@ -6459,17 +6435,11 @@ void proto_register_ftam(void) { { "read-Child-objects", "ftam.Attribute.Names.read.Child.objects", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - -/*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 119 "./asn1/ftam/packet-ftam-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_ftam, - -/*--- Included file: packet-ftam-ettarr.c ---*/ -#line 1 "./asn1/ftam/packet-ftam-ettarr.c" &ett_ftam_PDU, &ett_ftam_FTAM_Regime_PDU, &ett_ftam_F_INITIALIZE_request, @@ -6632,9 +6602,6 @@ void proto_register_ftam(void) { &ett_ftam_Path_Access_Passwords_item, &ett_ftam_Attribute_Names, &ett_ftam_AE_title, - -/*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 125 "./asn1/ftam/packet-ftam-template.c" }; static ei_register_info ei[] = { { &ei_ftam_zero_pdu, { "ftam.zero_pdu", PI_PROTOCOL, PI_ERROR, "Internal error, zero-byte FTAM PDU", EXPFILL }}, diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h index ac85d2432f..35b5e64055 100644 --- a/epan/dissectors/packet-ftam.h +++ b/epan/dissectors/packet-ftam.h @@ -3,9 +3,6 @@ /* packet-ftam.h */ /* asn2wrs.py -b -L -p ftam -c ./ftam.cnf -s ./packet-ftam-template -D . -O ../.. ISO8571-FTAM.asn */ -/* Input file: packet-ftam-template.h */ - -#line 1 "./asn1/ftam/packet-ftam-template.h" /* packet-ftam.h * Routine to dissect OSI ISO 8571 FTAM Protocol packets * based on the ASN.1 specification from http://www.itu.int/ITU-T/asn1/database/iso/8571-4/1988/ @@ -25,9 +22,6 @@ #ifndef PACKET_FTAM_H #define PACKET_FTAM_H - -/*--- Included file: packet-ftam-exp.h ---*/ -#line 1 "./asn1/ftam/packet-ftam-exp.h" extern const value_string ftam_Date_and_Time_Attribute_vals[]; extern const value_string ftam_Object_Availability_Attribute_vals[]; extern const value_string ftam_Object_Size_Attribute_vals[]; @@ -43,7 +37,4 @@ int dissect_ftam_Private_Use_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb int dissect_ftam_Attribute_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_ftam_Pathname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-ftam-exp.h ---*/ -#line 21 "./asn1/ftam/packet-ftam-template.h" - #endif /* PACKET_FTAM_H */ diff --git a/epan/dissectors/packet-gdt.c b/epan/dissectors/packet-gdt.c index 4441706fd9..8ddfea08f6 100644 --- a/epan/dissectors/packet-gdt.c +++ b/epan/dissectors/packet-gdt.c @@ -3,9 +3,6 @@ /* packet-gdt.c */ /* asn2wrs.py -b -L -p gdt -c ./gdt.cnf -s ./packet-gdt-template -D . -O ../.. gdt.asn */ -/* Input file: packet-gdt-template.c */ - -#line 1 "./asn1/gdt/packet-gdt-template.c" /* packet-gdt-template.c * * Copyright 2022, Damir Franusic @@ -39,9 +36,6 @@ static int proto_gdt = -1; static dissector_handle_t gdt_handle = NULL; - -/*--- Included file: packet-gdt-hf.c ---*/ -#line 1 "./asn1/gdt/packet-gdt-hf.c" static int hf_gdt_GDTMessage_PDU = -1; /* GDTMessage */ static int hf_gdt_version = -1; /* INTEGER */ static int hf_gdt_source = -1; /* EndPointDescriptor */ @@ -93,14 +87,8 @@ static int hf_gdt_header = -1; /* Header */ static int hf_gdt_body = -1; /* Body */ static int hf_gdt_enc_type = -1; /* OCTET_STRING */ -/*--- End of included file: packet-gdt-hf.c ---*/ -#line 35 "./asn1/gdt/packet-gdt-template.c" - /* Initialize the subtree pointers */ static int ett_gdt = -1; - -/*--- Included file: packet-gdt-ett.c ---*/ -#line 1 "./asn1/gdt/packet-gdt-ett.c" static gint ett_gdt_Header = -1; static gint ett_gdt_EndPointDescriptor = -1; static gint ett_gdt_Body = -1; @@ -123,12 +111,6 @@ static gint ett_gdt_HopInfo = -1; static gint ett_gdt_GDTMessage = -1; static gint ett_gdt_EncryptionInfo = -1; -/*--- End of included file: packet-gdt-ett.c ---*/ -#line 39 "./asn1/gdt/packet-gdt-template.c" - - -/*--- Included file: packet-gdt-fn.c ---*/ -#line 1 "./asn1/gdt/packet-gdt-fn.c" static int @@ -1029,9 +1011,6 @@ static int dissect_GDTMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-gdt-fn.c ---*/ -#line 41 "./asn1/gdt/packet-gdt-template.c" - static int dissect_gdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, @@ -1055,9 +1034,6 @@ static int dissect_gdt(tvbuff_t *tvb, void proto_register_gdt(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-gdt-hfarr.c ---*/ -#line 1 "./asn1/gdt/packet-gdt-hfarr.c" { &hf_gdt_GDTMessage_PDU, { "GDTMessage", "gdt.GDTMessage_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1258,17 +1234,11 @@ void proto_register_gdt(void) { { "enc-type", "gdt.enc_type", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - -/*--- End of included file: packet-gdt-hfarr.c ---*/ -#line 66 "./asn1/gdt/packet-gdt-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_gdt, - -/*--- Included file: packet-gdt-ettarr.c ---*/ -#line 1 "./asn1/gdt/packet-gdt-ettarr.c" &ett_gdt_Header, &ett_gdt_EndPointDescriptor, &ett_gdt_Body, @@ -1290,9 +1260,6 @@ void proto_register_gdt(void) { &ett_gdt_HopInfo, &ett_gdt_GDTMessage, &ett_gdt_EncryptionInfo, - -/*--- End of included file: packet-gdt-ettarr.c ---*/ -#line 72 "./asn1/gdt/packet-gdt-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-gdt.h b/epan/dissectors/packet-gdt.h index a62f5e1345..9c73b7076a 100644 --- a/epan/dissectors/packet-gdt.h +++ b/epan/dissectors/packet-gdt.h @@ -3,9 +3,6 @@ /* packet-gdt.h */ /* asn2wrs.py -b -L -p gdt -c ./gdt.cnf -s ./packet-gdt-template -D . -O ../.. gdt.asn */ -/* Input file: packet-gdt-template.h */ - -#line 1 "./asn1/gdt/packet-gdt-template.h" /* packet-gdt-template.h * * Copyright 2022, Damir Franusic diff --git a/epan/dissectors/packet-glow.c b/epan/dissectors/packet-glow.c index 5ec8191297..63139222a6 100644 --- a/epan/dissectors/packet-glow.c +++ b/epan/dissectors/packet-glow.c @@ -3,9 +3,6 @@ /* packet-glow.c */ /* asn2wrs.py -b -L -p glow -c ./glow.cnf -s ./packet-glow-template -D . -O ../.. glow.asn */ -/* Input file: packet-glow-template.c */ - -#line 1 "./asn1/glow/packet-glow-template.c" /* packet-glow.c * Routines for GLOW packet dissection * @@ -32,9 +29,6 @@ void proto_register_glow(void); static dissector_handle_t glow_handle=NULL; static int proto_glow = -1; - -/*--- Included file: packet-glow-hf.c ---*/ -#line 1 "./asn1/glow/packet-glow-hf.c" static int hf_glow_Root_PDU = -1; /* Root */ static int hf_glow_number = -1; /* Integer32 */ static int hf_glow_element = -1; /* TemplateElement */ @@ -130,15 +124,9 @@ static int hf_glow_qualifiedMatrix = -1; /* QualifiedMatrix */ static int hf_glow_qualifiedFunction = -1; /* QualifiedFunction */ static int hf_glow_qualifiedTemplate = -1; /* QualifiedTemplate */ -/*--- End of included file: packet-glow-hf.c ---*/ -#line 28 "./asn1/glow/packet-glow-template.c" - /* Initialize the subtree pointers */ static int ett_glow = -1; - -/*--- Included file: packet-glow-ett.c ---*/ -#line 1 "./asn1/glow/packet-glow-ett.c" static gint ett_glow_Template_U = -1; static gint ett_glow_QualifiedTemplate_U = -1; static gint ett_glow_TemplateElement = -1; @@ -182,12 +170,6 @@ static gint ett_glow_Root_U = -1; static gint ett_glow_SEQUENCE_OF_RootElement = -1; static gint ett_glow_RootElement = -1; -/*--- End of included file: packet-glow-ett.c ---*/ -#line 33 "./asn1/glow/packet-glow-template.c" - - -/*--- Included file: packet-glow-fn.c ---*/ -#line 1 "./asn1/glow/packet-glow-fn.c" /*--- Cyclic dependencies ---*/ /* Parameter -> Parameter/_untag -> ElementCollection -> ElementCollection/_untag -> Element -> Parameter */ @@ -1491,9 +1473,6 @@ static int dissect_Root_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } -/*--- End of included file: packet-glow-fn.c ---*/ -#line 35 "./asn1/glow/packet-glow-template.c" - static int dissect_glow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -1517,9 +1496,6 @@ void proto_register_glow(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-glow-hfarr.c ---*/ -#line 1 "./asn1/glow/packet-glow-hfarr.c" { &hf_glow_Root_PDU, { "Root", "glow.Root", FT_UINT32, BASE_DEC, VALS(glow_Root_U_vals), 0, @@ -1896,17 +1872,11 @@ void proto_register_glow(void) { { "qualifiedTemplate", "glow.qualifiedTemplate_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-glow-hfarr.c ---*/ -#line 60 "./asn1/glow/packet-glow-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_glow, - -/*--- Included file: packet-glow-ettarr.c ---*/ -#line 1 "./asn1/glow/packet-glow-ettarr.c" &ett_glow_Template_U, &ett_glow_QualifiedTemplate_U, &ett_glow_TemplateElement, @@ -1949,9 +1919,6 @@ void proto_register_glow(void) { &ett_glow_Root_U, &ett_glow_SEQUENCE_OF_RootElement, &ett_glow_RootElement, - -/*--- End of included file: packet-glow-ettarr.c ---*/ -#line 66 "./asn1/glow/packet-glow-template.c" }; diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index 0fca313ed4..2d51b1e511 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -3,9 +3,6 @@ /* packet-goose.c */ /* asn2wrs.py -b -L -p goose -c ./goose.cnf -s ./packet-goose-template -D . -O ../.. goose.asn */ -/* Input file: packet-goose-template.c */ - -#line 1 "./asn1/goose/packet-goose-template.c" /* packet-goose.c * Routines for IEC 61850 GOOSE packet dissection * Martin Lutz 2008 @@ -94,9 +91,6 @@ static expert_field ei_goose_invalid_sim = EI_INIT; #define SINGLE_FLOAT_EXP_BITS 8 #define FLOAT_ENC_LENGTH 5 - -/*--- Included file: packet-goose-hf.c ---*/ -#line 1 "./asn1/goose/packet-goose-hf.c" static int hf_goose_gseMngtPdu = -1; /* GSEMngtPdu */ static int hf_goose_goosePdu = -1; /* IECGoosePdu */ static int hf_goose_stateID = -1; /* INTEGER */ @@ -157,9 +151,6 @@ static int hf_goose_objId = -1; /* OBJECT_IDENTIFIER */ static int hf_goose_mMSString = -1; /* MMSString */ static int hf_goose_utc_time = -1; /* UtcTime */ -/*--- End of included file: packet-goose-hf.c ---*/ -#line 90 "./asn1/goose/packet-goose-template.c" - /* Initialize the subtree pointers */ static int ett_r_goose = -1; static int ett_session_header = -1; @@ -171,9 +162,6 @@ static int ett_goose = -1; static int ett_reserve1 = -1; static int ett_expert_inf_sim = -1; - -/*--- Included file: packet-goose-ett.c ---*/ -#line 1 "./asn1/goose/packet-goose-ett.c" static gint ett_goose_GOOSEpdu = -1; static gint ett_goose_GSEMngtPdu = -1; static gint ett_goose_RequestResponse = -1; @@ -192,12 +180,6 @@ static gint ett_goose_IECGoosePdu = -1; static gint ett_goose_SEQUENCE_OF_Data = -1; static gint ett_goose_Data = -1; -/*--- End of included file: packet-goose-ett.c ---*/ -#line 103 "./asn1/goose/packet-goose-template.c" - - -/*--- Included file: packet-goose-fn.c ---*/ -#line 1 "./asn1/goose/packet-goose-fn.c" /*--- Cyclic dependencies ---*/ /* Data -> Data/array -> Data */ @@ -776,9 +758,6 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -/*--- End of included file: packet-goose-fn.c ---*/ -#line 105 "./asn1/goose/packet-goose-template.c" - static dissector_handle_t goose_handle = NULL; static dissector_handle_t ositp_handle = NULL; @@ -1239,9 +1218,6 @@ void proto_register_goose(void) { { "float value", "goose.float_value", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - -/*--- Included file: packet-goose-hfarr.c ---*/ -#line 1 "./asn1/goose/packet-goose-hfarr.c" { &hf_goose_gseMngtPdu, { "gseMngtPdu", "goose.gseMngtPdu_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1478,9 +1454,6 @@ void proto_register_goose(void) { { "utc-time", "goose.utc_time", FT_STRING, BASE_NONE, NULL, 0, "UtcTime", HFILL }}, - -/*--- End of included file: packet-goose-hfarr.c ---*/ -#line 567 "./asn1/goose/packet-goose-template.c" }; /* List of subtrees */ @@ -1494,9 +1467,6 @@ void proto_register_goose(void) { &ett_goose, &ett_reserve1, &ett_expert_inf_sim, - -/*--- Included file: packet-goose-ettarr.c ---*/ -#line 1 "./asn1/goose/packet-goose-ettarr.c" &ett_goose_GOOSEpdu, &ett_goose_GSEMngtPdu, &ett_goose_RequestResponse, @@ -1514,9 +1484,6 @@ void proto_register_goose(void) { &ett_goose_IECGoosePdu, &ett_goose_SEQUENCE_OF_Data, &ett_goose_Data, - -/*--- End of included file: packet-goose-ettarr.c ---*/ -#line 581 "./asn1/goose/packet-goose-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 9c30ee5287..8ca207e7b2 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -3,9 +3,6 @@ /* packet-gprscdr.c */ /* asn2wrs.py -b -L -p gprscdr -c ./gprscdr.cnf -s ./packet-gprscdr-template -D . -O ../.. GenericChargingDataTypes.asn GPRSChargingDataTypesV641.asn GPRSChargingDataTypes.asn */ -/* Input file: packet-gprscdr-template.c */ - -#line 1 "./asn1/gprscdr/packet-gprscdr-template.c" /* packet-gprscdr-template.c * Copyright 2011 , Anders Broman * @@ -43,9 +40,6 @@ void proto_register_gprscdr(void); /* Define the GPRS CDR proto */ static int proto_gprscdr = -1; - -/*--- Included file: packet-gprscdr-hf.c ---*/ -#line 1 "./asn1/gprscdr/packet-gprscdr-hf.c" static int hf_gprscdr_gprscdr_GPRSCallEventRecord_PDU = -1; /* GPRSCallEventRecord */ static int hf_gprscdr_gprscdr_GPRSRecord_PDU = -1; /* GPRSRecord */ static int hf_gprscdr_gprscdr_CAMELInformationPDP_PDU = -1; /* CAMELInformationPDP */ @@ -532,9 +526,6 @@ static int hf_gprscdr_ServiceConditionChange_indirectServiceConditionChange = -1 static int hf_gprscdr_ServiceConditionChange_servingPLMNRateControlChange = -1; static int hf_gprscdr_ServiceConditionChange_aPNRateControlChange = -1; -/*--- End of included file: packet-gprscdr-hf.c ---*/ -#line 39 "./asn1/gprscdr/packet-gprscdr-template.c" - static int ett_gprscdr = -1; static int ett_gprscdr_timestamp = -1; static int ett_gprscdr_plmn_id = -1; @@ -542,9 +533,6 @@ static int ett_gprscdr_pdp_pdn_type = -1; static int ett_gprscdr_eps_qos_arp = -1; static int ett_gprscdr_managementextension_information = -1; static int ett_gprscdr_userlocationinformation = -1; - -/*--- Included file: packet-gprscdr-ett.c ---*/ -#line 1 "./asn1/gprscdr/packet-gprscdr-ett.c" static gint ett_gprscdr_Diagnostics = -1; static gint ett_gprscdr_Ecgi = -1; static gint ett_gprscdr_EnhancedDiagnostics = -1; @@ -646,9 +634,6 @@ static gint ett_gprscdr_UWANUserLocationInfo = -1; static gint ett_gprscdr_VoLTEInformation = -1; static gint ett_gprscdr_WLANOperatorId = -1; -/*--- End of included file: packet-gprscdr-ett.c ---*/ -#line 48 "./asn1/gprscdr/packet-gprscdr-template.c" - static expert_field ei_gprscdr_not_dissected = EI_INIT; static expert_field ei_gprscdr_choice_not_found = EI_INIT; @@ -718,9 +703,6 @@ dissect_gprscdr_uli(tvbuff_t *tvb _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U } -/*--- Included file: packet-gprscdr-fn.c ---*/ -#line 1 "./asn1/gprscdr/packet-gprscdr-fn.c" - static int dissect_gprscdr_BCDDirectoryNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -5111,9 +5093,6 @@ int dissect_gprscdr_CAMELInformationPDP_PDU(tvbuff_t *tvb _U_, packet_info *pinf } -/*--- End of included file: packet-gprscdr-fn.c ---*/ -#line 118 "./asn1/gprscdr/packet-gprscdr-template.c" - /* Register all the bits needed with the filtering engine */ @@ -5122,9 +5101,6 @@ proto_register_gprscdr(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-gprscdr-hfarr.c ---*/ -#line 1 "./asn1/gprscdr/packet-gprscdr-hfarr.c" { &hf_gprscdr_gprscdr_GPRSCallEventRecord_PDU, { "GPRSCallEventRecord", "gprscdr.GPRSCallEventRecord", FT_UINT32, BASE_DEC, VALS(gprscdr_GPRSCallEventRecord_vals), 0, @@ -7061,9 +7037,6 @@ proto_register_gprscdr(void) { "aPNRateControlChange", "gprscdr.ServiceConditionChange.aPNRateControlChange", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, - -/*--- End of included file: packet-gprscdr-hfarr.c ---*/ -#line 128 "./asn1/gprscdr/packet-gprscdr-template.c" }; /* List of subtrees */ @@ -7075,9 +7048,6 @@ proto_register_gprscdr(void) &ett_gprscdr_eps_qos_arp, &ett_gprscdr_managementextension_information, &ett_gprscdr_userlocationinformation, - -/*--- Included file: packet-gprscdr-ettarr.c ---*/ -#line 1 "./asn1/gprscdr/packet-gprscdr-ettarr.c" &ett_gprscdr_Diagnostics, &ett_gprscdr_Ecgi, &ett_gprscdr_EnhancedDiagnostics, @@ -7178,9 +7148,6 @@ proto_register_gprscdr(void) &ett_gprscdr_UWANUserLocationInfo, &ett_gprscdr_VoLTEInformation, &ett_gprscdr_WLANOperatorId, - -/*--- End of included file: packet-gprscdr-ettarr.c ---*/ -#line 140 "./asn1/gprscdr/packet-gprscdr-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-gprscdr.h b/epan/dissectors/packet-gprscdr.h index 6777ed2306..7113b0895d 100644 --- a/epan/dissectors/packet-gprscdr.h +++ b/epan/dissectors/packet-gprscdr.h @@ -3,9 +3,6 @@ /* packet-gprscdr.h */ /* asn2wrs.py -b -L -p gprscdr -c ./gprscdr.cnf -s ./packet-gprscdr-template -D . -O ../.. GenericChargingDataTypes.asn GPRSChargingDataTypesV641.asn GPRSChargingDataTypes.asn */ -/* Input file: packet-gprscdr-template.h */ - -#line 1 "./asn1/gprscdr/packet-gprscdr-template.h" /* packet-gprscdr.h * Routines for gprscdr packet dissection * Copyright 2011, Anders Broman @@ -21,9 +18,6 @@ #define PACKET_GPRSCDR_H - -/*--- Included file: packet-gprscdr-exp.h ---*/ -#line 1 "./asn1/gprscdr/packet-gprscdr-exp.h" extern const value_string gprscdr_GPRSCallEventRecord_vals[]; extern const value_string gprscdr_GPRSRecord_vals[]; int dissect_gprscdr_GPRSCallEventRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -33,9 +27,6 @@ int dissect_gprscdr_GPRSCallEventRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinf int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_gprscdr_CAMELInformationPDP_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-gprscdr-exp.h ---*/ -#line 17 "./asn1/gprscdr/packet-gprscdr-template.h" - #endif /* PACKET_GPRSCDR_H */ /* diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 729721b296..527c0da43c 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -3,9 +3,6 @@ /* packet-gsm_map.c */ /* asn2wrs.py -b -L -c ./gsm_map.cnf -s ./packet-gsm_map-template -D . -O ../.. ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn Ericsson.asn Nokia.asn */ -/* Input file: packet-gsm_map-template.c */ - -#line 1 "./asn1/gsm_map/packet-gsm_map-template.c" /* XXX see bug 1852: * * packet-gsm_map.c: There are 1174 display filter fields registered. Most are @@ -158,9 +155,6 @@ static int hf_gsm_map_earp_pl = -1; static int hf_gsm_map_earp_pvi = -1; -/*--- Included file: packet-gsm_map-hf.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-hf.c" - /* --- Module MAP-ExtensionDataTypes --- --- --- */ static int hf_gsm_map_privateExtensionList = -1; /* PrivateExtensionList */ @@ -2044,9 +2038,6 @@ static int hf_NokiaMAP_Extensions_AccessSubscriptionListExt_item = -1; /* Acces /* named bits */ static int hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed = -1; -/*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 153 "./asn1/gsm_map/packet-gsm_map-template.c" - /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; static gint ett_gsm_map_InvokeId = -1; @@ -2083,9 +2074,6 @@ static gint ett_gsm_map_TA_id = -1; static gint ett_gsm_map_GeodeticInformation = -1; -/*--- Included file: packet-gsm_map-ett.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-ett.c" - /* --- Module MAP-ExtensionDataTypes --- --- --- */ static gint ett_gsm_map_ExtensionContainer = -1; @@ -2798,9 +2786,6 @@ static gint ett_NokiaMAP_Extensions_AccessTypeExt = -1; static gint ett_NokiaMAP_Extensions_AccessSubscriptionListExt = -1; static gint ett_NokiaMAP_Extensions_AllowedServiceData = -1; -/*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 190 "./asn1/gsm_map/packet-gsm_map-template.c" - static expert_field ei_gsm_map_unknown_sequence3 = EI_INIT; static expert_field ei_gsm_map_unknown_sequence = EI_INIT; static expert_field ei_gsm_map_unknown_parameter = EI_INIT; @@ -3654,9 +3639,6 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } -/*--- Included file: packet-gsm_map-fn.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-fn.c" - /* --- Module MAP-SS-Code --- --- --- */ @@ -21875,9 +21857,6 @@ dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff } -/*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 1044 "./asn1/gsm_map/packet-gsm_map-template.c" - /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { { 44, "forwardSM" }, @@ -21888,9 +21867,6 @@ const value_string gsm_map_V1V2_opr_code_strings[] = { /* Generic translation for MAP operation */ const value_string gsm_map_opr_code_strings[] = { -/*--- Included file: packet-gsm_map-table.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-table.c" - /* --- Module Remote-Operations-Information-Objects --- --- --- */ /* Unknown or empty loop list OPERATION */ @@ -22097,18 +22073,12 @@ const value_string gsm_map_opr_code_strings[] = { /* --- Module NokiaMAP-Extensions --- --- --- */ /* Unknown or empty loop list OPERATION */ - -/*--- End of included file: packet-gsm_map-table.c ---*/ -#line 1055 "./asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; #if 0 static const value_string gsm_map_err_code_string_vals[] = { -/*--- Included file: packet-gsm_map-table.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-table.c" - /* --- Module Remote-Operations-Information-Objects --- --- --- */ /* Unknown or empty loop list OPERATION */ @@ -22315,9 +22285,6 @@ static const value_string gsm_map_err_code_string_vals[] = { /* --- Module NokiaMAP-Extensions --- --- --- */ /* Unknown or empty loop list OPERATION */ - -/*--- End of included file: packet-gsm_map-table.c ---*/ -#line 1061 "./asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; #endif @@ -24596,9 +24563,6 @@ void proto_register_gsm_map(void) { }, -/*--- Included file: packet-gsm_map-hfarr.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-hfarr.c" - /* --- Module MAP-ExtensionDataTypes --- --- --- */ { &hf_gsm_map_privateExtensionList, @@ -31963,9 +31927,6 @@ void proto_register_gsm_map(void) { { "amr-wb-allowed", "NokiaMAP.Extensions.AllowedServiceData.amr.wb.allowed", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, - -/*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 3339 "./asn1/gsm_map/packet-gsm_map-template.c" }; /* List of subtrees */ @@ -32005,9 +31966,6 @@ void proto_register_gsm_map(void) { &ett_gsm_map_GeodeticInformation, -/*--- Included file: packet-gsm_map-ettarr.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-ettarr.c" - /* --- Module MAP-ExtensionDataTypes --- --- --- */ &ett_gsm_map_ExtensionContainer, @@ -32719,9 +32677,6 @@ void proto_register_gsm_map(void) { &ett_NokiaMAP_Extensions_AccessTypeExt, &ett_NokiaMAP_Extensions_AccessSubscriptionListExt, &ett_NokiaMAP_Extensions_AllowedServiceData, - -/*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 3378 "./asn1/gsm_map/packet-gsm_map-template.c" }; static ei_register_info ei[] = { @@ -32782,9 +32737,6 @@ void proto_register_gsm_map(void) { gsm_map_tap = register_tap("gsm_map"); -/*--- Included file: packet-gsm_map-dis-tab.c ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-dis-tab.c" - /* --- Module MAP-MS-DataTypes --- --- --- */ dissector_add_uint("gsm_map.v3.arg.opcode", 56, create_dissector_handle(dissect_gsm_map_ms_SendAuthenticationInfoArg_PDU, proto_gsm_map_ms)); @@ -32863,9 +32815,6 @@ void proto_register_gsm_map(void) { /* --- Module NokiaMAP-Extensions --- --- --- */ - -/*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 3438 "./asn1/gsm_map/packet-gsm_map-template.c" oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" ); oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2"); /*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" ); diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 753b98d2c8..4a0415f454 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -3,9 +3,6 @@ /* packet-gsm_map.h */ /* asn2wrs.py -b -L -c ./gsm_map.cnf -s ./packet-gsm_map-template -D . -O ../.. ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn Ericsson.asn Nokia.asn */ -/* Input file: packet-gsm_map-template.h */ - -#line 1 "./asn1/gsm_map/packet-gsm_map-template.h" /* packet-gsm_map-template.h * Routines for GSM MAP packet dissection * Copyright 2004 - 2006, Anders Broman @@ -72,9 +69,6 @@ typedef struct { } gsm_map_packet_info_t; -/*--- Included file: packet-gsm_map-exp.h ---*/ -#line 1 "./asn1/gsm_map/packet-gsm_map-exp.h" - /* --- Module Remote-Operations-Information-Objects --- --- --- */ @@ -284,8 +278,5 @@ int dissect_gsm_ss_LocationMethod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_NokiaMAP_Extensions_ServiceKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-gsm_map-exp.h ---*/ -#line 67 "./asn1/gsm_map/packet-gsm_map-template.h" - #endif /* PACKET_GSM_MAP_H */ diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 6ca9123b91..60ce701512 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -3,9 +3,6 @@ /* packet-h225.c */ /* asn2wrs.py -L -p h225 -c ./h225.cnf -s ./packet-h225-template -D . -O ../.. H323-MESSAGES.asn */ -/* Input file: packet-h225-template.c */ - -#line 1 "./asn1/h225/packet-h225-template.c" /* packet-h225.c * Routines for h225 packet dissection * Copyright 2005, Anders Broman @@ -121,9 +118,6 @@ static int hf_h225_ras_dup = -1; static int hf_h225_ras_deltatime = -1; static int hf_h225_debug_dissector_try_string = -1; - -/*--- Included file: packet-h225-hf.c ---*/ -#line 1 "./asn1/h225/packet-h225-hf.c" static int hf_h225_H323_UserInformation_PDU = -1; /* H323_UserInformation */ static int hf_h225_h225_ExtendedAliasAddress_PDU = -1; /* ExtendedAliasAddress */ static int hf_h225_RasMessage_PDU = -1; /* RasMessage */ @@ -898,14 +892,8 @@ static int hf_h225_failed = -1; /* NULL */ static int hf_h225_stopped = -1; /* NULL */ static int hf_h225_notAvailable = -1; /* NULL */ -/*--- End of included file: packet-h225-hf.c ---*/ -#line 117 "./asn1/h225/packet-h225-template.c" - /* Initialize the subtree pointers */ static gint ett_h225 = -1; - -/*--- Included file: packet-h225-ett.c ---*/ -#line 1 "./asn1/h225/packet-h225-ett.c" static gint ett_h225_H323_UserInformation = -1; static gint ett_h225_T_user_data = -1; static gint ett_h225_H323_UU_PDU = -1; @@ -1146,9 +1134,6 @@ static gint ett_h225_T_callSpecific = -1; static gint ett_h225_ServiceControlResponse = -1; static gint ett_h225_T_result = -1; -/*--- End of included file: packet-h225-ett.c ---*/ -#line 121 "./asn1/h225/packet-h225-template.c" - /* Preferences */ static guint h225_tls_port = TLS_PORT_CS; static gboolean h225_reassembly = TRUE; @@ -1263,9 +1248,6 @@ h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, co return TAP_PACKET_REDRAW; } - -/*--- Included file: packet-h225-fn.c ---*/ -#line 1 "./asn1/h225/packet-h225-fn.c" /*--- Cyclic dependencies ---*/ /* EnumeratedParameter -> Content -> Content/compound -> EnumeratedParameter */ @@ -7669,9 +7651,6 @@ static int dissect_RasMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-h225-fn.c ---*/ -#line 237 "./asn1/h225/packet-h225-template.c" - /* Forward declaration we need below */ void proto_reg_handoff_h225(void); @@ -8261,9 +8240,6 @@ void proto_register_h225(void) { { "*** DEBUG dissector_try_string", "h225.debug.dissector_try_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-h225-hfarr.c ---*/ -#line 1 "./asn1/h225/packet-h225-hfarr.c" { &hf_h225_H323_UserInformation_PDU, { "H323-UserInformation", "h225.H323_UserInformation_element", FT_NONE, BASE_NONE, NULL, 0, @@ -11356,17 +11332,11 @@ void proto_register_h225(void) { { "notAvailable", "h225.notAvailable_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-h225-hfarr.c ---*/ -#line 828 "./asn1/h225/packet-h225-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_h225, - -/*--- Included file: packet-h225-ettarr.c ---*/ -#line 1 "./asn1/h225/packet-h225-ettarr.c" &ett_h225_H323_UserInformation, &ett_h225_T_user_data, &ett_h225_H323_UU_PDU, @@ -11606,9 +11576,6 @@ void proto_register_h225(void) { &ett_h225_T_callSpecific, &ett_h225_ServiceControlResponse, &ett_h225_T_result, - -/*--- End of included file: packet-h225-ettarr.c ---*/ -#line 834 "./asn1/h225/packet-h225-template.c" }; static tap_param h225_stat_params[] = { diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index 43da106eff..322ff507bd 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -3,9 +3,6 @@ /* packet-h225.h */ /* asn2wrs.py -L -p h225 -c ./h225.cnf -s ./packet-h225-template -D . -O ../.. H323-MESSAGES.asn */ -/* Input file: packet-h225-template.h */ - -#line 1 "./asn1/h225/packet-h225-template.h" /* packet-h225.h * Routines for h225 packet dissection * Copyright 2005, Anders Broman @@ -73,9 +70,6 @@ typedef struct _h225_packet_info { #include #include - -/*--- Included file: packet-h225-exp.h ---*/ -#line 1 "./asn1/h225/packet-h225-exp.h" WS_DLL_PUBLIC const value_string T_h323_message_body_vals[]; WS_DLL_PUBLIC const value_string h225_ReleaseCompleteReason_vals[]; extern const value_string h225_PresentationIndicator_vals[]; @@ -136,9 +130,6 @@ WS_DLL_PUBLIC int dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn int dissect_h225_TransportQOS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h225_ExtendedAliasAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-h225-exp.h ---*/ -#line 69 "./asn1/h225/packet-h225-template.h" - #endif /* PACKET_H225_H */ /* diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 4b14c56f08..f7bfe17177 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -3,9 +3,6 @@ /* packet-h235.c */ /* asn2wrs.py -L -p h235 -c ./h235.cnf -s ./packet-h235-template -D . -O ../.. H235-SECURITY-MESSAGES.asn H235-SRTP.asn */ -/* Input file: packet-h235-template.c */ - -#line 1 "./asn1/h235/packet-h235-template.c" /* packet-h235.c * Routines for H.235 packet dissection * 2004 Tomas Kukosa @@ -44,9 +41,6 @@ void proto_reg_handoff_h235(void); /* Initialize the protocol and registered fields */ static int proto_h235 = -1; - -/*--- Included file: packet-h235-hf.c ---*/ -#line 1 "./asn1/h235/packet-h235-hf.c" static int hf_h235_SrtpCryptoCapability_PDU = -1; /* SrtpCryptoCapability */ static int hf_h235_nonStandardIdentifier = -1; /* OBJECT_IDENTIFIER */ static int hf_h235_data = -1; /* OCTET_STRING */ @@ -149,13 +143,7 @@ static int hf_h235_newParameter_item = -1; /* GenericData */ static int hf_h235_fecBeforeSrtp = -1; /* NULL */ static int hf_h235_fecAfterSrtp = -1; /* NULL */ -/*--- End of included file: packet-h235-hf.c ---*/ -#line 40 "./asn1/h235/packet-h235-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-h235-ett.c ---*/ -#line 1 "./asn1/h235/packet-h235-ett.c" static gint ett_h235_NonStandardParameter = -1; static gint ett_h235_DHset = -1; static gint ett_h235_ECpoint = -1; @@ -189,9 +177,6 @@ static gint ett_h235_SrtpSessionParameters = -1; static gint ett_h235_SEQUENCE_OF_GenericData = -1; static gint ett_h235_FecOrder = -1; -/*--- End of included file: packet-h235-ett.c ---*/ -#line 43 "./asn1/h235/packet-h235-template.c" - static int dissect_xxx_ToBeSigned(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) { @@ -200,9 +185,6 @@ dissect_xxx_ToBeSigned(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree * } -/*--- Included file: packet-h235-fn.c ---*/ -#line 1 "./asn1/h235/packet-h235-fn.c" - static int dissect_h235_ChallengeString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1025,18 +1007,12 @@ static int dissect_SrtpCryptoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinf } -/*--- End of included file: packet-h235-fn.c ---*/ -#line 52 "./asn1/h235/packet-h235-template.c" - /*--- proto_register_h235 ----------------------------------------------*/ void proto_register_h235(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-h235-hfarr.c ---*/ -#line 1 "./asn1/h235/packet-h235-hfarr.c" { &hf_h235_SrtpCryptoCapability_PDU, { "SrtpCryptoCapability", "h235.SrtpCryptoCapability", FT_UINT32, BASE_DEC, NULL, 0, @@ -1441,16 +1417,10 @@ void proto_register_h235(void) { { "fecAfterSrtp", "h235.fecAfterSrtp_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-h235-hfarr.c ---*/ -#line 60 "./asn1/h235/packet-h235-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-h235-ettarr.c ---*/ -#line 1 "./asn1/h235/packet-h235-ettarr.c" &ett_h235_NonStandardParameter, &ett_h235_DHset, &ett_h235_ECpoint, @@ -1483,9 +1453,6 @@ void proto_register_h235(void) { &ett_h235_SrtpSessionParameters, &ett_h235_SEQUENCE_OF_GenericData, &ett_h235_FecOrder, - -/*--- End of included file: packet-h235-ettarr.c ---*/ -#line 65 "./asn1/h235/packet-h235-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h index 612bf20356..1037ab7fcb 100644 --- a/epan/dissectors/packet-h235.h +++ b/epan/dissectors/packet-h235.h @@ -3,9 +3,6 @@ /* packet-h235.h */ /* asn2wrs.py -L -p h235 -c ./h235.cnf -s ./packet-h235-template -D . -O ../.. H235-SECURITY-MESSAGES.asn H235-SRTP.asn */ -/* Input file: packet-h235-template.h */ - -#line 1 "./asn1/h235/packet-h235-template.h" /* packet-h235.h * Routines for H.235 packet dissection * 2004 Tomas Kukosa @@ -20,9 +17,6 @@ #ifndef PACKET_H235_H #define PACKET_H235_H - -/*--- Included file: packet-h235-exp.h ---*/ -#line 1 "./asn1/h235/packet-h235-exp.h" extern const value_string h235_AuthenticationMechanism_vals[]; extern const value_string h235_CryptoToken_vals[]; int dissect_h235_TimeStamp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -34,8 +28,5 @@ int dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, int dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h235_SrtpKeys(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-h235-exp.h ---*/ -#line 16 "./asn1/h235/packet-h235-template.h" - #endif /* PACKET_H235_H */ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index c0e2aafedb..e0b54da081 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -3,9 +3,6 @@ /* packet-h245.c */ /* asn2wrs.py -L -p h245 -c ./h245.cnf -s ./packet-h245-template -D . -O ../.. MULTIMEDIA-SYSTEM-CONTROL.asn */ -/* Input file: packet-h245-template.c */ - -#line 1 "./asn1/h245/packet-h245-template.c" /* packet-h245_asn1.c * Routines for h245 packet dissection * Copyright 2004, Anders Broman @@ -80,9 +77,6 @@ static gboolean h245_shorttypes = FALSE; static gboolean info_col_fmt_prepend = FALSE; -/*--- Included file: packet-h245-val.h ---*/ -#line 1 "./asn1/h245/packet-h245-val.h" - typedef enum _AudioCapability_enum { AudioCapability_nonStandard = 0, AudioCapability_g711Alaw64k = 1, @@ -201,9 +195,6 @@ typedef enum _IndicationMessage_enum { IndicationMessage_genericIndication = 23 } IndicationMessage_enum; -/*--- End of included file: packet-h245-val.h ---*/ -#line 75 "./asn1/h245/packet-h245-template.c" - static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, { RequestMessage_masterSlaveDetermination , "MSD" }, @@ -502,9 +493,6 @@ static void print_info_column(column_info *cinfo, const gint32 *value, /* Initialize the protocol and registered fields */ static int proto_h245 = -1; - -/*--- Included file: packet-h245-hf.c ---*/ -#line 1 "./asn1/h245/packet-h245-hf.c" static int hf_h245_OpenLogicalChannel_PDU = -1; /* OpenLogicalChannel */ static int hf_h245_request = -1; /* RequestMessage */ static int hf_h245_response = -1; /* ResponseMessage */ @@ -1908,15 +1896,9 @@ static int hf_h245_extendedAlphanumeric = -1; /* T_extendedAlphanumeric */ static int hf_h245_encrypted = -1; /* OCTET_STRING */ static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ -/*--- End of included file: packet-h245-hf.c ---*/ -#line 375 "./asn1/h245/packet-h245-template.c" - /* Initialize the subtree pointers */ static int ett_h245 = -1; static int ett_h245_returnedFunction = -1; - -/*--- Included file: packet-h245-ett.c ---*/ -#line 1 "./asn1/h245/packet-h245-ett.c" static gint ett_h245_MultimediaSystemControlMessage = -1; static gint ett_h245_RequestMessage = -1; static gint ett_h245_ResponseMessage = -1; @@ -2409,9 +2391,6 @@ static gint ett_h245_EncryptedAlphanumeric = -1; static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; -/*--- End of included file: packet-h245-ett.c ---*/ -#line 380 "./asn1/h245/packet-h245-template.c" - /* Forward declarations */ static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); static void reset_h245_pi(void *dummy _U_) @@ -2419,9 +2398,6 @@ static void reset_h245_pi(void *dummy _U_) h245_pi = NULL; /* Make sure we don't leave pinfo->pool memory lying around */ } - -/*--- Included file: packet-h245-fn.c ---*/ -#line 1 "./asn1/h245/packet-h245-fn.c" /*--- Cyclic dependencies ---*/ /* GenericParameter -> ParameterValue -> ParameterValue/genericParameter -> GenericParameter */ @@ -14292,9 +14268,6 @@ static int dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } -/*--- End of included file: packet-h245-fn.c ---*/ -#line 389 "./asn1/h245/packet-h245-template.c" - static int dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { @@ -14379,9 +14352,6 @@ void proto_register_h245(void) { { "*** DEBUG dissector_try_string", "h245.debug.dissector_try_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-h245-hfarr.c ---*/ -#line 1 "./asn1/h245/packet-h245-hfarr.c" { &hf_h245_OpenLogicalChannel_PDU, { "OpenLogicalChannel", "h245.OpenLogicalChannel_element", FT_NONE, BASE_NONE, NULL, 0, @@ -19990,18 +19960,12 @@ void proto_register_h245(void) { { "encryptedAlphanumeric", "h245.encryptedAlphanumeric_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-h245-hfarr.c ---*/ -#line 475 "./asn1/h245/packet-h245-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_h245, &ett_h245_returnedFunction, - -/*--- Included file: packet-h245-ettarr.c ---*/ -#line 1 "./asn1/h245/packet-h245-ettarr.c" &ett_h245_MultimediaSystemControlMessage, &ett_h245_RequestMessage, &ett_h245_ResponseMessage, @@ -20493,9 +20457,6 @@ void proto_register_h245(void) { &ett_h245_EncryptedAlphanumeric, &ett_h245_FlowControlIndication, &ett_h245_MobileMultilinkReconfigurationIndication, - -/*--- End of included file: packet-h245-ettarr.c ---*/ -#line 482 "./asn1/h245/packet-h245-template.c" }; module_t *h245_module; diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h index d11569afbc..b0d4962e55 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -3,9 +3,6 @@ /* packet-h245.h */ /* asn2wrs.py -L -p h245 -c ./h245.cnf -s ./packet-h245-template -D . -O ../.. MULTIMEDIA-SYSTEM-CONTROL.asn */ -/* Input file: packet-h245-template.h */ - -#line 1 "./asn1/h245/packet-h245-template.h" /* packet-h245.h * Routines for h245 packet dissection * Copyright 2005, Anders Broman @@ -118,9 +115,6 @@ WS_DLL_PUBLIC void h245_set_h223_set_mc_handle( h223_set_mc_handle_t handle ); typedef void (*h223_add_lc_handle_t) ( packet_info* pinfo, guint16 lc, h223_lc_params* params); WS_DLL_PUBLIC void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle ); - -/*--- Included file: packet-h245-exp.h ---*/ -#line 1 "./asn1/h245/packet-h245-exp.h" extern const value_string h245_Capability_vals[]; extern const value_string DataProtocolCapability_vals[]; extern const value_string h245_TransportAddress_vals[]; @@ -136,9 +130,6 @@ int dissect_h245_H223LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, int dissect_h245_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_UnicastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_h245_MulticastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); - -/*--- End of included file: packet-h245-exp.h ---*/ -#line 114 "./asn1/h245/packet-h245-template.h" void dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str); diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 93a34dcd91..de00ee88f0 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -3,9 +3,6 @@ /* packet-h248.c */ /* asn2wrs.py -b -L -p h248 -c ./h248.cnf -s ./packet-h248-template -D . -O ../.. h248v3.asn h248v1support.asn */ -/* Input file: packet-h248-template.c */ - -#line 1 "./asn1/h248/packet-h248-template.c" /* packet-h248.c * Routines for H.248/MEGACO packet dissection * @@ -73,9 +70,6 @@ static int hf_h248_context_id64 = -1; /* h248v1 support */ static int hf_h248_auditValueReplyV1 = -1; - -/*--- Included file: packet-h248-hf.c ---*/ -#line 1 "./asn1/h248/packet-h248-hf.c" static int hf_h248_authHeader = -1; /* AuthenticationHeader */ static int hf_h248_mess = -1; /* Message */ static int hf_h248_secParmIndex = -1; /* SecurityParmIndex */ @@ -391,9 +385,6 @@ static int hf_h248_NotifyCompletion_onInterruptByNewSignalDescr = -1; static int hf_h248_NotifyCompletion_otherReason = -1; static int hf_h248_NotifyCompletion_onIteration = -1; -/*--- End of included file: packet-h248-hf.c ---*/ -#line 69 "./asn1/h248/packet-h248-template.c" - /* Initialize the subtree pointers */ static gint ett_h248 = -1; static gint ett_mtpaddress = -1; @@ -412,9 +403,6 @@ static gcp_hf_ett_t h248_arrel = {{-1,-1,-1,-1,-1,-1},{-1,-1,-1,-1}}; static gint exported_pdu_tap = -1; - -/*--- Included file: packet-h248-ett.c ---*/ -#line 1 "./asn1/h248/packet-h248-ett.c" static gint ett_h248_MegacoMessage = -1; static gint ett_h248_AuthenticationHeader = -1; static gint ett_h248_Message = -1; @@ -559,9 +547,6 @@ static gint ett_h248_AuditResultV1 = -1; static gint ett_h248_EventParameterV1 = -1; static gint ett_h248_SigParameterV1 = -1; -/*--- End of included file: packet-h248-ett.c ---*/ -#line 89 "./asn1/h248/packet-h248-template.c" - static expert_field ei_h248_errored_command = EI_INIT; static expert_field ei_h248_transactionId64 = EI_INIT; static expert_field ei_h248_context_id64 = EI_INIT; @@ -2627,9 +2612,6 @@ static int dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int off #define H248_TAP() do { if (keep_persistent_data && curr_info.cmd) tap_queue_packet(h248_tap, actx->pinfo, curr_info.cmd); } while(0) - -/*--- Included file: packet-h248-fn.c ---*/ -#line 1 "./asn1/h248/packet-h248-fn.c" /*--- Cyclic dependencies ---*/ /* SecondEventsDescriptor -> SecondEventsDescriptor/eventList -> SecondRequestedEvent -> SecondRequestedActions -> NotifyBehaviour -> RegulatedEmbeddedDescriptor -> SecondEventsDescriptor */ @@ -5983,9 +5965,6 @@ dissect_h248_SigParameterV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -/*--- End of included file: packet-h248-fn.c ---*/ -#line 2156 "./asn1/h248/packet-h248-template.c" - static int dissect_h248_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_tpkt_encap(tvb, pinfo, tree, h248_desegment, h248_handle); return tvb_captured_length(tvb); @@ -6152,9 +6131,6 @@ void proto_register_h248(void) { FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-h248-hfarr.c ---*/ -#line 1 "./asn1/h248/packet-h248-hfarr.c" { &hf_h248_authHeader, { "authHeader", "h248.authHeader_element", FT_NONE, BASE_NONE, NULL, 0, @@ -7408,9 +7384,6 @@ void proto_register_h248(void) { FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, -/*--- End of included file: packet-h248-hfarr.c ---*/ -#line 2324 "./asn1/h248/packet-h248-template.c" - GCP_HF_ARR_ELEMS("h248",h248_arrel) }; @@ -7427,9 +7400,6 @@ void proto_register_h248(void) { &ett_h248_no_evt, GCP_ETT_ARR_ELEMS(h248_arrel), - -/*--- Included file: packet-h248-ettarr.c ---*/ -#line 1 "./asn1/h248/packet-h248-ettarr.c" &ett_h248_MegacoMessage, &ett_h248_AuthenticationHeader, &ett_h248_Message, @@ -7573,9 +7543,6 @@ void proto_register_h248(void) { &ett_h248_AuditResultV1, &ett_h248_EventParameterV1, &ett_h248_SigParameterV1, - -/*--- End of included file: packet-h248-ettarr.c ---*/ -#line 2342 "./asn1/h248/packet-h248-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index 7cd1f88978..ef7d395e09 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -3,9 +3,6 @@ /* packet-h248.h */ /* asn2wrs.py -b -L -p h248 -c ./h248.cnf -s ./packet-h248-template -D . -O ../.. h248v3.asn h248v1support.asn */ -/* Input file: packet-h248-template.h */ - -#line 1 "./asn1/h248/packet-h248-template.h" /* packet-h248.h * Definitions for H.248/MEGACO packet dissection * diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index ed2e6682dd..682414e767 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -3,9 +3,6 @@ /* packet-h282.c */ /* asn2wrs.py -L -p h282 -c ./h282.cnf -s ./packet-h282-template -D . -O ../.. RDC-PROTOCOL.asn */ -/* Input file: packet-h282-template.c */ - -#line 1 "./asn1/h282/packet-h282-template.c" /* packet-h282.c * Routines for H.282 packet dissection * 2007 Tomas Kukosa @@ -34,9 +31,6 @@ void proto_reg_handoff_h282(void); /* Initialize the protocol and registered fields */ static int proto_h282 = -1; - -/*--- Included file: packet-h282-hf.c ---*/ -#line 1 "./asn1/h282/packet-h282-hf.c" static int hf_h282_NonCollapsingCapabilities_PDU = -1; /* NonCollapsingCapabilities */ static int hf_h282_RDCPDU_PDU = -1; /* RDCPDU */ static int hf_h282_object = -1; /* OBJECT_IDENTIFIER */ @@ -471,14 +465,8 @@ static int hf_h282_deviceLockTerminatedIndication = -1; /* DeviceLockTerminated static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndication */ static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ -/*--- End of included file: packet-h282-hf.c ---*/ -#line 30 "./asn1/h282/packet-h282-template.c" - /* Initialize the subtree pointers */ static int ett_h282 = -1; - -/*--- Included file: packet-h282-ett.c ---*/ -#line 1 "./asn1/h282/packet-h282-ett.c" static gint ett_h282_Key = -1; static gint ett_h282_NonStandardParameter = -1; static gint ett_h282_NonStandardIdentifier = -1; @@ -623,17 +611,11 @@ static gint ett_h282_RequestPDU = -1; static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; -/*--- End of included file: packet-h282-ett.c ---*/ -#line 34 "./asn1/h282/packet-h282-template.c" - /* Dissectors */ /* Subdissectors */ -/*--- Included file: packet-h282-fn.c ---*/ -#line 1 "./asn1/h282/packet-h282-fn.c" - static int dissect_h282_H221NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -4370,9 +4352,6 @@ static int dissect_RDCPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t } -/*--- End of included file: packet-h282-fn.c ---*/ -#line 40 "./asn1/h282/packet-h282-template.c" - static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -4392,9 +4371,6 @@ void proto_register_h282(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-h282-hfarr.c ---*/ -#line 1 "./asn1/h282/packet-h282-hfarr.c" { &hf_h282_NonCollapsingCapabilities_PDU, { "NonCollapsingCapabilities", "h282.NonCollapsingCapabilities", FT_UINT32, BASE_DEC, NULL, 0, @@ -6127,17 +6103,11 @@ void proto_register_h282(void) { { "nonStandardIndication", "h282.nonStandardIndication_element", FT_NONE, BASE_NONE, NULL, 0, "NonStandardPDU", HFILL }}, - -/*--- End of included file: packet-h282-hfarr.c ---*/ -#line 61 "./asn1/h282/packet-h282-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_h282, - -/*--- Included file: packet-h282-ettarr.c ---*/ -#line 1 "./asn1/h282/packet-h282-ettarr.c" &ett_h282_Key, &ett_h282_NonStandardParameter, &ett_h282_NonStandardIdentifier, @@ -6281,9 +6251,6 @@ void proto_register_h282(void) { &ett_h282_RequestPDU, &ett_h282_ResponsePDU, &ett_h282_IndicationPDU, - -/*--- End of included file: packet-h282-ettarr.c ---*/ -#line 67 "./asn1/h282/packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 2c1ee0248b..0410f760c3 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -3,9 +3,6 @@ /* packet-h283.c */ /* asn2wrs.py -L -p h283 -c ./h283.cnf -s ./packet-h283-template -D . -O ../.. LCT-PROTOCOL.asn */ -/* Input file: packet-h283-template.c */ - -#line 1 "./asn1/h283/packet-h283-template.c" /* packet-h283.c * Routines for H.283 packet dissection * 2007 Tomas Kukosa @@ -34,9 +31,6 @@ void proto_reg_handoff_h283(void); /* Initialize the protocol and registered fields */ static int proto_h283 = -1; - -/*--- Included file: packet-h283-hf.c ---*/ -#line 1 "./asn1/h283/packet-h283-hf.c" static int hf_h283_LCTPDU_PDU = -1; /* LCTPDU */ static int hf_h283_t35CountryCode = -1; /* INTEGER_0_255 */ static int hf_h283_t35Extension = -1; /* INTEGER_0_255 */ @@ -70,14 +64,8 @@ static int hf_h283_announceResp = -1; /* NULL */ static int hf_h283_deviceListResp = -1; /* T_deviceListResp */ static int hf_h283_deviceChange = -1; /* NULL */ -/*--- End of included file: packet-h283-hf.c ---*/ -#line 30 "./asn1/h283/packet-h283-template.c" - /* Initialize the subtree pointers */ static int ett_h283 = -1; - -/*--- Included file: packet-h283-ett.c ---*/ -#line 1 "./asn1/h283/packet-h283-ett.c" static gint ett_h283_H221NonStandard = -1; static gint ett_h283_NonStandardIdentifier = -1; static gint ett_h283_NonStandardParameter = -1; @@ -93,9 +81,6 @@ static gint ett_h283_LCTResponse = -1; static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; -/*--- End of included file: packet-h283-ett.c ---*/ -#line 34 "./asn1/h283/packet-h283-template.c" - /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; static dissector_handle_t rdc_device_list_handle; @@ -106,9 +91,6 @@ static dissector_handle_t h283_udp_handle; static gboolean info_is_set; -/*--- Included file: packet-h283-fn.c ---*/ -#line 1 "./asn1/h283/packet-h283-fn.c" - static int dissect_h283_INTEGER_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -525,9 +507,6 @@ static int dissect_LCTPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t } -/*--- End of included file: packet-h283-fn.c ---*/ -#line 45 "./asn1/h283/packet-h283-template.c" - static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -549,9 +528,6 @@ void proto_register_h283(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-h283-hfarr.c ---*/ -#line 1 "./asn1/h283/packet-h283-hfarr.c" { &hf_h283_LCTPDU_PDU, { "LCTPDU", "h283.LCTPDU_element", FT_NONE, BASE_NONE, NULL, 0, @@ -680,17 +656,11 @@ void proto_register_h283(void) { { "deviceChange", "h283.deviceChange_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-h283-hfarr.c ---*/ -#line 68 "./asn1/h283/packet-h283-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_h283, - -/*--- Included file: packet-h283-ettarr.c ---*/ -#line 1 "./asn1/h283/packet-h283-ettarr.c" &ett_h283_H221NonStandard, &ett_h283_NonStandardIdentifier, &ett_h283_NonStandardParameter, @@ -705,9 +675,6 @@ void proto_register_h283(void) { &ett_h283_LCTResponse, &ett_h283_LCTIndication, &ett_h283_NonStandardMessage, - -/*--- End of included file: packet-h283-ettarr.c ---*/ -#line 74 "./asn1/h283/packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 97a561c7ba..b006934774 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -3,9 +3,6 @@ /* packet-h323.c */ /* asn2wrs.py -L -p h323 -c ./h323.cnf -s ./packet-h323-template -D . -O ../.. RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */ -/* Input file: packet-h323-template.c */ - -#line 1 "./asn1/h323/packet-h323-template.c" /* packet-h323.c * Routines for H.323 packet dissection * 2007 Tomas Kukosa @@ -82,9 +79,6 @@ void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx) { /* Initialize the protocol and registered fields */ static int proto_h323 = -1; - -/*--- Included file: packet-h323-hf.c ---*/ -#line 1 "./asn1/h323/packet-h323-hf.c" static int hf_h323_RasTunnelledSignallingMessage_PDU = -1; /* RasTunnelledSignallingMessage */ static int hf_h323_RobustnessData_PDU = -1; /* RobustnessData */ static int hf_h323_tunnelledProtocolID = -1; /* TunnelledProtocol */ @@ -114,13 +108,7 @@ static int hf_h323_resetH245 = -1; /* NULL */ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ -/*--- End of included file: packet-h323-hf.c ---*/ -#line 78 "./asn1/h323/packet-h323-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-h323-ett.c ---*/ -#line 1 "./asn1/h323/packet-h323-ett.c" static gint ett_h323_RasTunnelledSignallingMessage = -1; static gint ett_h323_T_messageContent = -1; static gint ett_h323_RobustnessData = -1; @@ -135,12 +123,6 @@ static gint ett_h323_Status_RD = -1; static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; -/*--- End of included file: packet-h323-ett.c ---*/ -#line 81 "./asn1/h323/packet-h323-template.c" - - -/*--- Included file: packet-h323-fn.c ---*/ -#line 1 "./asn1/h323/packet-h323-fn.c" static int @@ -426,17 +408,11 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-h323-fn.c ---*/ -#line 83 "./asn1/h323/packet-h323-template.c" - /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-h323-hfarr.c ---*/ -#line 1 "./asn1/h323/packet-h323-hfarr.c" { &hf_h323_RasTunnelledSignallingMessage_PDU, { "RasTunnelledSignallingMessage", "h323.RasTunnelledSignallingMessage_element", FT_NONE, BASE_NONE, NULL, 0, @@ -549,16 +525,10 @@ void proto_register_h323(void) { { "includeFastStart", "h323.includeFastStart_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-h323-hfarr.c ---*/ -#line 90 "./asn1/h323/packet-h323-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-h323-ettarr.c ---*/ -#line 1 "./asn1/h323/packet-h323-ettarr.c" &ett_h323_RasTunnelledSignallingMessage, &ett_h323_T_messageContent, &ett_h323_RobustnessData, @@ -572,9 +542,6 @@ void proto_register_h323(void) { &ett_h323_Status_RD, &ett_h323_T_fastStart, &ett_h323_StatusInquiry_RD, - -/*--- End of included file: packet-h323-ettarr.c ---*/ -#line 95 "./asn1/h323/packet-h323-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.h b/epan/dissectors/packet-h323.h index e932fee237..a4af1a98cd 100644 --- a/epan/dissectors/packet-h323.h +++ b/epan/dissectors/packet-h323.h @@ -3,9 +3,6 @@ /* packet-h323.h */ /* asn2wrs.py -L -p h323 -c ./h323.cnf -s ./packet-h323-template -D . -O ../.. RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */ -/* Input file: packet-h323-template.h */ - -#line 1 "./asn1/h323/packet-h323-template.h" /* packet-h323.h * Routines for H.235 packet dissection * 2007 Tomas Kukosa diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 650993c7da..1d63886cee 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -3,9 +3,6 @@ /* packet-h450-ros.c */ /* asn2wrs.py -L -p h450.ros -c ./h450-ros.cnf -s ./packet-h450-ros-template -D . -O ../.. ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */ -/* Input file: packet-h450-ros-template.c */ - -#line 1 "./asn1/h450-ros/packet-h450-ros-template.c" /* packet-h450-ros.c * Routines for H.450 packet dissection * 2007 Tomas Kukosa @@ -36,9 +33,6 @@ void proto_reg_handoff_h450_ros(void); /* Initialize the protocol and registered fields */ static int proto_h450_ros = -1; - -/*--- Included file: packet-h450-ros-hf.c ---*/ -#line 1 "./asn1/h450-ros/packet-h450-ros-hf.c" static int hf_h450_ros_local = -1; /* T_local */ static int hf_h450_ros_global = -1; /* T_global */ static int hf_h450_ros_invoke = -1; /* Invoke */ @@ -60,13 +54,7 @@ static int hf_h450_ros_invokeProblem = -1; /* InvokeProblem */ static int hf_h450_ros_returnResultProblem = -1; /* ReturnResultProblem */ static int hf_h450_ros_returnErrorProblem = -1; /* ReturnErrorProblem */ -/*--- End of included file: packet-h450-ros-hf.c ---*/ -#line 32 "./asn1/h450-ros/packet-h450-ros-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-h450-ros-ett.c ---*/ -#line 1 "./asn1/h450-ros/packet-h450-ros-ett.c" static gint ett_h450_ros_Code = -1; static gint ett_h450_ros_ROS = -1; static gint ett_h450_ros_Invoke = -1; @@ -76,9 +64,6 @@ static gint ett_h450_ros_ReturnError = -1; static gint ett_h450_ros_Reject = -1; static gint ett_h450_ros_T_problem = -1; -/*--- End of included file: packet-h450-ros-ett.c ---*/ -#line 35 "./asn1/h450-ros/packet-h450-ros-template.c" - static expert_field ei_ros_undecoded = EI_INIT; /* Preferences */ @@ -110,9 +95,6 @@ error_cb(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, void* data } -/*--- Included file: packet-h450-ros-fn.c ---*/ -#line 1 "./asn1/h450-ros/packet-h450-ros-fn.c" - static int dissect_h450_ros_T_local(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -542,17 +524,11 @@ dissect_h450_ros_ROS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr } -/*--- End of included file: packet-h450-ros-fn.c ---*/ -#line 67 "./asn1/h450-ros/packet-h450-ros-template.c" - /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-h450-ros-hfarr.c ---*/ -#line 1 "./asn1/h450-ros/packet-h450-ros-hfarr.c" { &hf_h450_ros_local, { "local", "h450.ros.local", FT_INT32, BASE_DEC, NULL, 0, @@ -633,16 +609,10 @@ void proto_register_h450_ros(void) { { "returnError", "h450.ros.returnError", FT_INT32, BASE_DEC, VALS(h450_ros_ReturnErrorProblem_vals), 0, "ReturnErrorProblem", HFILL }}, - -/*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 74 "./asn1/h450-ros/packet-h450-ros-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-h450-ros-ettarr.c ---*/ -#line 1 "./asn1/h450-ros/packet-h450-ros-ettarr.c" &ett_h450_ros_Code, &ett_h450_ros_ROS, &ett_h450_ros_Invoke, @@ -651,9 +621,6 @@ void proto_register_h450_ros(void) { &ett_h450_ros_ReturnError, &ett_h450_ros_Reject, &ett_h450_ros_T_problem, - -/*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 79 "./asn1/h450-ros/packet-h450-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-h450-ros.h b/epan/dissectors/packet-h450-ros.h index e041ed26fc..f303a652f7 100644 --- a/epan/dissectors/packet-h450-ros.h +++ b/epan/dissectors/packet-h450-ros.h @@ -3,9 +3,6 @@ /* packet-h450-ros.h */ /* asn2wrs.py -L -p h450.ros -c ./h450-ros.cnf -s ./packet-h450-ros-template -D . -O ../.. ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */ -/* Input file: packet-h450-ros-template.h */ - -#line 1 "./asn1/h450-ros/packet-h450-ros-template.h" /* packet-h450-ros.h * Routines for H.450 packet dissection * 2007 Tomas Kukosa @@ -20,14 +17,8 @@ #ifndef PACKET_H450_ROS_H #define PACKET_H450_ROS_H - -/*--- Included file: packet-h450-ros-exp.h ---*/ -#line 1 "./asn1/h450-ros/packet-h450-ros-exp.h" extern const value_string h450_ros_ROS_vals[]; int dissect_h450_ros_ROS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-h450-ros-exp.h ---*/ -#line 16 "./asn1/h450-ros/packet-h450-ros-template.h" - #endif /* PACKET_H450_ROS_H */ diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 33ecfe3095..456d2ccdd6 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -3,9 +3,6 @@ /* packet-h450.c */ /* asn2wrs.py -L -c ./h450.cnf -s ./packet-h450-template -D . -O ../.. H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn */ -/* Input file: packet-h450-template.c */ - -#line 1 "./asn1/h450/packet-h450-template.c" /* packet-h450.c * Routines for h450 packet dissection * Based on the previous h450 dissector by: @@ -47,9 +44,6 @@ static int proto_h450 = -1; static int hf_h450_operation = -1; static int hf_h450_error = -1; -/*--- Included file: packet-h450-hf.c ---*/ -#line 1 "./asn1/h450/packet-h450-hf.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ static int hf_h450_h450_H4501SupplementaryService_PDU = -1; /* H4501SupplementaryService */ @@ -434,14 +428,8 @@ static int hf_h450_12_ssCTDoNotTransfer = -1; /* NULL */ static int hf_h450_12_ssMWICallbackCall = -1; /* NULL */ static int hf_h450_12_ssCISilentMonitorPermitted = -1; /* NULL */ -/*--- End of included file: packet-h450-hf.c ---*/ -#line 42 "./asn1/h450/packet-h450-template.c" - /* Initialize the subtree pointers */ -/*--- Included file: packet-h450-ett.c ---*/ -#line 1 "./asn1/h450/packet-h450-ett.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ static gint ett_h450_H4501SupplementaryService = -1; @@ -612,18 +600,12 @@ static gint ett_h450_12_FeatureList = -1; static gint ett_h450_12_FeatureValues = -1; static gint ett_h450_12_FeatureControl = -1; -/*--- End of included file: packet-h450-ett.c ---*/ -#line 45 "./asn1/h450/packet-h450-template.c" - static expert_field ei_h450_unsupported_arg_type = EI_INIT; static expert_field ei_h450_unsupported_result_type = EI_INIT; static expert_field ei_h450_unsupported_error_type = EI_INIT; static const value_string h450_str_operation[] = { -/*--- Included file: packet-h450-table10.c ---*/ -#line 1 "./asn1/h450/packet-h450-table10.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ /* Unknown or empty loop list OPERATION */ @@ -718,17 +700,11 @@ static const value_string h450_str_operation[] = { { 84, "cmnRequest" }, { 85, "cmnInform" }, - -/*--- End of included file: packet-h450-table10.c ---*/ -#line 52 "./asn1/h450/packet-h450-template.c" { 0, NULL} }; static const value_string h450_str_error[] = { -/*--- Included file: packet-h450-table20.c ---*/ -#line 1 "./asn1/h450/packet-h450-table20.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ { 0, "userNotSubscribed" }, @@ -806,9 +782,6 @@ static const value_string h450_str_error[] = { /* --- Module Common-Information-Operations --- --- --- */ /* Unknown or empty loop list ERROR */ - -/*--- End of included file: packet-h450-table20.c ---*/ -#line 57 "./asn1/h450/packet-h450-template.c" { 0, NULL} }; @@ -818,9 +791,6 @@ static rose_ctx_t h450_rose_ctx; /* Global variables */ -/*--- Included file: packet-h450-fn.c ---*/ -#line 1 "./asn1/h450/packet-h450-fn.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ @@ -4468,9 +4438,6 @@ static int dissect_h450_12_CmnArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-h450-fn.c ---*/ -#line 66 "./asn1/h450/packet-h450-template.c" - typedef struct _h450_op_t { gint32 opcode; dissector_t arg_pdu; @@ -4479,9 +4446,6 @@ typedef struct _h450_op_t { static const h450_op_t h450_op_tab[] = { -/*--- Included file: packet-h450-table11.c ---*/ -#line 1 "./asn1/h450/packet-h450-table11.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ /* Unknown or empty loop list OPERATION */ @@ -4576,9 +4540,6 @@ static const h450_op_t h450_op_tab[] = { /* cmnRequest */ { 84, dissect_h450_12_DummyArg_PDU, dissect_h450_12_CmnArg_PDU }, /* cmnInform */ { 85, dissect_h450_12_CmnArg_PDU, NULL }, - -/*--- End of included file: packet-h450-table11.c ---*/ -#line 75 "./asn1/h450/packet-h450-template.c" }; typedef struct _h450_err_t { @@ -4588,9 +4549,6 @@ typedef struct _h450_err_t { static const h450_err_t h450_err_tab[] = { -/*--- Included file: packet-h450-table21.c ---*/ -#line 1 "./asn1/h450/packet-h450-table21.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ /* userNotSubscribed */ { 0, NULL }, @@ -4668,9 +4626,6 @@ static const h450_err_t h450_err_tab[] = { /* --- Module Common-Information-Operations --- --- --- */ /* Unknown or empty loop list ERROR */ - -/*--- End of included file: packet-h450-table21.c ---*/ -#line 84 "./asn1/h450/packet-h450-template.c" }; static const h450_op_t *get_op(gint32 opcode) { @@ -4840,9 +4795,6 @@ void proto_register_h450(void) { FT_UINT8, BASE_DEC, VALS(h450_str_error), 0x0, NULL, HFILL }}, -/*--- Included file: packet-h450-hfarr.c ---*/ -#line 1 "./asn1/h450/packet-h450-hfarr.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ { &hf_h450_h450_H4501SupplementaryService_PDU, @@ -6270,17 +6222,11 @@ void proto_register_h450(void) { { "ssCISilentMonitorPermitted", "h450.12.ssCISilentMonitorPermitted_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-h450-hfarr.c ---*/ -#line 253 "./asn1/h450/packet-h450-template.c" }; /* List of subtrees */ static gint *ett[] = { -/*--- Included file: packet-h450-ettarr.c ---*/ -#line 1 "./asn1/h450/packet-h450-ettarr.c" - /* --- Modules H4501-Supplementary-ServiceAPDU-Structure Addressing-Data-Elements H225-generic-parameters-definition Manufacturer-specific-service-extension-definition H4501-General-Error-List --- --- --- */ &ett_h450_H4501SupplementaryService, @@ -6450,9 +6396,6 @@ void proto_register_h450(void) { &ett_h450_12_FeatureList, &ett_h450_12_FeatureValues, &ett_h450_12_FeatureControl, - -/*--- End of included file: packet-h450-ettarr.c ---*/ -#line 258 "./asn1/h450/packet-h450-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index f19e303777..94eebb2e24 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -3,9 +3,6 @@ /* packet-h460.c */ /* asn2wrs.py -L -c ./h460.cnf -s ./packet-h460-template -D . -O ../.. NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */ -/* Input file: packet-h460-template.c */ - -#line 1 "./asn1/h460/packet-h460-template.c" /* packet-h460.c * Routines for H.460.x packet dissection * 2007 Tomas Kukosa @@ -38,9 +35,6 @@ void proto_reg_handoff_h460(void); /* Initialize the protocol and registered fields */ static int proto_h460 = -1; -/*--- Included file: packet-h460-hf.c ---*/ -#line 1 "./asn1/h460/packet-h460-hf.c" - /* --- Module NUMBER-PORTABILITY --- --- --- */ static int hf_h460_2_h460_2_NumberPortabilityInfo_PDU = -1; /* NumberPortabilityInfo */ @@ -241,14 +235,8 @@ static int hf_h460_21_groupIdentifer = -1; /* GloballyUniqueID */ static int hf_h460_21_capability = -1; /* Capability */ static int hf_h460_21_sourceAddress = -1; /* UnicastAddress */ -/*--- End of included file: packet-h460-hf.c ---*/ -#line 33 "./asn1/h460/packet-h460-template.c" - /* Initialize the subtree pointers */ -/*--- Included file: packet-h460-ett.c ---*/ -#line 1 "./asn1/h460/packet-h460-ett.c" - /* --- Module NUMBER-PORTABILITY --- --- --- */ static gint ett_h460_2_NumberPortabilityInfo = -1; @@ -338,17 +326,11 @@ static gint ett_h460_21_ReceiveCapabilities = -1; static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability = -1; static gint ett_h460_21_TransmitCapabilities = -1; -/*--- End of included file: packet-h460-ett.c ---*/ -#line 36 "./asn1/h460/packet-h460-template.c" - /* Subdissectors */ static dissector_handle_t q931_ie_handle = NULL; static dissector_handle_t h225_ras_handle = NULL; -/*--- Included file: packet-h460-fn.c ---*/ -#line 1 "./asn1/h460/packet-h460-fn.c" - /* --- Module NUMBER-PORTABILITY --- --- --- */ @@ -1949,9 +1931,6 @@ static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet } -/*--- End of included file: packet-h460-fn.c ---*/ -#line 42 "./asn1/h460/packet-h460-template.c" - static int dissect_ies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { int offset = 0; @@ -2145,9 +2124,6 @@ void proto_register_h460(void) { /* List of fields */ static hf_register_info hf[] = { -/*--- Included file: packet-h460-hfarr.c ---*/ -#line 1 "./asn1/h460/packet-h460-hfarr.c" - /* --- Module NUMBER-PORTABILITY --- --- --- */ { &hf_h460_2_h460_2_NumberPortabilityInfo_PDU, @@ -2857,17 +2833,11 @@ void proto_register_h460(void) { { "sourceAddress", "h460.21.sourceAddress", FT_UINT32, BASE_DEC, VALS(h245_UnicastAddress_vals), 0, "UnicastAddress", HFILL }}, - -/*--- End of included file: packet-h460-hfarr.c ---*/ -#line 236 "./asn1/h460/packet-h460-template.c" }; /* List of subtrees */ static gint *ett[] = { -/*--- Included file: packet-h460-ettarr.c ---*/ -#line 1 "./asn1/h460/packet-h460-ettarr.c" - /* --- Module NUMBER-PORTABILITY --- --- --- */ &ett_h460_2_NumberPortabilityInfo, @@ -2956,9 +2926,6 @@ void proto_register_h460(void) { &ett_h460_21_ReceiveCapabilities, &ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability, &ett_h460_21_TransmitCapabilities, - -/*--- End of included file: packet-h460-ettarr.c ---*/ -#line 241 "./asn1/h460/packet-h460-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index cf96abd2f9..a8bdbb588a 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -3,9 +3,6 @@ /* packet-h501.c */ /* asn2wrs.py -L -p h501 -c ./h501.cnf -s ./packet-h501-template -D . -O ../.. H501-MESSAGES.asn */ -/* Input file: packet-h501-template.c */ - -#line 1 "./asn1/h501/packet-h501-template.c" /* packet-h501.c * Routines for H.501 packet dissection * 2007 Tomas Kukosa @@ -37,9 +34,6 @@ void proto_register_h501(void); /* Initialize the protocol and registered fields */ static int proto_h501 = -1; - -/*--- Included file: packet-h501-hf.c ---*/ -#line 1 "./asn1/h501/packet-h501-hf.c" static int hf_h501_Message_PDU = -1; /* Message */ static int hf_h501_body = -1; /* MessageBody */ static int hf_h501_common = -1; /* MessageCommonInfo */ @@ -293,14 +287,8 @@ static int hf_h501_nonStandardData = -1; /* NonStandardParameter */ static int hf_h501_releaseCompleteReason = -1; /* ReleaseCompleteReason */ static int hf_h501_causeIE = -1; /* INTEGER_1_65535 */ -/*--- End of included file: packet-h501-hf.c ---*/ -#line 33 "./asn1/h501/packet-h501-template.c" - /* Initialize the subtree pointers */ static int ett_h501 = -1; - -/*--- Included file: packet-h501-ett.c ---*/ -#line 1 "./asn1/h501/packet-h501-ett.c" static gint ett_h501_Message = -1; static gint ett_h501_MessageBody = -1; static gint ett_h501_MessageCommonInfo = -1; @@ -401,9 +389,6 @@ static gint ett_h501_SEQUENCE_OF_AliasAddress = -1; static gint ett_h501_Role = -1; static gint ett_h501_TerminationCause = -1; -/*--- End of included file: packet-h501-ett.c ---*/ -#line 37 "./asn1/h501/packet-h501-template.c" - /* Dissectors */ static dissector_handle_t h501_pdu_handle; @@ -414,9 +399,6 @@ static gboolean h501_desegment_tcp = TRUE; void proto_reg_handoff_h501(void); -/*--- Included file: packet-h501-fn.c ---*/ -#line 1 "./asn1/h501/packet-h501-fn.c" - static int dissect_h501_ElementIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -2498,9 +2480,6 @@ static int dissect_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-h501-fn.c ---*/ -#line 48 "./asn1/h501/packet-h501-template.c" - static int dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2535,9 +2514,6 @@ void proto_register_h501(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-h501-hfarr.c ---*/ -#line 1 "./asn1/h501/packet-h501-hfarr.c" { &hf_h501_Message_PDU, { "Message", "h501.Message_element", FT_NONE, BASE_NONE, NULL, 0, @@ -3546,17 +3522,11 @@ void proto_register_h501(void) { { "causeIE", "h501.causeIE", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_1_65535", HFILL }}, - -/*--- End of included file: packet-h501-hfarr.c ---*/ -#line 84 "./asn1/h501/packet-h501-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_h501, - -/*--- Included file: packet-h501-ettarr.c ---*/ -#line 1 "./asn1/h501/packet-h501-ettarr.c" &ett_h501_Message, &ett_h501_MessageBody, &ett_h501_MessageCommonInfo, @@ -3656,9 +3626,6 @@ void proto_register_h501(void) { &ett_h501_SEQUENCE_OF_AliasAddress, &ett_h501_Role, &ett_h501_TerminationCause, - -/*--- End of included file: packet-h501-ettarr.c ---*/ -#line 90 "./asn1/h501/packet-h501-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index 98f02c331b..d0e5a245de 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -3,9 +3,6 @@ /* packet-hnbap.c */ /* asn2wrs.py -L -p hnbap -c ./hnbap.cnf -s ./packet-hnbap-template -D . -O ../.. HNBAP-CommonDataTypes.asn HNBAP-Constants.asn HNBAP-Containers.asn HNBAP-IEs.asn HNBAP-PDU-Contents.asn HNBAP-PDU-Descriptions.asn */ -/* Input file: packet-hnbap-template.c */ - -#line 1 "./asn1/hnbap/packet-hnbap-template.c" /* packet-hnbap-template.c * Routines for UMTS Node B Application Part(HNBAP) packet dissection * Copyright 2010 Neil Piercy, ip.access Limited @@ -43,9 +40,6 @@ void proto_register_hnbap(void); - -/*--- Included file: packet-hnbap-val.h ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -100,15 +94,9 @@ typedef enum _ProtocolIE_ID_enum { id_HNB_Cell_Identifier = 31 } ProtocolIE_ID_enum; -/*--- End of included file: packet-hnbap-val.h ---*/ -#line 39 "./asn1/hnbap/packet-hnbap-template.c" - /* Initialize the protocol and registered fields */ static int proto_hnbap = -1; - -/*--- Included file: packet-hnbap-hf.c ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-hf.c" static int hf_hnbap_BackoffTimer_PDU = -1; /* BackoffTimer */ static int hf_hnbap_Cause_PDU = -1; /* Cause */ static int hf_hnbap_CellIdentity_PDU = -1; /* CellIdentity */ @@ -246,15 +234,9 @@ static int hf_hnbap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_hnbap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_hnbap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-hnbap-hf.c ---*/ -#line 44 "./asn1/hnbap/packet-hnbap-template.c" - /* Initialize the subtree pointers */ static int ett_hnbap = -1; static int ett_hnbap_imsi = -1; - -/*--- Included file: packet-hnbap-ett.c ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-ett.c" static gint ett_hnbap_PrivateIE_ID = -1; static gint ett_hnbap_ProtocolIE_Container = -1; static gint ett_hnbap_ProtocolIE_Field = -1; @@ -320,9 +302,6 @@ static gint ett_hnbap_InitiatingMessage = -1; static gint ett_hnbap_SuccessfulOutcome = -1; static gint ett_hnbap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-hnbap-ett.c ---*/ -#line 49 "./asn1/hnbap/packet-hnbap-template.c" - struct hnbap_private_data { e212_number_type_t number_type; }; @@ -359,9 +338,6 @@ hnbap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-hnbap-fn.c ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-fn.c" - static const value_string hnbap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -2605,9 +2581,6 @@ static int dissect_HNBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } -/*--- End of included file: packet-hnbap-fn.c ---*/ -#line 86 "./asn1/hnbap/packet-hnbap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; @@ -2675,9 +2648,6 @@ void proto_register_hnbap(void) { static hf_register_info hf[] = { - -/*--- Included file: packet-hnbap-hfarr.c ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-hfarr.c" { &hf_hnbap_BackoffTimer_PDU, { "BackoffTimer", "hnbap.BackoffTimer", FT_UINT32, BASE_DEC, NULL, 0, @@ -3222,18 +3192,12 @@ void proto_register_hnbap(void) { { "value", "hnbap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-hnbap-hfarr.c ---*/ -#line 155 "./asn1/hnbap/packet-hnbap-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_hnbap, &ett_hnbap_imsi, - -/*--- Included file: packet-hnbap-ettarr.c ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-ettarr.c" &ett_hnbap_PrivateIE_ID, &ett_hnbap_ProtocolIE_Container, &ett_hnbap_ProtocolIE_Field, @@ -3298,9 +3262,6 @@ void proto_register_hnbap(void) { &ett_hnbap_InitiatingMessage, &ett_hnbap_SuccessfulOutcome, &ett_hnbap_UnsuccessfulOutcome, - -/*--- End of included file: packet-hnbap-ettarr.c ---*/ -#line 162 "./asn1/hnbap/packet-hnbap-template.c" }; @@ -3330,9 +3291,6 @@ proto_reg_handoff_hnbap(void) { dissector_add_uint("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle); dissector_add_uint_with_preference("sctp.port", SCTP_PORT_HNBAP, hnbap_handle); - -/*--- Included file: packet-hnbap-dis-tab.c ---*/ -#line 1 "./asn1/hnbap/packet-hnbap-dis-tab.c" dissector_add_uint("hnbap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_hnbap)); dissector_add_uint("hnbap.ies", id_CriticalityDiagnostics, create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_hnbap)); dissector_add_uint("hnbap.ies", id_HNB_Identity, create_dissector_handle(dissect_HNB_Identity_PDU, proto_hnbap)); @@ -3379,7 +3337,4 @@ proto_reg_handoff_hnbap(void) dissector_add_uint("hnbap.proc.imsg", id_privateMessage, create_dissector_handle(dissect_PrivateMessage_PDU, proto_hnbap)); -/*--- End of included file: packet-hnbap-dis-tab.c ---*/ -#line 192 "./asn1/hnbap/packet-hnbap-template.c" - } diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index 0aed243aec..89e3229c04 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -3,9 +3,6 @@ /* packet-idmp.c */ /* asn2wrs.py -b -L -p idmp -c ./idmp.cnf -s ./packet-idmp-template -D . -O ../.. IDMProtocolSpecification.asn CommonProtocolSpecification.asn */ -/* Input file: packet-idmp-template.c */ - -#line 1 "./asn1/idmp/packet-idmp-template.c" /* packet-idmp.c * Routines for X.519 Internet Directly Mapped Procotol (IDMP) packet dissection * Graeme Lunt 2010 @@ -122,9 +119,6 @@ static int call_idmp_oid_callback(tvbuff_t *tvb, int offset, packet_info *pinfo, } - -/*--- Included file: packet-idmp-hf.c ---*/ -#line 1 "./asn1/idmp/packet-idmp-hf.c" static int hf_idmp_bind = -1; /* IdmBind */ static int hf_idmp_bindResult = -1; /* IdmBindResult */ static int hf_idmp_bindError = -1; /* IdmBindError */ @@ -158,14 +152,8 @@ static int hf_idmp_global = -1; /* OBJECT_IDENTIFIER */ static int hf_idmp_present = -1; /* INTEGER */ static int hf_idmp_absent = -1; /* NULL */ -/*--- End of included file: packet-idmp-hf.c ---*/ -#line 118 "./asn1/idmp/packet-idmp-template.c" - /* Initialize the subtree pointers */ static gint ett_idmp = -1; - -/*--- Included file: packet-idmp-ett.c ---*/ -#line 1 "./asn1/idmp/packet-idmp-ett.c" static gint ett_idmp_IDM_PDU = -1; static gint ett_idmp_IdmBind = -1; static gint ett_idmp_IdmBindResult = -1; @@ -177,12 +165,6 @@ static gint ett_idmp_IdmReject = -1; static gint ett_idmp_Code = -1; static gint ett_idmp_InvokeId = -1; -/*--- End of included file: packet-idmp-ett.c ---*/ -#line 122 "./asn1/idmp/packet-idmp-template.c" - - -/*--- Included file: packet-idmp-fn.c ---*/ -#line 1 "./asn1/idmp/packet-idmp-fn.c" static int @@ -609,9 +591,6 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -/*--- End of included file: packet-idmp-fn.c ---*/ -#line 124 "./asn1/idmp/packet-idmp-template.c" - void register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name) { @@ -787,9 +766,6 @@ void proto_register_idmp(void) { "IDMP segment data", "idmp.segment_data", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - -/*--- Included file: packet-idmp-hfarr.c ---*/ -#line 1 "./asn1/idmp/packet-idmp-hfarr.c" { &hf_idmp_bind, { "bind", "idmp.bind_element", FT_NONE, BASE_NONE, NULL, 0, @@ -918,9 +894,6 @@ void proto_register_idmp(void) { "absent", "idmp.absent_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 301 "./asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -928,9 +901,6 @@ void proto_register_idmp(void) &ett_idmp, &ett_idmp_fragment, &ett_idmp_fragments, - -/*--- Included file: packet-idmp-ettarr.c ---*/ -#line 1 "./asn1/idmp/packet-idmp-ettarr.c" &ett_idmp_IDM_PDU, &ett_idmp_IdmBind, &ett_idmp_IdmBindResult, @@ -941,9 +911,6 @@ void proto_register_idmp(void) &ett_idmp_IdmReject, &ett_idmp_Code, &ett_idmp_InvokeId, - -/*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 309 "./asn1/idmp/packet-idmp-template.c" }; module_t *idmp_module; diff --git a/epan/dissectors/packet-idmp.h b/epan/dissectors/packet-idmp.h index 8f8bbae8a8..34e393de13 100644 --- a/epan/dissectors/packet-idmp.h +++ b/epan/dissectors/packet-idmp.h @@ -3,9 +3,6 @@ /* packet-idmp.h */ /* asn2wrs.py -b -L -p idmp -c ./idmp.cnf -s ./packet-idmp-template -D . -O ../.. IDMProtocolSpecification.asn CommonProtocolSpecification.asn */ -/* Input file: packet-idmp-template.h */ - -#line 1 "./asn1/idmp/packet-idmp-template.h" /* packet-idmp.h * Routines for X.519 Internet Directly Mapped Protocol (IDMP) packet dissection * Graeme Lunt 2010 diff --git a/epan/dissectors/packet-ieee1609dot2.c b/epan/dissectors/packet-ieee1609dot2.c index 45694bee16..62f11f6833 100644 --- a/epan/dissectors/packet-ieee1609dot2.c +++ b/epan/dissectors/packet-ieee1609dot2.c @@ -3,9 +3,6 @@ /* packet-ieee1609dot2.c */ /* asn2wrs.py -L -p ieee1609dot2 -c ./ieee1609dot2.cnf -s ./packet-ieee1609dot2-template -D . -O ../.. IEEE1609dot2BaseTypes.asn IEEE1609dot2DataTypes.asn IEEE1609dot12.asn */ -/* Input file: packet-ieee1609dot2-template.c */ - -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" /* packet-IEEE1609dot2.c * Routines for IEEE 1609.2 * Copyright 2018, Anders Broman @@ -45,9 +42,6 @@ void proto_reg_handoff_ieee1609dot2(void); /* Initialize the protocol and registered fields */ int proto_ieee1609dot2 = -1; dissector_handle_t proto_ieee1609dot2_handle = NULL; - -/*--- Included file: packet-ieee1609dot2-hf.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-hf.c" static int hf_ieee1609dot2_Ieee1609Dot2Data_PDU = -1; /* Ieee1609Dot2Data */ static int hf_ieee1609dot2_SequenceOfUint8_item = -1; /* Uint8 */ static int hf_ieee1609dot2_SequenceOfUint16_item = -1; /* Uint16 */ @@ -215,14 +209,8 @@ static int hf_ieee1609dot2_reconstructionValue = -1; /* EccP256CurvePoint */ static int hf_ieee1609dot2_EndEntityType_app = -1; static int hf_ieee1609dot2_EndEntityType_enrol = -1; -/*--- End of included file: packet-ieee1609dot2-hf.c ---*/ -#line 41 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" - /* Initialize the subtree pointers */ static int ett_ieee1609dot2_ssp = -1; - -/*--- Included file: packet-ieee1609dot2-ett.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-ett.c" static gint ett_ieee1609dot2_SequenceOfUint8 = -1; static gint ett_ieee1609dot2_SequenceOfUint16 = -1; static gint ett_ieee1609dot2_SequenceOfHashedId3 = -1; @@ -292,9 +280,6 @@ static gint ett_ieee1609dot2_SequenceOfPsidGroupPermissions = -1; static gint ett_ieee1609dot2_SubjectPermissions = -1; static gint ett_ieee1609dot2_VerificationKeyIndicator = -1; -/*--- End of included file: packet-ieee1609dot2-ett.c ---*/ -#line 45 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" - static dissector_table_t unsecured_data_subdissector_table; static dissector_table_t ssp_subdissector_table; @@ -309,9 +294,6 @@ ieee1609dot2_set_next_default_psid(packet_info *pinfo, guint32 psid) p_add_proto_data(wmem_file_scope(), pinfo, proto_ieee1609dot2, 0, GUINT_TO_POINTER(psid)); } - -/*--- Included file: packet-ieee1609dot2-fn.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-fn.c" /*--- Cyclic dependencies ---*/ /* SignedDataPayload -> Ieee1609Dot2Data -> Ieee1609Dot2Content -> SignedData -> ToBeSignedData -> SignedDataPayload */ @@ -2093,9 +2075,6 @@ static int dissect_Ieee1609Dot2Data_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } -/*--- End of included file: packet-ieee1609dot2-fn.c ---*/ -#line 61 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" - static void ieee1609dot2_NinetyDegreeInt_fmt(gchar *s, guint32 v) @@ -2163,9 +2142,6 @@ void proto_register_ieee1609dot2(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-ieee1609dot2-hfarr.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-hfarr.c" { &hf_ieee1609dot2_Ieee1609Dot2Data_PDU, { "Ieee1609Dot2Data", "ieee1609dot2.Ieee1609Dot2Data_element", FT_NONE, BASE_NONE, NULL, 0, @@ -2826,16 +2802,10 @@ void proto_register_ieee1609dot2(void) { { "enrol", "ieee1609dot2.EndEntityType.enrol", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-ieee1609dot2-hfarr.c ---*/ -#line 130 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-ieee1609dot2-ettarr.c ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-ettarr.c" &ett_ieee1609dot2_SequenceOfUint8, &ett_ieee1609dot2_SequenceOfUint16, &ett_ieee1609dot2_SequenceOfHashedId3, @@ -2904,9 +2874,6 @@ void proto_register_ieee1609dot2(void) { &ett_ieee1609dot2_SequenceOfPsidGroupPermissions, &ett_ieee1609dot2_SubjectPermissions, &ett_ieee1609dot2_VerificationKeyIndicator, - -/*--- End of included file: packet-ieee1609dot2-ettarr.c ---*/ -#line 135 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.c" &ett_ieee1609dot2_ssp, }; diff --git a/epan/dissectors/packet-ieee1609dot2.h b/epan/dissectors/packet-ieee1609dot2.h index 8c611da1a6..4e37f9728b 100644 --- a/epan/dissectors/packet-ieee1609dot2.h +++ b/epan/dissectors/packet-ieee1609dot2.h @@ -3,9 +3,6 @@ /* packet-ieee1609dot2.h */ /* asn2wrs.py -L -p ieee1609dot2 -c ./ieee1609dot2.cnf -s ./packet-ieee1609dot2-template -D . -O ../.. IEEE1609dot2BaseTypes.asn IEEE1609dot2DataTypes.asn IEEE1609dot12.asn */ -/* Input file: packet-ieee1609dot2-template.h */ - -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.h" /* packet-IEEE1609dot2.h * Routines for IEEE 1609.2 * Copyright 2018, Anders Broman @@ -23,9 +20,6 @@ #include "ws_symbol_export.h" -/*--- Included file: packet-ieee1609dot2-val.h ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-val.h" - typedef enum _Psid_enum { psid_system = 0, psid_electronic_fee_collection = 1, @@ -97,9 +91,6 @@ typedef enum _Psid_enum { psid_ipv6_routing = 270549118 } Psid_enum; -/*--- End of included file: packet-ieee1609dot2-val.h ---*/ -#line 18 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.h" - /* * When dissecting IEEE1609.2 structure containing only unsecured data, no PSID * is provided inside. Caller has to provide a ITS-AID/PSID before calling the @@ -111,14 +102,8 @@ typedef enum _Psid_enum { WS_DLL_PUBLIC void ieee1609dot2_set_next_default_psid(packet_info *pinfo, guint32 psid); - -/*--- Included file: packet-ieee1609dot2-exp.h ---*/ -#line 1 "./asn1/ieee1609dot2/packet-ieee1609dot2-exp.h" WS_DLL_PUBLIC const val64_string ieee1609dot2_Psid_vals[]; -/*--- End of included file: packet-ieee1609dot2-exp.h ---*/ -#line 31 "./asn1/ieee1609dot2/packet-ieee1609dot2-template.h" - #endif /* _IEEE1609DOT2_H_ */ /* diff --git a/epan/dissectors/packet-ilp.c b/epan/dissectors/packet-ilp.c index 7f41c03bcc..b8f495916e 100644 --- a/epan/dissectors/packet-ilp.c +++ b/epan/dissectors/packet-ilp.c @@ -3,9 +3,6 @@ /* packet-ilp.c */ /* asn2wrs.py -L -p ilp -c ./ilp.cnf -s ./packet-ilp-template -D . -O ../.. ILP.asn ILP-Components.asn */ -/* Input file: packet-ilp-template.c */ - -#line 1 "./asn1/ilp/packet-ilp-template.c" /* packet-ilp.c * Routines for OMA Internal Location Protocol packet dissection * Copyright 2006, e.yimjia @@ -57,9 +54,6 @@ static int proto_ilp = -1; static gboolean ilp_desegment = TRUE; - -/*--- Included file: packet-ilp-hf.c ---*/ -#line 1 "./asn1/ilp/packet-ilp-hf.c" static int hf_ilp_ILP_PDU_PDU = -1; /* ILP_PDU */ static int hf_ilp_length = -1; /* INTEGER_0_65535 */ static int hf_ilp_version = -1; /* Version */ @@ -499,17 +493,11 @@ static int hf_ilp_GANSSSignals_signal8 = -1; static int hf_ilp_T_addPosMode_standalone = -1; static int hf_ilp_T_addPosMode_setBased = -1; static int hf_ilp_T_addPosMode_setAssisted = -1; - -/*--- End of included file: packet-ilp-hf.c ---*/ -#line 53 "./asn1/ilp/packet-ilp-template.c" static int hf_ilp_mobile_directory_number = -1; /* Initialize the subtree pointers */ static gint ett_ilp = -1; static gint ett_ilp_setid = -1; - -/*--- Included file: packet-ilp-ett.c ---*/ -#line 1 "./asn1/ilp/packet-ilp-ett.c" static gint ett_ilp_ILP_PDU = -1; static gint ett_ilp_IlpMessage = -1; static gint ett_ilp_PREQ = -1; @@ -662,13 +650,7 @@ static gint ett_ilp_MultiPosPayLoad = -1; static gint ett_ilp_T_lPPPayload = -1; static gint ett_ilp_T_tia801Payload = -1; -/*--- End of included file: packet-ilp-ett.c ---*/ -#line 59 "./asn1/ilp/packet-ilp-template.c" - /* Include constants */ - -/*--- Included file: packet-ilp-val.h ---*/ -#line 1 "./asn1/ilp/packet-ilp-val.h" #define maxGANSS 16 #define maxGANSSSat 32 #define maxLidSize 64 @@ -681,14 +663,8 @@ static gint ett_ilp_T_tia801Payload = -1; #define maxTS 14 #define maxPosSize 1024 -/*--- End of included file: packet-ilp-val.h ---*/ -#line 62 "./asn1/ilp/packet-ilp-template.c" - -/*--- Included file: packet-ilp-fn.c ---*/ -#line 1 "./asn1/ilp/packet-ilp-fn.c" - static int dissect_ilp_INTEGER_0_65535(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -4697,9 +4673,6 @@ static int dissect_ILP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-ilp-fn.c ---*/ -#line 65 "./asn1/ilp/packet-ilp-template.c" - static guint get_ilp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) @@ -4724,9 +4697,6 @@ void proto_register_ilp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-ilp-hfarr.c ---*/ -#line 1 "./asn1/ilp/packet-ilp-hfarr.c" { &hf_ilp_ILP_PDU_PDU, { "ILP-PDU", "ilp.ILP_PDU_element", FT_NONE, BASE_NONE, NULL, 0, @@ -6479,9 +6449,6 @@ void proto_register_ilp(void) { { "setAssisted", "ilp.T.addPosMode.setAssisted", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-ilp-hfarr.c ---*/ -#line 91 "./asn1/ilp/packet-ilp-template.c" { &hf_ilp_mobile_directory_number, { "Mobile Directory Number", "ilp.mobile_directory_number", FT_STRING, BASE_NONE, NULL, 0, @@ -6492,9 +6459,6 @@ void proto_register_ilp(void) { static gint *ett[] = { &ett_ilp, &ett_ilp_setid, - -/*--- Included file: packet-ilp-ettarr.c ---*/ -#line 1 "./asn1/ilp/packet-ilp-ettarr.c" &ett_ilp_ILP_PDU, &ett_ilp_IlpMessage, &ett_ilp_PREQ, @@ -6646,9 +6610,6 @@ void proto_register_ilp(void) { &ett_ilp_MultiPosPayLoad, &ett_ilp_T_lPPPayload, &ett_ilp_T_tia801Payload, - -/*--- End of included file: packet-ilp-ettarr.c ---*/ -#line 102 "./asn1/ilp/packet-ilp-template.c" }; module_t *ilp_module; diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 8ad49461f3..4e546dd8c2 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -3,9 +3,6 @@ /* packet-inap.c */ /* asn2wrs.py -b -L -p inap -c ./inap.cnf -s ./packet-inap-template -D . -O ../.. IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn IN-errorcodes.asn IN-errortypes.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-inap-template.c */ - -#line 1 "./asn1/inap/packet-inap-template.c" /* packet-inap-template.c * Routines for INAP * Copyright 2004, Tim Endean @@ -49,9 +46,6 @@ void proto_reg_handoff_inap(void); static int proto_inap = -1; /* include constants */ - -/*--- Included file: packet-inap-val.h ---*/ -#line 1 "./asn1/inap/packet-inap-val.h" #define opcode_initialDP 0 #define opcode_originationAttemptAuthorized 1 #define opcode_collectedInformation 2 @@ -446,12 +440,6 @@ static int proto_inap = -1; #define errcode_chainingRefused 23 #define noInvokeId NULL -/*--- End of included file: packet-inap-val.h ---*/ -#line 45 "./asn1/inap/packet-inap-template.c" - - -/*--- Included file: packet-inap-hf.c ---*/ -#line 1 "./asn1/inap/packet-inap-hf.c" static int hf_inap_ActivateServiceFilteringArg_PDU = -1; /* ActivateServiceFilteringArg */ static int hf_inap_AnalysedInformationArg_PDU = -1; /* AnalysedInformationArg */ static int hf_inap_AnalyseInformationArg_PDU = -1; /* AnalyseInformationArg */ @@ -1013,9 +1001,6 @@ static int hf_inap_returnErrorProblem = -1; /* ReturnErrorProblem */ static int hf_inap_present = -1; /* INTEGER */ static int hf_inap_InvokeId_present = -1; /* InvokeId_present */ -/*--- End of included file: packet-inap-hf.c ---*/ -#line 47 "./asn1/inap/packet-inap-template.c" - #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1057,9 +1042,6 @@ static gint ett_inap_prefix = -1; static gint ett_inap_iPAddressValue = -1; static gint ett_inap_digitsResponse = -1; - -/*--- Included file: packet-inap-ett.c ---*/ -#line 1 "./asn1/inap/packet-inap-ett.c" static gint ett_inap_Extensions = -1; static gint ett_inap_ExtensionField = -1; static gint ett_inap_AlternativeIdentities = -1; @@ -1297,17 +1279,11 @@ static gint ett_inap_Reject = -1; static gint ett_inap_T_problem_01 = -1; static gint ett_inap_InvokeId = -1; -/*--- End of included file: packet-inap-ett.c ---*/ -#line 90 "./asn1/inap/packet-inap-template.c" - static expert_field ei_inap_unknown_invokeData = EI_INIT; static expert_field ei_inap_unknown_returnResultData = EI_INIT; static expert_field ei_inap_unknown_returnErrorData = EI_INIT; -/*--- Included file: packet-inap-table.c ---*/ -#line 1 "./asn1/inap/packet-inap-table.c" - /* INAP OPERATIONS */ const value_string inap_opr_code_strings[] = { { opcode_activateServiceFiltering , "activateServiceFiltering" }, @@ -1427,9 +1403,6 @@ static const value_string inap_err_code_string_vals[] = { }; -/*--- End of included file: packet-inap-table.c ---*/ -#line 96 "./asn1/inap/packet-inap-template.c" - const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, {1,"General Problem Mistyped Component"}, @@ -1443,9 +1416,6 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx); -/*--- Included file: packet-inap-fn.c ---*/ -#line 1 "./asn1/inap/packet-inap-fn.c" - const value_string inap_CriticalityType_vals[] = { { 0, "ignore" }, { 1, "abort" }, @@ -9039,9 +9009,6 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ return offset; } - -/*--- End of included file: packet-inap-fn.c ---*/ -#line 110 "./asn1/inap/packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9063,9 +9030,6 @@ TC-Invokable OPERATION ::= */ -/*--- Included file: packet-inap-table2.c ---*/ -#line 1 "./asn1/inap/packet-inap-table2.c" - static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { switch(opcode){ @@ -9390,9 +9354,6 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a } -/*--- End of included file: packet-inap-table2.c ---*/ -#line 131 "./asn1/inap/packet-inap-template.c" - static guint8 inap_pdu_type = 0; static guint8 inap_pdu_size = 0; @@ -9474,9 +9435,6 @@ void proto_register_inap(void) { FT_UINT8, BASE_DEC | BASE_EXT_STRING, &q850_cause_code_vals_ext, 0x7f, NULL, HFILL } }, - -/*--- Included file: packet-inap-hfarr.c ---*/ -#line 1 "./asn1/inap/packet-inap-hfarr.c" { &hf_inap_ActivateServiceFilteringArg_PDU, { "ActivateServiceFilteringArg", "inap.ActivateServiceFilteringArg_element", FT_NONE, BASE_NONE, NULL, 0, @@ -11717,9 +11675,6 @@ void proto_register_inap(void) { { "InvokeId.present", "inap.InvokeId_present", FT_INT32, BASE_DEC, NULL, 0, "InvokeId_present", HFILL }}, - -/*--- End of included file: packet-inap-hfarr.c ---*/ -#line 214 "./asn1/inap/packet-inap-template.c" }; @@ -11750,9 +11705,6 @@ void proto_register_inap(void) { &ett_inap_prefix, &ett_inap_iPAddressValue, &ett_inap_digitsResponse, - -/*--- Included file: packet-inap-ettarr.c ---*/ -#line 1 "./asn1/inap/packet-inap-ettarr.c" &ett_inap_Extensions, &ett_inap_ExtensionField, &ett_inap_AlternativeIdentities, @@ -11989,9 +11941,6 @@ void proto_register_inap(void) { &ett_inap_Reject, &ett_inap_T_problem_01, &ett_inap_InvokeId, - -/*--- End of included file: packet-inap-ettarr.c ---*/ -#line 245 "./asn1/inap/packet-inap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index cbc8f1f424..81ff7f1e2c 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -3,9 +3,6 @@ /* packet-inap.h */ /* asn2wrs.py -b -L -p inap -c ./inap.cnf -s ./packet-inap-template -D . -O ../.. IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn IN-errorcodes.asn IN-errortypes.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ -/* Input file: packet-inap-template.h */ - -#line 1 "./asn1/inap/packet-inap-template.h" /* packet-inap.h * * Copyright 2004, Tim Endean @@ -21,9 +18,6 @@ #ifndef PACKET_INAP_H #define PACKET_INAP_H - -/*--- Included file: packet-inap-exp.h ---*/ -#line 1 "./asn1/inap/packet-inap-exp.h" extern const value_string inap_CriticalityType_vals[]; extern const value_string inap_BothwayThroughConnectionInd_vals[]; extern const value_string inap_LegID_vals[]; @@ -39,7 +33,4 @@ int dissect_inap_MiscCallInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int int dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_inap_ServiceKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-inap-exp.h ---*/ -#line 17 "./asn1/inap/packet-inap-template.h" - #endif /* PACKET_INAP_H */ diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c index bb9b21624b..a08fd452ed 100644 --- a/epan/dissectors/packet-isdn-sup.c +++ b/epan/dissectors/packet-isdn-sup.c @@ -3,9 +3,6 @@ /* packet-isdn-sup.c */ /* asn2wrs.py -b -L -p isdn-sup -c ./isdn-sup.cnf -s ./packet-isdn-sup-template -D . -O ../.. Addressing-Data-Elements.asn Basic-Service-Elements.asn Embedded-Q931-Types.asn General-Errors.asn Advice-of-Charge-Operations.asn Closed-User-Group-Service-Operations.asn Conference-Add-On-Operations.asn Diversion-Operations.asn MCID-Operations.asn User-To-User-Signalling-Operations.asn Freephone-Operations.asn MLPP-Operations-And-Errors.asn */ -/* Input file: packet-isdn-sup-template.c */ - -#line 1 "./asn1/isdn-sup/packet-isdn-sup-template.c" /* packet-isdn-sup-template.c * Routines for ETSI Integrated Services Digital Network (ISDN) * supplementary services @@ -33,14 +30,8 @@ void proto_register_isdn_sup(void); void proto_reg_handoff_isdn_sup(void); - -/*--- Included file: packet-isdn-sup-val.h ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-val.h" #define fPHOID "0.4.0.210.1" -/*--- End of included file: packet-isdn-sup-val.h ---*/ -#line 29 "./asn1/isdn-sup/packet-isdn-sup-template.c" - /* Initialize the protocol and registered fields */ static int proto_isdn_sup = -1; static int hf_isdn_sup_operation = -1; @@ -72,9 +63,6 @@ typedef struct isdn_sup_err_t { } isdn_sup_err_t; static const value_string isdn_sup_str_operation[] = { - -/*--- Included file: packet-isdn-sup-table10.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-table10.c" { 1, "userUserService" }, { 2, "cUGcall" }, { 3, "mCIDRequest" }, @@ -107,17 +95,11 @@ static const value_string isdn_sup_str_operation[] = { { 44, "isolateCONF" }, { 45, "reattachCONF" }, { 46, "partyDISC" }, - -/*--- End of included file: packet-isdn-sup-table10.c ---*/ -#line 62 "./asn1/isdn-sup/packet-isdn-sup-template.c" { 0, NULL} }; static const value_string isdn_sup_str_error[] = { - -/*--- Included file: packet-isdn-sup-table20.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-table20.c" { 0, "notSubscribed" }, { 3, "notAvailable" }, { 4, "notImplemented" }, @@ -149,17 +131,11 @@ static const value_string isdn_sup_str_error[] = { { 1, "rejectedByTheNetwork" }, { 2, "rejectedByTheUser" }, { 44, "unauthorizedPrecedenceLevel" }, - -/*--- End of included file: packet-isdn-sup-table20.c ---*/ -#line 68 "./asn1/isdn-sup/packet-isdn-sup-template.c" { 0, NULL} }; static int hf_isdn_sup = -1; - -/*--- Included file: packet-isdn-sup-hf.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-hf.c" static int hf_isdn_sup_ChargingRequestArg_PDU = -1; /* ChargingRequestArg */ static int hf_isdn_sup_ChargingRequestRes_PDU = -1; /* ChargingRequestRes */ static int hf_isdn_sup_AOCSCurrencyArg_PDU = -1; /* AOCSCurrencyArg */ @@ -329,16 +305,10 @@ static int hf_isdn_sup_mlppSvcDomn = -1; /* MLPPSvcDomn */ static int hf_isdn_sup_statusQuery = -1; /* StatusQuery */ static int hf_isdn_sup_location = -1; /* Location */ -/*--- End of included file: packet-isdn-sup-hf.c ---*/ -#line 74 "./asn1/isdn-sup/packet-isdn-sup-template.c" - /* Initialize the subtree pointers */ static gint ett_isdn_sup = -1; - -/*--- Included file: packet-isdn-sup-ett.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-ett.c" static gint ett_isdn_sup_PresentedAddressScreened = -1; static gint ett_isdn_sup_PresentedAddressUnscreened = -1; static gint ett_isdn_sup_PresentedNumberScreened = -1; @@ -407,9 +377,6 @@ static gint ett_isdn_sup_MLPPLFBArg = -1; static gint ett_isdn_sup_MLPPParams = -1; static gint ett_isdn_sup_MLPPLFBResp = -1; -/*--- End of included file: packet-isdn-sup-ett.c ---*/ -#line 80 "./asn1/isdn-sup/packet-isdn-sup-template.c" - /* static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; */ static expert_field ei_isdn_sup_unsupported_result_type = EI_INIT; static expert_field ei_isdn_sup_unsupported_error_type = EI_INIT; @@ -419,9 +386,6 @@ static expert_field ei_isdn_sup_unsupported_error_type = EI_INIT; /* Global variables */ -/*--- Included file: packet-isdn-sup-fn.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-fn.c" - static int dissect_isdn_sup_NumberDigits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -2705,13 +2669,7 @@ static int dissect_PreemptParams_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-isdn-sup-fn.c ---*/ -#line 90 "./asn1/isdn-sup/packet-isdn-sup-template.c" - static const isdn_sup_op_t isdn_sup_op_tab[] = { - -/*--- Included file: packet-isdn-sup-table11.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-table11.c" /* chargingRequest */ { 30, dissect_ChargingRequestArg_PDU, dissect_ChargingRequestRes_PDU }, /* aOCSCurrency */ { 31, dissect_AOCSCurrencyArg_PDU, NULL }, /* aOCSSpecialArr */ { 32, dissect_AOCSSpecialArrArg_PDU, NULL }, @@ -2744,30 +2702,18 @@ static const isdn_sup_op_t isdn_sup_op_tab[] = { /* mLPPLFBQuery */ { 24, dissect_MLPPLFBArg_PDU, dissect_MLPPLFBResp_PDU }, /* mLPPCallRequest */ { 25, dissect_MLPPParams_PDU, dissect_StatusRequest_PDU }, /* mLPPCallPreemption */ { 26, dissect_PreemptParams_PDU, NULL }, - -/*--- End of included file: packet-isdn-sup-table11.c ---*/ -#line 93 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; static const isdn_sup_global_op_t isdn_sup_global_op_tab[] = { - -/*--- Included file: packet-isdn-sup-table31.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-table31.c" /* callFPH */ { fPHOID".1", dissect_CalledFreephoneNrArg_PDU, NULL }, /* monitor-T-FPH */ { fPHOID".2", dissect_Monitor_T_FPHArg_PDU, NULL }, /* free-T-FPH */ { fPHOID".3", dissect_Free_T_FPHArg_PDU, NULL }, /* call-T-FPH */ { fPHOID".4", dissect_Call_T_FPHArg_PDU, NULL }, - -/*--- End of included file: packet-isdn-sup-table31.c ---*/ -#line 99 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; static const isdn_sup_err_t isdn_sup_err_tab[] = { - -/*--- Included file: packet-isdn-sup-table21.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-table21.c" /* notSubscribed */ { 0, NULL }, /* notAvailable */ { 3, NULL }, /* notImplemented */ { 4, NULL }, @@ -2799,9 +2745,6 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = { /* rejectedByTheNetwork */ { 1, NULL }, /* rejectedByTheUser */ { 2, NULL }, /* unauthorizedPrecedenceLevel */ { 44, NULL }, - -/*--- End of included file: packet-isdn-sup-table21.c ---*/ -#line 103 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; @@ -3034,9 +2977,6 @@ void proto_register_isdn_sup(void) { NULL, HFILL } }, - -/*--- Included file: packet-isdn-sup-hfarr.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-hfarr.c" { &hf_isdn_sup_ChargingRequestArg_PDU, { "ChargingRequestArg", "isdn-sup.ChargingRequestArg", FT_UINT32, BASE_DEC, VALS(isdn_sup_ChargingCase_vals), 0, @@ -3709,18 +3649,12 @@ void proto_register_isdn_sup(void) { { "location", "isdn-sup.location", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-isdn-sup-hfarr.c ---*/ -#line 336 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_isdn_sup, - -/*--- Included file: packet-isdn-sup-ettarr.c ---*/ -#line 1 "./asn1/isdn-sup/packet-isdn-sup-ettarr.c" &ett_isdn_sup_PresentedAddressScreened, &ett_isdn_sup_PresentedAddressUnscreened, &ett_isdn_sup_PresentedNumberScreened, @@ -3788,9 +3722,6 @@ void proto_register_isdn_sup(void) { &ett_isdn_sup_MLPPLFBArg, &ett_isdn_sup_MLPPParams, &ett_isdn_sup_MLPPLFBResp, - -/*--- End of included file: packet-isdn-sup-ettarr.c ---*/ -#line 343 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-its.c b/epan/dissectors/packet-its.c index cae03a220d..c4ad4b06ba 100644 --- a/epan/dissectors/packet-its.c +++ b/epan/dissectors/packet-its.c @@ -3,9 +3,6 @@ /* packet-its.c */ /* asn2wrs.py -L -o its -c ./its.cnf -s ./packet-its-template -D . -O ../.. ITS-Container.asn ITS-ContainerV1.asn ISO_TS_14816.asn ISO_TS_24534-3.asn ISO_TS_17419.asn ISO_TS_14906_Application.asn ISO_TS_19091.asn GDD.asn ISO19321IVIv2.asn ETSI_TS_103301.asn CAMv1.asn CAM.asn DENMv1.asn DENM.asn TIS_TPG_Transactions_Descriptions.asn EVCSN-PDU-Descriptions.asn EV-RSR-PDU-Descriptions.asn CPM-PDU-Descriptions.asn */ -/* Input file: packet-its-template.c */ - -#line 1 "./asn1/its/packet-its-template.c" /* packet-its-template.c * * Intelligent Transport Systems Applications dissectors @@ -293,9 +290,6 @@ static int dissect_camssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree // Generated by asn2wrs -/*--- Included file: packet-its-hf.c ---*/ -#line 1 "./asn1/its/packet-its-hf.c" - /* --- Module ITS-Container --- --- --- */ static int hf_its_its_ItsPduHeader_PDU = -1; /* ItsPduHeader */ @@ -1923,9 +1917,6 @@ static int hf_cpm_node_Z4 = -1; /* Offset_B13 */ static int hf_cpm_node_Z5 = -1; /* Offset_B14 */ static int hf_cpm_node_Z6 = -1; /* Offset_B16 */ -/*--- End of included file: packet-its-hf.c ---*/ -#line 288 "./asn1/its/packet-its-template.c" - // CauseCode/SubCauseCode management static int hf_its_trafficConditionSubCauseCode = -1; static int hf_its_accidentSubCauseCode = -1; @@ -1955,9 +1946,6 @@ static int hf_its_dangerousSituationSubCauseCode = -1; static gint ett_its = -1; -/*--- Included file: packet-its-ett.c ---*/ -#line 1 "./asn1/its/packet-its-ett.c" - /* --- Module ITS-Container --- --- --- */ static gint ett_its_ItsPduHeader = -1; @@ -2524,9 +2512,6 @@ static gint ett_cpm_OtherSubclass = -1; static gint ett_cpm_OffsetPoint = -1; static gint ett_cpm_NodeOffsetPointZ = -1; -/*--- End of included file: packet-its-ett.c ---*/ -#line 318 "./asn1/its/packet-its-template.c" - // Deal with cause/subcause code management struct { CauseCodeType_enum cause; int* hf; } cause_to_subcause[] = { { trafficCondition, &hf_its_trafficConditionSubCauseCode }, @@ -2568,9 +2553,6 @@ find_subcause_from_cause(CauseCodeType_enum cause) } -/*--- Included file: packet-its-fn.c ---*/ -#line 1 "./asn1/its/packet-its-fn.c" - /* --- Module ITS-Container --- --- --- */ @@ -18365,9 +18347,6 @@ static int dissect_cpm_CollectivePerceptionMessage_PDU(tvbuff_t *tvb _U_, packet } -/*--- End of included file: packet-its-fn.c ---*/ -#line 360 "./asn1/its/packet-its-template.c" - static void its_latitude_fmt(gchar *s, guint32 v) { @@ -18865,9 +18844,6 @@ void proto_register_its(void) { static hf_register_info hf_its[] = { -/*--- Included file: packet-its-hfarr.c ---*/ -#line 1 "./asn1/its/packet-its-hfarr.c" - /* --- Module ITS-Container --- --- --- */ { &hf_its_its_ItsPduHeader_PDU, @@ -25191,9 +25167,6 @@ void proto_register_its(void) FT_INT32, BASE_DEC, NULL, 0, "Offset_B16", HFILL }}, -/*--- End of included file: packet-its-hfarr.c ---*/ -#line 858 "./asn1/its/packet-its-template.c" - { &hf_its_roadworksSubCauseCode, { "roadworksSubCauseCode", "its.subCauseCode", FT_UINT32, BASE_DEC, VALS(its_RoadworksSubCauseCode_vals), 0, @@ -25396,9 +25369,6 @@ void proto_register_its(void) &ett_denmssp_flags, &ett_camssp_flags, -/*--- Included file: packet-its-ettarr.c ---*/ -#line 1 "./asn1/its/packet-its-ettarr.c" - /* --- Module ITS-Container --- --- --- */ &ett_its_ItsPduHeader, @@ -25964,9 +25934,6 @@ void proto_register_its(void) &ett_cpm_OtherSubclass, &ett_cpm_OffsetPoint, &ett_cpm_NodeOffsetPointZ, - -/*--- End of included file: packet-its-ettarr.c ---*/ -#line 1061 "./asn1/its/packet-its-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-its.h b/epan/dissectors/packet-its.h index 9ae19e11d4..ca2670c381 100644 --- a/epan/dissectors/packet-its.h +++ b/epan/dissectors/packet-its.h @@ -3,9 +3,6 @@ /* packet-its.h */ /* asn2wrs.py -L -o its -c ./its.cnf -s ./packet-its-template -D . -O ../.. ITS-Container.asn ITS-ContainerV1.asn ISO_TS_14816.asn ISO_TS_24534-3.asn ISO_TS_17419.asn ISO_TS_14906_Application.asn ISO_TS_19091.asn GDD.asn ISO19321IVIv2.asn ETSI_TS_103301.asn CAMv1.asn CAM.asn DENMv1.asn DENM.asn TIS_TPG_Transactions_Descriptions.asn EVCSN-PDU-Descriptions.asn EV-RSR-PDU-Descriptions.asn CPM-PDU-Descriptions.asn */ -/* Input file: packet-its-template.h */ - -#line 1 "./asn1/its/packet-its-template.h" /* packet-its-template.h * * Intelligent Transport Systems Applications dissectors @@ -22,9 +19,6 @@ #define __PACKET_ITS_H__ -/*--- Included file: packet-its-exp.h ---*/ -#line 1 "./asn1/its/packet-its-exp.h" - /* --- Module ITS-Container --- --- --- */ @@ -100,12 +94,6 @@ /* --- Module CPM-PDU-Descriptions --- --- --- */ -/*--- End of included file: packet-its-exp.h ---*/ -#line 17 "./asn1/its/packet-its-template.h" - - -/*--- Included file: packet-its-val.h ---*/ -#line 1 "./asn1/its/packet-its-val.h" /* --- Module ITS-Container --- --- --- */ @@ -242,9 +230,6 @@ typedef enum _RegionId_enum { /* --- Module CPM-PDU-Descriptions --- --- --- */ -/*--- End of included file: packet-its-val.h ---*/ -#line 19 "./asn1/its/packet-its-template.h" - typedef struct its_header { guint32 version; guint32 msgId; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index e2d6894ffe..a7f6368c47 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -3,9 +3,6 @@ /* packet-kerberos.c */ /* asn2wrs.py -b -L -p kerberos -c ./kerberos.cnf -s ./packet-kerberos-template -D . -O ../.. KerberosV5Spec2.asn k5.asn RFC3244.asn RFC6113.asn SPAKE.asn */ -/* Input file: packet-kerberos-template.c */ - -#line 1 "./asn1/kerberos/packet-kerberos-template.c" /* packet-kerberos.c * Routines for Kerberos * Wes Hardaker (c) 2000 @@ -318,9 +315,6 @@ static gint hf_kerberos_FastOptions_spare_bit15 = -1; static gint hf_kerberos_FastOptions_kdc_follow_referrals = -1; #endif - -/*--- Included file: packet-kerberos-hf.c ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-hf.c" static int hf_kerberos_ticket = -1; /* Ticket */ static int hf_kerberos_authenticator = -1; /* Authenticator */ static int hf_kerberos_encTicketPart = -1; /* EncTicketPart */ @@ -553,9 +547,6 @@ static int hf_kerberos_PAC_OPTIONS_FLAGS_branch_aware = -1; static int hf_kerberos_PAC_OPTIONS_FLAGS_forward_to_full_dc = -1; static int hf_kerberos_PAC_OPTIONS_FLAGS_resource_based_constrained_delegation = -1; -/*--- End of included file: packet-kerberos-hf.c ---*/ -#line 314 "./asn1/kerberos/packet-kerberos-template.c" - /* Initialize the subtree pointers */ static gint ett_kerberos = -1; static gint ett_krb_recordmark = -1; @@ -585,9 +576,6 @@ static gint ett_kerberos_KrbFastResponse = -1; static gint ett_kerberos_KrbFastReq = -1; static gint ett_kerberos_FastOptions = -1; #endif - -/*--- Included file: packet-kerberos-ett.c ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-ett.c" static gint ett_kerberos_Applications = -1; static gint ett_kerberos_PrincipalName = -1; static gint ett_kerberos_SEQUENCE_OF_KerberosString = -1; @@ -675,9 +663,6 @@ static gint ett_kerberos_SPAKESecondFactor = -1; static gint ett_kerberos_SPAKEResponse = -1; static gint ett_kerberos_PA_SPAKE = -1; -/*--- End of included file: packet-kerberos-ett.c ---*/ -#line 345 "./asn1/kerberos/packet-kerberos-template.c" - static expert_field ei_kerberos_missing_keytype = EI_INIT; static expert_field ei_kerberos_decrypted_keytype = EI_INIT; static expert_field ei_kerberos_learnt_keytype = EI_INIT; @@ -690,9 +675,6 @@ static dissector_handle_t krb4_handle=NULL; static guint32 gbl_keytype; static gboolean gbl_do_col_info; - -/*--- Included file: packet-kerberos-val.h ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-val.h" #define id_krb5 "1.3.6.1.5.2" typedef enum _KERBEROS_AUTHDATA_TYPE_enum { @@ -806,9 +788,6 @@ typedef enum _KERBEROS_KRBFASTARMORTYPES_enum { KERBEROS_FX_FAST_ARMOR_AP_REQUEST = 1 } KERBEROS_KRBFASTARMORTYPES_enum; -/*--- End of included file: packet-kerberos-val.h ---*/ -#line 359 "./asn1/kerberos/packet-kerberos-template.c" - static void call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb) { @@ -4779,9 +4758,6 @@ dissect_krb5_AD_WIN2K_PAC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } -/*--- Included file: packet-kerberos-fn.c ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-fn.c" - static int dissect_kerberos_INTEGER_5(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -7811,9 +7787,6 @@ dissect_kerberos_PA_SPAKE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -/*--- End of included file: packet-kerberos-fn.c ---*/ -#line 4330 "./asn1/kerberos/packet-kerberos-template.c" - #ifdef HAVE_KERBEROS static const ber_sequence_t PA_ENC_TS_ENC_sequence[] = { { &hf_krb_patimestamp, BER_CLASS_CON, 0, 0, dissect_kerberos_KerberosTime }, @@ -8763,9 +8736,6 @@ void proto_register_kerberos(void) { FT_UINT32, BASE_DEC, NULL, 0, "Microseconds", HFILL }}, #endif /* HAVE_KERBEROS */ - -/*--- Included file: packet-kerberos-hfarr.c ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-hfarr.c" { &hf_kerberos_ticket, { "ticket", "kerberos.ticket_element", FT_NONE, BASE_NONE, NULL, 0, @@ -9686,9 +9656,6 @@ void proto_register_kerberos(void) { { "resource-based-constrained-delegation", "kerberos.PAC.OPTIONS.FLAGS.resource.based.constrained.delegation", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 5281 "./asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -9721,9 +9688,6 @@ void proto_register_kerberos(void) { &ett_kerberos_KrbFastReq, &ett_kerberos_FastOptions, #endif - -/*--- Included file: packet-kerberos-ettarr.c ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-ettarr.c" &ett_kerberos_Applications, &ett_kerberos_PrincipalName, &ett_kerberos_SEQUENCE_OF_KerberosString, @@ -9810,9 +9774,6 @@ void proto_register_kerberos(void) { &ett_kerberos_SPAKESecondFactor, &ett_kerberos_SPAKEResponse, &ett_kerberos_PA_SPAKE, - -/*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 5314 "./asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-kerberos.h b/epan/dissectors/packet-kerberos.h index 07e58d1e3e..dbba9d340a 100644 --- a/epan/dissectors/packet-kerberos.h +++ b/epan/dissectors/packet-kerberos.h @@ -3,9 +3,6 @@ /* packet-kerberos.h */ /* asn2wrs.py -b -L -p kerberos -c ./kerberos.cnf -s ./packet-kerberos-template -D . -O ../.. KerberosV5Spec2.asn k5.asn RFC3244.asn RFC6113.asn SPAKE.asn */ -/* Input file: packet-kerberos-template.h */ - -#line 1 "./asn1/kerberos/packet-kerberos-template.h" /* packet-kerberos.h * Routines for kerberos packet dissection * Copyright 2007, Anders Broman @@ -138,9 +135,6 @@ extern gboolean krb_decrypt; #endif /* __cplusplus */ -/*--- Included file: packet-kerberos-exp.h ---*/ -#line 1 "./asn1/kerberos/packet-kerberos-exp.h" - /* enumerated values for Applications */ #define KERBEROS_APPLICATIONS_TICKET 1 #define KERBEROS_APPLICATIONS_AUTHENTICATOR 2 @@ -164,7 +158,4 @@ int dissect_kerberos_TGT_REQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int dissect_kerberos_TGT_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-kerberos-exp.h ---*/ -#line 133 "./asn1/kerberos/packet-kerberos-template.h" - #endif /* __PACKET_KERBEROS_H */ diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c index 4860d0cecf..e74d18fd82 100644 --- a/epan/dissectors/packet-lcsap.c +++ b/epan/dissectors/packet-lcsap.c @@ -3,9 +3,6 @@ /* packet-lcsap.c */ /* asn2wrs.py -L -p lcsap -c ./lcsap.cnf -s ./packet-lcsap-template -D . -O ../.. LCS-AP-CommonDataTypes.asn LCS-AP-Constants.asn LCS-AP-Containers.asn LCS-AP-IEs.asn LCS-AP-PDU-Contents.asn LCS-AP-PDU-Descriptions.asn */ -/* Input file: packet-lcsap-template.c */ - -#line 1 "./asn1/lcsap/packet-lcsap-template.c" /* packet-lcsap.c * Routines for LCS-AP packet dissembly. * @@ -50,9 +47,6 @@ void proto_register_lcsap(void); void proto_reg_handoff_lcsap(void); #define SCTP_PORT_LCSAP 9082 - -/*--- Included file: packet-lcsap-val.h ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-val.h" #define max_No_Of_Points 15 #define max_Set 9 #define max_GNSS_Set 9 @@ -105,9 +99,6 @@ typedef enum _ProtocolIE_ID_enum { id_Coverage_Level = 31 } ProtocolIE_ID_enum; -/*--- End of included file: packet-lcsap-val.h ---*/ -#line 46 "./asn1/lcsap/packet-lcsap-template.c" - /* Initialize the protocol and registered fields */ static int proto_lcsap = -1; @@ -116,9 +107,6 @@ static int hf_lcsap_pos_usage = -1; static int hf_lcsap_gnss_pos_method = -1; static int hf_lcsap_gnss_id = -1; static int hf_lcsap_gnss_pos_usage = -1; - -/*--- Included file: packet-lcsap-hf.c ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-hf.c" static int hf_lcsap_APDU_PDU = -1; /* APDU */ static int hf_lcsap_Accuracy_Fulfillment_Indicator_PDU = -1; /* Accuracy_Fulfillment_Indicator */ static int hf_lcsap_Additional_PositioningDataSet_PDU = -1; /* Additional_PositioningDataSet */ @@ -265,18 +253,12 @@ static int hf_lcsap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_lcsap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_lcsap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-lcsap-hf.c ---*/ -#line 56 "./asn1/lcsap/packet-lcsap-template.c" - /* Initialize the subtree pointers */ static int ett_lcsap = -1; static int ett_lcsap_plmnd_id = -1; static int ett_lcsap_imsi = -1; static int ett_lcsap_civic_address = -1; - -/*--- Included file: packet-lcsap-ett.c ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-ett.c" static gint ett_lcsap_ProtocolIE_Container = -1; static gint ett_lcsap_ProtocolIE_Field = -1; static gint ett_lcsap_ProtocolExtensionContainer = -1; @@ -335,9 +317,6 @@ static gint ett_lcsap_InitiatingMessage = -1; static gint ett_lcsap_SuccessfulOutcome = -1; static gint ett_lcsap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-lcsap-ett.c ---*/ -#line 64 "./asn1/lcsap/packet-lcsap-template.c" - static expert_field ei_lcsap_civic_data_not_xml = EI_INIT; /* Global variables */ @@ -457,9 +436,6 @@ static const value_string lcsap_gnss_pos_usage_vals[] = { -/*--- Included file: packet-lcsap-fn.c ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-fn.c" - static const value_string lcsap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -2797,9 +2773,6 @@ static int dissect_LCS_AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-lcsap-fn.c ---*/ -#line 184 "./asn1/lcsap/packet-lcsap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint(lcsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; @@ -2853,9 +2826,6 @@ proto_reg_handoff_lcsap(void) xml_handle = find_dissector_add_dependency("xml", proto_lcsap); dissector_add_uint_with_preference("sctp.port", SCTP_PORT_LCSAP, lcsap_handle); dissector_add_uint("sctp.ppi", LCS_AP_PAYLOAD_PROTOCOL_ID, lcsap_handle); - -/*--- Included file: packet-lcsap-dis-tab.c ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-dis-tab.c" dissector_add_uint("lcsap.ies", id_Accuracy_Fulfillment_Indicator, create_dissector_handle(dissect_Accuracy_Fulfillment_Indicator_PDU, proto_lcsap)); dissector_add_uint("lcsap.ies", id_APDU, create_dissector_handle(dissect_APDU_PDU, proto_lcsap)); dissector_add_uint("lcsap.ies", id_Correlation_ID, create_dissector_handle(dissect_lcsap_Correlation_ID_PDU, proto_lcsap)); @@ -2904,9 +2874,6 @@ proto_reg_handoff_lcsap(void) dissector_add_uint("lcsap.proc.uout", id_Ciphering_Key_Data_Delivery, create_dissector_handle(dissect_Ciphering_Key_Data_Result_PDU, proto_lcsap)); -/*--- End of included file: packet-lcsap-dis-tab.c ---*/ -#line 239 "./asn1/lcsap/packet-lcsap-template.c" - } /*--- proto_register_lcsap -------------------------------------------*/ @@ -2941,9 +2908,6 @@ void proto_register_lcsap(void) { NULL, HFILL } }, - -/*--- Included file: packet-lcsap-hfarr.c ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-hfarr.c" { &hf_lcsap_APDU_PDU, { "APDU", "lcsap.APDU", FT_BYTES, BASE_NONE, NULL, 0, @@ -3524,9 +3488,6 @@ void proto_register_lcsap(void) { { "value", "lcsap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-lcsap-hfarr.c ---*/ -#line 275 "./asn1/lcsap/packet-lcsap-template.c" }; /* List of subtrees */ @@ -3535,9 +3496,6 @@ void proto_register_lcsap(void) { &ett_lcsap_plmnd_id, &ett_lcsap_imsi, &ett_lcsap_civic_address, - -/*--- Included file: packet-lcsap-ettarr.c ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-ettarr.c" &ett_lcsap_ProtocolIE_Container, &ett_lcsap_ProtocolIE_Field, &ett_lcsap_ProtocolExtensionContainer, @@ -3595,9 +3553,6 @@ void proto_register_lcsap(void) { &ett_lcsap_InitiatingMessage, &ett_lcsap_SuccessfulOutcome, &ett_lcsap_UnsuccessfulOutcome, - -/*--- End of included file: packet-lcsap-ettarr.c ---*/ -#line 284 "./asn1/lcsap/packet-lcsap-template.c" }; /* module_t *lcsap_module; */ diff --git a/epan/dissectors/packet-lcsap.h b/epan/dissectors/packet-lcsap.h index 814baa6a60..b8c3f449ab 100644 --- a/epan/dissectors/packet-lcsap.h +++ b/epan/dissectors/packet-lcsap.h @@ -3,9 +3,6 @@ /* packet-lcsap.h */ /* asn2wrs.py -L -p lcsap -c ./lcsap.cnf -s ./packet-lcsap-template -D . -O ../.. LCS-AP-CommonDataTypes.asn LCS-AP-Constants.asn LCS-AP-Containers.asn LCS-AP-IEs.asn LCS-AP-PDU-Contents.asn LCS-AP-PDU-Descriptions.asn */ -/* Input file: packet-lcsap-template.h */ - -#line 1 "./asn1/lcsap/packet-lcsap-template.h" /* packet-lcsap.c * Routines for LCS-AP packet dissembly. * @@ -23,13 +20,7 @@ #ifndef PACKET_LCSAP_H #define PACKET_LCSAP_H - -/*--- Included file: packet-lcsap-exp.h ---*/ -#line 1 "./asn1/lcsap/packet-lcsap-exp.h" int dissect_lcsap_Correlation_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lcsap_Positioning_Data_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-lcsap-exp.h ---*/ -#line 19 "./asn1/lcsap/packet-lcsap-template.h" - #endif /* PACKET_LCSAP_H */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index c2572d0a21..6b9817132a 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -3,9 +3,6 @@ /* packet-ldap.c */ /* asn2wrs.py -b -L -p ldap -c ./ldap.cnf -s ./packet-ldap-template -D . -O ../.. Lightweight-Directory-Access-Protocol-V3.asn */ -/* Input file: packet-ldap-template.c */ - -#line 1 "./asn1/ldap/packet-ldap-template.c" /* packet-ldap-template.c * Routines for ldap packet dissection * @@ -191,9 +188,6 @@ static int hf_ldap_incremental_value_flag = -1; static int hf_ldap_oid = -1; static int hf_ldap_gssapi_encrypted_payload = -1; - -/*--- Included file: packet-ldap-hf.c ---*/ -#line 1 "./asn1/ldap/packet-ldap-hf.c" static int hf_ldap_SearchControlValue_PDU = -1; /* SearchControlValue */ static int hf_ldap_SortKeyList_PDU = -1; /* SortKeyList */ static int hf_ldap_SortResult_PDU = -1; /* SortResult */ @@ -336,9 +330,6 @@ static int hf_ldap_timeBeforeExpiration = -1; /* INTEGER_0_maxInt */ static int hf_ldap_graceAuthNsRemaining = -1; /* INTEGER_0_maxInt */ static int hf_ldap_error = -1; /* T_error */ -/*--- End of included file: packet-ldap-hf.c ---*/ -#line 187 "./asn1/ldap/packet-ldap-template.c" - /* Initialize the subtree pointers */ static gint ett_ldap = -1; static gint ett_ldap_msg = -1; @@ -349,9 +340,6 @@ static gint ett_mscldap_ntver_flags = -1; static gint ett_mscldap_ipdetails = -1; static gint ett_ldap_DirSyncFlagsSubEntry = -1; - -/*--- Included file: packet-ldap-ett.c ---*/ -#line 1 "./asn1/ldap/packet-ldap-ett.c" static gint ett_ldap_LDAPMessage = -1; static gint ett_ldap_ProtocolOp = -1; static gint ett_ldap_AttributeDescriptionList = -1; @@ -408,9 +396,6 @@ static gint ett_ldap_SET_OF_SyncUUID = -1; static gint ett_ldap_PasswordPolicyResponseValue = -1; static gint ett_ldap_T_warning = -1; -/*--- End of included file: packet-ldap-ett.c ---*/ -#line 199 "./asn1/ldap/packet-ldap-template.c" - static expert_field ei_ldap_exceeded_filter_length = EI_INIT; static expert_field ei_ldap_too_many_filter_elements = EI_INIT; @@ -1121,9 +1106,6 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu return lcrp; } - -/*--- Included file: packet-ldap-fn.c ---*/ -#line 1 "./asn1/ldap/packet-ldap-fn.c" /*--- Cyclic dependencies ---*/ /* Filter -> Filter/and -> Filter/and/_item -> Filter */ @@ -3723,9 +3705,6 @@ static int dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_inf return offset; } - -/*--- End of included file: packet-ldap-fn.c ---*/ -#line 911 "./asn1/ldap/packet-ldap-template.c" static int dissect_LDAPMessage_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ldap_conv_info_t *ldap_info) { int offset = 0; @@ -4990,9 +4969,6 @@ void proto_register_ldap(void) { { "GSS-API Encrypted payload", "ldap.gssapi_encrypted_payload", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-ldap-hfarr.c ---*/ -#line 1 "./asn1/ldap/packet-ldap-hfarr.c" { &hf_ldap_SearchControlValue_PDU, { "SearchControlValue", "ldap.SearchControlValue_element", FT_NONE, BASE_NONE, NULL, 0, @@ -5557,9 +5533,6 @@ void proto_register_ldap(void) { { "error", "ldap.error", FT_UINT32, BASE_DEC, VALS(ldap_T_error_vals), 0, NULL, HFILL }}, - -/*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2176 "./asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5573,9 +5546,6 @@ void proto_register_ldap(void) { &ett_mscldap_ipdetails, &ett_ldap_DirSyncFlagsSubEntry, - -/*--- Included file: packet-ldap-ettarr.c ---*/ -#line 1 "./asn1/ldap/packet-ldap-ettarr.c" &ett_ldap_LDAPMessage, &ett_ldap_ProtocolOp, &ett_ldap_AttributeDescriptionList, @@ -5631,9 +5601,6 @@ void proto_register_ldap(void) { &ett_ldap_SET_OF_SyncUUID, &ett_ldap_PasswordPolicyResponseValue, &ett_ldap_T_warning, - -/*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2190 "./asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -5825,9 +5792,6 @@ proto_reg_handoff_ldap(void) dissector_add_string("ldap.name", "objectSid", create_dissector_handle(dissect_ldap_sid, proto_ldap)); dissector_add_string("ldap.name", "nTSecurityDescriptor", create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap)); - -/*--- Included file: packet-ldap-dis-tab.c ---*/ -#line 1 "./asn1/ldap/packet-ldap-dis-tab.c" register_ber_oid_dissector("1.2.840.113556.1.4.319", dissect_SearchControlValue_PDU, proto_ldap, "pagedResultsControl"); register_ber_oid_dissector("1.2.840.113556.1.4.473", dissect_SortKeyList_PDU, proto_ldap, "sortKeyList"); register_ber_oid_dissector("1.2.840.113556.1.4.474", dissect_SortResult_PDU, proto_ldap, "sortResult"); @@ -5841,9 +5805,6 @@ proto_reg_handoff_ldap(void) register_ber_oid_dissector("1.3.6.1.4.1.42.2.27.8.5.1", dissect_PasswordPolicyResponseValue_PDU, proto_ldap, "passwordPolicy"); -/*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2382 "./asn1/ldap/packet-ldap-template.c" - dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle); dissector_add_uint("acdr.tls_application_port", 636, ldap_handle); diff --git a/epan/dissectors/packet-ldap.h b/epan/dissectors/packet-ldap.h index a496dd73c5..b436b888dd 100644 --- a/epan/dissectors/packet-ldap.h +++ b/epan/dissectors/packet-ldap.h @@ -3,9 +3,6 @@ /* packet-ldap.h */ /* asn2wrs.py -b -L -p ldap -c ./ldap.cnf -s ./packet-ldap-template -D . -O ../.. Lightweight-Directory-Access-Protocol-V3.asn */ -/* Input file: packet-ldap-template.h */ - -#line 1 "./asn1/ldap/packet-ldap-template.h" /* packet-ldap.h * Routines for ros packet dissection * Copyright 2005, Anders Broman diff --git a/epan/dissectors/packet-lix2.c b/epan/dissectors/packet-lix2.c index 3d4e6b1185..bd81ed0e2d 100644 --- a/epan/dissectors/packet-lix2.c +++ b/epan/dissectors/packet-lix2.c @@ -3,9 +3,6 @@ /* packet-lix2.c */ /* asn2wrs.py -b -L -p lix2 -c ./lix2.cnf -s ./packet-lix2-template -D . -O ../.. lix2.asn */ -/* Input file: packet-lix2-template.c */ - -#line 1 "./asn1/lix2/packet-lix2-template.c" /* packet-lix2-template.c * Routines for Lawful Interception X2 xIRI event dissection * @@ -38,9 +35,6 @@ static int proto_lix2 = -1; static dissector_handle_t lix2_handle = NULL; - -/*--- Included file: packet-lix2-hf.c ---*/ -#line 1 "./asn1/lix2/packet-lix2-hf.c" static int hf_lix2_XIRIPayload_PDU = -1; /* XIRIPayload */ static int hf_lix2_xIRIPayloadOID = -1; /* RELATIVE_OID */ static int hf_lix2_event = -1; /* XIRIEvent */ @@ -738,12 +732,6 @@ static int hf_lix2_uncertainty_02 = -1; /* SpeedUncertainty */ static int hf_lix2_hUncertainty = -1; /* SpeedUncertainty */ static int hf_lix2_vUncertainty = -1; /* SpeedUncertainty */ -/*--- End of included file: packet-lix2-hf.c ---*/ -#line 34 "./asn1/lix2/packet-lix2-template.c" - - -/*--- Included file: packet-lix2-ett.c ---*/ -#line 1 "./asn1/lix2/packet-lix2-ett.c" static gint ett_lix2_XIRIPayload = -1; static gint ett_lix2_XIRIEvent = -1; static gint ett_lix2_IRIPayload = -1; @@ -990,12 +978,6 @@ static gint ett_lix2_HorizontalWithVerticalVelocity = -1; static gint ett_lix2_HorizontalVelocityWithUncertainty = -1; static gint ett_lix2_HorizontalWithVerticalVelocityAndUncertainty = -1; -/*--- End of included file: packet-lix2-ett.c ---*/ -#line 36 "./asn1/lix2/packet-lix2-template.c" - - -/*--- Included file: packet-lix2-fn.c ---*/ -#line 1 "./asn1/lix2/packet-lix2-fn.c" static int @@ -9086,17 +9068,11 @@ static int dissect_XIRIPayload_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr } -/*--- End of included file: packet-lix2-fn.c ---*/ -#line 38 "./asn1/lix2/packet-lix2-template.c" - /*--- proto_register_lix2 -------------------------------------------*/ void proto_register_lix2(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-lix2-hfarr.c ---*/ -#line 1 "./asn1/lix2/packet-lix2-hfarr.c" { &hf_lix2_XIRIPayload_PDU, { "XIRIPayload", "lix2.XIRIPayload_element", FT_NONE, BASE_NONE, NULL, 0, @@ -11881,16 +11857,10 @@ void proto_register_lix2(void) { { "vUncertainty", "lix2.vUncertainty", FT_STRING, BASE_NONE, NULL, 0, "SpeedUncertainty", HFILL }}, - -/*--- End of included file: packet-lix2-hfarr.c ---*/ -#line 45 "./asn1/lix2/packet-lix2-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-lix2-ettarr.c ---*/ -#line 1 "./asn1/lix2/packet-lix2-ettarr.c" &ett_lix2_XIRIPayload, &ett_lix2_XIRIEvent, &ett_lix2_IRIPayload, @@ -12136,9 +12106,6 @@ void proto_register_lix2(void) { &ett_lix2_HorizontalWithVerticalVelocity, &ett_lix2_HorizontalVelocityWithUncertainty, &ett_lix2_HorizontalWithVerticalVelocityAndUncertainty, - -/*--- End of included file: packet-lix2-ettarr.c ---*/ -#line 50 "./asn1/lix2/packet-lix2-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-lnpdqp.c b/epan/dissectors/packet-lnpdqp.c index 0d3f123382..f4c2f3576e 100644 --- a/epan/dissectors/packet-lnpdqp.c +++ b/epan/dissectors/packet-lnpdqp.c @@ -3,9 +3,6 @@ /* packet-lnpdqp.c */ /* asn2wrs.py -b -L -p lnpdqp -c ./lnpdqp.cnf -s ./packet-lnpdqp-template -D . -O ../.. LNPDQP.asn */ -/* Input file: packet-lnpdqp-template.c */ - -#line 1 "./asn1/lnpdqp/packet-lnpdqp-template.c" /* packet-lnpdqp-template.c * Routines for Local Number Portability Database Query Protocol dissection * @@ -62,9 +59,6 @@ static int hf_lnpdqp_callingPartyANI = -1; /* Digits */ static int hf_lnpdqp_originatingLATA = -1; /* Digits */ static int hf_lnpdqp_carrierID = -1; /* Digits */ - -/*--- Included file: packet-lnpdqp-hf.c ---*/ -#line 1 "./asn1/lnpdqp/packet-lnpdqp-hf.c" static int hf_lnpdqp_ConnectionControlArg_PDU = -1; /* ConnectionControlArg */ static int hf_lnpdqp_ProvideInstructionArg_PDU = -1; /* ProvideInstructionArg */ static int hf_lnpdqp_digits = -1; /* Digits */ @@ -72,22 +66,13 @@ static int hf_lnpdqp_billingIndicators = -1; /* BillingIndicators */ static int hf_lnpdqp_calledPartyNumber = -1; /* ServiceKey */ static int hf_lnpdqp_oli = -1; /* OriginatingStationType */ -/*--- End of included file: packet-lnpdqp-hf.c ---*/ -#line 58 "./asn1/lnpdqp/packet-lnpdqp-template.c" - static int ett_lnpdqp = -1; static int ett_lnpdqp_digitstype = -1; static int ett_lnpdqp_digits = -1; - -/*--- Included file: packet-lnpdqp-ett.c ---*/ -#line 1 "./asn1/lnpdqp/packet-lnpdqp-ett.c" static gint ett_lnpdqp_ConnectionControlArg_U = -1; static gint ett_lnpdqp_ProvideInstructionArg_U = -1; static gint ett_lnpdqp_ServiceKey = -1; -/*--- End of included file: packet-lnpdqp-ett.c ---*/ -#line 63 "./asn1/lnpdqp/packet-lnpdqp-template.c" - /* Type of Digits (octet 1, bits A-H) */ static const value_string lnpdqp_type_of_digits_vals[] = { @@ -240,9 +225,6 @@ dissect_lnpdqp_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr -/*--- Included file: packet-lnpdqp-fn.c ---*/ -#line 1 "./asn1/lnpdqp/packet-lnpdqp-fn.c" - static int dissect_lnpdqp_Digits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -392,9 +374,6 @@ static int dissect_ProvideInstructionArg_PDU(tvbuff_t *tvb _U_, packet_info *pin } -/*--- End of included file: packet-lnpdqp-fn.c ---*/ -#line 216 "./asn1/lnpdqp/packet-lnpdqp-template.c" - static int dissect_lnpdqp_cc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) { @@ -491,9 +470,6 @@ void proto_register_lnpdqp(void) { FT_BYTES, BASE_NONE, NULL, 0, "Digits", HFILL }}, - -/*--- Included file: packet-lnpdqp-hfarr.c ---*/ -#line 1 "./asn1/lnpdqp/packet-lnpdqp-hfarr.c" { &hf_lnpdqp_ConnectionControlArg_PDU, { "ConnectionControlArg", "lnpdqp.ConnectionControlArg_element", FT_NONE, BASE_NONE, NULL, 0, @@ -518,9 +494,6 @@ void proto_register_lnpdqp(void) { { "oli", "lnpdqp.oli", FT_UINT8, BASE_DEC, VALS(lnpdqp_OriginatingStationType_vals), 0, "OriginatingStationType", HFILL }}, - -/*--- End of included file: packet-lnpdqp-hfarr.c ---*/ -#line 314 "./asn1/lnpdqp/packet-lnpdqp-template.c" }; /* List of subtrees */ @@ -529,15 +502,9 @@ void proto_register_lnpdqp(void) { &ett_lnpdqp_digitstype, &ett_lnpdqp_digits, - -/*--- Included file: packet-lnpdqp-ettarr.c ---*/ -#line 1 "./asn1/lnpdqp/packet-lnpdqp-ettarr.c" &ett_lnpdqp_ConnectionControlArg_U, &ett_lnpdqp_ProvideInstructionArg_U, &ett_lnpdqp_ServiceKey, - -/*--- End of included file: packet-lnpdqp-ettarr.c ---*/ -#line 323 "./asn1/lnpdqp/packet-lnpdqp-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index ac37a0d0ab..efc5ea0371 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -3,9 +3,6 @@ /* packet-logotypecertextn.c */ /* asn2wrs.py -b -L -p logotypecertextn -c ./logotypecertextn.cnf -s ./packet-logotypecertextn-template -D . -O ../.. LogotypeCertExtn.asn */ -/* Input file: packet-logotypecertextn-template.c */ - -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" /* packet-logotypecertextn.c * Routines for RFC3709 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 @@ -34,9 +31,6 @@ void proto_reg_handoff_logotypecertextn(void); /* Initialize the protocol and registered fields */ static int proto_logotypecertextn = -1; - -/*--- Included file: packet-logotypecertextn-hf.c ---*/ -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-hf.c" static int hf_logotypecertextn_LogotypeExtn_PDU = -1; /* LogotypeExtn */ static int hf_logotypecertextn_communityLogos = -1; /* SEQUENCE_OF_LogotypeInfo */ static int hf_logotypecertextn_communityLogos_item = -1; /* LogotypeInfo */ @@ -79,13 +73,7 @@ static int hf_logotypecertextn_refStructURI_item = -1; /* T_refStructURI_item * static int hf_logotypecertextn_hashAlg = -1; /* AlgorithmIdentifier */ static int hf_logotypecertextn_hashValue = -1; /* OCTET_STRING */ -/*--- End of included file: packet-logotypecertextn-hf.c ---*/ -#line 30 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-logotypecertextn-ett.c ---*/ -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-ett.c" static gint ett_logotypecertextn_LogotypeExtn = -1; static gint ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo = -1; static gint ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo = -1; @@ -106,15 +94,9 @@ static gint ett_logotypecertextn_LogotypeReference = -1; static gint ett_logotypecertextn_T_refStructURI = -1; static gint ett_logotypecertextn_HashAlgAndValue = -1; -/*--- End of included file: packet-logotypecertextn-ett.c ---*/ -#line 33 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" -/*--- Included file: packet-logotypecertextn-fn.c ---*/ -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-fn.c" - - static int dissect_logotypecertextn_IA5String(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -501,18 +483,12 @@ static int dissect_LogotypeExtn_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-logotypecertextn-fn.c ---*/ -#line 36 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" - /*--- proto_register_logotypecertextn ----------------------------------------------*/ void proto_register_logotypecertextn(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-logotypecertextn-hfarr.c ---*/ -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-hfarr.c" { &hf_logotypecertextn_LogotypeExtn_PDU, { "LogotypeExtn", "logotypecertextn.LogotypeExtn_element", FT_NONE, BASE_NONE, NULL, 0, @@ -677,16 +653,10 @@ void proto_register_logotypecertextn(void) { { "hashValue", "logotypecertextn.hashValue", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - -/*--- End of included file: packet-logotypecertextn-hfarr.c ---*/ -#line 44 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-logotypecertextn-ettarr.c ---*/ -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-ettarr.c" &ett_logotypecertextn_LogotypeExtn, &ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo, &ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo, @@ -706,9 +676,6 @@ void proto_register_logotypecertextn(void) { &ett_logotypecertextn_LogotypeReference, &ett_logotypecertextn_T_refStructURI, &ett_logotypecertextn_HashAlgAndValue, - -/*--- End of included file: packet-logotypecertextn-ettarr.c ---*/ -#line 49 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* Register protocol */ @@ -723,15 +690,9 @@ void proto_register_logotypecertextn(void) { /*--- proto_reg_handoff_logotypecertextn -------------------------------------------*/ void proto_reg_handoff_logotypecertextn(void) { - -/*--- Included file: packet-logotypecertextn-dis-tab.c ---*/ -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.12", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logotype"); register_ber_oid_dissector("1.3.6.1.5.5.7.20.1", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-loyalty"); register_ber_oid_dissector("1.3.6.1.5.5.7.20.2", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-background"); - -/*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/ -#line 64 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" } diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h index 267436c6fa..b774d5aac6 100644 --- a/epan/dissectors/packet-logotypecertextn.h +++ b/epan/dissectors/packet-logotypecertextn.h @@ -3,9 +3,6 @@ /* packet-logotypecertextn.h */ /* asn2wrs.py -b -L -p logotypecertextn -c ./logotypecertextn.cnf -s ./packet-logotypecertextn-template -D . -O ../.. LogotypeCertExtn.asn */ -/* Input file: packet-logotypecertextn-template.h */ - -#line 1 "./asn1/logotypecertextn/packet-logotypecertextn-template.h" /* packet-logotypecertextn.h * Routines for RFC3907 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 94ba81379c..13ccae9cb9 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -3,9 +3,6 @@ /* packet-lpp.c */ /* asn2wrs.py -L -p lpp -c ./lpp.cnf -s ./packet-lpp-template -D . -O ../.. LPP-PDU-Definitions.asn LPP-Broadcast-Definitions.asn */ -/* Input file: packet-lpp-template.c */ - -#line 1 "./asn1/lpp/packet-lpp-template.c" /* packet-lpp.c * Routines for 3GPP LTE Positioning Protocol (LPP) packet dissection * Copyright 2011-2022 Pascal Quantin @@ -42,9 +39,6 @@ void proto_reg_handoff_lpp(void); /* Initialize the protocol and registered fields */ static int proto_lpp = -1; - -/*--- Included file: packet-lpp-hf.c ---*/ -#line 1 "./asn1/lpp/packet-lpp-hf.c" static int hf_lpp_LPP_Message_PDU = -1; /* LPP_Message */ static int hf_lpp_lpp_Ellipsoid_Point_PDU = -1; /* Ellipsoid_Point */ static int hf_lpp_lpp_Ellipsoid_PointWithUncertaintyCircle_PDU = -1; /* Ellipsoid_PointWithUncertaintyCircle */ @@ -2828,9 +2822,6 @@ static int hf_lpp_T_nr_UE_RxTx_TEG_ID_ReportingSupport_r17_case1 = -1; static int hf_lpp_T_nr_UE_RxTx_TEG_ID_ReportingSupport_r17_case2 = -1; static int hf_lpp_T_nr_UE_RxTx_TEG_ID_ReportingSupport_r17_case3 = -1; static int dummy_hf_lpp_eag_field = -1; /* never registered */ - -/*--- End of included file: packet-lpp-hf.c ---*/ -#line 38 "./asn1/lpp/packet-lpp-template.c" static int hf_lpp_svHealthExt_v1240_e5bhs = -1; static int hf_lpp_svHealthExt_v1240_e1_bhs = -1; static int hf_lpp_kepSV_StatusINAV_e5bhs = -1; @@ -2853,9 +2844,6 @@ static gint ett_kepSV_StatusINAV = -1; static gint ett_kepSV_StatusFNAV = -1; static gint ett_lpp_bdsSvHealth_r12 = -1; static gint ett_lpp_assistanceDataElement_r15 = -1; - -/*--- Included file: packet-lpp-ett.c ---*/ -#line 1 "./asn1/lpp/packet-lpp-ett.c" static gint ett_lpp_LPP_Message = -1; static gint ett_lpp_Acknowledgement = -1; static gint ett_lpp_LPP_MessageBody = -1; @@ -3752,13 +3740,7 @@ static gint ett_lpp_OTDOA_UE_Assisted_r15 = -1; static gint ett_lpp_NR_UEB_TRP_LocationData_r16 = -1; static gint ett_lpp_NR_UEB_TRP_RTD_Info_r16 = -1; -/*--- End of included file: packet-lpp-ett.c ---*/ -#line 61 "./asn1/lpp/packet-lpp-template.c" - /* Include constants */ - -/*--- Included file: packet-lpp-val.h ---*/ -#line 1 "./asn1/lpp/packet-lpp-val.h" #define maxEPDU 16 #define maxAddPRSconfig_r14 2 #define maxAvailNarrowBands_Minus1_r14 15 @@ -3824,9 +3806,6 @@ typedef enum _T_GNSS_ID_enum { T_GNSS_ID_NAVIC_V1610 = 6 } T_GNSS_ID_enum; -/*--- End of included file: packet-lpp-val.h ---*/ -#line 64 "./asn1/lpp/packet-lpp-template.c" - static const value_string lpp_ePDU_ID_vals[] = { { 1, "OMA LPP extensions (LPPe)"}, { 0, NULL} @@ -5815,9 +5794,6 @@ const unit_name_string units_dbhz = { "dB-Hz", NULL }; const unit_name_string units_pa = { "Pa", NULL }; -/*--- Included file: packet-lpp-fn.c ---*/ -#line 1 "./asn1/lpp/packet-lpp-fn.c" - static const value_string lpp_Initiator_vals[] = { { 0, "locationServer" }, { 1, "targetDevice" }, @@ -33193,9 +33169,6 @@ static int dissect_NR_UEB_TRP_RTD_Info_r16_PDU(tvbuff_t *tvb _U_, packet_info *p } -/*--- End of included file: packet-lpp-fn.c ---*/ -#line 2053 "./asn1/lpp/packet-lpp-template.c" - int dissect_lpp_AssistanceDataSIBelement_r15_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, lpp_pos_sib_type_t pos_sib_type) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -33225,9 +33198,6 @@ void proto_register_lpp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-lpp-hfarr.c ---*/ -#line 1 "./asn1/lpp/packet-lpp-hfarr.c" { &hf_lpp_LPP_Message_PDU, { "LPP-Message", "lpp.LPP_Message_element", FT_NONE, BASE_NONE, NULL, 0, @@ -44352,9 +44322,6 @@ void proto_register_lpp(void) { { "case3", "lpp.T.nr.UE.RxTx.TEG.ID.ReportingSupport.r17.case3", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-lpp-hfarr.c ---*/ -#line 2084 "./asn1/lpp/packet-lpp-template.c" { &hf_lpp_svHealthExt_v1240_e5bhs, { "E5b Signal Health Status", "lpp.svHealthExt_v1240.e5bhs", FT_UINT8, BASE_DEC, VALS(lpp_signal_health_status_vals), 0, @@ -44405,9 +44372,6 @@ void proto_register_lpp(void) { &ett_kepSV_StatusFNAV, &ett_lpp_bdsSvHealth_r12, &ett_lpp_assistanceDataElement_r15, - -/*--- Included file: packet-lpp-ettarr.c ---*/ -#line 1 "./asn1/lpp/packet-lpp-ettarr.c" &ett_lpp_LPP_Message, &ett_lpp_Acknowledgement, &ett_lpp_LPP_MessageBody, @@ -45303,9 +45267,6 @@ void proto_register_lpp(void) { &ett_lpp_OTDOA_UE_Assisted_r15, &ett_lpp_NR_UEB_TRP_LocationData_r16, &ett_lpp_NR_UEB_TRP_RTD_Info_r16, - -/*--- End of included file: packet-lpp-ettarr.c ---*/ -#line 2135 "./asn1/lpp/packet-lpp-template.c" }; diff --git a/epan/dissectors/packet-lpp.h b/epan/dissectors/packet-lpp.h index 0e4eeaaf27..b06411fa3e 100644 --- a/epan/dissectors/packet-lpp.h +++ b/epan/dissectors/packet-lpp.h @@ -3,9 +3,6 @@ /* packet-lpp.h */ /* asn2wrs.py -L -p lpp -c ./lpp.cnf -s ./packet-lpp-template -D . -O ../.. LPP-PDU-Definitions.asn LPP-Broadcast-Definitions.asn */ -/* Input file: packet-lpp-template.h */ - -#line 1 "./asn1/lpp/packet-lpp-template.h" /* packet-lpp.h * Routines for 3GPP LTE Positioning Protocol (LPP) packet dissection * Copyright 2011-2022 Pascal Quantin @@ -71,9 +68,6 @@ typedef enum { int dissect_lpp_AssistanceDataSIBelement_r15_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, lpp_pos_sib_type_t pos_sib_type); - -/*--- Included file: packet-lpp-exp.h ---*/ -#line 1 "./asn1/lpp/packet-lpp-exp.h" extern const value_string lpp_Velocity_vals[]; int dissect_lpp_ARFCN_ValueEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_lpp_ARFCN_ValueEUTRA_v9a0(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -112,7 +106,4 @@ int dissect_lpp_Sensor_MeasurementInformation_r13_PDU(tvbuff_t *tvb _U_, packet_ int dissect_lpp_Sensor_MotionInformation_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lpp_DisplacementTimeStamp_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-lpp-exp.h ---*/ -#line 67 "./asn1/lpp/packet-lpp-template.h" - #endif /* PACKET_LPP_H */ diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c index 2868416f5c..ad94bc412e 100644 --- a/epan/dissectors/packet-lppa.c +++ b/epan/dissectors/packet-lppa.c @@ -3,9 +3,6 @@ /* packet-lppa.c */ /* asn2wrs.py -L -p lppa -c ./lppa.cnf -s ./packet-lppa-template -D . -O ../.. LPPA-CommonDataTypes.asn LPPA-Constants.asn LPPA-Containers.asn LPPA-IEs.asn LPPA-PDU-Contents.asn LPPA-PDU-Descriptions.asn */ -/* Input file: packet-lppa-template.c */ - -#line 1 "./asn1/lppa/packet-lppa-template.c" /* packet-lppa.c * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection * Copyright 2011-2019, Pascal Quantin @@ -39,9 +36,6 @@ void proto_reg_handoff_lppa(void); /* Initialize the protocol and registered fields */ static int proto_lppa = -1; - -/*--- Included file: packet-lppa-hf.c ---*/ -#line 1 "./asn1/lppa/packet-lppa-hf.c" static int hf_lppa_Add_OTDOACells_PDU = -1; /* Add_OTDOACells */ static int hf_lppa_Assistance_Information_PDU = -1; /* Assistance_Information */ static int hf_lppa_AssistanceInformationFailureList_PDU = -1; /* AssistanceInformationFailureList */ @@ -294,14 +288,8 @@ static int hf_lppa_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_lppa_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_lppa_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-lppa-hf.c ---*/ -#line 35 "./asn1/lppa/packet-lppa-template.c" - /* Initialize the subtree pointers */ static gint ett_lppa = -1; - -/*--- Included file: packet-lppa-ett.c ---*/ -#line 1 "./asn1/lppa/packet-lppa-ett.c" static gint ett_lppa_PrivateIE_ID = -1; static gint ett_lppa_ProtocolIE_Container = -1; static gint ett_lppa_ProtocolIE_Field = -1; @@ -400,9 +388,6 @@ static gint ett_lppa_InitiatingMessage = -1; static gint ett_lppa_SuccessfulOutcome = -1; static gint ett_lppa_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-lppa-ett.c ---*/ -#line 39 "./asn1/lppa/packet-lppa-template.c" - enum { INITIATING_MESSAGE, SUCCESSFUL_OUTCOME, @@ -417,9 +402,6 @@ static dissector_table_t lppa_proc_sout_dissector_table; static dissector_table_t lppa_proc_uout_dissector_table; /* Include constants */ - -/*--- Included file: packet-lppa-val.h ---*/ -#line 1 "./asn1/lppa/packet-lppa-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -487,9 +469,6 @@ typedef enum _ProtocolIE_ID_enum { id_NR_CGI = 27 } ProtocolIE_ID_enum; -/*--- End of included file: packet-lppa-val.h ---*/ -#line 55 "./asn1/lppa/packet-lppa-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); @@ -515,9 +494,6 @@ lppa_get_private_data(packet_info* pinfo) } -/*--- Included file: packet-lppa-fn.c ---*/ -#line 1 "./asn1/lppa/packet-lppa-fn.c" - static const value_string lppa_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -4324,9 +4300,6 @@ static int dissect_LPPA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-lppa-fn.c ---*/ -#line 81 "./asn1/lppa/packet-lppa-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -4380,9 +4353,6 @@ void proto_register_lppa(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-lppa-hfarr.c ---*/ -#line 1 "./asn1/lppa/packet-lppa-hfarr.c" { &hf_lppa_Add_OTDOACells_PDU, { "Add-OTDOACells", "lppa.Add_OTDOACells", FT_UINT32, BASE_DEC, NULL, 0, @@ -5387,17 +5357,11 @@ void proto_register_lppa(void) { { "value", "lppa.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-lppa-hfarr.c ---*/ -#line 136 "./asn1/lppa/packet-lppa-template.c" }; /* List of subtrees */ static gint* ett[] = { &ett_lppa, - -/*--- Included file: packet-lppa-ettarr.c ---*/ -#line 1 "./asn1/lppa/packet-lppa-ettarr.c" &ett_lppa_PrivateIE_ID, &ett_lppa_ProtocolIE_Container, &ett_lppa_ProtocolIE_Field, @@ -5495,9 +5459,6 @@ void proto_register_lppa(void) { &ett_lppa_InitiatingMessage, &ett_lppa_SuccessfulOutcome, &ett_lppa_UnsuccessfulOutcome, - -/*--- End of included file: packet-lppa-ettarr.c ---*/ -#line 142 "./asn1/lppa/packet-lppa-template.c" }; /* Register protocol */ @@ -5520,9 +5481,6 @@ void proto_register_lppa(void) { void proto_reg_handoff_lppa(void) { - -/*--- Included file: packet-lppa-dis-tab.c ---*/ -#line 1 "./asn1/lppa/packet-lppa-dis-tab.c" dissector_add_uint("lppa.ies", id_MeasurementQuantities_Item, create_dissector_handle(dissect_MeasurementQuantities_Item_PDU, proto_lppa)); dissector_add_uint("lppa.ies", id_ReportCharacteristics, create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_lppa)); dissector_add_uint("lppa.ies", id_MeasurementPeriodicity, create_dissector_handle(dissect_MeasurementPeriodicity_PDU, proto_lppa)); @@ -5568,7 +5526,4 @@ proto_reg_handoff_lppa(void) dissector_add_uint("lppa.proc.imsg", id_assistanceInformationControl, create_dissector_handle(dissect_AssistanceInformationControl_PDU, proto_lppa)); dissector_add_uint("lppa.proc.imsg", id_assistanceInformationFeedback, create_dissector_handle(dissect_AssistanceInformationFeedback_PDU, proto_lppa)); - -/*--- End of included file: packet-lppa-dis-tab.c ---*/ -#line 165 "./asn1/lppa/packet-lppa-template.c" } diff --git a/epan/dissectors/packet-lppa.h b/epan/dissectors/packet-lppa.h index 73656d9b75..f7e2b0f3a2 100644 --- a/epan/dissectors/packet-lppa.h +++ b/epan/dissectors/packet-lppa.h @@ -3,9 +3,6 @@ /* packet-lppa.h */ /* asn2wrs.py -L -p lppa -c ./lppa.cnf -s ./packet-lppa-template -D . -O ../.. LPPA-CommonDataTypes.asn LPPA-Constants.asn LPPA-Containers.asn LPPA-IEs.asn LPPA-PDU-Contents.asn LPPA-PDU-Descriptions.asn */ -/* Input file: packet-lppa-template.h */ - -#line 1 "./asn1/lppa/packet-lppa-template.h" /* packet-lppa.h * Routines for 3GPP LTE Positioning Protocol A (LLPa) packet dissection * @@ -28,12 +25,6 @@ typedef struct _lppa_ctx_t { -/*--- Included file: packet-lppa-exp.h ---*/ -#line 1 "./asn1/lppa/packet-lppa-exp.h" - -/*--- End of included file: packet-lppa-exp.h ---*/ -#line 23 "./asn1/lppa/packet-lppa-template.h" - #endif /* PACKET_LPPA_H */ /* diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index b1174f8c74..c8ba02771f 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -3,9 +3,6 @@ /* packet-lppe.c */ /* asn2wrs.py -L -p lppe -c ./lppe.cnf -s ./packet-lppe-template -D . -O ../.. LPPe.asn */ -/* Input file: packet-lppe-template.c */ - -#line 1 "./asn1/lppe/packet-lppe-template.c" /* packet-lppe.c * Routines for LPP Extensions (LLPe) packet dissection * Copyright 2012-2021, Pascal Quantin @@ -45,9 +42,6 @@ static int proto_lppe = -1; static dissector_handle_t xml_handle; - -/*--- Included file: packet-lppe-hf.c ---*/ -#line 1 "./asn1/lppe/packet-lppe-hf.c" static int hf_lppe_OMA_LPPe_MessageExtension_PDU = -1; /* OMA_LPPe_MessageExtension */ static int hf_lppe_lppeCompatibilityLevel = -1; /* OMA_LPPe_LPPeCompatibilityLevel */ static int hf_lppe_lppeVersion = -1; /* OMA_LPPe_LPPeVersion */ @@ -1668,15 +1662,9 @@ static int hf_lppe_T_supportedAssistanceData_antennaPattern = -1; static int hf_lppe_T_srnMeasurements_rssi = -1; static int hf_lppe_T_srnMeasurements_rtd = -1; -/*--- End of included file: packet-lppe-hf.c ---*/ -#line 41 "./asn1/lppe/packet-lppe-template.c" - /* Initialize the subtree pointers */ static gint ett_lppe = -1; static gint ett_lppe_civicLocation = -1; - -/*--- Included file: packet-lppe-ett.c ---*/ -#line 1 "./asn1/lppe/packet-lppe-ett.c" static gint ett_lppe_OMA_LPPe_MessageExtension = -1; static gint ett_lppe_OMA_LPPe_LPPeVersion = -1; static gint ett_lppe_OMA_LPPe_MessageExtensionBody = -1; @@ -2315,13 +2303,7 @@ static gint ett_lppe_OMA_LPPe_SRN_Technologies = -1; static gint ett_lppe_OMA_LPPe_SRN_MeasurementMask = -1; static gint ett_lppe_T_srnMeasurements = -1; -/*--- End of included file: packet-lppe-ett.c ---*/ -#line 46 "./asn1/lppe/packet-lppe-template.c" - /* Include constants */ - -/*--- Included file: packet-lppe-val.h ---*/ -#line 1 "./asn1/lppe/packet-lppe-val.h" #define maxAssistanceContainerList 16 #define maxLocationInformationContainerDataList 10 #define maxVendorOrOperatorIDList 32 @@ -2354,14 +2336,8 @@ static gint ett_lppe_T_srnMeasurements = -1; #define maxWimaxBSMeas 32 #define maxChannels 512 -/*--- End of included file: packet-lppe-val.h ---*/ -#line 49 "./asn1/lppe/packet-lppe-template.c" - -/*--- Included file: packet-lppe-fn.c ---*/ -#line 1 "./asn1/lppe/packet-lppe-fn.c" - static int dissect_lppe_OMA_LPPe_LPPeCompatibilityLevel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -15895,9 +15871,6 @@ static int dissect_OMA_LPPe_MessageExtension_PDU(tvbuff_t *tvb _U_, packet_info } -/*--- End of included file: packet-lppe-fn.c ---*/ -#line 52 "./asn1/lppe/packet-lppe-template.c" - /*--- proto_register_lpp -------------------------------------------*/ void proto_register_lppe(void) { @@ -15905,9 +15878,6 @@ void proto_register_lppe(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-lppe-hfarr.c ---*/ -#line 1 "./asn1/lppe/packet-lppe-hfarr.c" { &hf_lppe_OMA_LPPe_MessageExtension_PDU, { "OMA-LPPe-MessageExtension", "lppe.OMA_LPPe_MessageExtension_element", FT_NONE, BASE_NONE, NULL, 0, @@ -22380,18 +22350,12 @@ void proto_register_lppe(void) { { "rtd", "lppe.T.srnMeasurements.rtd", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-lppe-hfarr.c ---*/ -#line 61 "./asn1/lppe/packet-lppe-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_lppe, &ett_lppe_civicLocation, - -/*--- Included file: packet-lppe-ettarr.c ---*/ -#line 1 "./asn1/lppe/packet-lppe-ettarr.c" &ett_lppe_OMA_LPPe_MessageExtension, &ett_lppe_OMA_LPPe_LPPeVersion, &ett_lppe_OMA_LPPe_MessageExtensionBody, @@ -23029,9 +22993,6 @@ void proto_register_lppe(void) { &ett_lppe_OMA_LPPe_SRN_Technologies, &ett_lppe_OMA_LPPe_SRN_MeasurementMask, &ett_lppe_T_srnMeasurements, - -/*--- End of included file: packet-lppe-ettarr.c ---*/ -#line 68 "./asn1/lppe/packet-lppe-template.c" }; diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 01078e22a6..2568f0faf5 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -3,9 +3,6 @@ /* packet-lte-rrc.c */ /* asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../.. EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn PC5-RRC-Definitions.asn NBIOT-InterNodeDefinitions.asn NBIOT-RRC-Definitions.asn */ -/* Input file: packet-lte-rrc-template.c */ - -#line 1 "./asn1/lte-rrc/packet-lte-rrc-template.c" /* packet-lte-rrc-template.c * Routines for Evolved Universal Terrestrial Radio Access (E-UTRA); * Radio Resource Control (RRC) protocol specification @@ -81,9 +78,6 @@ extern int proto_pdcp_lte; /* Include constants */ - -/*--- Included file: packet-lte-rrc-val.h ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-val.h" #define maxReestabInfo 32 #define maxAccessCat_1_r15 63 #define maxACDC_Cat_r13 16 @@ -319,15 +313,9 @@ typedef enum _SI_OrPSI_GERAN_enum { SI_OrPSI_GERAN_psi = 1 } SI_OrPSI_GERAN_enum; -/*--- End of included file: packet-lte-rrc-val.h ---*/ -#line 77 "./asn1/lte-rrc/packet-lte-rrc-template.c" - /* Initialize the protocol and registered fields */ static int proto_lte_rrc = -1; - -/*--- Included file: packet-lte-rrc-hf.c ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-hf.c" static int hf_lte_rrc_lte_rrc_HandoverCommand_PDU = -1; /* HandoverCommand */ static int hf_lte_rrc_lte_rrc_HandoverPreparationInformation_PDU = -1; /* HandoverPreparationInformation */ static int hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU = -1; /* SCG_Config_r12 */ @@ -9119,9 +9107,6 @@ static int hf_lte_rrc_physCellId_r14 = -1; /* PhysCellId */ static int hf_lte_rrc_carrierFreq_r14 = -1; /* CarrierFreq_NB_r13 */ static int dummy_hf_lte_rrc_eag_field = -1; /* never registered */ -/*--- End of included file: packet-lte-rrc-hf.c ---*/ -#line 82 "./asn1/lte-rrc/packet-lte-rrc-template.c" - static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1; static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1; static int hf_lte_rrc_eutra_cap_feat_group_ind_3 = -1; @@ -9314,9 +9299,6 @@ static int hf_lte_rrc_measGapPatterns_r15_bit8 = -1; /* Initialize the subtree pointers */ static int ett_lte_rrc = -1; - -/*--- Included file: packet-lte-rrc-ett.c ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-ett.c" static gint ett_lte_rrc_HandoverCommand = -1; static gint ett_lte_rrc_T_criticalExtensions = -1; static gint ett_lte_rrc_T_c1 = -1; @@ -13189,9 +13171,6 @@ static gint ett_lte_rrc_T_schedulingPeriodStartOffsetSCPTM_r14_03 = -1; static gint ett_lte_rrc_SCPTM_NeighbourCellList_NB_r14 = -1; static gint ett_lte_rrc_PCI_ARFCN_NB_r14 = -1; -/*--- End of included file: packet-lte-rrc-ett.c ---*/ -#line 276 "./asn1/lte-rrc/packet-lte-rrc-template.c" - static gint ett_lte_rrc_featureGroupIndicators = -1; static gint ett_lte_rrc_featureGroupIndRel9Add = -1; static gint ett_lte_rrc_featureGroupIndRel10 = -1; @@ -16165,9 +16144,6 @@ static void sr_lookup_configindex(guint32 config_index, guint16 *periodicity, gu } } - -/*--- Included file: packet-lte-rrc-fn.c ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-fn.c" /*--- PDUs declarations ---*/ static int dissect_HandoverPreparationInformation_v9j0_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_SCG_Config_v12i0b_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -133666,9 +133642,6 @@ static int dissect_UE_RadioPagingInfo_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info } -/*--- End of included file: packet-lte-rrc-fn.c ---*/ -#line 3251 "./asn1/lte-rrc/packet-lte-rrc-template.c" - static int dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { @@ -134089,9 +134062,6 @@ void proto_register_lte_rrc(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-lte-rrc-hfarr.c ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-hfarr.c" { &hf_lte_rrc_lte_rrc_HandoverCommand_PDU, { "HandoverCommand", "lte-rrc.HandoverCommand_element", FT_NONE, BASE_NONE, NULL, 0, @@ -169249,9 +169219,6 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "CarrierFreq_NB_r13", HFILL }}, -/*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 3673 "./asn1/lte-rrc/packet-lte-rrc-template.c" - { &hf_lte_rrc_eutra_cap_feat_group_ind_1, { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1", FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_1_val), 0, @@ -170009,9 +169976,6 @@ void proto_register_lte_rrc(void) { /* List of subtrees */ static gint *ett[] = { &ett_lte_rrc, - -/*--- Included file: packet-lte-rrc-ettarr.c ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-ettarr.c" &ett_lte_rrc_HandoverCommand, &ett_lte_rrc_T_criticalExtensions, &ett_lte_rrc_T_c1, @@ -173884,9 +173848,6 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_SCPTM_NeighbourCellList_NB_r14, &ett_lte_rrc_PCI_ARFCN_NB_r14, -/*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 4432 "./asn1/lte-rrc/packet-lte-rrc-template.c" - &ett_lte_rrc_featureGroupIndicators, &ett_lte_rrc_featureGroupIndRel9Add, &ett_lte_rrc_featureGroupIndRel10, @@ -173998,9 +173959,6 @@ void proto_register_lte_rrc(void) { expert_register_field_array(expert_lte_rrc, ei, array_length(ei)); /* Register the dissectors defined in lte-rrc.conf */ - -/*--- Included file: packet-lte-rrc-dis-reg.c ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-dis-reg.c" register_dissector("lte-rrc.ue_paging_coverage_info", dissect_lte_rrc_UEPagingCoverageInformation_PDU, proto_lte_rrc); register_dissector("lte-rrc.ue_radio_access_cap_info", dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU, proto_lte_rrc); register_dissector("lte-rrc.ue_radio_paging_info", dissect_lte_rrc_UERadioPagingInformation_PDU, proto_lte_rrc); @@ -174036,9 +173994,6 @@ void proto_register_lte_rrc(void) { register_dissector("lte-rrc.ul.dcch.nb", dissect_UL_DCCH_Message_NB_PDU, proto_lte_rrc); -/*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 4545 "./asn1/lte-rrc/packet-lte-rrc-template.c" - lte_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); lte_rrc_system_info_value_changed_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); diff --git a/epan/dissectors/packet-lte-rrc.h b/epan/dissectors/packet-lte-rrc.h index 4ddb173f99..1fe5bfb4a7 100644 --- a/epan/dissectors/packet-lte-rrc.h +++ b/epan/dissectors/packet-lte-rrc.h @@ -3,9 +3,6 @@ /* packet-lte-rrc.h */ /* asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . -O ../.. EUTRA-InterNodeDefinitions.asn EUTRA-RRC-Definitions.asn PC5-RRC-Definitions.asn NBIOT-InterNodeDefinitions.asn NBIOT-RRC-Definitions.asn */ -/* Input file: packet-lte-rrc-template.h */ - -#line 1 "./asn1/lte-rrc/packet-lte-rrc-template.h" /* packet-lte-rrc-template.h * Copyright 2009, Anders Broman * @@ -21,9 +18,6 @@ extern value_string_ext lte_rrc_messageIdentifier_vals_ext; - -/*--- Included file: packet-lte-rrc-exp.h ---*/ -#line 1 "./asn1/lte-rrc/packet-lte-rrc-exp.h" int dissect_lte_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -70,7 +64,4 @@ int dissect_lte_rrc_NPRACH_ParametersList_NB_r14_PDU(tvbuff_t *tvb _U_, packet_i int dissect_lte_rrc_NPRACH_ParametersListTDD_NB_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_lte_rrc_NPRACH_ParametersListFmt2_NB_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-lte-rrc-exp.h ---*/ -#line 17 "./asn1/lte-rrc/packet-lte-rrc-template.h" - #endif /* PACKET_LTE_RRC_H */ diff --git a/epan/dissectors/packet-m2ap.c b/epan/dissectors/packet-m2ap.c index 2b169bb484..b4d61e292f 100644 --- a/epan/dissectors/packet-m2ap.c +++ b/epan/dissectors/packet-m2ap.c @@ -3,9 +3,6 @@ /* packet-m2ap.c */ /* asn2wrs.py -L -p m2ap -c ./m2ap.cnf -s ./packet-m2ap-template -D . -O ../.. M2AP-CommonDataTypes.asn M2AP-Constants.asn M2AP-Containers.asn M2AP-IEs.asn M2AP-PDU-Contents.asn M2AP-PDU-Descriptions.asn */ -/* Input file: packet-m2ap-template.c */ - -#line 1 "./asn1/m2ap/packet-m2ap-template.c" /* packet-m2ap.c * Routines for M2 Application Protocol packet dissection * Copyright 2016, Pascal Quantin @@ -40,9 +37,6 @@ void proto_reg_handoff_m2ap(void); /* M2AP uses port 36443 as recommended by IANA. */ #define M2AP_PORT 36443 - -/*--- Included file: packet-m2ap-val.h ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -124,17 +118,11 @@ typedef enum _ProtocolIE_ID_enum { id_SubframeAllocationExtended = 50 } ProtocolIE_ID_enum; -/*--- End of included file: packet-m2ap-val.h ---*/ -#line 36 "./asn1/m2ap/packet-m2ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_m2ap = -1; static int hf_m2ap_IPAddress_v4 = -1; static int hf_m2ap_IPAddress_v6 = -1; - -/*--- Included file: packet-m2ap-hf.c ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-hf.c" static int hf_m2ap_Cause_PDU = -1; /* Cause */ static int hf_m2ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ static int hf_m2ap_ENB_MBMS_Configuration_data_Item_PDU = -1; /* ENB_MBMS_Configuration_data_Item */ @@ -321,16 +309,10 @@ static int hf_m2ap_initiatingMessage_value = -1; /* InitiatingMessage_value */ static int hf_m2ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_m2ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-m2ap-hf.c ---*/ -#line 43 "./asn1/m2ap/packet-m2ap-template.c" - /* Initialize the subtree pointers */ static int ett_m2ap = -1; static int ett_m2ap_PLMN_Identity = -1; static int ett_m2ap_IPAddress = -1; - -/*--- Included file: packet-m2ap-ett.c ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-ett.c" static gint ett_m2ap_PrivateIE_ID = -1; static gint ett_m2ap_ProtocolIE_Container = -1; static gint ett_m2ap_ProtocolIE_Field = -1; @@ -419,9 +401,6 @@ static gint ett_m2ap_InitiatingMessage = -1; static gint ett_m2ap_SuccessfulOutcome = -1; static gint ett_m2ap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-m2ap-ett.c ---*/ -#line 49 "./asn1/m2ap/packet-m2ap-template.c" - static expert_field ei_m2ap_invalid_ip_address_len = EI_INIT; struct m2ap_private_data { @@ -465,9 +444,6 @@ m2ap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-m2ap-fn.c ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-fn.c" - static const value_string m2ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -3487,9 +3463,6 @@ static int dissect_M2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-m2ap-fn.c ---*/ -#line 93 "./asn1/m2ap/packet-m2ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -3555,9 +3528,6 @@ proto_register_m2ap(void) { FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL } }, - -/*--- Included file: packet-m2ap-hfarr.c ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-hfarr.c" { &hf_m2ap_Cause_PDU, { "Cause", "m2ap.Cause", FT_UINT32, BASE_DEC, VALS(m2ap_Cause_vals), 0, @@ -4298,9 +4268,6 @@ proto_register_m2ap(void) { { "value", "m2ap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-m2ap-hfarr.c ---*/ -#line 160 "./asn1/m2ap/packet-m2ap-template.c" }; /* List of subtrees */ @@ -4308,9 +4275,6 @@ proto_register_m2ap(void) { &ett_m2ap, &ett_m2ap_PLMN_Identity, &ett_m2ap_IPAddress, - -/*--- Included file: packet-m2ap-ettarr.c ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-ettarr.c" &ett_m2ap_PrivateIE_ID, &ett_m2ap_ProtocolIE_Container, &ett_m2ap_ProtocolIE_Field, @@ -4398,9 +4362,6 @@ proto_register_m2ap(void) { &ett_m2ap_InitiatingMessage, &ett_m2ap_SuccessfulOutcome, &ett_m2ap_UnsuccessfulOutcome, - -/*--- End of included file: packet-m2ap-ettarr.c ---*/ -#line 168 "./asn1/m2ap/packet-m2ap-template.c" }; expert_module_t* expert_m2ap; @@ -4432,9 +4393,6 @@ proto_reg_handoff_m2ap(void) { dissector_add_uint("sctp.ppi", PROTO_3GPP_M2AP_PROTOCOL_ID, m2ap_handle); dissector_add_uint("sctp.port", M2AP_PORT, m2ap_handle); - -/*--- Included file: packet-m2ap-dis-tab.c ---*/ -#line 1 "./asn1/m2ap/packet-m2ap-dis-tab.c" dissector_add_uint("m2ap.ies", id_MCE_MBMS_M2AP_ID, create_dissector_handle(dissect_MCE_MBMS_M2AP_ID_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_ENB_MBMS_M2AP_ID, create_dissector_handle(dissect_ENB_MBMS_M2AP_ID_PDU, proto_m2ap)); dissector_add_uint("m2ap.ies", id_TMGI, create_dissector_handle(dissect_TMGI_PDU, proto_m2ap)); @@ -4512,7 +4470,4 @@ proto_reg_handoff_m2ap(void) dissector_add_uint("m2ap.proc.imsg", id_mbmsServiceCountingResultsReport, create_dissector_handle(dissect_MbmsServiceCountingResultsReport_PDU, proto_m2ap)); dissector_add_uint("m2ap.proc.imsg", id_mbmsOverloadNotification, create_dissector_handle(dissect_MbmsOverloadNotification_PDU, proto_m2ap)); - -/*--- End of included file: packet-m2ap-dis-tab.c ---*/ -#line 200 "./asn1/m2ap/packet-m2ap-template.c" } diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index cffe751abb..c24fcde9f0 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -3,9 +3,6 @@ /* packet-m3ap.c */ /* asn2wrs.py -L -p m3ap -c ./m3ap.cnf -s ./packet-m3ap-template -D . -O ../.. M3AP-CommonDataTypes.asn M3AP-Constants.asn M3AP-Containers.asn M3AP-IEs.asn M3AP-PDU-Contents.asn M3AP-PDU-Descriptions.asn */ -/* Input file: packet-m3ap-template.c */ - -#line 1 "./asn1/m3ap/packet-m3ap-template.c" /* packet-m3ap.c * Routines for M3 Application Protocol packet dissection * @@ -44,9 +41,6 @@ void proto_reg_handoff_m3ap(void); #define M3AP_PORT 36444 static dissector_handle_t m3ap_handle=NULL; - -/*--- Included file: packet-m3ap-val.h ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -95,9 +89,6 @@ typedef enum _ProtocolIE_ID_enum { id_MBMS_Cell_List = 25 } ProtocolIE_ID_enum; -/*--- End of included file: packet-m3ap-val.h ---*/ -#line 40 "./asn1/m3ap/packet-m3ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_m3ap = -1; @@ -105,9 +96,6 @@ static int hf_m3ap_Absolute_Time_ofMBMS_Data_value = -1; static int hf_m3ap_IPAddress_v4 = -1; static int hf_m3ap_IPAddress_v6 = -1; - -/*--- Included file: packet-m3ap-hf.c ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-hf.c" static int hf_m3ap_Absolute_Time_ofMBMS_Data_PDU = -1; /* Absolute_Time_ofMBMS_Data */ static int hf_m3ap_AllocationAndRetentionPriority_PDU = -1; /* AllocationAndRetentionPriority */ static int hf_m3ap_Cause_PDU = -1; /* Cause */ @@ -208,15 +196,9 @@ static int hf_m3ap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_m3ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_m3ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-m3ap-hf.c ---*/ -#line 49 "./asn1/m3ap/packet-m3ap-template.c" - /* Initialize the subtree pointers */ static int ett_m3ap = -1; static int ett_m3ap_IPAddress = -1; - -/*--- Included file: packet-m3ap-ett.c ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-ett.c" static gint ett_m3ap_PrivateIE_ID = -1; static gint ett_m3ap_ProtocolIE_Container = -1; static gint ett_m3ap_ProtocolIE_Field = -1; @@ -264,9 +246,6 @@ static gint ett_m3ap_InitiatingMessage = -1; static gint ett_m3ap_SuccessfulOutcome = -1; static gint ett_m3ap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-m3ap-ett.c ---*/ -#line 54 "./asn1/m3ap/packet-m3ap-template.c" - static expert_field ei_m3ap_invalid_ip_address_len = EI_INIT; struct m3ap_private_data { @@ -311,9 +290,6 @@ m3ap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-m3ap-fn.c ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-fn.c" - static const value_string m3ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -2046,9 +2022,6 @@ static int dissect_M3AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-m3ap-fn.c ---*/ -#line 99 "./asn1/m3ap/packet-m3ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint_new(m3ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; @@ -2114,9 +2087,6 @@ void proto_register_m3ap(void) { NULL, HFILL } }, - -/*--- Included file: packet-m3ap-hfarr.c ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-hfarr.c" { &hf_m3ap_Absolute_Time_ofMBMS_Data_PDU, { "Absolute-Time-ofMBMS-Data", "m3ap.Absolute_Time_ofMBMS_Data", FT_BYTES, BASE_NONE, NULL, 0, @@ -2513,18 +2483,12 @@ void proto_register_m3ap(void) { { "value", "m3ap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-m3ap-hfarr.c ---*/ -#line 166 "./asn1/m3ap/packet-m3ap-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_m3ap, &ett_m3ap_IPAddress, - -/*--- Included file: packet-m3ap-ettarr.c ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-ettarr.c" &ett_m3ap_PrivateIE_ID, &ett_m3ap_ProtocolIE_Container, &ett_m3ap_ProtocolIE_Field, @@ -2571,9 +2535,6 @@ void proto_register_m3ap(void) { &ett_m3ap_InitiatingMessage, &ett_m3ap_SuccessfulOutcome, &ett_m3ap_UnsuccessfulOutcome, - -/*--- End of included file: packet-m3ap-ettarr.c ---*/ -#line 173 "./asn1/m3ap/packet-m3ap-template.c" }; expert_module_t* expert_m3ap; @@ -2611,9 +2572,6 @@ proto_reg_handoff_m3ap(void) if( !inited ) { dissector_add_uint("sctp.ppi", PROTO_3GPP_M3AP_PROTOCOL_ID, m3ap_handle); inited = TRUE; - -/*--- Included file: packet-m3ap-dis-tab.c ---*/ -#line 1 "./asn1/m3ap/packet-m3ap-dis-tab.c" dissector_add_uint("m3ap.ies", id_MME_MBMS_M3AP_ID, create_dissector_handle(dissect_MME_MBMS_M3AP_ID_PDU, proto_m3ap)); dissector_add_uint("m3ap.ies", id_MCE_MBMS_M3AP_ID, create_dissector_handle(dissect_MCE_MBMS_M3AP_ID_PDU, proto_m3ap)); dissector_add_uint("m3ap.ies", id_TMGI, create_dissector_handle(dissect_TMGI_PDU, proto_m3ap)); @@ -2657,9 +2615,6 @@ proto_reg_handoff_m3ap(void) dissector_add_uint("m3ap.proc.sout", id_m3Setup, create_dissector_handle(dissect_M3SetupResponse_PDU, proto_m3ap)); dissector_add_uint("m3ap.proc.uout", id_m3Setup, create_dissector_handle(dissect_M3SetupFailure_PDU, proto_m3ap)); - -/*--- End of included file: packet-m3ap-dis-tab.c ---*/ -#line 211 "./asn1/m3ap/packet-m3ap-template.c" dissector_add_uint("m3ap.extension", 17, create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap)); } else { diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 0f9b1f01f0..c130f815f9 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -3,9 +3,6 @@ /* packet-mms.c */ /* asn2wrs.py -b -L -p mms -c ./mms.cnf -s ./packet-mms-template -D . -O ../.. mms.asn */ -/* Input file: packet-mms-template.c */ - -#line 1 "./asn1/mms/packet-mms-template.c" /* packet-mms_asn1.c * * Ronnie Sahlberg 2005 @@ -39,9 +36,6 @@ void proto_reg_handoff_mms(void); /* Initialize the protocol and registered fields */ static int proto_mms = -1; - -/*--- Included file: packet-mms-hf.c ---*/ -#line 1 "./asn1/mms/packet-mms-hf.c" static int hf_mms_confirmed_RequestPDU = -1; /* Confirmed_RequestPDU */ static int hf_mms_confirmed_ResponsePDU = -1; /* Confirmed_ResponsePDU */ static int hf_mms_confirmed_ErrorPDU = -1; /* Confirmed_ErrorPDU */ @@ -727,14 +721,8 @@ static int hf_mms_Transitions_disabled_to_active = -1; static int hf_mms_Transitions_idle_to_active = -1; static int hf_mms_Transitions_any_to_deleted = -1; -/*--- End of included file: packet-mms-hf.c ---*/ -#line 35 "./asn1/mms/packet-mms-template.c" - /* Initialize the subtree pointers */ static gint ett_mms = -1; - -/*--- Included file: packet-mms-ett.c ---*/ -#line 1 "./asn1/mms/packet-mms-ett.c" static gint ett_mms_MMSpdu = -1; static gint ett_mms_Confirmed_RequestPDU = -1; static gint ett_mms_SEQUENCE_OF_Modifier = -1; @@ -951,9 +939,6 @@ static gint ett_mms_SEQUENCE_OF_DirectoryEntry = -1; static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; -/*--- End of included file: packet-mms-ett.c ---*/ -#line 39 "./asn1/mms/packet-mms-template.c" - static expert_field ei_mms_mal_timeofday_encoding = EI_INIT; static expert_field ei_mms_mal_utctime_encoding = EI_INIT; static expert_field ei_mms_zero_pdu = EI_INIT; @@ -1038,9 +1023,6 @@ private_data_get_moreCinfo(asn1_ctx_t *actx) /*****************************************************************************/ - -/*--- Included file: packet-mms-fn.c ---*/ -#line 1 "./asn1/mms/packet-mms-fn.c" /*--- Cyclic dependencies ---*/ /* TypeSpecification -> TypeSpecification/array -> TypeSpecification */ @@ -7329,9 +7311,6 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } -/*--- End of included file: packet-mms-fn.c ---*/ -#line 125 "./asn1/mms/packet-mms-template.c" - /* * Dissect MMS PDUs inside a PPDU. */ @@ -7370,9 +7349,6 @@ void proto_register_mms(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-mms-hfarr.c ---*/ -#line 1 "./asn1/mms/packet-mms-hfarr.c" { &hf_mms_confirmed_RequestPDU, { "confirmed-RequestPDU", "mms.confirmed_RequestPDU_element", FT_NONE, BASE_NONE, NULL, 0, @@ -10105,17 +10081,11 @@ void proto_register_mms(void) { { "any-to-deleted", "mms.Transitions.any.to.deleted", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, - -/*--- End of included file: packet-mms-hfarr.c ---*/ -#line 165 "./asn1/mms/packet-mms-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_mms, - -/*--- Included file: packet-mms-ettarr.c ---*/ -#line 1 "./asn1/mms/packet-mms-ettarr.c" &ett_mms_MMSpdu, &ett_mms_Confirmed_RequestPDU, &ett_mms_SEQUENCE_OF_Modifier, @@ -10331,9 +10301,6 @@ void proto_register_mms(void) { &ett_mms_SEQUENCE_OF_DirectoryEntry, &ett_mms_DirectoryEntry, &ett_mms_FileAttributes, - -/*--- End of included file: packet-mms-ettarr.c ---*/ -#line 171 "./asn1/mms/packet-mms-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index d6deeecc56..f9def037d5 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -3,9 +3,6 @@ /* packet-mms.h */ /* asn2wrs.py -b -L -p mms -c ./mms.cnf -s ./packet-mms-template -D . -O ../.. mms.asn */ -/* Input file: packet-mms-template.h */ - -#line 1 "./asn1/mms/packet-mms-template.h" /* packet-mms.h * Routines for MMS packet dissection * Ronnie Sahlberg 2005 @@ -20,14 +17,8 @@ #ifndef PACKET_MMS_H #define PACKET_MMS_H - -/*--- Included file: packet-mms-exp.h ---*/ -#line 1 "./asn1/mms/packet-mms-exp.h" extern const value_string mms_MMSpdu_vals[]; int dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-mms-exp.h ---*/ -#line 16 "./asn1/mms/packet-mms-template.h" - #endif /* PACKET_MMS_H */ diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 0f25c09ca0..cb40ae45ee 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -3,9 +3,6 @@ /* packet-mpeg-audio.c */ /* asn2wrs.py -L -p mpeg-audio -c ./mpeg-audio.cnf -s ./packet-mpeg-audio-template -D . -O ../.. mpeg-audio.asn */ -/* Input file: packet-mpeg-audio-template.c */ - -#line 1 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" /* MPEG audio packet decoder. * Written by Shaun Jackman . * Copyright 2007 Shaun Jackman @@ -25,9 +22,6 @@ #include "packet-per.h" - -/*--- Included file: packet-mpeg-audio-hf.c ---*/ -#line 1 "./asn1/mpeg-audio/packet-mpeg-audio-hf.c" static int hf_mpeg_audio_sync = -1; /* BIT_STRING_SIZE_11 */ static int hf_mpeg_audio_version = -1; /* T_version */ static int hf_mpeg_audio_layer = -1; /* T_layer */ @@ -50,21 +44,9 @@ static int hf_mpeg_audio_comment = -1; /* OCTET_STRING_SIZE_28 */ static int hf_mpeg_audio_must_be_zero = -1; /* INTEGER_0_255 */ static int hf_mpeg_audio_track = -1; /* INTEGER_0_255 */ static int hf_mpeg_audio_genre = -1; /* T_genre */ - -/*--- End of included file: packet-mpeg-audio-hf.c ---*/ -#line 21 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" - -/*--- Included file: packet-mpeg-audio-ett.c ---*/ -#line 1 "./asn1/mpeg-audio/packet-mpeg-audio-ett.c" static gint ett_mpeg_audio_Audio = -1; static gint ett_mpeg_audio_ID3v1 = -1; -/*--- End of included file: packet-mpeg-audio-ett.c ---*/ -#line 22 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" - -/*--- Included file: packet-mpeg-audio-fn.c ---*/ -#line 1 "./asn1/mpeg-audio/packet-mpeg-audio-fn.c" - static int dissect_mpeg_audio_BIT_STRING_SIZE_11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -430,9 +412,6 @@ dissect_mpeg_audio_ID3v1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -/*--- End of included file: packet-mpeg-audio-fn.c ---*/ -#line 23 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" - void proto_register_mpeg_audio(void); void proto_reg_handoff_mpeg_audio(void); @@ -545,9 +524,6 @@ void proto_register_mpeg_audio(void) { static hf_register_info hf[] = { - -/*--- Included file: packet-mpeg-audio-hfarr.c ---*/ -#line 1 "./asn1/mpeg-audio/packet-mpeg-audio-hfarr.c" { &hf_mpeg_audio_sync, { "sync", "mpeg-audio.sync", FT_BYTES, BASE_NONE, NULL, 0, @@ -636,9 +612,6 @@ proto_register_mpeg_audio(void) { "genre", "mpeg-audio.genre", FT_UINT32, BASE_DEC, VALS(mpeg_audio_T_genre_vals), 0, NULL, HFILL }}, - -/*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 137 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" { &hf_mpeg_audio_data, { "Data", "mpeg-audio.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -655,14 +628,8 @@ proto_register_mpeg_audio(void) }; static gint *ett[] = { - -/*--- Included file: packet-mpeg-audio-ettarr.c ---*/ -#line 1 "./asn1/mpeg-audio/packet-mpeg-audio-ettarr.c" &ett_mpeg_audio_Audio, &ett_mpeg_audio_ID3v1, - -/*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 154 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" }; proto_mpeg_audio = proto_register_protocol( diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 84d173cdcd..9574cbc056 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -3,9 +3,6 @@ /* packet-mpeg-pes.c */ /* asn2wrs.py -L -p mpeg-pes -c ./mpeg-pes.cnf -s ./packet-mpeg-pes-template -D . -O ../.. mpeg-pes.asn */ -/* Input file: packet-mpeg-pes-template.c */ - -#line 1 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" /* MPEG Packetized Elementary Stream (PES) packet decoder. * Written by Shaun Jackman . * Copyright 2007 Shaun Jackman @@ -26,9 +23,6 @@ #include "packet-per.h" - -/*--- Included file: packet-mpeg-pes-hf.c ---*/ -#line 1 "./asn1/mpeg-pes/packet-mpeg-pes-hf.c" static int hf_mpeg_pes_prefix = -1; /* OCTET_STRING_SIZE_3 */ static int hf_mpeg_pes_stream = -1; /* T_stream */ static int hf_mpeg_pes_length = -1; /* INTEGER_0_65535 */ @@ -79,12 +73,6 @@ static int hf_mpeg_pes_must_be_zero = -1; /* BIT_STRING_SIZE_5 */ static int hf_mpeg_pes_temporal_sequence_number = -1; /* BIT_STRING_SIZE_10 */ static int hf_mpeg_pes_frame_type = -1; /* T_frame_type */ static int hf_mpeg_pes_vbv_delay = -1; /* BIT_STRING_SIZE_16 */ - -/*--- End of included file: packet-mpeg-pes-hf.c ---*/ -#line 22 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" - -/*--- Included file: packet-mpeg-pes-ett.c ---*/ -#line 1 "./asn1/mpeg-pes/packet-mpeg-pes-ett.c" static gint ett_mpeg_pes_PES = -1; static gint ett_mpeg_pes_Stream = -1; static gint ett_mpeg_pes_Sequence_header = -1; @@ -92,12 +80,6 @@ static gint ett_mpeg_pes_Sequence_extension = -1; static gint ett_mpeg_pes_Group_of_pictures = -1; static gint ett_mpeg_pes_Picture = -1; -/*--- End of included file: packet-mpeg-pes-ett.c ---*/ -#line 23 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" - -/*--- Included file: packet-mpeg-pes-fn.c ---*/ -#line 1 "./asn1/mpeg-pes/packet-mpeg-pes-fn.c" - static int dissect_mpeg_pes_OCTET_STRING_SIZE_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -460,9 +442,6 @@ dissect_mpeg_pes_Picture(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -/*--- End of included file: packet-mpeg-pes-fn.c ---*/ -#line 24 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" - void proto_register_mpeg_pes(void); void proto_reg_handoff_mpeg_pes(void); @@ -1014,9 +993,6 @@ void proto_register_mpeg_pes(void) { static hf_register_info hf[] = { - -/*--- Included file: packet-mpeg-pes-hfarr.c ---*/ -#line 1 "./asn1/mpeg-pes/packet-mpeg-pes-hfarr.c" { &hf_mpeg_pes_prefix, { "prefix", "mpeg-pes.prefix", FT_BYTES, BASE_NONE, NULL, 0, @@ -1217,9 +1193,6 @@ proto_register_mpeg_pes(void) { "vbv-delay", "mpeg-pes.vbv_delay", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_16", HFILL }}, - -/*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 577 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" { &hf_mpeg_pes_pack_header, { "Pack header", "mpeg-pes.pack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1326,18 +1299,12 @@ proto_register_mpeg_pes(void) }; static gint *ett[] = { - -/*--- Included file: packet-mpeg-pes-ettarr.c ---*/ -#line 1 "./asn1/mpeg-pes/packet-mpeg-pes-ettarr.c" &ett_mpeg_pes_PES, &ett_mpeg_pes_Stream, &ett_mpeg_pes_Sequence_header, &ett_mpeg_pes_Sequence_extension, &ett_mpeg_pes_Group_of_pictures, &ett_mpeg_pes_Picture, - -/*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 684 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, &ett_mpeg_pes_trick_mode diff --git a/epan/dissectors/packet-mudurl.c b/epan/dissectors/packet-mudurl.c index 8088a3c4eb..19f8d10d78 100644 --- a/epan/dissectors/packet-mudurl.c +++ b/epan/dissectors/packet-mudurl.c @@ -3,9 +3,6 @@ /* packet-mudurl.c */ /* asn2wrs.py -b -L -p mudurl -c ./mudurl.cnf -s ./packet-mudurl-template -D . -O ../.. MUDURL.asn */ -/* Input file: packet-mudurl-template.c */ - -#line 1 "./asn1/mudurl/packet-mudurl-template.c" /* packet-mudurl-template.c * Routines for mudurl found in draft-ietf-opsawg-mud * by Eliot Lear @@ -36,23 +33,14 @@ void proto_reg_handoff_mudurl(void); /* Initialize the protocol and registered fields */ static int proto_mudurl = -1; - -/*--- Included file: packet-mudurl-hf.c ---*/ -#line 1 "./asn1/mudurl/packet-mudurl-hf.c" static int hf_mudurl_MUDURLSyntax_PDU = -1; /* MUDURLSyntax */ -/*--- End of included file: packet-mudurl-hf.c ---*/ -#line 32 "./asn1/mudurl/packet-mudurl-template.c" - /* Initialize the subtree pointers */ /* #include "packet-mudurl-ett.c" */ // static const char *object_identifier_id; -/*--- Included file: packet-mudurl-fn.c ---*/ -#line 1 "./asn1/mudurl/packet-mudurl-fn.c" - static int dissect_mudurl_MUDURLSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -74,25 +62,16 @@ static int dissect_MUDURLSyntax_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-mudurl-fn.c ---*/ -#line 39 "./asn1/mudurl/packet-mudurl-template.c" - /*--- proto_register_mudurl ----------------------------------------------*/ void proto_register_mudurl(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-mudurl-hfarr.c ---*/ -#line 1 "./asn1/mudurl/packet-mudurl-hfarr.c" { &hf_mudurl_MUDURLSyntax_PDU, { "MUDURLSyntax", "mudurl.MUDURLSyntax", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-mudurl-hfarr.c ---*/ -#line 47 "./asn1/mudurl/packet-mudurl-template.c" }; /* List of subtrees */ @@ -112,12 +91,6 @@ void proto_register_mudurl(void) { /*--- proto_reg_handoff_mudurl -------------------------------------------*/ void proto_reg_handoff_mudurl(void) { - -/*--- Included file: packet-mudurl-dis-tab.c ---*/ -#line 1 "./asn1/mudurl/packet-mudurl-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.25", dissect_MUDURLSyntax_PDU, proto_mudurl, "id-pe-mud-url"); - -/*--- End of included file: packet-mudurl-dis-tab.c ---*/ -#line 67 "./asn1/mudurl/packet-mudurl-template.c" } diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index daa6ee480a..3e09fc0120 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -3,9 +3,6 @@ /* packet-nbap.c */ /* asn2wrs.py -L -p nbap -c ./nbap.cnf -s ./packet-nbap-template -D . -O ../.. NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ -/* Input file: packet-nbap-template.c */ - -#line 1 "./asn1/nbap/packet-nbap-template.c" /* packet-nbap-template.c * Routines for UMTS Node B Application Part(NBAP) packet dissection * Copyright 2005, 2009 Anders Broman @@ -65,9 +62,6 @@ void proto_reg_handoff_nbap(void); /* Protocol Handles */ static dissector_handle_t fp_handle; - -/*--- Included file: packet-nbap-val.h ---*/ -#line 1 "./asn1/nbap/packet-nbap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -1522,9 +1516,6 @@ typedef enum _ProtocolIE_ID_enum { id_Unallocated_1221 = 1221 } ProtocolIE_ID_enum; -/*--- End of included file: packet-nbap-val.h ---*/ -#line 61 "./asn1/nbap/packet-nbap-template.c" - /* Initialize the protocol and registered fields */ static int proto_nbap = -1; static int hf_nbap_transportLayerAddress_ipv4 = -1; @@ -1532,9 +1523,6 @@ static int hf_nbap_transportLayerAddress_ipv6 = -1; static int hf_nbap_transportLayerAddress_nsap = -1; static int hf_nbap_reassembled_information_block = -1; - -/*--- Included file: packet-nbap-hf.c ---*/ -#line 1 "./asn1/nbap/packet-nbap-hf.c" static int hf_nbap_ActivationInformation_PDU = -1; /* ActivationInformation */ static int hf_nbap_Additional_EDCH_Setup_Info_PDU = -1; /* Additional_EDCH_Setup_Info */ static int hf_nbap_Additional_EDCH_Cell_Information_Response_List_PDU = -1; /* Additional_EDCH_Cell_Information_Response_List */ @@ -4827,18 +4815,12 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh2 = -1; static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1; static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1; -/*--- End of included file: packet-nbap-hf.c ---*/ -#line 70 "./asn1/nbap/packet-nbap-template.c" - /* Initialize the subtree pointers */ static int ett_nbap = -1; static int ett_nbap_TransportLayerAddress = -1; static int ett_nbap_TransportLayerAddress_nsap = -1; static int ett_nbap_ib_sg_data = -1; - -/*--- Included file: packet-nbap-ett.c ---*/ -#line 1 "./asn1/nbap/packet-nbap-ett.c" static gint ett_nbap_PrivateIE_ID = -1; static gint ett_nbap_ProcedureID = -1; static gint ett_nbap_TransactionID = -1; @@ -6466,9 +6448,6 @@ static gint ett_nbap_SuccessfulOutcome = -1; static gint ett_nbap_UnsuccessfulOutcome = -1; static gint ett_nbap_Outcome = -1; -/*--- End of included file: packet-nbap-ett.c ---*/ -#line 78 "./asn1/nbap/packet-nbap-template.c" - static expert_field ei_nbap_no_find_port_info = EI_INIT; static expert_field ei_nbap_no_set_comm_context_id = EI_INIT; static expert_field ei_nbap_hsdsch_entity_not_specified = EI_INIT; @@ -6826,9 +6805,6 @@ static void delete_setup_conv(nbap_setup_conv_t *conv); static void add_hsdsch_bind(packet_info * pinfo); -/*--- Included file: packet-nbap-fn.c ---*/ -#line 1 "./asn1/nbap/packet-nbap-fn.c" - static const value_string nbap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -55466,9 +55442,6 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } -/*--- End of included file: packet-nbap-fn.c ---*/ -#line 436 "./asn1/nbap/packet-nbap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { guint32 protocol_ie_id; @@ -55777,9 +55750,6 @@ void proto_register_nbap(void) { "Reassembled Information Block", "nbap.reassembled_information_block", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-nbap-hfarr.c ---*/ -#line 1 "./asn1/nbap/packet-nbap-hfarr.c" { &hf_nbap_ActivationInformation_PDU, { "ActivationInformation", "nbap.ActivationInformation", FT_UINT32, BASE_DEC, NULL, 0, @@ -68940,9 +68910,6 @@ void proto_register_nbap(void) { "subCh0", "nbap.RACH.SubChannelNumbers.subCh0", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-nbap-hfarr.c ---*/ -#line 746 "./asn1/nbap/packet-nbap-template.c" }; /* List of subtrees */ @@ -68951,9 +68918,6 @@ void proto_register_nbap(void) &ett_nbap_TransportLayerAddress, &ett_nbap_TransportLayerAddress_nsap, &ett_nbap_ib_sg_data, - -/*--- Included file: packet-nbap-ettarr.c ---*/ -#line 1 "./asn1/nbap/packet-nbap-ettarr.c" &ett_nbap_PrivateIE_ID, &ett_nbap_ProcedureID, &ett_nbap_TransactionID, @@ -70580,9 +70544,6 @@ void proto_register_nbap(void) &ett_nbap_SuccessfulOutcome, &ett_nbap_UnsuccessfulOutcome, &ett_nbap_Outcome, - -/*--- End of included file: packet-nbap-ettarr.c ---*/ -#line 755 "./asn1/nbap/packet-nbap-template.c" }; static ei_register_info ei[] = { @@ -70640,9 +70601,6 @@ proto_reg_handoff_nbap(void) dissector_add_for_decode_as("sctp.port", nbap_handle); heur_dissector_add("sctp", dissect_nbap_heur, "NBAP over SCTP", "nbap_sctp", proto_nbap, HEURISTIC_ENABLE); - -/*--- Included file: packet-nbap-dis-tab.c ---*/ -#line 1 "./asn1/nbap/packet-nbap-dis-tab.c" dissector_add_uint("nbap.ies", id_TUTRANGPSMeasurementValueInformation, create_dissector_handle(dissect_TUTRANGPSMeasurementValueInformation_PDU, proto_nbap)); dissector_add_uint("nbap.ies", id_SFNSFNMeasurementValueInformation, create_dissector_handle(dissect_SFNSFNMeasurementValueInformation_PDU, proto_nbap)); dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmission, create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap)); @@ -71735,8 +71693,5 @@ proto_reg_handoff_nbap(void) dissector_add_string("nbap.proc.imsg", "id-secondaryULFrequencyReporting/fdd", create_dissector_handle(dissect_SecondaryULFrequencyReport_PDU, proto_nbap)); dissector_add_string("nbap.proc.imsg", "id-secondaryULFrequencyUpdate/fdd", create_dissector_handle(dissect_SecondaryULFrequencyUpdateIndication_PDU, proto_nbap)); - -/*--- End of included file: packet-nbap-dis-tab.c ---*/ -#line 813 "./asn1/nbap/packet-nbap-template.c" } diff --git a/epan/dissectors/packet-nbap.h b/epan/dissectors/packet-nbap.h index 10433ebbd4..c38b5c9bcd 100644 --- a/epan/dissectors/packet-nbap.h +++ b/epan/dissectors/packet-nbap.h @@ -3,9 +3,6 @@ /* packet-nbap.h */ /* asn2wrs.py -L -p nbap -c ./nbap.cnf -s ./packet-nbap-template -D . -O ../.. NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ -/* Input file: packet-nbap-template.h */ - -#line 1 "./asn1/nbap/packet-nbap-template.h" /* packet-nbap-template.h * * Wireshark - Network traffic analyzer diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index f9a53bd8fc..d0363cfdbb 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -3,9 +3,6 @@ /* packet-ngap.c */ /* asn2wrs.py -L -p ngap -c ./ngap.cnf -s ./packet-ngap-template -D . -O ../.. NGAP-CommonDataTypes.asn NGAP-Constants.asn NGAP-Containers.asn NGAP-IEs.asn NGAP-PDU-Contents.asn NGAP-PDU-Descriptions.asn */ -/* Input file: packet-ngap-template.c */ - -#line 1 "./asn1/ngap/packet-ngap-template.c" /* packet-ngap.c * Routines for NG-RAN NG Application Protocol (NGAP) packet dissection * Copyright 2018, Anders Broman @@ -74,9 +71,6 @@ static dissector_handle_t nrppa_handle; static int proto_json = -1; - -/*--- Included file: packet-ngap-val.h ---*/ -#line 1 "./asn1/ngap/packet-ngap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -630,9 +624,6 @@ typedef enum _RAT_Information_enum { nR_OTHERSAT = 5 } RAT_Information_enum; -/*--- End of included file: packet-ngap-val.h ---*/ -#line 70 "./asn1/ngap/packet-ngap-template.c" - /* Initialize the protocol and registered fields */ static int proto_ngap = -1; static int hf_ngap_transportLayerAddressIPv4 = -1; @@ -700,9 +691,6 @@ static int hf_ngap_GlobalCable_ID_str = -1; static int hf_ngap_UpdateFeedback_CN_PDB_DL = -1; static int hf_ngap_UpdateFeedback_CN_PDB_UL = -1; static int hf_ngap_UpdateFeedback_reserved = -1; - -/*--- Included file: packet-ngap-hf.c ---*/ -#line 1 "./asn1/ngap/packet-ngap-hf.c" static int hf_ngap_AdditionalDLUPTNLInformationForHOList_PDU = -1; /* AdditionalDLUPTNLInformationForHOList */ static int hf_ngap_AllowedNSSAI_PDU = -1; /* AllowedNSSAI */ static int hf_ngap_AlternativeQoSParaSetIndex_PDU = -1; /* AlternativeQoSParaSetIndex */ @@ -2106,9 +2094,6 @@ static int hf_ngap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_ngap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_ngap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-ngap-hf.c ---*/ -#line 139 "./asn1/ngap/packet-ngap-template.c" - /* Initialize the subtree pointers */ static gint ett_ngap = -1; static gint ett_ngap_TransportLayerAddress = -1; @@ -2153,9 +2138,6 @@ static gint ett_ngap_UERadioCapabilityForPagingOfNB_IoT = -1; static gint ett_ngap_GlobalCable_ID = -1; static gint ett_ngap_UpdateFeedback = -1; static gint ett_ngap_successfulHOReportContainer = -1; - -/*--- Included file: packet-ngap-ett.c ---*/ -#line 1 "./asn1/ngap/packet-ngap-ett.c" static gint ett_ngap_PrivateIE_ID = -1; static gint ett_ngap_ProtocolIE_Container = -1; static gint ett_ngap_ProtocolIE_Field = -1; @@ -2922,9 +2904,6 @@ static gint ett_ngap_InitiatingMessage = -1; static gint ett_ngap_SuccessfulOutcome = -1; static gint ett_ngap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-ngap-ett.c ---*/ -#line 185 "./asn1/ngap/packet-ngap-template.c" - static expert_field ei_ngap_number_pages_le15 = EI_INIT; enum{ @@ -3512,9 +3491,6 @@ const true_false_string ngap_not_updated_updated = { "Updated" }; - -/*--- Included file: packet-ngap-fn.c ---*/ -#line 1 "./asn1/ngap/packet-ngap-fn.c" /*--- PDUs declarations ---*/ static int dissect_UEContextResumeRequestTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_UEContextResumeResponseTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -26674,9 +26650,6 @@ static int dissect_MulticastSessionUpdateRequestTransfer_PDU(tvbuff_t *tvb _U_, } -/*--- End of included file: packet-ngap-fn.c ---*/ -#line 774 "./asn1/ngap/packet-ngap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { ngap_ctx_t ngap_ctx; @@ -26978,9 +26951,6 @@ proto_reg_handoff_ngap(void) lte_rrc_ue_radio_paging_info_nb_handle = find_dissector_add_dependency("lte-rrc.ue_radio_paging_info.nb", proto_ngap); lte_rrc_ue_radio_access_cap_info_nb_handle = find_dissector_add_dependency("lte-rrc.ue_radio_access_cap_info.nb", proto_ngap); dissector_add_uint("sctp.ppi", NGAP_PROTOCOL_ID, ngap_handle); - -/*--- Included file: packet-ngap-dis-tab.c ---*/ -#line 1 "./asn1/ngap/packet-ngap-dis-tab.c" dissector_add_uint("ngap.ies", id_AllowedNSSAI, create_dissector_handle(dissect_AllowedNSSAI_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_AMFName, create_dissector_handle(dissect_AMFName_PDU, proto_ngap)); dissector_add_uint("ngap.ies", id_AMFOverloadResponse, create_dissector_handle(dissect_OverloadResponse_PDU, proto_ngap)); @@ -27494,9 +27464,6 @@ proto_reg_handoff_ngap(void) dissector_add_string("ngap.n2_ie_type", "UE_RADIO_CAPABILITY", create_dissector_handle(dissect_UERadioCapability_PDU, proto_ngap)); -/*--- End of included file: packet-ngap-dis-tab.c ---*/ -#line 1077 "./asn1/ngap/packet-ngap-template.c" - dissector_add_string("media_type", "application/vnd.3gpp.ngap", ngap_media_type_handle); nrppa_handle = find_dissector_add_dependency("nrppa", proto_ngap); @@ -27775,9 +27742,6 @@ void proto_register_ngap(void) { { "Reserved", "ngap.UpdateFeedback.reserved", FT_UINT8, BASE_HEX, NULL, 0x3f, NULL, HFILL }}, - -/*--- Included file: packet-ngap-hfarr.c ---*/ -#line 1 "./asn1/ngap/packet-ngap-hfarr.c" { &hf_ngap_AdditionalDLUPTNLInformationForHOList_PDU, { "AdditionalDLUPTNLInformationForHOList", "ngap.AdditionalDLUPTNLInformationForHOList", FT_UINT32, BASE_DEC, NULL, 0, @@ -33386,9 +33350,6 @@ void proto_register_ngap(void) { { "value", "ngap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-ngap-hfarr.c ---*/ -#line 1357 "./asn1/ngap/packet-ngap-template.c" }; /* List of subtrees */ @@ -33436,9 +33397,6 @@ void proto_register_ngap(void) { &ett_ngap_GlobalCable_ID, &ett_ngap_UpdateFeedback, &ett_ngap_successfulHOReportContainer, - -/*--- Included file: packet-ngap-ettarr.c ---*/ -#line 1 "./asn1/ngap/packet-ngap-ettarr.c" &ett_ngap_PrivateIE_ID, &ett_ngap_ProtocolIE_Container, &ett_ngap_ProtocolIE_Field, @@ -34204,9 +34162,6 @@ void proto_register_ngap(void) { &ett_ngap_InitiatingMessage, &ett_ngap_SuccessfulOutcome, &ett_ngap_UnsuccessfulOutcome, - -/*--- End of included file: packet-ngap-ettarr.c ---*/ -#line 1405 "./asn1/ngap/packet-ngap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ngap.h b/epan/dissectors/packet-ngap.h index 96d424266e..99314dc249 100644 --- a/epan/dissectors/packet-ngap.h +++ b/epan/dissectors/packet-ngap.h @@ -3,9 +3,6 @@ /* packet-ngap.h */ /* asn2wrs.py -L -p ngap -c ./ngap.cnf -s ./packet-ngap-template -D . -O ../.. NGAP-CommonDataTypes.asn NGAP-Constants.asn NGAP-Containers.asn NGAP-IEs.asn NGAP-PDU-Contents.asn NGAP-PDU-Descriptions.asn */ -/* Input file: packet-ngap-template.h */ - -#line 1 "./asn1/ngap/packet-ngap-template.h" /* packet-ngap.h * Routines for NG-RAN NG Application Protocol (NGAP) packet dissection * @@ -19,9 +16,6 @@ #ifndef PACKET_NGAP_H #define PACKET_NGAP_H - -/*--- Included file: packet-ngap-exp.h ---*/ -#line 1 "./asn1/ngap/packet-ngap-exp.h" int dissect_ngap_SecondaryRATDataUsageReportTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_ngap_LastVisitedNGRANCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_ngap_LastVisitedPSCellInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -32,9 +26,6 @@ int dissect_ngap_SONConfigurationTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pi int dissect_ngap_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-ngap-exp.h ---*/ -#line 15 "./asn1/ngap/packet-ngap-template.h" - #endif /* PACKET_NGAP_H */ /* diff --git a/epan/dissectors/packet-nist-csor.c b/epan/dissectors/packet-nist-csor.c index 095f69b412..b7e26e37e3 100644 --- a/epan/dissectors/packet-nist-csor.c +++ b/epan/dissectors/packet-nist-csor.c @@ -3,9 +3,6 @@ /* packet-nist-csor.c */ /* asn2wrs.py -b -L -p nist-csor -c ./nist-csor.cnf -s ./packet-nist-csor-template -D . -O ../.. aes1.asn */ -/* Input file: packet-nist-csor-template.c */ - -#line 1 "./asn1/nist-csor/packet-nist-csor-template.c" /* packet-nist-csor.c * * Wireshark - Network traffic analyzer @@ -35,30 +32,15 @@ void proto_reg_handoff_nist_csor(void); /* Initialize the protocol and registered fields */ static int proto_nist_csor = -1; - -/*--- Included file: packet-nist-csor-hf.c ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-hf.c" static int hf_nist_csor_CFBParameters_PDU = -1; /* CFBParameters */ static int hf_nist_csor_AES_IV_PDU = -1; /* AES_IV */ static int hf_nist_csor_ShakeOutputLen_PDU = -1; /* ShakeOutputLen */ static int hf_nist_csor_aes_IV = -1; /* AES_IV */ static int hf_nist_csor_numberOfBits = -1; /* NumberOfBits */ -/*--- End of included file: packet-nist-csor-hf.c ---*/ -#line 31 "./asn1/nist-csor/packet-nist-csor-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-nist-csor-ett.c ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-ett.c" static gint ett_nist_csor_CFBParameters = -1; -/*--- End of included file: packet-nist-csor-ett.c ---*/ -#line 34 "./asn1/nist-csor/packet-nist-csor-template.c" - -/*--- Included file: packet-nist-csor-fn.c ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-fn.c" - int dissect_nist_csor_AES_IV(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -128,18 +110,12 @@ static int dissect_ShakeOutputLen_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-nist-csor-fn.c ---*/ -#line 35 "./asn1/nist-csor/packet-nist-csor-template.c" - /*--- proto_register_nist-csor ----------------------------------------------*/ void proto_register_nist_csor(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-nist-csor-hfarr.c ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-hfarr.c" { &hf_nist_csor_CFBParameters_PDU, { "CFBParameters", "nist-csor.CFBParameters_element", FT_NONE, BASE_NONE, NULL, 0, @@ -160,20 +136,11 @@ void proto_register_nist_csor(void) { { "numberOfBits", "nist-csor.numberOfBits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-nist-csor-hfarr.c ---*/ -#line 43 "./asn1/nist-csor/packet-nist-csor-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-nist-csor-ettarr.c ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-ettarr.c" &ett_nist_csor_CFBParameters, - -/*--- End of included file: packet-nist-csor-ettarr.c ---*/ -#line 48 "./asn1/nist-csor/packet-nist-csor-template.c" }; /* Register protocol */ @@ -187,9 +154,6 @@ void proto_register_nist_csor(void) { /*--- proto_reg_handoff_nist_csor -------------------------------------------*/ void proto_reg_handoff_nist_csor(void) { - -/*--- Included file: packet-nist-csor-dis-tab.c ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-dis-tab.c" register_ber_oid_dissector("2.16.840.1.101.3.4.1.2", dissect_AES_IV_PDU, proto_nist_csor, "id-aes128-CBC"); register_ber_oid_dissector("2.16.840.1.101.3.4.1.3", dissect_AES_IV_PDU, proto_nist_csor, "id-aes128-OFB"); register_ber_oid_dissector("2.16.840.1.101.3.4.1.4", dissect_CFBParameters_PDU, proto_nist_csor, "id-aes128-CFB"); @@ -202,9 +166,6 @@ void proto_reg_handoff_nist_csor(void) { register_ber_oid_dissector("2.16.840.1.101.3.4.2.17", dissect_ShakeOutputLen_PDU, proto_nist_csor, "id-shake128-len"); register_ber_oid_dissector("2.16.840.1.101.3.4.2.18", dissect_ShakeOutputLen_PDU, proto_nist_csor, "id-shake256-len"); - -/*--- End of included file: packet-nist-csor-dis-tab.c ---*/ -#line 62 "./asn1/nist-csor/packet-nist-csor-template.c" oid_add_from_string("id-data","1.2.840.113549.1.7.1"); /* AES */ diff --git a/epan/dissectors/packet-nist-csor.h b/epan/dissectors/packet-nist-csor.h index 1eefb558f3..6879c8841d 100644 --- a/epan/dissectors/packet-nist-csor.h +++ b/epan/dissectors/packet-nist-csor.h @@ -3,9 +3,6 @@ /* packet-nist-csor.h */ /* asn2wrs.py -b -L -p nist-csor -c ./nist-csor.cnf -s ./packet-nist-csor-template -D . -O ../.. aes1.asn */ -/* Input file: packet-nist-csor-template.h */ - -#line 1 "./asn1/nist-csor/packet-nist-csor-template.h" /* packet-nist-csor.h * Routines for NIST CSOR * @@ -19,15 +16,9 @@ #ifndef PACKET_NIST_CSOR_H #define PACKET_NIST_CSOR_H - -/*--- Included file: packet-nist-csor-exp.h ---*/ -#line 1 "./asn1/nist-csor/packet-nist-csor-exp.h" int dissect_nist_csor_CFBParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_nist_csor_AES_IV(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_nist_csor_NumberOfBits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_nist_csor_ShakeOutputLen(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-nist-csor-exp.h ---*/ -#line 15 "./asn1/nist-csor/packet-nist-csor-template.h" - #endif /* PACKET_NIST_CSOR_H */ diff --git a/epan/dissectors/packet-novell_pkis.c b/epan/dissectors/packet-novell_pkis.c index 2d7e5428fa..fb3e882142 100644 --- a/epan/dissectors/packet-novell_pkis.c +++ b/epan/dissectors/packet-novell_pkis.c @@ -3,9 +3,6 @@ /* packet-novell_pkis.c */ /* asn2wrs.py -b -u -L -p novell_pkis -c ./novell_pkis.cnf -s ./packet-novell_pkis-template -D . -O ../.. novell_pkis.asn */ -/* Input file: packet-novell_pkis-template.c */ - -#line 1 "./asn1/novell_pkis/packet-novell_pkis-template.c" /* packet-novell_pkis.c * * Wireshark - Network traffic analyzer @@ -27,9 +24,6 @@ #include "packet-per.h" #include "packet-ber.h" - -/*--- Included file: packet-novell_pkis-hf.c ---*/ -#line 1 "./asn1/novell_pkis/packet-novell_pkis-hf.c" static int hf_novell_pkis_SecurityAttributes_PDU = -1; /* SecurityAttributes */ static int hf_novell_pkis_RelianceLimits_PDU = -1; /* RelianceLimits */ static int hf_novell_pkis_versionNumber = -1; /* OCTET_STRING_SIZE_2 */ @@ -75,12 +69,6 @@ static int hf_novell_pkis_perCertificateLimit = -1; /* MonetaryValue */ static int hf_novell_pkis_currency = -1; /* Currency */ static int hf_novell_pkis_amount = -1; /* INTEGER */ static int hf_novell_pkis_amtExp10 = -1; /* INTEGER */ - -/*--- End of included file: packet-novell_pkis-hf.c ---*/ -#line 23 "./asn1/novell_pkis/packet-novell_pkis-template.c" - -/*--- Included file: packet-novell_pkis-ett.c ---*/ -#line 1 "./asn1/novell_pkis/packet-novell_pkis-ett.c" static gint ett_novell_pkis_SecurityAttributes = -1; static gint ett_novell_pkis_GLBExtensions = -1; static gint ett_novell_pkis_Quality = -1; @@ -98,12 +86,6 @@ static gint ett_novell_pkis_SingletonRange = -1; static gint ett_novell_pkis_RelianceLimits = -1; static gint ett_novell_pkis_MonetaryValue = -1; -/*--- End of included file: packet-novell_pkis-ett.c ---*/ -#line 24 "./asn1/novell_pkis/packet-novell_pkis-template.c" - -/*--- Included file: packet-novell_pkis-fn.c ---*/ -#line 1 "./asn1/novell_pkis/packet-novell_pkis-fn.c" - static int dissect_novell_pkis_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -496,9 +478,6 @@ static int dissect_RelianceLimits_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-novell_pkis-fn.c ---*/ -#line 25 "./asn1/novell_pkis/packet-novell_pkis-template.c" - void proto_register_novell_pkis (void); void proto_reg_handoff_novell_pkis(void); @@ -506,23 +485,14 @@ static int proto_novell_pkis = -1; void proto_reg_handoff_novell_pkis(void) { - -/*--- Included file: packet-novell_pkis-dis-tab.c ---*/ -#line 1 "./asn1/novell_pkis/packet-novell_pkis-dis-tab.c" register_ber_oid_dissector("2.16.840.1.113719.1.9.4.1", dissect_SecurityAttributes_PDU, proto_novell_pkis, "pa-sa"); register_ber_oid_dissector("2.16.840.1.113719.1.9.4.2", dissect_RelianceLimits_PDU, proto_novell_pkis, "pa-rl"); - -/*--- End of included file: packet-novell_pkis-dis-tab.c ---*/ -#line 34 "./asn1/novell_pkis/packet-novell_pkis-template.c" } void proto_register_novell_pkis (void) { static hf_register_info hf[] = { - -/*--- Included file: packet-novell_pkis-hfarr.c ---*/ -#line 1 "./asn1/novell_pkis/packet-novell_pkis-hfarr.c" { &hf_novell_pkis_SecurityAttributes_PDU, { "SecurityAttributes", "novell_pkis.SecurityAttributes_element", FT_NONE, BASE_NONE, NULL, 0, @@ -703,14 +673,8 @@ void proto_register_novell_pkis (void) { "amtExp10", "novell_pkis.amtExp10", FT_INT32, BASE_DEC, NULL, 0, "INTEGER", HFILL }}, - -/*--- End of included file: packet-novell_pkis-hfarr.c ---*/ -#line 40 "./asn1/novell_pkis/packet-novell_pkis-template.c" }; static gint *ett[] = { - -/*--- Included file: packet-novell_pkis-ettarr.c ---*/ -#line 1 "./asn1/novell_pkis/packet-novell_pkis-ettarr.c" &ett_novell_pkis_SecurityAttributes, &ett_novell_pkis_GLBExtensions, &ett_novell_pkis_Quality, @@ -727,9 +691,6 @@ void proto_register_novell_pkis (void) &ett_novell_pkis_SingletonRange, &ett_novell_pkis_RelianceLimits, &ett_novell_pkis_MonetaryValue, - -/*--- End of included file: packet-novell_pkis-ettarr.c ---*/ -#line 43 "./asn1/novell_pkis/packet-novell_pkis-template.c" }; /* execute protocol initialization only once */ diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c index 55d83f8494..4c89009e15 100644 --- a/epan/dissectors/packet-nr-rrc.c +++ b/epan/dissectors/packet-nr-rrc.c @@ -3,9 +3,6 @@ /* packet-nr-rrc.c */ /* asn2wrs.py -L -L -p nr-rrc -c ./nr-rrc.cnf -s ./packet-nr-rrc-template -D . -O ../.. NR-InterNodeDefinitions.asn NR-RRC-Definitions.asn PC5-RRC-Definitions.asn */ -/* Input file: packet-nr-rrc-template.c */ - -#line 1 "./asn1/nr-rrc/packet-nr-rrc-template.c" /* packet-nr-rrc-template.c * NR; * Radio Resource Control (RRC) protocol specification @@ -71,9 +68,6 @@ extern int proto_mac_nr; extern int proto_pdcp_nr; /* Include constants */ - -/*--- Included file: packet-nr-rrc-val.h ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-val.h" #define maxMeasFreqsMN 32 #define maxMeasFreqsSN 32 #define maxMeasIdentitiesMN 62 @@ -450,14 +444,8 @@ typedef enum _T_targetRAT_Type_enum { T_targetRAT_Type_spare1 = 3 } T_targetRAT_Type_enum; -/*--- End of included file: packet-nr-rrc-val.h ---*/ -#line 67 "./asn1/nr-rrc/packet-nr-rrc-template.c" - /* Initialize the protocol and registered fields */ static int proto_nr_rrc = -1; - -/*--- Included file: packet-nr-rrc-hf.c ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-hf.c" static int hf_nr_rrc_nr_rrc_HandoverCommand_PDU = -1; /* HandoverCommand */ static int hf_nr_rrc_nr_rrc_HandoverPreparationInformation_PDU = -1; /* HandoverPreparationInformation */ static int hf_nr_rrc_nr_rrc_CG_Config_PDU = -1; /* CG_Config */ @@ -9416,9 +9404,6 @@ static int hf_nr_rrc_sl_SIB1_Delivery_r17 = -1; /* T_sl_SIB1_Delivery_r17 */ static int hf_nr_rrc_sl_SystemInformationDelivery_r17 = -1; /* T_sl_SystemInformationDelivery_r17 */ static int hf_nr_rrc_nonCriticalExtension_157 = -1; /* T_nonCriticalExtension_67 */ static int dummy_hf_nr_rrc_eag_field = -1; /* never registered */ - -/*--- End of included file: packet-nr-rrc-hf.c ---*/ -#line 71 "./asn1/nr-rrc/packet-nr-rrc-template.c" static int hf_nr_rrc_serialNumber_gs = -1; static int hf_nr_rrc_serialNumber_msg_code = -1; static int hf_nr_rrc_serialNumber_upd_nb = -1; @@ -9455,9 +9440,6 @@ static int hf_nr_rrc_absolute_time = -1; /* Initialize the subtree pointers */ static gint ett_nr_rrc = -1; - -/*--- Included file: packet-nr-rrc-ett.c ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-ett.c" static gint ett_nr_rrc_HandoverCommand = -1; static gint ett_nr_rrc_T_criticalExtensions = -1; static gint ett_nr_rrc_T_c1 = -1; @@ -12921,9 +12903,6 @@ static gint ett_nr_rrc_T_criticalExtensions_60 = -1; static gint ett_nr_rrc_T_criticalExtensionsFuture_60 = -1; static gint ett_nr_rrc_UuMessageTransferSidelink_r17_IEs = -1; static gint ett_nr_rrc_T_nonCriticalExtension_67 = -1; - -/*--- End of included file: packet-nr-rrc-ett.c ---*/ -#line 108 "./asn1/nr-rrc/packet-nr-rrc-template.c" static gint ett_nr_rrc_DedicatedNAS_Message = -1; static gint ett_nr_rrc_targetRAT_MessageContainer = -1; static gint ett_nr_rrc_nas_Container = -1; @@ -13607,9 +13586,6 @@ dissect_nr_rrc_handovercommand_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, pr } - -/*--- Included file: packet-nr-rrc-fn.c ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-fn.c" /*--- PDUs declarations ---*/ static int dissect_MeasResultList2NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_UE_RadioPagingInfo_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -132400,9 +132376,6 @@ static int dissect_PagingRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-nr-rrc-fn.c ---*/ -#line 792 "./asn1/nr-rrc/packet-nr-rrc-template.c" - int dissect_nr_rrc_nr_RLF_Report_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); @@ -132445,9 +132418,6 @@ proto_register_nr_rrc(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-nr-rrc-hfarr.c ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-hfarr.c" { &hf_nr_rrc_nr_rrc_HandoverCommand_PDU, { "HandoverCommand", "nr-rrc.HandoverCommand_element", FT_NONE, BASE_NONE, NULL, 0, @@ -168277,9 +168247,6 @@ proto_register_nr_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "T_nonCriticalExtension_67", HFILL }}, -/*--- End of included file: packet-nr-rrc-hfarr.c ---*/ -#line 836 "./asn1/nr-rrc/packet-nr-rrc-template.c" - { &hf_nr_rrc_serialNumber_gs, { "Geographical Scope", "nr-rrc.serialNumber.gs", FT_UINT16, BASE_DEC, VALS(nr_rrc_serialNumber_gs_vals), 0xc000, @@ -168416,9 +168383,6 @@ proto_register_nr_rrc(void) { static gint *ett[] = { &ett_nr_rrc, - -/*--- Included file: packet-nr-rrc-ettarr.c ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-ettarr.c" &ett_nr_rrc_HandoverCommand, &ett_nr_rrc_T_criticalExtensions, &ett_nr_rrc_T_c1, @@ -171882,9 +171846,6 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_T_criticalExtensionsFuture_60, &ett_nr_rrc_UuMessageTransferSidelink_r17_IEs, &ett_nr_rrc_T_nonCriticalExtension_67, - -/*--- End of included file: packet-nr-rrc-ettarr.c ---*/ -#line 974 "./asn1/nr-rrc/packet-nr-rrc-template.c" &ett_nr_rrc_DedicatedNAS_Message, &ett_nr_rrc_targetRAT_MessageContainer, &ett_nr_rrc_nas_Container, @@ -171976,9 +171937,6 @@ proto_register_nr_rrc(void) { register_dissector("nr-rrc.handoverpreparationinformation_msg", dissect_nr_rrc_handoverpreparationinformation_msg, proto_nr_rrc); register_dissector("nr-rrc.handovercommand_msg", dissect_nr_rrc_handovercommand_msg, proto_nr_rrc); - -/*--- Included file: packet-nr-rrc-dis-reg.c ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-dis-reg.c" register_dissector("nr-rrc.ue_radio_paging_info", dissect_nr_rrc_UERadioPagingInformation_PDU, proto_nr_rrc); register_dissector("nr-rrc.ue_radio_access_cap_info", dissect_UERadioAccessCapabilityInformation_PDU, proto_nr_rrc); register_dissector("nr-rrc.bcch.bch", dissect_BCCH_BCH_Message_PDU, proto_nr_rrc); @@ -171998,9 +171956,6 @@ proto_register_nr_rrc(void) { register_dissector("nr-rrc.scch", dissect_SCCH_Message_PDU, proto_nr_rrc); -/*--- End of included file: packet-nr-rrc-dis-reg.c ---*/ -#line 1066 "./asn1/nr-rrc/packet-nr-rrc-template.c" - nr_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); diff --git a/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h index 04f3860c61..8ced0d9720 100644 --- a/epan/dissectors/packet-nr-rrc.h +++ b/epan/dissectors/packet-nr-rrc.h @@ -3,9 +3,6 @@ /* packet-nr-rrc.h */ /* asn2wrs.py -L -L -p nr-rrc -c ./nr-rrc.cnf -s ./packet-nr-rrc-template -D . -O ../.. NR-InterNodeDefinitions.asn NR-RRC-Definitions.asn PC5-RRC-Definitions.asn */ -/* Input file: packet-nr-rrc-template.h */ - -#line 1 "./asn1/nr-rrc/packet-nr-rrc-template.h" /* packet-nr-rrc-template.h * Copyright 2018-2022, Pascal Quantin * @@ -19,9 +16,6 @@ #ifndef PACKET_NR_RRC_H #define PACKET_NR_RRC_H - -/*--- Included file: packet-nr-rrc-exp.h ---*/ -#line 1 "./asn1/nr-rrc/packet-nr-rrc-exp.h" int dissect_nr_rrc_HandoverCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_nr_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_nr_rrc_CG_Config_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -110,9 +104,6 @@ int dissect_nr_rrc_SL_PHY_MAC_RLC_Config_r16_PDU(tvbuff_t *tvb _U_, packet_info int dissect_nr_rrc_SL_RLC_ChannelToAddModList_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_nr_rrc_MBS_NeighbourCellList_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_nr_rrc_MRB_PDCP_ConfigBroadcast_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); - -/*--- End of included file: packet-nr-rrc-exp.h ---*/ -#line 15 "./asn1/nr-rrc/packet-nr-rrc-template.h" int dissect_nr_rrc_nr_RLF_Report_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_nr_rrc_subCarrierSpacingCommon_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_nr_rrc_rach_ConfigCommonIAB_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); diff --git a/epan/dissectors/packet-nrppa.c b/epan/dissectors/packet-nrppa.c index cf91e77648..128cf5847a 100644 --- a/epan/dissectors/packet-nrppa.c +++ b/epan/dissectors/packet-nrppa.c @@ -3,9 +3,6 @@ /* packet-nrppa.c */ /* asn2wrs.py -L -p nrppa -c ./nrppa.cnf -s ./packet-nrppa-template -D . -O ../.. NRPPA-CommonDataTypes.asn NRPPA-Constants.asn NRPPA-Containers.asn NRPPA-PDU-Descriptions.asn NRPPA-IEs.asn NRPPA-PDU-Contents.asn */ -/* Input file: packet-nrppa-template.c */ - -#line 1 "./asn1/nrppa/packet-nrppa-template.c" /* packet-nrppa.c * Routines for 3GPP NR Positioning Protocol A (NRPPa) packet dissection * Copyright 2019, Anders Broman @@ -38,9 +35,6 @@ void proto_reg_handoff_nrppa(void); /* Initialize the protocol and registered fields */ static int proto_nrppa = -1; - -/*--- Included file: packet-nrppa-hf.c ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-hf.c" static int hf_nrppa_NRPPA_PDU_PDU = -1; /* NRPPA_PDU */ static int hf_nrppa_AbortTransmission_PDU = -1; /* AbortTransmission */ static int hf_nrppa_nrppa_Assistance_Information_PDU = -1; /* Assistance_Information */ @@ -625,14 +619,8 @@ static int hf_nrppa_sRSResourceSetID_01 = -1; /* SRSResourceSetID */ static int hf_nrppa_aperiodic_04 = -1; /* T_aperiodic */ static int hf_nrppa_sRSResourceTrigger_01 = -1; /* SRSResourceTrigger */ -/*--- End of included file: packet-nrppa-hf.c ---*/ -#line 34 "./asn1/nrppa/packet-nrppa-template.c" - /* Initialize the subtree pointers */ static gint ett_nrppa = -1; - -/*--- Included file: packet-nrppa-ett.c ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-ett.c" static gint ett_nrppa_PrivateIE_ID = -1; static gint ett_nrppa_ProtocolIE_Container = -1; static gint ett_nrppa_ProtocolIE_Field = -1; @@ -889,9 +877,6 @@ static gint ett_nrppa_PositioningActivationResponse = -1; static gint ett_nrppa_PositioningActivationFailure = -1; static gint ett_nrppa_PositioningDeactivation = -1; -/*--- End of included file: packet-nrppa-ett.c ---*/ -#line 38 "./asn1/nrppa/packet-nrppa-template.c" - /* Global variables */ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; @@ -904,9 +889,6 @@ static dissector_table_t nrppa_proc_sout_dissector_table; static dissector_table_t nrppa_proc_uout_dissector_table; /* Include constants */ - -/*--- Included file: packet-nrppa-val.h ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -1039,9 +1021,6 @@ typedef enum _ProtocolIE_ID_enum { id_SRSSpatialRelationPerSRSResource = 63 } ProtocolIE_ID_enum; -/*--- End of included file: packet-nrppa-val.h ---*/ -#line 52 "./asn1/nrppa/packet-nrppa-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); @@ -1049,9 +1028,6 @@ static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, pro static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); -/*--- Included file: packet-nrppa-fn.c ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-fn.c" - static const value_string nrppa_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -9161,9 +9137,6 @@ static int dissect_PositioningDeactivation_PDU(tvbuff_t *tvb _U_, packet_info *p } -/*--- End of included file: packet-nrppa-fn.c ---*/ -#line 60 "./asn1/nrppa/packet-nrppa-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint_new(nrppa_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; @@ -9195,9 +9168,6 @@ void proto_register_nrppa(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-nrppa-hfarr.c ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-hfarr.c" { &hf_nrppa_NRPPA_PDU_PDU, { "NRPPA-PDU", "nrppa.NRPPA_PDU", FT_UINT32, BASE_DEC, VALS(nrppa_NRPPA_PDU_vals), 0, @@ -11530,17 +11500,11 @@ void proto_register_nrppa(void) { { "sRSResourceTrigger", "nrppa.sRSResourceTrigger_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-nrppa-hfarr.c ---*/ -#line 93 "./asn1/nrppa/packet-nrppa-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_nrppa, - -/*--- Included file: packet-nrppa-ettarr.c ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-ettarr.c" &ett_nrppa_PrivateIE_ID, &ett_nrppa_ProtocolIE_Container, &ett_nrppa_ProtocolIE_Field, @@ -11796,9 +11760,6 @@ void proto_register_nrppa(void) { &ett_nrppa_PositioningActivationResponse, &ett_nrppa_PositioningActivationFailure, &ett_nrppa_PositioningDeactivation, - -/*--- End of included file: packet-nrppa-ettarr.c ---*/ -#line 99 "./asn1/nrppa/packet-nrppa-template.c" }; /* Register protocol */ @@ -11821,9 +11782,6 @@ void proto_register_nrppa(void) { void proto_reg_handoff_nrppa(void) { - -/*--- Included file: packet-nrppa-dis-tab.c ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-dis-tab.c" dissector_add_uint("nrppa.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_nrppa)); dissector_add_uint("nrppa.ies", id_CriticalityDiagnostics, create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_nrppa)); dissector_add_uint("nrppa.ies", id_LMF_UE_Measurement_ID, create_dissector_handle(dissect_UE_Measurement_ID_PDU, proto_nrppa)); @@ -11913,7 +11871,4 @@ proto_reg_handoff_nrppa(void) dissector_add_uint("nrppa.proc.uout", id_positioningActivation, create_dissector_handle(dissect_PositioningActivationFailure_PDU, proto_nrppa)); dissector_add_uint("nrppa.proc.imsg", id_positioningDeactivation, create_dissector_handle(dissect_PositioningDeactivation_PDU, proto_nrppa)); - -/*--- End of included file: packet-nrppa-dis-tab.c ---*/ -#line 122 "./asn1/nrppa/packet-nrppa-template.c" } diff --git a/epan/dissectors/packet-nrppa.h b/epan/dissectors/packet-nrppa.h index e9e7621dfc..5a1efb1f8b 100644 --- a/epan/dissectors/packet-nrppa.h +++ b/epan/dissectors/packet-nrppa.h @@ -3,9 +3,6 @@ /* packet-nrppa.h */ /* asn2wrs.py -L -p nrppa -c ./nrppa.cnf -s ./packet-nrppa-template -D . -O ../.. NRPPA-CommonDataTypes.asn NRPPA-Constants.asn NRPPA-Containers.asn NRPPA-PDU-Descriptions.asn NRPPA-IEs.asn NRPPA-PDU-Contents.asn */ -/* Input file: packet-nrppa-template.h */ - -#line 1 "./asn1/nrppa/packet-nrppa-template.h" /* packet-nrppa.h * Routines for 3GPP NR Positioning Protocol A (NRPPa) packet dissection * @@ -19,14 +16,8 @@ #ifndef PACKET_NRPPA_H #define PACKET_NRPPA_H - -/*--- Included file: packet-nrppa-exp.h ---*/ -#line 1 "./asn1/nrppa/packet-nrppa-exp.h" int dissect_nrppa_Assistance_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-nrppa-exp.h ---*/ -#line 15 "./asn1/nrppa/packet-nrppa-template.h" - #endif /* PACKET_NRPPA_H */ /* diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index a2f12f2156..d51a21e6fe 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -3,9 +3,6 @@ /* packet-ns_cert_exts.c */ /* asn2wrs.py -b -L -p ns_cert_exts -c ./ns_cert_exts.cnf -s ./packet-ns_cert_exts-template -D . -O ../.. NETSCAPE-CERT-EXTS.asn */ -/* Input file: packet-ns_cert_exts-template.c */ - -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /* packet-ns_cert_exts.c * Routines for NetScape Certificate Extensions packet dissection * Ronnie Sahlberg 2004 @@ -32,9 +29,6 @@ void proto_reg_handoff_ns_cert_exts(void); /* Initialize the protocol and registered fields */ static int proto_ns_cert_exts = -1; - -/*--- Included file: packet-ns_cert_exts-hf.c ---*/ -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-hf.c" static int hf_ns_cert_exts_BaseUrl_PDU = -1; /* BaseUrl */ static int hf_ns_cert_exts_RevocationUrl_PDU = -1; /* RevocationUrl */ static int hf_ns_cert_exts_CaRevocationUrl_PDU = -1; /* CaRevocationUrl */ @@ -53,21 +47,9 @@ static int hf_ns_cert_exts_CertType_ssl_ca = -1; static int hf_ns_cert_exts_CertType_smime_ca = -1; static int hf_ns_cert_exts_CertType_object_signing_ca = -1; -/*--- End of included file: packet-ns_cert_exts-hf.c ---*/ -#line 28 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-ns_cert_exts-ett.c ---*/ -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-ett.c" static gint ett_ns_cert_exts_CertType = -1; -/*--- End of included file: packet-ns_cert_exts-ett.c ---*/ -#line 31 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" - - -/*--- Included file: packet-ns_cert_exts-fn.c ---*/ -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-fn.c" static int @@ -227,18 +209,12 @@ static int dissect_CertType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-ns_cert_exts-fn.c ---*/ -#line 33 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" - /*--- proto_register_ns_cert_exts -------------------------------------------*/ void proto_register_ns_cert_exts(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-hfarr.c" { &hf_ns_cert_exts_BaseUrl_PDU, { "BaseUrl", "ns_cert_exts.BaseUrl", FT_STRING, BASE_NONE, NULL, 0, @@ -303,20 +279,11 @@ void proto_register_ns_cert_exts(void) { { "object-signing-ca", "ns.cert.exts.CertType.object.signing.ca", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - -/*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 41 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-ns_cert_exts-ettarr.c ---*/ -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-ettarr.c" &ett_ns_cert_exts_CertType, - -/*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/ -#line 46 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* Register protocol */ @@ -331,9 +298,6 @@ void proto_register_ns_cert_exts(void) { /*--- proto_reg_handoff_ns_cert_exts ---------------------------------------*/ void proto_reg_handoff_ns_cert_exts(void) { - -/*--- Included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 1 "./asn1/ns_cert_exts/packet-ns_cert_exts-dis-tab.c" register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns_cert_exts.cert_type"); register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.base_url"); register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns_cert_exts.revocation-url"); @@ -343,8 +307,5 @@ void proto_reg_handoff_ns_cert_exts(void) { register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns_cert_exts.ssl-server-name"); register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns_cert_exts.comment"); - -/*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 61 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" } diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 0c6e08edf8..a181997363 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -3,9 +3,6 @@ /* packet-ocsp.c */ /* asn2wrs.py -b -L -p ocsp -c ./ocsp.cnf -s ./packet-ocsp-template -D . -O ../.. OCSP.asn */ -/* Input file: packet-ocsp-template.c */ - -#line 1 "./asn1/ocsp/packet-ocsp-template.c" /* packet-ocsp.c * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 @@ -40,9 +37,6 @@ void proto_reg_handoff_ocsp(void); /* Initialize the protocol and registered fields */ int proto_ocsp = -1; static int hf_ocsp_responseType_id = -1; - -/*--- Included file: packet-ocsp-hf.c ---*/ -#line 1 "./asn1/ocsp/packet-ocsp-hf.c" static int hf_ocsp_BasicOCSPResponse_PDU = -1; /* BasicOCSPResponse */ static int hf_ocsp_ArchiveCutoff_PDU = -1; /* ArchiveCutoff */ static int hf_ocsp_AcceptableResponses_PDU = -1; /* AcceptableResponses */ @@ -96,14 +90,8 @@ static int hf_ocsp_crlUrl = -1; /* IA5String */ static int hf_ocsp_crlNum = -1; /* INTEGER */ static int hf_ocsp_crlTime = -1; /* GeneralizedTime */ -/*--- End of included file: packet-ocsp-hf.c ---*/ -#line 36 "./asn1/ocsp/packet-ocsp-template.c" - /* Initialize the subtree pointers */ static gint ett_ocsp = -1; - -/*--- Included file: packet-ocsp-ett.c ---*/ -#line 1 "./asn1/ocsp/packet-ocsp-ett.c" static gint ett_ocsp_OCSPRequest = -1; static gint ett_ocsp_TBSRequest = -1; static gint ett_ocsp_SEQUENCE_OF_Request = -1; @@ -124,12 +112,6 @@ static gint ett_ocsp_AcceptableResponses = -1; static gint ett_ocsp_ServiceLocator = -1; static gint ett_ocsp_CrlID = -1; -/*--- End of included file: packet-ocsp-ett.c ---*/ -#line 40 "./asn1/ocsp/packet-ocsp-template.c" - - -/*--- Included file: packet-ocsp-fn.c ---*/ -#line 1 "./asn1/ocsp/packet-ocsp-fn.c" static int @@ -658,9 +640,6 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } -/*--- End of included file: packet-ocsp-fn.c ---*/ -#line 42 "./asn1/ocsp/packet-ocsp-template.c" - static int dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) @@ -714,9 +693,6 @@ void proto_register_ocsp(void) { { "ResponseType Id", "ocsp.responseType.id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-ocsp-hfarr.c ---*/ -#line 1 "./asn1/ocsp/packet-ocsp-hfarr.c" { &hf_ocsp_BasicOCSPResponse_PDU, { "BasicOCSPResponse", "ocsp.BasicOCSPResponse_element", FT_NONE, BASE_NONE, NULL, 0, @@ -925,17 +901,11 @@ void proto_register_ocsp(void) { { "crlTime", "ocsp.crlTime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, "GeneralizedTime", HFILL }}, - -/*--- End of included file: packet-ocsp-hfarr.c ---*/ -#line 97 "./asn1/ocsp/packet-ocsp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_ocsp, - -/*--- Included file: packet-ocsp-ettarr.c ---*/ -#line 1 "./asn1/ocsp/packet-ocsp-ettarr.c" &ett_ocsp_OCSPRequest, &ett_ocsp_TBSRequest, &ett_ocsp_SEQUENCE_OF_Request, @@ -955,9 +925,6 @@ void proto_register_ocsp(void) { &ett_ocsp_AcceptableResponses, &ett_ocsp_ServiceLocator, &ett_ocsp_CrlID, - -/*--- End of included file: packet-ocsp-ettarr.c ---*/ -#line 103 "./asn1/ocsp/packet-ocsp-template.c" }; /* Register protocol */ @@ -980,9 +947,6 @@ void proto_reg_handoff_ocsp(void) { dissector_add_string("media_type", "application/ocsp-request", ocsp_request_handle); dissector_add_string("media_type", "application/ocsp-response", ocsp_response_handle); - -/*--- Included file: packet-ocsp-dis-tab.c ---*/ -#line 1 "./asn1/ocsp/packet-ocsp-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.1", dissect_BasicOCSPResponse_PDU, proto_ocsp, "id-pkix-ocsp-basic"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.2", dissect_ReOcspNonce_PDU, proto_ocsp, "id-pkix-ocsp-nonce"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl"); @@ -991,8 +955,5 @@ void proto_reg_handoff_ocsp(void) { register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.6", dissect_ArchiveCutoff_PDU, proto_ocsp, "id-pkix-ocsp-archive-cutoff"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.7", dissect_ServiceLocator_PDU, proto_ocsp, "id-pkix-ocsp-service-locator"); - -/*--- End of included file: packet-ocsp-dis-tab.c ---*/ -#line 126 "./asn1/ocsp/packet-ocsp-template.c" } diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h index 7d52f2f0b9..0b4690735b 100644 --- a/epan/dissectors/packet-ocsp.h +++ b/epan/dissectors/packet-ocsp.h @@ -3,9 +3,6 @@ /* packet-ocsp.h */ /* asn2wrs.py -b -L -p ocsp -c ./ocsp.cnf -s ./packet-ocsp-template -D . -O ../.. OCSP.asn */ -/* Input file: packet-ocsp-template.h */ - -#line 1 "./asn1/ocsp/packet-ocsp-template.h" /* packet-ocsp.h * Routines for Online Certificate Status Protocol (RFC2560) packet dissection * Ronnie Sahlberg 2004 diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 150279f715..9ede7b40d8 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -3,9 +3,6 @@ /* packet-p1.c */ /* asn2wrs.py -b -C -L -p p1 -c ./p1.cnf -s ./packet-p1-template -D . -O ../.. MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn MTSUpperBounds.asn */ -/* Input file: packet-p1-template.c */ - -#line 1 "./asn1/p1/packet-p1-template.c" /* packet-p1.c * Routines for X.411 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 @@ -52,9 +49,6 @@ static int hf_p1_MTABindArgument_PDU = -1; static int hf_p1_MTABindResult_PDU = -1; static int hf_p1_MTABindError_PDU = -1; - -/*--- Included file: packet-p1-hf.c ---*/ -#line 1 "./asn1/p1/packet-p1-hf.c" static int hf_p1_InternalTraceInformation_PDU = -1; /* InternalTraceInformation */ static int hf_p1_InternalTraceInformationElement_PDU = -1; /* InternalTraceInformationElement */ static int hf_p1_TraceInformation_PDU = -1; /* TraceInformation */ @@ -673,9 +667,6 @@ static int hf_p1_G3FacsimileNonBasicParameters_spare_bit69 = -1; static int hf_p1_G3FacsimileNonBasicParameters_spare_bit70 = -1; static int hf_p1_G3FacsimileNonBasicParameters_processable_mode_26 = -1; -/*--- End of included file: packet-p1-hf.c ---*/ -#line 48 "./asn1/p1/packet-p1-template.c" - /* Initialize the subtree pointers */ static gint ett_p1 = -1; static gint ett_p3 = -1; @@ -685,9 +676,6 @@ static gint ett_p1_additional_information = -1; static gint ett_p1_unknown_standard_extension = -1; static gint ett_p1_unknown_extension_attribute_type = -1; static gint ett_p1_unknown_tokendata_type = -1; - -/*--- Included file: packet-p1-ett.c ---*/ -#line 1 "./asn1/p1/packet-p1-ett.c" static gint ett_p1_MTABindArgument = -1; static gint ett_p1_AuthenticatedArgument = -1; static gint ett_p1_MTABindResult = -1; @@ -868,9 +856,6 @@ static gint ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportDeliveryFi static gint ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmissionFields = -1; static gint ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields = -1; -/*--- End of included file: packet-p1-ett.c ---*/ -#line 59 "./asn1/p1/packet-p1-template.c" - static expert_field ei_p1_unknown_extension_attribute_type = EI_INIT; static expert_field ei_p1_unknown_standard_extension = EI_INIT; static expert_field ei_p1_unknown_built_in_content_type = EI_INIT; @@ -886,9 +871,6 @@ static dissector_table_t p1_tokendata_dissector_table; static dissector_handle_t p1_handle; -/*--- Included file: packet-p1-table.c ---*/ -#line 1 "./asn1/p1/packet-p1-table.c" - /* P3 ABSTRACT-OPERATIONS */ const value_string p3_opr_code_string_vals[] = { { op_ros_bind, "mts_bind" }, @@ -928,9 +910,6 @@ static const value_string p3_err_code_string_vals[] = { }; -/*--- End of included file: packet-p1-table.c ---*/ -#line 75 "./asn1/p1/packet-p1-template.c" - typedef struct p1_address_ctx { gboolean do_address; const char *content_type_id; @@ -1004,9 +983,6 @@ static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx } -/*--- Included file: packet-p1-fn.c ---*/ -#line 1 "./asn1/p1/packet-p1-fn.c" - static int dissect_p1_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -8326,12 +8302,6 @@ static int dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *pi } -/*--- End of included file: packet-p1-fn.c ---*/ -#line 149 "./asn1/p1/packet-p1-template.c" - - -/*--- Included file: packet-p1-table11.c ---*/ -#line 1 "./asn1/p1/packet-p1-table11.c" static const ros_opr_t p3_opr_tab[] = { /* mts-bind */ @@ -8358,12 +8328,6 @@ static const ros_opr_t p3_opr_tab[] = { }; -/*--- End of included file: packet-p1-table11.c ---*/ -#line 151 "./asn1/p1/packet-p1-template.c" - -/*--- Included file: packet-p1-table21.c ---*/ -#line 1 "./asn1/p1/packet-p1-table21.c" - static const ros_err_t p3_err_tab[] = { /* mts-bind-error*/ { err_ros_bind, dissect_PAR_mts_bind_error_PDU }, @@ -8403,9 +8367,6 @@ static const ros_err_t p3_err_tab[] = { }; -/*--- End of included file: packet-p1-table21.c ---*/ -#line 152 "./asn1/p1/packet-p1-template.c" - static const ros_info_t p3_ros_info = { "P3", &proto_p3, @@ -8573,9 +8534,6 @@ void proto_register_p1(void) { FT_UINT32, BASE_DEC, VALS(p1_MTS_APDU_vals), 0, "p1.MTS_APDU", HFILL }}, - -/*--- Included file: packet-p1-hfarr.c ---*/ -#line 1 "./asn1/p1/packet-p1-hfarr.c" { &hf_p1_InternalTraceInformation_PDU, { "InternalTraceInformation", "p1.InternalTraceInformation", FT_UINT32, BASE_DEC, NULL, 0, @@ -11040,9 +10998,6 @@ void proto_register_p1(void) { { "processable-mode-26", "p1.G3FacsimileNonBasicParameters.processable.mode.26", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - -/*--- End of included file: packet-p1-hfarr.c ---*/ -#line 321 "./asn1/p1/packet-p1-template.c" }; /* List of subtrees */ @@ -11055,9 +11010,6 @@ void proto_register_p1(void) { &ett_p1_unknown_standard_extension, &ett_p1_unknown_extension_attribute_type, &ett_p1_unknown_tokendata_type, - -/*--- Included file: packet-p1-ettarr.c ---*/ -#line 1 "./asn1/p1/packet-p1-ettarr.c" &ett_p1_MTABindArgument, &ett_p1_AuthenticatedArgument, &ett_p1_MTABindResult, @@ -11237,9 +11189,6 @@ void proto_register_p1(void) { &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportDeliveryFields, &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmissionFields, &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, - -/*--- End of included file: packet-p1-ettarr.c ---*/ -#line 334 "./asn1/p1/packet-p1-template.c" }; static ei_register_info ei[] = { @@ -11283,23 +11232,14 @@ void proto_register_p1(void) { "P1 TCP Port preference moved information"); register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); - -/*--- Included file: packet-p1-syn-reg.c ---*/ -#line 1 "./asn1/p1/packet-p1-syn-reg.c" /*--- Syntax registrations ---*/ register_ber_syntax_dissector("ORAddress", proto_p1, dissect_ORAddress_PDU); register_ber_syntax_dissector("ORName", proto_p1, dissect_ORName_PDU); - -/*--- End of included file: packet-p1-syn-reg.c ---*/ -#line 378 "./asn1/p1/packet-p1-template.c" } /*--- proto_reg_handoff_p1 --- */ void proto_reg_handoff_p1(void) { - -/*--- Included file: packet-p1-dis-tab.c ---*/ -#line 1 "./asn1/p1/packet-p1-dis-tab.c" dissector_add_uint("p1.extension", 1, create_dissector_handle(dissect_RecipientReassignmentProhibited_PDU, proto_p1)); dissector_add_uint("p1.extension", 2, create_dissector_handle(dissect_OriginatorRequestedAlternateRecipient_PDU, proto_p1)); dissector_add_uint("p1.extension", 3, create_dissector_handle(dissect_DLExpansionProhibited_PDU, proto_p1)); @@ -11454,9 +11394,6 @@ void proto_reg_handoff_p1(void) { register_ber_oid_dissector("2.6.1.7.36", dissect_MessageToken_PDU, proto_p1, "id-hat-forwarded-token"); -/*--- End of included file: packet-p1-dis-tab.c ---*/ -#line 384 "./asn1/p1/packet-p1-template.c" - /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-mts-transfer","2.6.0.1.6"); diff --git a/epan/dissectors/packet-p1.h b/epan/dissectors/packet-p1.h index d6a42f4bf1..fd2fe7ed47 100644 --- a/epan/dissectors/packet-p1.h +++ b/epan/dissectors/packet-p1.h @@ -3,9 +3,6 @@ /* packet-p1.h */ /* asn2wrs.py -b -C -L -p p1 -c ./p1.cnf -s ./packet-p1-template -D . -O ../.. MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn MTSUpperBounds.asn */ -/* Input file: packet-p1-template.h */ - -#line 1 "./asn1/p1/packet-p1-template.h" /* packet-p3.h * Routines for X.411 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 @@ -20,9 +17,6 @@ #ifndef PACKET_P1_H #define PACKET_P1_H - -/*--- Included file: packet-p1-val.h ---*/ -#line 1 "./asn1/p1/packet-p1-val.h" #define op_message_submission 3 #define op_probe_submission 4 #define op_cancel_deferred_delivery 7 @@ -157,15 +151,9 @@ #define ub_universal_surname_length 64 #define ub_x121_address_length 16 -/*--- End of included file: packet-p1-val.h ---*/ -#line 16 "./asn1/p1/packet-p1-template.h" - void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean report_unknown_cont_type); const char* p1_get_last_oraddress(asn1_ctx_t* actx); int dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data); - -/*--- Included file: packet-p1-exp.h ---*/ -#line 1 "./asn1/p1/packet-p1-exp.h" extern const value_string p1_Credentials_vals[]; extern const value_string p1_SecurityProblem_vals[]; extern const value_string p1_ContentType_vals[]; @@ -218,9 +206,6 @@ int dissect_p1_TeletexNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tv int dissect_p1_SecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_p1_MessageSecurityLabel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-p1-exp.h ---*/ -#line 21 "./asn1/p1/packet-p1-template.h" - void proto_reg_handoff_p1(void); void proto_register_p1(void); diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index c3fe89ea58..c40b0e9e6c 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -3,9 +3,6 @@ /* packet-p22.c */ /* asn2wrs.py -b -C -L -p p22 -c ./p22.cnf -s ./packet-p22-template -D . -O ../.. IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn IPMSUpperBounds.asn */ -/* Input file: packet-p22-template.c */ - -#line 1 "./asn1/p22/packet-p22-template.c" /* packet-p22.c * Routines for X.420 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 @@ -71,9 +68,6 @@ static const value_string charsetreg_vals [] = { { 0, NULL} }; - -/*--- Included file: packet-p22-val.h ---*/ -#line 1 "./asn1/p22/packet-p22-val.h" #define id_ipms "2.6.1" #define id_mod id_ipms".0" #define id_ot id_ipms".1" @@ -322,12 +316,6 @@ static const value_string charsetreg_vals [] = { #define ub_subject_field 128 #define ub_telephone_number 32 -/*--- End of included file: packet-p22-val.h ---*/ -#line 67 "./asn1/p22/packet-p22-template.c" - - -/*--- Included file: packet-p22-hf.c ---*/ -#line 1 "./asn1/p22/packet-p22-hf.c" static int hf_p22_InformationObject_PDU = -1; /* InformationObject */ static int hf_p22_Heading_PDU = -1; /* Heading */ static int hf_p22_ORDescriptor_PDU = -1; /* ORDescriptor */ @@ -707,14 +695,8 @@ static int hf_p22_RecipientSecurityRequest_content_proof = -1; static int hf_p22_RecipientSecurityRequest_ipn_non_repudiation = -1; static int hf_p22_RecipientSecurityRequest_ipn_proof = -1; -/*--- End of included file: packet-p22-hf.c ---*/ -#line 69 "./asn1/p22/packet-p22-template.c" - /* Initialize the subtree pointers */ static gint ett_p22 = -1; - -/*--- Included file: packet-p22-ett.c ---*/ -#line 1 "./asn1/p22/packet-p22-ett.c" static gint ett_p22_InformationObject = -1; static gint ett_p22_IPM = -1; static gint ett_p22_IPMSExtension = -1; @@ -841,12 +823,6 @@ static gint ett_p22_ForwardedContentToken_item = -1; static gint ett_p22_T_body_part_token_choice = -1; static gint ett_p22_T_choice = -1; -/*--- End of included file: packet-p22-ett.c ---*/ -#line 73 "./asn1/p22/packet-p22-template.c" - - -/*--- Included file: packet-p22-fn.c ---*/ -#line 1 "./asn1/p22/packet-p22-fn.c" /*--- Cyclic dependencies ---*/ /* IPM -> Body -> BodyPart -> BodyPart/basic -> MessageBodyPart -> MessageData -> IPM */ @@ -4636,9 +4612,6 @@ static int dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pin } -/*--- End of included file: packet-p22-fn.c ---*/ -#line 75 "./asn1/p22/packet-p22-template.c" - /* * Dissect P22 PDUs inside a PPDU. */ @@ -4670,9 +4643,6 @@ void proto_register_p22(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-p22-hfarr.c ---*/ -#line 1 "./asn1/p22/packet-p22-hfarr.c" { &hf_p22_InformationObject_PDU, { "InformationObject", "p22.InformationObject", FT_UINT32, BASE_DEC, VALS(p22_InformationObject_vals), 0, @@ -6181,17 +6151,11 @@ void proto_register_p22(void) { { "ipn-proof", "p22.RecipientSecurityRequest.ipn.proof", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-p22-hfarr.c ---*/ -#line 108 "./asn1/p22/packet-p22-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_p22, - -/*--- Included file: packet-p22-ettarr.c ---*/ -#line 1 "./asn1/p22/packet-p22-ettarr.c" &ett_p22_InformationObject, &ett_p22_IPM, &ett_p22_IPMSExtension, @@ -6317,9 +6281,6 @@ void proto_register_p22(void) { &ett_p22_ForwardedContentToken_item, &ett_p22_T_body_part_token_choice, &ett_p22_T_choice, - -/*--- End of included file: packet-p22-ettarr.c ---*/ -#line 114 "./asn1/p22/packet-p22-template.c" }; /* Register protocol */ @@ -6335,9 +6296,6 @@ void proto_register_p22(void) { /*--- proto_reg_handoff_p22 --- */ void proto_reg_handoff_p22(void) { - -/*--- Included file: packet-p22-dis-tab.c ---*/ -#line 1 "./asn1/p22/packet-p22-dis-tab.c" register_ber_oid_dissector("2.6.1.19.0", dissect_AbsenceAdvice_PDU, proto_p22, "id-on-absence-advice"); register_ber_oid_dissector("2.6.1.19.1", dissect_ChangeOfAddressAdvice_PDU, proto_p22, "id-on-change-of-address-advice"); register_ber_oid_dissector("2.6.1.17.2", dissect_IPMAssemblyInstructions_PDU, proto_p22, "id-mst-assembly-instructions"); @@ -6438,9 +6396,6 @@ void proto_reg_handoff_p22(void) { register_ber_oid_dissector("2.6.1.18.1", dissect_IpnSecurityResponse_PDU, proto_p22, "id-sec-security-common-fields"); -/*--- End of included file: packet-p22-dis-tab.c ---*/ -#line 130 "./asn1/p22/packet-p22-template.c" - register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); diff --git a/epan/dissectors/packet-p22.h b/epan/dissectors/packet-p22.h index 885f91a042..2011ed4467 100644 --- a/epan/dissectors/packet-p22.h +++ b/epan/dissectors/packet-p22.h @@ -3,9 +3,6 @@ /* packet-p22.h */ /* asn2wrs.py -b -C -L -p p22 -c ./p22.cnf -s ./packet-p22-template -D . -O ../.. IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn IPMSUpperBounds.asn */ -/* Input file: packet-p22-template.h */ - -#line 1 "./asn1/p22/packet-p22-template.h" /* packet-p22.h * Routines for X.420 (X.400 Message Transfer) packet dissection * Graeme Lunt 2005 @@ -20,9 +17,6 @@ #ifndef PACKET_P22_H #define PACKET_P22_H - -/*--- Included file: packet-p22-exp.h ---*/ -#line 1 "./asn1/p22/packet-p22-exp.h" extern const value_string p22_InformationObject_vals[]; extern const value_string p22_NonReceiptReasonField_vals[]; extern const value_string p22_DiscardReasonField_vals[]; @@ -36,9 +30,6 @@ int dissect_p22_NonReceiptReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _ int dissect_p22_DiscardReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_p22_ReceiptTimeField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-p22-exp.h ---*/ -#line 16 "./asn1/p22/packet-p22-template.h" - void proto_reg_handoff_p22(void); void proto_register_p22(void); diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 68b0fd1239..2bd28bf0d8 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -3,9 +3,6 @@ /* packet-p7.c */ /* asn2wrs.py -b -C -L -p p7 -c ./p7.cnf -s ./packet-p7-template -D . -O ../.. MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn MSUpperBounds.asn */ -/* Input file: packet-p7-template.c */ - -#line 1 "./asn1/p7/packet-p7-template.c" /* packet-p7.c * Routines for X.413 (P7) packet dissection * Graeme Lunt 2007 @@ -45,9 +42,6 @@ static int seqno = 0; /* Initialize the protocol and registered fields */ static int proto_p7 = -1; - -/*--- Included file: packet-p7-val.h ---*/ -#line 1 "./asn1/p7/packet-p7-val.h" #define op_ms_submission_control 2 #define op_ms_message_submission 3 #define op_ms_probe_submission 4 @@ -103,12 +97,6 @@ static int proto_p7 = -1; #define ub_ua_registrations 128 #define ub_ua_restrictions 16 -/*--- End of included file: packet-p7-val.h ---*/ -#line 41 "./asn1/p7/packet-p7-template.c" - - -/*--- Included file: packet-p7-hf.c ---*/ -#line 1 "./asn1/p7/packet-p7-hf.c" static int hf_p7_AutoActionType_PDU = -1; /* AutoActionType */ static int hf_p7_AutoActionError_PDU = -1; /* AutoActionError */ static int hf_p7_EntryType_PDU = -1; /* EntryType */ @@ -475,14 +463,8 @@ static int hf_p7_T_entry_class_problem_unsupported_entry_class = -1; static int hf_p7_T_entry_class_problem_entry_class_not_subscribed = -1; static int hf_p7_T_entry_class_problem_inappropriate_entry_class = -1; -/*--- End of included file: packet-p7-hf.c ---*/ -#line 43 "./asn1/p7/packet-p7-template.c" - /* Initialize the subtree pointers */ static gint ett_p7 = -1; - -/*--- Included file: packet-p7-ett.c ---*/ -#line 1 "./asn1/p7/packet-p7-ett.c" static gint ett_p7_Attribute = -1; static gint ett_p7_AttributeValues = -1; static gint ett_p7_AutoActionRegistration = -1; @@ -617,12 +599,6 @@ static gint ett_p7_SignatureVerificationStatus = -1; static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; -/*--- End of included file: packet-p7-ett.c ---*/ -#line 47 "./asn1/p7/packet-p7-template.c" - - -/*--- Included file: packet-p7-table.c ---*/ -#line 1 "./asn1/p7/packet-p7-table.c" /* P7 ABSTRACT-OPERATIONS */ const value_string p7_opr_code_string_vals[] = { @@ -660,12 +636,6 @@ static const value_string p7_err_code_string_vals[] = { }; -/*--- End of included file: packet-p7-table.c ---*/ -#line 49 "./asn1/p7/packet-p7-template.c" - - -/*--- Included file: packet-p7-fn.c ---*/ -#line 1 "./asn1/p7/packet-p7-fn.c" /*--- Cyclic dependencies ---*/ /* Filter -> Filter/and -> Filter */ @@ -4105,12 +4075,6 @@ static int dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-p7-fn.c ---*/ -#line 51 "./asn1/p7/packet-p7-template.c" - - -/*--- Included file: packet-p7-table11.c ---*/ -#line 1 "./asn1/p7/packet-p7-table11.c" static const ros_opr_t p7_opr_tab[] = { /* ms-bind */ @@ -4137,12 +4101,6 @@ static const ros_opr_t p7_opr_tab[] = { }; -/*--- End of included file: packet-p7-table11.c ---*/ -#line 53 "./asn1/p7/packet-p7-template.c" - -/*--- Included file: packet-p7-table21.c ---*/ -#line 1 "./asn1/p7/packet-p7-table21.c" - static const ros_err_t p7_err_tab[] = { /* ms-bind-error*/ { err_ros_bind, dissect_PAR_ms_bind_error_PDU }, @@ -4176,9 +4134,6 @@ static const ros_err_t p7_err_tab[] = { }; -/*--- End of included file: packet-p7-table21.c ---*/ -#line 54 "./asn1/p7/packet-p7-template.c" - static const ros_info_t p7_ros_info = { "P7", &proto_p7, @@ -4196,9 +4151,6 @@ void proto_register_p7(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-p7-hfarr.c ---*/ -#line 1 "./asn1/p7/packet-p7-hfarr.c" { &hf_p7_AutoActionType_PDU, { "AutoActionType", "p7.AutoActionType", FT_OID, BASE_NONE, NULL, 0, @@ -5655,17 +5607,11 @@ void proto_register_p7(void) { { "inappropriate-entry-class", "p7.T.entry.class.problem.inappropriate.entry.class", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-p7-hfarr.c ---*/ -#line 73 "./asn1/p7/packet-p7-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_p7, - -/*--- Included file: packet-p7-ettarr.c ---*/ -#line 1 "./asn1/p7/packet-p7-ettarr.c" &ett_p7_Attribute, &ett_p7_AttributeValues, &ett_p7_AutoActionRegistration, @@ -5799,9 +5745,6 @@ void proto_register_p7(void) { &ett_p7_SignatureVerificationStatus, &ett_p7_RTSE_apdus, &ett_p7_RTABapdu, - -/*--- End of included file: packet-p7-ettarr.c ---*/ -#line 79 "./asn1/p7/packet-p7-template.c" }; module_t *p7_module; @@ -5827,9 +5770,6 @@ void proto_register_p7(void) { /*--- proto_reg_handoff_p7 --- */ void proto_reg_handoff_p7(void) { - -/*--- Included file: packet-p7-dis-tab.c ---*/ -#line 1 "./asn1/p7/packet-p7-dis-tab.c" register_ber_oid_dissector("2.6.4.3.42", dissect_ReportLocation_PDU, proto_p7, "id-att-ac-correlated-report-list"); register_ber_oid_dissector("2.6.4.3.76", dissect_SequenceNumber_PDU, proto_p7, "id-att-ac-report-subject-entry"); register_ber_oid_dissector("2.6.4.3.43", dissect_ReportSummary_PDU, proto_p7, "id-att-ac-report-summary"); @@ -5859,9 +5799,6 @@ void proto_reg_handoff_p7(void) { register_ber_oid_dissector("2.6.0.2.10""id-as-ms-rtse", dissect_RTSE_apdus_PDU, proto_p7, ""); -/*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 105 "./asn1/p7/packet-p7-template.c" - /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-ms-access","2.6.0.1.11"); diff --git a/epan/dissectors/packet-p7.h b/epan/dissectors/packet-p7.h index a40d63e1b1..a219740610 100644 --- a/epan/dissectors/packet-p7.h +++ b/epan/dissectors/packet-p7.h @@ -3,9 +3,6 @@ /* packet-p7.h */ /* asn2wrs.py -b -C -L -p p7 -c ./p7.cnf -s ./packet-p7-template -D . -O ../.. MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn MSUpperBounds.asn */ -/* Input file: packet-p7-template.h */ - -#line 1 "./asn1/p7/packet-p7-template.h" /* packet-p7.h * Routines for X.413 (P7) packet dissection * Graeme Lunt 2007 @@ -20,14 +17,8 @@ #ifndef PACKET_P7_H #define PACKET_P7_H - -/*--- Included file: packet-p7-exp.h ---*/ -#line 1 "./asn1/p7/packet-p7-exp.h" extern const value_string p7_SignatureStatus_vals[]; int dissect_p7_SequenceNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_p7_SignatureStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-p7-exp.h ---*/ -#line 16 "./asn1/p7/packet-p7-template.h" - #endif /* PACKET_P7_H */ diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index b2ed722fd5..a7beed6559 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -3,9 +3,6 @@ /* packet-p772.c */ /* asn2wrs.py -b -C -L -p p772 -c ./p772.cnf -s ./packet-p772-template -D . -O ../.. MMSAbstractService.asn MMSInformationObjects.asn MMSOtherNotificationTypeExtensions.asn MMSObjectIdentifiers.asn MMSHeadingExtensions.asn MMSUpperBounds.asn MMSExtendedBodyPartTypes.asn MMSPerRecipientSpecifierExtensions.asn */ -/* Input file: packet-p772-template.c */ - -#line 1 "./asn1/p772/packet-p772-template.c" /* packet-p772.c * Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection * Graeme Lunt 2005 @@ -41,9 +38,6 @@ void proto_reg_handoff_p772(void); /* Initialize the protocol and registered fields */ static int proto_p772 = -1; - -/*--- Included file: packet-p772-val.h ---*/ -#line 1 "./asn1/p772/packet-p772-val.h" #define id_mmhs "1.3.26.0.4406.0" #define id_mod id_mmhs".0" #define id_mm id_mmhs".2" @@ -150,12 +144,6 @@ static int proto_p772 = -1; #define ub_military_bigstring 128 #define ub_data_size 65535 -/*--- End of included file: packet-p772-val.h ---*/ -#line 37 "./asn1/p772/packet-p772-template.c" - - -/*--- Included file: packet-p772-hf.c ---*/ -#line 1 "./asn1/p772/packet-p772-hf.c" static int hf_p772_InformationObject_PDU = -1; /* InformationObject */ static int hf_p772_Acp127NotificationResponse_PDU = -1; /* Acp127NotificationResponse */ static int hf_p772_ExemptedAddressSeq_PDU = -1; /* ExemptedAddressSeq */ @@ -236,14 +224,8 @@ static int hf_p772_Acp127NotificationType_acp127_nn = -1; static int hf_p772_Acp127NotificationType_acp127_pn = -1; static int hf_p772_Acp127NotificationType_acp127_tn = -1; -/*--- End of included file: packet-p772-hf.c ---*/ -#line 39 "./asn1/p772/packet-p772-template.c" - /* Initialize the subtree pointers */ static gint ett_p772 = -1; - -/*--- Included file: packet-p772-ett.c ---*/ -#line 1 "./asn1/p772/packet-p772-ett.c" static gint ett_p772_InformationObject = -1; static gint ett_p772_Acp127NotificationResponse = -1; static gint ett_p772_AddressListIndicator = -1; @@ -272,12 +254,6 @@ static gint ett_p772_ForwardedEncryptedParameters = -1; static gint ett_p772_MMMessageParameters = -1; static gint ett_p772_Acp127NotificationType = -1; -/*--- End of included file: packet-p772-ett.c ---*/ -#line 43 "./asn1/p772/packet-p772-template.c" - - -/*--- Included file: packet-p772-fn.c ---*/ -#line 1 "./asn1/p772/packet-p772-fn.c" static const ber_choice_t InformationObject_choice[] = { { 0, &hf_p772_mm , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_p22_IPM }, @@ -1271,9 +1247,6 @@ static int dissect_Acp127NotificationType_PDU(tvbuff_t *tvb _U_, packet_info *pi } -/*--- End of included file: packet-p772-fn.c ---*/ -#line 45 "./asn1/p772/packet-p772-template.c" - /* * Dissect STANAG 4406 PDUs inside a PPDU. @@ -1307,9 +1280,6 @@ void proto_register_p772(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-p772-hfarr.c ---*/ -#line 1 "./asn1/p772/packet-p772-hfarr.c" { &hf_p772_InformationObject_PDU, { "InformationObject", "p772.InformationObject", FT_UINT32, BASE_DEC, VALS(p22_InformationObject_vals), 0, @@ -1622,17 +1592,11 @@ void proto_register_p772(void) { { "acp127-tn", "p772.Acp127NotificationType.acp127.tn", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-p772-hfarr.c ---*/ -#line 80 "./asn1/p772/packet-p772-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_p772, - -/*--- Included file: packet-p772-ettarr.c ---*/ -#line 1 "./asn1/p772/packet-p772-ettarr.c" &ett_p772_InformationObject, &ett_p772_Acp127NotificationResponse, &ett_p772_AddressListIndicator, @@ -1660,9 +1624,6 @@ void proto_register_p772(void) { &ett_p772_ForwardedEncryptedParameters, &ett_p772_MMMessageParameters, &ett_p772_Acp127NotificationType, - -/*--- End of included file: packet-p772-ettarr.c ---*/ -#line 86 "./asn1/p772/packet-p772-template.c" }; /* Register protocol */ @@ -1680,9 +1641,6 @@ void proto_register_p772(void) { /*--- proto_reg_handoff_p772 --- */ void proto_reg_handoff_p772(void) { - -/*--- Included file: packet-p772-dis-tab.c ---*/ -#line 1 "./asn1/p772/packet-p772-dis-tab.c" register_ber_oid_dissector("1.3.26.0.4406.0.2.0", dissect_PrimaryPrecedence_PDU, proto_p772, "primary-precedence"); register_ber_oid_dissector("1.3.26.0.4406.0.2.1", dissect_CopyPrecedence_PDU, proto_p772, "copy-precedence"); register_ber_oid_dissector("1.3.26.0.4406.0.2.2", dissect_MessageType_PDU, proto_p772, "message-type"); @@ -1715,8 +1673,5 @@ void proto_reg_handoff_p772(void) { register_ber_oid_dissector("2.6.1.4.17.1.3.26.0.4406.0.4.1", dissect_InformationObject_PDU, proto_p772, "id-et-content-p772"); -/*--- End of included file: packet-p772-dis-tab.c ---*/ -#line 104 "./asn1/p772/packet-p772-template.c" - register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406"); } diff --git a/epan/dissectors/packet-p772.h b/epan/dissectors/packet-p772.h index 53cb513902..0461615f66 100644 --- a/epan/dissectors/packet-p772.h +++ b/epan/dissectors/packet-p772.h @@ -3,9 +3,6 @@ /* packet-p772.h */ /* asn2wrs.py -b -C -L -p p772 -c ./p772.cnf -s ./packet-p772-template -D . -O ../.. MMSAbstractService.asn MMSInformationObjects.asn MMSOtherNotificationTypeExtensions.asn MMSObjectIdentifiers.asn MMSHeadingExtensions.asn MMSUpperBounds.asn MMSExtendedBodyPartTypes.asn MMSPerRecipientSpecifierExtensions.asn */ -/* Input file: packet-p772-template.h */ - -#line 1 "./asn1/p772/packet-p772-template.h" /* packet-p772.h * Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection * Graeme Lunt 2005 diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 25f768ed1b..5ec17aee29 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -3,9 +3,6 @@ /* packet-pcap.c */ /* asn2wrs.py -L -p pcap -c ./pcap.cnf -s ./packet-pcap-template -D . -O ../.. PCAP-CommonDataTypes.asn PCAP-Constants.asn PCAP-Containers.asn PCAP-IEs.asn PCAP-PDU-Contents.asn PCAP-PDU-Descriptions.asn */ -/* Input file: packet-pcap-template.c */ - -#line 1 "./asn1/pcap/packet-pcap-template.c" /* packet-pcap.c * Routines for UTRAN Iupc interface Positioning Calculation Application Part (PCAP) packet dissection * @@ -48,9 +45,6 @@ void proto_register_pcap(void); void proto_reg_handoff_pcap(void); - -/*--- Included file: packet-pcap-val.h ---*/ -#line 1 "./asn1/pcap/packet-pcap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -255,17 +249,11 @@ typedef enum _ProtocolIE_ID_enum { id_AddPosSupport = 142 } ProtocolIE_ID_enum; -/*--- End of included file: packet-pcap-val.h ---*/ -#line 44 "./asn1/pcap/packet-pcap-template.c" - static dissector_handle_t pcap_handle = NULL; /* Initialize the protocol and registered fields */ static int proto_pcap = -1; - -/*--- Included file: packet-pcap-hf.c ---*/ -#line 1 "./asn1/pcap/packet-pcap-hf.c" static int hf_pcap_AccuracyFulfilmentIndicator_PDU = -1; /* AccuracyFulfilmentIndicator */ static int hf_pcap_AddPos_MeasuredResults_PDU = -1; /* AddPos_MeasuredResults */ static int hf_pcap_Cause_PDU = -1; /* Cause */ @@ -1522,15 +1510,9 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh2 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1; -/*--- End of included file: packet-pcap-hf.c ---*/ -#line 51 "./asn1/pcap/packet-pcap-template.c" - /* Initialize the subtree pointers */ static int ett_pcap = -1; - -/*--- Included file: packet-pcap-ett.c ---*/ -#line 1 "./asn1/pcap/packet-pcap-ett.c" static gint ett_pcap_PrivateIE_ID = -1; static gint ett_pcap_TransactionID = -1; static gint ett_pcap_ProtocolIE_Container = -1; @@ -1959,9 +1941,6 @@ static gint ett_pcap_SuccessfulOutcome = -1; static gint ett_pcap_UnsuccessfulOutcome = -1; static gint ett_pcap_Outcome = -1; -/*--- End of included file: packet-pcap-ett.c ---*/ -#line 56 "./asn1/pcap/packet-pcap-template.c" - /* Global variables */ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; @@ -1985,9 +1964,6 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); -/*--- Included file: packet-pcap-fn.c ---*/ -#line 1 "./asn1/pcap/packet-pcap-fn.c" - static const value_string pcap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -14618,9 +14594,6 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-pcap-fn.c ---*/ -#line 80 "./asn1/pcap/packet-pcap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; @@ -14672,9 +14645,6 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ void proto_reg_handoff_pcap(void) { - -/*--- Included file: packet-pcap-dis-tab.c ---*/ -#line 1 "./asn1/pcap/packet-pcap-dis-tab.c" dissector_add_uint("pcap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_CriticalityDiagnostics, create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_GPS_UTRAN_TRU, create_dissector_handle(dissect_GPS_UTRAN_TRU_PDU, proto_pcap)); @@ -14824,9 +14794,6 @@ proto_reg_handoff_pcap(void) dissector_add_uint("pcap.proc.imsg", id_PositionPeriodicResult, create_dissector_handle(dissect_PositionPeriodicResult_PDU, proto_pcap)); dissector_add_uint("pcap.proc.imsg", id_PositionPeriodicTermination, create_dissector_handle(dissect_PositionPeriodicTermination_PDU, proto_pcap)); - -/*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 133 "./asn1/pcap/packet-pcap-template.c" dissector_add_for_decode_as_with_preference("sccp.ssn", pcap_handle); } @@ -14837,9 +14804,6 @@ void proto_register_pcap(void) { static hf_register_info hf[] = { - -/*--- Included file: packet-pcap-hfarr.c ---*/ -#line 1 "./asn1/pcap/packet-pcap-hfarr.c" { &hf_pcap_AccuracyFulfilmentIndicator_PDU, { "AccuracyFulfilmentIndicator", "pcap.AccuracyFulfilmentIndicator", FT_UINT32, BASE_DEC, VALS(pcap_AccuracyFulfilmentIndicator_vals), 0, @@ -19856,17 +19820,11 @@ void proto_register_pcap(void) { { "subCh0", "pcap.AvailableSubChannelNumbers.subCh0", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 144 "./asn1/pcap/packet-pcap-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_pcap, - -/*--- Included file: packet-pcap-ettarr.c ---*/ -#line 1 "./asn1/pcap/packet-pcap-ettarr.c" &ett_pcap_PrivateIE_ID, &ett_pcap_TransactionID, &ett_pcap_ProtocolIE_Container, @@ -20294,9 +20252,6 @@ void proto_register_pcap(void) { &ett_pcap_SuccessfulOutcome, &ett_pcap_UnsuccessfulOutcome, &ett_pcap_Outcome, - -/*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 150 "./asn1/pcap/packet-pcap-template.c" }; /* module_t *pcap_module; */ diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index ffc33c53f0..789da8dcf5 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -3,9 +3,6 @@ /* packet-pkcs1.c */ /* asn2wrs.py -b -L -p pkcs1 -c ./pkcs1.cnf -s ./packet-pkcs1-template -D . -O ../.. PKIXAlgs-2009.asn */ -/* Input file: packet-pkcs1-template.c */ - -#line 1 "./asn1/pkcs1/packet-pkcs1-template.c" /* packet-pkcs1.c * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 @@ -36,9 +33,6 @@ void proto_reg_handoff_pkcs1(void); /* Initialize the protocol and registered fields */ static int proto_pkcs1 = -1; - -/*--- Included file: packet-pkcs1-hf.c ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-hf.c" static int hf_pkcs1_DSA_Params_PDU = -1; /* DSA_Params */ static int hf_pkcs1_DomainParameters_PDU = -1; /* DomainParameters */ static int hf_pkcs1_KEA_Params_Id_PDU = -1; /* KEA_Params_Id */ @@ -76,13 +70,7 @@ static int hf_pkcs1_b = -1; /* FieldElement */ static int hf_pkcs1_r = -1; /* INTEGER */ static int hf_pkcs1_s = -1; /* INTEGER */ -/*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 32 "./asn1/pkcs1/packet-pkcs1-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkcs1-ett.c ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-ett.c" static gint ett_pkcs1_RSAPublicKey = -1; static gint ett_pkcs1_DigestInfo = -1; static gint ett_pkcs1_DSA_Params = -1; @@ -96,12 +84,6 @@ static gint ett_pkcs1_Curve = -1; static gint ett_pkcs1_DSA_Sig_Value = -1; static gint ett_pkcs1_ECDSA_Sig_Value = -1; -/*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 35 "./asn1/pkcs1/packet-pkcs1-template.c" - - -/*--- Included file: packet-pkcs1-fn.c ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-fn.c" static int @@ -468,17 +450,11 @@ static int dissect_Prime_p_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 37 "./asn1/pkcs1/packet-pkcs1-template.c" - /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkcs1-hfarr.c ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-hfarr.c" { &hf_pkcs1_DSA_Params_PDU, { "DSA-Params", "pkcs1.DSA_Params_element", FT_NONE, BASE_NONE, NULL, 0, @@ -623,16 +599,10 @@ void proto_register_pkcs1(void) { { "s", "pkcs1.s", FT_INT32, BASE_DEC, NULL, 0, "INTEGER", HFILL }}, - -/*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 44 "./asn1/pkcs1/packet-pkcs1-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-pkcs1-ettarr.c ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-ettarr.c" &ett_pkcs1_RSAPublicKey, &ett_pkcs1_DigestInfo, &ett_pkcs1_DSA_Params, @@ -645,9 +615,6 @@ void proto_register_pkcs1(void) { &ett_pkcs1_Curve, &ett_pkcs1_DSA_Sig_Value, &ett_pkcs1_ECDSA_Sig_Value, - -/*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 49 "./asn1/pkcs1/packet-pkcs1-template.c" }; /* Register protocol */ @@ -662,9 +629,6 @@ void proto_register_pkcs1(void) { /*--- proto_reg_handoff_pkcs1 -------------------------------------------*/ void proto_reg_handoff_pkcs1(void) { - -/*--- Included file: packet-pkcs1-dis-tab.c ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-dis-tab.c" register_ber_oid_dissector("1.2.840.10040.4.1", dissect_DSA_Params_PDU, proto_pkcs1, "id-dsa"); register_ber_oid_dissector("1.2.840.10046.2.1", dissect_DomainParameters_PDU, proto_pkcs1, "dhpublicnumber"); register_ber_oid_dissector("2.16.840.1.101.2.1.1.22", dissect_KEA_Params_Id_PDU, proto_pkcs1, "id-keyExchangeAlgorithm"); @@ -676,9 +640,6 @@ void proto_reg_handoff_pkcs1(void) { register_ber_oid_dissector("1.2.840.10045.1.1", dissect_Prime_p_PDU, proto_pkcs1, "prime-field"); -/*--- End of included file: packet-pkcs1-dis-tab.c ---*/ -#line 64 "./asn1/pkcs1/packet-pkcs1-template.c" - register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); register_ber_oid_dissector("1.2.840.113549.2.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5"); diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h index ba48da03eb..82870c93d7 100644 --- a/epan/dissectors/packet-pkcs1.h +++ b/epan/dissectors/packet-pkcs1.h @@ -3,9 +3,6 @@ /* packet-pkcs1.h */ /* asn2wrs.py -b -L -p pkcs1 -c ./pkcs1.cnf -s ./packet-pkcs1-template -D . -O ../.. PKIXAlgs-2009.asn */ -/* Input file: packet-pkcs1-template.h */ - -#line 1 "./asn1/pkcs1/packet-pkcs1-template.h" /* packet-pkcs1.h * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 @@ -20,14 +17,8 @@ #ifndef PACKET_PKCS1_H #define PACKET_PKCS1_H - -/*--- Included file: packet-pkcs1-exp.h ---*/ -#line 1 "./asn1/pkcs1/packet-pkcs1-exp.h" int dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-pkcs1-exp.h ---*/ -#line 16 "./asn1/pkcs1/packet-pkcs1-template.h" - #endif /* PACKET_PKCS1_H */ diff --git a/epan/dissectors/packet-pkcs10.c b/epan/dissectors/packet-pkcs10.c index bf1f4f9424..9ab2dc699b 100644 --- a/epan/dissectors/packet-pkcs10.c +++ b/epan/dissectors/packet-pkcs10.c @@ -3,9 +3,6 @@ /* packet-pkcs10.c */ /* asn2wrs.py -b -L -p pkcs10 -c ./pkcs10.cnf -s ./packet-pkcs10-template -D . -O ../.. PKCS10.asn */ -/* Input file: packet-pkcs10-template.c */ - -#line 1 "./asn1/pkcs10/packet-pkcs10-template.c" /* packet-p10.c * * Routines for PKCS10 packet dissection @@ -50,9 +47,6 @@ void proto_register_pkcs10(void); /* Initialize the protocol and registered fields */ static int proto_pkcs10 = -1; - -/*--- Included file: packet-pkcs10-hf.c ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-hf.c" static int hf_pkcs10_Attributes_PDU = -1; /* Attributes */ static int hf_pkcs10_CertificationRequest_PDU = -1; /* CertificationRequest */ static int hf_pkcs10_version = -1; /* T_version */ @@ -67,25 +61,13 @@ static int hf_pkcs10_certificationRequestInfo = -1; /* CertificationRequestInfo static int hf_pkcs10_signatureAlgorithm = -1; /* AlgorithmIdentifier */ static int hf_pkcs10_signature = -1; /* BIT_STRING */ -/*--- End of included file: packet-pkcs10-hf.c ---*/ -#line 46 "./asn1/pkcs10/packet-pkcs10-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkcs10-ett.c ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-ett.c" static gint ett_pkcs10_CertificationRequestInfo = -1; static gint ett_pkcs10_Attributes = -1; static gint ett_pkcs10_Attribute = -1; static gint ett_pkcs10_T_values = -1; static gint ett_pkcs10_CertificationRequest = -1; -/*--- End of included file: packet-pkcs10-ett.c ---*/ -#line 49 "./asn1/pkcs10/packet-pkcs10-template.c" - -/*--- Included file: packet-pkcs10-fn.c ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-fn.c" - static const value_string pkcs10_T_version_vals[] = { { 0, "v1" }, { 0, NULL } @@ -222,17 +204,11 @@ static int dissect_CertificationRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinf } -/*--- End of included file: packet-pkcs10-fn.c ---*/ -#line 50 "./asn1/pkcs10/packet-pkcs10-template.c" - /*--- proto_register_pkcs10 ----------------------------------------------*/ void proto_register_pkcs10(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkcs10-hfarr.c ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-hfarr.c" { &hf_pkcs10_Attributes_PDU, { "Attributes", "pkcs10.Attributes", FT_UINT32, BASE_DEC, NULL, 0, @@ -285,24 +261,15 @@ void proto_register_pkcs10(void) { { "signature", "pkcs10.signature", FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING", HFILL }}, - -/*--- End of included file: packet-pkcs10-hfarr.c ---*/ -#line 57 "./asn1/pkcs10/packet-pkcs10-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-pkcs10-ettarr.c ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-ettarr.c" &ett_pkcs10_CertificationRequestInfo, &ett_pkcs10_Attributes, &ett_pkcs10_Attribute, &ett_pkcs10_T_values, &ett_pkcs10_CertificationRequest, - -/*--- End of included file: packet-pkcs10-ettarr.c ---*/ -#line 62 "./asn1/pkcs10/packet-pkcs10-template.c" }; /* Register protocol */ proto_pkcs10 = proto_register_protocol(PNAME, PSNAME, PFNAME); @@ -321,15 +288,9 @@ void proto_register_pkcs10(void) { void proto_reg_handoff_pkcs10(void) { dissector_handle_t csr_handle; - -/*--- Included file: packet-pkcs10-dis-tab.c ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-dis-tab.c" register_ber_oid_dissector("1.2.840.113549.1.9.9", dissect_Attributes_PDU, proto_pkcs10, "pkcs-9-at-extendedCertificateAttributes"); -/*--- End of included file: packet-pkcs10-dis-tab.c ---*/ -#line 81 "./asn1/pkcs10/packet-pkcs10-template.c" - csr_handle = create_dissector_handle(dissect_CertificationRequest_PDU, proto_pkcs10); dissector_add_string("media_type", "application/pkcs10", csr_handle); /* RFC 5967 */ dissector_add_string("rfc7468.preeb_label", "CERTIFICATE REQUEST", csr_handle); /* RFC 7468 */ diff --git a/epan/dissectors/packet-pkcs10.h b/epan/dissectors/packet-pkcs10.h index 07cb74d92f..9f19b80280 100644 --- a/epan/dissectors/packet-pkcs10.h +++ b/epan/dissectors/packet-pkcs10.h @@ -3,9 +3,6 @@ /* packet-pkcs10.h */ /* asn2wrs.py -b -L -p pkcs10 -c ./pkcs10.cnf -s ./packet-pkcs10-template -D . -O ../.. PKCS10.asn */ -/* Input file: packet-pkcs10-template.h */ - -#line 1 "./asn1/pkcs10/packet-pkcs10-template.h" /* packet-pkcs10.h * * Routines for PKCS10 dissection @@ -35,12 +32,6 @@ void proto_reg_handoff_pkcs10(void); - -/*--- Included file: packet-pkcs10-exp.h ---*/ -#line 1 "./asn1/pkcs10/packet-pkcs10-exp.h" int dissect_pkcs10_CertificationRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-pkcs10-exp.h ---*/ -#line 31 "./asn1/pkcs10/packet-pkcs10-template.h" - #endif /* PACKET_PKCS10_H */ diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index d98bea9230..e27267dec6 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -3,9 +3,6 @@ /* packet-pkcs12.c */ /* asn2wrs.py -b -L -p pkcs12 -c ./pkcs12.cnf -s ./packet-pkcs12-template -D . -O ../.. pkcs12.asn */ -/* Input file: packet-pkcs12-template.c */ - -#line 1 "./asn1/pkcs12/packet-pkcs12-template.c" /* packet-pkcs12.c * Routines for PKCS#12: Personal Information Exchange packet dissection * Graeme Lunt 2006 @@ -68,9 +65,6 @@ static int dissect_AuthenticatedSafe_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info static int dissect_SafeContents_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data); static int dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data); - -/*--- Included file: packet-pkcs12-hf.c ---*/ -#line 1 "./asn1/pkcs12/packet-pkcs12-hf.c" static int hf_pkcs12_PFX_PDU = -1; /* PFX */ static int hf_pkcs12_SafeContents_PDU = -1; /* SafeContents */ static int hf_pkcs12_KeyBag_PDU = -1; /* KeyBag */ @@ -123,13 +117,7 @@ static int hf_pkcs12_keyDerivationFunc = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ -/*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 64 "./asn1/pkcs12/packet-pkcs12-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkcs12-ett.c ---*/ -#line 1 "./asn1/pkcs12/packet-pkcs12-ett.c" static gint ett_pkcs12_PFX = -1; static gint ett_pkcs12_MacData = -1; static gint ett_pkcs12_AuthenticatedSafe = -1; @@ -150,9 +138,6 @@ static gint ett_pkcs12_T_saltChoice = -1; static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; -/*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 67 "./asn1/pkcs12/packet-pkcs12-template.c" - static void append_oid(wmem_allocator_t *pool, proto_tree *tree, const char *oid) { const char *name = NULL; @@ -447,9 +432,6 @@ int PBE_decrypt_data(const char *object_identifier_id_param _U_, tvbuff_t *encry } -/*--- Included file: packet-pkcs12-fn.c ---*/ -#line 1 "./asn1/pkcs12/packet-pkcs12-fn.c" - static const value_string pkcs12_T_version_vals[] = { { 3, "v3" }, { 0, NULL } @@ -1076,9 +1058,6 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 362 "./asn1/pkcs12/packet-pkcs12-template.c" - static int strip_octet_string(tvbuff_t *tvb) { gint8 ber_class; @@ -1153,9 +1132,6 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-pkcs12-hfarr.c ---*/ -#line 1 "./asn1/pkcs12/packet-pkcs12-hfarr.c" { &hf_pkcs12_PFX_PDU, { "PFX", "pkcs12.PFX_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1360,17 +1336,11 @@ void proto_register_pkcs12(void) { { "messageAuthScheme", "pkcs12.messageAuthScheme_element", FT_NONE, BASE_NONE, NULL, 0, "AlgorithmIdentifier", HFILL }}, - -/*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 438 "./asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_decrypted_pbe, - -/*--- Included file: packet-pkcs12-ettarr.c ---*/ -#line 1 "./asn1/pkcs12/packet-pkcs12-ettarr.c" &ett_pkcs12_PFX, &ett_pkcs12_MacData, &ett_pkcs12_AuthenticatedSafe, @@ -1390,9 +1360,6 @@ void proto_register_pkcs12(void) { &ett_pkcs12_T_saltChoice, &ett_pkcs12_PBES2Params, &ett_pkcs12_PBMAC1Params, - -/*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 444 "./asn1/pkcs12/packet-pkcs12-template.c" }; static ei_register_info ei[] = { { &ei_pkcs12_octet_string_expected, { "pkcs12.octet_string_expected", PI_PROTOCOL, PI_WARN, "BER Error: OCTET STRING expected", EXPFILL }}, @@ -1431,9 +1398,6 @@ void proto_register_pkcs12(void) { /*--- proto_reg_handoff_pkcs12 -------------------------------------------*/ void proto_reg_handoff_pkcs12(void) { - -/*--- Included file: packet-pkcs12-dis-tab.c ---*/ -#line 1 "./asn1/pkcs12/packet-pkcs12-dis-tab.c" register_ber_oid_dissector("1.2.840.113549.1.12.10.1.1", dissect_KeyBag_PDU, proto_pkcs12, "keyBag"); register_ber_oid_dissector("1.2.840.113549.1.12.10.1.2", dissect_PKCS8ShroudedKeyBag_PDU, proto_pkcs12, "pkcs8ShroudedKeyBag"); register_ber_oid_dissector("1.2.840.113549.1.12.10.1.3", dissect_CertBag_PDU, proto_pkcs12, "certBag"); @@ -1459,9 +1423,6 @@ void proto_reg_handoff_pkcs12(void) { register_ber_oid_dissector("1.2.840.113549.1.5.14", dissect_PBMAC1Params_PDU, proto_pkcs12, "id-PBMAC1"); -/*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 483 "./asn1/pkcs12/packet-pkcs12-template.c" - register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); } diff --git a/epan/dissectors/packet-pkcs12.h b/epan/dissectors/packet-pkcs12.h index 84cd2d581a..5cf000bcff 100644 --- a/epan/dissectors/packet-pkcs12.h +++ b/epan/dissectors/packet-pkcs12.h @@ -3,9 +3,6 @@ /* packet-pkcs12.h */ /* asn2wrs.py -b -L -p pkcs12 -c ./pkcs12.cnf -s ./packet-pkcs12-template -D . -O ../.. pkcs12.asn */ -/* Input file: packet-pkcs12-template.h */ - -#line 1 "./asn1/pkcs12/packet-pkcs12-template.h" /* packet-pkcs12.h * Routines for PKCS#12 Personal Information Exchange packet dissection * Graeme Lunt 2006 diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index 68bb761f13..05fdac4006 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -3,9 +3,6 @@ /* packet-pkinit.c */ /* asn2wrs.py -b -L -p pkinit -c ./pkinit.cnf -s ./packet-pkinit-template -D . -O ../.. PKINIT.asn */ -/* Input file: packet-pkinit-template.c */ - -#line 1 "./asn1/pkinit/packet-pkinit-template.c" /* packet-pkinit.c * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 @@ -37,9 +34,6 @@ void proto_reg_handoff_pkinit(void); /* Initialize the protocol and registered fields */ static int proto_pkinit = -1; - -/*--- Included file: packet-pkinit-hf.c ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-hf.c" static int hf_pkinit_AuthPack_PDU = -1; /* AuthPack */ static int hf_pkinit_KRB5PrincipalName_PDU = -1; /* KRB5PrincipalName */ static int hf_pkinit_KDCDHKeyInfo_PDU = -1; /* KDCDHKeyInfo */ @@ -75,13 +69,7 @@ static int hf_pkinit_trusted_certifiers_item = -1; /* TrustedCA */ static int hf_pkinit_kdc_cert = -1; /* OCTET_STRING */ static int hf_pkinit_encryption_cert = -1; /* OCTET_STRING */ -/*--- End of included file: packet-pkinit-hf.c ---*/ -#line 33 "./asn1/pkinit/packet-pkinit-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkinit-ett.c ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-ett.c" static gint ett_pkinit_PaPkAsReq = -1; static gint ett_pkinit_SEQUENCE_OF_TrustedCA = -1; static gint ett_pkinit_TrustedCA = -1; @@ -94,18 +82,12 @@ static gint ett_pkinit_KDCDHKeyInfo = -1; static gint ett_pkinit_PKAuthenticator_Win2k = -1; static gint ett_pkinit_PA_PK_AS_REQ_Win2k = -1; -/*--- End of included file: packet-pkinit-ett.c ---*/ -#line 36 "./asn1/pkinit/packet-pkinit-template.c" - static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_KerberosV5Spec2_Realm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_KerberosV5Spec2_PrincipalName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_pkinit_PKAuthenticator_Win2k(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- Included file: packet-pkinit-fn.c ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-fn.c" - static const value_string pkinit_TrustedCA_vals[] = { { 0, "caName" }, { 2, "issuerAndSerial" }, @@ -391,9 +373,6 @@ static int dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-pkinit-fn.c ---*/ -#line 43 "./asn1/pkinit/packet-pkinit-template.c" - int dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { offset = dissect_pkinit_PaPkAsReq(FALSE, tvb, offset, actx, tree, -1); @@ -430,9 +409,6 @@ void proto_register_pkinit(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkinit-hfarr.c ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-hfarr.c" { &hf_pkinit_AuthPack_PDU, { "AuthPack", "pkinit.AuthPack_element", FT_NONE, BASE_NONE, NULL, 0, @@ -569,16 +545,10 @@ void proto_register_pkinit(void) { { "encryption-cert", "pkinit.encryption_cert", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - -/*--- End of included file: packet-pkinit-hfarr.c ---*/ -#line 81 "./asn1/pkinit/packet-pkinit-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-pkinit-ettarr.c ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-ettarr.c" &ett_pkinit_PaPkAsReq, &ett_pkinit_SEQUENCE_OF_TrustedCA, &ett_pkinit_TrustedCA, @@ -590,9 +560,6 @@ void proto_register_pkinit(void) { &ett_pkinit_KDCDHKeyInfo, &ett_pkinit_PKAuthenticator_Win2k, &ett_pkinit_PA_PK_AS_REQ_Win2k, - -/*--- End of included file: packet-pkinit-ettarr.c ---*/ -#line 86 "./asn1/pkinit/packet-pkinit-template.c" }; /* Register protocol */ @@ -607,15 +574,9 @@ void proto_register_pkinit(void) { /*--- proto_reg_handoff_pkinit -------------------------------------------*/ void proto_reg_handoff_pkinit(void) { - -/*--- Included file: packet-pkinit-dis-tab.c ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.2.3.1", dissect_AuthPack_PDU, proto_pkinit, "id-pkauthdata"); register_ber_oid_dissector("1.3.6.1.5.2.3.2", dissect_KDCDHKeyInfo_PDU, proto_pkinit, "id-pkdhkeydata"); register_ber_oid_dissector("1.3.6.1.5.2.2", dissect_KRB5PrincipalName_PDU, proto_pkinit, "id-pkinit-san"); - -/*--- End of included file: packet-pkinit-dis-tab.c ---*/ -#line 101 "./asn1/pkinit/packet-pkinit-template.c" } diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h index 72bc58e635..848eedb991 100644 --- a/epan/dissectors/packet-pkinit.h +++ b/epan/dissectors/packet-pkinit.h @@ -3,9 +3,6 @@ /* packet-pkinit.h */ /* asn2wrs.py -b -L -p pkinit -c ./pkinit.cnf -s ./packet-pkinit-template -D . -O ../.. PKINIT.asn */ -/* Input file: packet-pkinit-template.h */ - -#line 1 "./asn1/pkinit/packet-pkinit-template.h" /* packet-pkinit.h * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 @@ -23,17 +20,11 @@ int dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_); int dissect_pkinit_PA_PK_AS_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_); - -/*--- Included file: packet-pkinit-exp.h ---*/ -#line 1 "./asn1/pkinit/packet-pkinit-exp.h" extern const value_string pkinit_PaPkAsRep_vals[]; int dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkinit_PA_PK_AS_REQ_Win2k(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkinit_PA_PK_AS_REP_Win2k(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-pkinit-exp.h ---*/ -#line 19 "./asn1/pkinit/packet-pkinit-template.h" - #endif /* PACKET_PKINIT_H */ diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 647d744328..a1bfbdbea3 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -3,9 +3,6 @@ /* packet-pkix1explicit.c */ /* asn2wrs.py -b -L -p pkix1explicit -c ./pkix1explicit.cnf -s ./packet-pkix1explicit-template -D . -O ../.. PKIX1EXPLICIT93.asn IPAddrAndASCertExtn.asn */ -/* Input file: packet-pkix1explicit-template.c */ - -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" #define BER_UNI_TAG_TeletexString 20 /* workaround bug in asn2wrs */ /* packet-pkix1explicit.c @@ -49,9 +46,6 @@ static int hf_pkix1explicit_addressFamily_safi = -1; static int ett_pkix1explicit_addressFamily = -1; - -/*--- Included file: packet-pkix1explicit-hf.c ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-hf.c" static int hf_pkix1explicit_Extensions_PDU = -1; /* Extensions */ static int hf_pkix1explicit_DomainParameters_PDU = -1; /* DomainParameters */ static int hf_pkix1explicit_DirectoryString_PDU = -1; /* DirectoryString */ @@ -100,13 +94,7 @@ static int hf_pkix1explicit_range = -1; /* ASRange */ static int hf_pkix1explicit_min_01 = -1; /* ASId */ static int hf_pkix1explicit_max_01 = -1; /* ASId */ -/*--- End of included file: packet-pkix1explicit-hf.c ---*/ -#line 45 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkix1explicit-ett.c ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-ett.c" static gint ett_pkix1explicit_Time = -1; static gint ett_pkix1explicit_Extensions = -1; static gint ett_pkix1explicit_Extension = -1; @@ -131,9 +119,6 @@ static gint ett_pkix1explicit_SEQUENCE_OF_ASIdOrRange = -1; static gint ett_pkix1explicit_ASIdOrRange = -1; static gint ett_pkix1explicit_ASRange = -1; -/*--- End of included file: packet-pkix1explicit-ett.c ---*/ -#line 48 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" - int dissect_pkix1explicit_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) { offset = dissect_x509af_Certificate(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -174,9 +159,6 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, -/*--- Included file: packet-pkix1explicit-fn.c ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-fn.c" - int dissect_pkix1explicit_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -839,9 +821,6 @@ static int dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-pkix1explicit-fn.c ---*/ -#line 89 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" - /*--- proto_register_pkix1explicit ----------------------------------------------*/ void proto_register_pkix1explicit(void) { @@ -859,9 +838,6 @@ void proto_register_pkix1explicit(void) { { &hf_pkix1explicit_addressFamily_safi, { "Subsequent Address Family Identifiers (SAFI)", "pkix1explicit.addressfamily.safi", FT_UINT16, BASE_DEC, NULL, 0, "Subsequent Address Family Identifiers (SAFI) RFC4760", HFILL }}, - -/*--- Included file: packet-pkix1explicit-hfarr.c ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-hfarr.c" { &hf_pkix1explicit_Extensions_PDU, { "Extensions", "pkix1explicit.Extensions", FT_UINT32, BASE_DEC, NULL, 0, @@ -1050,17 +1026,11 @@ void proto_register_pkix1explicit(void) { { "max", "pkix1explicit.max", FT_INT32, BASE_DEC, NULL, 0, "ASId", HFILL }}, - -/*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ -#line 108 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_pkix1explicit_addressFamily, - -/*--- Included file: packet-pkix1explicit-ettarr.c ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-ettarr.c" &ett_pkix1explicit_Time, &ett_pkix1explicit_Extensions, &ett_pkix1explicit_Extension, @@ -1084,9 +1054,6 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_SEQUENCE_OF_ASIdOrRange, &ett_pkix1explicit_ASIdOrRange, &ett_pkix1explicit_ASRange, - -/*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ -#line 114 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* Register protocol */ @@ -1103,9 +1070,6 @@ void proto_register_pkix1explicit(void) { void proto_reg_handoff_pkix1explicit(void) { oid_add_from_string("id-pkix","1.3.6.1.5.5.7"); oid_add_from_string("id-dsa-with-sha1","1.2.840.10040.4.3"); - -/*--- Included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.2.1", dissect_DirectoryString_PDU, proto_pkix1explicit, "id-qt-cps"); register_ber_oid_dissector("1.2.840.10046.2.1", dissect_DomainParameters_PDU, proto_pkix1explicit, "dhpublicnumber"); register_ber_oid_dissector("1.3.6.1.5.5.7.1.7", dissect_IPAddrBlocks_PDU, proto_pkix1explicit, "id-pe-ipAddrBlocks"); @@ -1114,7 +1078,4 @@ void proto_reg_handoff_pkix1explicit(void) { register_ber_oid_dissector("1.2.840.113549.1.9.7", dissect_DirectoryString_PDU, proto_pkix1explicit, "pkcs-9-at-challengePassword"); register_ber_oid_dissector("1.2.840.113549.1.9.14", dissect_Extensions_PDU, proto_pkix1explicit, "pkcs-9-at-extensionRequest"); - -/*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 131 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" } diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h index 0ae212a701..1d410ae3ba 100644 --- a/epan/dissectors/packet-pkix1explicit.h +++ b/epan/dissectors/packet-pkix1explicit.h @@ -3,9 +3,6 @@ /* packet-pkix1explicit.h */ /* asn2wrs.py -b -L -p pkix1explicit -c ./pkix1explicit.cnf -s ./packet-pkix1explicit-template -D . -O ../.. PKIX1EXPLICIT93.asn IPAddrAndASCertExtn.asn */ -/* Input file: packet-pkix1explicit-template.h */ - -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-template.h" /* packet-pkix1explicit.h * Routines for PKIX1Explicit packet dissection * @@ -30,9 +27,6 @@ int dissect_pkix1explicit_AlgorithmIdentifier(gboolean implicit_tag, tvbuff_t *t int dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index); - -/*--- Included file: packet-pkix1explicit-exp.h ---*/ -#line 1 "./asn1/pkix1explicit/packet-pkix1explicit-exp.h" extern const value_string pkix1explicit_Version_vals[]; extern const value_string pkix1explicit_Time_vals[]; extern const value_string pkix1explicit_TerminalType_vals[]; @@ -50,8 +44,5 @@ int dissect_pkix1explicit_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *t int dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-pkix1explicit-exp.h ---*/ -#line 26 "./asn1/pkix1explicit/packet-pkix1explicit-template.h" - #endif /* PACKET_PKIX1EXPLICIT_H */ diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 2e5fdb4471..d645f72bad 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -3,9 +3,6 @@ /* packet-pkix1implicit.c */ /* asn2wrs.py -b -L -p pkix1implicit -c ./pkix1implicit.cnf -s ./packet-pkix1implicit-template -D . -O ../.. PKIX1IMPLICIT93.asn */ -/* Input file: packet-pkix1implicit-template.c */ - -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" /* packet-pkix1implicit.c * Routines for PKIX1Implitic packet dissection * @@ -35,9 +32,6 @@ void proto_reg_handoff_pkix1implicit(void); /* Initialize the protocol and registered fields */ static int proto_pkix1implicit = -1; - -/*--- Included file: packet-pkix1implicit-hf.c ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-hf.c" static int hf_pkix1implicit_Dummy_PDU = -1; /* Dummy */ static int hf_pkix1implicit_AuthorityInfoAccessSyntax_PDU = -1; /* AuthorityInfoAccessSyntax */ static int hf_pkix1implicit_UserNotice_PDU = -1; /* UserNotice */ @@ -54,13 +48,7 @@ static int hf_pkix1implicit_visibleString = -1; /* VisibleString */ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ -/*--- End of included file: packet-pkix1implicit-hf.c ---*/ -#line 31 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkix1implicit-ett.c ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-ett.c" static gint ett_pkix1implicit_AuthorityInfoAccessSyntax = -1; static gint ett_pkix1implicit_AccessDescription = -1; static gint ett_pkix1implicit_UserNotice = -1; @@ -68,9 +56,6 @@ static gint ett_pkix1implicit_NoticeReference = -1; static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; -/*--- End of included file: packet-pkix1implicit-ett.c ---*/ -#line 34 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" - int dissect_pkix1implicit_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) { @@ -86,9 +71,6 @@ dissect_pkix1implicit_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int } -/*--- Included file: packet-pkix1implicit-fn.c ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-fn.c" - int dissect_pkix1implicit_KeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -292,18 +274,12 @@ static int dissect_UserNotice_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-pkix1implicit-fn.c ---*/ -#line 50 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" - /*--- proto_register_pkix1implicit ----------------------------------------------*/ void proto_register_pkix1implicit(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkix1implicit-hfarr.c ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-hfarr.c" { &hf_pkix1implicit_Dummy_PDU, { "Dummy", "pkix1implicit.Dummy_element", FT_NONE, BASE_NONE, NULL, 0, @@ -364,25 +340,16 @@ void proto_register_pkix1implicit(void) { { "utf8String", "pkix1implicit.utf8String", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ -#line 58 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-pkix1implicit-ettarr.c ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-ettarr.c" &ett_pkix1implicit_AuthorityInfoAccessSyntax, &ett_pkix1implicit_AccessDescription, &ett_pkix1implicit_UserNotice, &ett_pkix1implicit_NoticeReference, &ett_pkix1implicit_T_noticeNumbers, &ett_pkix1implicit_DisplayText, - -/*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ -#line 63 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* Register protocol */ @@ -397,9 +364,6 @@ void proto_register_pkix1implicit(void) { /*--- proto_reg_handoff_pkix1implicit -------------------------------------------*/ void proto_reg_handoff_pkix1implicit(void) { - -/*--- Included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.1", dissect_AuthorityInfoAccessSyntax_PDU, proto_pkix1implicit, "id-pe-authorityInfoAccess"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ad-ocsp"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-ad-caIssuers"); @@ -438,8 +402,5 @@ void proto_reg_handoff_pkix1implicit(void) { register_ber_oid_dissector("1.3.6.1.5.5.8.2.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-ipsec-kp-ike-intermediate"); register_ber_oid_dissector("1.3.6.1.5.5.7.2.2", dissect_UserNotice_PDU, proto_pkix1implicit, "id-qt-unotice"); - -/*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 78 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" } diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index 56ce83a9da..389ff745c0 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -3,9 +3,6 @@ /* packet-pkix1implicit.h */ /* asn2wrs.py -b -L -p pkix1implicit -c ./pkix1implicit.cnf -s ./packet-pkix1implicit-template -D . -O ../.. PKIX1IMPLICIT93.asn */ -/* Input file: packet-pkix1implicit-template.h */ - -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-template.h" /* packet-pkix1implicit.h * Routines for PKIX1Implicit packet dissection * @@ -22,15 +19,9 @@ int dissect_pkix1implicit_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); int dissect_pkix1implicit_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); - -/*--- Included file: packet-pkix1implicit-exp.h ---*/ -#line 1 "./asn1/pkix1implicit/packet-pkix1implicit-exp.h" int dissect_pkix1implicit_KeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_pkix1implicit_UserNotice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-pkix1implicit-exp.h ---*/ -#line 18 "./asn1/pkix1implicit/packet-pkix1implicit-template.h" - #endif /* PACKET_PKIX1IMPLICIT_H */ diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index 6bf5c55796..79f08073fa 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -3,9 +3,6 @@ /* packet-pkixac.c */ /* asn2wrs.py -b -L -p pkixac -c ./pkixac.cnf -s ./packet-pkixac-template -D . -O ../.. PKIXAttributeCertificate.asn */ -/* Input file: packet-pkixac-template.c */ - -#line 1 "./asn1/pkixac/packet-pkixac-template.c" /* packet-pkixac.c * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. @@ -39,9 +36,6 @@ void proto_reg_handoff_pkixac(void); /* Initialize the protocol and registered fields */ static int proto_pkixac = -1; - -/*--- Included file: packet-pkixac-hf.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-hf.c" static int hf_pkixac_Targets_PDU = -1; /* Targets */ static int hf_pkixac_IetfAttrSyntax_PDU = -1; /* IetfAttrSyntax */ static int hf_pkixac_SvceAuthInfo_PDU = -1; /* SvceAuthInfo */ @@ -94,14 +88,8 @@ static int hf_pkixac_ClassList_confidential = -1; static int hf_pkixac_ClassList_secret = -1; static int hf_pkixac_ClassList_topSecret = -1; -/*--- End of included file: packet-pkixac-hf.c ---*/ -#line 35 "./asn1/pkixac/packet-pkixac-template.c" - /* Initialize the subtree pointers */ static gint ett_pkixac = -1; - -/*--- Included file: packet-pkixac-ett.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-ett.c" static gint ett_pkixac_ObjectDigestInfo = -1; static gint ett_pkixac_IssuerSerial = -1; static gint ett_pkixac_Targets = -1; @@ -121,15 +109,9 @@ static gint ett_pkixac_AAControls = -1; static gint ett_pkixac_AttrSpec = -1; static gint ett_pkixac_ProxyInfo = -1; -/*--- End of included file: packet-pkixac-ett.c ---*/ -#line 39 "./asn1/pkixac/packet-pkixac-template.c" - static const char *object_identifier_id; -/*--- Included file: packet-pkixac-fn.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-fn.c" - static const value_string pkixac_T_digestedObjectType_vals[] = { { 0, "publicKey" }, { 1, "publicKeyCert" }, @@ -581,17 +563,11 @@ static int dissect_ProxyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } -/*--- End of included file: packet-pkixac-fn.c ---*/ -#line 43 "./asn1/pkixac/packet-pkixac-template.c" - /*--- proto_register_pkixac ----------------------------------------------*/ void proto_register_pkixac(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkixac-hfarr.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-hfarr.c" { &hf_pkixac_Targets_PDU, { "Targets", "pkixac.Targets", FT_UINT32, BASE_DEC, NULL, 0, @@ -792,17 +768,11 @@ void proto_register_pkixac(void) { { "topSecret", "pkixac.ClassList.topSecret", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, - -/*--- End of included file: packet-pkixac-hfarr.c ---*/ -#line 50 "./asn1/pkixac/packet-pkixac-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_pkixac, - -/*--- Included file: packet-pkixac-ettarr.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-ettarr.c" &ett_pkixac_ObjectDigestInfo, &ett_pkixac_IssuerSerial, &ett_pkixac_Targets, @@ -821,9 +791,6 @@ void proto_register_pkixac(void) { &ett_pkixac_AAControls, &ett_pkixac_AttrSpec, &ett_pkixac_ProxyInfo, - -/*--- End of included file: packet-pkixac-ettarr.c ---*/ -#line 56 "./asn1/pkixac/packet-pkixac-template.c" }; /* Register protocol */ @@ -833,24 +800,15 @@ void proto_register_pkixac(void) { proto_register_field_array(proto_pkixac, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - -/*--- Included file: packet-pkixac-syn-reg.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-syn-reg.c" /*--- Syntax registrations ---*/ register_ber_syntax_dissector("Clearance", proto_pkixac, dissect_Clearance_PDU); register_ber_syntax_dissector("RFC3281Clearance", proto_pkixac, dissect_RFC3281Clearance_PDU); -/*--- End of included file: packet-pkixac-syn-reg.c ---*/ -#line 66 "./asn1/pkixac/packet-pkixac-template.c" - } /*--- proto_reg_handoff_pkixac -------------------------------------------*/ void proto_reg_handoff_pkixac(void) { - -/*--- Included file: packet-pkixac-dis-tab.c ---*/ -#line 1 "./asn1/pkixac/packet-pkixac-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.6", dissect_AAControls_PDU, proto_pkixac, "id-pe-aaControls"); register_ber_oid_dissector("1.3.6.1.5.5.7.1.10", dissect_ProxyInfo_PDU, proto_pkixac, "id-pe-ac-proxying"); register_ber_oid_dissector("1.3.6.1.5.5.7.10.1", dissect_SvceAuthInfo_PDU, proto_pkixac, "id-aca-authenticationInfo"); @@ -862,8 +820,5 @@ void proto_reg_handoff_pkixac(void) { register_ber_oid_dissector("2.5.4.72", dissect_RoleSyntax_PDU, proto_pkixac, "id-at-role"); register_ber_oid_dissector("2.5.29.55", dissect_Targets_PDU, proto_pkixac, "id-ce-targetInformation"); - -/*--- End of included file: packet-pkixac-dis-tab.c ---*/ -#line 73 "./asn1/pkixac/packet-pkixac-template.c" } diff --git a/epan/dissectors/packet-pkixac.h b/epan/dissectors/packet-pkixac.h index b9bd1ec9bf..fa9dac1613 100644 --- a/epan/dissectors/packet-pkixac.h +++ b/epan/dissectors/packet-pkixac.h @@ -3,9 +3,6 @@ /* packet-pkixac.h */ /* asn2wrs.py -b -L -p pkixac -c ./pkixac.cnf -s ./packet-pkixac-template -D . -O ../.. PKIXAttributeCertificate.asn */ -/* Input file: packet-pkixac-template.h */ - -#line 1 "./asn1/pkixac/packet-pkixac-template.h" /* packet-pkixac.h * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 9f88bbde8b..e915f20d8e 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -3,9 +3,6 @@ /* packet-pkixproxy.c */ /* asn2wrs.py -b -L -p pkixproxy -c ./pkixproxy.cnf -s ./packet-pkixproxy-template -D . -O ../.. PKIXProxy.asn */ -/* Input file: packet-pkixproxy-template.c */ - -#line 1 "./asn1/pkixproxy/packet-pkixproxy-template.c" /* packet-pkixproxy.c * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 @@ -35,31 +32,16 @@ void proto_reg_handoff_pkixproxy(void); /* Initialize the protocol and registered fields */ static int proto_pkixproxy = -1; - -/*--- Included file: packet-pkixproxy-hf.c ---*/ -#line 1 "./asn1/pkixproxy/packet-pkixproxy-hf.c" static int hf_pkixproxy_ProxyCertInfoExtension_PDU = -1; /* ProxyCertInfoExtension */ static int hf_pkixproxy_pCPathLenConstraint = -1; /* ProxyCertPathLengthConstraint */ static int hf_pkixproxy_proxyPolicy = -1; /* ProxyPolicy */ static int hf_pkixproxy_policyLanguage = -1; /* OBJECT_IDENTIFIER */ static int hf_pkixproxy_policy = -1; /* OCTET_STRING */ -/*--- End of included file: packet-pkixproxy-hf.c ---*/ -#line 31 "./asn1/pkixproxy/packet-pkixproxy-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkixproxy-ett.c ---*/ -#line 1 "./asn1/pkixproxy/packet-pkixproxy-ett.c" static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; -/*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 34 "./asn1/pkixproxy/packet-pkixproxy-template.c" - - -/*--- Included file: packet-pkixproxy-fn.c ---*/ -#line 1 "./asn1/pkixproxy/packet-pkixproxy-fn.c" static int @@ -130,18 +112,12 @@ static int dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *pi } -/*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 36 "./asn1/pkixproxy/packet-pkixproxy-template.c" - /*--- proto_register_pkixproxy ----------------------------------------------*/ void proto_register_pkixproxy(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkixproxy-hfarr.c ---*/ -#line 1 "./asn1/pkixproxy/packet-pkixproxy-hfarr.c" { &hf_pkixproxy_ProxyCertInfoExtension_PDU, { "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension_element", FT_NONE, BASE_NONE, NULL, 0, @@ -162,21 +138,12 @@ void proto_register_pkixproxy(void) { { "policy", "pkixproxy.policy", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - -/*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 44 "./asn1/pkixproxy/packet-pkixproxy-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-pkixproxy-ettarr.c ---*/ -#line 1 "./asn1/pkixproxy/packet-pkixproxy-ettarr.c" &ett_pkixproxy_ProxyCertInfoExtension, &ett_pkixproxy_ProxyPolicy, - -/*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 49 "./asn1/pkixproxy/packet-pkixproxy-template.c" }; /* Register protocol */ @@ -191,14 +158,8 @@ void proto_register_pkixproxy(void) { /*--- proto_reg_handoff_pkixproxy -------------------------------------------*/ void proto_reg_handoff_pkixproxy(void) { - -/*--- Included file: packet-pkixproxy-dis-tab.c ---*/ -#line 1 "./asn1/pkixproxy/packet-pkixproxy-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.14", dissect_ProxyCertInfoExtension_PDU, proto_pkixproxy, "id-pe-proxyCertInfo"); - -/*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 64 "./asn1/pkixproxy/packet-pkixproxy-template.c" oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h index fd43d4a5b8..ece82e1676 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -3,9 +3,6 @@ /* packet-pkixproxy.h */ /* asn2wrs.py -b -L -p pkixproxy -c ./pkixproxy.cnf -s ./packet-pkixproxy-template -D . -O ../.. PKIXProxy.asn */ -/* Input file: packet-pkixproxy-template.h */ - -#line 1 "./asn1/pkixproxy/packet-pkixproxy-template.h" /* packet-pkixproxy.h * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index dfc5f6b906..f3afe761e5 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -3,9 +3,6 @@ /* packet-pkixqualified.c */ /* asn2wrs.py -b -L -p pkixqualified -c ./pkixqualified.cnf -s ./packet-pkixqualified-template -D . -O ../.. PKIXqualified.asn PKIXServiceNameSAN88.asn PKIXServiceNameSAN93.asn */ -/* Input file: packet-pkixqualified-template.c */ - -#line 1 "./asn1/pkixqualified/packet-pkixqualified-template.c" /* packet-pkixqualified.c * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 @@ -38,9 +35,6 @@ void proto_reg_handoff_pkixqualified(void); /* Initialize the protocol and registered fields */ static int proto_pkixqualified = -1; - -/*--- Included file: packet-pkixqualified-hf.c ---*/ -#line 1 "./asn1/pkixqualified/packet-pkixqualified-hf.c" static int hf_pkixqualified_Generalizedtime_PDU = -1; /* Generalizedtime */ static int hf_pkixqualified_Directorystring_PDU = -1; /* Directorystring */ static int hf_pkixqualified_Printablestring_PDU = -1; /* Printablestring */ @@ -63,13 +57,7 @@ static int hf_pkixqualified_semanticsIdentifier = -1; /* OBJECT_IDENTIFIER */ static int hf_pkixqualified_nameRegistrationAuthorities = -1; /* NameRegistrationAuthorities */ static int hf_pkixqualified_NameRegistrationAuthorities_item = -1; /* GeneralName */ -/*--- End of included file: packet-pkixqualified-hf.c ---*/ -#line 34 "./asn1/pkixqualified/packet-pkixqualified-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-pkixqualified-ett.c ---*/ -#line 1 "./asn1/pkixqualified/packet-pkixqualified-ett.c" static gint ett_pkixqualified_BiometricSyntax = -1; static gint ett_pkixqualified_BiometricData = -1; static gint ett_pkixqualified_TypeOfBiometricData = -1; @@ -78,15 +66,9 @@ static gint ett_pkixqualified_QCStatement = -1; static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; -/*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 37 "./asn1/pkixqualified/packet-pkixqualified-template.c" - static const char *object_identifier_id; -/*--- Included file: packet-pkixqualified-fn.c ---*/ -#line 1 "./asn1/pkixqualified/packet-pkixqualified-fn.c" - static int dissect_pkixqualified_Generalizedtime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -370,18 +352,12 @@ static int dissect_SRVName_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 41 "./asn1/pkixqualified/packet-pkixqualified-template.c" - /*--- proto_register_pkixqualified ----------------------------------------------*/ void proto_register_pkixqualified(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkixqualified-hfarr.c ---*/ -#line 1 "./asn1/pkixqualified/packet-pkixqualified-hfarr.c" { &hf_pkixqualified_Generalizedtime_PDU, { "Generalizedtime", "pkixqualified.Generalizedtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, @@ -466,16 +442,10 @@ void proto_register_pkixqualified(void) { { "GeneralName", "pkixqualified.GeneralName", FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0, NULL, HFILL }}, - -/*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 49 "./asn1/pkixqualified/packet-pkixqualified-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-pkixqualified-ettarr.c ---*/ -#line 1 "./asn1/pkixqualified/packet-pkixqualified-ettarr.c" &ett_pkixqualified_BiometricSyntax, &ett_pkixqualified_BiometricData, &ett_pkixqualified_TypeOfBiometricData, @@ -483,9 +453,6 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_QCStatement, &ett_pkixqualified_SemanticsInformation, &ett_pkixqualified_NameRegistrationAuthorities, - -/*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 54 "./asn1/pkixqualified/packet-pkixqualified-template.c" }; /* Register protocol */ @@ -500,9 +467,6 @@ void proto_register_pkixqualified(void) { /*--- proto_reg_handoff_pkixqualified -------------------------------------------*/ void proto_reg_handoff_pkixqualified(void) { - -/*--- Included file: packet-pkixqualified-dis-tab.c ---*/ -#line 1 "./asn1/pkixqualified/packet-pkixqualified-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.2", dissect_BiometricSyntax_PDU, proto_pkixqualified, "id-pe-biometricInfo"); register_ber_oid_dissector("1.3.6.1.5.5.7.1.3", dissect_QCStatements_PDU, proto_pkixqualified, "id-pe-qcStatements"); register_ber_oid_dissector("1.3.6.1.5.5.7.11.1", dissect_SemanticsInformation_PDU, proto_pkixqualified, "id-qcs-pkixQCSyntax-v1"); @@ -515,8 +479,5 @@ void proto_reg_handoff_pkixqualified(void) { register_ber_oid_dissector("1.3.6.1.5.5.7.9.5", dissect_Printablestring_PDU, proto_pkixqualified, "id-pda-countryOfResidence"); register_ber_oid_dissector("1.3.6.1.5.5.7.8.7", dissect_SRVName_PDU, proto_pkixqualified, "id-on-dnsSRV"); - -/*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 69 "./asn1/pkixqualified/packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h index 8bb5d9e653..b218b951a6 100644 --- a/epan/dissectors/packet-pkixqualified.h +++ b/epan/dissectors/packet-pkixqualified.h @@ -3,9 +3,6 @@ /* packet-pkixqualified.h */ /* asn2wrs.py -b -L -p pkixqualified -c ./pkixqualified.cnf -s ./packet-pkixqualified-template -D . -O ../.. PKIXqualified.asn PKIXServiceNameSAN88.asn PKIXServiceNameSAN93.asn */ -/* Input file: packet-pkixqualified-template.h */ - -#line 1 "./asn1/pkixqualified/packet-pkixqualified-template.h" /* packet-pkixqualified.h * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 7661b3cc3d..acb08d8935 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -3,9 +3,6 @@ /* packet-pkixtsp.c */ /* asn2wrs.py -b -L -p pkixtsp -c ./pkixtsp.cnf -s ./packet-pkixtsp-template -D . -O ../.. PKIXTSP.asn */ -/* Input file: packet-pkixtsp-template.c */ - -#line 1 "./asn1/pkixtsp/packet-pkixtsp-template.c" /* packet-pkixtsp.c * Routines for RFC2634 Extended Security Services packet dissection * Ronnie Sahlberg 2004 @@ -37,9 +34,6 @@ void proto_reg_handoff_pkixtsp(void); /* Initialize the protocol and registered fields */ static int proto_pkixtsp = -1; - -/*--- Included file: packet-pkixtsp-hf.c ---*/ -#line 1 "./asn1/pkixtsp/packet-pkixtsp-hf.c" static int hf_pkixtsp_TimeStampReq_PDU = -1; /* TimeStampReq */ static int hf_pkixtsp_TimeStampResp_PDU = -1; /* TimeStampResp */ static int hf_pkixtsp_TSTInfo_PDU = -1; /* TSTInfo */ @@ -94,14 +88,8 @@ static int hf_pkixtsp_PKIFailureInfo_spare_bit23 = -1; static int hf_pkixtsp_PKIFailureInfo_spare_bit24 = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; -/*--- End of included file: packet-pkixtsp-hf.c ---*/ -#line 33 "./asn1/pkixtsp/packet-pkixtsp-template.c" - /* Initialize the subtree pointers */ static gint ett_pkixtsp = -1; - -/*--- Included file: packet-pkixtsp-ett.c ---*/ -#line 1 "./asn1/pkixtsp/packet-pkixtsp-ett.c" static gint ett_pkixtsp_TimeStampReq = -1; static gint ett_pkixtsp_MessageImprint = -1; static gint ett_pkixtsp_TimeStampResp = -1; @@ -110,14 +98,8 @@ static gint ett_pkixtsp_PKIFailureInfo = -1; static gint ett_pkixtsp_TSTInfo = -1; static gint ett_pkixtsp_Accuracy = -1; -/*--- End of included file: packet-pkixtsp-ett.c ---*/ -#line 37 "./asn1/pkixtsp/packet-pkixtsp-template.c" - -/*--- Included file: packet-pkixtsp-fn.c ---*/ -#line 1 "./asn1/pkixtsp/packet-pkixtsp-fn.c" - static const value_string pkixtsp_T_version_vals[] = { { 1, "v1" }, { 0, NULL } @@ -417,9 +399,6 @@ static int dissect_SignatureTimeStampToken_PDU(tvbuff_t *tvb _U_, packet_info *p } -/*--- End of included file: packet-pkixtsp-fn.c ---*/ -#line 40 "./asn1/pkixtsp/packet-pkixtsp-template.c" - static int dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) @@ -469,9 +448,6 @@ void proto_register_pkixtsp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-pkixtsp-hfarr.c ---*/ -#line 1 "./asn1/pkixtsp/packet-pkixtsp-hfarr.c" { &hf_pkixtsp_TimeStampReq_PDU, { "TimeStampReq", "pkixtsp.TimeStampReq_element", FT_NONE, BASE_NONE, NULL, 0, @@ -680,17 +656,11 @@ void proto_register_pkixtsp(void) { { "systemFailure", "pkixtsp.PKIFailureInfo.systemFailure", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 91 "./asn1/pkixtsp/packet-pkixtsp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_pkixtsp, - -/*--- Included file: packet-pkixtsp-ettarr.c ---*/ -#line 1 "./asn1/pkixtsp/packet-pkixtsp-ettarr.c" &ett_pkixtsp_TimeStampReq, &ett_pkixtsp_MessageImprint, &ett_pkixtsp_TimeStampResp, @@ -698,9 +668,6 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_PKIFailureInfo, &ett_pkixtsp_TSTInfo, &ett_pkixtsp_Accuracy, - -/*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 97 "./asn1/pkixtsp/packet-pkixtsp-template.c" }; /* Register protocol */ @@ -729,14 +696,8 @@ void proto_reg_handoff_pkixtsp(void) { timestamp_query_handle = create_dissector_handle(dissect_timestamp_query, proto_pkixtsp); dissector_add_string("media_type", "application/timestamp-query", timestamp_query_handle); - -/*--- Included file: packet-pkixtsp-dis-tab.c ---*/ -#line 1 "./asn1/pkixtsp/packet-pkixtsp-dis-tab.c" register_ber_oid_dissector("1.2.840.113549.1.9.16.2.14", dissect_SignatureTimeStampToken_PDU, proto_pkixtsp, "id-aa-timeStampToken"); register_ber_oid_dissector("1.2.840.113549.1.9.16.1.4", dissect_TSTInfo_PDU, proto_pkixtsp, "id-ct-TSTInfo"); - -/*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 126 "./asn1/pkixtsp/packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h index 0afe6d9882..71ae9743d5 100644 --- a/epan/dissectors/packet-pkixtsp.h +++ b/epan/dissectors/packet-pkixtsp.h @@ -3,9 +3,6 @@ /* packet-pkixtsp.h */ /* asn2wrs.py -b -L -p pkixtsp -c ./pkixtsp.cnf -s ./packet-pkixtsp-template -D . -O ../.. PKIXTSP.asn */ -/* Input file: packet-pkixtsp-template.h */ - -#line 1 "./asn1/pkixtsp/packet-pkixtsp-template.h" /* packet-pkixtsp.h * Routines for RFC3161 Time-Stamp Protocol packet dissection * Ronnie Sahlberg 2004 diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index b894853912..9942c927b7 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -3,9 +3,6 @@ /* packet-pres.c */ /* asn2wrs.py -b -L -p pres -c ./pres.cnf -s ./packet-pres-template -D . -O ../.. ISO8823-PRESENTATION.asn ISO9576-PRESENTATION.asn */ -/* Input file: packet-pres-template.c */ - -#line 1 "./asn1/pres/packet-pres-template.c" /* packet-pres.c * Routine to dissect ISO 8823 OSI Presentation Protocol packets * Based on the dissector by @@ -81,9 +78,6 @@ static int hf_pres_Abort_type = -1; static int hf_pres_CPR_PPDU = -1; static int hf_pres_Typed_data_type = -1; - -/*--- Included file: packet-pres-hf.c ---*/ -#line 1 "./asn1/pres/packet-pres-hf.c" static int hf_pres_UD_type_PDU = -1; /* UD_type */ static int hf_pres_mode_selector = -1; /* Mode_selector */ static int hf_pres_x410_mode_parameters = -1; /* RTORQapdu */ @@ -163,15 +157,9 @@ static int hf_pres_User_session_requirements_typed_data = -1; static int hf_pres_User_session_requirements_symmetric_synchronize = -1; static int hf_pres_User_session_requirements_data_separation = -1; -/*--- End of included file: packet-pres-hf.c ---*/ -#line 77 "./asn1/pres/packet-pres-template.c" - /* Initialize the subtree pointers */ static gint ett_pres = -1; - -/*--- Included file: packet-pres-ett.c ---*/ -#line 1 "./asn1/pres/packet-pres-ett.c" static gint ett_pres_CP_type = -1; static gint ett_pres_T_normal_mode_parameters = -1; static gint ett_pres_T_extensions = -1; @@ -209,9 +197,6 @@ static gint ett_pres_T_presentation_data_values = -1; static gint ett_pres_User_session_requirements = -1; static gint ett_pres_UD_type = -1; -/*--- End of included file: packet-pres-ett.c ---*/ -#line 82 "./asn1/pres/packet-pres-template.c" - static expert_field ei_pres_dissector_not_available = EI_INIT; static expert_field ei_pres_wrong_spdu_type = EI_INIT; static expert_field ei_pres_invalid_offset = EI_INIT; @@ -325,9 +310,6 @@ pres_free_cb(void *r) -/*--- Included file: packet-pres-fn.c ---*/ -#line 1 "./asn1/pres/packet-pres-fn.c" - static const value_string pres_T_mode_value_vals[] = { { 0, "x410-1984-mode" }, { 1, "normal-mode" }, @@ -1318,9 +1300,6 @@ static int dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-pres-fn.c ---*/ -#line 196 "./asn1/pres/packet-pres-template.c" - /* * Dissect an PPDU. @@ -1488,9 +1467,6 @@ void proto_register_pres(void) { FT_UINT32, BASE_DEC, VALS(pres_Typed_data_type_vals), 0, NULL, HFILL }}, - -/*--- Included file: packet-pres-hfarr.c ---*/ -#line 1 "./asn1/pres/packet-pres-hfarr.c" { &hf_pres_UD_type_PDU, { "UD-type", "pres.UD_type_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1799,17 +1775,11 @@ void proto_register_pres(void) { { "data-separation", "pres.User.session.requirements.data.separation", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, - -/*--- End of included file: packet-pres-hfarr.c ---*/ -#line 365 "./asn1/pres/packet-pres-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_pres, - -/*--- Included file: packet-pres-ettarr.c ---*/ -#line 1 "./asn1/pres/packet-pres-ettarr.c" &ett_pres_CP_type, &ett_pres_T_normal_mode_parameters, &ett_pres_T_extensions, @@ -1846,9 +1816,6 @@ void proto_register_pres(void) { &ett_pres_T_presentation_data_values, &ett_pres_User_session_requirements, &ett_pres_UD_type, - -/*--- End of included file: packet-pres-ettarr.c ---*/ -#line 371 "./asn1/pres/packet-pres-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-pres.h b/epan/dissectors/packet-pres.h index 5b32e2ade0..d0ec9e384e 100644 --- a/epan/dissectors/packet-pres.h +++ b/epan/dissectors/packet-pres.h @@ -3,9 +3,6 @@ /* packet-pres.h */ /* asn2wrs.py -b -L -p pres -c ./pres.cnf -s ./packet-pres-template -D . -O ../.. ISO8823-PRESENTATION.asn ISO9576-PRESENTATION.asn */ -/* Input file: packet-pres-template.h */ - -#line 1 "./asn1/pres/packet-pres-template.h" /* packet-pres.h * Routines for pres packet dissection * diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 35173a5cda..abf4d5eb98 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -3,9 +3,6 @@ /* packet-q932-ros.c */ /* asn2wrs.py -b -L -p q932.ros -c ./q932-ros.cnf -s ./packet-q932-ros-template -D . -O ../.. ../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn */ -/* Input file: packet-q932-ros-template.c */ - -#line 1 "./asn1/q932-ros/packet-q932-ros-template.c" /* packet-q932-ros.c * Routines for Q.932 packet dissection * 2007 Tomas Kukosa @@ -35,9 +32,6 @@ void proto_reg_handoff_q932_ros(void); /* Initialize the protocol and registered fields */ static int proto_q932_ros = -1; - -/*--- Included file: packet-q932-ros-hf.c ---*/ -#line 1 "./asn1/q932-ros/packet-q932-ros-hf.c" static int hf_q932_ros_ROS_PDU = -1; /* ROS */ static int hf_q932_ros_local = -1; /* T_local */ static int hf_q932_ros_global = -1; /* T_global */ @@ -63,13 +57,7 @@ static int hf_q932_ros_returnErrorProblem = -1; /* ReturnErrorProblem */ static int hf_q932_ros_present = -1; /* INTEGER */ static int hf_q932_ros_InvokeId_present = -1; /* InvokeId_present */ -/*--- End of included file: packet-q932-ros-hf.c ---*/ -#line 31 "./asn1/q932-ros/packet-q932-ros-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-q932-ros-ett.c ---*/ -#line 1 "./asn1/q932-ros/packet-q932-ros-ett.c" static gint ett_q932_ros_Code = -1; static gint ett_q932_ros_ROS = -1; static gint ett_q932_ros_Invoke = -1; @@ -81,9 +69,6 @@ static gint ett_q932_ros_Reject = -1; static gint ett_q932_ros_T_problem = -1; static gint ett_q932_ros_InvokeId = -1; -/*--- End of included file: packet-q932-ros-ett.c ---*/ -#line 34 "./asn1/q932-ros/packet-q932-ros-template.c" - static expert_field ei_ros_undecoded = EI_INIT; /* Preferences */ @@ -100,9 +85,6 @@ static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; -/*--- Included file: packet-q932-ros-fn.c ---*/ -#line 1 "./asn1/q932-ros/packet-q932-ros-fn.c" - static int dissect_q932_ros_T_local(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -630,9 +612,6 @@ static int dissect_ROS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree } -/*--- End of included file: packet-q932-ros-fn.c ---*/ -#line 51 "./asn1/q932-ros/packet-q932-ros-template.c" - /*--- dissect_q932_ros -----------------------------------------------------*/ static int dissect_q932_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { /* Reject the packet if data is NULL */ @@ -648,9 +627,6 @@ void proto_register_q932_ros(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-q932-ros-hfarr.c ---*/ -#line 1 "./asn1/q932-ros/packet-q932-ros-hfarr.c" { &hf_q932_ros_ROS_PDU, { "ROS", "q932.ros.ROS", FT_UINT32, BASE_DEC, VALS(q932_ros_ROS_vals), 0, @@ -747,16 +723,10 @@ void proto_register_q932_ros(void) { { "InvokeId.present", "q932.ros.InvokeId_present", FT_INT32, BASE_DEC, NULL, 0, "InvokeId_present", HFILL }}, - -/*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 68 "./asn1/q932-ros/packet-q932-ros-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-q932-ros-ettarr.c ---*/ -#line 1 "./asn1/q932-ros/packet-q932-ros-ettarr.c" &ett_q932_ros_Code, &ett_q932_ros_ROS, &ett_q932_ros_Invoke, @@ -767,9 +737,6 @@ void proto_register_q932_ros(void) { &ett_q932_ros_Reject, &ett_q932_ros_T_problem, &ett_q932_ros_InvokeId, - -/*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 73 "./asn1/q932-ros/packet-q932-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 78e24dc71b..6191af58c2 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -3,9 +3,6 @@ /* packet-q932.c */ /* asn2wrs.py -b -L -p q932 -c ./q932.cnf -s ./packet-q932-template -D . -O ../.. Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */ -/* Input file: packet-q932-template.c */ - -#line 1 "./asn1/q932/packet-q932-template.c" /* packet-q932.c * Routines for Q.932 packet dissection * 2007 Tomas Kukosa @@ -41,9 +38,6 @@ static int hf_q932_ie_len = -1; static int hf_q932_ie_data = -1; static int hf_q932_pp = -1; static int hf_q932_nd = -1; - -/*--- Included file: packet-q932-hf.c ---*/ -#line 1 "./asn1/q932/packet-q932-hf.c" static int hf_q932_NetworkFacilityExtension_PDU = -1; /* NetworkFacilityExtension */ static int hf_q932_NetworkProtocolProfile_PDU = -1; /* NetworkProtocolProfile */ static int hf_q932_InterpretationComponent_PDU = -1; /* InterpretationComponent */ @@ -82,15 +76,9 @@ static int hf_q932_sourceEntityAddress = -1; /* AddressInformation */ static int hf_q932_destinationEntity = -1; /* EntityType */ static int hf_q932_destinationEntityAddress = -1; /* AddressInformation */ -/*--- End of included file: packet-q932-hf.c ---*/ -#line 37 "./asn1/q932/packet-q932-template.c" - /* Initialize the subtree pointers */ static gint ett_q932 = -1; static gint ett_q932_ie = -1; - -/*--- Included file: packet-q932-ett.c ---*/ -#line 1 "./asn1/q932/packet-q932-ett.c" static gint ett_q932_PresentedAddressScreened = -1; static gint ett_q932_PresentedAddressUnscreened = -1; static gint ett_q932_PresentedNumberScreened = -1; @@ -105,9 +93,6 @@ static gint ett_q932_PartySubaddress = -1; static gint ett_q932_UserSpecifiedSubaddress = -1; static gint ett_q932_NetworkFacilityExtension_U = -1; -/*--- End of included file: packet-q932-ett.c ---*/ -#line 42 "./asn1/q932/packet-q932-template.c" - static expert_field ei_q932_dse_not_supported = EI_INIT; static expert_field ei_q932_acse_not_supported = EI_INIT; static expert_field ei_q932_unknown_component = EI_INIT; @@ -196,9 +181,6 @@ static const value_string str_nd[] = { }; -/*--- Included file: packet-q932-fn.c ---*/ -#line 1 "./asn1/q932/packet-q932-fn.c" - static int dissect_q932_NumberDigits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -703,9 +685,6 @@ static int dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info *p } -/*--- End of included file: packet-q932-fn.c ---*/ -#line 131 "./asn1/q932/packet-q932-template.c" - /*--- dissect_q932_facility_ie -------------------------------------------------------*/ static void dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int length) { @@ -874,9 +853,6 @@ void proto_register_q932(void) { { &hf_q932_nd, { "Notification description", "q932.nd", FT_UINT8, BASE_HEX, VALS(str_nd), 0x0, NULL, HFILL }}, - -/*--- Included file: packet-q932-hfarr.c ---*/ -#line 1 "./asn1/q932/packet-q932-hfarr.c" { &hf_q932_NetworkFacilityExtension_PDU, { "NetworkFacilityExtension", "q932.NetworkFacilityExtension_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1025,18 +1001,12 @@ void proto_register_q932(void) { { "destinationEntityAddress", "q932.destinationEntityAddress", FT_UINT32, BASE_DEC, VALS(q932_PartyNumber_vals), 0, "AddressInformation", HFILL }}, - -/*--- End of included file: packet-q932-hfarr.c ---*/ -#line 301 "./asn1/q932/packet-q932-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_q932, &ett_q932_ie, - -/*--- Included file: packet-q932-ettarr.c ---*/ -#line 1 "./asn1/q932/packet-q932-ettarr.c" &ett_q932_PresentedAddressScreened, &ett_q932_PresentedAddressUnscreened, &ett_q932_PresentedNumberScreened, @@ -1050,9 +1020,6 @@ void proto_register_q932(void) { &ett_q932_PartySubaddress, &ett_q932_UserSpecifiedSubaddress, &ett_q932_NetworkFacilityExtension_U, - -/*--- End of included file: packet-q932-ettarr.c ---*/ -#line 308 "./asn1/q932/packet-q932-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h index 5b49a31487..8a53af0e68 100644 --- a/epan/dissectors/packet-q932.h +++ b/epan/dissectors/packet-q932.h @@ -3,9 +3,6 @@ /* packet-q932.h */ /* asn2wrs.py -b -L -p q932 -c ./q932.cnf -s ./packet-q932-template -D . -O ../.. Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */ -/* Input file: packet-q932-template.h */ - -#line 1 "./asn1/q932/packet-q932-template.h" /* packet-q932.h * Routines for Q.932 packet dissection * 2007 Tomas Kukosa @@ -20,9 +17,6 @@ #ifndef PACKET_Q932_H #define PACKET_Q932_H - -/*--- Included file: packet-q932-exp.h ---*/ -#line 1 "./asn1/q932/packet-q932-exp.h" WS_DLL_PUBLIC const value_string q932_PresentedAddressScreened_vals[]; WS_DLL_PUBLIC const value_string q932_PresentedAddressUnscreened_vals[]; WS_DLL_PUBLIC const value_string q932_PresentedNumberScreened_vals[]; @@ -40,8 +34,5 @@ WS_DLL_PUBLIC int dissect_q932_PartySubaddress(gboolean implicit_tag _U_, tvbuff WS_DLL_PUBLIC int dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); WS_DLL_PUBLIC int dissect_q932_PresentationAllowedIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-q932-exp.h ---*/ -#line 16 "./asn1/q932/packet-q932-template.h" - #endif /* PACKET_Q932_H */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index ea85dd255d..b049187f27 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -3,9 +3,6 @@ /* packet-qsig.c */ /* asn2wrs.py -L -c ./qsig.cnf -s ./packet-qsig-template -D . -O ../.. General-Error-List.asn qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn QSIG-NA.asn QSIG-CF.asn QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */ -/* Input file: packet-qsig-template.c */ - -#line 1 "./asn1/qsig/packet-qsig-template.c" /* packet-qsig.c * Routines for QSIG packet dissection * 2007 Tomas Kukosa @@ -266,9 +263,6 @@ static const gint32 op2srv_tab[] = { static const value_string qsig_str_operation[] = { -/*--- Included file: packet-qsig-table10.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-table10.c" - /* --- Module General-Error-List --- --- --- */ /* Unknown or empty loop list OPERATION */ @@ -476,17 +470,11 @@ static const value_string qsig_str_operation[] = { { 119, "mIDMailboxAuth" }, { 120, "mIDMailboxID" }, - -/*--- End of included file: packet-qsig-table10.c ---*/ -#line 261 "./asn1/qsig/packet-qsig-template.c" { 0, NULL} }; static const value_string qsig_str_error[] = { -/*--- Included file: packet-qsig-table20.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-table20.c" - /* --- Module General-Error-List --- --- --- */ { 0, "userNotSubscribed" }, @@ -668,9 +656,6 @@ static const value_string qsig_str_error[] = { { 1039, "invalidMailbox" }, { 1040, "authorizationFailed" }, { 1008, "unspecified" }, - -/*--- End of included file: packet-qsig-table20.c ---*/ -#line 266 "./asn1/qsig/packet-qsig-template.c" { 0, NULL} }; @@ -687,9 +672,6 @@ static int hf_qsig_ie_data = -1; static int hf_qsig_tc = -1; static int hf_qsig_pc = -1; -/*--- Included file: packet-qsig-hf.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-hf.c" - /* --- Modules Manufacturer-specific-service-extension-class-asn1-97 PSS1-generic-parameters-definition-asn1-97 Addressing-Data-Elements-asn1-97 --- --- --- */ static int hf_qsig_extensionId = -1; /* T_extensionId */ @@ -1571,9 +1553,6 @@ static int hf_qsig_mid_extension = -1; /* Extension */ static int hf_qsig_mid_multipleExtension = -1; /* SEQUENCE_OF_Extension */ static int hf_qsig_mid_multipleExtension_item = -1; /* Extension */ -/*--- End of included file: packet-qsig-hf.c ---*/ -#line 282 "./asn1/qsig/packet-qsig-template.c" - static int *hf_qsig_ie_type_arr[] = { NULL, NULL, @@ -1590,9 +1569,6 @@ static gint ett_qsig = -1; static gint ett_qsig_ie = -1; static gint ett_qsig_unknown_extension = -1; -/*--- Included file: packet-qsig-ett.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-ett.c" - /* --- Modules Manufacturer-specific-service-extension-class-asn1-97 PSS1-generic-parameters-definition-asn1-97 Addressing-Data-Elements-asn1-97 --- --- --- */ static gint ett_qsig_Extension = -1; @@ -2030,9 +2006,6 @@ static gint ett_qsig_mid_PartyInfo = -1; static gint ett_qsig_mid_String = -1; static gint ett_qsig_mid_MIDExtensions = -1; static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1; - -/*--- End of included file: packet-qsig-ett.c ---*/ -#line 299 "./asn1/qsig/packet-qsig-template.c" static gint ett_cnq_PSS1InformationElement = -1; /* static expert_field ei_qsig_unsupported_arg_type = EI_INIT; */ @@ -2051,9 +2024,6 @@ static const char *extension_oid = NULL; static dissector_table_t extension_dissector_table; -/*--- Included file: packet-qsig-fn.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-fn.c" - /* --- Modules Manufacturer-specific-service-extension-class-asn1-97 PSS1-generic-parameters-definition-asn1-97 Addressing-Data-Elements-asn1-97 --- --- --- */ @@ -11922,9 +11892,6 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo } -/*--- End of included file: packet-qsig-fn.c ---*/ -#line 317 "./asn1/qsig/packet-qsig-template.c" - typedef struct _qsig_op_t { gint32 opcode; dissector_t arg_pdu; @@ -11933,9 +11900,6 @@ typedef struct _qsig_op_t { static const qsig_op_t qsig_op_tab[] = { -/*--- Included file: packet-qsig-table11.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-table11.c" - /* --- Module General-Error-List --- --- --- */ /* Unknown or empty loop list OPERATION */ @@ -12143,9 +12107,6 @@ static const qsig_op_t qsig_op_tab[] = { /* mIDMailboxAuth */ { 119, dissect_qsig_mid_MIDMailboxAuthArg_PDU, dissect_qsig_mid_MIDDummyRes_PDU }, /* mIDMailboxID */ { 120, dissect_qsig_mid_MIDMailboxIDArg_PDU, dissect_qsig_mid_MIDDummyRes_PDU }, - -/*--- End of included file: packet-qsig-table11.c ---*/ -#line 326 "./asn1/qsig/packet-qsig-template.c" }; typedef struct _qsig_err_t { @@ -12155,9 +12116,6 @@ typedef struct _qsig_err_t { static const qsig_err_t qsig_err_tab[] = { -/*--- Included file: packet-qsig-table21.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-table21.c" - /* --- Module General-Error-List --- --- --- */ /* userNotSubscribed */ { 0, NULL }, @@ -12339,9 +12297,6 @@ static const qsig_err_t qsig_err_tab[] = { /* invalidMailbox */ { 1039, NULL }, /* authorizationFailed */ { 1040, NULL }, /* unspecified */ { 1008, dissect_qsig_mid_Extension_PDU }, - -/*--- End of included file: packet-qsig-table21.c ---*/ -#line 335 "./asn1/qsig/packet-qsig-template.c" }; static const qsig_op_t *get_op(gint32 opcode) { @@ -12640,9 +12595,6 @@ void proto_register_qsig(void) { FT_UINT8, BASE_HEX, VALS(qsig_str_pc), 0x07, NULL, HFILL }}, -/*--- Included file: packet-qsig-hfarr.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-hfarr.c" - /* --- Modules Manufacturer-specific-service-extension-class-asn1-97 PSS1-generic-parameters-definition-asn1-97 Addressing-Data-Elements-asn1-97 --- --- --- */ { &hf_qsig_extensionId, @@ -15903,9 +15855,6 @@ void proto_register_qsig(void) { { "Extension", "qsig.mid.Extension_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-qsig-hfarr.c ---*/ -#line 633 "./asn1/qsig/packet-qsig-template.c" }; /* List of subtrees */ @@ -15914,9 +15863,6 @@ void proto_register_qsig(void) { &ett_qsig_ie, &ett_qsig_unknown_extension, -/*--- Included file: packet-qsig-ettarr.c ---*/ -#line 1 "./asn1/qsig/packet-qsig-ettarr.c" - /* --- Modules Manufacturer-specific-service-extension-class-asn1-97 PSS1-generic-parameters-definition-asn1-97 Addressing-Data-Elements-asn1-97 --- --- --- */ &ett_qsig_Extension, @@ -16354,9 +16300,6 @@ void proto_register_qsig(void) { &ett_qsig_mid_String, &ett_qsig_mid_MIDExtensions, &ett_qsig_mid_SEQUENCE_OF_Extension, - -/*--- End of included file: packet-qsig-ettarr.c ---*/ -#line 641 "./asn1/qsig/packet-qsig-template.c" &ett_cnq_PSS1InformationElement, }; diff --git a/epan/dissectors/packet-qsig.h b/epan/dissectors/packet-qsig.h index 3518179c1a..6e07d5f23b 100644 --- a/epan/dissectors/packet-qsig.h +++ b/epan/dissectors/packet-qsig.h @@ -3,9 +3,6 @@ /* packet-qsig.h */ /* asn2wrs.py -L -c ./qsig.cnf -s ./packet-qsig-template -D . -O ../.. General-Error-List.asn qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn QSIG-NA.asn QSIG-CF.asn QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */ -/* Input file: packet-qsig-template.h */ - -#line 1 "./asn1/qsig/packet-qsig-template.h" /* packet-qsig.h * Routines for QSIG packet dissection * 2007 Tomas Kukosa @@ -21,9 +18,6 @@ #define PACKET_QSIG_H -/*--- Included file: packet-qsig-exp.h ---*/ -#line 1 "./asn1/qsig/packet-qsig-exp.h" - /* --- Module General-Error-List --- --- --- */ @@ -118,8 +112,5 @@ WS_DLL_PUBLIC int dissect_qsig_na_Name(gboolean implicit_tag _U_, tvbuff_t *tvb /* --- Module SS-MID-Operations-asn1-97 --- --- --- */ -/*--- End of included file: packet-qsig-exp.h ---*/ -#line 16 "./asn1/qsig/packet-qsig-template.h" - #endif /* PACKET_QSIG_H */ diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index a686d70f37..b45c76c34f 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -3,9 +3,6 @@ /* packet-ranap.c */ /* asn2wrs.py -L -p ranap -c ./ranap.cnf -s ./packet-ranap-template -D . -O ../.. RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn */ -/* Input file: packet-ranap-template.c */ - -#line 1 "./asn1/ranap/packet-ranap-template.c" /* packet-ranap.c * Routines for UMTS Node B Application Part(RANAP) packet dissection * Copyright 2005 - 2010, Anders Broman @@ -53,9 +50,6 @@ /* Highest Ranap_ProcedureCode_value, use in heuristics */ #define RANAP_MAX_PC 49 /* id_RerouteNASRequest = 49 */ - -/*--- Included file: packet-ranap-val.h ---*/ -#line 1 "./asn1/ranap/packet-ranap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -444,9 +438,6 @@ typedef enum _ProtocolIE_ID_enum { id_UE_Application_Layer_Measurement_Configuration_For_Relocation = 293 } ProtocolIE_ID_enum; -/*--- End of included file: packet-ranap-val.h ---*/ -#line 49 "./asn1/ranap/packet-ranap-template.c" - void proto_register_ranap(void); void proto_reg_handoff_ranap(void); @@ -463,9 +454,6 @@ static int hf_ranap_transportLayerAddress_ipv4 = -1; static int hf_ranap_transportLayerAddress_ipv6 = -1; static int hf_ranap_transportLayerAddress_nsap = -1; - -/*--- Included file: packet-ranap-hf.c ---*/ -#line 1 "./asn1/ranap/packet-ranap-hf.c" static int hf_ranap_AccuracyFulfilmentIndicator_PDU = -1; /* AccuracyFulfilmentIndicator */ static int hf_ranap_Additional_CSPS_coordination_information_PDU = -1; /* Additional_CSPS_coordination_information */ static int hf_ranap_Additional_PositioningDataSet_PDU = -1; /* Additional_PositioningDataSet */ @@ -1258,17 +1246,11 @@ static int hf_ranap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_ranap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ static int hf_ranap_value = -1; /* T_value */ -/*--- End of included file: packet-ranap-hf.c ---*/ -#line 67 "./asn1/ranap/packet-ranap-template.c" - /* Initialize the subtree pointers */ static int ett_ranap = -1; static int ett_ranap_transportLayerAddress = -1; static int ett_ranap_transportLayerAddress_nsap = -1; - -/*--- Included file: packet-ranap-ett.c ---*/ -#line 1 "./asn1/ranap/packet-ranap-ett.c" static gint ett_ranap_PrivateIE_ID = -1; static gint ett_ranap_ProtocolIE_Container = -1; static gint ett_ranap_ProtocolIE_Field = -1; @@ -1621,9 +1603,6 @@ static gint ett_ranap_SuccessfulOutcome = -1; static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; -/*--- End of included file: packet-ranap-ett.c ---*/ -#line 74 "./asn1/ranap/packet-ranap-template.c" - /*****************************************************************************/ /* Packet private data */ /* For this dissector, all access to actx->private_data should be made */ @@ -1742,9 +1721,6 @@ static int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvbuff_t *tv -/*--- Included file: packet-ranap-fn.c ---*/ -#line 1 "./asn1/ranap/packet-ranap-fn.c" - static const value_string ranap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -14810,9 +14786,6 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } -/*--- End of included file: packet-ranap-fn.c ---*/ -#line 193 "./asn1/ranap/packet-ranap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -15026,9 +14999,6 @@ void proto_register_ranap(void) { NULL, HFILL }}, - -/*--- Included file: packet-ranap-hfarr.c ---*/ -#line 1 "./asn1/ranap/packet-ranap-hfarr.c" { &hf_ranap_AccuracyFulfilmentIndicator_PDU, { "AccuracyFulfilmentIndicator", "ranap.AccuracyFulfilmentIndicator", FT_UINT32, BASE_DEC, VALS(ranap_AccuracyFulfilmentIndicator_vals), 0, @@ -18193,9 +18163,6 @@ void proto_register_ranap(void) { { "value", "ranap.value_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 408 "./asn1/ranap/packet-ranap-template.c" }; /* List of subtrees */ @@ -18203,9 +18170,6 @@ void proto_register_ranap(void) { &ett_ranap, &ett_ranap_transportLayerAddress, &ett_ranap_transportLayerAddress_nsap, - -/*--- Included file: packet-ranap-ettarr.c ---*/ -#line 1 "./asn1/ranap/packet-ranap-ettarr.c" &ett_ranap_PrivateIE_ID, &ett_ranap_ProtocolIE_Container, &ett_ranap_ProtocolIE_Field, @@ -18557,9 +18521,6 @@ void proto_register_ranap(void) { &ett_ranap_SuccessfulOutcome, &ett_ranap_UnsuccessfulOutcome, &ett_ranap_Outcome, - -/*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 416 "./asn1/ranap/packet-ranap-template.c" }; @@ -18603,9 +18564,6 @@ proto_reg_handoff_ranap(void) heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap, HEURISTIC_ENABLE); heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap, HEURISTIC_ENABLE); dissector_add_uint_with_preference("sccp.ssn", SCCP_SSN_RANAP, ranap_handle); - -/*--- Included file: packet-ranap-dis-tab.c ---*/ -#line 1 "./asn1/ranap/packet-ranap-dis-tab.c" dissector_add_uint("ranap.ies", id_Cause, create_dissector_handle(dissect_ranap_Cause_PDU, proto_ranap)); dissector_add_uint("ranap.ies", id_RAB_DataVolumeReportList, create_dissector_handle(dissect_RAB_DataVolumeReportList_PDU, proto_ranap)); dissector_add_uint("ranap.ies", id_RAB_ReleasedList_IuRelComp, create_dissector_handle(dissect_RAB_ReleasedList_IuRelComp_PDU, proto_ranap)); @@ -18980,9 +18938,6 @@ proto_reg_handoff_ranap(void) dissector_add_uint("ranap.proc.imsg", id_RerouteNASRequest, create_dissector_handle(dissect_RerouteNASRequest_PDU, proto_ranap)); -/*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 460 "./asn1/ranap/packet-ranap-template.c" - } /* diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h index 13a60e4f18..70213a4444 100644 --- a/epan/dissectors/packet-ranap.h +++ b/epan/dissectors/packet-ranap.h @@ -3,9 +3,6 @@ /* packet-ranap.h */ /* asn2wrs.py -L -p ranap -c ./ranap.cnf -s ./packet-ranap-template -D . -O ../.. RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn */ -/* Input file: packet-ranap-template.h */ - -#line 1 "./asn1/ranap/packet-ranap-template.h" /* packet-ranap-template.h * Routines for GSM Supplementary Services dissection * Copyright 2005, Anders Broman @@ -19,9 +16,6 @@ #ifndef PACKET_RANAP_H #define PACKET_RANAP_H - -/*--- Included file: packet-ranap-exp.h ---*/ -#line 1 "./asn1/ranap/packet-ranap-exp.h" extern const value_string ranap_Service_Handover_vals[]; int dissect_ranap_EncryptionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_ranap_IntegrityProtectionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -36,9 +30,6 @@ int dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU(tvbuff_t *tvb _ int dissect_ranap_TargetRNC_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-ranap-exp.h ---*/ -#line 15 "./asn1/ranap/packet-ranap-template.h" - #endif /* PACKET_RANAP_H */ /* diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index fee67907a6..4f82194207 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -3,9 +3,6 @@ /* packet-rnsap.c */ /* asn2wrs.py -L -p rnsap -c ./rnsap.cnf -s ./packet-rnsap-template -D . -O ../.. RNSAP-CommonDataTypes.asn RNSAP-Constants.asn RNSAP-Containers.asn RNSAP-IEs.asn RNSAP-PDU-Contents.asn RNSAP-PDU-Descriptions.asn */ -/* Input file: packet-rnsap-template.c */ - -#line 1 "./asn1/rnsap/packet-rnsap-template.c" /* packet-rnsap.c * Routines for dissecting Universal Mobile Telecommunications System (UMTS); * UTRAN Iur interface Radio Network Subsystem @@ -43,9 +40,6 @@ #define SCCP_SSN_RNSAP 143 - -/*--- Included file: packet-rnsap-val.h ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -1264,9 +1258,6 @@ typedef enum _ProtocolIE_ID_enum { id_EventH = 2064 } ProtocolIE_ID_enum; -/*--- End of included file: packet-rnsap-val.h ---*/ -#line 39 "./asn1/rnsap/packet-rnsap-template.c" - void proto_register_rnsap(void); void proto_reg_handoff_rnsap(void); @@ -1288,9 +1279,6 @@ static int proto_rnsap = -1; static int hf_rnsap_transportLayerAddress_ipv4 = -1; static int hf_rnsap_transportLayerAddress_ipv6 = -1; static int hf_rnsap_transportLayerAddress_nsap = -1; - -/*--- Included file: packet-rnsap-hf.c ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-hf.c" static int hf_rnsap_ActivationInformation_PDU = -1; /* ActivationInformation */ static int hf_rnsap_Active_MBMS_Bearer_Service_ListFDD_PDU = -1; /* Active_MBMS_Bearer_Service_ListFDD */ static int hf_rnsap_Active_MBMS_Bearer_Service_ListFDD_PFL_PDU = -1; /* Active_MBMS_Bearer_Service_ListFDD_PFL */ @@ -4396,17 +4384,11 @@ static int hf_rnsap_value_03 = -1; /* SuccessfulOutcome_value */ static int hf_rnsap_value_04 = -1; /* UnsuccessfulOutcome_value */ static int hf_rnsap_value_05 = -1; /* Outcome_value */ -/*--- End of included file: packet-rnsap-hf.c ---*/ -#line 62 "./asn1/rnsap/packet-rnsap-template.c" - /* Initialize the subtree pointers */ static int ett_rnsap = -1; static int ett_rnsap_transportLayerAddress = -1; static int ett_rnsap_transportLayerAddress_nsap = -1; - -/*--- Included file: packet-rnsap-ett.c ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-ett.c" static gint ett_rnsap_PrivateIE_ID = -1; static gint ett_rnsap_ProcedureID = -1; static gint ett_rnsap_TransactionID = -1; @@ -5835,9 +5817,6 @@ static gint ett_rnsap_SuccessfulOutcome = -1; static gint ett_rnsap_UnsuccessfulOutcome = -1; static gint ett_rnsap_Outcome = -1; -/*--- End of included file: packet-rnsap-ett.c ---*/ -#line 69 "./asn1/rnsap/packet-rnsap-template.c" - /* Dissector tables */ static dissector_table_t rnsap_ies_dissector_table; @@ -5870,9 +5849,6 @@ rnsap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-rnsap-fn.c ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-fn.c" - static const value_string rnsap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -49121,9 +49097,6 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } -/*--- End of included file: packet-rnsap-fn.c ---*/ -#line 102 "./asn1/rnsap/packet-rnsap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { rnsap_private_data_t *pdata = rnsap_get_private_data(pinfo); @@ -49277,9 +49250,6 @@ void proto_register_rnsap(void) { { "transportLayerAddress NSAP", "rnsap.transportLayerAddress_NSAP", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-rnsap-hfarr.c ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-hfarr.c" { &hf_rnsap_ActivationInformation_PDU, { "ActivationInformation", "rnsap.ActivationInformation", FT_UINT32, BASE_DEC, NULL, 0, @@ -61696,9 +61666,6 @@ void proto_register_rnsap(void) { { "value", "rnsap.value_element", FT_NONE, BASE_NONE, NULL, 0, "Outcome_value", HFILL }}, - -/*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 257 "./asn1/rnsap/packet-rnsap-template.c" }; /* List of subtrees */ @@ -61706,9 +61673,6 @@ void proto_register_rnsap(void) { &ett_rnsap, &ett_rnsap_transportLayerAddress, &ett_rnsap_transportLayerAddress_nsap, - -/*--- Included file: packet-rnsap-ettarr.c ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-ettarr.c" &ett_rnsap_PrivateIE_ID, &ett_rnsap_ProcedureID, &ett_rnsap_TransactionID, @@ -63136,9 +63100,6 @@ void proto_register_rnsap(void) { &ett_rnsap_SuccessfulOutcome, &ett_rnsap_UnsuccessfulOutcome, &ett_rnsap_Outcome, - -/*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 265 "./asn1/rnsap/packet-rnsap-template.c" }; @@ -63172,9 +63133,6 @@ proto_reg_handoff_rnsap(void) dissector_add_uint("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle); heur_dissector_add("sccp", dissect_sccp_rnsap_heur, "RNSAP over SCCP", "rnsap_sccp", proto_rnsap, HEURISTIC_ENABLE); - -/*--- Included file: packet-rnsap-dis-tab.c ---*/ -#line 1 "./asn1/rnsap/packet-rnsap-dis-tab.c" dissector_add_uint("rnsap.ies", id_RTLoadValue, create_dissector_handle(dissect_RTLoadValue_PDU, proto_rnsap)); dissector_add_uint("rnsap.ies", id_NRTLoadInformationValue, create_dissector_handle(dissect_NRTLoadInformationValue_PDU, proto_rnsap)); dissector_add_uint("rnsap.ies", id_UpPTSInterferenceValue, create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_rnsap)); @@ -64096,9 +64054,6 @@ proto_reg_handoff_rnsap(void) dissector_add_string("rnsap.proc.sout", "id-enhancedRelocationResourceRelease/tdd", create_dissector_handle(dissect_EnhancedRelocationResourceReleaseComplete_PDU, proto_rnsap)); dissector_add_string("rnsap.proc.imsg", "id-informationTransferControl/common", create_dissector_handle(dissect_InformationTransferControlRequest_PDU, proto_rnsap)); - -/*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 299 "./asn1/rnsap/packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index c89ee28e96..00f67e922a 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -3,9 +3,6 @@ /* packet-ros.c */ /* asn2wrs.py -b -L -p ros -c ./ros.cnf -s ./packet-ros-template -D . -O ../.. ros.asn Remote-Operations-Information-Objects.asn */ -/* Input file: packet-ros-template.c */ - -#line 1 "./asn1/ros/packet-ros-template.c" /* packet-ros_asn1.c * Routines for ROS packet dissection * Graeme Lunt 2005 @@ -62,9 +59,6 @@ static int hf_ros_response_to = -1; static int hf_ros_time = -1; - -/*--- Included file: packet-ros-hf.c ---*/ -#line 1 "./asn1/ros/packet-ros-hf.c" static int hf_ros_invoke = -1; /* Invoke */ static int hf_ros_returnResult = -1; /* ReturnResult */ static int hf_ros_returnError = -1; /* ReturnError */ @@ -93,9 +87,6 @@ static int hf_ros_absent = -1; /* NULL */ static int hf_ros_local = -1; /* INTEGER */ static int hf_ros_global = -1; /* OBJECT_IDENTIFIER */ -/*--- End of included file: packet-ros-hf.c ---*/ -#line 58 "./asn1/ros/packet-ros-template.c" - /* Initialize the subtree pointers */ static gint ett_ros = -1; static gint ett_ros_unknown = -1; @@ -107,9 +98,6 @@ static gint ett_ros_bind_error = -1; static gint ett_ros_unbind_invoke = -1; static gint ett_ros_unbind_result = -1; static gint ett_ros_unbind_error = -1; - -/*--- Included file: packet-ros-ett.c ---*/ -#line 1 "./asn1/ros/packet-ros-ett.c" static gint ett_ros_ROS = -1; static gint ett_ros_Invoke = -1; static gint ett_ros_ReturnResult = -1; @@ -120,9 +108,6 @@ static gint ett_ros_T_problem = -1; static gint ett_ros_InvokeId = -1; static gint ett_ros_Code = -1; -/*--- End of included file: packet-ros-ett.c ---*/ -#line 71 "./asn1/ros/packet-ros-template.c" - static expert_field ei_ros_dissector_oid_not_implemented = EI_INIT; static expert_field ei_ros_unknown_ros_pdu = EI_INIT; @@ -414,9 +399,6 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui } -/*--- Included file: packet-ros-fn.c ---*/ -#line 1 "./asn1/ros/packet-ros-fn.c" - static int dissect_ros_T_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -969,9 +951,6 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a } -/*--- End of included file: packet-ros-fn.c ---*/ -#line 363 "./asn1/ros/packet-ros-template.c" - /* * Dissect ROS PDUs inside a PPDU. */ @@ -1053,9 +1032,6 @@ void proto_register_ros(void) { FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "The time between the Invoke and the Response", HFILL }}, - -/*--- Included file: packet-ros-hfarr.c ---*/ -#line 1 "./asn1/ros/packet-ros-hfarr.c" { &hf_ros_invoke, { "invoke", "ros.invoke_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1164,9 +1140,6 @@ void proto_register_ros(void) { { "global", "ros.global", FT_OID, BASE_NONE, NULL, 0, "OBJECT_IDENTIFIER", HFILL }}, - -/*--- End of included file: packet-ros-hfarr.c ---*/ -#line 446 "./asn1/ros/packet-ros-template.c" }; /* List of subtrees */ @@ -1182,9 +1155,6 @@ void proto_register_ros(void) { &ett_ros_unbind_result, &ett_ros_unbind_error, - -/*--- Included file: packet-ros-ettarr.c ---*/ -#line 1 "./asn1/ros/packet-ros-ettarr.c" &ett_ros_ROS, &ett_ros_Invoke, &ett_ros_ReturnResult, @@ -1194,9 +1164,6 @@ void proto_register_ros(void) { &ett_ros_T_problem, &ett_ros_InvokeId, &ett_ros_Code, - -/*--- End of included file: packet-ros-ettarr.c ---*/ -#line 462 "./asn1/ros/packet-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index bc4c02fe20..df0106b1bf 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -3,9 +3,6 @@ /* packet-ros.h */ /* asn2wrs.py -b -L -p ros -c ./ros.cnf -s ./packet-ros-template -D . -O ../.. ros.asn Remote-Operations-Information-Objects.asn */ -/* Input file: packet-ros-template.h */ - -#line 1 "./asn1/ros/packet-ros-template.h" /* packet-ros.h * Routines for ROS packet dissection * Graeme Lunt 2005 @@ -20,9 +17,6 @@ #ifndef PACKET_ROS_H #define PACKET_ROS_H - -/*--- Included file: packet-ros-exp.h ---*/ -#line 1 "./asn1/ros/packet-ros-exp.h" extern const value_string ros_ROS_vals[]; extern const value_string ros_InvokeId_vals[]; extern const value_string ros_Code_vals[]; @@ -30,9 +24,6 @@ int dissect_ros_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ int dissect_ros_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-ros-exp.h ---*/ -#line 16 "./asn1/ros/packet-ros-template.h" - # include "packet-ses.h" /* for use in the SESSION_DATA_STRUCTURE ros_op argument diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 5c8f9dbca3..b52e8b1f66 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -3,9 +3,6 @@ /* packet-rrc.c */ /* asn2wrs.py -L -p rrc -c ./rrc.cnf -s ./packet-rrc-template -D . -O ../.. Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ -/* Input file: packet-rrc-template.c */ - -#line 1 "./asn1/rrc/packet-rrc-template.c" /* packet-rrc.c * Routines for Universal Mobile Telecommunications System (UMTS); * Radio Resource Control (RRC) protocol specification @@ -317,9 +314,6 @@ static int dissect_SysInfoType11ter_PDU(tvbuff_t *tvb, packet_info *pinfo, proto static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); /* Include constants */ - -/*--- Included file: packet-rrc-val.h ---*/ -#line 1 "./asn1/rrc/packet-rrc-val.h" #define hiPDSCHidentities 64 #define hiPUSCHidentities 64 #define hiRM 256 @@ -515,18 +509,12 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr #define maxWLANID 16 #define maxWLANs 64 -/*--- End of included file: packet-rrc-val.h ---*/ -#line 313 "./asn1/rrc/packet-rrc-template.c" - /* Initialize the protocol and registered fields */ int proto_rrc = -1; static int hf_test; static int hf_urnti; static int hf_urnti_new; static int hf_urnti_current; - -/*--- Included file: packet-rrc-hf.c ---*/ -#line 1 "./asn1/rrc/packet-rrc-hf.c" static int hf_rrc_DL_DCCH_Message_PDU = -1; /* DL_DCCH_Message */ static int hf_rrc_UL_DCCH_Message_PDU = -1; /* UL_DCCH_Message */ static int hf_rrc_DL_CCCH_Message_PDU = -1; /* DL_CCCH_Message */ @@ -11421,15 +11409,9 @@ static int hf_rrc_GsmSecurityCapability_a5_3 = -1; static int hf_rrc_GsmSecurityCapability_a5_2 = -1; static int hf_rrc_GsmSecurityCapability_a5_1 = -1; -/*--- End of included file: packet-rrc-hf.c ---*/ -#line 321 "./asn1/rrc/packet-rrc-template.c" - /* Initialize the subtree pointers */ static int ett_rrc = -1; - -/*--- Included file: packet-rrc-ett.c ---*/ -#line 1 "./asn1/rrc/packet-rrc-ett.c" static gint ett_rrc_DL_DCCH_Message = -1; static gint ett_rrc_DL_DCCH_MessageType = -1; static gint ett_rrc_UL_DCCH_Message = -1; @@ -18368,9 +18350,6 @@ static gint ett_rrc_UE_RadioAccessCapability_r5 = -1; static gint ett_rrc_UE_RadioAccessCapability_r6 = -1; static gint ett_rrc_UL_RFC3095_Context = -1; -/*--- End of included file: packet-rrc-ett.c ---*/ -#line 326 "./asn1/rrc/packet-rrc-template.c" - static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; static gint ett_rrc_ims_info = -1; @@ -18504,9 +18483,6 @@ rrc_try_map_urnti_to_crncc(guint32 u_rnti, asn1_ctx_t *actx) } } - -/*--- Included file: packet-rrc-fn.c ---*/ -#line 1 "./asn1/rrc/packet-rrc-fn.c" /*--- PDUs declarations ---*/ static int dissect_CellUpdate_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static int dissect_CellUpdateConfirm_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -165178,9 +165154,6 @@ static int dissect_SRNC_RelocationInfo_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, pac } -/*--- End of included file: packet-rrc-fn.c ---*/ -#line 461 "./asn1/rrc/packet-rrc-template.c" - static int dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -165262,9 +165235,6 @@ void proto_register_rrc(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-rrc-hfarr.c ---*/ -#line 1 "./asn1/rrc/packet-rrc-hfarr.c" { &hf_rrc_DL_DCCH_Message_PDU, { "DL-DCCH-Message", "rrc.DL_DCCH_Message_element", FT_NONE, BASE_NONE, NULL, 0, @@ -208833,9 +208803,6 @@ void proto_register_rrc(void) { { "a5-1", "rrc.GsmSecurityCapability.a5.1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, - -/*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 544 "./asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -208897,9 +208864,6 @@ void proto_register_rrc(void) { /* List of subtrees */ static gint *ett[] = { &ett_rrc, - -/*--- Included file: packet-rrc-ettarr.c ---*/ -#line 1 "./asn1/rrc/packet-rrc-ettarr.c" &ett_rrc_DL_DCCH_Message, &ett_rrc_DL_DCCH_MessageType, &ett_rrc_UL_DCCH_Message, @@ -215837,9 +215801,6 @@ void proto_register_rrc(void) { &ett_rrc_UE_RadioAccessCapability_r5, &ett_rrc_UE_RadioAccessCapability_r6, &ett_rrc_UL_RFC3095_Context, - -/*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 606 "./asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, &ett_rrc_ims_info, @@ -215864,9 +215825,6 @@ void proto_register_rrc(void) { register_dissector("rrc", dissect_rrc, proto_rrc); - -/*--- Included file: packet-rrc-dis-reg.c ---*/ -#line 1 "./asn1/rrc/packet-rrc-dis-reg.c" register_dissector("rrc.dl.dcch", dissect_DL_DCCH_Message_PDU, proto_rrc); register_dissector("rrc.ul.dcch", dissect_UL_DCCH_Message_PDU, proto_rrc); register_dissector("rrc.dl.ccch", dissect_DL_CCCH_Message_PDU, proto_rrc); @@ -215939,9 +215897,6 @@ void proto_register_rrc(void) { register_dissector("rrc.t_to_srnc_cont", dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU, proto_rrc); -/*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 631 "./asn1/rrc/packet-rrc-template.c" - register_init_routine(rrc_init); register_cleanup_routine(rrc_cleanup); diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index 37277c4f2f..8d2e27c153 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -3,9 +3,6 @@ /* packet-rrc.h */ /* asn2wrs.py -L -p rrc -c ./rrc.cnf -s ./packet-rrc-template -D . -O ../.. Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ -/* Input file: packet-rrc-template.h */ - -#line 1 "./asn1/rrc/packet-rrc-template.h" /* packet-rrc-template.h * Copyright 2009, Anders Broman * @@ -22,9 +19,6 @@ #include /* Needed for non asn1 dissectors?*/ extern int proto_rrc; - -/*--- Included file: packet-rrc-exp.h ---*/ -#line 1 "./asn1/rrc/packet-rrc-exp.h" int dissect_rrc_InterRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_rrc_HandoverToUTRANCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_rrc_InterRATHandoverInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -59,9 +53,6 @@ int dissect_rrc_SysInfoTypeSB2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr int dissect_rrc_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-rrc-exp.h ---*/ -#line 18 "./asn1/rrc/packet-rrc-template.h" - enum rrc_message_type { RRC_MESSAGE_TYPE_INVALID = 0, RRC_MESSAGE_TYPE_PCCH = 1, diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 51220161e8..54f5b565fb 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -3,9 +3,6 @@ /* packet-rrlp.c */ /* asn2wrs.py -L -p rrlp -c ./rrlp.cnf -s ./packet-rrlp-template -D . -O ../.. ../gsm_map/MAP-ExtensionDataTypes.asn ../gsm_map/MAP-LCS-DataTypes.asn RRLP-Messages.asn RRLP-Components.asn */ -/* Input file: packet-rrlp-template.c */ - -#line 1 "./asn1/rrlp/packet-rrlp-template.c" /* packet-rrlp.c * Routines for 3GPP Radio Resource LCS Protocol (RRLP) packet dissection * Copyright 2006, Anders Broman @@ -47,9 +44,6 @@ void proto_reg_handoff_rrlp(void); static int proto_rrlp = -1; - -/*--- Included file: packet-rrlp-hf.c ---*/ -#line 1 "./asn1/rrlp/packet-rrlp-hf.c" static int hf_rrlp_PDU_PDU = -1; /* PDU */ static int hf_rrlp_privateExtensionList = -1; /* PrivateExtensionList */ static int hf_rrlp_pcs_Extensions = -1; /* PCS_Extensions */ @@ -872,14 +866,8 @@ static int hf_rrlp_GANSSModelID_model6 = -1; static int hf_rrlp_GANSSModelID_model7 = -1; static int hf_rrlp_GANSSModelID_model8 = -1; -/*--- End of included file: packet-rrlp-hf.c ---*/ -#line 43 "./asn1/rrlp/packet-rrlp-template.c" - /* Initialize the subtree pointers */ static gint ett_rrlp = -1; - -/*--- Included file: packet-rrlp-ett.c ---*/ -#line 1 "./asn1/rrlp/packet-rrlp-ett.c" static gint ett_rrlp_ExtensionContainer = -1; static gint ett_rrlp_PrivateExtensionList = -1; static gint ett_rrlp_PrivateExtension = -1; @@ -1133,26 +1121,14 @@ static gint ett_rrlp_GANSSAdditionalAssistanceChoicesForOneGANSS = -1; static gint ett_rrlp_GANSSModelID = -1; static gint ett_rrlp_AssistanceNeeded = -1; -/*--- End of included file: packet-rrlp-ett.c ---*/ -#line 47 "./asn1/rrlp/packet-rrlp-template.c" - /* Include constants */ - -/*--- Included file: packet-rrlp-val.h ---*/ -#line 1 "./asn1/rrlp/packet-rrlp-val.h" #define maxNumOfPrivateExtensions 10 #define maxExt_GeographicalInformation 20 #define maxGPSAssistanceData 40 #define maxGANSSAssistanceData 40 -/*--- End of included file: packet-rrlp-val.h ---*/ -#line 50 "./asn1/rrlp/packet-rrlp-template.c" - -/*--- Included file: packet-rrlp-fn.c ---*/ -#line 1 "./asn1/rrlp/packet-rrlp-fn.c" - static int dissect_rrlp_OBJECT_IDENTIFIER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -7203,9 +7179,6 @@ static int dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree } -/*--- End of included file: packet-rrlp-fn.c ---*/ -#line 53 "./asn1/rrlp/packet-rrlp-template.c" - /*--- proto_register_rrlp -------------------------------------------*/ void proto_register_rrlp(void) { @@ -7213,9 +7186,6 @@ void proto_register_rrlp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-rrlp-hfarr.c ---*/ -#line 1 "./asn1/rrlp/packet-rrlp-hfarr.c" { &hf_rrlp_PDU_PDU, { "PDU", "rrlp.PDU_element", FT_NONE, BASE_NONE, NULL, 0, @@ -10496,17 +10466,11 @@ void proto_register_rrlp(void) { { "model8", "rrlp.GANSSModelID.model8", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - -/*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 62 "./asn1/rrlp/packet-rrlp-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_rrlp, - -/*--- Included file: packet-rrlp-ettarr.c ---*/ -#line 1 "./asn1/rrlp/packet-rrlp-ettarr.c" &ett_rrlp_ExtensionContainer, &ett_rrlp_PrivateExtensionList, &ett_rrlp_PrivateExtension, @@ -10759,9 +10723,6 @@ void proto_register_rrlp(void) { &ett_rrlp_GANSSAdditionalAssistanceChoicesForOneGANSS, &ett_rrlp_GANSSModelID, &ett_rrlp_AssistanceNeeded, - -/*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 68 "./asn1/rrlp/packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index e9071381cd..08ecf5f38c 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -3,9 +3,6 @@ /* packet-rtse.c */ /* asn2wrs.py -b -L -p rtse -c ./rtse.cnf -s ./packet-rtse-template -D . -O ../.. rtse.asn */ -/* Input file: packet-rtse-template.c */ - -#line 1 "./asn1/rtse/packet-rtse-template.c" /* packet-rtse-template.c * Routines for RTSE packet dissection * Graeme Lunt 2005 @@ -52,9 +49,6 @@ static proto_tree *top_tree=NULL; /* Preferences */ static gboolean rtse_reassemble = TRUE; - -/*--- Included file: packet-rtse-hf.c ---*/ -#line 1 "./asn1/rtse/packet-rtse-hf.c" static int hf_rtse_rtorq_apdu = -1; /* RTORQapdu */ static int hf_rtse_rtoac_apdu = -1; /* RTOACapdu */ static int hf_rtse_rtorj_apdu = -1; /* RTORJapdu */ @@ -80,14 +74,8 @@ static int hf_rtse_additionalReferenceInformation = -1; /* AdditionalReferenceI static int hf_rtse_t61String = -1; /* T_t61String */ static int hf_rtse_octetString = -1; /* T_octetString */ -/*--- End of included file: packet-rtse-hf.c ---*/ -#line 48 "./asn1/rtse/packet-rtse-template.c" - /* Initialize the subtree pointers */ static gint ett_rtse = -1; - -/*--- Included file: packet-rtse-ett.c ---*/ -#line 1 "./asn1/rtse/packet-rtse-ett.c" static gint ett_rtse_RTSE_apdus = -1; static gint ett_rtse_RTORQapdu = -1; static gint ett_rtse_RTOACapdu = -1; @@ -97,9 +85,6 @@ static gint ett_rtse_ConnectionData = -1; static gint ett_rtse_SessionConnectionIdentifier = -1; static gint ett_rtse_CallingSSuserReference = -1; -/*--- End of included file: packet-rtse-ett.c ---*/ -#line 52 "./asn1/rtse/packet-rtse-template.c" - static expert_field ei_rtse_dissector_oid_not_implemented = EI_INIT; static expert_field ei_rtse_unknown_rtse_pdu = EI_INIT; static expert_field ei_rtse_abstract_syntax = EI_INIT; @@ -223,9 +208,6 @@ call_rtse_external_type_callback(gboolean implicit_tag _U_, tvbuff_t *tvb, int o } -/*--- Included file: packet-rtse-fn.c ---*/ -#line 1 "./asn1/rtse/packet-rtse-fn.c" - static int dissect_rtse_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -687,9 +669,6 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -/*--- End of included file: packet-rtse-fn.c ---*/ -#line 176 "./asn1/rtse/packet-rtse-template.c" - /* * Dissect RTSE PDUs inside a PPDU. */ @@ -847,9 +826,6 @@ void proto_register_rtse(void) { { "Reassembled RTSE length", "rtse.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, "The total length of the reassembled payload", HFILL } }, - -/*--- Included file: packet-rtse-hfarr.c ---*/ -#line 1 "./asn1/rtse/packet-rtse-hfarr.c" { &hf_rtse_rtorq_apdu, { "rtorq-apdu", "rtse.rtorq_apdu_element", FT_NONE, BASE_NONE, NULL, 0, @@ -946,9 +922,6 @@ void proto_register_rtse(void) { { "octetString", "rtse.octetString", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 335 "./asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -957,9 +930,6 @@ void proto_register_rtse(void) { &ett_rtse_unknown, &ett_rtse_fragment, &ett_rtse_fragments, - -/*--- Included file: packet-rtse-ettarr.c ---*/ -#line 1 "./asn1/rtse/packet-rtse-ettarr.c" &ett_rtse_RTSE_apdus, &ett_rtse_RTORQapdu, &ett_rtse_RTOACapdu, @@ -968,9 +938,6 @@ void proto_register_rtse(void) { &ett_rtse_ConnectionData, &ett_rtse_SessionConnectionIdentifier, &ett_rtse_CallingSSuserReference, - -/*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 344 "./asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h index 4a30fea53b..b17f3c78df 100644 --- a/epan/dissectors/packet-rtse.h +++ b/epan/dissectors/packet-rtse.h @@ -3,9 +3,6 @@ /* packet-rtse.h */ /* asn2wrs.py -b -L -p rtse -c ./rtse.cnf -s ./packet-rtse-template -D . -O ../.. rtse.asn */ -/* Input file: packet-rtse-template.h */ - -#line 1 "./asn1/rtse/packet-rtse-template.h" /* packet-rtse.h * Routines for RTSE packet dissection * Graeme Lunt 2005 @@ -20,17 +17,11 @@ #ifndef PACKET_RTSE_H #define PACKET_RTSE_H - -/*--- Included file: packet-rtse-exp.h ---*/ -#line 1 "./asn1/rtse/packet-rtse-exp.h" int dissect_rtse_RTORQapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_rtse_RTOACapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_rtse_RTORJapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_rtse_RTABapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-rtse-exp.h ---*/ -#line 16 "./asn1/rtse/packet-rtse-template.h" - void register_rtse_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name, gboolean uses_ros); #endif /* PACKET_RTSE_H */ diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index 7bca00c27e..0d39398d82 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -3,9 +3,6 @@ /* packet-rua.c */ /* asn2wrs.py -L -p rua -c ./rua.cnf -s ./packet-rua-template -D . -O ../.. RUA-CommonDataTypes.asn RUA-Constants.asn RUA-Containers.asn RUA-IEs.asn RUA-PDU-Contents.asn RUA-PDU-Descriptions.asn */ -/* Input file: packet-rua-template.c */ - -#line 1 "./asn1/rua/packet-rua-template.c" /* packet-rua-template.c * Routines for UMTS Home Node B RANAP User Adaptation (RUA) packet dissection * Copyright 2010 Neil Piercy, ip.access Limited @@ -41,9 +38,6 @@ void proto_register_rua(void); - -/*--- Included file: packet-rua-val.h ---*/ -#line 1 "./asn1/rua/packet-rua-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -69,15 +63,9 @@ typedef enum _ProtocolIE_ID_enum { id_CSGMembershipStatus = 9 } ProtocolIE_ID_enum; -/*--- End of included file: packet-rua-val.h ---*/ -#line 37 "./asn1/rua/packet-rua-template.c" - /* Initialize the protocol and registered fields */ static int proto_rua = -1; - -/*--- Included file: packet-rua-hf.c ---*/ -#line 1 "./asn1/rua/packet-rua-hf.c" static int hf_rua_CN_DomainIndicator_PDU = -1; /* CN_DomainIndicator */ static int hf_rua_CSGMembershipStatus_PDU = -1; /* CSGMembershipStatus */ static int hf_rua_Establishment_Cause_PDU = -1; /* Establishment_Cause */ @@ -146,18 +134,12 @@ static int hf_rua_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_rua_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_rua_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-rua-hf.c ---*/ -#line 42 "./asn1/rua/packet-rua-template.c" - /* Initialize the subtree pointers */ static int ett_rua = -1; /* initialise sub-dissector handles */ static dissector_handle_t ranap_handle = NULL; - -/*--- Included file: packet-rua-ett.c ---*/ -#line 1 "./asn1/rua/packet-rua-ett.c" static gint ett_rua_PrivateIE_ID = -1; static gint ett_rua_ProtocolIE_Container = -1; static gint ett_rua_ProtocolIE_Field = -1; @@ -195,9 +177,6 @@ static gint ett_rua_InitiatingMessage = -1; static gint ett_rua_SuccessfulOutcome = -1; static gint ett_rua_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-rua-ett.c ---*/ -#line 50 "./asn1/rua/packet-rua-template.c" - /* Global variables */ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; @@ -220,9 +199,6 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p void proto_reg_handoff_rua(void); -/*--- Included file: packet-rua-fn.c ---*/ -#line 1 "./asn1/rua/packet-rua-fn.c" - static const value_string rua_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -1327,9 +1303,6 @@ static int dissect_RUA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-rua-fn.c ---*/ -#line 73 "./asn1/rua/packet-rua-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; @@ -1378,9 +1351,6 @@ void proto_register_rua(void) { static hf_register_info hf[] = { - -/*--- Included file: packet-rua-hfarr.c ---*/ -#line 1 "./asn1/rua/packet-rua-hfarr.c" { &hf_rua_CN_DomainIndicator_PDU, { "CN-DomainIndicator", "rua.CN_DomainIndicator", FT_UINT32, BASE_DEC, VALS(rua_CN_DomainIndicator_vals), 0, @@ -1649,17 +1619,11 @@ void proto_register_rua(void) { { "value", "rua.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-rua-hfarr.c ---*/ -#line 123 "./asn1/rua/packet-rua-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_rua, - -/*--- Included file: packet-rua-ettarr.c ---*/ -#line 1 "./asn1/rua/packet-rua-ettarr.c" &ett_rua_PrivateIE_ID, &ett_rua_ProtocolIE_Container, &ett_rua_ProtocolIE_Field, @@ -1696,9 +1660,6 @@ void proto_register_rua(void) { &ett_rua_InitiatingMessage, &ett_rua_SuccessfulOutcome, &ett_rua_UnsuccessfulOutcome, - -/*--- End of included file: packet-rua-ettarr.c ---*/ -#line 129 "./asn1/rua/packet-rua-template.c" }; @@ -1730,9 +1691,6 @@ proto_reg_handoff_rua(void) ranap_handle = find_dissector_add_dependency("ranap", proto_rua); dissector_add_uint("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle); dissector_add_uint_with_preference("sctp.port", SCTP_PORT_RUA, rua_handle); - -/*--- Included file: packet-rua-dis-tab.c ---*/ -#line 1 "./asn1/rua/packet-rua-dis-tab.c" dissector_add_uint("rua.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_rua)); dissector_add_uint("rua.ies", id_CriticalityDiagnostics, create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_rua)); dissector_add_uint("rua.ies", id_Context_ID, create_dissector_handle(dissect_Context_ID_PDU, proto_rua)); @@ -1748,7 +1706,4 @@ proto_reg_handoff_rua(void) dissector_add_uint("rua.proc.imsg", id_ErrorIndication, create_dissector_handle(dissect_ErrorIndication_PDU, proto_rua)); dissector_add_uint("rua.proc.imsg", id_privateMessage, create_dissector_handle(dissect_PrivateMessage_PDU, proto_rua)); - -/*--- End of included file: packet-rua-dis-tab.c ---*/ -#line 161 "./asn1/rua/packet-rua-template.c" } diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 27a8ea8642..88a18306fd 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -3,9 +3,6 @@ /* packet-s1ap.c */ /* asn2wrs.py -L -p s1ap -c ./s1ap.cnf -s ./packet-s1ap-template -D . -O ../.. S1AP-CommonDataTypes.asn S1AP-Constants.asn S1AP-Containers.asn S1AP-IEs.asn S1AP-PDU-Contents.asn S1AP-PDU-Descriptions.asn S1AP-SonTransfer-IEs.asn */ -/* Input file: packet-s1ap-template.c */ - -#line 1 "./asn1/s1ap/packet-s1ap-template.c" /* packet-s1ap.c * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * Copyright 2007-2016, Anders Broman @@ -71,9 +68,6 @@ static dissector_handle_t lte_rrc_ue_radio_paging_info_handle; static dissector_handle_t lte_rrc_ue_radio_paging_info_nb_handle; static dissector_handle_t nr_rrc_ue_radio_paging_info_handle; - -/*--- Included file: packet-s1ap-val.h ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -577,9 +571,6 @@ typedef enum _SRVCCHOIndication_enum { cSonly = 1 } SRVCCHOIndication_enum; -/*--- End of included file: packet-s1ap-val.h ---*/ -#line 67 "./asn1/s1ap/packet-s1ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -636,9 +627,6 @@ static int hf_s1ap_rAT_RestrictionInformation_MEO = -1; static int hf_s1ap_rAT_RestrictionInformation_GEO = -1; static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT = -1; static int hf_s1ap_rAT_RestrictionInformation_Reserved = -1; - -/*--- Included file: packet-s1ap-hf.c ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-hf.c" static int hf_s1ap_Additional_GUTI_PDU = -1; /* Additional_GUTI */ static int hf_s1ap_AdditionalRRMPriorityIndex_PDU = -1; /* AdditionalRRMPriorityIndex */ static int hf_s1ap_AerialUEsubscriptionInformation_PDU = -1; /* AerialUEsubscriptionInformation */ @@ -1557,9 +1545,6 @@ static int hf_s1ap_eHRPDCapacityValue = -1; /* EHRPDCapacityValue */ static int hf_s1ap_eHRPD_Sector_ID_01 = -1; /* EHRPD_Sector_ID */ static int hf_s1ap_eHRPDSectorLoadReportingResponse = -1; /* EHRPDSectorLoadReportingResponse */ -/*--- End of included file: packet-s1ap-hf.c ---*/ -#line 125 "./asn1/s1ap/packet-s1ap-template.c" - /* Initialize the subtree pointers */ static int ett_s1ap = -1; static int ett_s1ap_TransportLayerAddress = -1; @@ -1604,9 +1589,6 @@ static int ett_s1ap_NB_IoT_RLF_Report_Container = -1; static int ett_s1ap_MDT_ConfigurationNR = -1; static int ett_s1ap_IntersystemSONConfigurationTransfer = -1; static int ett_s1ap_rAT_RestrictionInformation = -1; - -/*--- Included file: packet-s1ap-ett.c ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-ett.c" static gint ett_s1ap_PrivateIE_ID = -1; static gint ett_s1ap_ProtocolIE_Container = -1; static gint ett_s1ap_ProtocolIE_Field = -1; @@ -2032,9 +2014,6 @@ static gint ett_s1ap_EHRPDSectorLoadReportingResponse = -1; static gint ett_s1ap_EHRPDCompositeAvailableCapacity = -1; static gint ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem = -1; -/*--- End of included file: packet-s1ap-ett.c ---*/ -#line 171 "./asn1/s1ap/packet-s1ap-template.c" - static expert_field ei_s1ap_number_pages_le15 = EI_INIT; enum{ @@ -2272,9 +2251,6 @@ s1ap_is_nbiot_ue(packet_info *pinfo) } -/*--- Included file: packet-s1ap-fn.c ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-fn.c" - static const value_string s1ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -18142,9 +18118,6 @@ int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-s1ap-fn.c ---*/ -#line 409 "./asn1/s1ap/packet-s1ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { s1ap_ctx_t s1ap_ctx; @@ -18254,9 +18227,6 @@ proto_reg_handoff_s1ap(void) nr_rrc_ue_radio_paging_info_handle = find_dissector_add_dependency("nr-rrc.ue_radio_paging_info", proto_s1ap); dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID, s1ap_handle); dissector_add_uint_with_preference("sctp.port", SCTP_PORT_S1AP, s1ap_handle); - -/*--- Included file: packet-s1ap-dis-tab.c ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-dis-tab.c" dissector_add_uint("s1ap.ies", id_MME_UE_S1AP_ID, create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap)); dissector_add_uint("s1ap.ies", id_HandoverType, create_dissector_handle(dissect_HandoverType_PDU, proto_s1ap)); dissector_add_uint("s1ap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_s1ap)); @@ -18675,9 +18645,6 @@ proto_reg_handoff_s1ap(void) dissector_add_uint("s1ap.proc.imsg", id_eNBEarlyStatusTransfer, create_dissector_handle(dissect_ENBEarlyStatusTransfer_PDU, proto_s1ap)); dissector_add_uint("s1ap.proc.imsg", id_MMEEarlyStatusTransfer, create_dissector_handle(dissect_MMEEarlyStatusTransfer_PDU, proto_s1ap)); - -/*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 520 "./asn1/s1ap/packet-s1ap-template.c" } /*--- proto_register_s1ap -------------------------------------------*/ @@ -18898,9 +18865,6 @@ void proto_register_s1ap(void) { { "Reserved", "s1ap.rAT_RestrictionInformation.Reserved", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }}, - -/*--- Included file: packet-s1ap-hfarr.c ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-hfarr.c" { &hf_s1ap_Additional_GUTI_PDU, { "Additional-GUTI", "s1ap.Additional_GUTI_element", FT_NONE, BASE_NONE, NULL, 0, @@ -22569,9 +22533,6 @@ void proto_register_s1ap(void) { { "eHRPDSectorLoadReportingResponse", "s1ap.eHRPDSectorLoadReportingResponse_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 741 "./asn1/s1ap/packet-s1ap-template.c" }; /* List of subtrees */ @@ -22619,9 +22580,6 @@ void proto_register_s1ap(void) { &ett_s1ap_MDT_ConfigurationNR, &ett_s1ap_IntersystemSONConfigurationTransfer, &ett_s1ap_rAT_RestrictionInformation, - -/*--- Included file: packet-s1ap-ettarr.c ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-ettarr.c" &ett_s1ap_PrivateIE_ID, &ett_s1ap_ProtocolIE_Container, &ett_s1ap_ProtocolIE_Field, @@ -23046,9 +23004,6 @@ void proto_register_s1ap(void) { &ett_s1ap_EHRPDSectorLoadReportingResponse, &ett_s1ap_EHRPDCompositeAvailableCapacity, &ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem, - -/*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 789 "./asn1/s1ap/packet-s1ap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-s1ap.h b/epan/dissectors/packet-s1ap.h index 1b400ca17e..bcc2ce53de 100644 --- a/epan/dissectors/packet-s1ap.h +++ b/epan/dissectors/packet-s1ap.h @@ -3,9 +3,6 @@ /* packet-s1ap.h */ /* asn2wrs.py -L -p s1ap -c ./s1ap.cnf -s ./packet-s1ap-template -D . -O ../.. S1AP-CommonDataTypes.asn S1AP-Constants.asn S1AP-Containers.asn S1AP-IEs.asn S1AP-PDU-Contents.asn S1AP-PDU-Descriptions.asn S1AP-SonTransfer-IEs.asn */ -/* Input file: packet-s1ap-template.h */ - -#line 1 "./asn1/s1ap/packet-s1ap-template.h" /* packet-s1ap.h * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * @@ -31,9 +28,6 @@ extern const value_string s1ap_serialNumber_gs_vals[]; void dissect_s1ap_warningMessageContents(tvbuff_t *warning_msg_tvb, proto_tree *tree, packet_info *pinfo, guint8 dcs, int hf_nb_pages, int hf_decoded_page); - -/*--- Included file: packet-s1ap-exp.h ---*/ -#line 1 "./asn1/s1ap/packet-s1ap-exp.h" WS_DLL_PUBLIC const value_string s1ap_Cause_vals[]; WS_DLL_PUBLIC const value_string s1ap_CauseMisc_vals[]; WS_DLL_PUBLIC const value_string s1ap_CauseProtocol_vals[]; @@ -65,9 +59,6 @@ int dissect_s1ap_SONtransferRequestContainer_PDU(tvbuff_t *tvb _U_, packet_info int dissect_s1ap_SONtransferResponseContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-s1ap-exp.h ---*/ -#line 27 "./asn1/s1ap/packet-s1ap-template.h" - #endif /* PACKET_S1AP_H */ /* diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 1ef818bb14..cd336c1f0b 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -3,9 +3,6 @@ /* packet-sabp.c */ /* asn2wrs.py -L -p sabp -c ./sabp.cnf -s ./packet-sabp-template -D . -O ../.. SABP-CommonDataTypes.asn SABP-Constants.asn SABP-Containers.asn SABP-IEs.asn SABP-PDU-Contents.asn SABP-PDU-Descriptions.asn */ -/* Input file: packet-sabp-template.c */ - -#line 1 "./asn1/sabp/packet-sabp-template.c" /* packet-sabp-template.c * Routines for UTRAN Iu-BC Interface: Service Area Broadcast Protocol (SABP) packet dissection * Copyright 2007, Tomas Kukosa @@ -37,9 +34,6 @@ #define PSNAME "SABP" #define PFNAME "sabp" - -/*--- Included file: packet-sabp-val.h ---*/ -#line 1 "./asn1/sabp/packet-sabp-val.h" #define maxNrOfErrors 256 #define maxnoofSAI 65535 #define maxProtocolExtensions 65535 @@ -82,9 +76,6 @@ typedef enum _ProtocolIE_ID_enum { id_Broadcast_Message_Content_Validity_Indicator = 21 } ProtocolIE_ID_enum; -/*--- End of included file: packet-sabp-val.h ---*/ -#line 33 "./asn1/sabp/packet-sabp-template.c" - void proto_register_sabp(void); void proto_reg_handoff_sabp(void); @@ -95,9 +86,6 @@ static int hf_sabp_no_of_pages = -1; static int hf_sabp_cb_inf_len = -1; static int hf_sabp_cb_msg_inf_page = -1; static int hf_sabp_cbs_page_content = -1; - -/*--- Included file: packet-sabp-hf.c ---*/ -#line 1 "./asn1/sabp/packet-sabp-hf.c" static int hf_sabp_Broadcast_Message_Content_PDU = -1; /* Broadcast_Message_Content */ static int hf_sabp_Broadcast_Message_Content_Validity_Indicator_PDU = -1; /* Broadcast_Message_Content_Validity_Indicator */ static int hf_sabp_Category_PDU = -1; /* Category */ @@ -178,9 +166,6 @@ static int hf_sabp_initiatingMessage_value = -1; /* InitiatingMessage_value */ static int hf_sabp_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_sabp_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-sabp-hf.c ---*/ -#line 45 "./asn1/sabp/packet-sabp-template.c" - /* Initialize the subtree pointers */ static int ett_sabp = -1; static int ett_sabp_e212 = -1; @@ -191,9 +176,6 @@ static int ett_sabp_cbs_new_serial_number = -1; static int ett_sabp_cbs_page = -1; static int ett_sabp_cbs_page_content = -1; - -/*--- Included file: packet-sabp-ett.c ---*/ -#line 1 "./asn1/sabp/packet-sabp-ett.c" static gint ett_sabp_ProtocolIE_Container = -1; static gint ett_sabp_ProtocolIE_Field = -1; static gint ett_sabp_ProtocolExtensionContainer = -1; @@ -234,9 +216,6 @@ static gint ett_sabp_InitiatingMessage = -1; static gint ett_sabp_SuccessfulOutcome = -1; static gint ett_sabp_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-sabp-ett.c ---*/ -#line 57 "./asn1/sabp/packet-sabp-template.c" - /* Global variables */ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; @@ -263,9 +242,6 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p static void dissect_sabp_cb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -/*--- Included file: packet-sabp-fn.c ---*/ -#line 1 "./asn1/sabp/packet-sabp-fn.c" - static const value_string sabp_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -1700,9 +1676,6 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-sabp-fn.c ---*/ -#line 84 "./asn1/sabp/packet-sabp-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; @@ -1856,9 +1829,6 @@ void proto_register_sabp(void) { FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-sabp-hfarr.c ---*/ -#line 1 "./asn1/sabp/packet-sabp-hfarr.c" { &hf_sabp_Broadcast_Message_Content_PDU, { "Broadcast-Message-Content", "sabp.Broadcast_Message_Content", FT_BYTES, BASE_NONE, NULL, 0, @@ -2175,9 +2145,6 @@ void proto_register_sabp(void) { { "value", "sabp.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-sabp-hfarr.c ---*/ -#line 239 "./asn1/sabp/packet-sabp-template.c" }; /* List of subtrees */ @@ -2190,9 +2157,6 @@ void proto_register_sabp(void) { &ett_sabp_cbs_new_serial_number, &ett_sabp_cbs_page, &ett_sabp_cbs_page_content, - -/*--- Included file: packet-sabp-ettarr.c ---*/ -#line 1 "./asn1/sabp/packet-sabp-ettarr.c" &ett_sabp_ProtocolIE_Container, &ett_sabp_ProtocolIE_Field, &ett_sabp_ProtocolExtensionContainer, @@ -2232,9 +2196,6 @@ void proto_register_sabp(void) { &ett_sabp_InitiatingMessage, &ett_sabp_SuccessfulOutcome, &ett_sabp_UnsuccessfulOutcome, - -/*--- End of included file: packet-sabp-ettarr.c ---*/ -#line 252 "./asn1/sabp/packet-sabp-template.c" }; @@ -2265,9 +2226,6 @@ proto_reg_handoff_sabp(void) dissector_add_uint_with_preference("tcp.port", SABP_PORT, sabp_tcp_handle); dissector_add_uint("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID, sabp_handle); - -/*--- Included file: packet-sabp-dis-tab.c ---*/ -#line 1 "./asn1/sabp/packet-sabp-dis-tab.c" dissector_add_uint("sabp.ies", id_Message_Identifier, create_dissector_handle(dissect_Message_Identifier_PDU, proto_sabp)); dissector_add_uint("sabp.ies", id_New_Serial_Number, create_dissector_handle(dissect_New_Serial_Number_PDU, proto_sabp)); dissector_add_uint("sabp.ies", id_Old_Serial_Number, create_dissector_handle(dissect_Old_Serial_Number_PDU, proto_sabp)); @@ -2309,9 +2267,6 @@ proto_reg_handoff_sabp(void) dissector_add_uint("sabp.proc.imsg", id_Failure_Indication, create_dissector_handle(dissect_Failure_PDU, proto_sabp)); dissector_add_uint("sabp.proc.imsg", id_Error_Indication, create_dissector_handle(dissect_Error_Indication_PDU, proto_sabp)); - -/*--- End of included file: packet-sabp-dis-tab.c ---*/ -#line 283 "./asn1/sabp/packet-sabp-template.c" } diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index b51e3d566b..3360f70a46 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -3,9 +3,6 @@ /* packet-sbc-ap.c */ /* asn2wrs.py -L -p sbc-ap -c ./sbc-ap.cnf -s ./packet-sbc-ap-template -D . -O ../.. SBC-AP-CommonDataTypes.asn SBC-AP-Constants.asn SBC-AP-Containers.asn SBC-AP-IEs.asn SBC-AP-PDU-Contents.asn SBC-AP-PDU-Descriptions.asn */ -/* Input file: packet-sbc-ap-template.c */ - -#line 1 "./asn1/sbc-ap/packet-sbc-ap-template.c" /* packet-sbc-ap.c * Routines for SBc Application Part (SBc-AP) packet dissection * @@ -47,9 +44,6 @@ void proto_reg_handoff_sbc_ap(void); static dissector_handle_t sbc_ap_handle=NULL; - -/*--- Included file: packet-sbc-ap-val.h ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-val.h" #define maxNrOfErrors 256 #define maxnoofCellID 65535 #define maxnoofCellinEAI 65535 @@ -132,9 +126,6 @@ typedef enum _ProtocolIE_ID_enum { id_Warning_Area_Coordinates = 46 } ProtocolIE_ID_enum; -/*--- End of included file: packet-sbc-ap-val.h ---*/ -#line 43 "./asn1/sbc-ap/packet-sbc-ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_sbc_ap = -1; @@ -146,9 +137,6 @@ static int hf_sbc_ap_Warning_Type_emergency_user_alert = -1; static int hf_sbc_ap_Warning_Type_popup = -1; static int hf_sbc_ap_Warning_Message_Contents_nb_pages = -1; static int hf_sbc_ap_Warning_Message_Contents_decoded_page = -1; - -/*--- Included file: packet-sbc-ap-hf.c ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-hf.c" static int hf_sbc_ap_Broadcast_Scheduled_Area_List_PDU = -1; /* Broadcast_Scheduled_Area_List */ static int hf_sbc_ap_Broadcast_Scheduled_Area_List_5GS_PDU = -1; /* Broadcast_Scheduled_Area_List_5GS */ static int hf_sbc_ap_Broadcast_Cancelled_Area_List_PDU = -1; /* Broadcast_Cancelled_Area_List */ @@ -299,9 +287,6 @@ static int hf_sbc_ap_initiatingMessagevalue = -1; /* InitiatingMessage_value */ static int hf_sbc_ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_sbc_ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-sbc-ap-hf.c ---*/ -#line 56 "./asn1/sbc-ap/packet-sbc-ap-template.c" - /* Initialize the subtree pointers */ static int ett_sbc_ap = -1; static int ett_sbc_ap_Serial_Number = -1; @@ -309,9 +294,6 @@ static int ett_sbc_ap_Warning_Type = -1; static int ett_sbc_ap_Data_Coding_Scheme = -1; static int ett_sbc_ap_Warning_Message_Contents = -1; - -/*--- Included file: packet-sbc-ap-ett.c ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-ett.c" static gint ett_sbc_ap_ProtocolIE_Container = -1; static gint ett_sbc_ap_ProtocolIE_Field = -1; static gint ett_sbc_ap_ProtocolExtensionContainer = -1; @@ -399,9 +381,6 @@ static gint ett_sbc_ap_InitiatingMessage = -1; static gint ett_sbc_ap_SuccessfulOutcome = -1; static gint ett_sbc_ap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-sbc-ap-ett.c ---*/ -#line 65 "./asn1/sbc-ap/packet-sbc-ap-template.c" - enum{ INITIATING_MESSAGE, SUCCESSFUL_OUTCOME, @@ -445,9 +424,6 @@ sbc_ap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-sbc-ap-fn.c ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-fn.c" - static const value_string sbc_ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -2807,9 +2783,6 @@ static int dissect_SBC_AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro } -/*--- End of included file: packet-sbc-ap-fn.c ---*/ -#line 109 "./asn1/sbc-ap/packet-sbc-ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint(sbc_ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; @@ -2902,9 +2875,6 @@ void proto_register_sbc_ap(void) { { "Decoded Page", "sbc-ap.WarningMessageContents.decoded_page", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-sbc-ap-hfarr.c ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-hfarr.c" { &hf_sbc_ap_Broadcast_Scheduled_Area_List_PDU, { "Broadcast-Scheduled-Area-List", "sbc-ap.Broadcast_Scheduled_Area_List_element", FT_NONE, BASE_NONE, NULL, 0, @@ -3501,9 +3471,6 @@ void proto_register_sbc_ap(void) { { "value", "sbc-ap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-sbc-ap-hfarr.c ---*/ -#line 203 "./asn1/sbc-ap/packet-sbc-ap-template.c" }; /* List of subtrees */ @@ -3513,9 +3480,6 @@ void proto_register_sbc_ap(void) { &ett_sbc_ap_Warning_Type, &ett_sbc_ap_Data_Coding_Scheme, &ett_sbc_ap_Warning_Message_Contents, - -/*--- Included file: packet-sbc-ap-ettarr.c ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-ettarr.c" &ett_sbc_ap_ProtocolIE_Container, &ett_sbc_ap_ProtocolIE_Field, &ett_sbc_ap_ProtocolExtensionContainer, @@ -3602,9 +3566,6 @@ void proto_register_sbc_ap(void) { &ett_sbc_ap_InitiatingMessage, &ett_sbc_ap_SuccessfulOutcome, &ett_sbc_ap_UnsuccessfulOutcome, - -/*--- End of included file: packet-sbc-ap-ettarr.c ---*/ -#line 213 "./asn1/sbc-ap/packet-sbc-ap-template.c" }; @@ -3637,9 +3598,6 @@ proto_reg_handoff_sbc_ap(void) sbc_ap_handle = create_dissector_handle(dissect_sbc_ap, proto_sbc_ap); dissector_add_uint("sctp.ppi", SBC_AP_PAYLOAD_PROTOCOL_ID, sbc_ap_handle); inited = TRUE; - -/*--- Included file: packet-sbc-ap-dis-tab.c ---*/ -#line 1 "./asn1/sbc-ap/packet-sbc-ap-dis-tab.c" dissector_add_uint("sbc_ap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_sbc_ap)); dissector_add_uint("sbc_ap.ies", id_Criticality_Diagnostics, create_dissector_handle(dissect_Criticality_Diagnostics_PDU, proto_sbc_ap)); dissector_add_uint("sbc_ap.ies", id_Data_Coding_Scheme, create_dissector_handle(dissect_Data_Coding_Scheme_PDU, proto_sbc_ap)); @@ -3690,9 +3648,6 @@ proto_reg_handoff_sbc_ap(void) dissector_add_uint("sbc_ap.proc.imsg", id_PWS_Restart_Indication, create_dissector_handle(dissect_PWS_Restart_Indication_PDU, proto_sbc_ap)); dissector_add_uint("sbc_ap.proc.imsg", id_PWS_Failure_Indication, create_dissector_handle(dissect_PWS_Failure_Indication_PDU, proto_sbc_ap)); - -/*--- End of included file: packet-sbc-ap-dis-tab.c ---*/ -#line 246 "./asn1/sbc-ap/packet-sbc-ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, sbc_ap_handle); diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 1a6e5abde8..8f3ab9ff69 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -3,9 +3,6 @@ /* packet-smrse.c */ /* asn2wrs.py -b -L -p smrse -c ./smrse.cnf -s ./packet-smrse-template -D . -O ../.. SMRSE.asn */ -/* Input file: packet-smrse-template.c */ - -#line 1 "./asn1/smrse/packet-smrse-template.c" /* packet-smrse.c * Routines for SMRSE Short Message Relay Service packet dissection * Ronnie Sahlberg 2004 @@ -40,9 +37,6 @@ static int hf_smrse_reserved = -1; static int hf_smrse_tag = -1; static int hf_smrse_length = -1; static int hf_smrse_Octet_Format = -1; - -/*--- Included file: packet-smrse-hf.c ---*/ -#line 1 "./asn1/smrse/packet-smrse-hf.c" static int hf_smrse_sc_address = -1; /* SMS_Address */ static int hf_smrse_password = -1; /* Password */ static int hf_smrse_address_type = -1; /* T_address_type */ @@ -70,14 +64,8 @@ static int hf_smrse_alerting_MS_ISDN = -1; /* SMS_Address */ static int hf_smrse_sm_diag_info = -1; /* RP_UD */ static int hf_smrse_ms_address = -1; /* SMS_Address */ -/*--- End of included file: packet-smrse-hf.c ---*/ -#line 36 "./asn1/smrse/packet-smrse-template.c" - /* Initialize the subtree pointers */ static gint ett_smrse = -1; - -/*--- Included file: packet-smrse-ett.c ---*/ -#line 1 "./asn1/smrse/packet-smrse-ett.c" static gint ett_smrse_SMR_Bind = -1; static gint ett_smrse_SMS_Address = -1; static gint ett_smrse_T_address_value = -1; @@ -90,13 +78,7 @@ static gint ett_smrse_RPAck = -1; static gint ett_smrse_RPError = -1; static gint ett_smrse_RPAlertSC = -1; -/*--- End of included file: packet-smrse-ett.c ---*/ -#line 40 "./asn1/smrse/packet-smrse-template.c" - - -/*--- Included file: packet-smrse-fn.c ---*/ -#line 1 "./asn1/smrse/packet-smrse-fn.c" static const value_string smrse_T_address_type_vals[] = { { 0, "unknown-type" }, @@ -464,9 +446,6 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -/*--- End of included file: packet-smrse-fn.c ---*/ -#line 43 "./asn1/smrse/packet-smrse-template.c" - static const value_string tag_vals[] = { { 1, "AliveTest" }, { 2, "AliveTestRsp" }, @@ -568,9 +547,6 @@ void proto_register_smrse(void) { FT_STRING, BASE_NONE, NULL, 0, "SMS-Address/address-value/octet-format", HFILL }}, - -/*--- Included file: packet-smrse-hfarr.c ---*/ -#line 1 "./asn1/smrse/packet-smrse-hfarr.c" { &hf_smrse_sc_address, { "sc-address", "smrse.sc_address_element", FT_NONE, BASE_NONE, NULL, 0, @@ -675,17 +651,11 @@ void proto_register_smrse(void) { { "ms-address", "smrse.ms_address_element", FT_NONE, BASE_NONE, NULL, 0, "SMS_Address", HFILL }}, - -/*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 146 "./asn1/smrse/packet-smrse-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_smrse, - -/*--- Included file: packet-smrse-ettarr.c ---*/ -#line 1 "./asn1/smrse/packet-smrse-ettarr.c" &ett_smrse_SMR_Bind, &ett_smrse_SMS_Address, &ett_smrse_T_address_value, @@ -697,9 +667,6 @@ void proto_register_smrse(void) { &ett_smrse_RPAck, &ett_smrse_RPError, &ett_smrse_RPAlertSC, - -/*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 152 "./asn1/smrse/packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h index 6c61bf548a..e93f81dea2 100644 --- a/epan/dissectors/packet-smrse.h +++ b/epan/dissectors/packet-smrse.h @@ -3,9 +3,6 @@ /* packet-smrse.h */ /* asn2wrs.py -b -L -p smrse -c ./smrse.cnf -s ./packet-smrse-template -D . -O ../.. SMRSE.asn */ -/* Input file: packet-smrse-template.h */ - -#line 1 "./asn1/smrse/packet-smrse-template.h" /* packet-smrse.h * Routines for SMRSE Short Message Relay Service packet dissection * Ronnie Sahlberg 2004 diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index e08a7dc129..32c155477f 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3,9 +3,6 @@ /* packet-snmp.c */ /* asn2wrs.py -b -L -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . -O ../.. snmp.asn */ -/* Input file: packet-snmp-template.c */ - -#line 1 "./asn1/snmp/packet-snmp-template.c" /* packet-snmp.c * Routines for SNMP (simple network management protocol) * Copyright (C) 1998 Didier Jorand @@ -242,9 +239,6 @@ static int hf_snmp_scalar_instance_index = -1; static int hf_snmp_var_bind_str = -1; static int hf_snmp_agentid_trailer = -1; - -/*--- Included file: packet-snmp-hf.c ---*/ -#line 1 "./asn1/snmp/packet-snmp-hf.c" static int hf_snmp_SMUX_PDUs_PDU = -1; /* SMUX_PDUs */ static int hf_snmp_version = -1; /* Version */ static int hf_snmp_community = -1; /* Community */ @@ -311,9 +305,6 @@ static int hf_snmp_subtree = -1; /* ObjectName */ static int hf_snmp_priority = -1; /* INTEGER_M1_2147483647 */ static int hf_snmp_operation = -1; /* T_operation */ -/*--- End of included file: packet-snmp-hf.c ---*/ -#line 238 "./asn1/snmp/packet-snmp-template.c" - /* Initialize the subtree pointers */ static gint ett_smux = -1; static gint ett_snmp = -1; @@ -328,9 +319,6 @@ static gint ett_name = -1; static gint ett_value = -1; static gint ett_decoding_error = -1; - -/*--- Included file: packet-snmp-ett.c ---*/ -#line 1 "./asn1/snmp/packet-snmp-ett.c" static gint ett_snmp_Message = -1; static gint ett_snmp_Messagev2u = -1; static gint ett_snmp_T_datav2u = -1; @@ -351,9 +339,6 @@ static gint ett_snmp_OpenPDU = -1; static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; -/*--- End of included file: packet-snmp-ett.c ---*/ -#line 254 "./asn1/snmp/packet-snmp-template.c" - static expert_field ei_snmp_failed_decrypted_data_pdu = EI_INIT; static expert_field ei_snmp_decrypted_data_bad_formatted = EI_INIT; static expert_field ei_snmp_verify_authentication_error = EI_INIT; @@ -2022,9 +2007,6 @@ check_ScopedPdu(tvbuff_t* tvb) } -/*--- Included file: packet-snmp-fn.c ---*/ -#line 1 "./asn1/snmp/packet-snmp-fn.c" - static int @@ -3132,9 +3114,6 @@ static int dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot } -/*--- End of included file: packet-snmp-fn.c ---*/ -#line 1923 "./asn1/snmp/packet-snmp-template.c" - static snmp_conv_info_t* snmp_find_conversation_and_get_conv_data(packet_info *pinfo) { @@ -3662,9 +3641,6 @@ void proto_register_snmp(void) { NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-snmp-hfarr.c ---*/ -#line 1 "./asn1/snmp/packet-snmp-hfarr.c" { &hf_snmp_SMUX_PDUs_PDU, { "SMUX-PDUs", "snmp.SMUX_PDUs", FT_UINT32, BASE_DEC, VALS(snmp_SMUX_PDUs_vals), 0, @@ -3925,9 +3901,6 @@ void proto_register_snmp(void) { { "operation", "snmp.operation", FT_INT32, BASE_DEC, VALS(snmp_T_operation_vals), 0, NULL, HFILL }}, - -/*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2452 "./asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3943,9 +3916,6 @@ void proto_register_snmp(void) { &ett_name, &ett_value, &ett_decoding_error, - -/*--- Included file: packet-snmp-ettarr.c ---*/ -#line 1 "./asn1/snmp/packet-snmp-ettarr.c" &ett_snmp_Message, &ett_snmp_Messagev2u, &ett_snmp_T_datav2u, @@ -3965,9 +3935,6 @@ void proto_register_snmp(void) { &ett_snmp_OpenPDU, &ett_snmp_SimpleOpen_U, &ett_snmp_RReqPDU_U, - -/*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2468 "./asn1/snmp/packet-snmp-template.c" }; static ei_register_info ei[] = { { &ei_snmp_failed_decrypted_data_pdu, { "snmp.failed_decrypted_data_pdu", PI_MALFORMED, PI_WARN, "Failed to decrypt encryptedPDU", EXPFILL }}, diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h index a1c5c27698..2c34737ecb 100644 --- a/epan/dissectors/packet-snmp.h +++ b/epan/dissectors/packet-snmp.h @@ -3,9 +3,6 @@ /* packet-snmp.h */ /* asn2wrs.py -b -L -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . -O ../.. snmp.asn */ -/* Input file: packet-snmp-template.h */ - -#line 1 "./asn1/snmp/packet-snmp-template.h" /* packet-snmp.h * Routines for snmp packet dissection * diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index d97a60d444..2228706258 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -3,9 +3,6 @@ /* packet-spnego.c */ /* asn2wrs.py -b -L -p spnego -c ./spnego.cnf -s ./packet-spnego-template -D . -O ../.. spnego.asn */ -/* Input file: packet-spnego-template.c */ - -#line 1 "./asn1/spnego/packet-spnego-template.c" /* packet-spnego-template.c * Routines for the simple and protected GSS-API negotiation mechanism * as described in RFC 2478. @@ -68,9 +65,6 @@ static int hf_spnego_krb5_cfx_ec = -1; static int hf_spnego_krb5_cfx_rrc = -1; static int hf_spnego_krb5_cfx_seq = -1; - -/*--- Included file: packet-spnego-hf.c ---*/ -#line 1 "./asn1/spnego/packet-spnego-hf.c" static int hf_spnego_negTokenInit = -1; /* T_negTokenInit */ static int hf_spnego_negTokenTarg = -1; /* NegTokenTarg */ static int hf_spnego_MechTypeList_item = -1; /* MechType */ @@ -97,9 +91,6 @@ static int hf_spnego_ContextFlags_anonFlag = -1; static int hf_spnego_ContextFlags_confFlag = -1; static int hf_spnego_ContextFlags_integFlag = -1; -/*--- End of included file: packet-spnego-hf.c ---*/ -#line 64 "./asn1/spnego/packet-spnego-template.c" - /* Global variables */ static const char *MechType_oid; gssapi_oid_value *next_level_value; @@ -112,9 +103,6 @@ static gint ett_spnego_wraptoken = -1; static gint ett_spnego_krb5 = -1; static gint ett_spnego_krb5_cfx_flags = -1; - -/*--- Included file: packet-spnego-ett.c ---*/ -#line 1 "./asn1/spnego/packet-spnego-ett.c" static gint ett_spnego_NegotiationToken = -1; static gint ett_spnego_MechTypeList = -1; static gint ett_spnego_NegTokenInit = -1; @@ -124,9 +112,6 @@ static gint ett_spnego_ContextFlags = -1; static gint ett_spnego_NegTokenTarg = -1; static gint ett_spnego_InitialContextToken_U = -1; -/*--- End of included file: packet-spnego-ett.c ---*/ -#line 78 "./asn1/spnego/packet-spnego-template.c" - static expert_field ei_spnego_decrypted_keytype = EI_INIT; static expert_field ei_spnego_unknown_header = EI_INIT; @@ -147,9 +132,6 @@ static int dissect_spnego_NegTokenInit2(gboolean implicit_tag, tvbuff_t *tvb, proto_tree *tree, int hf_index); -/*--- Included file: packet-spnego-fn.c ---*/ -#line 1 "./asn1/spnego/packet-spnego-fn.c" - static int dissect_spnego_MechType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -564,9 +546,6 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, return offset; } - -/*--- End of included file: packet-spnego-fn.c ---*/ -#line 99 "./asn1/spnego/packet-spnego-template.c" /* * This is the SPNEGO KRB5 dissector. It is not true KRB5, but some ASN.1 * wrapped blob with an OID, USHORT token ID, and a Ticket, that is also @@ -1861,9 +1840,6 @@ void proto_register_spnego(void) { { "krb5_cfx_seq", "spnego.krb5.cfx_seq", FT_UINT64, BASE_DEC, NULL, 0, "KRB5 Sequence Number", HFILL}}, - -/*--- Included file: packet-spnego-hfarr.c ---*/ -#line 1 "./asn1/spnego/packet-spnego-hfarr.c" { &hf_spnego_negTokenInit, { "negTokenInit", "spnego.negTokenInit_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1960,9 +1936,6 @@ void proto_register_spnego(void) { { "integFlag", "spnego.ContextFlags.integFlag", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, - -/*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1394 "./asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1972,9 +1945,6 @@ void proto_register_spnego(void) { &ett_spnego_krb5, &ett_spnego_krb5_cfx_flags, - -/*--- Included file: packet-spnego-ettarr.c ---*/ -#line 1 "./asn1/spnego/packet-spnego-ettarr.c" &ett_spnego_NegotiationToken, &ett_spnego_MechTypeList, &ett_spnego_NegTokenInit, @@ -1983,9 +1953,6 @@ void proto_register_spnego(void) { &ett_spnego_ContextFlags, &ett_spnego_NegTokenTarg, &ett_spnego_InitialContextToken_U, - -/*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1404 "./asn1/spnego/packet-spnego-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index 4795e400b8..d5e8594695 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -3,9 +3,6 @@ /* packet-sv.c */ /* asn2wrs.py -b -L -p sv -c ./sv.cnf -s ./packet-sv-template -D . -O ../.. sv.asn */ -/* Input file: packet-sv-template.c */ - -#line 1 "./asn1/sv/packet-sv-template.c" /* packet-sv.c * Routines for IEC 61850 Sampled Values packet dissection * Michael Bernhard 2008 @@ -98,9 +95,6 @@ static int hf_sv_phsmeas_q_derived = -1; static int hf_sv_gmidentity = -1; static int hf_sv_gmidentity_manuf = -1; - -/*--- Included file: packet-sv-hf.c ---*/ -#line 1 "./asn1/sv/packet-sv-hf.c" static int hf_sv_savPdu = -1; /* SavPdu */ static int hf_sv_noASDU = -1; /* INTEGER_0_65535 */ static int hf_sv_seqASDU = -1; /* SEQUENCE_OF_ASDU */ @@ -116,9 +110,6 @@ static int hf_sv_seqData = -1; /* Data */ static int hf_sv_smpMod = -1; /* T_smpMod */ static int hf_sv_gmidData = -1; /* GmidData */ -/*--- End of included file: packet-sv-hf.c ---*/ -#line 94 "./asn1/sv/packet-sv-template.c" - /* Initialize the subtree pointers */ static int ett_sv = -1; static int ett_phsmeas = -1; @@ -127,17 +118,11 @@ static int ett_gmidentity = -1; static int ett_reserve1 = -1; - -/*--- Included file: packet-sv-ett.c ---*/ -#line 1 "./asn1/sv/packet-sv-ett.c" static gint ett_sv_SampledValues = -1; static gint ett_sv_SavPdu = -1; static gint ett_sv_SEQUENCE_OF_ASDU = -1; static gint ett_sv_ASDU = -1; -/*--- End of included file: packet-sv-ett.c ---*/ -#line 104 "./asn1/sv/packet-sv-template.c" - static expert_field ei_sv_mal_utctime = EI_INIT; static expert_field ei_sv_zero_pdu = EI_INIT; static expert_field ei_sv_mal_gmidentity = EI_INIT; @@ -220,9 +205,6 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv } -/*--- Included file: packet-sv-fn.c ---*/ -#line 1 "./asn1/sv/packet-sv-fn.c" - static int dissect_sv_INTEGER_0_65535(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -466,9 +448,6 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -/*--- End of included file: packet-sv-fn.c ---*/ -#line 187 "./asn1/sv/packet-sv-template.c" - /* * Dissect SV PDUs inside a PPDU. */ @@ -599,9 +578,6 @@ void proto_register_sv(void) { { "MAC Vendor", "sv.gmidentity_manuf", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL}}, - -/*--- Included file: packet-sv-hfarr.c ---*/ -#line 1 "./asn1/sv/packet-sv-hfarr.c" { &hf_sv_savPdu, { "savPdu", "sv.savPdu_element", FT_NONE, BASE_NONE, NULL, 0, @@ -658,9 +634,6 @@ void proto_register_sv(void) { { "gmidData", "sv.gmidData", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-sv-hfarr.c ---*/ -#line 319 "./asn1/sv/packet-sv-template.c" }; /* List of subtrees */ @@ -670,16 +643,10 @@ void proto_register_sv(void) { &ett_phsmeas_q, &ett_gmidentity, &ett_reserve1, - -/*--- Included file: packet-sv-ettarr.c ---*/ -#line 1 "./asn1/sv/packet-sv-ettarr.c" &ett_sv_SampledValues, &ett_sv_SavPdu, &ett_sv_SEQUENCE_OF_ASDU, &ett_sv_ASDU, - -/*--- End of included file: packet-sv-ettarr.c ---*/ -#line 329 "./asn1/sv/packet-sv-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-sv.h b/epan/dissectors/packet-sv.h index 2f249ebe6e..204c2c6326 100644 --- a/epan/dissectors/packet-sv.h +++ b/epan/dissectors/packet-sv.h @@ -3,9 +3,6 @@ /* packet-sv.h */ /* asn2wrs.py -b -L -p sv -c ./sv.cnf -s ./packet-sv-template -D . -O ../.. sv.asn */ -/* Input file: packet-sv-template.h */ - -#line 1 "./asn1/sv/packet-sv-template.h" /* packet-sv.h * Routines for IEC 61850 Sampled Vales packet dissection * Michael Bernhard 2008 diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index cde0a031c5..97a09a6a1e 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -3,9 +3,6 @@ /* packet-t124.c */ /* asn2wrs.py -L -p t124 -c ./t124.cnf -s ./packet-t124-template -D . -O ../.. GCC-PROTOCOL.asn ../t125/MCS-PROTOCOL.asn */ -/* Input file: packet-t124-template.c */ - -#line 1 "./asn1/t124/packet-t124-template.c" /* packet-t124.c * Routines for t124 packet dissection * Copyright 2010, Graeme Lunt @@ -45,9 +42,6 @@ void proto_reg_handoff_t124(void); static int proto_t124 = -1; static proto_tree *top_tree = NULL; - -/*--- Included file: packet-t124-hf.c ---*/ -#line 1 "./asn1/t124/packet-t124-hf.c" static int hf_t124_object = -1; /* T_object */ static int hf_t124_h221NonStandard = -1; /* H221NonStandardIdentifier */ static int hf_t124_key = -1; /* Key */ @@ -272,9 +266,6 @@ static int hf_t124_tokenTestConfirm = -1; /* TokenTestConfirm */ static int hf_t124_Segmentation_begin = -1; static int hf_t124_Segmentation_end = -1; -/*--- End of included file: packet-t124-hf.c ---*/ -#line 41 "./asn1/t124/packet-t124-template.c" - /* Initialize the subtree pointers */ static int ett_t124 = -1; static int ett_t124_connectGCCPDU = -1; @@ -288,9 +279,6 @@ static guint32 channelId = -1; static dissector_table_t t124_ns_dissector_table=NULL; static dissector_table_t t124_sd_dissector_table=NULL; - -/*--- Included file: packet-t124-ett.c ---*/ -#line 1 "./asn1/t124/packet-t124-ett.c" static gint ett_t124_Key = -1; static gint ett_t124_NonStandardParameter = -1; static gint ett_t124_UserData = -1; @@ -393,12 +381,6 @@ static gint ett_t124_TokenTestRequest = -1; static gint ett_t124_TokenTestConfirm = -1; static gint ett_t124_DomainMCSPDU = -1; -/*--- End of included file: packet-t124-ett.c ---*/ -#line 56 "./asn1/t124/packet-t124-template.c" - - -/*--- Included file: packet-t124-fn.c ---*/ -#line 1 "./asn1/t124/packet-t124-fn.c" static int @@ -2854,9 +2836,6 @@ dissect_t124_DomainMCSPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -/*--- End of included file: packet-t124-fn.c ---*/ -#line 58 "./asn1/t124/packet-t124-template.c" - static const per_sequence_t t124Heur_sequence[] = { { &hf_t124_t124Identifier , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_t124_Key }, { NULL, 0, 0, NULL } @@ -2976,9 +2955,6 @@ void proto_register_t124(void) { { "DomainMCSPDU", "t124.DomainMCSPDU", FT_UINT32, BASE_DEC, VALS(t124_DomainMCSPDU_vals), 0, NULL, HFILL }}, - -/*--- Included file: packet-t124-hfarr.c ---*/ -#line 1 "./asn1/t124/packet-t124-hfarr.c" { &hf_t124_object, { "object", "t124.object", FT_OID, BASE_NONE, NULL, 0, @@ -3867,18 +3843,12 @@ void proto_register_t124(void) { { "end", "t124.Segmentation.end", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - -/*--- End of included file: packet-t124-hfarr.c ---*/ -#line 179 "./asn1/t124/packet-t124-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_t124, &ett_t124_connectGCCPDU, - -/*--- Included file: packet-t124-ettarr.c ---*/ -#line 1 "./asn1/t124/packet-t124-ettarr.c" &ett_t124_Key, &ett_t124_NonStandardParameter, &ett_t124_UserData, @@ -3980,9 +3950,6 @@ void proto_register_t124(void) { &ett_t124_TokenTestRequest, &ett_t124_TokenTestConfirm, &ett_t124_DomainMCSPDU, - -/*--- End of included file: packet-t124-ettarr.c ---*/ -#line 186 "./asn1/t124/packet-t124-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t124.h b/epan/dissectors/packet-t124.h index ee73e475b2..5338234aae 100644 --- a/epan/dissectors/packet-t124.h +++ b/epan/dissectors/packet-t124.h @@ -3,9 +3,6 @@ /* packet-t124.h */ /* asn2wrs.py -L -p t124 -c ./t124.cnf -s ./packet-t124-template -D . -O ../.. GCC-PROTOCOL.asn ../t125/MCS-PROTOCOL.asn */ -/* Input file: packet-t124-template.h */ - -#line 1 "./asn1/t124/packet-t124-template.h" /* packet-t124.h * Routines for t124 packet dissection * Copyright 2010, Graeme Lunt @@ -30,16 +27,10 @@ extern void t124_set_top_tree(proto_tree *tree); extern void register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto); extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, dissector_t dissector, int proto); - -/*--- Included file: packet-t124-exp.h ---*/ -#line 1 "./asn1/t124/packet-t124-exp.h" extern const value_string t124_ConnectGCCPDU_vals[]; int dissect_t124_ConnectData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_t124_ConnectGCCPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-t124-exp.h ---*/ -#line 26 "./asn1/t124/packet-t124-template.h" - #endif /* PACKET_T124_H */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index add0cfa9fa..77937ed8d9 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -3,9 +3,6 @@ /* packet-t125.c */ /* asn2wrs.py -b -L -p t125 -c ./t125.cnf -s ./packet-t125-template -D . -O ../.. MCS-PROTOCOL.asn */ -/* Input file: packet-t125-template.c */ - -#line 1 "./asn1/t125/packet-t125-template.c" /* packet-t125.c * Routines for t125 packet dissection * Copyright 2007, Ronnie Sahlberg @@ -49,9 +46,6 @@ void proto_reg_handoff_t125(void); /* Initialize the protocol and registered fields */ static int proto_t125 = -1; static proto_tree *top_tree = NULL; - -/*--- Included file: packet-t125-hf.c ---*/ -#line 1 "./asn1/t125/packet-t125-hf.c" static int hf_t125_ConnectMCSPDU_PDU = -1; /* ConnectMCSPDU */ static int hf_t125_maxChannelIds = -1; /* INTEGER_0_MAX */ static int hf_t125_maxUserIds = -1; /* INTEGER_0_MAX */ @@ -78,15 +72,9 @@ static int hf_t125_connect_response = -1; /* Connect_Response */ static int hf_t125_connect_additional = -1; /* Connect_Additional */ static int hf_t125_connect_result = -1; /* Connect_Result */ -/*--- End of included file: packet-t125-hf.c ---*/ -#line 45 "./asn1/t125/packet-t125-template.c" - /* Initialize the subtree pointers */ static int ett_t125 = -1; - -/*--- Included file: packet-t125-ett.c ---*/ -#line 1 "./asn1/t125/packet-t125-ett.c" static gint ett_t125_DomainParameters = -1; static gint ett_t125_Connect_Initial_U = -1; static gint ett_t125_Connect_Response_U = -1; @@ -94,15 +82,9 @@ static gint ett_t125_Connect_Additional_U = -1; static gint ett_t125_Connect_Result_U = -1; static gint ett_t125_ConnectMCSPDU = -1; -/*--- End of included file: packet-t125-ett.c ---*/ -#line 50 "./asn1/t125/packet-t125-template.c" - static heur_dissector_list_t t125_heur_subdissector_list; -/*--- Included file: packet-t125-fn.c ---*/ -#line 1 "./asn1/t125/packet-t125-fn.c" - static const value_string t125_DataPriority_vals[] = { { 0, "top" }, { 1, "high" }, @@ -376,9 +358,6 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-t125-fn.c ---*/ -#line 54 "./asn1/t125/packet-t125-template.c" - static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) { @@ -469,9 +448,6 @@ void proto_register_t125(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-t125-hfarr.c ---*/ -#line 1 "./asn1/t125/packet-t125-hfarr.c" { &hf_t125_ConnectMCSPDU_PDU, { "ConnectMCSPDU", "t125.ConnectMCSPDU", FT_UINT32, BASE_DEC, VALS(t125_ConnectMCSPDU_vals), 0, @@ -572,26 +548,17 @@ void proto_register_t125(void) { { "connect-result", "t125.connect_result_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-t125-hfarr.c ---*/ -#line 146 "./asn1/t125/packet-t125-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_t125, - -/*--- Included file: packet-t125-ettarr.c ---*/ -#line 1 "./asn1/t125/packet-t125-ettarr.c" &ett_t125_DomainParameters, &ett_t125_Connect_Initial_U, &ett_t125_Connect_Response_U, &ett_t125_Connect_Additional_U, &ett_t125_Connect_Result_U, &ett_t125_ConnectMCSPDU, - -/*--- End of included file: packet-t125-ettarr.c ---*/ -#line 152 "./asn1/t125/packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index b3d3ff6935..8db448f139 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -3,9 +3,6 @@ /* packet-t38.c */ /* asn2wrs.py -L -p t38 -c ./t38.cnf -s ./packet-t38-template -D . -O ../.. T38_2002.asn */ -/* Input file: packet-t38-template.c */ - -#line 1 "./asn1/t38/packet-t38-template.c" /* packet-t38.c * Routines for T.38 packet dissection * 2003 Hans Viens @@ -109,9 +106,6 @@ static guint32 Data_Field_item_num; static int proto_t38 = -1; static int proto_acdr = -1; - -/*--- Included file: packet-t38-hf.c ---*/ -#line 1 "./asn1/t38/packet-t38-hf.c" static int hf_t38_IFPPacket_PDU = -1; /* IFPPacket */ static int hf_t38_UDPTLPacket_PDU = -1; /* UDPTLPacket */ static int hf_t38_type_of_msg = -1; /* Type_of_msg */ @@ -131,9 +125,6 @@ static int hf_t38_fec_npackets = -1; /* INTEGER */ static int hf_t38_fec_data = -1; /* T_fec_data */ static int hf_t38_fec_data_item = -1; /* OCTET_STRING */ -/*--- End of included file: packet-t38-hf.c ---*/ -#line 105 "./asn1/t38/packet-t38-template.c" - /* T38 setup fields */ static int hf_t38_setup = -1; static int hf_t38_setup_frame = -1; @@ -152,9 +143,6 @@ static int hf_t38_reassembled_in = -1; static int hf_t38_reassembled_length = -1; static gint ett_t38 = -1; - -/*--- Included file: packet-t38-ett.c ---*/ -#line 1 "./asn1/t38/packet-t38-ett.c" static gint ett_t38_IFPPacket = -1; static gint ett_t38_Type_of_msg = -1; static gint ett_t38_Data_Field = -1; @@ -164,9 +152,6 @@ static gint ett_t38_T_error_recovery = -1; static gint ett_t38_T_secondary_ifp_packets = -1; static gint ett_t38_T_fec_info = -1; static gint ett_t38_T_fec_data = -1; - -/*--- End of included file: packet-t38-ett.c ---*/ -#line 125 "./asn1/t38/packet-t38-template.c" static gint ett_t38_setup = -1; static gint ett_data_fragment = -1; @@ -414,9 +399,6 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) /* T38 Routines */ -/*--- Included file: packet-t38-fn.c ---*/ -#line 1 "./asn1/t38/packet-t38-fn.c" - const value_string t38_T30_indicator_vals[] = { { 0, "no-signal" }, { 1, "cng" }, @@ -930,9 +912,6 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr } -/*--- End of included file: packet-t38-fn.c ---*/ -#line 372 "./asn1/t38/packet-t38-template.c" - /* initialize the tap t38_info and the conversation */ static void init_t38_info_conv(packet_info *pinfo) @@ -1204,9 +1183,6 @@ proto_register_t38(void) { static hf_register_info hf[] = { - -/*--- Included file: packet-t38-hfarr.c ---*/ -#line 1 "./asn1/t38/packet-t38-hfarr.c" { &hf_t38_IFPPacket_PDU, { "IFPPacket", "t38.IFPPacket_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1279,9 +1255,6 @@ proto_register_t38(void) { "fec-data item", "t38.fec_data_item", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING", HFILL }}, - -/*--- End of included file: packet-t38-hfarr.c ---*/ -#line 645 "./asn1/t38/packet-t38-template.c" { &hf_t38_setup, { "Stream setup", "t38.setup", FT_STRING, BASE_NONE, NULL, 0x0, "Stream setup, method and frame number", HFILL }}, @@ -1328,9 +1301,6 @@ proto_register_t38(void) static gint *ett[] = { &ett_t38, - -/*--- Included file: packet-t38-ettarr.c ---*/ -#line 1 "./asn1/t38/packet-t38-ettarr.c" &ett_t38_IFPPacket, &ett_t38_Type_of_msg, &ett_t38_Data_Field, @@ -1340,9 +1310,6 @@ proto_register_t38(void) &ett_t38_T_secondary_ifp_packets, &ett_t38_T_fec_info, &ett_t38_T_fec_data, - -/*--- End of included file: packet-t38-ettarr.c ---*/ -#line 692 "./asn1/t38/packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h index d0214c4b56..39ec75dc4f 100644 --- a/epan/dissectors/packet-t38.h +++ b/epan/dissectors/packet-t38.h @@ -3,9 +3,6 @@ /* packet-t38.h */ /* asn2wrs.py -L -p t38 -c ./t38.cnf -s ./packet-t38-template -D . -O ../.. T38_2002.asn */ -/* Input file: packet-t38-template.h */ - -#line 1 "./asn1/t38/packet-t38-template.h" /* packet-t38.h * * Routines for T38 dissection @@ -75,14 +72,8 @@ void t38_add_address(packet_info *pinfo, const gchar *setup_method, guint32 setup_frame_number); - -/*--- Included file: packet-t38-exp.h ---*/ -#line 1 "./asn1/t38/packet-t38-exp.h" WS_DLL_PUBLIC const value_string t38_T30_indicator_vals[]; WS_DLL_PUBLIC const value_string t38_T30_data_vals[]; -/*--- End of included file: packet-t38-exp.h ---*/ -#line 71 "./asn1/t38/packet-t38-template.h" - diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 6082fb9875..69d48b53e5 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -3,9 +3,6 @@ /* packet-tcap.c */ /* asn2wrs.py -b -L -p tcap -c ./tcap.cnf -s ./packet-tcap-template -D . -O ../.. tcap.asn UnidialoguePDUs.asn DialoguePDUs.asn */ -/* Input file: packet-tcap-template.c */ - -#line 1 "./asn1/tcap/packet-tcap-template.c" /* packet-tcap-template.c * Routines for TCAP * Copyright 2004 - 2005, Tim Endean @@ -53,9 +50,6 @@ int hf_tcapsrt_BeginSession=-1; int hf_tcapsrt_EndSession=-1; int hf_tcapsrt_SessionTime=-1; - -/*--- Included file: packet-tcap-hf.c ---*/ -#line 1 "./asn1/tcap/packet-tcap-hf.c" static int hf_tcap_UniDialoguePDU_PDU = -1; /* UniDialoguePDU */ static int hf_tcap_DialoguePDU_PDU = -1; /* DialoguePDU */ static int hf_tcap_oid = -1; /* OBJECT_IDENTIFIER */ @@ -124,9 +118,6 @@ static int hf_tcap_AUDT_protocol_version_version1 = -1; static int hf_tcap_AARQ_protocol_version_version1 = -1; static int hf_tcap_AARE_protocol_version_version1 = -1; -/*--- End of included file: packet-tcap-hf.c ---*/ -#line 49 "./asn1/tcap/packet-tcap-template.c" - /* Initialize the subtree pointers */ static gint ett_tcap = -1; static gint ett_param = -1; @@ -143,9 +134,6 @@ static int ss7pc_address_type = -1; static struct tcaphash_context_t * gp_tcap_context=NULL; - -/*--- Included file: packet-tcap-ett.c ---*/ -#line 1 "./asn1/tcap/packet-tcap-ett.c" static gint ett_tcap_ExternalPDU_U = -1; static gint ett_tcap_TCMessage = -1; static gint ett_tcap_Unidirectional = -1; @@ -180,9 +168,6 @@ static gint ett_tcap_ABRT_apdu_U = -1; static gint ett_tcap_ABRT_user_information = -1; static gint ett_tcap_Associate_source_diagnostic = -1; -/*--- End of included file: packet-tcap-ett.c ---*/ -#line 67 "./asn1/tcap/packet-tcap-template.c" - /* When several Tcap components are received in a single TCAP message, we have to use several buffers for the stored parameters because else this data are erased during TAP dissector call */ @@ -257,9 +242,6 @@ dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { } -/*--- Included file: packet-tcap-fn.c ---*/ -#line 1 "./asn1/tcap/packet-tcap-fn.c" - static int dissect_tcap_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1401,9 +1383,6 @@ static int dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr } -/*--- End of included file: packet-tcap-fn.c ---*/ -#line 142 "./asn1/tcap/packet-tcap-template.c" - /* * DEBUG functions */ @@ -3180,15 +3159,9 @@ proto_reg_handoff_tcap(void) ss7pc_address_type = address_type_get_by_name("AT_SS7PC"); - -/*--- Included file: packet-tcap-dis-tab.c ---*/ -#line 1 "./asn1/tcap/packet-tcap-dis-tab.c" register_ber_oid_dissector("0.0.17.773.1.1.1", dissect_DialoguePDU_PDU, proto_tcap, "id-as-dialogue"); register_ber_oid_dissector("0.0.17.773.1.2.1", dissect_UniDialoguePDU_PDU, proto_tcap, "id-as-uniDialogue"); - -/*--- End of included file: packet-tcap-dis-tab.c ---*/ -#line 1920 "./asn1/tcap/packet-tcap-template.c" } static void init_tcap(void); @@ -3261,9 +3234,6 @@ proto_register_tcap(void) FT_FRAMENUM, BASE_NONE, NULL, 0x0, "SRT Duplicated with Session", HFILL } }, - -/*--- Included file: packet-tcap-hfarr.c ---*/ -#line 1 "./asn1/tcap/packet-tcap-hfarr.c" { &hf_tcap_UniDialoguePDU_PDU, { "UniDialoguePDU", "tcap.UniDialoguePDU", FT_UINT32, BASE_DEC, VALS(tcap_UniDialoguePDU_vals), 0, @@ -3528,9 +3498,6 @@ proto_register_tcap(void) { "version1", "tcap.AARE.protocol.version.version1", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, - -/*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 1993 "./asn1/tcap/packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -3540,9 +3507,6 @@ proto_register_tcap(void) &ett_otid, &ett_dtid, &ett_tcap_stat, - -/*--- Included file: packet-tcap-ettarr.c ---*/ -#line 1 "./asn1/tcap/packet-tcap-ettarr.c" &ett_tcap_ExternalPDU_U, &ett_tcap_TCMessage, &ett_tcap_Unidirectional, @@ -3576,9 +3540,6 @@ proto_register_tcap(void) &ett_tcap_ABRT_apdu_U, &ett_tcap_ABRT_user_information, &ett_tcap_Associate_source_diagnostic, - -/*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 2003 "./asn1/tcap/packet-tcap-template.c" }; /*static enum_val_t tcap_options[] = { diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h index ebd3b074c4..dadb967563 100644 --- a/epan/dissectors/packet-tcap.h +++ b/epan/dissectors/packet-tcap.h @@ -3,9 +3,6 @@ /* packet-tcap.h */ /* asn2wrs.py -b -L -p tcap -c ./tcap.cnf -s ./packet-tcap-template -D . -O ../.. tcap.asn UnidialoguePDUs.asn DialoguePDUs.asn */ -/* Input file: packet-tcap-template.h */ - -#line 1 "./asn1/tcap/packet-tcap-template.h" /* packet-tcap.h * * Copyright 2004, Tim Endean @@ -217,15 +214,9 @@ WS_DLL_PUBLIC void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t extern void call_tcap_dissector(dissector_handle_t, tvbuff_t*, packet_info*, proto_tree*); - -/*--- Included file: packet-tcap-exp.h ---*/ -#line 1 "./asn1/tcap/packet-tcap-exp.h" extern const value_string tcap_UniDialoguePDU_vals[]; extern const value_string tcap_DialoguePDU_vals[]; int dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-tcap-exp.h ---*/ -#line 213 "./asn1/tcap/packet-tcap-template.h" - #endif /* PACKET_tcap_H */ diff --git a/epan/dissectors/packet-tcg-cp-oids.c b/epan/dissectors/packet-tcg-cp-oids.c index a38b17c9b6..6446f2bce4 100644 --- a/epan/dissectors/packet-tcg-cp-oids.c +++ b/epan/dissectors/packet-tcg-cp-oids.c @@ -3,9 +3,6 @@ /* packet-tcg-cp-oids.c */ /* asn2wrs.py -b -L -p tcg-cp-oids -c ./tcg-cp-oids.cnf -s ./packet-tcg-cp-oids-template -D . -O ../.. tcg-cp-oids.asn */ -/* Input file: packet-tcg-cp-oids-template.c */ - -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" /* packet-tcg-cp-oids.c * * Wireshark - Network traffic analyzer @@ -35,9 +32,6 @@ void proto_reg_handoff_tcg_cp_oids(void); /* Initialize the protocol and registered fields */ static int proto_tcg_cp_oids = -1; - -/*--- Included file: packet-tcg-cp-oids-hf.c ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-hf.c" static int hf_tcg_cp_oids_TPMSpecification_PDU = -1; /* TPMSpecification */ static int hf_tcg_cp_oids_TCGPlatformSpecification_PDU = -1; /* TCGPlatformSpecification */ static int hf_tcg_cp_oids_TCPASpecVersion_PDU = -1; /* TCPASpecVersion */ @@ -93,15 +87,9 @@ static int hf_tcg_cp_oids_TCGRelevantCredentials_item = -1; /* HashedSubjectInf static int hf_tcg_cp_oids_TCGRelevantManifests_item = -1; /* HashedSubjectInfoURI */ static int hf_tcg_cp_oids_restoreAllowed = -1; /* BOOLEAN */ static int hf_tcg_cp_oids_backupServiceURI = -1; /* IA5String */ - -/*--- End of included file: packet-tcg-cp-oids-hf.c ---*/ -#line 31 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" static int hf_tcg_cp_oids_UTF8String_PDU = -1; /* Initialize the subtree pointers */ - -/*--- Included file: packet-tcg-cp-oids-ett.c ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-ett.c" static gint ett_tcg_cp_oids_TPMSpecification = -1; static gint ett_tcg_cp_oids_TCGSpecificationVersion = -1; static gint ett_tcg_cp_oids_TCGPlatformSpecification = -1; @@ -117,12 +105,6 @@ static gint ett_tcg_cp_oids_TCGRelevantCredentials = -1; static gint ett_tcg_cp_oids_TCGRelevantManifests = -1; static gint ett_tcg_cp_oids_VirtualPlatformBackupServiceURI = -1; -/*--- End of included file: packet-tcg-cp-oids-ett.c ---*/ -#line 35 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" - -/*--- Included file: packet-tcg-cp-oids-fn.c ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-fn.c" - static int dissect_tcg_cp_oids_UTF8String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -723,9 +705,6 @@ static int dissect_VirtualPlatformBackupServiceURI_PDU(tvbuff_t *tvb _U_, packet } -/*--- End of included file: packet-tcg-cp-oids-fn.c ---*/ -#line 36 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" - /*--- proto_register_tcg_cp_oids ----------------------------------------------*/ void proto_register_tcg_cp_oids(void) { @@ -736,9 +715,6 @@ void proto_register_tcg_cp_oids(void) { { "UTF8String", "tcg-cp-oids.UTF8String", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-tcg-cp-oids-hfarr.c ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-hfarr.c" { &hf_tcg_cp_oids_TPMSpecification_PDU, { "TPMSpecification", "tcg-cp-oids.TPMSpecification_element", FT_NONE, BASE_NONE, NULL, 0, @@ -959,16 +935,10 @@ void proto_register_tcg_cp_oids(void) { { "backupServiceURI", "tcg-cp-oids.backupServiceURI", FT_STRING, BASE_NONE, NULL, 0, "IA5String", HFILL }}, - -/*--- End of included file: packet-tcg-cp-oids-hfarr.c ---*/ -#line 48 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-tcg-cp-oids-ettarr.c ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-ettarr.c" &ett_tcg_cp_oids_TPMSpecification, &ett_tcg_cp_oids_TCGSpecificationVersion, &ett_tcg_cp_oids_TCGPlatformSpecification, @@ -983,9 +953,6 @@ void proto_register_tcg_cp_oids(void) { &ett_tcg_cp_oids_TCGRelevantCredentials, &ett_tcg_cp_oids_TCGRelevantManifests, &ett_tcg_cp_oids_VirtualPlatformBackupServiceURI, - -/*--- End of included file: packet-tcg-cp-oids-ettarr.c ---*/ -#line 53 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" }; /* Register protocol */ @@ -1008,9 +975,6 @@ dissect_tcg_cp_oids_UTF8String_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- proto_reg_handoff_tcg_cp_oids -------------------------------------------*/ void proto_reg_handoff_tcg_cp_oids(void) { - -/*--- Included file: packet-tcg-cp-oids-dis-tab.c ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-dis-tab.c" register_ber_oid_dissector("2.23.133.1", dissect_TCPASpecVersion_PDU, proto_tcg_cp_oids, "tcg-tcpaSpecVersion"); register_ber_oid_dissector("2.23.133.2.11", dissect_ProtectionProfile_PDU, proto_tcg_cp_oids, "tcg-at-tpmProtectionProfile"); register_ber_oid_dissector("2.23.133.2.12", dissect_SecurityTarget_PDU, proto_tcg_cp_oids, "tcg-at-tpmSecurityTarget"); @@ -1027,9 +991,6 @@ void proto_reg_handoff_tcg_cp_oids(void) { register_ber_oid_dissector("2.23.133.6.6", dissect_MigrationControllerRegistrationServiceURI_PDU, proto_tcg_cp_oids, "tcg-ce-migrationControllerRegistrationService"); register_ber_oid_dissector("2.23.133.6.7", dissect_VirtualPlatformBackupServiceURI_PDU, proto_tcg_cp_oids, "tcg-ce-virtualPlatformBackupService"); - -/*--- End of included file: packet-tcg-cp-oids-dis-tab.c ---*/ -#line 76 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c" oid_add_from_string("tcg","2.23.133"); oid_add_from_string("tcg-attribute","2.23.133.2"); oid_add_from_string("tcg-protocol","2.23.133.3"); diff --git a/epan/dissectors/packet-tcg-cp-oids.h b/epan/dissectors/packet-tcg-cp-oids.h index ccc2a57700..ab7d72ab7f 100644 --- a/epan/dissectors/packet-tcg-cp-oids.h +++ b/epan/dissectors/packet-tcg-cp-oids.h @@ -3,9 +3,6 @@ /* packet-tcg-cp-oids.h */ /* asn2wrs.py -b -L -p tcg-cp-oids -c ./tcg-cp-oids.cnf -s ./packet-tcg-cp-oids-template -D . -O ../.. tcg-cp-oids.asn */ -/* Input file: packet-tcg-cp-oids-template.h */ - -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.h" /* packet-tcg-cp-oids.h * Routines for TCG Certificate Profile OIDs * @@ -20,10 +17,4 @@ #define PACKET_TCG_CP_OIDS_H -/*--- Included file: packet-tcg-cp-oids-exp.h ---*/ -#line 1 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-exp.h" - -/*--- End of included file: packet-tcg-cp-oids-exp.h ---*/ -#line 15 "./asn1/tcg-cp-oids/packet-tcg-cp-oids-template.h" - #endif /* PACKET_TCG_CP_OIDS_H */ diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index 7ecd5ef227..81e5c0d54f 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -3,9 +3,6 @@ /* packet-tetra.c */ /* asn2wrs.py -u -L -p tetra -c ./tetra.cnf -s ./packet-tetra-template -D . -O ../.. tetra.asn */ -/* Input file: packet-tetra-template.c */ - -#line 1 "./asn1/tetra/packet-tetra-template.c" /* packet-tetra.c * Routines for TETRA packet dissection * @@ -71,9 +68,6 @@ static gint hf_tetra_rxchannel3 = -1; static gint hf_tetra_crc = -1; static gint hf_tetra_len0 = -1; - -/*--- Included file: packet-tetra-hf.c ---*/ -#line 1 "./asn1/tetra/packet-tetra-hf.c" static int hf_tetra_AACH_PDU = -1; /* AACH */ static int hf_tetra_BSCH_PDU = -1; /* BSCH */ static int hf_tetra_BNCH_PDU = -1; /* BNCH */ @@ -667,9 +661,6 @@ static int hf_tetra_proprietary_element_owner = -1; /* Proprietary_element_owne static int hf_tetra_proprietary_element_owner_extension = -1; /* BIT_STRING */ static int hf_tetra_simplex_duplex_selection_06 = -1; /* T_simplex_duplex_selection_05 */ -/*--- End of included file: packet-tetra-hf.c ---*/ -#line 67 "./asn1/tetra/packet-tetra-template.c" - /* Initialize the subtree pointers */ /* These are the ids of the subtrees that we may be creating */ static gint ett_tetra = -1; @@ -678,9 +669,6 @@ static gint ett_tetra_length = -1; static gint ett_tetra_txreg = -1; static gint ett_tetra_text = -1; - -/*--- Included file: packet-tetra-ett.c ---*/ -#line 1 "./asn1/tetra/packet-tetra-ett.c" static gint ett_tetra_AACH = -1; static gint ett_tetra_BSCH = -1; static gint ett_tetra_MLE_Sync = -1; @@ -952,15 +940,9 @@ static gint ett_tetra_Type1 = -1; static gint ett_tetra_Type2 = -1; static gint ett_tetra_Modify_type = -1; -/*--- End of included file: packet-tetra-ett.c ---*/ -#line 77 "./asn1/tetra/packet-tetra-template.c" - static expert_field ei_tetra_channels_incorrect = EI_INIT; -/*--- Included file: packet-tetra-fn.c ---*/ -#line 1 "./asn1/tetra/packet-tetra-fn.c" - static int dissect_tetra_INTEGER_0_3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -8730,9 +8712,6 @@ static int dissect_MAC_ACCESS_DEFINE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ } -/*--- End of included file: packet-tetra-fn.c ---*/ -#line 81 "./asn1/tetra/packet-tetra-template.c" - static const value_string channeltypenames[] = { { 0, "Reserved" }, { 1, "AACH" }, @@ -9255,9 +9234,6 @@ void proto_register_tetra (void) { "PDU", "tetra.pdu", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }} , - -/*--- Included file: packet-tetra-hfarr.c ---*/ -#line 1 "./asn1/tetra/packet-tetra-hfarr.c" { &hf_tetra_AACH_PDU, { "AACH", "tetra.AACH_element", FT_NONE, BASE_NONE, NULL, 0, @@ -11626,9 +11602,6 @@ void proto_register_tetra (void) { "simplex-duplex-selection", "tetra.simplex_duplex_selection", FT_UINT32, BASE_DEC, VALS(tetra_T_simplex_duplex_selection_05_vals), 0, "T_simplex_duplex_selection_05", HFILL }}, - -/*--- End of included file: packet-tetra-hfarr.c ---*/ -#line 605 "./asn1/tetra/packet-tetra-template.c" }; /* List of subtrees */ @@ -11638,9 +11611,6 @@ void proto_register_tetra (void) &ett_tetra_length, &ett_tetra_txreg, &ett_tetra_text, - -/*--- Included file: packet-tetra-ettarr.c ---*/ -#line 1 "./asn1/tetra/packet-tetra-ettarr.c" &ett_tetra_AACH, &ett_tetra_BSCH, &ett_tetra_MLE_Sync, @@ -11911,9 +11881,6 @@ void proto_register_tetra (void) &ett_tetra_Type1, &ett_tetra_Type2, &ett_tetra_Modify_type, - -/*--- End of included file: packet-tetra-ettarr.c ---*/ -#line 615 "./asn1/tetra/packet-tetra-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-tetra.h b/epan/dissectors/packet-tetra.h index 5f717b7b9b..02dc7a3734 100644 --- a/epan/dissectors/packet-tetra.h +++ b/epan/dissectors/packet-tetra.h @@ -3,9 +3,6 @@ /* packet-tetra.h */ /* asn2wrs.py -u -L -p tetra -c ./tetra.cnf -s ./packet-tetra-template -D . -O ../.. tetra.asn */ -/* Input file: packet-tetra-template.h */ - -#line 1 "./asn1/tetra/packet-tetra-template.h" /* packet-tetra.h * Routines for TETRA packet dissection * diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index d7cb569d1f..defa76e867 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -3,9 +3,6 @@ /* packet-ulp.c */ /* asn2wrs.py -L -p ulp -c ./ulp.cnf -s ./packet-ulp-template -D . -O ../.. ULP.asn SUPL.asn ULP-Components.asn */ -/* Input file: packet-ulp-template.c */ - -#line 1 "./asn1/ulp/packet-ulp-template.c" /* packet-ulp.c * Routines for OMA UserPlane Location Protocol packet dissection * Copyright 2006, Anders Broman @@ -59,9 +56,6 @@ static int proto_ulp = -1; static gboolean ulp_desegment = TRUE; - -/*--- Included file: packet-ulp-hf.c ---*/ -#line 1 "./asn1/ulp/packet-ulp-hf.c" static int hf_ulp_ULP_PDU_PDU = -1; /* ULP_PDU */ static int hf_ulp_length = -1; /* INTEGER_0_65535 */ static int hf_ulp_version = -1; /* Version */ @@ -750,9 +744,6 @@ static int hf_ulp_GANSSSignals_signal5 = -1; static int hf_ulp_GANSSSignals_signal6 = -1; static int hf_ulp_GANSSSignals_signal7 = -1; static int hf_ulp_GANSSSignals_signal8 = -1; - -/*--- End of included file: packet-ulp-hf.c ---*/ -#line 55 "./asn1/ulp/packet-ulp-template.c" static int hf_ulp_mobile_directory_number = -1; static int hf_ulp_ganssTimeModels_bit0 = -1; static int hf_ulp_ganssTimeModels_bit1 = -1; @@ -766,9 +757,6 @@ static gint ett_ulp = -1; static gint ett_ulp_setid = -1; static gint ett_ulp_thirdPartyId = -1; static gint ett_ulp_ganssTimeModels = -1; - -/*--- Included file: packet-ulp-ett.c ---*/ -#line 1 "./asn1/ulp/packet-ulp-ett.c" static gint ett_ulp_ULP_PDU = -1; static gint ett_ulp_UlpMessage = -1; static gint ett_ulp_SUPLINIT = -1; @@ -999,9 +987,6 @@ static gint ett_ulp_Ver2_HighAccuracyPosition = -1; static gint ett_ulp_HighAccuracyPositionEstimate = -1; static gint ett_ulp_HighAccuracyAltitudeInfo = -1; -/*--- End of included file: packet-ulp-ett.c ---*/ -#line 69 "./asn1/ulp/packet-ulp-template.c" - static dissector_handle_t ulp_tcp_handle; static const value_string ulp_ganss_id_vals[] = { @@ -1250,9 +1235,6 @@ ulp_Coordinate_longitude_fmt(gchar *s, guint32 v) } /* Include constants */ - -/*--- Included file: packet-ulp-val.h ---*/ -#line 1 "./asn1/ulp/packet-ulp-val.h" #define maxReqLength 50 #define maxClientLength 50 #define maxNumGeoArea 32 @@ -1271,9 +1253,6 @@ ulp_Coordinate_longitude_fmt(gchar *s, guint32 v) #define maxNRServingCell 32 #define maxCellReportNR 32 -/*--- End of included file: packet-ulp-val.h ---*/ -#line 319 "./asn1/ulp/packet-ulp-template.c" - typedef struct { guint8 notif_enc_type; @@ -1289,9 +1268,6 @@ static ulp_private_data_t* ulp_get_private_data(asn1_ctx_t *actx) } -/*--- Included file: packet-ulp-fn.c ---*/ -#line 1 "./asn1/ulp/packet-ulp-fn.c" - static int dissect_ulp_INTEGER_0_65535(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -7822,9 +7798,6 @@ static int dissect_ULP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ } -/*--- End of included file: packet-ulp-fn.c ---*/ -#line 335 "./asn1/ulp/packet-ulp-template.c" - static guint get_ulp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) @@ -7849,9 +7822,6 @@ void proto_register_ulp(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-ulp-hfarr.c ---*/ -#line 1 "./asn1/ulp/packet-ulp-hfarr.c" { &hf_ulp_ULP_PDU_PDU, { "ULP-PDU", "ulp.ULP_PDU_element", FT_NONE, BASE_NONE, NULL, 0, @@ -10600,9 +10570,6 @@ void proto_register_ulp(void) { { "signal8", "ulp.GANSSSignals.signal8", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - -/*--- End of included file: packet-ulp-hfarr.c ---*/ -#line 361 "./asn1/ulp/packet-ulp-template.c" { &hf_ulp_mobile_directory_number, { "Mobile Directory Number", "ulp.mobile_directory_number", FT_STRING, BASE_NONE, NULL, 0, @@ -10639,9 +10606,6 @@ void proto_register_ulp(void) { &ett_ulp_setid, &ett_ulp_thirdPartyId, &ett_ulp_ganssTimeModels, - -/*--- Included file: packet-ulp-ettarr.c ---*/ -#line 1 "./asn1/ulp/packet-ulp-ettarr.c" &ett_ulp_ULP_PDU, &ett_ulp_UlpMessage, &ett_ulp_SUPLINIT, @@ -10871,9 +10835,6 @@ void proto_register_ulp(void) { &ett_ulp_Ver2_HighAccuracyPosition, &ett_ulp_HighAccuracyPositionEstimate, &ett_ulp_HighAccuracyAltitudeInfo, - -/*--- End of included file: packet-ulp-ettarr.c ---*/ -#line 398 "./asn1/ulp/packet-ulp-template.c" }; module_t *ulp_module; diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index afd4361ca1..a208e19f29 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -3,9 +3,6 @@ /* packet-wlancertextn.c */ /* asn2wrs.py -b -L -p wlancertextn -c ./wlancertextn.cnf -s ./packet-wlancertextn-template -D . -O ../.. WLANCERTEXTN.asn */ -/* Input file: packet-wlancertextn-template.c */ - -#line 1 "./asn1/wlancertextn/packet-wlancertextn-template.c" /* packet-wlancertextn.c * Routines for Wireless Certificate Extension (RFC3770) * Ronnie Sahlberg 2005 @@ -38,27 +35,12 @@ void proto_reg_handoff_wlancertextn(void); /* Initialize the protocol and registered fields */ static int proto_wlancertextn = -1; - -/*--- Included file: packet-wlancertextn-hf.c ---*/ -#line 1 "./asn1/wlancertextn/packet-wlancertextn-hf.c" 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 34 "./asn1/wlancertextn/packet-wlancertextn-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-wlancertextn-ett.c ---*/ -#line 1 "./asn1/wlancertextn/packet-wlancertextn-ett.c" static gint ett_wlancertextn_SSIDList = -1; -/*--- End of included file: packet-wlancertextn-ett.c ---*/ -#line 37 "./asn1/wlancertextn/packet-wlancertextn-template.c" - - -/*--- Included file: packet-wlancertextn-fn.c ---*/ -#line 1 "./asn1/wlancertextn/packet-wlancertextn-fn.c" static int @@ -93,18 +75,12 @@ static int dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 39 "./asn1/wlancertextn/packet-wlancertextn-template.c" - /*--- proto_register_wlancertextn ----------------------------------------------*/ void proto_register_wlancertextn(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-wlancertextn-hfarr.c ---*/ -#line 1 "./asn1/wlancertextn/packet-wlancertextn-hfarr.c" { &hf_wlancertextn_SSIDList_PDU, { "SSIDList", "wlancertextn.SSIDList", FT_UINT32, BASE_DEC, NULL, 0, @@ -113,20 +89,11 @@ void proto_register_wlancertextn(void) { { "SSID", "wlancertextn.SSID", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 47 "./asn1/wlancertextn/packet-wlancertextn-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-wlancertextn-ettarr.c ---*/ -#line 1 "./asn1/wlancertextn/packet-wlancertextn-ettarr.c" &ett_wlancertextn_SSIDList, - -/*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 52 "./asn1/wlancertextn/packet-wlancertextn-template.c" }; /* Register protocol */ @@ -141,15 +108,9 @@ void proto_register_wlancertextn(void) { /*--- proto_reg_handoff_wlancertextn -------------------------------------------*/ void proto_reg_handoff_wlancertextn(void) { - -/*--- Included file: packet-wlancertextn-dis-tab.c ---*/ -#line 1 "./asn1/wlancertextn/packet-wlancertextn-dis-tab.c" register_ber_oid_dissector("1.3.6.1.5.5.7.1.13", dissect_SSIDList_PDU, proto_wlancertextn, "id-pe-wlanSSID"); register_ber_oid_dissector("1.3.6.1.5.5.7.10.6", dissect_SSIDList_PDU, proto_wlancertextn, "id-aca-wlanSSID"); - -/*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ -#line 67 "./asn1/wlancertextn/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"); } diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h index b39b8dad6b..e679ac6b54 100644 --- a/epan/dissectors/packet-wlancertextn.h +++ b/epan/dissectors/packet-wlancertextn.h @@ -3,9 +3,6 @@ /* packet-wlancertextn.h */ /* asn2wrs.py -b -L -p wlancertextn -c ./wlancertextn.cnf -s ./packet-wlancertextn-template -D . -O ../.. WLANCERTEXTN.asn */ -/* Input file: packet-wlancertextn-template.h */ - -#line 1 "./asn1/wlancertextn/packet-wlancertextn-template.h" /* packet-wlancertextn.h * Routines for Wireless Certificate Extensions (RFC3770) packet dissection * Ronnie Sahlberg 2005 diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index f7c42ada2f..1846c3e78a 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -3,9 +3,6 @@ /* packet-x2ap.c */ /* asn2wrs.py -L -p x2ap -c ./x2ap.cnf -s ./packet-x2ap-template -D . -O ../.. X2AP-CommonDataTypes.asn X2AP-Constants.asn X2AP-Containers.asn X2AP-IEs.asn X2AP-PDU-Contents.asn X2AP-PDU-Descriptions.asn */ -/* Input file: packet-x2ap-template.c */ - -#line 1 "./asn1/x2ap/packet-x2ap-template.c" /* packet-x2ap.c * Routines for dissecting Evolved Universal Terrestrial Radio Access Network (EUTRAN); * X2 Application Protocol (X2AP); @@ -58,9 +55,6 @@ void proto_register_x2ap(void); /* Dissector will use SCTP PPID 27 or SCTP port. IANA assigned port = 36422 */ #define SCTP_PORT_X2AP 36422 - -/*--- Included file: packet-x2ap-val.h ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -638,9 +632,6 @@ typedef enum _ProtocolIE_ID_enum { id_SensorMeasurementConfiguration = 440 } ProtocolIE_ID_enum; -/*--- End of included file: packet-x2ap-val.h ---*/ -#line 54 "./asn1/x2ap/packet-x2ap-template.c" - /* Initialize the protocol and registered fields */ static int proto_x2ap = -1; static int hf_x2ap_transportLayerAddressIPv4 = -1; @@ -719,9 +710,6 @@ static int hf_x2ap_rAT_RestrictionInformation_MEO = -1; static int hf_x2ap_rAT_RestrictionInformation_GEO = -1; static int hf_x2ap_rAT_RestrictionInformation_OTHERSAT = -1; static int hf_x2ap_rAT_RestrictionInformation_Reserved = -1; - -/*--- Included file: packet-x2ap-hf.c ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-hf.c" static int hf_x2ap_ABSInformation_PDU = -1; /* ABSInformation */ static int hf_x2ap_ABS_Status_PDU = -1; /* ABS_Status */ static int hf_x2ap_ActivationID_PDU = -1; /* ActivationID */ @@ -2005,9 +1993,6 @@ static int hf_x2ap_initiatingMessage_value = -1; /* InitiatingMessage_value */ static int hf_x2ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_x2ap_value = -1; /* UnsuccessfulOutcome_value */ -/*--- End of included file: packet-x2ap-hf.c ---*/ -#line 134 "./asn1/x2ap/packet-x2ap-template.c" - /* Initialize the subtree pointers */ static int ett_x2ap = -1; static int ett_x2ap_TransportLayerAddress = -1; @@ -2060,9 +2045,6 @@ static int ett_x2ap_UERadioCapability = -1; static int ett_x2ap_LastVisitedPSCell_Item = -1; static int ett_x2ap_NRRACHReportContainer = -1; static int ett_x2ap_rAT_RestrictionInformation = -1; - -/*--- Included file: packet-x2ap-ett.c ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-ett.c" static gint ett_x2ap_PrivateIE_ID = -1; static gint ett_x2ap_ProtocolIE_Container = -1; static gint ett_x2ap_ProtocolIE_Field = -1; @@ -2695,9 +2677,6 @@ static gint ett_x2ap_InitiatingMessage = -1; static gint ett_x2ap_SuccessfulOutcome = -1; static gint ett_x2ap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-x2ap-ett.c ---*/ -#line 188 "./asn1/x2ap/packet-x2ap-template.c" - /* Forward declarations */ static int dissect_x2ap_Registration_Request_ENDC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); static int dissect_x2ap_ReportCharacteristics_ENDC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -2813,9 +2792,6 @@ x2ap_get_private_data(packet_info *pinfo) } -/*--- Included file: packet-x2ap-fn.c ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-fn.c" - static const value_string x2ap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -23123,9 +23099,6 @@ static int dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-x2ap-fn.c ---*/ -#line 304 "./asn1/x2ap/packet-x2ap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { struct x2ap_private_data *x2ap_data = x2ap_get_private_data(pinfo); @@ -23492,9 +23465,6 @@ void proto_register_x2ap(void) { { "Reserved", "x2ap.rAT_RestrictionInformation.Reserved", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }}, - -/*--- Included file: packet-x2ap-hfarr.c ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-hfarr.c" { &hf_x2ap_ABSInformation_PDU, { "ABSInformation", "x2ap.ABSInformation", FT_UINT32, BASE_DEC, VALS(x2ap_ABSInformation_vals), 0, @@ -28623,9 +28593,6 @@ void proto_register_x2ap(void) { { "value", "x2ap.value_element", FT_NONE, BASE_NONE, NULL, 0, "UnsuccessfulOutcome_value", HFILL }}, - -/*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 672 "./asn1/x2ap/packet-x2ap-template.c" }; /* List of subtrees */ @@ -28681,9 +28648,6 @@ void proto_register_x2ap(void) { &ett_x2ap_LastVisitedPSCell_Item, &ett_x2ap_NRRACHReportContainer, &ett_x2ap_rAT_RestrictionInformation, - -/*--- Included file: packet-x2ap-ettarr.c ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-ettarr.c" &ett_x2ap_PrivateIE_ID, &ett_x2ap_ProtocolIE_Container, &ett_x2ap_ProtocolIE_Field, @@ -29315,9 +29279,6 @@ void proto_register_x2ap(void) { &ett_x2ap_InitiatingMessage, &ett_x2ap_SuccessfulOutcome, &ett_x2ap_UnsuccessfulOutcome, - -/*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 728 "./asn1/x2ap/packet-x2ap-template.c" }; module_t *x2ap_module; @@ -29353,9 +29314,6 @@ proto_reg_handoff_x2ap(void) { dissector_add_uint_with_preference("sctp.port", SCTP_PORT_X2AP, x2ap_handle); dissector_add_uint("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle); - -/*--- Included file: packet-x2ap-dis-tab.c ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-dis-tab.c" dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_Item, create_dissector_handle(dissect_E_RABs_Admitted_Item_PDU, proto_x2ap)); dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_List, create_dissector_handle(dissect_E_RABs_Admitted_List_PDU, proto_x2ap)); dissector_add_uint("x2ap.ies", id_E_RAB_Item, create_dissector_handle(dissect_E_RAB_Item_PDU, proto_x2ap)); @@ -29892,9 +29850,6 @@ proto_reg_handoff_x2ap(void) dissector_add_uint("x2ap.proc.imsg", id_accessAndMobilityIndication, create_dissector_handle(dissect_AccessAndMobilityIndication_PDU, proto_x2ap)); dissector_add_uint("x2ap.proc.imsg", id_CPC_cancel, create_dissector_handle(dissect_CPC_cancel_PDU, proto_x2ap)); - -/*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 764 "./asn1/x2ap/packet-x2ap-template.c" } diff --git a/epan/dissectors/packet-x2ap.h b/epan/dissectors/packet-x2ap.h index e187dfe67b..6d59f21b1a 100644 --- a/epan/dissectors/packet-x2ap.h +++ b/epan/dissectors/packet-x2ap.h @@ -3,9 +3,6 @@ /* packet-x2ap.h */ /* asn2wrs.py -L -p x2ap -c ./x2ap.cnf -s ./packet-x2ap-template -D . -O ../.. X2AP-CommonDataTypes.asn X2AP-Constants.asn X2AP-Containers.asn X2AP-IEs.asn X2AP-PDU-Contents.asn X2AP-PDU-Descriptions.asn */ -/* Input file: packet-x2ap-template.h */ - -#line 1 "./asn1/x2ap/packet-x2ap-template.h" /* packet-x2ap.h * Routines for E-UTRAN X2 Application Protocol (X2AP) packet dissection * @@ -19,18 +16,12 @@ #ifndef PACKET_X2AP_H #define PACKET_X2AP_H - -/*--- Included file: packet-x2ap-exp.h ---*/ -#line 1 "./asn1/x2ap/packet-x2ap-exp.h" int dissect_x2ap_MeNBResourceCoordinationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_x2ap_ProtectedEUTRAResourceIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_x2ap_SgNBResourceCoordinationInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_x2ap_EUTRANRCellResourceCoordinationRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); int dissect_x2ap_EUTRANRCellResourceCoordinationResponse_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-x2ap-exp.h ---*/ -#line 15 "./asn1/x2ap/packet-x2ap-template.h" - #endif /* PACKET_X2AP_H */ /* diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 5e58546644..767e4790f6 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -3,9 +3,6 @@ /* packet-x509af.c */ /* asn2wrs.py -b -L -p x509af -c ./x509af.cnf -s ./packet-x509af-template -D . -O ../.. AuthenticationFramework.asn */ -/* Input file: packet-x509af-template.c */ - -#line 1 "./asn1/x509af/packet-x509af-template.c" /* packet-x509af.c * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 @@ -46,9 +43,6 @@ void proto_reg_handoff_x509af(void); static int proto_x509af = -1; static int hf_x509af_algorithm_id = -1; static int hf_x509af_extension_id = -1; - -/*--- Included file: packet-x509af-hf.c ---*/ -#line 1 "./asn1/x509af/packet-x509af-hf.c" static int hf_x509af_x509af_Certificate_PDU = -1; /* Certificate */ static int hf_x509af_SubjectPublicKeyInfo_PDU = -1; /* SubjectPublicKeyInfo */ static int hf_x509af_CertificatePair_PDU = -1; /* CertificatePair */ @@ -126,14 +120,8 @@ static int hf_x509af_p = -1; /* INTEGER */ static int hf_x509af_q = -1; /* INTEGER */ static int hf_x509af_g = -1; /* INTEGER */ -/*--- End of included file: packet-x509af-hf.c ---*/ -#line 42 "./asn1/x509af/packet-x509af-template.c" - /* Initialize the subtree pointers */ static gint ett_pkix_crl = -1; - -/*--- Included file: packet-x509af-ett.c ---*/ -#line 1 "./asn1/x509af/packet-x509af-ett.c" static gint ett_x509af_Certificate = -1; static gint ett_x509af_T_signedCertificate = -1; static gint ett_x509af_SubjectName = -1; @@ -166,16 +154,10 @@ static gint ett_x509af_AttributeCertificateAssertion = -1; static gint ett_x509af_AssertionSubject = -1; static gint ett_x509af_SET_OF_AttributeType = -1; static gint ett_x509af_DSS_Params = -1; - -/*--- End of included file: packet-x509af-ett.c ---*/ -#line 46 "./asn1/x509af/packet-x509af-template.c" static const char *algorithm_id = NULL; static void x509af_export_publickey(tvbuff_t *tvb, asn1_ctx_t *actx, int offset, int len); -/*--- Included file: packet-x509af-fn.c ---*/ -#line 1 "./asn1/x509af/packet-x509af-fn.c" - const value_string x509af_Version_vals[] = { { 0, "v1" }, { 1, "v2" }, @@ -947,9 +929,6 @@ static int dissect_Userid_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t } -/*--- End of included file: packet-x509af-fn.c ---*/ -#line 50 "./asn1/x509af/packet-x509af-template.c" - /* Exports the SubjectPublicKeyInfo structure as gnutls_datum_t. * actx->private_data is assumed to be a gnutls_datum_t pointer which will be * filled in if non-NULL. */ @@ -1007,9 +986,6 @@ void proto_register_x509af(void) { { "Extension Id", "x509af.extension.id", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }}, - -/*--- Included file: packet-x509af-hfarr.c ---*/ -#line 1 "./asn1/x509af/packet-x509af-hfarr.c" { &hf_x509af_x509af_Certificate_PDU, { "Certificate", "x509af.Certificate_element", FT_NONE, BASE_NONE, NULL, 0, @@ -1314,17 +1290,11 @@ void proto_register_x509af(void) { { "g", "x509af.g", FT_BYTES, BASE_NONE, NULL, 0, "INTEGER", HFILL }}, - -/*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 109 "./asn1/x509af/packet-x509af-template.c" }; /* List of subtrees */ static gint *ett[] = { &ett_pkix_crl, - -/*--- Included file: packet-x509af-ettarr.c ---*/ -#line 1 "./asn1/x509af/packet-x509af-ettarr.c" &ett_x509af_Certificate, &ett_x509af_T_signedCertificate, &ett_x509af_SubjectName, @@ -1357,9 +1327,6 @@ void proto_register_x509af(void) { &ett_x509af_AssertionSubject, &ett_x509af_SET_OF_AttributeType, &ett_x509af_DSS_Params, - -/*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 115 "./asn1/x509af/packet-x509af-template.c" }; /* Register protocol */ @@ -1388,9 +1355,6 @@ void proto_reg_handoff_x509af(void) { pkix_crl_handle = create_dissector_handle(dissect_pkix_crl, proto_x509af); dissector_add_string("media_type", "application/pkix-crl", pkix_crl_handle); - -/*--- Included file: packet-x509af-dis-tab.c ---*/ -#line 1 "./asn1/x509af/packet-x509af-dis-tab.c" register_ber_oid_dissector("2.5.4.36", dissect_x509af_Certificate_PDU, proto_x509af, "id-at-userCertificate"); register_ber_oid_dissector("2.5.4.37", dissect_x509af_Certificate_PDU, proto_x509af, "id-at-cAcertificate"); register_ber_oid_dissector("2.5.4.38", dissect_CertificateList_PDU, proto_x509af, "id-at-authorityRevocationList"); @@ -1403,9 +1367,6 @@ void proto_reg_handoff_x509af(void) { register_ber_oid_dissector("0.9.2342.19200300.100.1.1", dissect_Userid_PDU, proto_x509af, "id-userid"); -/*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 144 "./asn1/x509af/packet-x509af-template.c" - /*XXX these should really go to a better place but since I have not that ITU standard, I'll put it here for the time being. diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index be83a511fd..c64a01d813 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -3,9 +3,6 @@ /* packet-x509af.h */ /* asn2wrs.py -b -L -p x509af -c ./x509af.cnf -s ./packet-x509af-template -D . -O ../.. AuthenticationFramework.asn */ -/* Input file: packet-x509af-template.h */ - -#line 1 "./asn1/x509af/packet-x509af-template.h" /* packet-x509af.h * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 @@ -20,9 +17,6 @@ #ifndef PACKET_X509AF_H #define PACKET_X509AF_H - -/*--- Included file: packet-x509af-exp.h ---*/ -#line 1 "./asn1/x509af/packet-x509af-exp.h" extern const value_string x509af_Version_vals[]; extern const value_string x509af_Time_vals[]; int dissect_x509af_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -49,9 +43,6 @@ int dissect_x509af_AttCertValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tv int dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-x509af-exp.h ---*/ -#line 16 "./asn1/x509af/packet-x509af-template.h" - extern const char* x509af_get_last_algorithm_id(void); #endif /* PACKET_X509AF_H */ diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index c752c4a580..85c69a2a96 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -3,9 +3,6 @@ /* packet-x509ce.c */ /* asn2wrs.py -b -L -p x509ce -c ./x509ce.cnf -s ./packet-x509ce-template -D . -O ../.. CertificateExtensions.asn CertificateExtensionsCiplus.asn */ -/* Input file: packet-x509ce-template.c */ - -#line 1 "./asn1/x509ce/packet-x509ce-template.c" /* packet-x509ce.c * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 @@ -44,9 +41,6 @@ static int hf_x509ce_id_ce_baseUpdateTime = -1; static int hf_x509ce_object_identifier_id = -1; static int hf_x509ce_IPAddress_ipv4 = -1; static int hf_x509ce_IPAddress_ipv6 = -1; - -/*--- Included file: packet-x509ce-hf.c ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-hf.c" static int hf_x509ce_AuthorityKeyIdentifier_PDU = -1; /* AuthorityKeyIdentifier */ static int hf_x509ce_SubjectKeyIdentifier_PDU = -1; /* SubjectKeyIdentifier */ static int hf_x509ce_KeyUsage_PDU = -1; /* KeyUsage */ @@ -245,13 +239,7 @@ static int hf_x509ce_EntrustInfoFlags_enterpriseCategory = -1; static int hf_x509ce_EntrustInfoFlags_webCategory = -1; static int hf_x509ce_EntrustInfoFlags_sETCategory = -1; -/*--- End of included file: packet-x509ce-hf.c ---*/ -#line 40 "./asn1/x509ce/packet-x509ce-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-x509ce-ett.c ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-ett.c" static gint ett_x509ce_AuthorityKeyIdentifier = -1; static gint ett_x509ce_KeyUsage = -1; static gint ett_x509ce_KeyPurposeIDs = -1; @@ -313,12 +301,6 @@ static gint ett_x509ce_EntrustVersionInfo = -1; static gint ett_x509ce_EntrustInfoFlags = -1; static gint ett_x509ce_ScramblerCapabilities = -1; -/*--- End of included file: packet-x509ce-ett.c ---*/ -#line 43 "./asn1/x509ce/packet-x509ce-template.c" - -/*--- Included file: packet-x509ce-fn.c ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-fn.c" - int dissect_x509ce_KeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1935,9 +1917,6 @@ static int dissect_CicamBrandId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } -/*--- End of included file: packet-x509ce-fn.c ---*/ -#line 44 "./asn1/x509ce/packet-x509ce-template.c" - /* CI+ (www.ci-plus.com) defines some X.509 certificate extensions that use OIDs which are not officially assigned dissection of these extensions can be enabled temporarily using the @@ -2004,9 +1983,6 @@ void proto_register_x509ce(void) { { "iPAddress", "x509ce.IPAddress.ipv6", FT_IPv6, BASE_NONE, NULL, 0, "IPv6 address", HFILL }}, - -/*--- Included file: packet-x509ce-hfarr.c ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-hfarr.c" { &hf_x509ce_AuthorityKeyIdentifier_PDU, { "AuthorityKeyIdentifier", "x509ce.AuthorityKeyIdentifier_element", FT_NONE, BASE_NONE, NULL, 0, @@ -2791,16 +2767,10 @@ void proto_register_x509ce(void) { { "sETCategory", "x509ce.EntrustInfoFlags.sETCategory", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, - -/*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 112 "./asn1/x509ce/packet-x509ce-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-x509ce-ettarr.c ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-ettarr.c" &ett_x509ce_AuthorityKeyIdentifier, &ett_x509ce_KeyUsage, &ett_x509ce_KeyPurposeIDs, @@ -2861,9 +2831,6 @@ void proto_register_x509ce(void) { &ett_x509ce_EntrustVersionInfo, &ett_x509ce_EntrustInfoFlags, &ett_x509ce_ScramblerCapabilities, - -/*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 117 "./asn1/x509ce/packet-x509ce-template.c" }; /* Register protocol */ @@ -2878,9 +2845,6 @@ void proto_register_x509ce(void) { /*--- proto_reg_handoff_x509ce -------------------------------------------*/ void proto_reg_handoff_x509ce(void) { - -/*--- Included file: packet-x509ce-dis-tab.c ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-dis-tab.c" register_ber_oid_dissector("2.5.29.3", dissect_CertificatePoliciesSyntax_PDU, proto_x509ce, "id-ce-certificatePolicies"); register_ber_oid_dissector("2.5.29.9", dissect_AttributesSyntax_PDU, proto_x509ce, "id-ce-subjectDirectoryAttributes"); register_ber_oid_dissector("2.5.29.14", dissect_SubjectKeyIdentifier_PDU, proto_x509ce, "id-ce-subjectKeyIdentifier"); @@ -2924,9 +2888,6 @@ void proto_reg_handoff_x509ce(void) { register_ber_oid_dissector("1.3.6.1.4.1.311.21.10", dissect_CertificatePoliciesSyntax_PDU, proto_x509ce, "id-ms-application-certificate-policies"); register_ber_oid_dissector("1.2.840.113533.7.65.0", dissect_EntrustVersionInfo_PDU, proto_x509ce, "id-ce-entrustVersionInfo"); - -/*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 132 "./asn1/x509ce/packet-x509ce-template.c" register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate"); register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime"); oid_add_from_string("anyPolicy","2.5.29.32.0"); diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h index 3f4eb29f85..5739a30290 100644 --- a/epan/dissectors/packet-x509ce.h +++ b/epan/dissectors/packet-x509ce.h @@ -3,9 +3,6 @@ /* packet-x509ce.h */ /* asn2wrs.py -b -L -p x509ce -c ./x509ce.cnf -s ./packet-x509ce-template -D . -O ../.. CertificateExtensions.asn CertificateExtensionsCiplus.asn */ -/* Input file: packet-x509ce-template.h */ - -#line 1 "./asn1/x509ce/packet-x509ce-template.h" /* packet-x509ce.h * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 @@ -20,9 +17,6 @@ #ifndef PACKET_X509CE_H #define PACKET_X509CE_H - -/*--- Included file: packet-x509ce-exp.h ---*/ -#line 1 "./asn1/x509ce/packet-x509ce-exp.h" extern const value_string x509ce_GeneralName_vals[]; extern const value_string x509ce_CRLReason_vals[]; extern const value_string x509ce_StatusReferral_vals[]; @@ -85,9 +79,6 @@ int dissect_x509ce_ScramblerCapabilities(gboolean implicit_tag _U_, tvbuff_t *tv int dissect_x509ce_CiplusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_x509ce_CicamBrandId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-x509ce-exp.h ---*/ -#line 16 "./asn1/x509ce/packet-x509ce-template.h" - void x509ce_enable_ciplus(void); void x509ce_disable_ciplus(void); diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index d55e5ba2c7..832d753809 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -3,9 +3,6 @@ /* packet-x509if.c */ /* asn2wrs.py -b -L -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . -O ../.. InformationFramework.asn ServiceAdministration.asn */ -/* Input file: packet-x509if-template.c */ - -#line 1 "./asn1/x509if/packet-x509if-template.c" /* packet-x509if.c * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 @@ -41,9 +38,6 @@ void proto_reg_handoff_x509if(void); static int proto_x509if = -1; static int hf_x509if_object_identifier_id = -1; static int hf_x509if_any_string = -1; - -/*--- Included file: packet-x509if-hf.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-hf.c" static int hf_x509if_DistinguishedName_PDU = -1; /* DistinguishedName */ static int hf_x509if_SubtreeSpecification_PDU = -1; /* SubtreeSpecification */ static int hf_x509if_HierarchyLevel_PDU = -1; /* HierarchyLevel */ @@ -200,13 +194,7 @@ static int hf_x509if_AllowedSubset_baseObject = -1; static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; -/*--- End of included file: packet-x509if-hf.c ---*/ -#line 37 "./asn1/x509if/packet-x509if-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-x509if-ett.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-ett.c" static gint ett_x509if_Attribute = -1; static gint ett_x509if_T_values = -1; static gint ett_x509if_T_valuesWithContext = -1; @@ -281,9 +269,6 @@ static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute = -1; static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; -/*--- End of included file: packet-x509if-ett.c ---*/ -#line 40 "./asn1/x509if/packet-x509if-template.c" - static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; @@ -315,9 +300,6 @@ x509if_frame_end(void) last_ava = NULL; } - -/*--- Included file: packet-x509if-fn.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-fn.c" /*--- Cyclic dependencies ---*/ /* Refinement -> Refinement/and -> Refinement */ @@ -2047,9 +2029,6 @@ static int dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } -/*--- End of included file: packet-x509if-fn.c ---*/ -#line 73 "./asn1/x509if/packet-x509if-template.c" - const char * x509if_get_last_dn(void) { return last_dn_buf ? wmem_strbuf_get_str(last_dn_buf) : NULL; @@ -2093,9 +2072,6 @@ void proto_register_x509if(void) { { "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE, NULL, 0, "This is any String", HFILL }}, - -/*--- Included file: packet-x509if-hfarr.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-hfarr.c" { &hf_x509if_DistinguishedName_PDU, { "DistinguishedName", "x509if.DistinguishedName", FT_UINT32, BASE_DEC, NULL, 0, @@ -2712,16 +2688,10 @@ void proto_register_x509if(void) { { "wholeSubtree", "x509if.AllowedSubset.wholeSubtree", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, - -/*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 118 "./asn1/x509if/packet-x509if-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-x509if-ettarr.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-ettarr.c" &ett_x509if_Attribute, &ett_x509if_T_values, &ett_x509if_T_valuesWithContext, @@ -2795,9 +2765,6 @@ void proto_register_x509if(void) { &ett_x509if_SEQUENCE_SIZE_1_MAX_OF_ResultAttribute, &ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType, &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, - -/*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 123 "./asn1/x509if/packet-x509if-template.c" }; /* Register protocol */ @@ -2816,9 +2783,6 @@ void proto_register_x509if(void) { /*--- proto_reg_handoff_x509if -------------------------------------------*/ void proto_reg_handoff_x509if(void) { - -/*--- Included file: packet-x509if-dis-tab.c ---*/ -#line 1 "./asn1/x509if/packet-x509if-dis-tab.c" register_ber_oid_dissector("2.5.4.1", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aliasedEntryName"); register_ber_oid_dissector("2.5.4.31", dissect_DistinguishedName_PDU, proto_x509if, "id-at-member"); register_ber_oid_dissector("2.5.4.32", dissect_DistinguishedName_PDU, proto_x509if, "id-at-owner"); @@ -2853,8 +2817,5 @@ void proto_reg_handoff_x509if(void) { register_ber_oid_dissector("2.16.840.1.101.2.2.1.184", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aCPDutyOfficer"); register_ber_oid_dissector("2.16.840.1.101.2.2.1.188", dissect_DistinguishedName_PDU, proto_x509if, "id-at-primaryMember"); - -/*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 142 "./asn1/x509if/packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h index f1ce20df71..c780bfd3f5 100644 --- a/epan/dissectors/packet-x509if.h +++ b/epan/dissectors/packet-x509if.h @@ -3,9 +3,6 @@ /* packet-x509if.h */ /* asn2wrs.py -b -L -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . -O ../.. InformationFramework.asn ServiceAdministration.asn */ -/* Input file: packet-x509if-template.h */ - -#line 1 "./asn1/x509if/packet-x509if-template.h" /* packet-x509if.h * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 @@ -20,9 +17,6 @@ #ifndef PACKET_X509IF_H #define PACKET_X509IF_H - -/*--- Included file: packet-x509if-exp.h ---*/ -#line 1 "./asn1/x509if/packet-x509if-exp.h" extern const value_string x509if_Name_vals[]; extern const value_string x509if_Refinement_vals[]; extern const value_string x509if_AttributeUsage_vals[]; @@ -68,9 +62,6 @@ int dissect_x509if_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int dissect_x509if_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_x509if_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-x509if-exp.h ---*/ -#line 16 "./asn1/x509if/packet-x509if-template.h" - extern const char * x509if_get_last_dn(void); extern gboolean x509if_register_fmt(int hf_index, const gchar *fmt); diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index f6528af360..97a0cd9150 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -3,9 +3,6 @@ /* packet-x509sat.c */ /* asn2wrs.py -b -r Syntax -L -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . -O ../.. SelectedAttributeTypes.asn */ -/* Input file: packet-x509sat-template.c */ - -#line 1 "./asn1/x509sat/packet-x509sat-template.c" /* packet-x509sat.c * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 @@ -38,9 +35,6 @@ void proto_reg_handoff_x509sat(void); /* Initialize the protocol and registered fields */ static int proto_x509sat = -1; - -/*--- Included file: packet-x509sat-hf.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-hf.c" static int hf_x509sat_DirectoryString_PDU = -1; /* DirectoryString */ static int hf_x509sat_UniqueIdentifier_PDU = -1; /* UniqueIdentifier */ static int hf_x509sat_CountryName_PDU = -1; /* CountryName */ @@ -207,13 +201,7 @@ static int hf_x509sat_T_bitNamedDays_thursday = -1; static int hf_x509sat_T_bitNamedDays_friday = -1; static int hf_x509sat_T_bitNamedDays_saturday = -1; -/*--- End of included file: packet-x509sat-hf.c ---*/ -#line 34 "./asn1/x509sat/packet-x509sat-template.c" - /* Initialize the subtree pointers */ - -/*--- Included file: packet-x509sat-ett.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-ett.c" static gint ett_x509sat_DirectoryString = -1; static gint ett_x509sat_Guide = -1; static gint ett_x509sat_Criteria = -1; @@ -262,12 +250,6 @@ static gint ett_x509sat_TimeAssertion = -1; static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; -/*--- End of included file: packet-x509sat-ett.c ---*/ -#line 37 "./asn1/x509sat/packet-x509sat-template.c" - - -/*--- Included file: packet-x509sat-fn.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-fn.c" /*--- Cyclic dependencies ---*/ /* Criteria -> Criteria/and -> Criteria */ @@ -1902,18 +1884,12 @@ static int dissect_GUID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre } -/*--- End of included file: packet-x509sat-fn.c ---*/ -#line 39 "./asn1/x509sat/packet-x509sat-template.c" - /*--- proto_register_x509sat ----------------------------------------------*/ void proto_register_x509sat(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-x509sat-hfarr.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-hfarr.c" { &hf_x509sat_DirectoryString_PDU, { "DirectoryString", "x509sat.DirectoryString", FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0, @@ -2570,16 +2546,10 @@ void proto_register_x509sat(void) { { "saturday", "x509sat.T.bitNamedDays.saturday", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, - -/*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 47 "./asn1/x509sat/packet-x509sat-template.c" }; /* List of subtrees */ static gint *ett[] = { - -/*--- Included file: packet-x509sat-ettarr.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-ettarr.c" &ett_x509sat_DirectoryString, &ett_x509sat_Guide, &ett_x509sat_Criteria, @@ -2627,9 +2597,6 @@ void proto_register_x509sat(void) { &ett_x509sat_TimeAssertion, &ett_x509sat_T_between, &ett_x509sat_LocaleContextSyntax, - -/*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 52 "./asn1/x509sat/packet-x509sat-template.c" }; /* Register protocol */ @@ -2639,9 +2606,6 @@ void proto_register_x509sat(void) { proto_register_field_array(proto_x509sat, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - -/*--- Included file: packet-x509sat-syn-reg.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-syn-reg.c" /*--- Syntax registrations ---*/ register_ber_syntax_dissector("BitString", proto_x509sat, dissect_BitString_PDU); register_ber_syntax_dissector("Boolean", proto_x509sat, dissect_Boolean_PDU); @@ -2681,17 +2645,11 @@ void proto_register_x509sat(void) { register_ber_syntax_dissector("UniqueIdentifier", proto_x509sat, dissect_UniqueIdentifier_PDU); register_ber_syntax_dissector("X121Address", proto_x509sat, dissect_X121Address_PDU); -/*--- End of included file: packet-x509sat-syn-reg.c ---*/ -#line 62 "./asn1/x509sat/packet-x509sat-template.c" - } /*--- proto_reg_handoff_x509sat -------------------------------------------*/ void proto_reg_handoff_x509sat(void) { - -/*--- Included file: packet-x509sat-dis-tab.c ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-dis-tab.c" register_ber_oid_dissector("2.5.4.0", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-objectClass"); register_ber_oid_dissector("2.5.4.2", dissect_DirectoryString_PDU, proto_x509sat, "id-at-knowledgeInformation"); register_ber_oid_dissector("2.5.4.3", dissect_DirectoryString_PDU, proto_x509sat, "id-at-commonName"); @@ -2874,9 +2832,6 @@ void proto_reg_handoff_x509sat(void) { register_ber_oid_dissector("1.3.6.1.4.1.311.60.2.1.3", dissect_CountryName_PDU, proto_x509sat, "jurisdictionOfIncorporationCountryName"); -/*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 69 "./asn1/x509sat/packet-x509sat-template.c" - /* OBJECT CLASSES */ oid_add_from_string("top","2.5.6.0"); diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index eb33e426bf..84370b95cd 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -3,9 +3,6 @@ /* packet-x509sat.h */ /* asn2wrs.py -b -r Syntax -L -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . -O ../.. SelectedAttributeTypes.asn */ -/* Input file: packet-x509sat-template.h */ - -#line 1 "./asn1/x509sat/packet-x509sat-template.h" /* packet-x509sat.h * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 @@ -20,9 +17,6 @@ #ifndef PACKET_X509SAT_H #define PACKET_X509SAT_H - -/*--- Included file: packet-x509sat-exp.h ---*/ -#line 1 "./asn1/x509sat/packet-x509sat-exp.h" extern const value_string x509sat_DirectoryString_vals[]; extern const value_string x509sat_Criteria_vals[]; extern const value_string x509sat_ZonalResult_vals[]; @@ -60,8 +54,5 @@ int dissect_x509sat_TimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -/*--- End of included file: packet-x509sat-exp.h ---*/ -#line 16 "./asn1/x509sat/packet-x509sat-template.h" - #endif /* PACKET_X509SAT_H */ diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c index ebdb87fa09..d94ffd0d98 100644 --- a/epan/dissectors/packet-xnap.c +++ b/epan/dissectors/packet-xnap.c @@ -3,9 +3,6 @@ /* packet-xnap.c */ /* asn2wrs.py -L -p xnap -c ./xnap.cnf -s ./packet-xnap-template -D . -O ../.. XnAP-CommonDataTypes.asn XnAP-Constants.asn XnAP-Containers.asn XnAP-IEs.asn XnAP-PDU-Contents.asn XnAP-PDU-Descriptions.asn */ -/* Input file: packet-xnap-template.c */ - -#line 1 "./asn1/xnap/packet-xnap-template.c" /* packet-xnap.c * Routines for dissecting NG-RAN Xn application protocol (XnAP) * 3GPP TS 38.423 packet dissection @@ -53,9 +50,6 @@ /* Dissector will use SCTP PPID 61 or SCTP port. IANA assigned port = 38422 */ #define SCTP_PORT_XnAP 38422 - -/*--- Included file: packet-xnap-val.h ---*/ -#line 1 "./asn1/xnap/packet-xnap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -598,9 +592,6 @@ typedef enum _GlobalNG_RANNode_ID_enum { GlobalNG_RANNode_ID_choice_extension = 2 } GlobalNG_RANNode_ID_enum; -/*--- End of included file: packet-xnap-val.h ---*/ -#line 49 "./asn1/xnap/packet-xnap-template.c" - /* Initialize the protocol and registered fields */ static int proto_xnap = -1; static int hf_xnap_transportLayerAddressIPv4 = -1; @@ -635,9 +626,6 @@ static int hf_xnap_ReportCharacteristics_TNLCapacityIndPeriodic = -1; static int hf_xnap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; static int hf_xnap_ReportCharacteristics_NumberOfActiveUEs = -1; static int hf_xnap_ReportCharacteristics_Reserved = -1; - -/*--- Included file: packet-xnap-hf.c ---*/ -#line 1 "./asn1/xnap/packet-xnap-hf.c" static int hf_xnap_AdditionLocationInformation_PDU = -1; /* AdditionLocationInformation */ static int hf_xnap_Additional_PDCP_Duplication_TNL_List_PDU = -1; /* Additional_PDCP_Duplication_TNL_List */ static int hf_xnap_Additional_UL_NG_U_TNLatUPF_List_PDU = -1; /* Additional_UL_NG_U_TNLatUPF_List */ @@ -2321,9 +2309,6 @@ static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128 = -1; static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia2_128 = -1; static int hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia3_128 = -1; -/*--- End of included file: packet-xnap-hf.c ---*/ -#line 85 "./asn1/xnap/packet-xnap-template.c" - /* Initialize the subtree pointers */ static gint ett_xnap = -1; static gint ett_xnap_RRC_Context = -1; @@ -2373,9 +2358,6 @@ static gint ett_xnap_RACH_Config_Common_IAB = -1; static gint ett_xnap_ReportConfigContainer = -1; static gint ett_xnap_RLC_Bearer_Configuration = -1; static gint ett_xnap_SuccessfulHOReportContainer = -1; - -/*--- Included file: packet-xnap-ett.c ---*/ -#line 1 "./asn1/xnap/packet-xnap-ett.c" static gint ett_xnap_PrivateIE_ID = -1; static gint ett_xnap_ProtocolIE_Container = -1; static gint ett_xnap_ProtocolIE_Field = -1; @@ -3230,9 +3212,6 @@ static gint ett_xnap_InitiatingMessage = -1; static gint ett_xnap_SuccessfulOutcome = -1; static gint ett_xnap_UnsuccessfulOutcome = -1; -/*--- End of included file: packet-xnap-ett.c ---*/ -#line 136 "./asn1/xnap/packet-xnap-template.c" - enum { XNAP_NG_RAN_CONTAINER_AUTOMATIC, XNAP_NG_RAN_CONTAINER_GNB, @@ -3377,9 +3356,6 @@ xnap_get_ranmode_id(address *addr, guint32 port, packet_info *pinfo) } -/*--- Included file: packet-xnap-fn.c ---*/ -#line 1 "./asn1/xnap/packet-xnap-fn.c" - static const value_string xnap_Criticality_vals[] = { { 0, "reject" }, { 1, "ignore" }, @@ -27997,9 +27973,6 @@ static int dissect_XnAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -/*--- End of included file: packet-xnap-fn.c ---*/ -#line 281 "./asn1/xnap/packet-xnap-template.c" - static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { struct xnap_private_data *xnap_data = xnap_get_private_data(pinfo); @@ -28200,9 +28173,6 @@ void proto_register_xnap(void) { { "Reserved", "xnap.ReportCharacteristics.Reserved", FT_UINT32, BASE_HEX, NULL, 0x0fffffff, NULL, HFILL }}, - -/*--- Included file: packet-xnap-hfarr.c ---*/ -#line 1 "./asn1/xnap/packet-xnap-hfarr.c" { &hf_xnap_AdditionLocationInformation_PDU, { "AdditionLocationInformation", "xnap.AdditionLocationInformation", FT_UINT32, BASE_DEC, VALS(xnap_AdditionLocationInformation_vals), 0, @@ -34927,9 +34897,6 @@ void proto_register_xnap(void) { { "eia3-128", "xnap.T.e.utra.IntegrityProtectionAlgorithms.eia3.128", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - -/*--- End of included file: packet-xnap-hfarr.c ---*/ -#line 483 "./asn1/xnap/packet-xnap-template.c" }; /* List of subtrees */ @@ -34982,9 +34949,6 @@ void proto_register_xnap(void) { &ett_xnap_ReportConfigContainer, &ett_xnap_RLC_Bearer_Configuration, &ett_xnap_SuccessfulHOReportContainer, - -/*--- Included file: packet-xnap-ettarr.c ---*/ -#line 1 "./asn1/xnap/packet-xnap-ettarr.c" &ett_xnap_PrivateIE_ID, &ett_xnap_ProtocolIE_Container, &ett_xnap_ProtocolIE_Field, @@ -35838,9 +35802,6 @@ void proto_register_xnap(void) { &ett_xnap_InitiatingMessage, &ett_xnap_SuccessfulOutcome, &ett_xnap_UnsuccessfulOutcome, - -/*--- End of included file: packet-xnap-ettarr.c ---*/ -#line 536 "./asn1/xnap/packet-xnap-template.c" }; module_t *xnap_module; @@ -35874,9 +35835,6 @@ proto_reg_handoff_xnap(void) { dissector_add_uint_with_preference("sctp.port", SCTP_PORT_XnAP, xnap_handle); dissector_add_uint("sctp.ppi", XNAP_PROTOCOL_ID, xnap_handle); - -/*--- Included file: packet-xnap-dis-tab.c ---*/ -#line 1 "./asn1/xnap/packet-xnap-dis-tab.c" dissector_add_uint("xnap.ies", id_ActivatedServedCells, create_dissector_handle(dissect_ActivatedServedCells_PDU, proto_xnap)); dissector_add_uint("xnap.ies", id_ActivationIDforCellActivation, create_dissector_handle(dissect_ActivationIDforCellActivation_PDU, proto_xnap)); dissector_add_uint("xnap.ies", id_admittedSplitSRB, create_dissector_handle(dissect_SplitSRBsTypes_PDU, proto_xnap)); @@ -36330,7 +36288,4 @@ proto_reg_handoff_xnap(void) dissector_add_uint("xnap.proc.imsg", id_retrieveUEContextConfirm, create_dissector_handle(dissect_RetrieveUEContextConfirm_PDU, proto_xnap)); dissector_add_uint("xnap.proc.imsg", id_cPCCancel, create_dissector_handle(dissect_CPCCancel_PDU, proto_xnap)); - -/*--- End of included file: packet-xnap-dis-tab.c ---*/ -#line 570 "./asn1/xnap/packet-xnap-template.c" } diff --git a/epan/dissectors/packet-xnap.h b/epan/dissectors/packet-xnap.h index 7065ba6788..db9e953ad1 100644 --- a/epan/dissectors/packet-xnap.h +++ b/epan/dissectors/packet-xnap.h @@ -3,9 +3,6 @@ /* packet-xnap.h */ /* asn2wrs.py -L -p xnap -c ./xnap.cnf -s ./packet-xnap-template -D . -O ../.. XnAP-CommonDataTypes.asn XnAP-Constants.asn XnAP-Containers.asn XnAP-IEs.asn XnAP-PDU-Contents.asn XnAP-PDU-Descriptions.asn */ -/* Input file: packet-xnap-template.h */ - -#line 1 "./asn1/xnap/packet-xnap-template.h" /* packet-xnap.h * Routines for dissecting NG-RAN Xn application protocol (XnAP) * @@ -19,14 +16,8 @@ #ifndef PACKET_XnAP_H #define PACKET_XnAP_H - -/*--- Included file: packet-xnap-exp.h ---*/ -#line 1 "./asn1/xnap/packet-xnap-exp.h" int dissect_xnap_IntendedTDD_DL_ULConfiguration_NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); -/*--- End of included file: packet-xnap-exp.h ---*/ -#line 15 "./asn1/xnap/packet-xnap-template.h" - #endif /* PACKET_XnAP_H */ /* diff --git a/epan/dissectors/packet-z3950.c b/epan/dissectors/packet-z3950.c index 4b0327c780..11cb2e2649 100644 --- a/epan/dissectors/packet-z3950.c +++ b/epan/dissectors/packet-z3950.c @@ -3,9 +3,6 @@ /* packet-z3950.c */ /* asn2wrs.py -b -L -p z3950 -c ./z3950.cnf -s ./packet-z3950-template -D . -O ../.. z3950.asn z3950-oclc.asn z3950-externals.asn */ -/* Input file: packet-z3950-template.c */ - -#line 1 "./asn1/z3950/packet-z3950-template.c" /* packet-z3950.c * Routines for dissection of the NISO Z39.50 Information Retrieval protocol * Also contains a dissector for the MARC Machine Readable Cataloging file @@ -659,9 +656,6 @@ static const value_string z3950_bib1_diagconditions[] = { { 0, NULL} }; - -/*--- Included file: packet-z3950-hf.c ---*/ -#line 1 "./asn1/z3950/packet-z3950-hf.c" static int hf_z3950_OCLC_UserInformation_PDU = -1; /* OCLC_UserInformation */ static int hf_z3950_SutrsRecord_PDU = -1; /* SutrsRecord */ static int hf_z3950_OPACRecord_PDU = -1; /* OPACRecord */ @@ -1509,18 +1503,12 @@ static int hf_z3950_Options_U_level_2Segmentation = -1; static int hf_z3950_Options_U_concurrentOperations = -1; static int hf_z3950_Options_U_namedResultSets = -1; -/*--- End of included file: packet-z3950-hf.c ---*/ -#line 655 "./asn1/z3950/packet-z3950-template.c" - static int hf_z3950_referenceId_printable = -1; static int hf_z3950_general_printable = -1; /* Initialize the subtree pointers */ static int ett_z3950 = -1; - -/*--- Included file: packet-z3950-ett.c ---*/ -#line 1 "./asn1/z3950/packet-z3950-ett.c" static gint ett_z3950_PDU = -1; static gint ett_z3950_InitializeRequest = -1; static gint ett_z3950_T_idAuthentication = -1; @@ -1813,9 +1801,6 @@ static gint ett_z3950_T_databases = -1; static gint ett_z3950_QueryExpression = -1; static gint ett_z3950_T_queryExpression_term = -1; -/*--- End of included file: packet-z3950-ett.c ---*/ -#line 663 "./asn1/z3950/packet-z3950-template.c" - /* MARC variables and forwards */ static int dissect_marc_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * data _U_); @@ -2072,9 +2057,6 @@ dissect_z3950_printable_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U return offset; } - -/*--- Included file: packet-z3950-fn.c ---*/ -#line 1 "./asn1/z3950/packet-z3950-fn.c" /*--- Cyclic dependencies ---*/ /* RPNStructure -> RPNStructure/rpnRpnOp -> RPNStructure */ @@ -8619,9 +8601,6 @@ static int dissect_SearchInfoReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U } -/*--- End of included file: packet-z3950-fn.c ---*/ -#line 921 "./asn1/z3950/packet-z3950-template.c" - static int dissect_z3950(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -8676,9 +8655,6 @@ void proto_register_z3950(void) { /* List of fields */ static hf_register_info hf[] = { - -/*--- Included file: packet-z3950-hfarr.c ---*/ -#line 1 "./asn1/z3950/packet-z3950-hfarr.c" { &hf_z3950_OCLC_UserInformation_PDU, { "OCLC-UserInformation", "z3950.OCLC_UserInformation_element", FT_NONE, BASE_NONE, NULL, 0, @@ -12060,9 +12036,6 @@ void proto_register_z3950(void) { FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, -/*--- End of included file: packet-z3950-hfarr.c ---*/ -#line 977 "./asn1/z3950/packet-z3950-template.c" - { &hf_z3950_referenceId_printable, { "referenceId", "z3950.referenceId.printable", FT_STRING, BASE_NONE, NULL, 0, @@ -12218,9 +12191,6 @@ void proto_register_z3950(void) { &ett_marc_directory_entry, &ett_marc_fields, &ett_marc_field, - -/*--- Included file: packet-z3950-ettarr.c ---*/ -#line 1 "./asn1/z3950/packet-z3950-ettarr.c" &ett_z3950_PDU, &ett_z3950_InitializeRequest, &ett_z3950_T_idAuthentication, @@ -12512,9 +12482,6 @@ void proto_register_z3950(void) { &ett_z3950_T_databases, &ett_z3950_QueryExpression, &ett_z3950_T_queryExpression_term, - -/*--- End of included file: packet-z3950-ettarr.c ---*/ -#line 1134 "./asn1/z3950/packet-z3950-template.c" }; module_t *z3950_module; @@ -12565,9 +12532,6 @@ proto_reg_handoff_z3950(void) dissector_add_uint_with_preference("tcp.port", global_z3950_port, z3950_handle); - -/*--- Included file: packet-z3950-dis-tab.c ---*/ -#line 1 "./asn1/z3950/packet-z3950-dis-tab.c" register_ber_oid_dissector("1.2.840.10003.5.100", dissect_Explain_Record_PDU, proto_z3950, "Explain-record"); register_ber_oid_dissector("1.2.840.10003.5.101", dissect_SutrsRecord_PDU, proto_z3950, "Sutrs-record"); register_ber_oid_dissector("1.2.840.10003.5.102", dissect_OPACRecord_PDU, proto_z3950, "OPAC-record"); @@ -12582,9 +12546,6 @@ proto_reg_handoff_z3950(void) register_ber_oid_dissector("1.2.840.10003.10.1000.17.1", dissect_OCLC_UserInformation_PDU, proto_z3950, "OCLC-UserInfo-1"); -/*--- End of included file: packet-z3950-dis-tab.c ---*/ -#line 1185 "./asn1/z3950/packet-z3950-template.c" - register_ber_oid_dissector(Z3950_RECORDSYNTAX_MARC21_OID, dissect_marc_record, proto_z3950, "MARC21"); oid_add_from_string("Z39.50", "1.2.840.10003"); -- cgit v1.2.3