From a7c5d642d5e123b34143cf4ad623c7ced230f831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Fri, 13 May 2011 08:12:27 +0000 Subject: Regenerate ASN.1 dissectors to update the #line directive. svn path=/trunk/; revision=37118 --- epan/dissectors/packet-HI2Operations.c | 22 +-- epan/dissectors/packet-acp133.c | 26 ++-- epan/dissectors/packet-acp133.h | 2 +- epan/dissectors/packet-acse.c | 56 ++++---- epan/dissectors/packet-acse.h | 6 +- epan/dissectors/packet-ansi_tcap.c | 54 +++---- epan/dissectors/packet-ansi_tcap.h | 2 +- epan/dissectors/packet-camel.c | 38 ++--- epan/dissectors/packet-camel.h | 2 +- epan/dissectors/packet-cdt.c | 36 ++--- epan/dissectors/packet-cdt.h | 6 +- epan/dissectors/packet-charging_ase.c | 24 ++-- epan/dissectors/packet-charging_ase.h | 6 +- epan/dissectors/packet-cmip.c | 94 ++++++------- epan/dissectors/packet-cmip.h | 6 +- epan/dissectors/packet-cmp.c | 32 ++--- epan/dissectors/packet-cmp.h | 6 +- epan/dissectors/packet-cms.c | 56 ++++---- epan/dissectors/packet-cms.h | 6 +- epan/dissectors/packet-crmf.c | 28 ++-- epan/dissectors/packet-crmf.h | 6 +- epan/dissectors/packet-dap.c | 38 ++--- epan/dissectors/packet-dap.h | 6 +- epan/dissectors/packet-disp.c | 40 +++--- epan/dissectors/packet-disp.h | 6 +- epan/dissectors/packet-dop.c | 66 ++++----- epan/dissectors/packet-dop.h | 6 +- epan/dissectors/packet-dsp.c | 26 ++-- epan/dissectors/packet-dsp.h | 6 +- epan/dissectors/packet-ftam.c | 40 +++--- epan/dissectors/packet-ftam.h | 6 +- epan/dissectors/packet-gnm.c | 26 ++-- epan/dissectors/packet-gnm.h | 2 +- epan/dissectors/packet-goose.c | 24 ++-- epan/dissectors/packet-gprscdr.c | 24 ++-- epan/dissectors/packet-gprscdr.h | 6 +- epan/dissectors/packet-gsm_map.c | 116 +++++++-------- epan/dissectors/packet-gsm_map.h | 6 +- epan/dissectors/packet-h225.c | 134 +++++++++--------- epan/dissectors/packet-h225.h | 6 +- epan/dissectors/packet-h235.c | 32 ++--- epan/dissectors/packet-h235.h | 6 +- epan/dissectors/packet-h245.c | 226 +++++++++++++++--------------- epan/dissectors/packet-h245.h | 6 +- epan/dissectors/packet-h282.c | 34 ++--- epan/dissectors/packet-h283.c | 50 +++---- epan/dissectors/packet-h323.c | 22 +-- epan/dissectors/packet-h323.h | 2 +- epan/dissectors/packet-h450-ros.c | 52 +++---- epan/dissectors/packet-h450-ros.h | 6 +- epan/dissectors/packet-h450.c | 42 +++--- epan/dissectors/packet-h460.c | 22 +-- epan/dissectors/packet-h501.c | 26 ++-- epan/dissectors/packet-hnbap.c | 56 ++++---- epan/dissectors/packet-idmp.c | 22 +-- epan/dissectors/packet-idmp.h | 2 +- epan/dissectors/packet-inap.c | 78 +++++------ epan/dissectors/packet-inap.h | 6 +- epan/dissectors/packet-ldap.c | 2 +- epan/dissectors/packet-logotypecertextn.c | 30 ++-- epan/dissectors/packet-logotypecertextn.h | 2 +- epan/dissectors/packet-mms.c | 36 ++--- epan/dissectors/packet-mms.h | 6 +- epan/dissectors/packet-mpeg-audio.c | 22 +-- epan/dissectors/packet-mpeg-pes.c | 22 +-- epan/dissectors/packet-nbap.c | 40 +++--- epan/dissectors/packet-ns_cert_exts.c | 26 ++-- epan/dissectors/packet-ocsp.c | 28 ++-- epan/dissectors/packet-ocsp.h | 2 +- epan/dissectors/packet-p1.c | 184 ++++++++++++------------ epan/dissectors/packet-p1.h | 10 +- epan/dissectors/packet-p22.c | 52 +++---- epan/dissectors/packet-p22.h | 6 +- epan/dissectors/packet-p7.c | 42 +++--- epan/dissectors/packet-p7.h | 6 +- epan/dissectors/packet-p772.c | 36 ++--- epan/dissectors/packet-p772.h | 2 +- epan/dissectors/packet-pcap.c | 30 ++-- epan/dissectors/packet-pkcs1.c | 22 +-- epan/dissectors/packet-pkcs1.h | 6 +- epan/dissectors/packet-pkcs12.c | 56 ++++---- epan/dissectors/packet-pkcs12.h | 2 +- epan/dissectors/packet-pkinit.c | 26 ++-- epan/dissectors/packet-pkinit.h | 6 +- epan/dissectors/packet-pkix1explicit.c | 36 ++--- epan/dissectors/packet-pkix1explicit.h | 6 +- epan/dissectors/packet-pkix1implicit.c | 26 ++-- epan/dissectors/packet-pkix1implicit.h | 6 +- epan/dissectors/packet-pkixac.c | 30 ++-- epan/dissectors/packet-pkixac.h | 2 +- epan/dissectors/packet-pkixproxy.c | 26 ++-- epan/dissectors/packet-pkixproxy.h | 2 +- epan/dissectors/packet-pkixqualified.c | 28 ++-- epan/dissectors/packet-pkixqualified.h | 2 +- epan/dissectors/packet-pkixtsp.c | 26 ++-- epan/dissectors/packet-pkixtsp.h | 2 +- epan/dissectors/packet-pres.c | 34 ++--- epan/dissectors/packet-pres.h | 2 +- epan/dissectors/packet-q932-ros.c | 56 ++++---- epan/dissectors/packet-q932.c | 22 +-- epan/dissectors/packet-q932.h | 6 +- epan/dissectors/packet-ranap.c | 70 ++++----- epan/dissectors/packet-ranap.h | 6 +- epan/dissectors/packet-rnsap.c | 38 ++--- epan/dissectors/packet-ros.c | 50 +++---- epan/dissectors/packet-ros.h | 6 +- epan/dissectors/packet-rrc.c | 204 +++++++++++++-------------- epan/dissectors/packet-rrc.h | 6 +- epan/dissectors/packet-rrlp.c | 30 ++-- epan/dissectors/packet-rua.c | 48 +++---- epan/dissectors/packet-s1ap.c | 74 +++++----- epan/dissectors/packet-s1ap.h | 6 +- epan/dissectors/packet-sabp.c | 38 ++--- epan/dissectors/packet-smrse.c | 24 ++-- epan/dissectors/packet-smrse.h | 2 +- epan/dissectors/packet-spnego.c | 7 +- epan/dissectors/packet-sv.c | 28 ++-- epan/dissectors/packet-sv.h | 2 +- epan/dissectors/packet-t125.c | 26 ++-- epan/dissectors/packet-t125.h | 2 +- epan/dissectors/packet-tcap.c | 54 +++---- epan/dissectors/packet-tcap.h | 6 +- epan/dissectors/packet-ulp.c | 38 ++--- epan/dissectors/packet-wlancertextn.c | 26 ++-- epan/dissectors/packet-wlancertextn.h | 2 +- epan/dissectors/packet-x2ap.c | 44 +++--- epan/dissectors/packet-x509af.c | 36 ++--- epan/dissectors/packet-x509af.h | 6 +- epan/dissectors/packet-x509ce.c | 34 ++--- epan/dissectors/packet-x509ce.h | 6 +- epan/dissectors/packet-x509sat.c | 36 ++--- epan/dissectors/packet-x509sat.h | 6 +- 132 files changed, 1883 insertions(+), 1880 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index e75b64e278..9858ce89a2 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -5,7 +5,7 @@ /* Input file: packet-HI2Operations-template.c */ -#line 1 "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 @@ -51,7 +51,7 @@ int proto_HI2Operations = -1; /*--- Included file: packet-HI2Operations-hf.c ---*/ -#line 1 "packet-HI2Operations-hf.c" +#line 1 "../../asn1/HI2Operations/packet-HI2Operations-hf.c" static int hf_HI2Operations_IRIsContent_PDU = -1; /* IRIsContent */ static int hf_HI2Operations_iRIContent = -1; /* IRIContent */ static int hf_HI2Operations_iRISequence = -1; /* IRISequence */ @@ -368,12 +368,12 @@ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ /*--- End of included file: packet-HI2Operations-hf.c ---*/ -#line 45 "packet-HI2Operations-template.c" +#line 45 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-HI2Operations-ett.c ---*/ -#line 1 "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; @@ -478,11 +478,11 @@ static gint ett_HI2Operations_TETRACGIType = -1; static gint ett_HI2Operations_TSIType = -1; /*--- End of included file: packet-HI2Operations-ett.c ---*/ -#line 48 "packet-HI2Operations-template.c" +#line 48 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /*--- Included file: packet-HI2Operations-fn.c ---*/ -#line 1 "packet-HI2Operations-fn.c" +#line 1 "../../asn1/HI2Operations/packet-HI2Operations-fn.c" static int @@ -3767,7 +3767,7 @@ static void dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-HI2Operations-fn.c ---*/ -#line 50 "packet-HI2Operations-template.c" +#line 50 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /*--- proto_register_HI2Operations ----------------------------------------------*/ @@ -3777,7 +3777,7 @@ void proto_register_HI2Operations(void) { static hf_register_info hf[] = { /*--- Included file: packet-HI2Operations-hfarr.c ---*/ -#line 1 "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, @@ -5036,14 +5036,14 @@ void proto_register_HI2Operations(void) { "SSIType", HFILL }}, /*--- End of included file: packet-HI2Operations-hfarr.c ---*/ -#line 58 "packet-HI2Operations-template.c" +#line 58 "../../asn1/HI2Operations/packet-HI2Operations-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-HI2Operations-ettarr.c ---*/ -#line 1 "packet-HI2Operations-ettarr.c" +#line 1 "../../asn1/HI2Operations/packet-HI2Operations-ettarr.c" &ett_HI2Operations_IRIsContent, &ett_HI2Operations_IRISequence, &ett_HI2Operations_IRIContent, @@ -5148,7 +5148,7 @@ void proto_register_HI2Operations(void) { &ett_HI2Operations_TSIType, /*--- End of included file: packet-HI2Operations-ettarr.c ---*/ -#line 63 "packet-HI2Operations-template.c" +#line 63 "../../asn1/HI2Operations/packet-HI2Operations-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 0649e11172..1f9c7aafef 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -5,7 +5,7 @@ /* Input file: packet-acp133-template.c */ -#line 1 "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 @@ -59,7 +59,7 @@ static int proto_acp133 = -1; /*--- Included file: packet-acp133-hf.c ---*/ -#line 1 "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 */ @@ -140,13 +140,13 @@ 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 53 "packet-acp133-template.c" +#line 53 "../../asn1/acp133/packet-acp133-template.c" /* Initialize the subtree pointers */ static gint ett_acp133 = -1; /*--- Included file: packet-acp133-ett.c ---*/ -#line 1 "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; @@ -168,11 +168,11 @@ static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; /*--- End of included file: packet-acp133-ett.c ---*/ -#line 57 "packet-acp133-template.c" +#line 57 "../../asn1/acp133/packet-acp133-template.c" /*--- Included file: packet-acp133-fn.c ---*/ -#line 1 "packet-acp133-fn.c" +#line 1 "../../asn1/acp133/packet-acp133-fn.c" static const value_string acp133_ACPPreferredDelivery_vals[] = { { 0, "smtp" }, @@ -1016,7 +1016,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-acp133-fn.c ---*/ -#line 59 "packet-acp133-template.c" +#line 59 "../../asn1/acp133/packet-acp133-template.c" /*--- proto_register_acp133 -------------------------------------------*/ @@ -1027,7 +1027,7 @@ void proto_register_acp133(void) { { /*--- Included file: packet-acp133-hfarr.c ---*/ -#line 1 "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, @@ -1338,7 +1338,7 @@ void proto_register_acp133(void) { NULL, HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 68 "packet-acp133-template.c" +#line 68 "../../asn1/acp133/packet-acp133-template.c" }; /* List of subtrees */ @@ -1346,7 +1346,7 @@ void proto_register_acp133(void) { &ett_acp133, /*--- Included file: packet-acp133-ettarr.c ---*/ -#line 1 "packet-acp133-ettarr.c" +#line 1 "../../asn1/acp133/packet-acp133-ettarr.c" &ett_acp133_OnSupported, &ett_acp133_Addressees, &ett_acp133_MonthlyUKMs, @@ -1368,7 +1368,7 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_ExtendedContentType, /*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 74 "packet-acp133-template.c" +#line 74 "../../asn1/acp133/packet-acp133-template.c" }; /* Register protocol */ @@ -1386,7 +1386,7 @@ void proto_reg_handoff_acp133(void) { /*--- Included file: packet-acp133-dis-tab.c ---*/ -#line 1 "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"); @@ -1429,7 +1429,7 @@ void proto_reg_handoff_acp133(void) { /*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 90 "packet-acp133-template.c" +#line 90 "../../asn1/acp133/packet-acp133-template.c" /* X.402 Object Classes */ oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); diff --git a/epan/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h index 3f9577b21e..e5a207c407 100644 --- a/epan/dissectors/packet-acp133.h +++ b/epan/dissectors/packet-acp133.h @@ -5,7 +5,7 @@ /* Input file: packet-acp133-template.h */ -#line 1 "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 5491e4bd76..e6d610da7a 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -5,7 +5,7 @@ /* Input file: packet-acse-template.c */ -#line 1 "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 { @@ -80,7 +80,7 @@ int proto_clacse = -1; /*--- Included file: packet-acse-hf.c ---*/ -#line 1 "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 */ @@ -191,13 +191,13 @@ 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 74 "packet-acse-template.c" +#line 74 "../../asn1/acse/packet-acse-template.c" /* Initialize the subtree pointers */ static gint ett_acse = -1; /*--- Included file: packet-acse-ett.c ---*/ -#line 1 "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; @@ -235,7 +235,7 @@ static gint ett_acse_Authentication_value_other = -1; static gint ett_acse_Authentication_value = -1; /*--- End of included file: packet-acse-ett.c ---*/ -#line 78 "packet-acse-template.c" +#line 78 "../../asn1/acse/packet-acse-template.c" static struct SESSION_DATA_STRUCTURE* session = NULL; @@ -313,7 +313,7 @@ find_oid_by_ctx_id(packet_info *pinfo _U_, guint32 idx) /*--- Included file: packet-acse-fn.c ---*/ -#line 1 "packet-acse-fn.c" +#line 1 "../../asn1/acse/packet-acse-fn.c" static int @@ -327,7 +327,7 @@ dissect_acse_T_direct_reference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_acse_T_indirect_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_) { -#line 71 "acse.cnf" +#line 71 "../../asn1/acse/acse.cnf" char *oid; offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_acse_indirect_reference, @@ -361,7 +361,7 @@ dissect_acse_ObjectDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 88 "acse.cnf" +#line 88 "../../asn1/acse/acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree); @@ -373,7 +373,7 @@ dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_acse_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 91 "acse.cnf" +#line 91 "../../asn1/acse/acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree); @@ -471,7 +471,7 @@ dissect_acse_ASO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_acse_T_AARQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 55 "acse.cnf" +#line 55 "../../asn1/acse/acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -679,7 +679,7 @@ dissect_acse_T_other_mechanism_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_acse_T_other_mechanism_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 49 "acse.cnf" +#line 49 "../../asn1/acse/acse.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree); @@ -959,7 +959,7 @@ dissect_acse_AARQ_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 94 "acse.cnf" +#line 94 "../../asn1/acse/acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -990,7 +990,7 @@ dissect_acse_T_AARE_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_acse_T_AARE_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 59 "acse.cnf" +#line 59 "../../asn1/acse/acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1191,7 +1191,7 @@ dissect_acse_AARE_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_AARE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 99 "acse.cnf" +#line 99 "../../asn1/acse/acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1214,7 +1214,7 @@ static const value_string acse_Release_request_reason_vals[] = { static int dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 112 "acse.cnf" +#line 112 "../../asn1/acse/acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1250,7 +1250,7 @@ dissect_acse_RLRQ_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_RLRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 104 "acse.cnf" +#line 104 "../../asn1/acse/acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1273,7 +1273,7 @@ static const value_string acse_Release_response_reason_vals[] = { static int dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 128 "acse.cnf" +#line 128 "../../asn1/acse/acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1309,7 +1309,7 @@ dissect_acse_RLRE_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_RLRE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 120 "acse.cnf" +#line 120 "../../asn1/acse/acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1331,7 +1331,7 @@ static const value_string acse_ABRT_source_vals[] = { static int dissect_acse_ABRT_source(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 141 "acse.cnf" +#line 141 "../../asn1/acse/acse.cnf" int source = -1; offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset, @@ -1388,7 +1388,7 @@ dissect_acse_ABRT_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_ABRT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 136 "acse.cnf" +#line 136 "../../asn1/acse/acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1423,7 +1423,7 @@ dissect_acse_Simply_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_acse_T_simple_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 52 "acse.cnf" +#line 52 "../../asn1/acse/acse.cnf" /*XXX not implemented yet */ @@ -1535,7 +1535,7 @@ dissect_acse_A_DT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_acse_T_ACRQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 63 "acse.cnf" +#line 63 "../../asn1/acse/acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1577,7 +1577,7 @@ dissect_acse_ACRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_acse_T_ACRP_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 67 "acse.cnf" +#line 67 "../../asn1/acse/acse.cnf" offset = dissect_ber_object_identifier_str(FALSE, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1690,7 +1690,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ /*--- End of included file: packet-acse-fn.c ---*/ -#line 154 "packet-acse-template.c" +#line 154 "../../asn1/acse/packet-acse-template.c" /* @@ -1810,7 +1810,7 @@ void proto_register_acse(void) { static hf_register_info hf[] = { /*--- Included file: packet-acse-hfarr.c ---*/ -#line 1 "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, @@ -2241,7 +2241,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 272 "packet-acse-template.c" +#line 272 "../../asn1/acse/packet-acse-template.c" }; /* List of subtrees */ @@ -2249,7 +2249,7 @@ void proto_register_acse(void) { &ett_acse, /*--- Included file: packet-acse-ettarr.c ---*/ -#line 1 "packet-acse-ettarr.c" +#line 1 "../../asn1/acse/packet-acse-ettarr.c" &ett_acse_EXTERNALt_U, &ett_acse_T_encoding, &ett_acse_ACSE_apdu, @@ -2287,7 +2287,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 278 "packet-acse-template.c" +#line 278 "../../asn1/acse/packet-acse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h index 0509918d71..d055517e5e 100644 --- a/epan/dissectors/packet-acse.h +++ b/epan/dissectors/packet-acse.h @@ -5,7 +5,7 @@ /* Input file: packet-acse-template.h */ -#line 1 "packet-acse-template.h" +#line 1 "../../asn1/acse/packet-acse-template.h" /* packet-acse.h * Routines for ACSE packet dissection * Ronnie Sahlberg 2005 @@ -36,7 +36,7 @@ /*--- Included file: packet-acse-exp.h ---*/ -#line 1 "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[]; @@ -49,7 +49,7 @@ int dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *t 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 30 "packet-acse-template.h" +#line 30 "../../asn1/acse/packet-acse-template.h" #endif /* PACKET_ACSE_H */ diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 232e231fab..14b33a8992 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -5,7 +5,7 @@ /* Input file: packet-ansi_tcap-template.c */ -#line 1 "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 @@ -69,7 +69,7 @@ static int hf_ansi_tcapsrt_SessionTime = -1; /*--- Included file: packet-ansi_tcap-hf.c ---*/ -#line 1 "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 */ @@ -123,7 +123,7 @@ 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 63 "packet-ansi_tcap-template.c" +#line 63 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -140,7 +140,7 @@ static struct tcaphash_context_t * gp_tcap_context=NULL; /*--- Included file: packet-ansi_tcap-ett.c ---*/ -#line 1 "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; @@ -165,7 +165,7 @@ 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 78 "packet-ansi_tcap-template.c" +#line 78 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" #define MAX_SSN 254 @@ -423,7 +423,7 @@ find_tcap_subdissector(tvbuff_t *tvb, asn1_ctx_t *actx, proto_tree *tree){ /*--- Included file: packet-ansi_tcap-fn.c ---*/ -#line 1 "packet-ansi_tcap-fn.c" +#line 1 "../../asn1/ansi_tcap/packet-ansi_tcap-fn.c" static int @@ -463,7 +463,7 @@ dissect_ansi_tcap_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in OperationCode_choice, hf_index, ett_ansi_tcap_OperationCode, &ansi_tcap_private.d.OperationCode); -#line 17 "ansi_tcap.cnf" +#line 17 "../../asn1/ansi_tcap/ansi_tcap.cnf" ansi_tcap_private.d.OperationCode_item = actx->created_item; return offset; @@ -515,7 +515,7 @@ dissect_ansi_tcap_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_ansi_tcap_TransactionID_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 90 "ansi_tcap.cnf" +#line 90 "../../asn1/ansi_tcap/ansi_tcap.cnf" tvbuff_t *next_tvb; guint8 len; @@ -614,7 +614,7 @@ dissect_ansi_tcap_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_ansi_tcap_ObjectIDApplicationContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 54 "ansi_tcap.cnf" +#line 54 "../../asn1/ansi_tcap/ansi_tcap.cnf" static const char * oid_str; @@ -783,7 +783,7 @@ dissect_ansi_tcap_T_componentIDs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_ansi_tcap_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 23 "ansi_tcap.cnf" +#line 23 "../../asn1/ansi_tcap/ansi_tcap.cnf" if(find_tcap_subdissector(tvb, actx, tree)) offset = tvb_length(tvb); @@ -804,7 +804,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_ansi_tcap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 29 "ansi_tcap.cnf" +#line 29 "../../asn1/ansi_tcap/ansi_tcap.cnf" ansi_tcap_private.d.pdu = 1; @@ -829,7 +829,7 @@ dissect_ansi_tcap_T_componentID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_ansi_tcap_T_parameter_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 36 "ansi_tcap.cnf" +#line 36 "../../asn1/ansi_tcap/ansi_tcap.cnf" if(find_tcap_subdissector(tvb, actx, tree)) offset = tvb_length(tvb); @@ -847,7 +847,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_ansi_tcap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 40 "ansi_tcap.cnf" +#line 40 "../../asn1/ansi_tcap/ansi_tcap.cnf" ansi_tcap_private.d.pdu = 2; @@ -873,7 +873,7 @@ dissect_ansi_tcap_T_componentID_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_ansi_tcap_T_parameter_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 46 "ansi_tcap.cnf" +#line 46 "../../asn1/ansi_tcap/ansi_tcap.cnf" if(find_tcap_subdissector(tvb, actx, tree)) offset = tvb_length(tvb); @@ -892,7 +892,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_ansi_tcap_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 50 "ansi_tcap.cnf" +#line 50 "../../asn1/ansi_tcap/ansi_tcap.cnf" ansi_tcap_private.d.pdu = 3; @@ -1085,7 +1085,7 @@ dissect_ansi_tcap_UniTransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_ansi_tcap_T_unidirectional(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 62 "ansi_tcap.cnf" +#line 62 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; col_set_str(actx->pinfo->cinfo, COL_INFO, "unidirectional "); @@ -1115,7 +1115,7 @@ dissect_ansi_tcap_TransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_ansi_tcap_T_queryWithPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 66 "ansi_tcap.cnf" +#line 66 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; col_set_str(actx->pinfo->cinfo, COL_INFO, "queryWithPerm "); @@ -1129,7 +1129,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO, "queryWithPerm "); static int dissect_ansi_tcap_T_queryWithoutPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 70 "ansi_tcap.cnf" +#line 70 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; col_set_str(actx->pinfo->cinfo, COL_INFO, "queryWithoutPerm "); @@ -1143,7 +1143,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO, "queryWithoutPerm "); static int dissect_ansi_tcap_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 74 "ansi_tcap.cnf" +#line 74 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; col_set_str(actx->pinfo->cinfo, COL_INFO, "response "); @@ -1157,7 +1157,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO, "response "); static int dissect_ansi_tcap_T_conversationWithPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 78 "ansi_tcap.cnf" +#line 78 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; col_set_str(actx->pinfo->cinfo, COL_INFO, "conversationWithPerm "); @@ -1171,7 +1171,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO, "conversationWithPerm "); static int dissect_ansi_tcap_T_conversationWithoutPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 82 "ansi_tcap.cnf" +#line 82 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; col_set_str(actx->pinfo->cinfo, COL_INFO, "conversationWithoutPerm "); @@ -1267,7 +1267,7 @@ dissect_ansi_tcap_Abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_ansi_tcap_T_abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 86 "ansi_tcap.cnf" +#line 86 "../../asn1/ansi_tcap/ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ABORT; col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort "); @@ -1311,7 +1311,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int /*--- End of included file: packet-ansi_tcap-fn.c ---*/ -#line 334 "packet-ansi_tcap-template.c" +#line 334 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" @@ -1433,7 +1433,7 @@ proto_register_ansi_tcap(void) }, /*--- Included file: packet-ansi_tcap-hfarr.c ---*/ -#line 1 "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, @@ -1640,7 +1640,7 @@ proto_register_ansi_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-ansi_tcap-hfarr.c ---*/ -#line 454 "packet-ansi_tcap-template.c" +#line 454 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" }; /* Setup protocol subtree array */ @@ -1652,7 +1652,7 @@ proto_register_ansi_tcap(void) &ett_ansi_tcap_stat, /*--- Included file: packet-ansi_tcap-ettarr.c ---*/ -#line 1 "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, @@ -1677,7 +1677,7 @@ proto_register_ansi_tcap(void) &ett_ansi_tcap_T_paramSet, /*--- End of included file: packet-ansi_tcap-ettarr.c ---*/ -#line 464 "packet-ansi_tcap-template.c" +#line 464 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" }; static enum_val_t ansi_tcap_response_matching_type_values[] = { diff --git a/epan/dissectors/packet-ansi_tcap.h b/epan/dissectors/packet-ansi_tcap.h index 27e3880681..2d024cd5a0 100644 --- a/epan/dissectors/packet-ansi_tcap.h +++ b/epan/dissectors/packet-ansi_tcap.h @@ -5,7 +5,7 @@ /* Input file: packet-ansi_tcap-template.h */ -#line 1 "packet-ansi_tcap-template.h" +#line 1 "../../asn1/ansi_tcap/packet-ansi_tcap-template.h" /* packet-ansi_tcap.h * * $Id$ diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 0f2a083030..d85e2daf04 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -5,7 +5,7 @@ /* Input file: packet-camel-template.c */ -#line 1 "packet-camel-template.c" +#line 1 "../../asn1/camel/packet-camel-template.c" /* packet-camel-template.c * Routines for Camel * Copyright 2004, Tim Endean @@ -117,7 +117,7 @@ int hf_camelsrt_DeltaTime80=-1; /*--- Included file: packet-camel-hf.c ---*/ -#line 1 "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 */ @@ -591,7 +591,7 @@ 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 111 "packet-camel-template.c" +#line 111 "../../asn1/camel/packet-camel-template.c" static struct camelsrt_info_t * gp_camelsrt_info; @@ -618,7 +618,7 @@ static guint ett_camel_calledpartybcdnumber = -1; /*--- Included file: packet-camel-ett.c ---*/ -#line 1 "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; @@ -807,7 +807,7 @@ static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 136 "packet-camel-template.c" +#line 136 "../../asn1/camel/packet-camel-template.c" /* Preference settings default */ @@ -943,7 +943,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = { /*--- Included file: packet-camel-val.h ---*/ -#line 1 "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" @@ -1126,11 +1126,11 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define noInvokeId NULL /*--- End of included file: packet-camel-val.h ---*/ -#line 270 "packet-camel-template.c" +#line 270 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table.c ---*/ -#line 1 "packet-camel-table.c" +#line 1 "../../asn1/camel/packet-camel-table.c" /* CAMEL OPERATIONS */ const value_string camel_opr_code_strings[] = { @@ -1216,7 +1216,7 @@ static const value_string camel_err_code_string_vals[] = { /*--- End of included file: packet-camel-table.c ---*/ -#line 272 "packet-camel-template.c" +#line 272 "../../asn1/camel/packet-camel-template.c" static char camel_number_to_char(int number) { @@ -1263,7 +1263,7 @@ dissect_RP_cause_ie(tvbuff_t *tvb, guint32 offset, _U_ guint len, /*--- Included file: packet-camel-fn.c ---*/ -#line 1 "packet-camel-fn.c" +#line 1 "../../asn1/camel/packet-camel-fn.c" static int @@ -6807,11 +6807,11 @@ static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-camel-fn.c ---*/ -#line 317 "packet-camel-template.c" +#line 317 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table2.c ---*/ -#line 1 "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) { proto_item *cause; @@ -7018,7 +7018,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-camel-table2.c ---*/ -#line 319 "packet-camel-template.c" +#line 319 "../../asn1/camel/packet-camel-template.c" static guint8 camel_pdu_type = 0; @@ -7135,13 +7135,13 @@ void proto_reg_handoff_camel(void) { /*--- Included file: packet-camel-dis-tab.c ---*/ -#line 1 "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 434 "packet-camel-template.c" +#line 434 "../../asn1/camel/packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -7316,7 +7316,7 @@ void proto_register_camel(void) { #endif /*--- Included file: packet-camel-hfarr.c ---*/ -#line 1 "packet-camel-hfarr.c" +#line 1 "../../asn1/camel/packet-camel-hfarr.c" { &hf_camel_PAR_cancelFailed_PDU, { "PAR-cancelFailed", "camel.PAR_cancelFailed", FT_NONE, BASE_NONE, NULL, 0, @@ -9203,7 +9203,7 @@ void proto_register_camel(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 607 "packet-camel-template.c" +#line 607 "../../asn1/camel/packet-camel-template.c" }; /* List of subtrees */ @@ -9219,7 +9219,7 @@ void proto_register_camel(void) { /*--- Included file: packet-camel-ettarr.c ---*/ -#line 1 "packet-camel-ettarr.c" +#line 1 "../../asn1/camel/packet-camel-ettarr.c" &ett_camel_AChChargingAddress, &ett_camel_AOCBeforeAnswer, &ett_camel_AOCGPRS, @@ -9408,7 +9408,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 621 "packet-camel-template.c" +#line 621 "../../asn1/camel/packet-camel-template.c" }; /* Register protocol */ proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME); diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index e1ce089d59..e3ac21f059 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -5,7 +5,7 @@ /* Input file: packet-camel-template.h */ -#line 1 "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-cdt.c b/epan/dissectors/packet-cdt.c index c94c530106..56d01b3d76 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -5,7 +5,7 @@ /* Input file: packet-cdt-template.c */ -#line 1 "packet-cdt-template.c" +#line 1 "../../asn1/cdt/packet-cdt-template.c" /* packet-cdt.c * * Routines for Compressed Data Type packet dissection. @@ -68,7 +68,7 @@ static guint32 content_type = 0; static int proto_cdt = -1; /*--- Included file: packet-cdt-hf.c ---*/ -#line 1 "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 */ @@ -80,25 +80,25 @@ 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 62 "packet-cdt-template.c" +#line 62 "../../asn1/cdt/packet-cdt-template.c" static dissector_handle_t data_handle = NULL; /* Initialize the subtree pointers */ /*--- Included file: packet-cdt-ett.c ---*/ -#line 1 "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 67 "packet-cdt-template.c" +#line 67 "../../asn1/cdt/packet-cdt-template.c" /*--- Included file: packet-cdt-fn.c ---*/ -#line 1 "packet-cdt-fn.c" +#line 1 "../../asn1/cdt/packet-cdt-fn.c" static const value_string cdt_AlgorithmID_ShortForm_vals[] = { { 0, "zlibCompress" }, @@ -108,7 +108,7 @@ static const value_string cdt_AlgorithmID_ShortForm_vals[] = { static int dissect_cdt_AlgorithmID_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 21 "cdt.cnf" +#line 21 "../../asn1/cdt/cdt.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -171,7 +171,7 @@ static const value_string cdt_ContentType_ShortForm_vals[] = { static int dissect_cdt_ContentType_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 36 "cdt.cnf" +#line 36 "../../asn1/cdt/cdt.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &content_type); @@ -193,7 +193,7 @@ dissect_cdt_ContentType_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_cdt_T_contentType_OID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 50 "cdt.cnf" +#line 50 "../../asn1/cdt/cdt.cnf" const char *obj_id = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &obj_id); @@ -241,7 +241,7 @@ dissect_cdt_T_contentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "cdt.cnf" +#line 69 "../../asn1/cdt/cdt.cnf" tvbuff_t *next_tvb = NULL, *compr_tvb = NULL; proto_item *tf = NULL; int save_offset = offset; @@ -317,7 +317,7 @@ static const ber_sequence_t CompressedData_sequence[] = { 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_) { -#line 13 "cdt.cnf" +#line 13 "../../asn1/cdt/cdt.cnf" content_type = 0; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -339,7 +339,7 @@ static void dissect_CompressedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-cdt-fn.c ---*/ -#line 69 "packet-cdt-template.c" +#line 69 "../../asn1/cdt/packet-cdt-template.c" /*--- proto_register_cdt -------------------------------------------*/ @@ -371,7 +371,7 @@ void proto_register_cdt (void) { static hf_register_info hf[] = { /*--- Included file: packet-cdt-hfarr.c ---*/ -#line 1 "packet-cdt-hfarr.c" +#line 1 "../../asn1/cdt/packet-cdt-hfarr.c" { &hf_cdt_CompressedData_PDU, { "CompressedData", "cdt.CompressedData", FT_NONE, BASE_NONE, NULL, 0, @@ -410,21 +410,21 @@ void proto_register_cdt (void) { NULL, HFILL }}, /*--- End of included file: packet-cdt-hfarr.c ---*/ -#line 99 "packet-cdt-template.c" +#line 99 "../../asn1/cdt/packet-cdt-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-cdt-ettarr.c ---*/ -#line 1 "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 104 "packet-cdt-template.c" +#line 104 "../../asn1/cdt/packet-cdt-template.c" }; /* Register protocol */ @@ -441,12 +441,12 @@ void proto_register_cdt (void) { void proto_reg_handoff_cdt (void) { /*--- Included file: packet-cdt-dis-tab.c ---*/ -#line 1 "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 119 "packet-cdt-template.c" +#line 119 "../../asn1/cdt/packet-cdt-template.c" data_handle = find_dissector ("data"); } diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h index 2e47d1dd5b..060de3efc7 100644 --- a/epan/dissectors/packet-cdt.h +++ b/epan/dissectors/packet-cdt.h @@ -5,7 +5,7 @@ /* Input file: packet-cdt-template.h */ -#line 1 "packet-cdt-template.h" +#line 1 "../../asn1/cdt/packet-cdt-template.h" /* packet-cdt.h * * Routines for Compressed Data Type packet dissection. @@ -39,11 +39,11 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); /*--- Included file: packet-cdt-exp.h ---*/ -#line 1 "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 33 "packet-cdt-template.h" +#line 33 "../../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 6a4aa28264..81d755cdc2 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -5,7 +5,7 @@ /* Input file: packet-charging_ase-template.c */ -#line 1 "packet-charging_ase-template.c" +#line 1 "../../asn1/charging_ase/packet-charging_ase-template.c" /* packet-charging_ase-template.c * Copyright 2009 , Anders Broman * @@ -51,7 +51,7 @@ static int proto_charging_ase = -1; /*--- Included file: packet-charging_ase-hf.c ---*/ -#line 1 "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 */ @@ -116,12 +116,12 @@ 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 45 "packet-charging_ase-template.c" +#line 45 "../../asn1/charging_ase/packet-charging_ase-template.c" static int ett_charging_ase = -1; /*--- Included file: packet-charging_ase-ett.c ---*/ -#line 1 "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; @@ -154,13 +154,13 @@ 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 48 "packet-charging_ase-template.c" +#line 48 "../../asn1/charging_ase/packet-charging_ase-template.c" static dissector_handle_t charging_ase_handle; /*--- Included file: packet-charging_ase-fn.c ---*/ -#line 1 "packet-charging_ase-fn.c" +#line 1 "../../asn1/charging_ase/packet-charging_ase-fn.c" static const asn_namedbit ChargingControlIndicators_bits[] = { { 0, &hf_charging_ase_ChargingControlIndicators_subscriberCharge, -1, -1, "subscriberCharge", NULL }, @@ -533,7 +533,7 @@ dissect_charging_ase_CriticalityType(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_charging_ase_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 14 "charging_ase.cnf" +#line 14 "../../asn1/charging_ase/charging_ase.cnf" proto_tree_add_text(tree, tvb, offset, -1, "Extensions not dissected"); return tvb_length(tvb); @@ -840,7 +840,7 @@ int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-charging_ase-fn.c ---*/ -#line 52 "packet-charging_ase-template.c" +#line 52 "../../asn1/charging_ase/packet-charging_ase-template.c" static void dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -865,7 +865,7 @@ proto_register_charging_ase(void) static hf_register_info hf[] = { /*--- Included file: packet-charging_ase-hfarr.c ---*/ -#line 1 "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, @@ -1112,7 +1112,7 @@ proto_register_charging_ase(void) NULL, HFILL }}, /*--- End of included file: packet-charging_ase-hfarr.c ---*/ -#line 75 "packet-charging_ase-template.c" +#line 75 "../../asn1/charging_ase/packet-charging_ase-template.c" }; /* List of subtrees */ @@ -1120,7 +1120,7 @@ proto_register_charging_ase(void) &ett_charging_ase, /*--- Included file: packet-charging_ase-ettarr.c ---*/ -#line 1 "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, @@ -1153,7 +1153,7 @@ proto_register_charging_ase(void) &ett_charging_ase_ChargingReferenceIdentification, /*--- End of included file: packet-charging_ase-ettarr.c ---*/ -#line 81 "packet-charging_ase-template.c" +#line 81 "../../asn1/charging_ase/packet-charging_ase-template.c" }; proto_charging_ase = proto_register_protocol(PNAME, PSNAME, PFNAME); diff --git a/epan/dissectors/packet-charging_ase.h b/epan/dissectors/packet-charging_ase.h index 3425785a31..59121aea88 100644 --- a/epan/dissectors/packet-charging_ase.h +++ b/epan/dissectors/packet-charging_ase.h @@ -5,7 +5,7 @@ /* Input file: packet-charging_ase-template.h */ -#line 1 "packet-charging_ase-template.h" +#line 1 "../../asn1/charging_ase/packet-charging_ase-template.h" /* packet-charging_ase-template.h * Copyright 2009, Anders Broman * @@ -35,12 +35,12 @@ /*--- Included file: packet-charging_ase-exp.h ---*/ -#line 1 "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_); /*--- End of included file: packet-charging_ase-exp.h ---*/ -#line 29 "packet-charging_ase-template.h" +#line 29 "../../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 527522b258..b2d7608e00 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -5,7 +5,7 @@ /* Input file: packet-cmip-template.c */ -#line 1 "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 @@ -65,7 +65,7 @@ static int hf_NameBinding = -1; static int hf_ObjectClass = -1; /*--- Included file: packet-cmip-hf.c ---*/ -#line 1 "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 */ @@ -344,13 +344,13 @@ 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 59 "packet-cmip-template.c" +#line 59 "../../asn1/cmip/packet-cmip-template.c" /* Initialize the subtree pointers */ static gint ett_cmip = -1; /*--- Included file: packet-cmip-ett.c ---*/ -#line 1 "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; @@ -474,7 +474,7 @@ static gint ett_cmip_T_modificationList = -1; static gint ett_cmip_T_modificationList_item = -1; /*--- End of included file: packet-cmip-ett.c ---*/ -#line 63 "packet-cmip-template.c" +#line 63 "../../asn1/cmip/packet-cmip-template.c" static guint32 opcode; @@ -483,7 +483,7 @@ static dissector_table_t attribute_id_dissector_table; /*--- Included file: packet-cmip-table.c ---*/ -#line 1 "packet-cmip-table.c" +#line 1 "../../asn1/cmip/packet-cmip-table.c" /* CMIP OPERATIONS */ static const value_string cmip_Opcode_vals[] = { @@ -533,7 +533,7 @@ static const value_string cmip_error_code_vals[] = { /*--- End of included file: packet-cmip-table.c ---*/ -#line 70 "packet-cmip-template.c" +#line 70 "../../asn1/cmip/packet-cmip-template.c" static int opcode_type; #define OPCODE_INVOKE 1 @@ -558,7 +558,7 @@ static const char *objectclass_identifier_id; /*--- Included file: packet-cmip-val.h ---*/ -#line 1 "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" @@ -645,10 +645,10 @@ static const char *objectclass_identifier_id; #define noInvokeId NULL /*--- End of included file: packet-cmip-val.h ---*/ -#line 93 "packet-cmip-template.c" +#line 93 "../../asn1/cmip/packet-cmip-template.c" /*--- Included file: packet-cmip-fn.c ---*/ -#line 1 "packet-cmip-fn.c" +#line 1 "../../asn1/cmip/packet-cmip-fn.c" /*--- Cyclic dependencies ---*/ /* CMISFilter -> CMISFilter/and -> CMISFilter */ @@ -660,7 +660,7 @@ static int dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_cmip_T_attributeId_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 266 "cmip.cnf" +#line 266 "../../asn1/cmip/cmip.cnf" attributeform = ATTRIBUTE_GLOBAL_FORM; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &attribute_identifier_id); @@ -674,7 +674,7 @@ dissect_cmip_T_attributeId_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_cmip_T_attributeIdlocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 270 "cmip.cnf" +#line 270 "../../asn1/cmip/cmip.cnf" attributeform = ATTRIBUTE_LOCAL_FORM; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &attribute_local_id); @@ -733,7 +733,7 @@ dissect_cmip_AccessControl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_cmip_T_objectClass_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 430 "cmip.cnf" +#line 430 "../../asn1/cmip/cmip.cnf" objectclassform = OBJECTCLASS_GLOBAL_FORM; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &objectclass_identifier_id); @@ -745,7 +745,7 @@ dissect_cmip_T_objectClass_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_cmip_T_objectClasslocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 435 "cmip.cnf" +#line 435 "../../asn1/cmip/cmip.cnf" objectclassform = OBJECTCLASS_LOCAL_FORM; @@ -790,7 +790,7 @@ dissect_cmip_T_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_cmip_T_attributeValueAssertionvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 286 "cmip.cnf" +#line 286 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, actx->pinfo, tree); @@ -953,7 +953,7 @@ dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_cmip_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 274 "cmip.cnf" +#line 274 "../../asn1/cmip/cmip.cnf" if(attributeform==ATTRIBUTE_GLOBAL_FORM){ offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree); } else if (dissector_try_uint(attribute_id_dissector_table, attribute_local_id, tvb, actx->pinfo, tree)) { @@ -1127,7 +1127,7 @@ dissect_cmip_ActionTypeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_T_actionInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 441 "cmip.cnf" +#line 441 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1284,7 +1284,7 @@ dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cmip_T_eventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 471 "cmip.cnf" +#line 471 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1389,7 +1389,7 @@ dissect_cmip_ActionError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_cmip_T_actionReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 474 "cmip.cnf" +#line 474 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1471,7 +1471,7 @@ dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cmip_T_attributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 468 "cmip.cnf" +#line 468 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1699,7 +1699,7 @@ dissect_cmip_DeleteResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_T_eventReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 450 "cmip.cnf" +#line 450 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1726,7 +1726,7 @@ dissect_cmip_EventReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmip_EventReportArgumentEventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 447 "cmip.cnf" +#line 447 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1993,7 +1993,7 @@ dissect_cmip_T_errorId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmip_T_errorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 465 "cmip.cnf" +#line 465 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2102,7 +2102,7 @@ dissect_cmip_NoSuchEventType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_cmip_T_attributevalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 453 "cmip.cnf" +#line 453 "../../asn1/cmip/cmip.cnf" if(attributeform==ATTRIBUTE_GLOBAL_FORM){ offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree); } else if (dissector_try_uint(attribute_id_dissector_table, attribute_local_id, tvb, actx->pinfo, tree)) { @@ -2175,7 +2175,7 @@ static const value_string cmip_CMIPAbortSource_vals[] = { static int dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 230 "cmip.cnf" +#line 230 "../../asn1/cmip/cmip.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2205,7 +2205,7 @@ static const ber_sequence_t CMIPAbortInfo_sequence[] = { int dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 222 "cmip.cnf" +#line 222 "../../asn1/cmip/cmip.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT"); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2260,7 +2260,7 @@ static const ber_sequence_t CMIPUserInfo_sequence[] = { int dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 226 "cmip.cnf" +#line 226 "../../asn1/cmip/cmip.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE"); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2346,7 +2346,7 @@ dissect_cmip_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_cmip_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 481 "cmip.cnf" +#line 481 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2443,7 +2443,7 @@ dissect_cmip_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_cmip_T_oldAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 484 "cmip.cnf" +#line 484 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2455,7 +2455,7 @@ dissect_cmip_T_oldAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_cmip_T_newAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 487 "cmip.cnf" +#line 487 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3231,7 +3231,7 @@ dissect_cmip_T_serviceUseridentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_cmip_T_details(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 492 "cmip.cnf" +#line 492 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3354,7 +3354,7 @@ dissect_cmip_T_featureIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_cmip_T_featureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 497 "cmip.cnf" +#line 497 "../../asn1/cmip/cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3604,7 +3604,7 @@ dissect_cmip_WeekMask(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_cmip_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_) { -#line 237 "cmip.cnf" +#line 237 "../../asn1/cmip/cmip.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &opcode); @@ -3685,7 +3685,7 @@ dissect_cmip_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmip_InvokeArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 289 "cmip.cnf" +#line 289 "../../asn1/cmip/cmip.cnf" switch(opcode){ case 0: /* M-eventreport */ offset = dissect_cmip_EventReportArgument(FALSE, tvb, offset, actx, tree, -1); @@ -3739,7 +3739,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 246 "cmip.cnf" +#line 246 "../../asn1/cmip/cmip.cnf" opcode_type=OPCODE_INVOKE; col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Invoke "); @@ -3753,7 +3753,7 @@ dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_cmip_ResultArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 327 "cmip.cnf" +#line 327 "../../asn1/cmip/cmip.cnf" switch(opcode){ case 0: /* M-eventreport*/ @@ -3816,7 +3816,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 251 "cmip.cnf" +#line 251 "../../asn1/cmip/cmip.cnf" opcode_type=OPCODE_RETURN_RESULT; col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnResult "); @@ -3830,7 +3830,7 @@ dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 361 "cmip.cnf" +#line 361 "../../asn1/cmip/cmip.cnf" switch(opcode){ case 19: /* classInstanceConflict */ @@ -3914,7 +3914,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_cmip_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 256 "cmip.cnf" +#line 256 "../../asn1/cmip/cmip.cnf" opcode_type=OPCODE_RETURN_ERROR; col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnError "); @@ -4034,7 +4034,7 @@ static const ber_sequence_t Reject_sequence[] = { static int dissect_cmip_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 261 "cmip.cnf" +#line 261 "../../asn1/cmip/cmip.cnf" opcode_type=OPCODE_REJECT; col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Reject "); @@ -4380,7 +4380,7 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-cmip-fn.c ---*/ -#line 94 "packet-cmip-template.c" +#line 94 "../../asn1/cmip/packet-cmip-template.c" @@ -4476,7 +4476,7 @@ void proto_register_cmip(void) { /*--- Included file: packet-cmip-hfarr.c ---*/ -#line 1 "packet-cmip-hfarr.c" +#line 1 "../../asn1/cmip/packet-cmip-hfarr.c" { &hf_cmip_BaseManagedObjectId_PDU, { "BaseManagedObjectId", "cmip.BaseManagedObjectId", FT_NONE, BASE_NONE, NULL, 0, @@ -5579,7 +5579,7 @@ void proto_register_cmip(void) { NULL, HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 188 "packet-cmip-template.c" +#line 188 "../../asn1/cmip/packet-cmip-template.c" }; /* List of subtrees */ @@ -5587,7 +5587,7 @@ void proto_register_cmip(void) { &ett_cmip, /*--- Included file: packet-cmip-ettarr.c ---*/ -#line 1 "packet-cmip-ettarr.c" +#line 1 "../../asn1/cmip/packet-cmip-ettarr.c" &ett_cmip_PAR_missingAttributeValue, &ett_cmip_ActionArgument, &ett_cmip_ActionError, @@ -5711,7 +5711,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 194 "packet-cmip-template.c" +#line 194 "../../asn1/cmip/packet-cmip-template.c" }; /* Register protocol */ @@ -5722,7 +5722,7 @@ void proto_register_cmip(void) { proto_register_subtree_array(ett, array_length(ett)); /*--- Included file: packet-cmip-dis-tab.c ---*/ -#line 1 "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)"); @@ -5796,7 +5796,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 203 "packet-cmip-template.c" +#line 203 "../../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", FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index 68918745c6..dbd1b93c98 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -5,7 +5,7 @@ /* Input file: packet-cmip-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-cmip-exp.h ---*/ -#line 1 "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[]; @@ -57,7 +57,7 @@ int dissect_cmip_ProbableCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int 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 30 "packet-cmip-template.h" +#line 30 "../../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 c9a2233b04..d4ec9fdbec 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -5,7 +5,7 @@ /* Input file: packet-cmp-template.c */ -#line 1 "packet-cmp-template.c" +#line 1 "../../asn1/cmp/packet-cmp-template.c" /* packet-cmp.c * * Routines for RFC2510 Certificate Management Protocol packet dissection @@ -78,7 +78,7 @@ static int hf_cmp_tcptrans10_version = -1; static int hf_cmp_tcptrans10_flags = -1; /*--- Included file: packet-cmp-hf.c ---*/ -#line 1 "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 */ @@ -239,13 +239,13 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 72 "packet-cmp-template.c" +#line 72 "../../asn1/cmp/packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; /*--- Included file: packet-cmp-ett.c ---*/ -#line 1 "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; @@ -295,14 +295,14 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 76 "packet-cmp-template.c" +#line 76 "../../asn1/cmp/packet-cmp-template.c" static const char *object_identifier_id; /*--- Included file: packet-cmp-fn.c ---*/ -#line 1 "packet-cmp-fn.c" +#line 1 "../../asn1/cmp/packet-cmp-fn.c" /*--- Cyclic dependencies ---*/ /* PKIMessage -> PKIBody -> NestedMessageContent -> PKIMessages -> PKIMessage */ @@ -401,7 +401,7 @@ dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmp_T_infoValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 90 "cmp.cnf" +#line 90 "../../asn1/cmp/cmp.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -500,7 +500,7 @@ const value_string cmp_PKIStatus_vals[] = { int dissect_cmp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 106 "cmp.cnf" +#line 106 "../../asn1/cmp/cmp.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1097,7 +1097,7 @@ static const ber_choice_t PKIBody_choice[] = { int dissect_cmp_PKIBody(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 96 "cmp.cnf" +#line 96 "../../asn1/cmp/cmp.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1459,7 +1459,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-cmp-fn.c ---*/ -#line 81 "packet-cmp-template.c" +#line 81 "../../asn1/cmp/packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx) @@ -1718,7 +1718,7 @@ void proto_register_cmp(void) { "TCP transport flags", HFILL }}, /*--- Included file: packet-cmp-hfarr.c ---*/ -#line 1 "packet-cmp-hfarr.c" +#line 1 "../../asn1/cmp/packet-cmp-hfarr.c" { &hf_cmp_PBMParameter_PDU, { "PBMParameter", "cmp.PBMParameter", FT_NONE, BASE_NONE, NULL, 0, @@ -2349,7 +2349,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 338 "packet-cmp-template.c" +#line 338 "../../asn1/cmp/packet-cmp-template.c" }; /* List of subtrees */ @@ -2357,7 +2357,7 @@ void proto_register_cmp(void) { &ett_cmp, /*--- Included file: packet-cmp-ettarr.c ---*/ -#line 1 "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, @@ -2407,7 +2407,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 344 "packet-cmp-template.c" +#line 344 "../../asn1/cmp/packet-cmp-template.c" }; module_t *cmp_module; @@ -2481,7 +2481,7 @@ void proto_reg_handoff_cmp(void) { /*--- Included file: packet-cmp-dis-tab.c ---*/ -#line 1 "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"); @@ -2501,7 +2501,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 416 "packet-cmp-template.c" +#line 416 "../../asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index c4e48730c4..60ffde9c12 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -5,7 +5,7 @@ /* Input file: packet-cmp-template.h */ -#line 1 "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 @@ -38,7 +38,7 @@ void proto_reg_handoff_cmp(void); /*--- Included file: packet-cmp-exp.h ---*/ -#line 1 "packet-cmp-exp.h" +#line 1 "../../asn1/cmp/packet-cmp-exp.h" extern const value_string cmp_CMPCertificate_vals[]; extern const value_string cmp_PKIBody_vals[]; extern const value_string cmp_PKIStatus_vals[]; @@ -83,7 +83,7 @@ int dissect_cmp_PollReqContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int int dissect_cmp_PollRepContent(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 32 "packet-cmp-template.h" +#line 32 "../../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 2a31aca42a..47d20cab8f 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -5,7 +5,7 @@ /* Input file: packet-cms-template.c */ -#line 1 "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 @@ -63,7 +63,7 @@ static int proto_cms = -1; static int hf_cms_ci_contentType = -1; /*--- Included file: packet-cms-hf.c ---*/ -#line 1 "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 */ @@ -189,12 +189,12 @@ static int hf_cms_issuerUniqueID = -1; /* UniqueIdentifier */ static int hf_cms_extensions = -1; /* Extensions */ /*--- End of included file: packet-cms-hf.c ---*/ -#line 57 "packet-cms-template.c" +#line 57 "../../asn1/cms/packet-cms-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-cms-ett.c ---*/ -#line 1 "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; @@ -251,7 +251,7 @@ static gint ett_cms_T_subject = -1; static gint ett_cms_SEQUENCE_OF_Attribute = -1; /*--- End of included file: packet-cms-ett.c ---*/ -#line 60 "packet-cms-template.c" +#line 60 "../../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 */ @@ -331,12 +331,12 @@ cms_verify_msg_digest(proto_item *pi, tvbuff_t *content, const char *alg, tvbuff /*--- Included file: packet-cms-fn.c ---*/ -#line 1 "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_) { -#line 87 "cms.cnf" +#line 87 "../../asn1/cms/cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -356,7 +356,7 @@ dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 97 "cms.cnf" +#line 97 "../../asn1/cms/cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -374,7 +374,7 @@ static const ber_sequence_t ContentInfo_sequence[] = { 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_) { -#line 78 "cms.cnf" +#line 78 "../../asn1/cms/cms.cnf" top_tree = tree; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ContentInfo_sequence, hf_index, ett_cms_ContentInfo); @@ -433,7 +433,7 @@ dissect_cms_DigestAlgorithmIdentifiers(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 101 "cms.cnf" +#line 101 "../../asn1/cms/cms.cnf" offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &content_tvb); proto_item_set_text(actx->created_item, "eContent (%u bytes)", tvb_length (content_tvb)); @@ -464,7 +464,7 @@ dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 128 "cms.cnf" +#line 128 "../../asn1/cms/cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id); @@ -484,7 +484,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 138 "cms.cnf" +#line 138 "../../asn1/cms/cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -746,7 +746,7 @@ dissect_cms_T_otherRevInfoFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_cms_T_otherRevInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 122 "cms.cnf" +#line 122 "../../asn1/cms/cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1083,7 +1083,7 @@ dissect_cms_T_keyAttrId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 117 "cms.cnf" +#line 117 "../../asn1/cms/cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1271,7 +1271,7 @@ dissect_cms_T_oriType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_cms_T_oriValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 111 "cms.cnf" +#line 111 "../../asn1/cms/cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1348,14 +1348,14 @@ dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbu static int dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 188 "cms.cnf" +#line 188 "../../asn1/cms/cms.cnf" tvbuff_t *encrypted_tvb; proto_item *item; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &encrypted_tvb); -#line 193 "cms.cnf" +#line 193 "../../asn1/cms/cms.cnf" item = actx->created_item; @@ -1513,7 +1513,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 142 "cms.cnf" +#line 142 "../../asn1/cms/cms.cnf" proto_item *pi; int old_offset = offset; @@ -1588,7 +1588,7 @@ dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 178 "cms.cnf" +#line 178 "../../asn1/cms/cms.cnf" guint32 length = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1641,7 +1641,7 @@ dissect_cms_RC2CBCParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 160 "cms.cnf" +#line 160 "../../asn1/cms/cms.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id); @@ -1662,7 +1662,7 @@ dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_cms_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 171 "cms.cnf" +#line 171 "../../asn1/cms/cms.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1825,7 +1825,7 @@ static void dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-cms-fn.c ---*/ -#line 138 "packet-cms-template.c" +#line 138 "../../asn1/cms/packet-cms-template.c" /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -1838,7 +1838,7 @@ void proto_register_cms(void) { NULL, HFILL }}, /*--- Included file: packet-cms-hfarr.c ---*/ -#line 1 "packet-cms-hfarr.c" +#line 1 "../../asn1/cms/packet-cms-hfarr.c" { &hf_cms_ContentInfo_PDU, { "ContentInfo", "cms.ContentInfo", FT_NONE, BASE_NONE, NULL, 0, @@ -2333,14 +2333,14 @@ void proto_register_cms(void) { NULL, HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ -#line 149 "packet-cms-template.c" +#line 149 "../../asn1/cms/packet-cms-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-cms-ettarr.c ---*/ -#line 1 "packet-cms-ettarr.c" +#line 1 "../../asn1/cms/packet-cms-ettarr.c" &ett_cms_ContentInfo, &ett_cms_SignedData, &ett_cms_DigestAlgorithmIdentifiers, @@ -2397,7 +2397,7 @@ void proto_register_cms(void) { &ett_cms_SEQUENCE_OF_Attribute, /*--- End of included file: packet-cms-ettarr.c ---*/ -#line 154 "packet-cms-template.c" +#line 154 "../../asn1/cms/packet-cms-template.c" }; /* Register protocol */ @@ -2421,7 +2421,7 @@ void proto_register_cms(void) { void proto_reg_handoff_cms(void) { /*--- Included file: packet-cms-dis-tab.c ---*/ -#line 1 "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"); @@ -2442,7 +2442,7 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 176 "packet-cms-template.c" +#line 176 "../../asn1/cms/packet-cms-template.c" oid_add_from_string("id-data","1.2.840.113549.1.7.1"); oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7"); diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index 33fc2400b7..88c98ae102 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -5,7 +5,7 @@ /* Input file: packet-cms-template.h */ -#line 1 "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 @@ -37,7 +37,7 @@ /*--- Included file: packet-cms-exp.h ---*/ -#line 1 "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_); @@ -57,7 +57,7 @@ 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_); /*--- End of included file: packet-cms-exp.h ---*/ -#line 31 "packet-cms-template.h" +#line 31 "../../asn1/cms/packet-cms-template.h" #endif /* PACKET_CMS_H */ diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 8adafc334e..5f5060f82e 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -5,7 +5,7 @@ /* Input file: packet-crmf-template.c */ -#line 1 "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 @@ -55,7 +55,7 @@ static int proto_crmf = -1; static int hf_crmf_type_oid = -1; /*--- Included file: packet-crmf-hf.c ---*/ -#line 1 "packet-crmf-hf.c" +#line 1 "../../asn1/crmf/packet-crmf-hf.c" static int hf_crmf_CertRequest_PDU = -1; /* CertRequest */ static int hf_crmf_PBMParameter_PDU = -1; /* PBMParameter */ static int hf_crmf_RegToken_PDU = -1; /* RegToken */ @@ -138,12 +138,12 @@ static int hf_crmf_attributes = -1; /* Attributes */ static int hf_crmf_Attributes_item = -1; /* Attribute */ /*--- End of included file: packet-crmf-hf.c ---*/ -#line 49 "packet-crmf-template.c" +#line 49 "../../asn1/crmf/packet-crmf-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-crmf-ett.c ---*/ -#line 1 "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; @@ -172,13 +172,13 @@ static gint ett_crmf_PrivateKeyInfo = -1; static gint ett_crmf_Attributes = -1; /*--- End of included file: packet-crmf-ett.c ---*/ -#line 52 "packet-crmf-template.c" +#line 52 "../../asn1/crmf/packet-crmf-template.c" static const char *object_identifier_id; /*--- Included file: packet-crmf-fn.c ---*/ -#line 1 "packet-crmf-fn.c" +#line 1 "../../asn1/crmf/packet-crmf-fn.c" static int @@ -240,7 +240,7 @@ dissect_crmf_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_crmf_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 74 "crmf.cnf" +#line 74 "../../asn1/crmf/crmf.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -888,7 +888,7 @@ static void dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-crmf-fn.c ---*/ -#line 56 "packet-crmf-template.c" +#line 56 "../../asn1/crmf/packet-crmf-template.c" /*--- proto_register_crmf ----------------------------------------------*/ @@ -902,7 +902,7 @@ void proto_register_crmf(void) { "Type of AttributeTypeAndValue", HFILL }}, /*--- Included file: packet-crmf-hfarr.c ---*/ -#line 1 "packet-crmf-hfarr.c" +#line 1 "../../asn1/crmf/packet-crmf-hfarr.c" { &hf_crmf_CertRequest_PDU, { "CertRequest", "crmf.CertRequest", FT_NONE, BASE_NONE, NULL, 0, @@ -1225,14 +1225,14 @@ void proto_register_crmf(void) { NULL, HFILL }}, /*--- End of included file: packet-crmf-hfarr.c ---*/ -#line 68 "packet-crmf-template.c" +#line 68 "../../asn1/crmf/packet-crmf-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-crmf-ettarr.c ---*/ -#line 1 "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, @@ -1261,7 +1261,7 @@ void proto_register_crmf(void) { &ett_crmf_Attributes, /*--- End of included file: packet-crmf-ettarr.c ---*/ -#line 73 "packet-crmf-template.c" +#line 73 "../../asn1/crmf/packet-crmf-template.c" }; /* Register protocol */ @@ -1281,7 +1281,7 @@ void proto_reg_handoff_crmf(void) { oid_add_from_string("id-regInfo","1.3.6.1.5.5.7.5.2"); /*--- Included file: packet-crmf-dis-tab.c ---*/ -#line 1 "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"); @@ -1295,6 +1295,6 @@ void proto_reg_handoff_crmf(void) { /*--- End of included file: packet-crmf-dis-tab.c ---*/ -#line 91 "packet-crmf-template.c" +#line 91 "../../asn1/crmf/packet-crmf-template.c" } diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h index 9eba6b7a8f..eeccce19c4 100644 --- a/epan/dissectors/packet-crmf.h +++ b/epan/dissectors/packet-crmf.h @@ -5,7 +5,7 @@ /* Input file: packet-crmf-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-crmf-exp.h ---*/ -#line 1 "packet-crmf-exp.h" +#line 1 "../../asn1/crmf/packet-crmf-exp.h" extern const value_string crmf_ProofOfPossession_vals[]; extern const value_string crmf_POPOPrivKey_vals[]; extern const value_string crmf_SubsequentMessage_vals[]; @@ -74,7 +74,7 @@ int dissect_crmf_PrivateKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in int dissect_crmf_Attributes(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 30 "packet-crmf-template.h" +#line 30 "../../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 c040e91bc3..d7de1ed842 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -5,7 +5,7 @@ /* Input file: packet-dap-template.c */ -#line 1 "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 @@ -73,7 +73,7 @@ static int proto_dap = -1; /*--- Included file: packet-dap-hf.c ---*/ -#line 1 "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 */ @@ -481,13 +481,13 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 67 "packet-dap-template.c" +#line 67 "../../asn1/dap/packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; /*--- Included file: packet-dap-ett.c ---*/ -#line 1 "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; @@ -660,11 +660,11 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 71 "packet-dap-template.c" +#line 71 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-val.h ---*/ -#line 1 "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 @@ -685,11 +685,11 @@ static gint ett_dap_T_signedUpdateError = -1; #define id_errcode_dsaReferral 9 /*--- End of included file: packet-dap-val.h ---*/ -#line 73 "packet-dap-template.c" +#line 73 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table.c ---*/ -#line 1 "packet-dap-table.c" +#line 1 "../../asn1/dap/packet-dap-table.c" /* DAP OPERATIONS */ const value_string dap_opr_code_string_vals[] = { @@ -723,11 +723,11 @@ static const value_string dap_err_code_string_vals[] = { /*--- End of included file: packet-dap-table.c ---*/ -#line 75 "packet-dap-template.c" +#line 75 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ -#line 1 "packet-dap-fn.c" +#line 1 "../../asn1/dap/packet-dap-fn.c" /*--- Cyclic dependencies ---*/ /* FamilyEntries -> FamilyEntries/familyEntries -> FamilyEntry -> FamilyEntry/family-info -> FamilyEntries */ @@ -4778,11 +4778,11 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-dap-fn.c ---*/ -#line 77 "packet-dap-template.c" +#line 77 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table11.c ---*/ -#line 1 "packet-dap-table11.c" +#line 1 "../../asn1/dap/packet-dap-table11.c" static const ros_opr_t dap_opr_tab[] = { /* directoryBind */ @@ -4810,10 +4810,10 @@ static const ros_opr_t dap_opr_tab[] = { /*--- End of included file: packet-dap-table11.c ---*/ -#line 79 "packet-dap-template.c" +#line 79 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table21.c ---*/ -#line 1 "packet-dap-table21.c" +#line 1 "../../asn1/dap/packet-dap-table21.c" static const ros_err_t dap_err_tab[] = { /* directoryBindError*/ @@ -4839,7 +4839,7 @@ static const ros_err_t dap_err_tab[] = { /*--- End of included file: packet-dap-table21.c ---*/ -#line 80 "packet-dap-template.c" +#line 80 "../../asn1/dap/packet-dap-template.c" static const ros_info_t dap_ros_info = { "DAP", @@ -4860,7 +4860,7 @@ void proto_register_dap(void) { { /*--- Included file: packet-dap-hfarr.c ---*/ -#line 1 "packet-dap-hfarr.c" +#line 1 "../../asn1/dap/packet-dap-hfarr.c" { &hf_dap_DirectoryBindArgument_PDU, { "DirectoryBindArgument", "dap.DirectoryBindArgument", FT_NONE, BASE_NONE, NULL, 0, @@ -6479,7 +6479,7 @@ void proto_register_dap(void) { NULL, HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 99 "packet-dap-template.c" +#line 99 "../../asn1/dap/packet-dap-template.c" }; /* List of subtrees */ @@ -6487,7 +6487,7 @@ void proto_register_dap(void) { &ett_dap, /*--- Included file: packet-dap-ettarr.c ---*/ -#line 1 "packet-dap-ettarr.c" +#line 1 "../../asn1/dap/packet-dap-ettarr.c" &ett_dap_ServiceControls, &ett_dap_T_manageDSAITPlaneRef, &ett_dap_ServiceControlOptions, @@ -6660,7 +6660,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 105 "packet-dap-template.c" +#line 105 "../../asn1/dap/packet-dap-template.c" }; module_t *dap_module; diff --git a/epan/dissectors/packet-dap.h b/epan/dissectors/packet-dap.h index dbc1e105e7..6255815216 100644 --- a/epan/dissectors/packet-dap.h +++ b/epan/dissectors/packet-dap.h @@ -5,7 +5,7 @@ /* Input file: packet-dap-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-dap-exp.h ---*/ -#line 1 "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[]; @@ -108,6 +108,6 @@ int dissect_dap_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o 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 30 "packet-dap-template.h" +#line 30 "../../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 264cb67a87..9c3d8c895d 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -5,7 +5,7 @@ /* Input file: packet-disp-template.c */ -#line 1 "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 @@ -75,7 +75,7 @@ static struct SESSION_DATA_STRUCTURE* session = NULL; /*--- Included file: packet-disp-hf.c ---*/ -#line 1 "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 */ @@ -185,13 +185,13 @@ static int hf_disp_signedShadowError = -1; /* T_signedShadowError */ static int hf_disp_shadowError = -1; /* ShadowErrorData */ /*--- End of included file: packet-disp-hf.c ---*/ -#line 69 "packet-disp-template.c" +#line 69 "../../asn1/disp/packet-disp-template.c" /* Initialize the subtree pointers */ static gint ett_disp = -1; /*--- Included file: packet-disp-ett.c ---*/ -#line 1 "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; @@ -248,11 +248,11 @@ static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; /*--- End of included file: packet-disp-ett.c ---*/ -#line 73 "packet-disp-template.c" +#line 73 "../../asn1/disp/packet-disp-template.c" /*--- Included file: packet-disp-fn.c ---*/ -#line 1 "packet-disp-fn.c" +#line 1 "../../asn1/disp/packet-disp-fn.c" /*--- Cyclic dependencies ---*/ /* Subtree -> Subtree/subtree -> Subtree */ @@ -658,7 +658,7 @@ static const value_string disp_StandardUpdate_vals[] = { static int dissect_disp_StandardUpdate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 58 "disp.cnf" +#line 58 "../../asn1/disp/disp.cnf" guint32 update; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -854,7 +854,7 @@ static const ber_choice_t CoordinateShadowUpdateResult_choice[] = { static int dissect_disp_CoordinateShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 68 "disp.cnf" +#line 68 "../../asn1/disp/disp.cnf" guint32 update; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -879,7 +879,7 @@ static const value_string disp_T_standard_vals[] = { static int dissect_disp_T_standard(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 38 "disp.cnf" +#line 38 "../../asn1/disp/disp.cnf" guint32 update; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -985,7 +985,7 @@ static const ber_choice_t RequestShadowUpdateResult_choice[] = { static int dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 78 "disp.cnf" +#line 78 "../../asn1/disp/disp.cnf" guint32 update; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1287,7 +1287,7 @@ static const ber_choice_t RefreshInformation_choice[] = { static int dissect_disp_RefreshInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 48 "disp.cnf" +#line 48 "../../asn1/disp/disp.cnf" guint32 update; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1373,7 +1373,7 @@ static const ber_choice_t UpdateShadowResult_choice[] = { static int dissect_disp_UpdateShadowResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 88 "disp.cnf" +#line 88 "../../asn1/disp/disp.cnf" guint32 update; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1407,7 +1407,7 @@ static const value_string disp_ShadowProblem_vals[] = { static int dissect_disp_ShadowProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 98 "disp.cnf" +#line 98 "../../asn1/disp/disp.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1498,7 +1498,7 @@ static void dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-disp-fn.c ---*/ -#line 75 "packet-disp-template.c" +#line 75 "../../asn1/disp/packet-disp-template.c" /* * Dissect DISP PDUs inside a ROS PDUs @@ -1628,7 +1628,7 @@ void proto_register_disp(void) { { /*--- Included file: packet-disp-hfarr.c ---*/ -#line 1 "packet-disp-hfarr.c" +#line 1 "../../asn1/disp/packet-disp-hfarr.c" { &hf_disp_EstablishParameter_PDU, { "EstablishParameter", "disp.EstablishParameter", FT_NONE, BASE_NONE, NULL, 0, @@ -2059,7 +2059,7 @@ void proto_register_disp(void) { "ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 203 "packet-disp-template.c" +#line 203 "../../asn1/disp/packet-disp-template.c" }; /* List of subtrees */ @@ -2067,7 +2067,7 @@ void proto_register_disp(void) { &ett_disp, /*--- Included file: packet-disp-ettarr.c ---*/ -#line 1 "packet-disp-ettarr.c" +#line 1 "../../asn1/disp/packet-disp-ettarr.c" &ett_disp_ModificationParameter, &ett_disp_SET_OF_SupplierAndConsumers, &ett_disp_ShadowingAgreementInfo, @@ -2124,7 +2124,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 209 "packet-disp-template.c" +#line 209 "../../asn1/disp/packet-disp-template.c" }; module_t *disp_module; @@ -2154,7 +2154,7 @@ void proto_reg_handoff_disp(void) { /*--- Included file: packet-disp-dis-tab.c ---*/ -#line 1 "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)); @@ -2163,7 +2163,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 237 "packet-disp-template.c" +#line 237 "../../asn1/disp/packet-disp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-disp.h b/epan/dissectors/packet-disp.h index 436f5509c5..29c7e3c993 100644 --- a/epan/dissectors/packet-disp.h +++ b/epan/dissectors/packet-disp.h @@ -5,7 +5,7 @@ /* Input file: packet-disp-template.h */ -#line 1 "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 @@ -36,10 +36,10 @@ /*--- Included file: packet-disp-exp.h ---*/ -#line 1 "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 30 "packet-disp-template.h" +#line 30 "../../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 74ff3a6721..7429b9037b 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -5,7 +5,7 @@ /* Input file: packet-dop-template.c */ -#line 1 "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 @@ -74,7 +74,7 @@ static int call_dop_oid_callback(char *base_string, tvbuff_t *tvb, int offset, p /*--- Included file: packet-dop-hf.c ---*/ -#line 1 "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 */ @@ -268,14 +268,14 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; /*--- End of included file: packet-dop-hf.c ---*/ -#line 68 "packet-dop-template.c" +#line 68 "../../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 "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; @@ -345,7 +345,7 @@ static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; /*--- End of included file: packet-dop-ett.c ---*/ -#line 73 "packet-dop-template.c" +#line 73 "../../asn1/dop/packet-dop-template.c" /* Dissector table */ static dissector_table_t dop_dissector_table; @@ -360,7 +360,7 @@ static void append_oid(packet_info *pinfo, const char *oid) /*--- Included file: packet-dop-fn.c ---*/ -#line 1 "packet-dop-fn.c" +#line 1 "../../asn1/dop/packet-dop-fn.c" static const asn_namedbit DSEType_bits[] = { { 0, &hf_dop_DSEType_root, -1, -1, "root", NULL }, @@ -411,7 +411,7 @@ dissect_dop_SET_OF_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_dop_T_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_) { -#line 172 "dop.cnf" +#line 172 "../../asn1/dop/dop.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -431,7 +431,7 @@ dissect_dop_T_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_dop_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 181 "dop.cnf" +#line 181 "../../asn1/dop/dop.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -577,7 +577,7 @@ static int dissect_dop_BindingType(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &binding_type); -#line 103 "dop.cnf" +#line 103 "../../asn1/dop/dop.cnf" append_oid(actx->pinfo, binding_type); return offset; @@ -587,7 +587,7 @@ dissect_dop_BindingType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_dop_EstablishSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 107 "dop.cnf" +#line 107 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -600,7 +600,7 @@ dissect_dop_EstablishSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_dop_EstablishRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 111 "dop.cnf" +#line 111 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("establish.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -613,7 +613,7 @@ dissect_dop_EstablishRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dop_EstablishRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 115 "dop.cnf" +#line 115 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("establish.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -650,7 +650,7 @@ dissect_dop_EstablishArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_dop_T_agreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 143 "dop.cnf" +#line 143 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -840,7 +840,7 @@ dissect_dop_EstablishOperationalBindingArgument(gboolean implicit_tag _U_, tvbuf static int dissect_dop_T_symmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 147 "dop.cnf" +#line 147 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -853,7 +853,7 @@ dissect_dop_T_symmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_dop_T_roleA_replies(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 151 "dop.cnf" +#line 151 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("establish.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -866,7 +866,7 @@ dissect_dop_T_roleA_replies(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_dop_T_roleB_replies(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 155 "dop.cnf" +#line 155 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("establish.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -937,7 +937,7 @@ dissect_dop_EstablishOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_ static int dissect_dop_ModifySymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 119 "dop.cnf" +#line 119 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("modify.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -950,7 +950,7 @@ dissect_dop_ModifySymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_dop_ModifyRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 123 "dop.cnf" +#line 123 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("modify.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -963,7 +963,7 @@ dissect_dop_ModifyRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_dop_ModifyRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 127 "dop.cnf" +#line 127 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("modify.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -1000,7 +1000,7 @@ dissect_dop_ModifyArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dop_ArgumentNewAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 167 "dop.cnf" +#line 167 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -1073,7 +1073,7 @@ dissect_dop_ModifyOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t static int dissect_dop_ResultNewAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 163 "dop.cnf" +#line 163 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -1145,7 +1145,7 @@ dissect_dop_ModifyOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_t * static int dissect_dop_TerminateSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 131 "dop.cnf" +#line 131 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("terminate.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -1158,7 +1158,7 @@ dissect_dop_TerminateSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_dop_TerminateRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 135 "dop.cnf" +#line 135 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("terminate.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -1171,7 +1171,7 @@ dissect_dop_TerminateRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dop_TerminateRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 139 "dop.cnf" +#line 139 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("terminate.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -1347,7 +1347,7 @@ dissect_dop_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_dop_T_agreementProposal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 159 "dop.cnf" +#line 159 "../../asn1/dop/dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -1559,7 +1559,7 @@ dissect_dop_NHOBSubordinateToSuperior(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_dop_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 190 "dop.cnf" +#line 190 "../../asn1/dop/dop.cnf" guint32 precedence = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2044,7 +2044,7 @@ static void dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-dop-fn.c ---*/ -#line 86 "packet-dop-template.c" +#line 86 "../../asn1/dop/packet-dop-template.c" static int call_dop_oid_callback(char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *col_info) @@ -2201,7 +2201,7 @@ void proto_register_dop(void) { { /*--- Included file: packet-dop-hfarr.c ---*/ -#line 1 "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, @@ -2964,7 +2964,7 @@ void proto_register_dop(void) { NULL, HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 241 "packet-dop-template.c" +#line 241 "../../asn1/dop/packet-dop-template.c" }; /* List of subtrees */ @@ -2973,7 +2973,7 @@ void proto_register_dop(void) { &ett_dop_unknown, /*--- Included file: packet-dop-ettarr.c ---*/ -#line 1 "packet-dop-ettarr.c" +#line 1 "../../asn1/dop/packet-dop-ettarr.c" &ett_dop_DSEType, &ett_dop_SupplierOrConsumer, &ett_dop_SET_OF_ProtocolInformation, @@ -3043,7 +3043,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 248 "packet-dop-template.c" +#line 248 "../../asn1/dop/packet-dop-template.c" }; module_t *dop_module; @@ -3078,7 +3078,7 @@ void proto_reg_handoff_dop(void) { /*--- Included file: packet-dop-dis-tab.c ---*/ -#line 1 "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"); @@ -3099,7 +3099,7 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 281 "packet-dop-template.c" +#line 281 "../../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 416df3e56b..605bbe7f30 100644 --- a/epan/dissectors/packet-dop.h +++ b/epan/dissectors/packet-dop.h @@ -5,7 +5,7 @@ /* Input file: packet-dop-template.h */ -#line 1 "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 @@ -36,12 +36,12 @@ /*--- Included file: packet-dop-exp.h ---*/ -#line 1 "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 30 "packet-dop-template.h" +#line 30 "../../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 3ca515735e..cfd00e701d 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -5,7 +5,7 @@ /* Input file: packet-dsp-template.c */ -#line 1 "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 @@ -69,7 +69,7 @@ static struct SESSION_DATA_STRUCTURE* session = NULL; /*--- Included file: packet-dsp-hf.c ---*/ -#line 1 "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 */ @@ -209,13 +209,13 @@ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ /*--- End of included file: packet-dsp-hf.c ---*/ -#line 63 "packet-dsp-template.c" +#line 63 "../../asn1/dsp/packet-dsp-template.c" /* Initialize the subtree pointers */ static gint ett_dsp = -1; /*--- Included file: packet-dsp-ett.c ---*/ -#line 1 "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; @@ -289,11 +289,11 @@ static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; /*--- End of included file: packet-dsp-ett.c ---*/ -#line 67 "packet-dsp-template.c" +#line 67 "../../asn1/dsp/packet-dsp-template.c" /*--- Included file: packet-dsp-fn.c ---*/ -#line 1 "packet-dsp-fn.c" +#line 1 "../../asn1/dsp/packet-dsp-fn.c" static int @@ -1787,7 +1787,7 @@ static void dissect_DitBridgeKnowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-dsp-fn.c ---*/ -#line 69 "packet-dsp-template.c" +#line 69 "../../asn1/dsp/packet-dsp-template.c" /* * Dissect X518 PDUs inside a ROS PDUs @@ -1994,7 +1994,7 @@ void proto_register_dsp(void) { { /*--- Included file: packet-dsp-hfarr.c ---*/ -#line 1 "packet-dsp-hfarr.c" +#line 1 "../../asn1/dsp/packet-dsp-hfarr.c" { &hf_dsp_AccessPoint_PDU, { "AccessPoint", "dsp.AccessPoint", FT_NONE, BASE_NONE, NULL, 0, @@ -2545,7 +2545,7 @@ void proto_register_dsp(void) { "EXTERNAL", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 274 "packet-dsp-template.c" +#line 274 "../../asn1/dsp/packet-dsp-template.c" }; /* List of subtrees */ @@ -2553,7 +2553,7 @@ void proto_register_dsp(void) { &ett_dsp, /*--- Included file: packet-dsp-ettarr.c ---*/ -#line 1 "packet-dsp-ettarr.c" +#line 1 "../../asn1/dsp/packet-dsp-ettarr.c" &ett_dsp_ChainedReadArgumentData, &ett_dsp_ChainedReadArgument, &ett_dsp_T_signedChainedReadArgument, @@ -2627,7 +2627,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 280 "packet-dsp-template.c" +#line 280 "../../asn1/dsp/packet-dsp-template.c" }; module_t *dsp_module; @@ -2659,7 +2659,7 @@ void proto_reg_handoff_dsp(void) { /*--- Included file: packet-dsp-dis-tab.c ---*/ -#line 1 "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"); @@ -2668,7 +2668,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 310 "packet-dsp-template.c" +#line 310 "../../asn1/dsp/packet-dsp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-dsp.h b/epan/dissectors/packet-dsp.h index 0c1a97dce4..9ae7b21653 100644 --- a/epan/dissectors/packet-dsp.h +++ b/epan/dissectors/packet-dsp.h @@ -5,7 +5,7 @@ /* Input file: packet-dsp-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-dsp-exp.h ---*/ -#line 1 "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_); @@ -47,6 +47,6 @@ int dissect_dsp_Exclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off 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 30 "packet-dsp-template.h" +#line 30 "../../asn1/dsp/packet-dsp-template.h" #endif /* PACKET_DSP_H */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 39e3fade9a..cc24b22a8c 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -5,7 +5,7 @@ /* Input file: packet-ftam-template.c */ -#line 1 "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/ @@ -64,7 +64,7 @@ static int hf_ftam_unstructured_text = -1; /* ISO FTAM unstructured static int hf_ftam_unstructured_binary = -1; /* ISO FTAM unstructured binary */ /*--- Included file: packet-ftam-hf.c ---*/ -#line 1 "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 */ @@ -482,13 +482,13 @@ static int hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS = -1; static int hf_ftam_Attribute_Names_read_private_use = -1; /*--- End of included file: packet-ftam-hf.c ---*/ -#line 58 "packet-ftam-template.c" +#line 58 "../../asn1/ftam/packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; /*--- Included file: packet-ftam-ett.c ---*/ -#line 1 "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; @@ -653,11 +653,11 @@ static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 62 "packet-ftam-template.c" +#line 62 "../../asn1/ftam/packet-ftam-template.c" /*--- Included file: packet-ftam-fn.c ---*/ -#line 1 "packet-ftam-fn.c" +#line 1 "../../asn1/ftam/packet-ftam-fn.c" static const asn_namedbit Protocol_Version_U_bits[] = { { 0, &hf_ftam_Protocol_Version_U_version_1, -1, -1, "version-1", NULL }, @@ -1308,7 +1308,7 @@ static const ber_choice_t FTAM_Regime_PDU_choice[] = { static int dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 93 "ftam.cnf" +#line 93 "../../asn1/ftam/ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1703,7 +1703,7 @@ dissect_ftam_Permitted_Actions_Attribute(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_ftam_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 76 "ftam.cnf" +#line 76 "../../asn1/ftam/ftam.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1907,7 +1907,7 @@ dissect_ftam_Concurrency_Access(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_ftam_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 88 "ftam.cnf" +#line 88 "../../asn1/ftam/ftam.cnf" /* XXX have no idea about this one */ @@ -1918,7 +1918,7 @@ dissect_ftam_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_ftam_AE_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_) { -#line 90 "ftam.cnf" +#line 90 "../../asn1/ftam/ftam.cnf" /* XXX have no idea about this one */ @@ -2072,7 +2072,7 @@ dissect_ftam_T_extension_attribute_identifier(gboolean implicit_tag _U_, tvbuff_ static int dissect_ftam_T_extension_attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 79 "ftam.cnf" +#line 79 "../../asn1/ftam/ftam.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3135,7 +3135,7 @@ static const ber_choice_t File_PDU_choice[] = { static int dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 102 "ftam.cnf" +#line 102 "../../asn1/ftam/ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3439,7 +3439,7 @@ static const ber_choice_t Bulk_Data_PDU_choice[] = { static int dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 111 "ftam.cnf" +#line 111 "../../asn1/ftam/ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3781,7 +3781,7 @@ dissect_ftam_T_attribute_extension_attribute_identifier(gboolean implicit_tag _U static int dissect_ftam_T_extension_attribute_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 85 "ftam.cnf" +#line 85 "../../asn1/ftam/ftam.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -4701,7 +4701,7 @@ static const ber_choice_t FSM_PDU_choice[] = { static int dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 120 "ftam.cnf" +#line 120 "../../asn1/ftam/ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -4745,7 +4745,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ftam-fn.c ---*/ -#line 64 "packet-ftam-template.c" +#line 64 "../../asn1/ftam/packet-ftam-template.c" /* * Dissect FTAM unstructured text @@ -4811,7 +4811,7 @@ void proto_register_ftam(void) { BASE_NONE, NULL, 0x0, NULL, HFILL } }, /*--- Included file: packet-ftam-hfarr.c ---*/ -#line 1 "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, @@ -6470,7 +6470,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 128 "packet-ftam-template.c" +#line 128 "../../asn1/ftam/packet-ftam-template.c" }; /* List of subtrees */ @@ -6478,7 +6478,7 @@ void proto_register_ftam(void) { &ett_ftam, /*--- Included file: packet-ftam-ettarr.c ---*/ -#line 1 "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, @@ -6643,7 +6643,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 134 "packet-ftam-template.c" +#line 134 "../../asn1/ftam/packet-ftam-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h index ddc5b5f42b..3fdde14749 100644 --- a/epan/dissectors/packet-ftam.h +++ b/epan/dissectors/packet-ftam.h @@ -5,7 +5,7 @@ /* Input file: packet-ftam-template.h */ -#line 1 "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/ @@ -41,7 +41,7 @@ /*--- Included file: packet-ftam-exp.h ---*/ -#line 1 "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[]; @@ -58,6 +58,6 @@ int dissect_ftam_Attribute_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb _ 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 35 "packet-ftam-template.h" +#line 35 "../../asn1/ftam/packet-ftam-template.h" #endif /* PACKET_FTAM_H */ diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index 3a49c87da7..d9700cc5b0 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -5,7 +5,7 @@ /* Input file: packet-gnm-template.c */ -#line 1 "packet-gnm-template.c" +#line 1 "../../asn1/gnm/packet-gnm-template.c" /* packet-gnm.c * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection * @@ -56,7 +56,7 @@ static int proto_gnm = -1; /*--- Included file: packet-gnm-hf.c ---*/ -#line 1 "packet-gnm-hf.c" +#line 1 "../../asn1/gnm/packet-gnm-hf.c" static int hf_gnm_SupportedTOClasses_PDU = -1; /* SupportedTOClasses */ static int hf_gnm_AcceptableCircuitPackTypeList_PDU = -1; /* AcceptableCircuitPackTypeList */ static int hf_gnm_AlarmSeverityAssignmentList_PDU = -1; /* AlarmSeverityAssignmentList */ @@ -227,12 +227,12 @@ static int hf_gnm_TransmissionCharacteristics_dCME = -1; static int hf_gnm_TransmissionCharacteristics_echoControl = -1; /*--- End of included file: packet-gnm-hf.c ---*/ -#line 50 "packet-gnm-template.c" +#line 50 "../../asn1/gnm/packet-gnm-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-gnm-ett.c ---*/ -#line 1 "packet-gnm-ett.c" +#line 1 "../../asn1/gnm/packet-gnm-ett.c" static gint ett_gnm_MappingList = -1; static gint ett_gnm_SignalRate = -1; static gint ett_gnm_SupportedTOClasses = -1; @@ -301,11 +301,11 @@ static gint ett_gnm_TpsInGtpList = -1; static gint ett_gnm_TransmissionCharacteristics = -1; /*--- End of included file: packet-gnm-ett.c ---*/ -#line 53 "packet-gnm-template.c" +#line 53 "../../asn1/gnm/packet-gnm-template.c" /*--- Included file: packet-gnm-fn.c ---*/ -#line 1 "packet-gnm-fn.c" +#line 1 "../../asn1/gnm/packet-gnm-fn.c" static int @@ -2029,7 +2029,7 @@ static void dissect_Version_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-gnm-fn.c ---*/ -#line 55 "packet-gnm-template.c" +#line 55 "../../asn1/gnm/packet-gnm-template.c" @@ -2058,7 +2058,7 @@ void proto_register_gnm(void) { /*--- Included file: packet-gnm-hfarr.c ---*/ -#line 1 "packet-gnm-hfarr.c" +#line 1 "../../asn1/gnm/packet-gnm-hfarr.c" { &hf_gnm_SupportedTOClasses_PDU, { "SupportedTOClasses", "gnm.SupportedTOClasses", FT_UINT32, BASE_DEC, NULL, 0, @@ -2729,14 +2729,14 @@ void proto_register_gnm(void) { NULL, HFILL }}, /*--- End of included file: packet-gnm-hfarr.c ---*/ -#line 82 "packet-gnm-template.c" +#line 82 "../../asn1/gnm/packet-gnm-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-gnm-ettarr.c ---*/ -#line 1 "packet-gnm-ettarr.c" +#line 1 "../../asn1/gnm/packet-gnm-ettarr.c" &ett_gnm_MappingList, &ett_gnm_SignalRate, &ett_gnm_SupportedTOClasses, @@ -2805,7 +2805,7 @@ void proto_register_gnm(void) { &ett_gnm_TransmissionCharacteristics, /*--- End of included file: packet-gnm-ettarr.c ---*/ -#line 87 "packet-gnm-template.c" +#line 87 "../../asn1/gnm/packet-gnm-template.c" }; /* Register protocol */ @@ -2822,7 +2822,7 @@ void proto_register_gnm(void) { void proto_reg_handoff_gnm(void) { /*--- Included file: packet-gnm-dis-tab.c ---*/ -#line 1 "packet-gnm-dis-tab.c" +#line 1 "../../asn1/gnm/packet-gnm-dis-tab.c" register_ber_oid_dissector("0.0.13.3100.0.7.1", dissect_RelatedObjectInstance_PDU, proto_gnm, "a-TPInstance(1)"); register_ber_oid_dissector("0.0.13.3100.0.7.2", dissect_ObjectList_PDU, proto_gnm, "affectedObjectList(2)"); register_ber_oid_dissector("0.0.13.3100.0.7.3", dissect_AlarmSeverityAssignmentList_PDU, proto_gnm, "alarmSeverityAssignmentList(3)"); @@ -2894,7 +2894,7 @@ void proto_reg_handoff_gnm(void) { /*--- End of included file: packet-gnm-dis-tab.c ---*/ -#line 102 "packet-gnm-template.c" +#line 102 "../../asn1/gnm/packet-gnm-template.c" /* Wrapper to call CMIP */ register_ber_oid_dissector("0.0.13.3100.0.7.9", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientConnection(9)"); register_ber_oid_dissector("0.0.13.3100.0.7.10", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientTrail(10)"); diff --git a/epan/dissectors/packet-gnm.h b/epan/dissectors/packet-gnm.h index 0f37fa1362..c768bcb976 100644 --- a/epan/dissectors/packet-gnm.h +++ b/epan/dissectors/packet-gnm.h @@ -5,7 +5,7 @@ /* Input file: packet-gnm-template.h */ -#line 1 "packet-gnm-template.h" +#line 1 "../../asn1/gnm/packet-gnm-template.h" /* packet-gnm.c * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection * diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index f94b8009fa..a6e42701c9 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -5,7 +5,7 @@ /* Input file: packet-goose-template.c */ -#line 1 "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 @@ -58,7 +58,7 @@ static int hf_goose_reserve2 = -1; /*--- Included file: packet-goose-hf.c ---*/ -#line 1 "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 */ @@ -117,14 +117,14 @@ static int hf_goose_bcd = -1; /* INTEGER */ static int hf_goose_booleanArray = -1; /* BIT_STRING */ /*--- End of included file: packet-goose-hf.c ---*/ -#line 52 "packet-goose-template.c" +#line 52 "../../asn1/goose/packet-goose-template.c" /* Initialize the subtree pointers */ static int ett_goose = -1; /*--- Included file: packet-goose-ett.c ---*/ -#line 1 "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; @@ -144,11 +144,11 @@ static gint ett_goose_SEQUENCE_OF_Data = -1; static gint ett_goose_Data = -1; /*--- End of included file: packet-goose-ett.c ---*/ -#line 57 "packet-goose-template.c" +#line 57 "../../asn1/goose/packet-goose-template.c" /*--- Included file: packet-goose-fn.c ---*/ -#line 1 "packet-goose-fn.c" +#line 1 "../../asn1/goose/packet-goose-fn.c" /*--- Cyclic dependencies ---*/ /* Data -> Data/array -> Data */ @@ -471,7 +471,7 @@ dissect_goose_GSEMngtPdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_goose_UtcTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 18 "goose.cnf" +#line 18 "../../asn1/goose/goose.cnf" guint32 len; proto_item *cause; @@ -686,7 +686,7 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-goose-fn.c ---*/ -#line 59 "packet-goose-template.c" +#line 59 "../../asn1/goose/packet-goose-template.c" /* * Dissect GOOSE PDUs inside a PPDU. @@ -762,7 +762,7 @@ void proto_register_goose(void) { /*--- Included file: packet-goose-hfarr.c ---*/ -#line 1 "packet-goose-hfarr.c" +#line 1 "../../asn1/goose/packet-goose-hfarr.c" { &hf_goose_gseMngtPdu, { "gseMngtPdu", "goose.gseMngtPdu", FT_NONE, BASE_NONE, NULL, 0, @@ -989,7 +989,7 @@ void proto_register_goose(void) { "BIT_STRING", HFILL }}, /*--- End of included file: packet-goose-hfarr.c ---*/ -#line 133 "packet-goose-template.c" +#line 133 "../../asn1/goose/packet-goose-template.c" }; /* List of subtrees */ @@ -997,7 +997,7 @@ void proto_register_goose(void) { &ett_goose, /*--- Included file: packet-goose-ettarr.c ---*/ -#line 1 "packet-goose-ettarr.c" +#line 1 "../../asn1/goose/packet-goose-ettarr.c" &ett_goose_GOOSEpdu, &ett_goose_GSEMngtPdu, &ett_goose_RequestResponse, @@ -1017,7 +1017,7 @@ void proto_register_goose(void) { &ett_goose_Data, /*--- End of included file: packet-goose-ettarr.c ---*/ -#line 139 "packet-goose-template.c" +#line 139 "../../asn1/goose/packet-goose-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 438cd72cc1..0e16c350aa 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -5,7 +5,7 @@ /* Input file: packet-gprscdr-template.c */ -#line 1 "packet-gprscdr-template.c" +#line 1 "../../asn1/gprscdr/packet-gprscdr-template.c" /* packet-gprscdr-template.c * Copyright 2011 , Anders Broman * @@ -52,7 +52,7 @@ static int proto_gprscdr = -1; /*--- Included file: packet-gprscdr-hf.c ---*/ -#line 1 "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_gsm0408Cause = -1; /* INTEGER */ static int hf_gprscdr_gsm0902MapErrorValue = -1; /* INTEGER */ @@ -215,13 +215,13 @@ static int hf_gprscdr_LevelOfCAMELService_callDurationSupervision = -1; static int hf_gprscdr_LevelOfCAMELService_onlineCharging = -1; /*--- End of included file: packet-gprscdr-hf.c ---*/ -#line 46 "packet-gprscdr-template.c" +#line 46 "../../asn1/gprscdr/packet-gprscdr-template.c" static int ett_gprscdr = -1; static int ett_gprscdr_timestamp = -1; /*--- Included file: packet-gprscdr-ett.c ---*/ -#line 1 "packet-gprscdr-ett.c" +#line 1 "../../asn1/gprscdr/packet-gprscdr-ett.c" static gint ett_gprscdr_Diagnostics = -1; static gint ett_gprscdr_IPAddress = -1; static gint ett_gprscdr_IPBinaryAddress = -1; @@ -259,13 +259,13 @@ static gint ett_gprscdr_PSFurnishChargingInformation = -1; static gint ett_gprscdr_MBMSInformation = -1; /*--- End of included file: packet-gprscdr-ett.c ---*/ -#line 50 "packet-gprscdr-template.c" +#line 50 "../../asn1/gprscdr/packet-gprscdr-template.c" static dissector_handle_t gprscdr_handle; /*--- Included file: packet-gprscdr-fn.c ---*/ -#line 1 "packet-gprscdr-fn.c" +#line 1 "../../asn1/gprscdr/packet-gprscdr-fn.c" static int @@ -465,7 +465,7 @@ dissect_gprscdr_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_gprscdr_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 26 "gprscdr.cnf" +#line 26 "../../asn1/gprscdr/gprscdr.cnf" proto_tree_add_text(tree, tvb, offset, -1, "Not dissected"); @@ -2044,7 +2044,7 @@ int dissect_gprscdr_GPRSCallEventRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-gprscdr-fn.c ---*/ -#line 54 "packet-gprscdr-template.c" +#line 54 "../../asn1/gprscdr/packet-gprscdr-template.c" @@ -2056,7 +2056,7 @@ proto_register_gprscdr(void) static hf_register_info hf[] = { /*--- Included file: packet-gprscdr-hfarr.c ---*/ -#line 1 "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, @@ -2695,7 +2695,7 @@ proto_register_gprscdr(void) NULL, HFILL }}, /*--- End of included file: packet-gprscdr-hfarr.c ---*/ -#line 64 "packet-gprscdr-template.c" +#line 64 "../../asn1/gprscdr/packet-gprscdr-template.c" }; /* List of subtrees */ @@ -2704,7 +2704,7 @@ proto_register_gprscdr(void) &ett_gprscdr_timestamp, /*--- Included file: packet-gprscdr-ettarr.c ---*/ -#line 1 "packet-gprscdr-ettarr.c" +#line 1 "../../asn1/gprscdr/packet-gprscdr-ettarr.c" &ett_gprscdr_Diagnostics, &ett_gprscdr_IPAddress, &ett_gprscdr_IPBinaryAddress, @@ -2742,7 +2742,7 @@ proto_register_gprscdr(void) &ett_gprscdr_MBMSInformation, /*--- End of included file: packet-gprscdr-ettarr.c ---*/ -#line 71 "packet-gprscdr-template.c" +#line 71 "../../asn1/gprscdr/packet-gprscdr-template.c" }; proto_gprscdr = proto_register_protocol(PNAME, PSNAME, PFNAME); diff --git a/epan/dissectors/packet-gprscdr.h b/epan/dissectors/packet-gprscdr.h index bceee16b1e..463e88256d 100644 --- a/epan/dissectors/packet-gprscdr.h +++ b/epan/dissectors/packet-gprscdr.h @@ -5,7 +5,7 @@ /* Input file: packet-gprscdr-template.h */ -#line 1 "packet-gprscdr-template.h" +#line 1 "../../asn1/gprscdr/packet-gprscdr-template.h" /* packet-gprscdr.h * Routines for gprscdr packet dissection * Copyright 2011, Anders Broman @@ -37,13 +37,13 @@ /*--- Included file: packet-gprscdr-exp.h ---*/ -#line 1 "packet-gprscdr-exp.h" +#line 1 "../../asn1/gprscdr/packet-gprscdr-exp.h" extern const value_string gprscdr_GPRSCallEventRecord_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_); int dissect_gprscdr_GPRSCallEventRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-gprscdr-exp.h ---*/ -#line 31 "packet-gprscdr-template.h" +#line 31 "../../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 bd979a1cca..5d1ae52494 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -5,7 +5,7 @@ /* Input file: packet-gsm_map-template.c */ -#line 1 "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 @@ -150,7 +150,7 @@ static int hf_gsm_map_dlci = -1; /*--- Included file: packet-gsm_map-hf.c ---*/ -#line 1 "packet-gsm_map-hf.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-hf.c" /* --- Module MAP-ExtensionDataTypes --- --- --- */ @@ -1578,7 +1578,7 @@ static int hf_gsm_ss_areaEventInfo = -1; /* AreaEventInfo */ static int hf_gsm_ss_qoS = -1; /* LCS_QoS */ /*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 144 "packet-gsm_map-template.c" +#line 144 "../../asn1/gsm_map/packet-gsm_map-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -1606,7 +1606,7 @@ static gint ett_gsm_map_GeographicalInformation = -1; /*--- Included file: packet-gsm_map-ett.c ---*/ -#line 1 "packet-gsm_map-ett.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-ett.c" /* --- Module MAP-ExtensionDataTypes --- --- --- */ @@ -2180,7 +2180,7 @@ static gint ett_gsm_ss_LCS_PeriodicLocationCancellationArg = -1; /*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 170 "packet-gsm_map-template.c" +#line 170 "../../asn1/gsm_map/packet-gsm_map-template.c" static dissector_table_t sms_dissector_table; /* SMS TPDU */ static dissector_handle_t data_handle; @@ -2773,7 +2773,7 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) /*--- Included file: packet-gsm_map-fn.c ---*/ -#line 1 "packet-gsm_map-fn.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-fn.c" /* --- Module MAP-SS-Code --- --- --- */ @@ -2849,7 +2849,7 @@ dissect_gsm_map_T_extId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_gsm_map_T_extType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 188 "gsm_map.cnf" +#line 188 "../../asn1/gsm_map/gsm_map.cnf" proto_tree_add_text(tree, tvb, offset, -1, "Extension Data"); if (obj_id){ offset=call_ber_oid_callback(obj_id, tvb, offset, actx->pinfo, tree); @@ -2964,7 +2964,7 @@ dissect_gsm_map_SLR_ArgExtensionContainer(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_gsm_map_TBCD_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 214 "gsm_map.cnf" +#line 214 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; const char *digit_str; @@ -2997,7 +2997,7 @@ dissect_gsm_map_DiameterIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i int dissect_gsm_map_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 201 "gsm_map.cnf" +#line 201 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -3067,7 +3067,7 @@ dissect_gsm_map_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_gsm_map_SignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 295 "gsm_map.cnf" +#line 295 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -3091,7 +3091,7 @@ static const ber_sequence_t gsm_map_ExternalSignalInfo_sequence[] = { static int dissect_gsm_map_ExternalSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 717 "gsm_map.cnf" +#line 717 "../../asn1/gsm_map/gsm_map.cnf" /* -- Information about the internal structure is given in -- clause 7.6.9. @@ -3230,7 +3230,7 @@ dissect_gsm_map_AccessNetworkProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_gsm_map_LongSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 233 "gsm_map.cnf" +#line 233 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; guint8 octet; @@ -3311,7 +3311,7 @@ dissect_gsm_map_AlertingPattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in int dissect_gsm_map_GSN_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 541 "gsm_map.cnf" +#line 541 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; guint8 octet; @@ -3452,7 +3452,7 @@ dissect_gsm_map_HLR_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse int dissect_gsm_map_GlobalCellId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 798 "gsm_map.cnf" +#line 798 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -3719,7 +3719,7 @@ dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(gboolean implicit_tag _U_ int dissect_gsm_map_LAIFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 577 "gsm_map.cnf" +#line 577 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -3845,7 +3845,7 @@ dissect_gsm_map_EMLPP_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_gsm_map_Ext_SS_Status(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 393 "gsm_map.cnf" +#line 393 "../../asn1/gsm_map/gsm_map.cnf" /* Note Ext-SS-Status can have more than one byte */ tvbuff_t *parameter_tvb; @@ -3978,7 +3978,7 @@ dissect_gsm_map_ss_RegisterSS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_gsm_map_ss_SS_Status(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 373 "gsm_map.cnf" +#line 373 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; guint8 octet; @@ -4012,7 +4012,7 @@ dissect_gsm_map_ss_ForwardingOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); -#line 484 "gsm_map.cnf" +#line 484 "../../asn1/gsm_map/gsm_map.cnf" proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE); proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE); @@ -4331,7 +4331,7 @@ dissect_gsm_map_ss_InterrogateSS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U int dissect_gsm_map_ss_USSD_DataCodingScheme(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 416 "gsm_map.cnf" +#line 416 "../../asn1/gsm_map/gsm_map.cnf" /*The structure of the USSD-DataCodingScheme is defined by * the Cell Broadcast Data Coding Scheme as described in * TS 3GPP TS 23.038 @@ -4357,7 +4357,7 @@ dissect_gsm_map_ss_USSD_DataCodingScheme(gboolean implicit_tag _U_, tvbuff_t *tv int dissect_gsm_map_ss_USSD_String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 431 "gsm_map.cnf" +#line 431 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; int length; @@ -4844,7 +4844,7 @@ static const ber_sequence_t gsm_map_er_SM_DeliveryFailureCause_sequence[] = { static int dissect_gsm_map_er_SM_DeliveryFailureCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 302 "gsm_map.cnf" +#line 302 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, gsm_map_er_SM_DeliveryFailureCause_sequence, hf_index, ett_gsm_map_er_SM_DeliveryFailureCause); @@ -5738,7 +5738,7 @@ dissect_gsm_map_sm_SM_RP_DA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_gsm_map_sm_T_msisdn(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 291 "gsm_map.cnf" +#line 291 "../../asn1/gsm_map/gsm_map.cnf" actx->pinfo->p2p_dir = P2P_DIR_RECV; offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -5752,7 +5752,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV; static int dissect_gsm_map_sm_T_serviceCentreAddressOA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 283 "gsm_map.cnf" +#line 283 "../../asn1/gsm_map/gsm_map.cnf" actx->pinfo->p2p_dir = P2P_DIR_SENT; offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -5798,7 +5798,7 @@ static const ber_sequence_t gsm_map_sm_MO_ForwardSM_Arg_sequence[] = { static int dissect_gsm_map_sm_MO_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 319 "gsm_map.cnf" +#line 319 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -5823,7 +5823,7 @@ static const ber_sequence_t gsm_map_sm_MO_ForwardSM_Res_sequence[] = { static int dissect_gsm_map_sm_MO_ForwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 328 "gsm_map.cnf" +#line 328 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -5851,7 +5851,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Arg_sequence[] = { static int dissect_gsm_map_sm_MT_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 337 "gsm_map.cnf" +#line 337 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -5876,7 +5876,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Res_sequence[] = { static int dissect_gsm_map_sm_MT_ForwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 346 "gsm_map.cnf" +#line 346 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -6059,7 +6059,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_VGCS_Arg_sequence[] = { static int dissect_gsm_map_sm_MT_ForwardSM_VGCS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 355 "gsm_map.cnf" +#line 355 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -6099,7 +6099,7 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_VGCS_Res_sequence[] = { static int dissect_gsm_map_sm_MT_ForwardSM_VGCS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 364 "gsm_map.cnf" +#line 364 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -7717,7 +7717,7 @@ dissect_gsm_map_ms_UpdateGprsLocationRes(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_gsm_map_ms_IntegrityProtectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 613 "gsm_map.cnf" +#line 613 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; asn1_ctx_t asn1_ctx; @@ -7740,7 +7740,7 @@ dissect_gsm_map_ms_IntegrityProtectionInformation(gboolean implicit_tag _U_, tvb static int dissect_gsm_map_ms_EncryptionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 625 "gsm_map.cnf" +#line 625 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; asn1_ctx_t asn1_ctx; @@ -7825,7 +7825,7 @@ dissect_gsm_map_ms_AllowedUMTS_Algorithms(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_gsm_map_ms_RadioResourceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 589 "gsm_map.cnf" +#line 589 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -7896,7 +7896,7 @@ dissect_gsm_map_ms_BSSMAP_ServiceHandover(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_gsm_map_ms_RANAP_ServiceHandover(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 601 "gsm_map.cnf" +#line 601 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; asn1_ctx_t asn1_ctx; @@ -8715,7 +8715,7 @@ static int dissect_gsm_map_ms_T_forwardingOptions(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_gsm_map_ms_Ext_ForwOptions(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 490 "gsm_map.cnf" +#line 490 "../../asn1/gsm_map/gsm_map.cnf" proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE); proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE); @@ -9901,7 +9901,7 @@ dissect_gsm_map_ms_VlrCamelSubscriptionInfo(gboolean implicit_tag _U_, tvbuff_t static int dissect_gsm_map_ms_PDP_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 498 "gsm_map.cnf" +#line 498 "../../asn1/gsm_map/gsm_map.cnf" guint8 pdp_type_org; tvbuff_t *parameter_tvb; @@ -9934,7 +9934,7 @@ dissect_gsm_map_ms_PDP_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of int dissect_gsm_map_ms_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 520 "gsm_map.cnf" +#line 520 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; @@ -9956,7 +9956,7 @@ dissect_gsm_map_ms_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_gsm_map_ms_Ext_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 531 "gsm_map.cnf" +#line 531 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; @@ -11553,7 +11553,7 @@ dissect_gsm_map_ms_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_gsm_map_ms_RAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 565 "gsm_map.cnf" +#line 565 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -13933,7 +13933,7 @@ dissect_gsm_map_lcs_ProvideSubscriberLocation_Arg(gboolean implicit_tag _U_, tvb int dissect_gsm_map_lcs_Ext_GeographicalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 810 "gsm_map.cnf" +#line 810 "../../asn1/gsm_map/gsm_map.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -14891,7 +14891,7 @@ static const value_string gsm_old_GSMMAPOperationLocalvalue_vals[] = { static int dissect_gsm_old_GSMMAPOperationLocalvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 174 "gsm_map.cnf" +#line 174 "../../asn1/gsm_map/gsm_map.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &opcode); @@ -14948,7 +14948,7 @@ dissect_gsm_old_MAP_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_gsm_old_InvokeParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 161 "gsm_map.cnf" +#line 161 "../../asn1/gsm_map/gsm_map.cnf" offset = dissect_invokeData(tree, tvb, offset, actx); @@ -14977,7 +14977,7 @@ dissect_gsm_old_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_gsm_old_ReturnResultParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 164 "gsm_map.cnf" +#line 164 "../../asn1/gsm_map/gsm_map.cnf" offset = dissect_returnResultData(tree, tvb, offset, actx); @@ -15124,7 +15124,7 @@ dissect_gsm_old_MAP_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_gsm_old_ReturnErrorParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 167 "gsm_map.cnf" +#line 167 "../../asn1/gsm_map/gsm_map.cnf" offset = dissect_returnErrorData(tree, tvb, offset, actx); @@ -15333,7 +15333,7 @@ static const ber_sequence_t gsm_old_Bss_APDU_sequence[] = { static int dissect_gsm_old_Bss_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 638 "gsm_map.cnf" +#line 638 "../../asn1/gsm_map/gsm_map.cnf" guint8 octet; guint8 length; tvbuff_t *next_tvb; @@ -15943,7 +15943,7 @@ dissect_gsm_old_SM_RP_DAold(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_gsm_old_T_msisdn(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 287 "gsm_map.cnf" +#line 287 "../../asn1/gsm_map/gsm_map.cnf" actx->pinfo->p2p_dir = P2P_DIR_RECV; offset = dissect_gsm_map_ISDN_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -15957,7 +15957,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV; static int dissect_gsm_old_T_serviceCentreAddressOA(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 279 "gsm_map.cnf" +#line 279 "../../asn1/gsm_map/gsm_map.cnf" actx->pinfo->p2p_dir = P2P_DIR_SENT; offset = dissect_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -16002,7 +16002,7 @@ static const ber_sequence_t gsm_old_ForwardSM_Arg_sequence[] = { static int dissect_gsm_old_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 310 "gsm_map.cnf" +#line 310 "../../asn1/gsm_map/gsm_map.cnf" /* dissect_gsm_map_SignalInfo will return parameter_tvb in actx */ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -16834,7 +16834,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 761 "packet-gsm_map-template.c" +#line 761 "../../asn1/gsm_map/packet-gsm_map-template.c" /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { @@ -16847,7 +16847,7 @@ const value_string gsm_map_V1V2_opr_code_strings[] = { const value_string gsm_map_opr_code_strings[] = { /*--- Included file: packet-gsm_map-table.c ---*/ -#line 1 "packet-gsm_map-table.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-table.c" /* --- Module Remote-Operations-Information-Objects --- --- --- */ @@ -17046,13 +17046,13 @@ const value_string gsm_map_opr_code_strings[] = { { 109, "lcs_PeriodicLocationCancellation" }, /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 772 "packet-gsm_map-template.c" +#line 772 "../../asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; static const value_string gsm_map_err_code_string_vals[] = { /*--- Included file: packet-gsm_map-table.c ---*/ -#line 1 "packet-gsm_map-table.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-table.c" /* --- Module Remote-Operations-Information-Objects --- --- --- */ @@ -17251,7 +17251,7 @@ static const value_string gsm_map_err_code_string_vals[] = { { 109, "lcs_PeriodicLocationCancellation" }, /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 776 "packet-gsm_map-template.c" +#line 776 "../../asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; static const true_false_string gsm_map_extension_value = { @@ -18942,7 +18942,7 @@ void proto_register_gsm_map(void) { /*--- Included file: packet-gsm_map-hfarr.c ---*/ -#line 1 "packet-gsm_map-hfarr.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-hfarr.c" /* --- Module MAP-ExtensionDataTypes --- --- --- */ @@ -24504,7 +24504,7 @@ void proto_register_gsm_map(void) { "LCS_QoS", HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 2465 "packet-gsm_map-template.c" +#line 2465 "../../asn1/gsm_map/packet-gsm_map-template.c" }; /* List of subtrees */ @@ -24534,7 +24534,7 @@ void proto_register_gsm_map(void) { /*--- Included file: packet-gsm_map-ettarr.c ---*/ -#line 1 "packet-gsm_map-ettarr.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-ettarr.c" /* --- Module MAP-ExtensionDataTypes --- --- --- */ @@ -25108,7 +25108,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 2493 "packet-gsm_map-template.c" +#line 2493 "../../asn1/gsm_map/packet-gsm_map-template.c" }; /* Register protocol */ @@ -25128,7 +25128,7 @@ void proto_register_gsm_map(void) { /*--- Included file: packet-gsm_map-dis-tab.c ---*/ -#line 1 "packet-gsm_map-dis-tab.c" +#line 1 "../../asn1/gsm_map/packet-gsm_map-dis-tab.c" /* --- Module MAP-DialogueInformation --- --- --- */ @@ -25184,7 +25184,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 2511 "packet-gsm_map-template.c" +#line 2511 "../../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 efbc64fbef..d66d65cb55 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -5,7 +5,7 @@ /* Input file: packet-gsm_map-template.h */ -#line 1 "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 @@ -64,7 +64,7 @@ void dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t /*--- Included file: packet-gsm_map-exp.h ---*/ -#line 1 "packet-gsm_map-exp.h" +#line 1 "../../asn1/gsm_map/packet-gsm_map-exp.h" /* --- Module MAP-SS-Code --- --- --- */ @@ -198,7 +198,7 @@ extern const value_string gsm_ss_LocationMethod_vals[]; int dissect_gsm_ss_LocationMethod(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 58 "packet-gsm_map-template.h" +#line 58 "../../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 2530fdf1cc..e6545a657d 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -5,7 +5,7 @@ /* Input file: packet-h225-template.c */ -#line 1 "packet-h225-template.c" +#line 1 "../../asn1/h225/packet-h225-template.c" /* packet-h225.c * Routines for h225 packet dissection * Copyright 2005, Anders Broman @@ -115,7 +115,7 @@ static int hf_h225_ras_deltatime = -1; /*--- Included file: packet-h225-hf.c ---*/ -#line 1 "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 */ @@ -888,13 +888,13 @@ static int hf_h225_stopped = -1; /* NULL */ static int hf_h225_notAvailable = -1; /* NULL */ /*--- End of included file: packet-h225-hf.c ---*/ -#line 109 "packet-h225-template.c" +#line 109 "../../asn1/h225/packet-h225-template.c" /* Initialize the subtree pointers */ static gint ett_h225 = -1; /*--- Included file: packet-h225-ett.c ---*/ -#line 1 "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; @@ -1137,7 +1137,7 @@ static gint ett_h225_ServiceControlResponse = -1; static gint ett_h225_T_result = -1; /*--- End of included file: packet-h225-ett.c ---*/ -#line 113 "packet-h225-template.c" +#line 113 "../../asn1/h225/packet-h225-template.c" /* Preferences */ static guint h225_tls_port = TLS_PORT_CS; @@ -1163,7 +1163,7 @@ static const char *tpOID; /*--- Included file: packet-h225-fn.c ---*/ -#line 1 "packet-h225-fn.c" +#line 1 "../../asn1/h225/packet-h225-fn.c" /*--- Cyclic dependencies ---*/ /* EnumeratedParameter -> Content -> Content/compound -> EnumeratedParameter */ @@ -1186,7 +1186,7 @@ dissect_h225_ProtocolIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h225_T_h245Ip(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 318 "h225.cnf" +#line 318 "../../asn1/h225/h225.cnf" tvbuff_t *value_tvb; ipv4_address = 0; @@ -1426,7 +1426,7 @@ static const per_sequence_t H221NonStandard_sequence[] = { static int dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 608 "h225.cnf" +#line 608 "../../asn1/h225/h225.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -1434,7 +1434,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_H221NonStandard, H221NonStandard_sequence); -#line 612 "h225.cnf" +#line 612 "../../asn1/h225/h225.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -1456,7 +1456,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 589 "h225.cnf" +#line 589 "../../asn1/h225/h225.cnf" gint32 value; nsiOID = ""; @@ -1485,7 +1485,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h225_T_nsp_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 623 "h225.cnf" +#line 623 "../../asn1/h225/h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -1508,7 +1508,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { int dissect_h225_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 621 "h225.cnf" +#line 621 "../../asn1/h225/h225.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1542,7 +1542,7 @@ static const per_choice_t H245TransportAddress_choice[] = { static int dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 428 "h225.cnf" +#line 428 "../../asn1/h225/h225.cnf" ipv4_address=0; ipv4_port=0; @@ -1551,7 +1551,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t ett_h225_H245TransportAddress, H245TransportAddress_choice, NULL); -#line 434 "h225.cnf" +#line 434 "../../asn1/h225/h225.cnf" /* we need this info for TAPing */ h225_pi->is_h245 = TRUE; h225_pi->h245_address = ipv4_address; @@ -1580,7 +1580,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h225_DialedDigits(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 300 "h225.cnf" +#line 300 "../../asn1/h225/h225.cnf" tvbuff_t *value_tvb = NULL; guint len = 0; @@ -1897,7 +1897,7 @@ dissect_h225_PartyNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_TBCD_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 704 "h225.cnf" +#line 704 "../../asn1/h225/h225.cnf" int min_len, max_len; gboolean has_extension; @@ -2696,13 +2696,13 @@ static const per_sequence_t TunnelledProtocol_sequence[] = { int dissect_h225_TunnelledProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 566 "h225.cnf" +#line 566 "../../asn1/h225/h225.cnf" tpOID = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); -#line 568 "h225.cnf" +#line 568 "../../asn1/h225/h225.cnf" tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID); return offset; @@ -2880,7 +2880,7 @@ dissect_h225_CallType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 540 "h225.cnf" +#line 540 "../../asn1/h225/h225.cnf" tvbuff_t *guid_tvb = NULL; actx->value_ptr = &guid_tvb; @@ -3094,7 +3094,7 @@ dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h225_FastStart_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 269 "h225.cnf" +#line 269 "../../asn1/h225/h225.cnf" tvbuff_t *value_tvb = NULL; char codec_str[50]; @@ -3682,7 +3682,7 @@ dissect_h225_CircuitIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 680 "h225.cnf" +#line 680 "../../asn1/h225/h225.cnf" guint32 value_int = (guint32)-1; gef_ctx_t *gefx; @@ -3700,7 +3700,7 @@ dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h225_T_oid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 689 "h225.cnf" +#line 689 "../../asn1/h225/h225.cnf" const gchar *oid_str = NULL; gef_ctx_t *gefx; @@ -3730,14 +3730,14 @@ static const per_choice_t GenericIdentifier_choice[] = { int dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 666 "h225.cnf" +#line 666 "../../asn1/h225/h225.cnf" gef_ctx_t *gefx; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_GenericIdentifier, GenericIdentifier_choice, NULL); -#line 668 "h225.cnf" +#line 668 "../../asn1/h225/h225.cnf" gef_ctx_update_key(gef_ctx_get(actx->private_data)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG GenericIdentifier: %s", gef_ctx_get(actx->private_data)->key);*/ gefx = gef_ctx_get(actx->private_data); @@ -3870,7 +3870,7 @@ dissect_h225_EnumeratedParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_T_parameters_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 648 "h225.cnf" +#line 648 "../../asn1/h225/h225.cnf" gef_ctx_t *parent_gefx; parent_gefx = gef_ctx_get(actx->private_data); @@ -3878,7 +3878,7 @@ dissect_h225_T_parameters_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac offset = dissect_h225_EnumeratedParameter(tvb, offset, actx, tree, hf_index); -#line 653 "h225.cnf" +#line 653 "../../asn1/h225/h225.cnf" actx->private_data = parent_gefx; return offset; @@ -3907,7 +3907,7 @@ static const per_sequence_t GenericData_sequence[] = { int dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 634 "h225.cnf" +#line 634 "../../asn1/h225/h225.cnf" void *priv_data = actx->private_data; gef_ctx_t *gefx; @@ -3921,7 +3921,7 @@ dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_GenericData, GenericData_sequence); -#line 644 "h225.cnf" +#line 644 "../../asn1/h225/h225.cnf" actx->private_data = priv_data; return offset; @@ -3960,13 +3960,13 @@ dissect_h225_CircuitInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 658 "h225.cnf" +#line 658 "../../asn1/h225/h225.cnf" void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "FeatureDescriptor"); offset = dissect_h225_GenericData(tvb, offset, actx, tree, hf_index); -#line 661 "h225.cnf" +#line 661 "../../asn1/h225/h225.cnf" actx->private_data = priv_data; return offset; @@ -3989,7 +3989,7 @@ dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, as static int dissect_h225_ParallelH245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 329 "h225.cnf" +#line 329 "../../asn1/h225/h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4139,13 +4139,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = { static int dissect_h225_Setup_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 382 "h225.cnf" +#line 382 "../../asn1/h225/h225.cnf" contains_faststart = FALSE; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Setup_UUIE, Setup_UUIE_sequence); -#line 386 "h225.cnf" +#line 386 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP; if (contains_faststart == TRUE ) @@ -4195,7 +4195,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence); -#line 395 "h225.cnf" +#line 395 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CALL_PROCEDING; if (contains_faststart == TRUE ) @@ -4236,7 +4236,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Connect_UUIE, Connect_UUIE_sequence); -#line 419 "h225.cnf" +#line 419 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CONNECT; if (contains_faststart == TRUE ) @@ -4275,7 +4275,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Alerting_UUIE, Alerting_UUIE_sequence); -#line 404 "h225.cnf" +#line 404 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_ALERTING; if (contains_faststart == TRUE ) @@ -4303,7 +4303,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Information_UUIE, Information_UUIE_sequence); -#line 353 "h225.cnf" +#line 353 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_INFORMATION; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4422,7 +4422,7 @@ static const per_choice_t ReleaseCompleteReason_choice[] = { int dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 533 "h225.cnf" +#line 533 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4458,7 +4458,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence); -#line 413 "h225.cnf" +#line 413 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_RELEASE_COMPLET; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4499,7 +4499,7 @@ static const per_choice_t FacilityReason_choice[] = { static int dissect_h225_FacilityReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 457 "h225.cnf" +#line 457 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4572,7 +4572,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Facility_UUIE, Facility_UUIE_sequence); -#line 374 "h225.cnf" +#line 374 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_FACILITY; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4601,7 +4601,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Progress_UUIE, Progress_UUIE_sequence); -#line 359 "h225.cnf" +#line 359 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_PROGRESS; if (contains_faststart == TRUE ) @@ -4618,7 +4618,7 @@ static int dissect_h225_T_empty_flg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 343 "h225.cnf" +#line 343 "../../asn1/h225/h225.cnf" h225_pi->cs_type = H225_EMPTY; return offset; @@ -4638,7 +4638,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Status_UUIE, Status_UUIE_sequence); -#line 347 "h225.cnf" +#line 347 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_STATUS; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4677,7 +4677,7 @@ dissect_h225_SetupAcknowledge_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_SetupAcknowledge_UUIE, SetupAcknowledge_UUIE_sequence); -#line 368 "h225.cnf" +#line 368 "../../asn1/h225/h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP_ACK; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "")); @@ -4744,7 +4744,7 @@ static const per_choice_t T_h323_message_body_choice[] = { static int dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 242 "h225.cnf" +#line 242 "../../asn1/h225/h225.cnf" gint32 message_body_val; contains_faststart = FALSE; @@ -4781,7 +4781,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 554 "h225.cnf" +#line 554 "../../asn1/h225/h225.cnf" tvbuff_t *h4501_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4821,7 +4821,7 @@ dissect_h225_T_h245Tunnelling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h225_H245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 336 "h225.cnf" +#line 336 "../../asn1/h225/h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4878,7 +4878,7 @@ dissect_h225_CallLinkage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 576 "h225.cnf" +#line 576 "../../asn1/h225/h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4914,7 +4914,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { static int dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 574 "h225.cnf" +#line 574 "../../asn1/h225/h225.cnf" tp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5752,7 +5752,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = { static int dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 464 "h225.cnf" +#line 464 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6054,7 +6054,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = { static int dissect_h225_RegistrationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 519 "h225.cnf" +#line 519 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6117,7 +6117,7 @@ static const per_choice_t UnregRequestReason_choice[] = { static int dissect_h225_UnregRequestReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 471 "h225.cnf" +#line 471 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6202,7 +6202,7 @@ static const per_choice_t UnregRejectReason_choice[] = { static int dissect_h225_UnregRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 478 "h225.cnf" +#line 478 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6262,7 +6262,7 @@ dissect_h225_CallModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h225_DestinationInfo_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 295 "h225.cnf" +#line 295 "../../asn1/h225/h225.cnf" h225_pi->is_destinationInfo = TRUE; @@ -6470,7 +6470,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = { static int dissect_h225_AdmissionRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 505 "h225.cnf" +#line 505 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6602,7 +6602,7 @@ static const per_choice_t BandRejectReason_choice[] = { static int dissect_h225_BandRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 485 "h225.cnf" +#line 485 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6654,7 +6654,7 @@ static const per_choice_t DisengageReason_choice[] = { static int dissect_h225_DisengageReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 492 "h225.cnf" +#line 492 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6741,7 +6741,7 @@ static const per_choice_t DisengageRejectReason_choice[] = { static int dissect_h225_DisengageRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 498 "h225.cnf" +#line 498 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6887,7 +6887,7 @@ static const per_choice_t LocationRejectReason_choice[] = { static int dissect_h225_LocationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 512 "h225.cnf" +#line 512 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7258,7 +7258,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = { static int dissect_h225_InfoRequestNakReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 526 "h225.cnf" +#line 526 "../../asn1/h225/h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7469,7 +7469,7 @@ static const per_choice_t RasMessage_choice[] = { int dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 285 "h225.cnf" +#line 285 "../../asn1/h225/h225.cnf" gint32 rasmessage_value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7514,7 +7514,7 @@ static int dissect_RasMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-h225-fn.c ---*/ -#line 137 "packet-h225-template.c" +#line 137 "../../asn1/h225/packet-h225-template.c" /* Forward declaration we need below */ @@ -7613,7 +7613,7 @@ void proto_register_h225(void) { /*--- Included file: packet-h225-hfarr.c ---*/ -#line 1 "packet-h225-hfarr.c" +#line 1 "../../asn1/h225/packet-h225-hfarr.c" { &hf_h225_H323_UserInformation_PDU, { "H323-UserInformation", "h225.H323_UserInformation", FT_NONE, BASE_NONE, NULL, 0, @@ -10696,7 +10696,7 @@ void proto_register_h225(void) { NULL, HFILL }}, /*--- End of included file: packet-h225-hfarr.c ---*/ -#line 234 "packet-h225-template.c" +#line 234 "../../asn1/h225/packet-h225-template.c" }; /* List of subtrees */ @@ -10704,7 +10704,7 @@ void proto_register_h225(void) { &ett_h225, /*--- Included file: packet-h225-ettarr.c ---*/ -#line 1 "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, @@ -10947,7 +10947,7 @@ void proto_register_h225(void) { &ett_h225_T_result, /*--- End of included file: packet-h225-ettarr.c ---*/ -#line 240 "packet-h225-template.c" +#line 240 "../../asn1/h225/packet-h225-template.c" }; module_t *h225_module; diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index b9145b3d0e..0db99305e8 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -5,7 +5,7 @@ /* Input file: packet-h225-template.h */ -#line 1 "packet-h225-template.h" +#line 1 "../../asn1/h225/packet-h225-template.h" /* packet-h225.h * Routines for h225 packet dissection * Copyright 2005, Anders Broman @@ -89,7 +89,7 @@ typedef struct _h225_packet_info { /*--- Included file: packet-h225-exp.h ---*/ -#line 1 "packet-h225-exp.h" +#line 1 "../../asn1/h225/packet-h225-exp.h" WS_VAR_IMPORT const value_string T_h323_message_body_vals[]; WS_VAR_IMPORT const value_string h225_ReleaseCompleteReason_vals[]; extern const value_string h225_PresentationIndicator_vals[]; @@ -151,7 +151,7 @@ int dissect_h225_TransportQOS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act int dissect_h225_ExtendedAliasAddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-h225-exp.h ---*/ -#line 83 "packet-h225-template.h" +#line 83 "../../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 65f256b52a..a7d8b11649 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -5,7 +5,7 @@ /* Input file: packet-h235-template.c */ -#line 1 "packet-h235-template.c" +#line 1 "../../asn1/h235/packet-h235-template.c" /* packet-h235.c * Routines for H.235 packet dissection * 2004 Tomas Kukosa @@ -60,7 +60,7 @@ static int proto_h235 = -1; /*--- Included file: packet-h235-hf.c ---*/ -#line 1 "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 */ @@ -164,12 +164,12 @@ static int hf_h235_fecBeforeSrtp = -1; /* NULL */ static int hf_h235_fecAfterSrtp = -1; /* NULL */ /*--- End of included file: packet-h235-hf.c ---*/ -#line 54 "packet-h235-template.c" +#line 54 "../../asn1/h235/packet-h235-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-h235-ett.c ---*/ -#line 1 "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; @@ -204,7 +204,7 @@ static gint ett_h235_SEQUENCE_OF_GenericData = -1; static gint ett_h235_FecOrder = -1; /*--- End of included file: packet-h235-ett.c ---*/ -#line 57 "packet-h235-template.c" +#line 57 "../../asn1/h235/packet-h235-template.c" static int @@ -215,7 +215,7 @@ PER_NOT_DECODED_YET("ToBeSigned"); /*--- Included file: packet-h235-fn.c ---*/ -#line 1 "packet-h235-fn.c" +#line 1 "../../asn1/h235/packet-h235-fn.c" static int @@ -557,7 +557,7 @@ static const per_sequence_t ENCRYPTED_sequence[] = { int dissect_h235_ENCRYPTED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 65 "h235.cnf" +#line 65 "../../asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -589,7 +589,7 @@ static const per_sequence_t SIGNED_sequence[] = { int dissect_h235_SIGNED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 60 "h235.cnf" +#line 60 "../../asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -754,7 +754,7 @@ static const per_sequence_t ClearToken_sequence[] = { int dissect_h235_ClearToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 76 "h235.cnf" +#line 76 "../../asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -775,7 +775,7 @@ static const per_sequence_t HASHED_sequence[] = { int dissect_h235_HASHED(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 70 "h235.cnf" +#line 70 "../../asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -851,7 +851,7 @@ static const per_choice_t CryptoToken_choice[] = { int dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 82 "h235.cnf" +#line 82 "../../asn1/h235/h235.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h235, tvb, offset, 0, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -1050,7 +1050,7 @@ static int dissect_SrtpCryptoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-h235-fn.c ---*/ -#line 66 "packet-h235-template.c" +#line 66 "../../asn1/h235/packet-h235-template.c" /*--- proto_register_h235 ----------------------------------------------*/ @@ -1060,7 +1060,7 @@ void proto_register_h235(void) { static hf_register_info hf[] = { /*--- Included file: packet-h235-hfarr.c ---*/ -#line 1 "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, @@ -1467,14 +1467,14 @@ void proto_register_h235(void) { NULL, HFILL }}, /*--- End of included file: packet-h235-hfarr.c ---*/ -#line 74 "packet-h235-template.c" +#line 74 "../../asn1/h235/packet-h235-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-h235-ettarr.c ---*/ -#line 1 "packet-h235-ettarr.c" +#line 1 "../../asn1/h235/packet-h235-ettarr.c" &ett_h235_NonStandardParameter, &ett_h235_DHset, &ett_h235_ECpoint, @@ -1509,7 +1509,7 @@ void proto_register_h235(void) { &ett_h235_FecOrder, /*--- End of included file: packet-h235-ettarr.c ---*/ -#line 79 "packet-h235-template.c" +#line 79 "../../asn1/h235/packet-h235-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h index 832a7b3066..e8770b4b40 100644 --- a/epan/dissectors/packet-h235.h +++ b/epan/dissectors/packet-h235.h @@ -5,7 +5,7 @@ /* Input file: packet-h235-template.h */ -#line 1 "packet-h235-template.h" +#line 1 "../../asn1/h235/packet-h235-template.h" /* packet-h235.h * Routines for H.235 packet dissection * 2004 Tomas Kukosa @@ -36,7 +36,7 @@ /*--- Included file: packet-h235-exp.h ---*/ -#line 1 "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_); @@ -49,7 +49,7 @@ int dissect_h235_CryptoToken(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx 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 30 "packet-h235-template.h" +#line 30 "../../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 ec41a63302..db3e3a254a 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -5,7 +5,7 @@ /* Input file: packet-h245-template.c */ -#line 1 "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 @@ -93,7 +93,7 @@ static gboolean h245_shorttypes = FALSE; /*--- Included file: packet-h245-val.h ---*/ -#line 1 "packet-h245-val.h" +#line 1 "../../asn1/h245/packet-h245-val.h" typedef enum _AudioCapability_enum { AudioCapability_nonStandard = 0, @@ -214,7 +214,7 @@ typedef enum _IndicationMessage_enum { } IndicationMessage_enum; /*--- End of included file: packet-h245-val.h ---*/ -#line 87 "packet-h245-template.c" +#line 87 "../../asn1/h245/packet-h245-template.c" static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, @@ -514,7 +514,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha static int proto_h245 = -1; /*--- Included file: packet-h245-hf.c ---*/ -#line 1 "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 */ @@ -1919,14 +1919,14 @@ static int hf_h245_encrypted = -1; /* OCTET_STRING */ static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ /*--- End of included file: packet-h245-hf.c ---*/ -#line 385 "packet-h245-template.c" +#line 385 "../../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 "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; @@ -2420,7 +2420,7 @@ static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; /*--- End of included file: packet-h245-ett.c ---*/ -#line 390 "packet-h245-template.c" +#line 390 "../../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_); @@ -2431,7 +2431,7 @@ static void reset_h245_pi(void *dummy _U_) /*--- Included file: packet-h245-fn.c ---*/ -#line 1 "packet-h245-fn.c" +#line 1 "../../asn1/h245/packet-h245-fn.c" /*--- Cyclic dependencies ---*/ /* GenericParameter -> ParameterValue -> ParameterValue/genericParameter -> GenericParameter */ @@ -2508,7 +2508,7 @@ static const per_sequence_t H221NonStandardID_sequence[] = { static int dissect_h245_H221NonStandardID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 951 "h245.cnf" +#line 951 "../../asn1/h245/h245.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -2516,7 +2516,7 @@ dissect_h245_H221NonStandardID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_H221NonStandardID, H221NonStandardID_sequence); -#line 955 "h245.cnf" +#line 955 "../../asn1/h245/h245.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h245Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -2538,7 +2538,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h245_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 932 "h245.cnf" +#line 932 "../../asn1/h245/h245.cnf" gint32 value; nsiOID = ""; @@ -2567,7 +2567,7 @@ dissect_h245_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_nsd_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 966 "h245.cnf" +#line 966 "../../asn1/h245/h245.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -2590,7 +2590,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { static int dissect_h245_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 964 "h245.cnf" +#line 964 "../../asn1/h245/h245.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2645,7 +2645,7 @@ dissect_h245_MasterSlaveDetermination(tvbuff_t *tvb _U_, int offset _U_, asn1_ct offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDetermination, MasterSlaveDetermination_sequence); -#line 577 "h245.cnf" +#line 577 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDet; @@ -3543,7 +3543,7 @@ dissect_h245_T_t38fax(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h245_T_standardOid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 716 "h245.cnf" +#line 716 "../../asn1/h245/h245.cnf" const gchar *standard_oid_str = NULL; gef_ctx_t *gefx; @@ -3603,14 +3603,14 @@ static const per_choice_t CapabilityIdentifier_choice[] = { static int dissect_h245_CapabilityIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 702 "h245.cnf" +#line 702 "../../asn1/h245/h245.cnf" gef_ctx_t *gefx; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h245_CapabilityIdentifier, CapabilityIdentifier_choice, NULL); -#line 704 "h245.cnf" +#line 704 "../../asn1/h245/h245.cnf" gef_ctx_update_key(gef_ctx_get(actx->private_data)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG CapabilityIdentifier: %s", gef_ctx_get(actx->private_data)->key);*/ gefx = gef_ctx_get(actx->private_data); @@ -3638,7 +3638,7 @@ dissect_h245_INTEGER_0_4294967295(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 747 "h245.cnf" +#line 747 "../../asn1/h245/h245.cnf" guint32 value_int = (guint32)-1; gef_ctx_t *gefx; @@ -3671,14 +3671,14 @@ static const per_choice_t ParameterIdentifier_choice[] = { static int dissect_h245_ParameterIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 733 "h245.cnf" +#line 733 "../../asn1/h245/h245.cnf" gef_ctx_t *gefx; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h245_ParameterIdentifier, ParameterIdentifier_choice, NULL); -#line 735 "h245.cnf" +#line 735 "../../asn1/h245/h245.cnf" gef_ctx_update_key(gef_ctx_get(actx->private_data)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG ParameterIdentifier: %s", gef_ctx_get(actx->private_data)->key);*/ gefx = gef_ctx_get(actx->private_data); @@ -3696,7 +3696,7 @@ dissect_h245_ParameterIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h245_T_booleanArray(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 756 "h245.cnf" +#line 756 "../../asn1/h245/h245.cnf" guint32 value; guint8 *buf; tvbuff_t *value_tvb; @@ -3722,7 +3722,7 @@ dissect_h245_T_booleanArray(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_T_unsignedMin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 772 "h245.cnf" +#line 772 "../../asn1/h245/h245.cnf" guint32 value; guint8 *buf; tvbuff_t *value_tvb; @@ -3748,7 +3748,7 @@ dissect_h245_T_unsignedMin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h245_T_unsignedMax(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 788 "h245.cnf" +#line 788 "../../asn1/h245/h245.cnf" guint32 value; guint8 *buf; tvbuff_t *value_tvb; @@ -3774,7 +3774,7 @@ dissect_h245_T_unsignedMax(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_h245_T_unsigned32Min(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 804 "h245.cnf" +#line 804 "../../asn1/h245/h245.cnf" guint32 value; guint8 *buf; tvbuff_t *value_tvb; @@ -3800,7 +3800,7 @@ dissect_h245_T_unsigned32Min(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_T_unsigned32Max(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 820 "h245.cnf" +#line 820 "../../asn1/h245/h245.cnf" guint32 value; guint8 *buf; tvbuff_t *value_tvb; @@ -3826,7 +3826,7 @@ dissect_h245_T_unsigned32Max(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_T_octetString(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 836 "h245.cnf" +#line 836 "../../asn1/h245/h245.cnf" tvbuff_t *value_tvb; gef_ctx_t *gefx; @@ -3923,7 +3923,7 @@ dissect_h245_GenericParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h245_T_collapsing_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 658 "h245.cnf" +#line 658 "../../asn1/h245/h245.cnf" gef_ctx_t *parent_gefx; parent_gefx = gef_ctx_get(actx->private_data); @@ -3931,7 +3931,7 @@ dissect_h245_T_collapsing_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac offset = dissect_h245_GenericParameter(tvb, offset, actx, tree, hf_index); -#line 663 "h245.cnf" +#line 663 "../../asn1/h245/h245.cnf" actx->private_data = parent_gefx; return offset; @@ -3954,7 +3954,7 @@ dissect_h245_T_collapsing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h245_T_nonCollapsing_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 667 "h245.cnf" +#line 667 "../../asn1/h245/h245.cnf" gef_ctx_t *parent_gefx; parent_gefx = gef_ctx_get(actx->private_data); @@ -3962,7 +3962,7 @@ dissect_h245_T_nonCollapsing_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_h245_GenericParameter(tvb, offset, actx, tree, hf_index); -#line 672 "h245.cnf" +#line 672 "../../asn1/h245/h245.cnf" actx->private_data = parent_gefx; return offset; @@ -3985,7 +3985,7 @@ dissect_h245_T_nonCollapsing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_T_nonCollapsingRaw(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 676 "h245.cnf" +#line 676 "../../asn1/h245/h245.cnf" tvbuff_t *value_tvb; gef_ctx_t *parent_gefx; gef_ctx_t *gefx; @@ -4020,14 +4020,14 @@ static const per_sequence_t GenericCapability_sequence[] = { static int dissect_h245_GenericCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 651 "h245.cnf" +#line 651 "../../asn1/h245/h245.cnf" void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "GenericCapability"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_GenericCapability, GenericCapability_sequence); -#line 654 "h245.cnf" +#line 654 "../../asn1/h245/h245.cnf" actx->private_data = priv_data; return offset; @@ -4072,7 +4072,7 @@ static const per_choice_t Application_choice[] = { static int dissect_h245_Application(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 499 "h245.cnf" +#line 499 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4218,7 +4218,7 @@ dissect_h245_T_payloadDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h245_T_rtpPayloadType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 917 "h245.cnf" +#line 917 "../../asn1/h245/h245.cnf" unsigned int pt; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -4242,7 +4242,7 @@ static const per_sequence_t RTPPayloadType_sequence[] = { static int dissect_h245_RTPPayloadType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 909 "h245.cnf" +#line 909 "../../asn1/h245/h245.cnf" rfc_number = 0; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5638,7 +5638,7 @@ dissect_h245_H263VideoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_H263VideoCapability, H263VideoCapability_sequence); -#line 364 "h245.cnf" +#line 364 "../../asn1/h245/h245.cnf" h245_lc_dissector = h263_handle; return offset; @@ -5731,7 +5731,7 @@ static const per_choice_t VideoCapability_choice[] = { static int dissect_h245_VideoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 489 "h245.cnf" +#line 489 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6051,7 +6051,7 @@ static const per_choice_t AudioCapability_choice[] = { static int dissect_h245_AudioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 479 "h245.cnf" +#line 479 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6633,7 +6633,7 @@ dissect_h245_SET_SIZE_1_256_OF_CapabilityDescriptor(tvbuff_t *tvb _U_, int offse static int dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 624 "h245.cnf" +#line 624 "../../asn1/h245/h245.cnf" guint32 subMessageIdentifer; gef_ctx_t *gefx; @@ -6651,7 +6651,7 @@ dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_h245_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 633 "h245.cnf" +#line 633 "../../asn1/h245/h245.cnf" gef_ctx_t *parent_gefx; parent_gefx = gef_ctx_get(actx->private_data); @@ -6659,7 +6659,7 @@ dissect_h245_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_h245_GenericParameter(tvb, offset, actx, tree, hf_index); -#line 638 "h245.cnf" +#line 638 "../../asn1/h245/h245.cnf" actx->private_data = parent_gefx; return offset; @@ -6688,7 +6688,7 @@ static const per_sequence_t GenericMessage_sequence[] = { static int dissect_h245_GenericMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 610 "h245.cnf" +#line 610 "../../asn1/h245/h245.cnf" void *priv_data = actx->private_data; gef_ctx_t *gefx; @@ -6702,7 +6702,7 @@ dissect_h245_GenericMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_GenericMessage, GenericMessage_sequence); -#line 620 "h245.cnf" +#line 620 "../../asn1/h245/h245.cnf" actx->private_data = priv_data; return offset; @@ -6712,13 +6712,13 @@ dissect_h245_GenericMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_GenericInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 643 "h245.cnf" +#line 643 "../../asn1/h245/h245.cnf" void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "GenericInformation"); offset = dissect_h245_GenericMessage(tvb, offset, actx, tree, hf_index); -#line 646 "h245.cnf" +#line 646 "../../asn1/h245/h245.cnf" actx->private_data = priv_data; return offset; @@ -6753,7 +6753,7 @@ dissect_h245_TerminalCapabilitySet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySet, TerminalCapabilitySet_sequence); -#line 595 "h245.cnf" +#line 595 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSet; @@ -6765,7 +6765,7 @@ if (h245_pi != NULL) static int dissect_h245_LogicalChannelNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 123 "h245.cnf" +#line 123 "../../asn1/h245/h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 65535U, &value, FALSE); @@ -6782,7 +6782,7 @@ static int dissect_h245_OLC_fw_lcn(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 164 "h245.cnf" +#line 164 "../../asn1/h245/h245.cnf" if (upcoming_olc) upcoming_olc->fwd_lc_num = h245_lc_temp; h223_fw_lc_num = h245_lc_temp; @@ -7217,7 +7217,7 @@ static const per_choice_t DataType_choice[] = { static int dissect_h245_DataType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 993 "h245.cnf" +#line 993 "../../asn1/h245/h245.cnf" gint choice_index; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7270,7 +7270,7 @@ dissect_h245_H222LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_h245_T_h223_al_type_al1Framed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 295 "h245.cnf" +#line 295 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1Framed; @@ -7283,7 +7283,7 @@ dissect_h245_T_h223_al_type_al1Framed(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_h245_T_h223_al_type_al1NotFramed(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 300 "h245.cnf" +#line 300 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1NotFramed; @@ -7296,7 +7296,7 @@ dissect_h245_T_h223_al_type_al1NotFramed(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h245_T_h223_al_type_al2WithoutSequenceNumbers(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 305 "h245.cnf" +#line 305 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2WithoutSequenceNumbers; @@ -7309,7 +7309,7 @@ dissect_h245_T_h223_al_type_al2WithoutSequenceNumbers(tvbuff_t *tvb _U_, int off static int dissect_h245_T_h223_al_type_al2WithSequenceNumbers(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 310 "h245.cnf" +#line 310 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2WithSequenceNumbers; @@ -7322,7 +7322,7 @@ dissect_h245_T_h223_al_type_al2WithSequenceNumbers(tvbuff_t *tvb _U_, int offset static int dissect_h245_T_controlFieldOctets(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 324 "h245.cnf" +#line 324 "../../asn1/h245/h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 2U, &value, FALSE); @@ -7338,7 +7338,7 @@ dissect_h245_T_controlFieldOctets(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_al3_sendBufferSize(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 333 "h245.cnf" +#line 333 "../../asn1/h245/h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 16777215U, &value, FALSE); @@ -7369,7 +7369,7 @@ dissect_h245_Al3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ static int dissect_h245_T_h223_al_type_al3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 315 "h245.cnf" +#line 315 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) { h223_lc_params_temp->al_type = al3; h223_lc_params_temp->al_params = se_alloc(sizeof(h223_al3_params)); @@ -7564,7 +7564,7 @@ dissect_h245_H223AL1MParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h245_T_h223_al_type_al1M(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 340 "h245.cnf" +#line 340 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al1M; @@ -7614,7 +7614,7 @@ dissect_h245_H223AL2MParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h245_T_h223_al_type_al2M(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 345 "h245.cnf" +#line 345 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al2M; @@ -7702,7 +7702,7 @@ dissect_h245_H223AL3MParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h245_T_h223_al_type_al3M(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 350 "h245.cnf" +#line 350 "../../asn1/h245/h245.cnf" if(h223_lc_params_temp) h223_lc_params_temp->al_type = al3M; @@ -7751,7 +7751,7 @@ dissect_h245_T_adaptationLayerType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h245_T_h223_lc_segmentableFlag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 357 "h245.cnf" +#line 357 "../../asn1/h245/h245.cnf" gboolean value; offset = dissect_per_boolean(tvb, offset, actx, tree, hf_index, &value); @@ -7781,7 +7781,7 @@ dissect_h245_H223LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_h245_OLC_fw_h223_params(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 186 "h245.cnf" +#line 186 "../../asn1/h245/h245.cnf" h223_fw_lc_params = se_alloc(sizeof(h223_lc_params)); h223_fw_lc_params->al_type = al_nonStandard; h223_fw_lc_params->al_params = NULL; @@ -7955,7 +7955,7 @@ dissect_h245_V76LogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h245_Ipv4_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 851 "h245.cnf" +#line 851 "../../asn1/h245/h245.cnf" tvbuff_t *value_tvb; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -7975,7 +7975,7 @@ dissect_h245_Ipv4_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h245_TsapIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 862 "h245.cnf" +#line 862 "../../asn1/h245/h245.cnf" guint32 tsapIdentifier; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -8232,13 +8232,13 @@ dissect_h245_TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h245_T_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 881 "h245.cnf" +#line 881 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = &upcoming_channel->media_addr; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 885 "h245.cnf" +#line 885 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = NULL; @@ -8249,13 +8249,13 @@ dissect_h245_T_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h245_T_mediaControlChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 899 "h245.cnf" +#line 899 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = &upcoming_channel->media_control_addr; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 903 "h245.cnf" +#line 903 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = NULL; @@ -8386,7 +8386,7 @@ static const per_sequence_t T_forwardLogicalChannelParameters_sequence[] = { static int dissect_h245_T_forwardLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 169 "h245.cnf" +#line 169 "../../asn1/h245/h245.cnf" upcoming_channel = (upcoming_olc) ? &upcoming_olc->fwd_lc : NULL; @@ -8412,7 +8412,7 @@ dissect_h245_T_forwardLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_ static int dissect_h245_OLC_rev_h223_params(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 207 "h245.cnf" +#line 207 "../../asn1/h245/h245.cnf" h223_rev_lc_params = se_alloc(sizeof(h223_lc_params)); h223_rev_lc_params->al_type = al_nonStandard; h223_rev_lc_params->al_params = NULL; @@ -8460,7 +8460,7 @@ static const per_sequence_t OLC_reverseLogicalChannelParameters_sequence[] = { static int dissect_h245_OLC_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 195 "h245.cnf" +#line 195 "../../asn1/h245/h245.cnf" upcoming_channel = (upcoming_olc) ? &upcoming_olc->rev_lc : NULL; @@ -8647,14 +8647,14 @@ static const per_sequence_t EncryptionSync_sequence[] = { static int dissect_h245_EncryptionSync(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 694 "h245.cnf" +#line 694 "../../asn1/h245/h245.cnf" void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "EncryptionSync"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_EncryptionSync, EncryptionSync_sequence); -#line 697 "h245.cnf" +#line 697 "../../asn1/h245/h245.cnf" actx->private_data = priv_data; return offset; @@ -8673,7 +8673,7 @@ static const per_sequence_t OpenLogicalChannel_sequence[] = { int dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 130 "h245.cnf" +#line 130 "../../asn1/h245/h245.cnf" gint32 temp; upcoming_olc = (!actx->pinfo->fd->flags.visited) ? se_alloc0(sizeof(olc_info_t)) : NULL; @@ -8773,7 +8773,7 @@ dissect_h245_CloseLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_CloseLogicalChannel, CloseLogicalChannel_sequence); -#line 553 "h245.cnf" +#line 553 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_CloseLogChn; @@ -8829,7 +8829,7 @@ dissect_h245_RequestChannelClose(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 66 "h245.cnf" +#line 66 "../../asn1/h245/h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 15U, &value, FALSE); @@ -8844,7 +8844,7 @@ dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h245_T_logicalChannelNum(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 93 "h245.cnf" +#line 93 "../../asn1/h245/h245.cnf" /*MultiplexElement/type/logicalChannelNumber*/ guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, @@ -8864,7 +8864,7 @@ static const per_sequence_t T_subElementList_sequence_of[1] = { static int dissect_h245_T_subElementList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 101 "h245.cnf" +#line 101 "../../asn1/h245/h245.cnf" h223_mux_element dummy_me, *parent_me = h223_me; memset (&dummy_me, 0, sizeof (h223_mux_element)); h223_me = &dummy_me; @@ -8906,7 +8906,7 @@ dissect_h245_Me_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_h245_ME_finiteRepeatCount(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 117 "h245.cnf" +#line 117 "../../asn1/h245/h245.cnf" guint32 value; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 1U, 65535U, &value, FALSE); @@ -8923,7 +8923,7 @@ static int dissect_h245_T_untilClosingFlag(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 111 "h245.cnf" +#line 111 "../../asn1/h245/h245.cnf" h223_me->repeat_count = 0; return offset; @@ -8960,7 +8960,7 @@ static const per_sequence_t MultiplexElement_sequence[] = { static int dissect_h245_MultiplexElement(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 83 "h245.cnf" +#line 83 "../../asn1/h245/h245.cnf" /*MultiplexElement*/ h223_mux_element* me = se_alloc(sizeof(h223_mux_element)); h223_me->next = me; @@ -8980,7 +8980,7 @@ static const per_sequence_t T_elementList_sequence_of[1] = { static int dissect_h245_T_elementList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 72 "h245.cnf" +#line 72 "../../asn1/h245/h245.cnf" /* create a h223_mux_element to hold onto the head of the list, since * h223_me will track the tail */ h223_mux_element dummy_me; @@ -9006,7 +9006,7 @@ static const per_sequence_t MultiplexEntryDescriptor_sequence[] = { static int dissect_h245_MultiplexEntryDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 54 "h245.cnf" +#line 54 "../../asn1/h245/h245.cnf" /*MultiplexEntryDescriptor*/ h223_me = NULL; h223_mc = 0; @@ -9271,7 +9271,7 @@ static const per_choice_t VideoMode_choice[] = { static int dissect_h245_VideoMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 517 "h245.cnf" +#line 517 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9599,7 +9599,7 @@ static const per_choice_t AudioMode_choice[] = { static int dissect_h245_AudioMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 508 "h245.cnf" +#line 508 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -9668,7 +9668,7 @@ static const per_choice_t DataModeApplication_choice[] = { static int dissect_h245_DataModeApplication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 526 "h245.cnf" +#line 526 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -10657,7 +10657,7 @@ static const per_choice_t RequestMessage_choice[] = { static int dissect_h245_RequestMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 368 "h245.cnf" +#line 368 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -10734,7 +10734,7 @@ dissect_h245_MasterSlaveDeterminationAck(tvbuff_t *tvb _U_, int offset _U_, asn1 offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationAck, MasterSlaveDeterminationAck_sequence); -#line 535 "h245.cnf" +#line 535 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDetAck; @@ -10773,7 +10773,7 @@ dissect_h245_MasterSlaveDeterminationReject(tvbuff_t *tvb _U_, int offset _U_, a offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationReject, MasterSlaveDeterminationReject_sequence); -#line 541 "h245.cnf" +#line 541 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDetRjc; @@ -10793,7 +10793,7 @@ dissect_h245_TerminalCapabilitySetAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ct offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetAck, TerminalCapabilitySetAck_sequence); -#line 571 "h245.cnf" +#line 571 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSetAck; @@ -10862,7 +10862,7 @@ dissect_h245_TerminalCapabilitySetReject(tvbuff_t *tvb _U_, int offset _U_, asn1 offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetReject, TerminalCapabilitySetReject_sequence); -#line 583 "h245.cnf" +#line 583 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSetRjc; @@ -10876,7 +10876,7 @@ static int dissect_h245_OLC_ack_fw_lcn(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 275 "h245.cnf" +#line 275 "../../asn1/h245/h245.cnf" if (upcoming_olc) upcoming_olc->fwd_lc_num = h245_lc_temp; h223_fw_lc_num = h245_lc_temp; @@ -10889,7 +10889,7 @@ static int dissect_h245_T_reverseLogicalChannelNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_h245_LogicalChannelNumber(tvb, offset, actx, tree, hf_index); -#line 289 "h245.cnf" +#line 289 "../../asn1/h245/h245.cnf" h223_rev_lc_num = h245_lc_temp; return offset; @@ -10938,13 +10938,13 @@ dissect_h245_OLC_ack_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offs static int dissect_h245_Ack_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 872 "h245.cnf" +#line 872 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = &upcoming_channel->media_addr; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 876 "h245.cnf" +#line 876 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = NULL; @@ -10955,13 +10955,13 @@ dissect_h245_Ack_mediaChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_h245_Ack_mediaControlChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 890 "h245.cnf" +#line 890 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = &upcoming_channel->media_control_addr; offset = dissect_h245_TransportAddress(tvb, offset, actx, tree, hf_index); -#line 894 "h245.cnf" +#line 894 "../../asn1/h245/h245.cnf" if (upcoming_channel) upcoming_channel->upcoming_addr = NULL; @@ -11001,7 +11001,7 @@ static const per_choice_t T_forwardMultiplexAckParameters_choice[] = { static int dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 280 "h245.cnf" +#line 280 "../../asn1/h245/h245.cnf" upcoming_channel = (upcoming_olc) ? &upcoming_olc->fwd_lc : NULL; @@ -11029,7 +11029,7 @@ static const per_sequence_t OpenLogicalChannelAck_sequence[] = { static int dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 219 "h245.cnf" +#line 219 "../../asn1/h245/h245.cnf" guint32 temp; int p2p_dir; h223_pending_olc *pend; @@ -11153,7 +11153,7 @@ dissect_h245_OpenLogicalChannelReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ct offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelReject, OpenLogicalChannelReject_sequence); -#line 547 "h245.cnf" +#line 547 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChnRjc; @@ -11172,7 +11172,7 @@ dissect_h245_CloseLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_CloseLogicalChannelAck, CloseLogicalChannelAck_sequence); -#line 559 "h245.cnf" +#line 559 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_CloseLogChnAck; @@ -12296,7 +12296,7 @@ static const per_choice_t ResponseMessage_choice[] = { static int dissect_h245_ResponseMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 406 "h245.cnf" +#line 406 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -13336,7 +13336,7 @@ static const per_choice_t CommandMessage_choice[] = { static int dissect_h245_CommandMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 455 "h245.cnf" +#line 455 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -13400,7 +13400,7 @@ dissect_h245_MasterSlaveDeterminationRelease(tvbuff_t *tvb _U_, int offset _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_MasterSlaveDeterminationRelease, MasterSlaveDeterminationRelease_sequence); -#line 589 "h245.cnf" +#line 589 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_MastSlvDetRls; @@ -13419,7 +13419,7 @@ dissect_h245_TerminalCapabilitySetRelease(tvbuff_t *tvb _U_, int offset _U_, asn offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_TerminalCapabilitySetRelease, TerminalCapabilitySetRelease_sequence); -#line 601 "h245.cnf" +#line 601 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_TermCapSetRls; @@ -13439,7 +13439,7 @@ dissect_h245_OpenLogicalChannelConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_c offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelConfirm, OpenLogicalChannelConfirm_sequence); -#line 565 "h245.cnf" +#line 565 "../../asn1/h245/h245.cnf" if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChnCnf; @@ -14212,7 +14212,7 @@ dissect_h245_FunctionNotSupportedCause(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_h245_T_returnedFunction(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 975 "h245.cnf" +#line 975 "../../asn1/h245/h245.cnf" tvbuff_t *next_tvb = NULL; proto_item *item; proto_tree *subtree; @@ -14405,7 +14405,7 @@ static const per_choice_t IndicationMessage_choice[] = { static int dissect_h245_IndicationMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 431 "h245.cnf" +#line 431 "../../asn1/h245/h245.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -14471,7 +14471,7 @@ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-h245-fn.c ---*/ -#line 399 "packet-h245-template.c" +#line 399 "../../asn1/h245/packet-h245-template.c" static void dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -14549,7 +14549,7 @@ void proto_register_h245(void) { VALS(H221ManufacturerCode_vals), 0, "h245.H.221 Manufacturer", HFILL }}, /*--- Included file: packet-h245-hfarr.c ---*/ -#line 1 "packet-h245-hfarr.c" +#line 1 "../../asn1/h245/packet-h245-hfarr.c" { &hf_h245_OpenLogicalChannel_PDU, { "OpenLogicalChannel", "h245.OpenLogicalChannel", FT_NONE, BASE_NONE, NULL, 0, @@ -20160,7 +20160,7 @@ void proto_register_h245(void) { NULL, HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ -#line 475 "packet-h245-template.c" +#line 475 "../../asn1/h245/packet-h245-template.c" }; /* List of subtrees */ @@ -20169,7 +20169,7 @@ void proto_register_h245(void) { &ett_h245_returnedFunction, /*--- Included file: packet-h245-ettarr.c ---*/ -#line 1 "packet-h245-ettarr.c" +#line 1 "../../asn1/h245/packet-h245-ettarr.c" &ett_h245_MultimediaSystemControlMessage, &ett_h245_RequestMessage, &ett_h245_ResponseMessage, @@ -20663,7 +20663,7 @@ void proto_register_h245(void) { &ett_h245_MobileMultilinkReconfigurationIndication, /*--- End of included file: packet-h245-ettarr.c ---*/ -#line 482 "packet-h245-template.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 6e314ae984..99b178397c 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -5,7 +5,7 @@ /* Input file: packet-h245-template.h */ -#line 1 "packet-h245-template.h" +#line 1 "../../asn1/h245/packet-h245-template.h" /* packet-h245.h * Routines for h245 packet dissection * Copyright 2005, Anders Broman @@ -131,7 +131,7 @@ extern void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle ); /*--- Included file: packet-h245-exp.h ---*/ -#line 1 "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[]; @@ -149,7 +149,7 @@ int dissect_h245_UnicastAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a 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 125 "packet-h245-template.h" +#line 125 "../../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-h282.c b/epan/dissectors/packet-h282.c index 84add8e233..b5b990ef34 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -5,7 +5,7 @@ /* Input file: packet-h282-template.c */ -#line 1 "packet-h282-template.c" +#line 1 "../../asn1/h282/packet-h282-template.c" /* packet-h282.c * Routines for H.282 packet dissection * 2007 Tomas Kukosa @@ -50,7 +50,7 @@ static int proto_h282 = -1; /*--- Included file: packet-h282-hf.c ---*/ -#line 1 "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 */ @@ -486,13 +486,13 @@ static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndica static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ /*--- End of included file: packet-h282-hf.c ---*/ -#line 44 "packet-h282-template.c" +#line 44 "../../asn1/h282/packet-h282-template.c" /* Initialize the subtree pointers */ static int ett_h282 = -1; /*--- Included file: packet-h282-ett.c ---*/ -#line 1 "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; @@ -638,7 +638,7 @@ static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; /*--- End of included file: packet-h282-ett.c ---*/ -#line 48 "packet-h282-template.c" +#line 48 "../../asn1/h282/packet-h282-template.c" /* Dissectors */ @@ -646,7 +646,7 @@ static gint ett_h282_IndicationPDU = -1; /*--- Included file: packet-h282-fn.c ---*/ -#line 1 "packet-h282-fn.c" +#line 1 "../../asn1/h282/packet-h282-fn.c" static int @@ -4258,7 +4258,7 @@ static const per_choice_t RequestPDU_choice[] = { static int dissect_h282_RequestPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 24 "h282.cnf" +#line 24 "../../asn1/h282/h282.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -4266,7 +4266,7 @@ dissect_h282_RequestPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_h282_RequestPDU, RequestPDU_choice, &msg_type); -#line 27 "h282.cnf" +#line 27 "../../asn1/h282/h282.cnf" p = match_strval(msg_type, VALS(h282_RequestPDU_vals)); if (p) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p); @@ -4301,7 +4301,7 @@ static const per_choice_t ResponsePDU_choice[] = { static int dissect_h282_ResponsePDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 35 "h282.cnf" +#line 35 "../../asn1/h282/h282.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -4309,7 +4309,7 @@ dissect_h282_ResponsePDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ ett_h282_ResponsePDU, ResponsePDU_choice, &msg_type); -#line 38 "h282.cnf" +#line 38 "../../asn1/h282/h282.cnf" p = match_strval(msg_type, VALS(h282_ResponsePDU_vals)); if (p) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p); @@ -4336,7 +4336,7 @@ static const per_choice_t IndicationPDU_choice[] = { static int dissect_h282_IndicationPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 46 "h282.cnf" +#line 46 "../../asn1/h282/h282.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -4344,7 +4344,7 @@ dissect_h282_IndicationPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ ett_h282_IndicationPDU, IndicationPDU_choice, &msg_type); -#line 49 "h282.cnf" +#line 49 "../../asn1/h282/h282.cnf" p = match_strval(msg_type, VALS(h282_IndicationPDU_vals)); if (p) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "IndicationPDU/%s", p); @@ -4397,7 +4397,7 @@ static int dissect_RDCPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h282-fn.c ---*/ -#line 54 "packet-h282-template.c" +#line 54 "../../asn1/h282/packet-h282-template.c" static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -4420,7 +4420,7 @@ void proto_register_h282(void) { static hf_register_info hf[] = { /*--- Included file: packet-h282-hfarr.c ---*/ -#line 1 "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, @@ -6155,7 +6155,7 @@ void proto_register_h282(void) { "NonStandardPDU", HFILL }}, /*--- End of included file: packet-h282-hfarr.c ---*/ -#line 75 "packet-h282-template.c" +#line 75 "../../asn1/h282/packet-h282-template.c" }; /* List of subtrees */ @@ -6163,7 +6163,7 @@ void proto_register_h282(void) { &ett_h282, /*--- Included file: packet-h282-ettarr.c ---*/ -#line 1 "packet-h282-ettarr.c" +#line 1 "../../asn1/h282/packet-h282-ettarr.c" &ett_h282_Key, &ett_h282_NonStandardParameter, &ett_h282_NonStandardIdentifier, @@ -6309,7 +6309,7 @@ void proto_register_h282(void) { &ett_h282_IndicationPDU, /*--- End of included file: packet-h282-ettarr.c ---*/ -#line 81 "packet-h282-template.c" +#line 81 "../../asn1/h282/packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index d5ef1670b3..59243317a4 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -5,7 +5,7 @@ /* Input file: packet-h283-template.c */ -#line 1 "packet-h283-template.c" +#line 1 "../../asn1/h283/packet-h283-template.c" /* packet-h283.c * Routines for H.283 packet dissection * 2007 Tomas Kukosa @@ -50,7 +50,7 @@ static int proto_h283 = -1; /*--- Included file: packet-h283-hf.c ---*/ -#line 1 "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 */ @@ -85,13 +85,13 @@ static int hf_h283_deviceListResp = -1; /* T_deviceListResp */ static int hf_h283_deviceChange = -1; /* NULL */ /*--- End of included file: packet-h283-hf.c ---*/ -#line 44 "packet-h283-template.c" +#line 44 "../../asn1/h283/packet-h283-template.c" /* Initialize the subtree pointers */ static int ett_h283 = -1; /*--- Included file: packet-h283-ett.c ---*/ -#line 1 "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; @@ -108,7 +108,7 @@ static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; /*--- End of included file: packet-h283-ett.c ---*/ -#line 48 "packet-h283-template.c" +#line 48 "../../asn1/h283/packet-h283-template.c" /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; @@ -119,7 +119,7 @@ static gboolean info_is_set; /*--- Included file: packet-h283-fn.c ---*/ -#line 1 "packet-h283-fn.c" +#line 1 "../../asn1/h283/packet-h283-fn.c" static int @@ -270,7 +270,7 @@ static const per_choice_t LCTRequest_choice[] = { static int dissect_h283_LCTRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 58 "h283.cnf" +#line 58 "../../asn1/h283/h283.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -278,7 +278,7 @@ dissect_h283_LCTRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_h283_LCTRequest, LCTRequest_choice, &msg_type); -#line 61 "h283.cnf" +#line 61 "../../asn1/h283/h283.cnf" p = match_strval(msg_type, VALS(h283_LCTRequest_vals)); if (!info_is_set && p ) { col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTRequest/%s", p); @@ -292,7 +292,7 @@ dissect_h283_LCTRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h283_T_deviceListResp(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 105 "h283.cnf" +#line 105 "../../asn1/h283/h283.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -321,7 +321,7 @@ static const per_choice_t LCTResponse_choice[] = { static int dissect_h283_LCTResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 71 "h283.cnf" +#line 71 "../../asn1/h283/h283.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -329,7 +329,7 @@ dissect_h283_LCTResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ ett_h283_LCTResponse, LCTResponse_choice, &msg_type); -#line 74 "h283.cnf" +#line 74 "../../asn1/h283/h283.cnf" p = match_strval(msg_type, VALS(h283_LCTResponse_vals)); if (!info_is_set && p ) { col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTResponse/%s", p); @@ -352,7 +352,7 @@ static const per_choice_t LCTIndication_choice[] = { static int dissect_h283_LCTIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 84 "h283.cnf" +#line 84 "../../asn1/h283/h283.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -360,7 +360,7 @@ dissect_h283_LCTIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ ett_h283_LCTIndication, LCTIndication_choice, &msg_type); -#line 87 "h283.cnf" +#line 87 "../../asn1/h283/h283.cnf" p = match_strval(msg_type, VALS(h283_LCTIndication_vals)); if (!info_is_set && p ) { col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTIndication/%s", p); @@ -416,7 +416,7 @@ static const per_choice_t LCTMessage_choice[] = { static int dissect_h283_LCTMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 45 "h283.cnf" +#line 45 "../../asn1/h283/h283.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -424,7 +424,7 @@ dissect_h283_LCTMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_h283_LCTMessage, LCTMessage_choice, &msg_type); -#line 48 "h283.cnf" +#line 48 "../../asn1/h283/h283.cnf" p = match_strval(msg_type, VALS(h283_LCTMessage_vals)); if (!info_is_set && p ) { col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTMessage/%s", p); @@ -438,7 +438,7 @@ dissect_h283_LCTMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h283_T_rdcPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 95 "h283.cnf" +#line 95 "../../asn1/h283/h283.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -468,7 +468,7 @@ static const per_choice_t T_dataType_choice[] = { static int dissect_h283_T_dataType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 32 "h283.cnf" +#line 32 "../../asn1/h283/h283.cnf" gint32 data_type = -1; const gchar *p = NULL; @@ -476,7 +476,7 @@ dissect_h283_T_dataType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_h283_T_dataType, T_dataType_choice, &data_type); -#line 35 "h283.cnf" +#line 35 "../../asn1/h283/h283.cnf" p = match_strval(data_type, VALS(h283_T_dataType_vals)); if (!info_is_set && p ) { col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RDCData/%s", p); @@ -516,7 +516,7 @@ static const per_choice_t T_pduType_choice[] = { static int dissect_h283_T_pduType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 19 "h283.cnf" +#line 19 "../../asn1/h283/h283.cnf" gint32 pdu_type = -1; const gchar *p = NULL; @@ -524,7 +524,7 @@ dissect_h283_T_pduType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_h283_T_pduType, T_pduType_choice, &pdu_type); -#line 22 "h283.cnf" +#line 22 "../../asn1/h283/h283.cnf" p = match_strval(pdu_type, VALS(h283_T_pduType_vals)); if (!info_is_set && p ) { col_set_str(actx->pinfo->cinfo, COL_INFO, p); @@ -566,7 +566,7 @@ static int dissect_LCTPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h283-fn.c ---*/ -#line 57 "packet-h283-template.c" +#line 57 "../../asn1/h283/packet-h283-template.c" static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -591,7 +591,7 @@ void proto_register_h283(void) { static hf_register_info hf[] = { /*--- Included file: packet-h283-hfarr.c ---*/ -#line 1 "packet-h283-hfarr.c" +#line 1 "../../asn1/h283/packet-h283-hfarr.c" { &hf_h283_LCTPDU_PDU, { "LCTPDU", "h283.LCTPDU", FT_NONE, BASE_NONE, NULL, 0, @@ -722,7 +722,7 @@ void proto_register_h283(void) { NULL, HFILL }}, /*--- End of included file: packet-h283-hfarr.c ---*/ -#line 80 "packet-h283-template.c" +#line 80 "../../asn1/h283/packet-h283-template.c" }; /* List of subtrees */ @@ -730,7 +730,7 @@ void proto_register_h283(void) { &ett_h283, /*--- Included file: packet-h283-ettarr.c ---*/ -#line 1 "packet-h283-ettarr.c" +#line 1 "../../asn1/h283/packet-h283-ettarr.c" &ett_h283_H221NonStandard, &ett_h283_NonStandardIdentifier, &ett_h283_NonStandardParameter, @@ -747,7 +747,7 @@ void proto_register_h283(void) { &ett_h283_NonStandardMessage, /*--- End of included file: packet-h283-ettarr.c ---*/ -#line 86 "packet-h283-template.c" +#line 86 "../../asn1/h283/packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 966ccfe8cb..0b52c13c00 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -5,7 +5,7 @@ /* Input file: packet-h323-template.c */ -#line 1 "packet-h323-template.c" +#line 1 "../../asn1/h323/packet-h323-template.c" /* packet-h323.c * Routines for H.323 packet dissection * 2007 Tomas Kukosa @@ -99,7 +99,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) { static int proto_h323 = -1; /*--- Included file: packet-h323-hf.c ---*/ -#line 1 "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 */ @@ -130,12 +130,12 @@ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ /*--- End of included file: packet-h323-hf.c ---*/ -#line 93 "packet-h323-template.c" +#line 93 "../../asn1/h323/packet-h323-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-h323-ett.c ---*/ -#line 1 "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; @@ -151,11 +151,11 @@ static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; /*--- End of included file: packet-h323-ett.c ---*/ -#line 96 "packet-h323-template.c" +#line 96 "../../asn1/h323/packet-h323-template.c" /*--- Included file: packet-h323-fn.c ---*/ -#line 1 "packet-h323-fn.c" +#line 1 "../../asn1/h323/packet-h323-fn.c" static int @@ -442,7 +442,7 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h323-fn.c ---*/ -#line 98 "packet-h323-template.c" +#line 98 "../../asn1/h323/packet-h323-template.c" /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { @@ -451,7 +451,7 @@ void proto_register_h323(void) { static hf_register_info hf[] = { /*--- Included file: packet-h323-hfarr.c ---*/ -#line 1 "packet-h323-hfarr.c" +#line 1 "../../asn1/h323/packet-h323-hfarr.c" { &hf_h323_RasTunnelledSignallingMessage_PDU, { "RasTunnelledSignallingMessage", "h323.RasTunnelledSignallingMessage", FT_NONE, BASE_NONE, NULL, 0, @@ -566,14 +566,14 @@ void proto_register_h323(void) { NULL, HFILL }}, /*--- End of included file: packet-h323-hfarr.c ---*/ -#line 105 "packet-h323-template.c" +#line 105 "../../asn1/h323/packet-h323-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-h323-ettarr.c ---*/ -#line 1 "packet-h323-ettarr.c" +#line 1 "../../asn1/h323/packet-h323-ettarr.c" &ett_h323_RasTunnelledSignallingMessage, &ett_h323_T_messageContent, &ett_h323_RobustnessData, @@ -589,7 +589,7 @@ void proto_register_h323(void) { &ett_h323_StatusInquiry_RD, /*--- End of included file: packet-h323-ettarr.c ---*/ -#line 110 "packet-h323-template.c" +#line 110 "../../asn1/h323/packet-h323-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.h b/epan/dissectors/packet-h323.h index b8381d84c2..7595b56f53 100644 --- a/epan/dissectors/packet-h323.h +++ b/epan/dissectors/packet-h323.h @@ -5,7 +5,7 @@ /* Input file: packet-h323-template.h */ -#line 1 "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 294f05ad5a..63c27402f7 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -5,7 +5,7 @@ /* Input file: packet-h450-ros-template.c */ -#line 1 "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 @@ -50,7 +50,7 @@ static int proto_h450_ros = -1; /*--- Included file: packet-h450-ros-hf.c ---*/ -#line 1 "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 */ @@ -73,12 +73,12 @@ 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 44 "packet-h450-ros-template.c" +#line 44 "../../asn1/h450-ros/packet-h450-ros-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-h450-ros-ett.c ---*/ -#line 1 "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; @@ -89,7 +89,7 @@ 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 47 "packet-h450-ros-template.c" +#line 47 "../../asn1/h450-ros/packet-h450-ros-template.c" /* Preferences */ @@ -118,7 +118,7 @@ error_cb(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_) { /*--- Included file: packet-h450-ros-fn.c ---*/ -#line 1 "packet-h450-ros-fn.c" +#line 1 "../../asn1/h450-ros/packet-h450-ros-fn.c" static int @@ -156,7 +156,7 @@ dissect_h450_ros_Code(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p ett_h450_ros_Code, Code_choice, &actx->rose_ctx->d.code); -#line 40 "h450-ros.cnf" +#line 40 "../../asn1/h450-ros/h450-ros.cnf" actx->rose_ctx->d.code_item = actx->created_item; return offset; @@ -175,7 +175,7 @@ dissect_h450_ros_InvokeId(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_h450_ros_T_invokeIdConstrained(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 68 "h450-ros.cnf" +#line 68 "../../asn1/h450-ros/h450-ros.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, NULL, TRUE); @@ -203,7 +203,7 @@ static const per_sequence_t Invoke_sequence[] = { static int dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 8 "ros-inv.cnf" +#line 8 "../../asn1/ros/ros-inv.cnf" dissector_handle_t arg_handle = NULL; const gchar *descr = ""; @@ -212,7 +212,7 @@ dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h450_ros_Invoke, Invoke_sequence); -#line 13 "ros-inv.cnf" +#line 13 "../../asn1/ros/ros-inv.cnf" actx->rose_ctx->d.pdu = 1; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->arg_local_dissector_table) { @@ -285,7 +285,7 @@ static const per_sequence_t ReturnResult_sequence[] = { static int dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 7 "ros-res.cnf" +#line 7 "../../asn1/ros/ros-res.cnf" dissector_handle_t res_handle = NULL; const gchar *descr = ""; @@ -295,7 +295,7 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h450_ros_ReturnResult, ReturnResult_sequence); -#line 13 "ros-res.cnf" +#line 13 "../../asn1/ros/ros-res.cnf" actx->rose_ctx->d.pdu = 2; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) { @@ -356,7 +356,7 @@ static const per_sequence_t ReturnError_sequence[] = { static int dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 7 "ros-err.cnf" +#line 7 "../../asn1/ros/ros-err.cnf" dissector_handle_t err_handle = NULL; const gchar *descr = ""; @@ -365,7 +365,7 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h450_ros_ReturnError, ReturnError_sequence); -#line 12 "ros-err.cnf" +#line 12 "../../asn1/ros/ros-err.cnf" actx->rose_ctx->d.pdu = 3; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->err_local_dissector_table) { @@ -418,7 +418,7 @@ static int dissect_h450_ros_GeneralProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); -#line 51 "h450-ros.cnf" +#line 51 "../../asn1/h450-ros/h450-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_GeneralProblem_vals), ""), 64); problem_str[64-1] = '\0'; @@ -443,7 +443,7 @@ static int dissect_h450_ros_InvokeProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); -#line 54 "h450-ros.cnf" +#line 54 "../../asn1/h450-ros/h450-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_InvokeProblem_vals), ""), 64); problem_str[64-1] = '\0'; @@ -463,7 +463,7 @@ static int dissect_h450_ros_ReturnResultProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); -#line 57 "h450-ros.cnf" +#line 57 "../../asn1/h450-ros/h450-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_ReturnResultProblem_vals), ""), 64); problem_str[64-1] = '\0'; @@ -485,7 +485,7 @@ static int dissect_h450_ros_ReturnErrorProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); -#line 60 "h450-ros.cnf" +#line 60 "../../asn1/h450-ros/h450-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(h450_ros_ReturnErrorProblem_vals), ""), 64); problem_str[64-1] = '\0'; @@ -527,7 +527,7 @@ static const per_sequence_t Reject_sequence[] = { static int dissect_h450_ros_Reject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 7 "ros-rej.cnf" +#line 7 "../../asn1/ros/ros-rej.cnf" const gchar *descr = ""; problem_str[0] = '\0'; @@ -535,7 +535,7 @@ dissect_h450_ros_Reject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h450_ros_Reject, Reject_sequence); -#line 11 "ros-rej.cnf" +#line 11 "../../asn1/ros/ros-rej.cnf" descr = ep_strdup_printf("REJ: %s", problem_str); if (actx->rose_ctx->apdu_depth >= 0) @@ -567,7 +567,7 @@ static const per_choice_t ROS_choice[] = { 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_) { -#line 29 "h450-ros.cnf" +#line 29 "../../asn1/h450-ros/h450-ros.cnf" DISSECTOR_ASSERT(actx->rose_ctx); rose_ctx_clean_data(actx->rose_ctx); @@ -580,7 +580,7 @@ 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 74 "packet-h450-ros-template.c" +#line 74 "../../asn1/h450-ros/packet-h450-ros-template.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { @@ -589,7 +589,7 @@ void proto_register_h450_ros(void) { static hf_register_info hf[] = { /*--- Included file: packet-h450-ros-hfarr.c ---*/ -#line 1 "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, @@ -672,14 +672,14 @@ void proto_register_h450_ros(void) { "ReturnErrorProblem", HFILL }}, /*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 81 "packet-h450-ros-template.c" +#line 81 "../../asn1/h450-ros/packet-h450-ros-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-h450-ros-ettarr.c ---*/ -#line 1 "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, @@ -690,7 +690,7 @@ void proto_register_h450_ros(void) { &ett_h450_ros_T_problem, /*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 86 "packet-h450-ros-template.c" +#line 86 "../../asn1/h450-ros/packet-h450-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-h450-ros.h b/epan/dissectors/packet-h450-ros.h index e79cb801f1..cf0e9b949e 100644 --- a/epan/dissectors/packet-h450-ros.h +++ b/epan/dissectors/packet-h450-ros.h @@ -5,7 +5,7 @@ /* Input file: packet-h450-ros-template.h */ -#line 1 "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 @@ -36,12 +36,12 @@ /*--- Included file: packet-h450-ros-exp.h ---*/ -#line 1 "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 30 "packet-h450-ros-template.h" +#line 30 "../../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 d676c50839..5caea32b45 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -5,7 +5,7 @@ /* Input file: packet-h450-template.c */ -#line 1 "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: @@ -60,7 +60,7 @@ static int hf_h450_operation = -1; static int hf_h450_error = -1; /*--- Included file: packet-h450-hf.c ---*/ -#line 1 "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 --- --- --- */ @@ -447,12 +447,12 @@ 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 54 "packet-h450-template.c" +#line 54 "../../asn1/h450/packet-h450-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-h450-ett.c ---*/ -#line 1 "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 --- --- --- */ @@ -625,12 +625,12 @@ static gint ett_h450_12_FeatureValues = -1; static gint ett_h450_12_FeatureControl = -1; /*--- End of included file: packet-h450-ett.c ---*/ -#line 57 "packet-h450-template.c" +#line 57 "../../asn1/h450/packet-h450-template.c" static const value_string h450_str_operation[] = { /*--- Included file: packet-h450-table10.c ---*/ -#line 1 "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 --- --- --- */ @@ -728,14 +728,14 @@ static const value_string h450_str_operation[] = { { 85, "cmnInform" }, /*--- End of included file: packet-h450-table10.c ---*/ -#line 60 "packet-h450-template.c" +#line 60 "../../asn1/h450/packet-h450-template.c" { 0, NULL} }; static const value_string h450_str_error[] = { /*--- Included file: packet-h450-table20.c ---*/ -#line 1 "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 --- --- --- */ @@ -816,7 +816,7 @@ static const value_string h450_str_error[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table20.c ---*/ -#line 65 "packet-h450-template.c" +#line 65 "../../asn1/h450/packet-h450-template.c" { 0, NULL} }; @@ -827,7 +827,7 @@ static rose_ctx_t h450_rose_ctx; /*--- Included file: packet-h450-fn.c ---*/ -#line 1 "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 --- --- --- */ @@ -916,7 +916,7 @@ dissect_h450_InterpretationApdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h450_T_rosApdus_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 62 "h450.cnf" +#line 62 "../../asn1/h450/h450.cnf" h450_rose_ctx.apdu_depth = 1; actx->rose_ctx = &h450_rose_ctx; @@ -969,7 +969,7 @@ static const per_sequence_t h450_H4501SupplementaryService_sequence[] = { static int dissect_h450_H4501SupplementaryService(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 55 "h450.cnf" +#line 55 "../../asn1/h450/h450.cnf" proto_item *hidden_item; hidden_item = proto_tree_add_item(tree, proto_h450, tvb, offset, -1, FALSE); @@ -4481,7 +4481,7 @@ static int dissect_h450_12_CmnArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h450-fn.c ---*/ -#line 74 "packet-h450-template.c" +#line 74 "../../asn1/h450/packet-h450-template.c" typedef struct _h450_op_t { gint32 opcode; @@ -4492,7 +4492,7 @@ typedef struct _h450_op_t { static const h450_op_t h450_op_tab[] = { /*--- Included file: packet-h450-table11.c ---*/ -#line 1 "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 --- --- --- */ @@ -4590,7 +4590,7 @@ static const h450_op_t h450_op_tab[] = { /* cmnInform */ { 85, dissect_h450_12_CmnArg_PDU, NULL }, /*--- End of included file: packet-h450-table11.c ---*/ -#line 83 "packet-h450-template.c" +#line 83 "../../asn1/h450/packet-h450-template.c" }; typedef struct _h450_err_t { @@ -4601,7 +4601,7 @@ typedef struct _h450_err_t { static const h450_err_t h450_err_tab[] = { /*--- Included file: packet-h450-table21.c ---*/ -#line 1 "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 --- --- --- */ @@ -4682,7 +4682,7 @@ static const h450_err_t h450_err_tab[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table21.c ---*/ -#line 92 "packet-h450-template.c" +#line 92 "../../asn1/h450/packet-h450-template.c" }; static const h450_op_t *get_op(gint32 opcode) { @@ -4844,7 +4844,7 @@ void proto_register_h450(void) { NULL, HFILL }}, /*--- Included file: packet-h450-hfarr.c ---*/ -#line 1 "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 --- --- --- */ @@ -6275,14 +6275,14 @@ void proto_register_h450(void) { NULL, HFILL }}, /*--- End of included file: packet-h450-hfarr.c ---*/ -#line 252 "packet-h450-template.c" +#line 252 "../../asn1/h450/packet-h450-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-h450-ettarr.c ---*/ -#line 1 "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 --- --- --- */ @@ -6455,7 +6455,7 @@ void proto_register_h450(void) { &ett_h450_12_FeatureControl, /*--- End of included file: packet-h450-ettarr.c ---*/ -#line 257 "packet-h450-template.c" +#line 257 "../../asn1/h450/packet-h450-template.c" }; diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 01473fdac1..32a5057262 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -5,7 +5,7 @@ /* Input file: packet-h460-template.c */ -#line 1 "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 @@ -55,7 +55,7 @@ static int proto_h460 = -1; /*--- Included file: packet-h460-hf.c ---*/ -#line 1 "packet-h460-hf.c" +#line 1 "../../asn1/h460/packet-h460-hf.c" /* --- Module NUMBER-PORTABILITY --- --- --- */ @@ -258,12 +258,12 @@ 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 49 "packet-h460-template.c" +#line 49 "../../asn1/h460/packet-h460-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-h460-ett.c ---*/ -#line 1 "packet-h460-ett.c" +#line 1 "../../asn1/h460/packet-h460-ett.c" /* --- Module NUMBER-PORTABILITY --- --- --- */ @@ -355,7 +355,7 @@ 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 52 "packet-h460-template.c" +#line 52 "../../asn1/h460/packet-h460-template.c" /* Subdissectors */ static dissector_handle_t q931_ie_handle = NULL; @@ -363,7 +363,7 @@ static dissector_handle_t h225_ras_handle = NULL; /*--- Included file: packet-h460-fn.c ---*/ -#line 1 "packet-h460-fn.c" +#line 1 "../../asn1/h460/packet-h460-fn.c" /* --- Module NUMBER-PORTABILITY --- --- --- */ @@ -1966,7 +1966,7 @@ static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet /*--- End of included file: packet-h460-fn.c ---*/ -#line 58 "packet-h460-template.c" +#line 58 "../../asn1/h460/packet-h460-template.c" static int dissect_ies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -2158,7 +2158,7 @@ void proto_register_h460(void) { static hf_register_info hf[] = { /*--- Included file: packet-h460-hfarr.c ---*/ -#line 1 "packet-h460-hfarr.c" +#line 1 "../../asn1/h460/packet-h460-hfarr.c" /* --- Module NUMBER-PORTABILITY --- --- --- */ @@ -2871,14 +2871,14 @@ void proto_register_h460(void) { "UnicastAddress", HFILL }}, /*--- End of included file: packet-h460-hfarr.c ---*/ -#line 248 "packet-h460-template.c" +#line 248 "../../asn1/h460/packet-h460-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-h460-ettarr.c ---*/ -#line 1 "packet-h460-ettarr.c" +#line 1 "../../asn1/h460/packet-h460-ettarr.c" /* --- Module NUMBER-PORTABILITY --- --- --- */ @@ -2970,7 +2970,7 @@ void proto_register_h460(void) { &ett_h460_21_TransmitCapabilities, /*--- End of included file: packet-h460-ettarr.c ---*/ -#line 253 "packet-h460-template.c" +#line 253 "../../asn1/h460/packet-h460-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index beccf13160..1b1f22496c 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -5,7 +5,7 @@ /* Input file: packet-h501-template.c */ -#line 1 "packet-h501-template.c" +#line 1 "../../asn1/h501/packet-h501-template.c" /* packet-h501.c * Routines for H.501 packet dissection * 2007 Tomas Kukosa @@ -54,7 +54,7 @@ static int proto_h501 = -1; /*--- Included file: packet-h501-hf.c ---*/ -#line 1 "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 */ @@ -307,13 +307,13 @@ 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 48 "packet-h501-template.c" +#line 48 "../../asn1/h501/packet-h501-template.c" /* Initialize the subtree pointers */ static int ett_h501 = -1; /*--- Included file: packet-h501-ett.c ---*/ -#line 1 "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; @@ -415,7 +415,7 @@ static gint ett_h501_Role = -1; static gint ett_h501_TerminationCause = -1; /*--- End of included file: packet-h501-ett.c ---*/ -#line 52 "packet-h501-template.c" +#line 52 "../../asn1/h501/packet-h501-template.c" /* Dissectors */ static dissector_handle_t h501_pdu_handle; @@ -429,7 +429,7 @@ void proto_reg_handoff_h501(void); /*--- Included file: packet-h501-fn.c ---*/ -#line 1 "packet-h501-fn.c" +#line 1 "../../asn1/h501/packet-h501-fn.c" static int @@ -2358,7 +2358,7 @@ static const per_choice_t MessageBody_choice[] = { static int dissect_h501_MessageBody(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 22 "h501.cnf" +#line 22 "../../asn1/h501/h501.cnf" gint32 msg_type = -1; const gchar *p = NULL; @@ -2366,7 +2366,7 @@ dissect_h501_MessageBody(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ ett_h501_MessageBody, MessageBody_choice, &msg_type); -#line 25 "h501.cnf" +#line 25 "../../asn1/h501/h501.cnf" p = match_strval(msg_type, VALS(h501_MessageBody_vals)); if (p ) col_set_str(actx->pinfo->cinfo, COL_INFO, p); @@ -2517,7 +2517,7 @@ static int dissect_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-h501-fn.c ---*/ -#line 64 "packet-h501-template.c" +#line 64 "../../asn1/h501/packet-h501-template.c" static int dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -2555,7 +2555,7 @@ void proto_register_h501(void) { static hf_register_info hf[] = { /*--- Included file: packet-h501-hfarr.c ---*/ -#line 1 "packet-h501-hfarr.c" +#line 1 "../../asn1/h501/packet-h501-hfarr.c" { &hf_h501_Message_PDU, { "Message", "h501.Message", FT_NONE, BASE_NONE, NULL, 0, @@ -3558,7 +3558,7 @@ void proto_register_h501(void) { "INTEGER_1_65535", HFILL }}, /*--- End of included file: packet-h501-hfarr.c ---*/ -#line 100 "packet-h501-template.c" +#line 100 "../../asn1/h501/packet-h501-template.c" }; /* List of subtrees */ @@ -3566,7 +3566,7 @@ void proto_register_h501(void) { &ett_h501, /*--- Included file: packet-h501-ettarr.c ---*/ -#line 1 "packet-h501-ettarr.c" +#line 1 "../../asn1/h501/packet-h501-ettarr.c" &ett_h501_Message, &ett_h501_MessageBody, &ett_h501_MessageCommonInfo, @@ -3668,7 +3668,7 @@ void proto_register_h501(void) { &ett_h501_TerminationCause, /*--- End of included file: packet-h501-ettarr.c ---*/ -#line 106 "packet-h501-template.c" +#line 106 "../../asn1/h501/packet-h501-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index 418f23d6d7..fb069cfc97 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -5,7 +5,7 @@ /* Input file: packet-hnbap-template.c */ -#line 1 "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 @@ -60,7 +60,7 @@ /*--- Included file: packet-hnbap-val.h ---*/ -#line 1 "packet-hnbap-val.h" +#line 1 "../../asn1/hnbap/packet-hnbap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -101,14 +101,14 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-hnbap-val.h ---*/ -#line 54 "packet-hnbap-template.c" +#line 54 "../../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 "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 */ @@ -213,14 +213,14 @@ 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 59 "packet-hnbap-template.c" +#line 59 "../../asn1/hnbap/packet-hnbap-template.c" /* Initialize the subtree pointers */ static int ett_hnbap = -1; /*--- Included file: packet-hnbap-ett.c ---*/ -#line 1 "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; @@ -267,7 +267,7 @@ static gint ett_hnbap_SuccessfulOutcome = -1; static gint ett_hnbap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-hnbap-ett.c ---*/ -#line 64 "packet-hnbap-template.c" +#line 64 "../../asn1/hnbap/packet-hnbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -290,7 +290,7 @@ void proto_reg_handoff_hnbap(void); /*--- Included file: packet-hnbap-fn.c ---*/ -#line 1 "packet-hnbap-fn.c" +#line 1 "../../asn1/hnbap/packet-hnbap-fn.c" static const value_string hnbap_Criticality_vals[] = { { 0, "reject" }, @@ -367,7 +367,7 @@ dissect_hnbap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 59 "hnbap.cnf" +#line 59 "../../asn1/hnbap/hnbap.cnf" if (strcmp(val_to_str(ProcedureCode, hnbap_ProcedureCode_vals, "Unknown"), "Unknown") == 0) { col_set_str(actx->pinfo->cinfo, COL_INFO, "Unknown Message"); @@ -409,7 +409,7 @@ dissect_hnbap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, maxProtocolIEs, &ProtocolIE_ID, FALSE); -#line 48 "hnbap.cnf" +#line 48 "../../asn1/hnbap/hnbap.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(hnbap_ProtocolIE_ID_vals), "unknown (%d)")); } @@ -1404,7 +1404,7 @@ static const per_sequence_t HNBRegisterRequest_sequence[] = { static int dissect_hnbap_HNBRegisterRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 72 "hnbap.cnf" +#line 72 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "HNB_REGISTER_REQUEST "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1425,7 +1425,7 @@ static const per_sequence_t HNBRegisterAccept_sequence[] = { static int dissect_hnbap_HNBRegisterAccept(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 77 "hnbap.cnf" +#line 77 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "HNB_REGISTER_ACCEPT "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1446,7 +1446,7 @@ static const per_sequence_t HNBRegisterReject_sequence[] = { static int dissect_hnbap_HNBRegisterReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 82 "hnbap.cnf" +#line 82 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "HNB_REGISTER_REJECT "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1467,7 +1467,7 @@ static const per_sequence_t HNBDe_Register_sequence[] = { static int dissect_hnbap_HNBDe_Register(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 107 "hnbap.cnf" +#line 107 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "HNB_DE-REGISTER "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1488,7 +1488,7 @@ static const per_sequence_t UERegisterRequest_sequence[] = { static int dissect_hnbap_UERegisterRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 87 "hnbap.cnf" +#line 87 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "UE_REGISTER_REQUEST "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1509,7 +1509,7 @@ static const per_sequence_t UERegisterAccept_sequence[] = { static int dissect_hnbap_UERegisterAccept(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 92 "hnbap.cnf" +#line 92 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "UE_REGISTER_ACCEPT "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1530,7 +1530,7 @@ static const per_sequence_t UERegisterReject_sequence[] = { static int dissect_hnbap_UERegisterReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 97 "hnbap.cnf" +#line 97 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "UE_REGISTER_REJECT "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1551,7 +1551,7 @@ static const per_sequence_t UEDe_Register_sequence[] = { static int dissect_hnbap_UEDe_Register(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 102 "hnbap.cnf" +#line 102 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "UE_DE-REGISTER "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1572,7 +1572,7 @@ static const per_sequence_t CSGMembershipUpdate_sequence[] = { static int dissect_hnbap_CSGMembershipUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 118 "hnbap.cnf" +#line 118 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "CSG_MEMBERSHIP_UPDATE_MESSAGE "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1593,7 +1593,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_hnbap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 112 "hnbap.cnf" +#line 112 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "ERROR_INDICATION "); col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */ @@ -1614,7 +1614,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_hnbap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 123 "hnbap.cnf" +#line 123 "../../asn1/hnbap/hnbap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "PRIVATE_MESSAGE "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1982,7 +1982,7 @@ static void dissect_HNBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-hnbap-fn.c ---*/ -#line 85 "packet-hnbap-template.c" +#line 85 "../../asn1/hnbap/packet-hnbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -2054,7 +2054,7 @@ module_t *hnbap_module; /*--- Included file: packet-hnbap-hfarr.c ---*/ -#line 1 "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, @@ -2465,7 +2465,7 @@ module_t *hnbap_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-hnbap-hfarr.c ---*/ -#line 155 "packet-hnbap-template.c" +#line 155 "../../asn1/hnbap/packet-hnbap-template.c" }; /* List of subtrees */ @@ -2473,7 +2473,7 @@ module_t *hnbap_module; &ett_hnbap, /*--- Included file: packet-hnbap-ettarr.c ---*/ -#line 1 "packet-hnbap-ettarr.c" +#line 1 "../../asn1/hnbap/packet-hnbap-ettarr.c" &ett_hnbap_PrivateIE_ID, &ett_hnbap_ProtocolIE_Container, &ett_hnbap_ProtocolIE_Field, @@ -2520,7 +2520,7 @@ module_t *hnbap_module; &ett_hnbap_UnsuccessfulOutcome, /*--- End of included file: packet-hnbap-ettarr.c ---*/ -#line 161 "packet-hnbap-template.c" +#line 161 "../../asn1/hnbap/packet-hnbap-template.c" }; @@ -2559,7 +2559,7 @@ proto_reg_handoff_hnbap(void) initialized = TRUE; /*--- Included file: packet-hnbap-dis-tab.c ---*/ -#line 1 "packet-hnbap-dis-tab.c" +#line 1 "../../asn1/hnbap/packet-hnbap-dis-tab.c" dissector_add_uint("hnbap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_hnbap)); dissector_add_uint("hnbap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_hnbap)); dissector_add_uint("hnbap.ies", id_HNB_Identity, new_create_dissector_handle(dissect_HNB_Identity_PDU, proto_hnbap)); @@ -2595,7 +2595,7 @@ proto_reg_handoff_hnbap(void) /*--- End of included file: packet-hnbap-dis-tab.c ---*/ -#line 198 "packet-hnbap-template.c" +#line 198 "../../asn1/hnbap/packet-hnbap-template.c" } else { dissector_delete_uint("sctp.port", sctp_port, hnbap_handle); diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index d290bc559e..185a84d570 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -5,7 +5,7 @@ /* Input file: packet-idmp-template.c */ -#line 1 "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 2020 @@ -138,7 +138,7 @@ static int call_idmp_oid_callback(tvbuff_t *tvb, int offset, packet_info *pinfo, /*--- Included file: packet-idmp-hf.c ---*/ -#line 1 "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 */ @@ -173,13 +173,13 @@ static int hf_idmp_present = -1; /* INTEGER */ static int hf_idmp_absent = -1; /* NULL */ /*--- End of included file: packet-idmp-hf.c ---*/ -#line 132 "packet-idmp-template.c" +#line 132 "../../asn1/idmp/packet-idmp-template.c" /* Initialize the subtree pointers */ static gint ett_idmp = -1; /*--- Included file: packet-idmp-ett.c ---*/ -#line 1 "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; @@ -192,11 +192,11 @@ static gint ett_idmp_Code = -1; static gint ett_idmp_InvokeId = -1; /*--- End of included file: packet-idmp-ett.c ---*/ -#line 136 "packet-idmp-template.c" +#line 136 "../../asn1/idmp/packet-idmp-template.c" /*--- Included file: packet-idmp-fn.c ---*/ -#line 1 "packet-idmp-fn.c" +#line 1 "../../asn1/idmp/packet-idmp-fn.c" static int @@ -616,7 +616,7 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U /*--- End of included file: packet-idmp-fn.c ---*/ -#line 138 "packet-idmp-template.c" +#line 138 "../../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) @@ -804,7 +804,7 @@ void proto_register_idmp(void) { /*--- Included file: packet-idmp-hfarr.c ---*/ -#line 1 "packet-idmp-hfarr.c" +#line 1 "../../asn1/idmp/packet-idmp-hfarr.c" { &hf_idmp_bind, { "bind", "idmp.bind", FT_NONE, BASE_NONE, NULL, 0, @@ -935,7 +935,7 @@ void proto_register_idmp(void) { NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 324 "packet-idmp-template.c" +#line 324 "../../asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -945,7 +945,7 @@ void proto_register_idmp(void) { &ett_idmp_fragments, /*--- Included file: packet-idmp-ettarr.c ---*/ -#line 1 "packet-idmp-ettarr.c" +#line 1 "../../asn1/idmp/packet-idmp-ettarr.c" &ett_idmp_IDM_PDU, &ett_idmp_IdmBind, &ett_idmp_IdmBindResult, @@ -958,7 +958,7 @@ void proto_register_idmp(void) { &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 332 "packet-idmp-template.c" +#line 332 "../../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 0bf2a28a9f..640e46443b 100644 --- a/epan/dissectors/packet-idmp.h +++ b/epan/dissectors/packet-idmp.h @@ -5,7 +5,7 @@ /* Input file: packet-idmp-template.h */ -#line 1 "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-inap.c b/epan/dissectors/packet-inap.c index f2c8a05b78..1a30cb3419 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -5,7 +5,7 @@ /* Input file: packet-inap-template.c */ -#line 1 "packet-inap-template.c" +#line 1 "../../asn1/inap/packet-inap-template.c" /* packet-inap-template.c * Routines for INAP * Copyright 2004, Tim Endean @@ -63,7 +63,7 @@ static int proto_inap = -1; /* include constants */ /*--- Included file: packet-inap-val.h ---*/ -#line 1 "packet-inap-val.h" +#line 1 "../../asn1/inap/packet-inap-val.h" #define opcode_initialDP 0 #define opcode_originationAttemptAuthorized 1 #define opcode_collectedInformation 2 @@ -459,11 +459,11 @@ static int proto_inap = -1; #define noInvokeId NULL /*--- End of included file: packet-inap-val.h ---*/ -#line 57 "packet-inap-template.c" +#line 57 "../../asn1/inap/packet-inap-template.c" /*--- Included file: packet-inap-hf.c ---*/ -#line 1 "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 */ @@ -1026,7 +1026,7 @@ 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 59 "packet-inap-template.c" +#line 59 "../../asn1/inap/packet-inap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1051,7 +1051,7 @@ static gint ett_inapisup_parameter = -1; static gint ett_inap_HighLayerCompatibility = -1; /*--- Included file: packet-inap-ett.c ---*/ -#line 1 "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; @@ -1290,11 +1290,11 @@ static gint ett_inap_T_problem_01 = -1; static gint ett_inap_InvokeId = -1; /*--- End of included file: packet-inap-ett.c ---*/ -#line 82 "packet-inap-template.c" +#line 82 "../../asn1/inap/packet-inap-template.c" /*--- Included file: packet-inap-table.c ---*/ -#line 1 "packet-inap-table.c" +#line 1 "../../asn1/inap/packet-inap-table.c" /* INAP OPERATIONS */ const value_string inap_opr_code_strings[] = { @@ -1416,7 +1416,7 @@ static const value_string inap_err_code_string_vals[] = { /*--- End of included file: packet-inap-table.c ---*/ -#line 84 "packet-inap-template.c" +#line 84 "../../asn1/inap/packet-inap-template.c" const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, @@ -1432,7 +1432,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset, /*--- Included file: packet-inap-fn.c ---*/ -#line 1 "packet-inap-fn.c" +#line 1 "../../asn1/inap/packet-inap-fn.c" const value_string inap_CriticalityType_vals[] = { { 0, "ignore" }, @@ -1453,7 +1453,7 @@ dissect_inap_CriticalityType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_inap_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_) { -#line 163 "inap.cnf" +#line 163 "../../asn1/inap/inap.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &opcode); @@ -1510,7 +1510,7 @@ dissect_inap_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_inap_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 221 "inap.cnf" +#line 221 "../../asn1/inap/inap.cnf" proto_tree_add_text(tree, tvb, offset, -1, "Extension Data"); if (obj_id){ offset=call_ber_oid_callback(obj_id, tvb, offset, actx->pinfo, tree); @@ -1536,7 +1536,7 @@ static const ber_sequence_t ExtensionField_sequence[] = { static int dissect_inap_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 216 "inap.cnf" +#line 216 "../../asn1/inap/inap.cnf" obj_id = NULL; @@ -2190,7 +2190,7 @@ dissect_inap_BCSMEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_inap_T_bearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 253 "inap.cnf" +#line 253 "../../asn1/inap/inap.cnf" tvbuff_t *parameter_tvb; @@ -2345,7 +2345,7 @@ dissect_inap_CalledPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_inap_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 232 "inap.cnf" +#line 232 "../../asn1/inap/inap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2396,7 +2396,7 @@ dissect_inap_CallingPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_inap_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 242 "inap.cnf" +#line 242 "../../asn1/inap/inap.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -4534,7 +4534,7 @@ dissect_inap_GlobalCallReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i int dissect_inap_HighLayerCompatibility(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 295 "inap.cnf" +#line 295 "../../asn1/inap/inap.cnf" /* * -- Indicates the teleservice. For encoding, DSS1 (Q.931) is used. */ @@ -4708,7 +4708,7 @@ dissect_inap_NumberingPlan(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_inap_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 275 "inap.cnf" +#line 275 "../../asn1/inap/inap.cnf" tvbuff_t *parameter_tvb; @@ -4771,7 +4771,7 @@ dissect_inap_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 285 "inap.cnf" +#line 285 "../../asn1/inap/inap.cnf" tvbuff_t *parameter_tvb; @@ -4792,7 +4792,7 @@ dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in 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_) { -#line 264 "inap.cnf" +#line 264 "../../asn1/inap/inap.cnf" tvbuff_t *parameter_tvb; @@ -5156,7 +5156,7 @@ dissect_inap_T_triggerId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_inap_T_triggerPar(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 202 "inap.cnf" +#line 202 "../../asn1/inap/inap.cnf" /* FIX ME */ @@ -7734,7 +7734,7 @@ dissect_inap_MessageReceivedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_inap_T_uIScriptSpecificInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 208 "inap.cnf" +#line 208 "../../asn1/inap/inap.cnf" /* FIX ME */ @@ -7763,7 +7763,7 @@ dissect_inap_ScriptCloseArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_inap_T_uIScriptResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 205 "inap.cnf" +#line 205 "../../asn1/inap/inap.cnf" /* FIX ME */ @@ -7793,7 +7793,7 @@ dissect_inap_ScriptEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_inap_T_uIScriptSpecificInfo_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 211 "inap.cnf" +#line 211 "../../asn1/inap/inap.cnf" /* FIX ME */ @@ -7821,7 +7821,7 @@ dissect_inap_ScriptInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_inap_T_uIScriptSpecificInfo_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 213 "inap.cnf" +#line 213 "../../asn1/inap/inap.cnf" /* FIX ME */ @@ -8052,7 +8052,7 @@ dissect_inap_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_inap_T_argument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 190 "inap.cnf" +#line 190 "../../asn1/inap/inap.cnf" offset = dissect_invokeData(tree, tvb, offset, actx); @@ -8071,7 +8071,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_inap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 178 "inap.cnf" +#line 178 "../../asn1/inap/inap.cnf" inap_opcode_type=INAP_OPCODE_INVOKE; @@ -8085,7 +8085,7 @@ dissect_inap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_inap_ResultArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 193 "inap.cnf" +#line 193 "../../asn1/inap/inap.cnf" offset = dissect_returnResultData(tree, tvb, offset, actx); @@ -8117,7 +8117,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_inap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 181 "inap.cnf" +#line 181 "../../asn1/inap/inap.cnf" inap_opcode_type=INAP_OPCODE_RETURN_RESULT; @@ -8131,7 +8131,7 @@ dissect_inap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_inap_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 196 "inap.cnf" +#line 196 "../../asn1/inap/inap.cnf" offset = dissect_returnErrorData(tree, tvb, offset, actx); @@ -8151,7 +8151,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_inap_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 184 "inap.cnf" +#line 184 "../../asn1/inap/inap.cnf" inap_opcode_type=INAP_OPCODE_RETURN_ERROR; @@ -8271,7 +8271,7 @@ static const ber_sequence_t Reject_sequence[] = { static int dissect_inap_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 187 "inap.cnf" +#line 187 "../../asn1/inap/inap.cnf" inap_opcode_type=INAP_OPCODE_REJECT; @@ -8984,7 +8984,7 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-inap-fn.c ---*/ -#line 98 "packet-inap-template.c" +#line 98 "../../asn1/inap/packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9007,7 +9007,7 @@ TC-Invokable OPERATION ::= /*--- Included file: packet-inap-table2.c ---*/ -#line 1 "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) { proto_item *cause; @@ -9340,7 +9340,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-inap-table2.c ---*/ -#line 119 "packet-inap-template.c" +#line 119 "../../asn1/inap/packet-inap-template.c" static guint8 inap_pdu_type = 0; @@ -9423,7 +9423,7 @@ void proto_register_inap(void) { /*--- Included file: packet-inap-hfarr.c ---*/ -#line 1 "packet-inap-hfarr.c" +#line 1 "../../asn1/inap/packet-inap-hfarr.c" { &hf_inap_ActivateServiceFilteringArg_PDU, { "ActivateServiceFilteringArg", "inap.ActivateServiceFilteringArg", FT_NONE, BASE_NONE, NULL, 0, @@ -11666,7 +11666,7 @@ void proto_register_inap(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 200 "packet-inap-template.c" +#line 200 "../../asn1/inap/packet-inap-template.c" }; @@ -11681,7 +11681,7 @@ void proto_register_inap(void) { &ett_inap_HighLayerCompatibility, /*--- Included file: packet-inap-ettarr.c ---*/ -#line 1 "packet-inap-ettarr.c" +#line 1 "../../asn1/inap/packet-inap-ettarr.c" &ett_inap_Extensions, &ett_inap_ExtensionField, &ett_inap_AlternativeIdentities, @@ -11920,7 +11920,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 213 "packet-inap-template.c" +#line 213 "../../asn1/inap/packet-inap-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index aa97b4c152..9442545767 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -5,7 +5,7 @@ /* Input file: packet-inap-template.h */ -#line 1 "packet-inap-template.h" +#line 1 "../../asn1/inap/packet-inap-template.h" /* packet-inap.h * * $Id$ @@ -37,7 +37,7 @@ /*--- Included file: packet-inap-exp.h ---*/ -#line 1 "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[]; @@ -54,6 +54,6 @@ int dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb 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 31 "packet-inap-template.h" +#line 31 "../../asn1/inap/packet-inap-template.h" #endif /* PACKET_INAP_H */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 011a641860..bc42355a69 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ldap.c */ -/* ../../../tools/asn2wrs.py -b -p ldap -c ../../../asn1/ldap/ldap.cnf -s ../../../asn1/ldap/packet-ldap-template -D ../../../asn1/ldap Lightweight-Directory-Access-Protocol-V3.asn */ +/* ../../tools/asn2wrs.py -b -p ldap -c ./ldap.cnf -s ./packet-ldap-template -D . Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.c */ diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 26ac4f4e74..a9e1bd78fe 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -5,7 +5,7 @@ /* Input file: packet-logotypecertextn-template.c */ -#line 1 "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 @@ -50,7 +50,7 @@ static int proto_logotypecertextn = -1; /*--- Included file: packet-logotypecertextn-hf.c ---*/ -#line 1 "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 */ @@ -94,12 +94,12 @@ static int hf_logotypecertextn_hashAlg = -1; /* AlgorithmIdentifier */ static int hf_logotypecertextn_hashValue = -1; /* OCTET_STRING */ /*--- End of included file: packet-logotypecertextn-hf.c ---*/ -#line 44 "packet-logotypecertextn-template.c" +#line 44 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-logotypecertextn-ett.c ---*/ -#line 1 "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; @@ -121,12 +121,12 @@ static gint ett_logotypecertextn_T_refStructURI = -1; static gint ett_logotypecertextn_HashAlgAndValue = -1; /*--- End of included file: packet-logotypecertextn-ett.c ---*/ -#line 47 "packet-logotypecertextn-template.c" +#line 47 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" /*--- Included file: packet-logotypecertextn-fn.c ---*/ -#line 1 "packet-logotypecertextn-fn.c" +#line 1 "../../asn1/logotypecertextn/packet-logotypecertextn-fn.c" static int @@ -184,7 +184,7 @@ dissect_logotypecertextn_T_logotypeURI_item(gboolean implicit_tag _U_, tvbuff_t actx, tree, tvb, offset, hf_index, NULL); -#line 18 "logotypecertextn.cnf" +#line 18 "../../asn1/logotypecertextn/logotypecertextn.cnf" PROTO_ITEM_SET_URL(actx->created_item); @@ -384,7 +384,7 @@ dissect_logotypecertextn_T_refStructURI_item(gboolean implicit_tag _U_, tvbuff_t actx, tree, tvb, offset, hf_index, NULL); -#line 21 "logotypecertextn.cnf" +#line 21 "../../asn1/logotypecertextn/logotypecertextn.cnf" PROTO_ITEM_SET_URL(actx->created_item); @@ -518,7 +518,7 @@ static void dissect_LogotypeExtn_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-logotypecertextn-fn.c ---*/ -#line 50 "packet-logotypecertextn-template.c" +#line 50 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" /*--- proto_register_logotypecertextn ----------------------------------------------*/ @@ -528,7 +528,7 @@ void proto_register_logotypecertextn(void) { static hf_register_info hf[] = { /*--- Included file: packet-logotypecertextn-hfarr.c ---*/ -#line 1 "packet-logotypecertextn-hfarr.c" +#line 1 "../../asn1/logotypecertextn/packet-logotypecertextn-hfarr.c" { &hf_logotypecertextn_LogotypeExtn_PDU, { "LogotypeExtn", "logotypecertextn.LogotypeExtn", FT_NONE, BASE_NONE, NULL, 0, @@ -695,14 +695,14 @@ void proto_register_logotypecertextn(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/ -#line 58 "packet-logotypecertextn-template.c" +#line 58 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-logotypecertextn-ettarr.c ---*/ -#line 1 "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, @@ -724,7 +724,7 @@ void proto_register_logotypecertextn(void) { &ett_logotypecertextn_HashAlgAndValue, /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/ -#line 63 "packet-logotypecertextn-template.c" +#line 63 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* Register protocol */ @@ -741,13 +741,13 @@ void proto_register_logotypecertextn(void) { void proto_reg_handoff_logotypecertextn(void) { /*--- Included file: packet-logotypecertextn-dis-tab.c ---*/ -#line 1 "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 78 "packet-logotypecertextn-template.c" +#line 78 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" } diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h index f115ed9ad3..52eb19e49a 100644 --- a/epan/dissectors/packet-logotypecertextn.h +++ b/epan/dissectors/packet-logotypecertextn.h @@ -5,7 +5,7 @@ /* Input file: packet-logotypecertextn-template.h */ -#line 1 "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-mms.c b/epan/dissectors/packet-mms.c index 3459dcb1a1..79b8b14467 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -5,7 +5,7 @@ /* Input file: packet-mms-template.c */ -#line 1 "packet-mms-template.c" +#line 1 "../../asn1/mms/packet-mms-template.c" /* packet-mms_asn1.c * * Ronnie Sahlberg 2005 @@ -55,7 +55,7 @@ static int proto_mms = -1; /*--- Included file: packet-mms-hf.c ---*/ -#line 1 "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 */ @@ -725,13 +725,13 @@ 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 49 "packet-mms-template.c" +#line 49 "../../asn1/mms/packet-mms-template.c" /* Initialize the subtree pointers */ static gint ett_mms = -1; /*--- Included file: packet-mms-ett.c ---*/ -#line 1 "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; @@ -942,11 +942,11 @@ static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; /*--- End of included file: packet-mms-ett.c ---*/ -#line 53 "packet-mms-template.c" +#line 53 "../../asn1/mms/packet-mms-template.c" /*--- Included file: packet-mms-fn.c ---*/ -#line 1 "packet-mms-fn.c" +#line 1 "../../asn1/mms/packet-mms-fn.c" /*--- Cyclic dependencies ---*/ /* TypeSpecification -> TypeSpecification/array -> TypeSpecification */ @@ -1831,7 +1831,7 @@ dissect_mms_FloatingPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_mms_TimeOfDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 50 "mms.cnf" +#line 50 "../../asn1/mms/mms.cnf" guint32 len; proto_item *cause; @@ -1915,7 +1915,7 @@ dissect_mms_MMSString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_mms_UtcTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 105 "mms.cnf" +#line 105 "../../asn1/mms/mms.cnf" guint32 len; proto_item *cause; @@ -2339,7 +2339,7 @@ dissect_mms_Output_Request(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_mms_T_ap_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 27 "mms.cnf" +#line 27 "../../asn1/mms/mms.cnf" offset=dissect_acse_AP_title(FALSE, tvb, offset, actx, tree, hf_mms_ap_title); @@ -2351,7 +2351,7 @@ dissect_mms_T_ap_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_mms_T_ap_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 30 "mms.cnf" +#line 30 "../../asn1/mms/mms.cnf" offset=dissect_acse_AP_invocation_identifier(FALSE, tvb, offset, actx, tree, hf_mms_ap_invocation_id); @@ -2363,7 +2363,7 @@ dissect_mms_T_ap_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_mms_T_ae_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_) { -#line 33 "mms.cnf" +#line 33 "../../asn1/mms/mms.cnf" offset=dissect_acse_AE_qualifier(FALSE, tvb, offset, actx, tree, hf_mms_ae_qualifier); @@ -2375,7 +2375,7 @@ dissect_mms_T_ae_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_mms_T_ae_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 36 "mms.cnf" +#line 36 "../../asn1/mms/mms.cnf" offset=dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, actx, tree, hf_mms_ae_invocation_id); @@ -7033,7 +7033,7 @@ static const ber_choice_t MMSpdu_choice[] = { 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_) { -#line 39 "mms.cnf" +#line 39 "../../asn1/mms/mms.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -7054,7 +7054,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, /*--- End of included file: packet-mms-fn.c ---*/ -#line 55 "packet-mms-template.c" +#line 55 "../../asn1/mms/packet-mms-template.c" /* * Dissect MMS PDUs inside a PPDU. @@ -7096,7 +7096,7 @@ void proto_register_mms(void) { { /*--- Included file: packet-mms-hfarr.c ---*/ -#line 1 "packet-mms-hfarr.c" +#line 1 "../../asn1/mms/packet-mms-hfarr.c" { &hf_mms_confirmed_RequestPDU, { "confirmed-RequestPDU", "mms.confirmed_RequestPDU", FT_NONE, BASE_NONE, NULL, 0, @@ -9763,7 +9763,7 @@ void proto_register_mms(void) { NULL, HFILL }}, /*--- End of included file: packet-mms-hfarr.c ---*/ -#line 95 "packet-mms-template.c" +#line 95 "../../asn1/mms/packet-mms-template.c" }; /* List of subtrees */ @@ -9771,7 +9771,7 @@ void proto_register_mms(void) { &ett_mms, /*--- Included file: packet-mms-ettarr.c ---*/ -#line 1 "packet-mms-ettarr.c" +#line 1 "../../asn1/mms/packet-mms-ettarr.c" &ett_mms_MMSpdu, &ett_mms_Confirmed_RequestPDU, &ett_mms_SEQUENCE_OF_Modifier, @@ -9982,7 +9982,7 @@ void proto_register_mms(void) { &ett_mms_FileAttributes, /*--- End of included file: packet-mms-ettarr.c ---*/ -#line 101 "packet-mms-template.c" +#line 101 "../../asn1/mms/packet-mms-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index 73be5f15b7..94f7657f1b 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -5,7 +5,7 @@ /* Input file: packet-mms-template.h */ -#line 1 "packet-mms-template.h" +#line 1 "../../asn1/mms/packet-mms-template.h" /* packet-mms.h * Routines for MMS packet dissection * Ronnie Sahlberg 2005 @@ -36,12 +36,12 @@ /*--- Included file: packet-mms-exp.h ---*/ -#line 1 "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 30 "packet-mms-template.h" +#line 30 "../../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 666cdc5e7f..64c2478a99 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -5,7 +5,7 @@ /* Input file: packet-mpeg-audio-template.c */ -#line 1 "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 @@ -45,7 +45,7 @@ /*--- Included file: packet-mpeg-audio-hf.c ---*/ -#line 1 "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 */ @@ -70,18 +70,18 @@ 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 39 "packet-mpeg-audio-template.c" +#line 39 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-ett.c ---*/ -#line 1 "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 40 "packet-mpeg-audio-template.c" +#line 40 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-fn.c ---*/ -#line 1 "packet-mpeg-audio-fn.c" +#line 1 "../../asn1/mpeg-audio/packet-mpeg-audio-fn.c" static int @@ -449,7 +449,7 @@ 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 41 "packet-mpeg-audio-template.c" +#line 41 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" static int proto_mpeg_audio = -1; @@ -569,7 +569,7 @@ proto_register_mpeg_audio(void) static hf_register_info hf[] = { /*--- Included file: packet-mpeg-audio-hfarr.c ---*/ -#line 1 "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, @@ -660,7 +660,7 @@ proto_register_mpeg_audio(void) NULL, HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 159 "packet-mpeg-audio-template.c" +#line 159 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" { &hf_mpeg_audio_data, { "Data", "mpeg.audio.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -679,12 +679,12 @@ proto_register_mpeg_audio(void) static gint *ett[] = { /*--- Included file: packet-mpeg-audio-ettarr.c ---*/ -#line 1 "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 176 "packet-mpeg-audio-template.c" +#line 176 "../../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 578c12e24f..7a76921cbb 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -5,7 +5,7 @@ /* Input file: packet-mpeg-pes-template.c */ -#line 1 "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 @@ -44,7 +44,7 @@ /*--- Included file: packet-mpeg-pes-hf.c ---*/ -#line 1 "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 */ @@ -97,10 +97,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 38 "packet-mpeg-pes-template.c" +#line 38 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-ett.c ---*/ -#line 1 "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; @@ -109,10 +109,10 @@ 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 39 "packet-mpeg-pes-template.c" +#line 39 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-fn.c ---*/ -#line 1 "packet-mpeg-pes-fn.c" +#line 1 "../../asn1/mpeg-pes/packet-mpeg-pes-fn.c" static int @@ -477,7 +477,7 @@ 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 40 "packet-mpeg-pes-template.c" +#line 40 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" static int proto_mpeg = -1; static int proto_mpeg_pes = -1; @@ -1009,7 +1009,7 @@ proto_register_mpeg_pes(void) static hf_register_info hf[] = { /*--- Included file: packet-mpeg-pes-hfarr.c ---*/ -#line 1 "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, @@ -1212,7 +1212,7 @@ proto_register_mpeg_pes(void) "BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 570 "packet-mpeg-pes-template.c" +#line 570 "../../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 }}, @@ -1321,7 +1321,7 @@ proto_register_mpeg_pes(void) static gint *ett[] = { /*--- Included file: packet-mpeg-pes-ettarr.c ---*/ -#line 1 "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, @@ -1330,7 +1330,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 677 "packet-mpeg-pes-template.c" +#line 677 "../../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-nbap.c b/epan/dissectors/packet-nbap.c index 970f31c494..c2ef8e78ff 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -5,7 +5,7 @@ /* Input file: packet-nbap-template.c */ -#line 1 "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 @@ -56,7 +56,7 @@ /*--- Included file: packet-nbap-val.h ---*/ -#line 1 "packet-nbap-val.h" +#line 1 "../../asn1/nbap/packet-nbap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -1512,7 +1512,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-nbap-val.h ---*/ -#line 50 "packet-nbap-template.c" +#line 50 "../../asn1/nbap/packet-nbap-template.c" /* Initialize the protocol and registered fields */ static int proto_nbap = -1; @@ -1521,7 +1521,7 @@ static int hf_nbap_transportLayerAddress_ipv6 = -1; /*--- Included file: packet-nbap-hf.c ---*/ -#line 1 "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 */ @@ -4807,7 +4807,7 @@ 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 57 "packet-nbap-template.c" +#line 57 "../../asn1/nbap/packet-nbap-template.c" /* Initialize the subtree pointers */ static int ett_nbap = -1; @@ -4815,7 +4815,7 @@ static int ett_nbap_TransportLayerAddress = -1; /*--- Included file: packet-nbap-ett.c ---*/ -#line 1 "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; @@ -6444,7 +6444,7 @@ static gint ett_nbap_UnsuccessfulOutcome = -1; static gint ett_nbap_Outcome = -1; /*--- End of included file: packet-nbap-ett.c ---*/ -#line 63 "packet-nbap-template.c" +#line 63 "../../asn1/nbap/packet-nbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -6467,7 +6467,7 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p /*--- Included file: packet-nbap-fn.c ---*/ -#line 1 "packet-nbap-fn.c" +#line 1 "../../asn1/nbap/packet-nbap-fn.c" static const value_string nbap_Criticality_vals[] = { { 0, "reject" }, @@ -6609,7 +6609,7 @@ dissect_nbap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 91 "nbap.cnf" +#line 91 "../../asn1/nbap/nbap.cnf" col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(ProcedureCode, nbap_ProcedureCode_vals, "unknown message")); @@ -6643,7 +6643,7 @@ static const per_sequence_t ProcedureID_sequence[] = { static int dissect_nbap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 98 "nbap.cnf" +#line 98 "../../asn1/nbap/nbap.cnf" ProcedureCode = 0xFFFF; ddMode = 0xFFFF; ProcedureID = NULL; @@ -6651,7 +6651,7 @@ dissect_nbap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nbap_ProcedureID, ProcedureID_sequence); -#line 104 "nbap.cnf" +#line 104 "../../asn1/nbap/nbap.cnf" ProcedureID = ep_strdup_printf("%s/%s", val_to_str(ProcedureCode, VALS(nbap_ProcedureCode_vals), "unknown(%u)"), val_to_str(ddMode, VALS(nbap_DdMode_vals), "unknown(%u)")); @@ -7895,7 +7895,7 @@ dissect_nbap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, maxProtocolIEs, &ProtocolIE_ID, FALSE); -#line 80 "nbap.cnf" +#line 80 "../../asn1/nbap/nbap.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &nbap_ProtocolIE_ID_vals_ext, "unknown (%d)")); } @@ -8463,7 +8463,7 @@ dissect_nbap_BindingID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_nbap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 116 "nbap.cnf" +#line 116 "../../asn1/nbap/nbap.cnf" tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; @@ -52855,7 +52855,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-nbap-fn.c ---*/ -#line 84 "packet-nbap-template.c" +#line 84 "../../asn1/nbap/packet-nbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -52918,7 +52918,7 @@ void proto_register_nbap(void) { /*--- Included file: packet-nbap-hfarr.c ---*/ -#line 1 "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, @@ -66049,7 +66049,7 @@ void proto_register_nbap(void) { NULL, HFILL }}, /*--- End of included file: packet-nbap-hfarr.c ---*/ -#line 145 "packet-nbap-template.c" +#line 145 "../../asn1/nbap/packet-nbap-template.c" }; /* List of subtrees */ @@ -66058,7 +66058,7 @@ void proto_register_nbap(void) { &ett_nbap_TransportLayerAddress, /*--- Included file: packet-nbap-ettarr.c ---*/ -#line 1 "packet-nbap-ettarr.c" +#line 1 "../../asn1/nbap/packet-nbap-ettarr.c" &ett_nbap_PrivateIE_ID, &ett_nbap_ProcedureID, &ett_nbap_TransactionID, @@ -67687,7 +67687,7 @@ void proto_register_nbap(void) { &ett_nbap_Outcome, /*--- End of included file: packet-nbap-ettarr.c ---*/ -#line 152 "packet-nbap-template.c" +#line 152 "../../asn1/nbap/packet-nbap-template.c" }; @@ -67722,7 +67722,7 @@ proto_reg_handoff_nbap(void) /*--- Included file: packet-nbap-dis-tab.c ---*/ -#line 1 "packet-nbap-dis-tab.c" +#line 1 "../../asn1/nbap/packet-nbap-dis-tab.c" dissector_add_uint("nbap.ies", id_TUTRANGPSMeasurementValueInformation, new_create_dissector_handle(dissect_TUTRANGPSMeasurementValueInformation_PDU, proto_nbap)); dissector_add_uint("nbap.ies", id_SFNSFNMeasurementValueInformation, new_create_dissector_handle(dissect_SFNSFNMeasurementValueInformation_PDU, proto_nbap)); dissector_add_uint("nbap.ies", id_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmission, new_create_dissector_handle(dissect_TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue_PDU, proto_nbap)); @@ -68817,7 +68817,7 @@ proto_reg_handoff_nbap(void) /*--- End of included file: packet-nbap-dis-tab.c ---*/ -#line 185 "packet-nbap-template.c" +#line 185 "../../asn1/nbap/packet-nbap-template.c" } diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 7773101a95..2823f77b52 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -5,7 +5,7 @@ /* Input file: packet-ns_cert_exts-template.c */ -#line 1 "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 @@ -48,7 +48,7 @@ static int proto_ns_cert_exts = -1; /*--- Included file: packet-ns_cert_exts-hf.c ---*/ -#line 1 "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 */ @@ -68,20 +68,20 @@ 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 42 "packet-ns_cert_exts-template.c" +#line 42 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-ns_cert_exts-ett.c ---*/ -#line 1 "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 45 "packet-ns_cert_exts-template.c" +#line 45 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /*--- Included file: packet-ns_cert_exts-fn.c ---*/ -#line 1 "packet-ns_cert_exts-fn.c" +#line 1 "../../asn1/ns_cert_exts/packet-ns_cert_exts-fn.c" static int @@ -226,7 +226,7 @@ static void dissect_CertType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ns_cert_exts-fn.c ---*/ -#line 47 "packet-ns_cert_exts-template.c" +#line 47 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /*--- proto_register_ns_cert_exts -------------------------------------------*/ @@ -236,7 +236,7 @@ void proto_register_ns_cert_exts(void) { static hf_register_info hf[] = { /*--- Included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 1 "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,18 +303,18 @@ void proto_register_ns_cert_exts(void) { NULL, HFILL }}, /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 55 "packet-ns_cert_exts-template.c" +#line 55 "../../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 "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 60 "packet-ns_cert_exts-template.c" +#line 60 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* Register protocol */ @@ -331,7 +331,7 @@ void proto_register_ns_cert_exts(void) { void proto_reg_handoff_ns_cert_exts(void) { /*--- Included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 1 "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,6 +343,6 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 75 "packet-ns_cert_exts-template.c" +#line 75 "../../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 c89e21affb..2f358ca5fa 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -5,7 +5,7 @@ /* Input file: packet-ocsp-template.c */ -#line 1 "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 @@ -56,7 +56,7 @@ int proto_ocsp = -1; static int hf_ocsp_responseType_id = -1; /*--- Included file: packet-ocsp-hf.c ---*/ -#line 1 "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 */ @@ -110,13 +110,13 @@ static int hf_ocsp_crlNum = -1; /* INTEGER */ static int hf_ocsp_crlTime = -1; /* GeneralizedTime */ /*--- End of included file: packet-ocsp-hf.c ---*/ -#line 50 "packet-ocsp-template.c" +#line 50 "../../asn1/ocsp/packet-ocsp-template.c" /* Initialize the subtree pointers */ static gint ett_ocsp = -1; /*--- Included file: packet-ocsp-ett.c ---*/ -#line 1 "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; @@ -138,14 +138,14 @@ static gint ett_ocsp_ServiceLocator = -1; static gint ett_ocsp_CrlID = -1; /*--- End of included file: packet-ocsp-ett.c ---*/ -#line 54 "packet-ocsp-template.c" +#line 54 "../../asn1/ocsp/packet-ocsp-template.c" static const char *responseType_id; /*--- Included file: packet-ocsp-fn.c ---*/ -#line 1 "packet-ocsp-fn.c" +#line 1 "../../asn1/ocsp/packet-ocsp-fn.c" static const value_string ocsp_Version_vals[] = { { 0, "v1" }, @@ -321,7 +321,7 @@ dissect_ocsp_T_responseType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 38 "ocsp.cnf" +#line 38 "../../asn1/ocsp/ocsp.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -648,7 +648,7 @@ static void dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr /*--- End of included file: packet-ocsp-fn.c ---*/ -#line 59 "packet-ocsp-template.c" +#line 59 "../../asn1/ocsp/packet-ocsp-template.c" static int @@ -705,7 +705,7 @@ void proto_register_ocsp(void) { NULL, HFILL }}, /*--- Included file: packet-ocsp-hfarr.c ---*/ -#line 1 "packet-ocsp-hfarr.c" +#line 1 "../../asn1/ocsp/packet-ocsp-hfarr.c" { &hf_ocsp_BasicOCSPResponse_PDU, { "BasicOCSPResponse", "ocsp.BasicOCSPResponse", FT_NONE, BASE_NONE, NULL, 0, @@ -912,7 +912,7 @@ void proto_register_ocsp(void) { "GeneralizedTime", HFILL }}, /*--- End of included file: packet-ocsp-hfarr.c ---*/ -#line 114 "packet-ocsp-template.c" +#line 114 "../../asn1/ocsp/packet-ocsp-template.c" }; /* List of subtrees */ @@ -920,7 +920,7 @@ void proto_register_ocsp(void) { &ett_ocsp, /*--- Included file: packet-ocsp-ettarr.c ---*/ -#line 1 "packet-ocsp-ettarr.c" +#line 1 "../../asn1/ocsp/packet-ocsp-ettarr.c" &ett_ocsp_OCSPRequest, &ett_ocsp_TBSRequest, &ett_ocsp_SEQUENCE_OF_Request, @@ -942,7 +942,7 @@ void proto_register_ocsp(void) { &ett_ocsp_CrlID, /*--- End of included file: packet-ocsp-ettarr.c ---*/ -#line 120 "packet-ocsp-template.c" +#line 120 "../../asn1/ocsp/packet-ocsp-template.c" }; /* Register protocol */ @@ -967,7 +967,7 @@ void proto_reg_handoff_ocsp(void) { /*--- Included file: packet-ocsp-dis-tab.c ---*/ -#line 1 "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.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl"); register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.4", dissect_AcceptableResponses_PDU, proto_ocsp, "id-pkix-ocsp-response"); @@ -977,6 +977,6 @@ void proto_reg_handoff_ocsp(void) { /*--- End of included file: packet-ocsp-dis-tab.c ---*/ -#line 143 "packet-ocsp-template.c" +#line 143 "../../asn1/ocsp/packet-ocsp-template.c" } diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h index a002c9b2d1..3803500372 100644 --- a/epan/dissectors/packet-ocsp.h +++ b/epan/dissectors/packet-ocsp.h @@ -5,7 +5,7 @@ /* Input file: packet-ocsp-template.h */ -#line 1 "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 532f4fc90c..c62bc4def1 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -5,7 +5,7 @@ /* Input file: packet-p1-template.c */ -#line 1 "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 @@ -89,7 +89,7 @@ static int hf_p1_MTABindError_PDU = -1; /*--- Included file: packet-p1-hf.c ---*/ -#line 1 "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 */ @@ -657,7 +657,7 @@ static int hf_p1_G3FacsimileNonBasicParameters_jpeg = -1; static int hf_p1_G3FacsimileNonBasicParameters_processable_mode_26 = -1; /*--- End of included file: packet-p1-hf.c ---*/ -#line 83 "packet-p1-template.c" +#line 83 "../../asn1/p1/packet-p1-template.c" /* Initialize the subtree pointers */ static gint ett_p1 = -1; @@ -670,7 +670,7 @@ 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 "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; @@ -854,7 +854,7 @@ static gint ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmissio static gint ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields = -1; /*--- End of included file: packet-p1-ett.c ---*/ -#line 94 "packet-p1-template.c" +#line 94 "../../asn1/p1/packet-p1-template.c" /* Dissector tables */ static dissector_table_t p1_extension_dissector_table; @@ -863,7 +863,7 @@ static dissector_table_t p1_tokendata_dissector_table; /*--- Included file: packet-p1-table.c ---*/ -#line 1 "packet-p1-table.c" +#line 1 "../../asn1/p1/packet-p1-table.c" /* P3 ABSTRACT-OPERATIONS */ const value_string p3_opr_code_string_vals[] = { @@ -905,11 +905,11 @@ static const value_string p3_err_code_string_vals[] = { /*--- End of included file: packet-p1-table.c ---*/ -#line 101 "packet-p1-template.c" +#line 101 "../../asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-fn.c ---*/ -#line 1 "packet-p1-fn.c" +#line 1 "../../asn1/p1/packet-p1-fn.c" static int @@ -923,7 +923,7 @@ dissect_p1_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, as static int dissect_p1_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 681 "p1.cnf" +#line 681 "../../asn1/p1/p1.cnf" tvbuff_t *mtaname = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -1004,7 +1004,7 @@ dissect_p1_TokenTypeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_TokenTypeData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1215 "p1.cnf" +#line 1215 "../../asn1/p1/p1.cnf" if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1115,7 +1115,7 @@ static const ber_choice_t Credentials_choice[] = { int dissect_p1_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1223 "p1.cnf" +#line 1223 "../../asn1/p1/p1.cnf" gint credentials = -1; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -1196,7 +1196,7 @@ dissect_p1_SecurityCategoryIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_p1_SecurityCategoryValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 561 "p1.cnf" +#line 561 "../../asn1/p1/p1.cnf" const char *name; if (object_identifier_id) { @@ -1376,7 +1376,7 @@ static const value_string p1_MTABindError_vals[] = { static int dissect_p1_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1206 "p1.cnf" +#line 1206 "../../asn1/p1/p1.cnf" int error = -1; offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset, 0U, ub_integer_options, hf_index, &error); @@ -1393,7 +1393,7 @@ dissect_p1_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_T_x121_dcc_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_) { -#line 865 "p1.cnf" +#line 865 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1413,7 +1413,7 @@ dissect_p1_T_x121_dcc_code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_T_iso_3166_alpha2_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_) { -#line 817 "p1.cnf" +#line 817 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1455,7 +1455,7 @@ dissect_p1_CountryName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p1_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 595 "p1.cnf" +#line 595 "../../asn1/p1/p1.cnf" if(doing_address) g_strlcat(oraddress, "/C=", MAX_ORA_STR_LEN); @@ -1473,7 +1473,7 @@ dissect_p1_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_T_numeric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 873 "p1.cnf" +#line 873 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1493,7 +1493,7 @@ dissect_p1_T_numeric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_p1_T_printable(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 825 "p1.cnf" +#line 825 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1535,7 +1535,7 @@ dissect_p1_AdministrationDomainName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_p1_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 602 "p1.cnf" +#line 602 "../../asn1/p1/p1.cnf" if(doing_address) g_strlcat(oraddress, "/A=", MAX_ORA_STR_LEN); @@ -1553,7 +1553,7 @@ dissect_p1_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_p1_T_numeric_private_domain_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_) { -#line 889 "p1.cnf" +#line 889 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1573,7 +1573,7 @@ dissect_p1_T_numeric_private_domain_identifier(gboolean implicit_tag _U_, tvbuff static int dissect_p1_T_printable_private_domain_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_) { -#line 841 "p1.cnf" +#line 841 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1604,7 +1604,7 @@ static const ber_choice_t PrivateDomainIdentifier_choice[] = { static int dissect_p1_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 732 "p1.cnf" +#line 732 "../../asn1/p1/p1.cnf" if(doing_address) g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN); @@ -1639,7 +1639,7 @@ dissect_p1_GlobalDomainIdentifier_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_p1_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1086 "p1.cnf" +#line 1086 "../../asn1/p1/p1.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = tree; @@ -1666,7 +1666,7 @@ dissect_p1_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1105 "p1.cnf" +#line 1105 "../../asn1/p1/p1.cnf" tvbuff_t *id = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -1706,7 +1706,7 @@ dissect_p1_MTSIdentifier_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1118 "p1.cnf" +#line 1118 "../../asn1/p1/p1.cnf" doing_address = TRUE; @@ -1732,7 +1732,7 @@ dissect_p1_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p1_MessageIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1080 "p1.cnf" +#line 1080 "../../asn1/p1/p1.cnf" address_item = NULL; @@ -1748,7 +1748,7 @@ dissect_p1_MessageIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 701 "p1.cnf" +#line 701 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1780,7 +1780,7 @@ dissect_p1_NetworkAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_p1_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 715 "p1.cnf" +#line 715 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1802,7 +1802,7 @@ dissect_p1_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_numeric_private_domain_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 881 "p1.cnf" +#line 881 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1822,7 +1822,7 @@ dissect_p1_T_numeric_private_domain_name(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_p1_T_printable_private_domain_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 833 "p1.cnf" +#line 833 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1853,7 +1853,7 @@ static const ber_choice_t PrivateDomainName_choice[] = { static int dissect_p1_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 725 "p1.cnf" +#line 725 "../../asn1/p1/p1.cnf" if(doing_address) g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN); @@ -1872,7 +1872,7 @@ dissect_p1_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 742 "p1.cnf" +#line 742 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1905,7 +1905,7 @@ dissect_p1_NumericUserIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p1_T_printable_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 945 "p1.cnf" +#line 945 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1927,7 +1927,7 @@ dissect_p1_T_printable_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_printable_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 955 "p1.cnf" +#line 955 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1949,7 +1949,7 @@ dissect_p1_T_printable_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_T_printable_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 965 "p1.cnf" +#line 965 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1971,7 +1971,7 @@ dissect_p1_T_printable_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_T_printable_generation_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_) { -#line 975 "p1.cnf" +#line 975 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2010,7 +2010,7 @@ dissect_p1_PersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_OrganizationalUnitName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 768 "p1.cnf" +#line 768 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2057,7 +2057,7 @@ static const ber_sequence_t BuiltInStandardAttributes_sequence[] = { static int dissect_p1_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1142 "p1.cnf" +#line 1142 "../../asn1/p1/p1.cnf" address_item = tree; @@ -2074,7 +2074,7 @@ dissect_p1_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_p1_T_printable_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1025 "p1.cnf" +#line 1025 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2097,7 +2097,7 @@ dissect_p1_T_printable_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_p1_T_printable_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1036 "p1.cnf" +#line 1036 "../../asn1/p1/p1.cnf" tvbuff_t *pstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -2127,7 +2127,7 @@ static const ber_sequence_t BuiltInDomainDefinedAttribute_sequence[] = { static int dissect_p1_BuiltInDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1049 "p1.cnf" +#line 1049 "../../asn1/p1/p1.cnf" ddatype = ep_alloc(MAX_ORA_STR_LEN); ddatype[0] = '\0'; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2210,7 +2210,7 @@ dissect_p1_ExtensionAttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p1_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 575 "p1.cnf" +#line 575 "../../asn1/p1/p1.cnf" proto_item_append_text(tree, " (%s)", val_to_str(extension_id, p1_ExtensionAttributeType_vals, "extension-attribute-type %d")); if (dissector_try_uint(p1_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) { @@ -2281,7 +2281,7 @@ dissect_p1_ORName_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ int dissect_p1_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1067 "p1.cnf" +#line 1067 "../../asn1/p1/p1.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = NULL; @@ -2491,7 +2491,7 @@ static const value_string p1_BuiltInContentType_U_vals[] = { static int dissect_p1_BuiltInContentType_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 635 "p1.cnf" +#line 635 "../../asn1/p1/p1.cnf" static guint32 ict = -1; offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset, @@ -2530,7 +2530,7 @@ dissect_p1_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int int dissect_p1_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 620 "p1.cnf" +#line 620 "../../asn1/p1/p1.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &content_type_id); @@ -2655,7 +2655,7 @@ dissect_p1_PerMessageIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1185 "p1.cnf" +#line 1185 "../../asn1/p1/p1.cnf" tvbuff_t *arrival = NULL; offset = dissect_ber_UTCTime(implicit_tag, actx, tree, tvb, offset, hf_index); @@ -2719,7 +2719,7 @@ dissect_p1_T_bilateral_domain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_bilateral_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1253 "p1.cnf" +#line 1253 "../../asn1/p1/p1.cnf" proto_item *item = NULL; int loffset = 0; guint32 len = 0; @@ -2787,7 +2787,7 @@ static const value_string p1_RoutingAction_vals[] = { static int dissect_p1_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1196 "p1.cnf" +#line 1196 "../../asn1/p1/p1.cnf" int action = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2848,7 +2848,7 @@ static const ber_sequence_t DomainSuppliedInformation_set[] = { static int dissect_p1_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1164 "p1.cnf" +#line 1164 "../../asn1/p1/p1.cnf" doing_address = FALSE; @@ -2873,7 +2873,7 @@ static const ber_sequence_t TraceInformationElement_sequence[] = { static int dissect_p1_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1148 "p1.cnf" +#line 1148 "../../asn1/p1/p1.cnf" doing_address = TRUE; @@ -2974,7 +2974,7 @@ dissect_p1_StandardExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_T_private_extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 612 "p1.cnf" +#line 612 "../../asn1/p1/p1.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -3028,7 +3028,7 @@ dissect_p1_Criticality(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 534 "p1.cnf" +#line 534 "../../asn1/p1/p1.cnf" const char *name; if(extension_id != -1) { @@ -3211,7 +3211,7 @@ dissect_p1_MessageTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_p1_Content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 653 "p1.cnf" +#line 653 "../../asn1/p1/p1.cnf" tvbuff_t *next_tvb; /* we can do this now constructed octet strings are supported */ @@ -3405,7 +3405,7 @@ dissect_p1_SubjectIntermediateTraceInformation(gboolean implicit_tag _U_, tvbuff static int dissect_p1_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 516 "p1.cnf" +#line 516 "../../asn1/p1/p1.cnf" proto_item *item = NULL; int loffset = 0; guint32 len = 0; @@ -3625,7 +3625,7 @@ static const ber_choice_t ReportType_choice[] = { static int dissect_p1_ReportType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1285 "p1.cnf" +#line 1285 "../../asn1/p1/p1.cnf" gint report = -1; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3767,7 +3767,7 @@ static const ber_choice_t MTS_APDU_choice[] = { static int dissect_p1_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1271 "p1.cnf" +#line 1271 "../../asn1/p1/p1.cnf" gint apdu = -1; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3824,7 +3824,7 @@ static const ber_sequence_t MTASuppliedInformation_set[] = { static int dissect_p1_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1173 "p1.cnf" +#line 1173 "../../asn1/p1/p1.cnf" doing_address = FALSE; @@ -3850,7 +3850,7 @@ static const ber_sequence_t InternalTraceInformationElement_sequence[] = { static int dissect_p1_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1156 "p1.cnf" +#line 1156 "../../asn1/p1/p1.cnf" doing_address = TRUE; @@ -4113,7 +4113,7 @@ static const ber_sequence_t MessageSubmissionArgument_sequence[] = { static int dissect_p1_MessageSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1296 "p1.cnf" +#line 1296 "../../asn1/p1/p1.cnf" p1_initialize_content_globals(tree, TRUE); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MessageSubmissionArgument_sequence, hf_index, ett_p1_MessageSubmissionArgument); @@ -4687,7 +4687,7 @@ static const ber_sequence_t MessageDeliveryArgument_sequence[] = { static int dissect_p1_MessageDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1301 "p1.cnf" +#line 1301 "../../asn1/p1/p1.cnf" p1_initialize_content_globals(tree, TRUE); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, MessageDeliveryArgument_sequence, hf_index, ett_p1_MessageDeliveryArgument); @@ -4797,7 +4797,7 @@ static const ber_sequence_t ReportDeliveryArgument_set[] = { static int dissect_p1_ReportDeliveryArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1306 "p1.cnf" +#line 1306 "../../asn1/p1/p1.cnf" p1_initialize_content_globals(tree, TRUE); offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, ReportDeliveryArgument_set, hf_index, ett_p1_ReportDeliveryArgument); @@ -4935,7 +4935,7 @@ dissect_p1_RefusedArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_p1_T_refused_extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 592 "p1.cnf" +#line 592 "../../asn1/p1/p1.cnf" /*XXX not implemented yet */ @@ -5010,7 +5010,7 @@ dissect_p1_UserName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_p1_T_x121_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 857 "p1.cnf" +#line 857 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -5329,7 +5329,7 @@ dissect_p1_T_standard_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p1_T_type_extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 531 "p1.cnf" +#line 531 "../../asn1/p1/p1.cnf" /*XXX not implemented yet */ @@ -5716,7 +5716,7 @@ static const ber_sequence_t ORAddress_sequence[] = { int dissect_p1_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1054 "p1.cnf" +#line 1054 "../../asn1/p1/p1.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; doing_address = TRUE; @@ -6204,7 +6204,7 @@ dissect_p1_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 794 "p1.cnf" +#line 794 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -6226,7 +6226,7 @@ dissect_p1_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_p1_TeletexCommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 807 "p1.cnf" +#line 807 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6327,7 +6327,7 @@ dissect_p1_UniversalCommonName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_TeletexOrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 755 "p1.cnf" +#line 755 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6358,7 +6358,7 @@ dissect_p1_UniversalOrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_p1_T_teletex_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 985 "p1.cnf" +#line 985 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6380,7 +6380,7 @@ dissect_p1_T_teletex_surname(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p1_T_teletex_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 995 "p1.cnf" +#line 995 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6402,7 +6402,7 @@ dissect_p1_T_teletex_given_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p1_T_teletex_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1005 "p1.cnf" +#line 1005 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6424,7 +6424,7 @@ dissect_p1_T_teletex_initials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_teletex_generation_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_) { -#line 1015 "p1.cnf" +#line 1015 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6480,7 +6480,7 @@ dissect_p1_UniversalPersonalName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p1_TeletexOrganizationalUnitName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 781 "p1.cnf" +#line 781 "../../asn1/p1/p1.cnf" tvbuff_t *string = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -6548,7 +6548,7 @@ dissect_p1_PDSName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p1_T_x121_dcc_code_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 897 "p1.cnf" +#line 897 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -6568,7 +6568,7 @@ dissect_p1_T_x121_dcc_code_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p1_T_iso_3166_alpha2_code_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 849 "p1.cnf" +#line 849 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -6610,7 +6610,7 @@ dissect_p1_PhysicalDeliveryCountryName(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_p1_T_numeric_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_) { -#line 905 "p1.cnf" +#line 905 "../../asn1/p1/p1.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -7035,7 +7035,7 @@ dissect_p1_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p1_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 914 "p1.cnf" +#line 914 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -7059,7 +7059,7 @@ dissect_p1_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p1_T_teletex_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 926 "p1.cnf" +#line 926 "../../asn1/p1/p1.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -7090,7 +7090,7 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = { static int dissect_p1_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_) { -#line 940 "p1.cnf" +#line 940 "../../asn1/p1/p1.cnf" ddatype = ep_alloc(MAX_ORA_STR_LEN); ddatype[0] = '\0'; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -7153,7 +7153,7 @@ static const ber_sequence_t MTANameAndOptionalGDI_sequence[] = { static int dissect_p1_MTANameAndOptionalGDI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1133 "p1.cnf" +#line 1133 "../../asn1/p1/p1.cnf" doing_address = TRUE; @@ -7213,7 +7213,7 @@ dissect_p1_TokenDataType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p1_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1237 "p1.cnf" +#line 1237 "../../asn1/p1/p1.cnf" proto_item_append_text(tree, " (%s)", val_to_str(extension_id, p1_TokenDataType_vals, "tokendata-type %d")); if (dissector_try_uint(p1_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) { @@ -8209,11 +8209,11 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-p1-fn.c ---*/ -#line 103 "packet-p1-template.c" +#line 103 "../../asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-table11.c ---*/ -#line 1 "packet-p1-table11.c" +#line 1 "../../asn1/p1/packet-p1-table11.c" static const ros_opr_t p3_opr_tab[] = { /* mts-bind */ @@ -8241,10 +8241,10 @@ static const ros_opr_t p3_opr_tab[] = { /*--- End of included file: packet-p1-table11.c ---*/ -#line 105 "packet-p1-template.c" +#line 105 "../../asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-table21.c ---*/ -#line 1 "packet-p1-table21.c" +#line 1 "../../asn1/p1/packet-p1-table21.c" static const ros_err_t p3_err_tab[] = { /* mts-bind-error*/ @@ -8286,7 +8286,7 @@ static const ros_err_t p3_err_tab[] = { /*--- End of included file: packet-p1-table21.c ---*/ -#line 106 "packet-p1-template.c" +#line 106 "../../asn1/p1/packet-p1-template.c" static const ros_info_t p3_ros_info = { "P3", @@ -8438,7 +8438,7 @@ void proto_register_p1(void) { /*--- Included file: packet-p1-hfarr.c ---*/ -#line 1 "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, @@ -10697,7 +10697,7 @@ void proto_register_p1(void) { NULL, HFILL }}, /*--- End of included file: packet-p1-hfarr.c ---*/ -#line 256 "packet-p1-template.c" +#line 256 "../../asn1/p1/packet-p1-template.c" }; /* List of subtrees */ @@ -10712,7 +10712,7 @@ void proto_register_p1(void) { &ett_p1_unknown_tokendata_type, /*--- Included file: packet-p1-ettarr.c ---*/ -#line 1 "packet-p1-ettarr.c" +#line 1 "../../asn1/p1/packet-p1-ettarr.c" &ett_p1_MTABindArgument, &ett_p1_AuthenticatedArgument, &ett_p1_MTABindResult, @@ -10896,7 +10896,7 @@ void proto_register_p1(void) { &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, /*--- End of included file: packet-p1-ettarr.c ---*/ -#line 269 "packet-p1-template.c" +#line 269 "../../asn1/p1/packet-p1-template.c" }; module_t *p1_module; @@ -10934,7 +10934,7 @@ void proto_reg_handoff_p1(void) { /*--- Included file: packet-p1-dis-tab.c ---*/ -#line 1 "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)); @@ -11089,7 +11089,7 @@ void proto_reg_handoff_p1(void) { /*--- End of included file: packet-p1-dis-tab.c ---*/ -#line 305 "packet-p1-template.c" +#line 305 "../../asn1/p1/packet-p1-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-p1.h b/epan/dissectors/packet-p1.h index a24ac0284d..acdbde0125 100644 --- a/epan/dissectors/packet-p1.h +++ b/epan/dissectors/packet-p1.h @@ -5,7 +5,7 @@ /* Input file: packet-p1-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-p1-val.h ---*/ -#line 1 "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 @@ -172,14 +172,14 @@ #define ub_x121_address_length 16 /*--- End of included file: packet-p1-val.h ---*/ -#line 30 "packet-p1-template.h" +#line 30 "../../asn1/p1/packet-p1-template.h" void p1_initialize_content_globals (proto_tree *tree, gboolean report_unknown_cont_type); char* p1_get_last_oraddress(void); void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); /*--- Included file: packet-p1-exp.h ---*/ -#line 1 "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[]; @@ -232,7 +232,7 @@ 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_); /*--- End of included file: packet-p1-exp.h ---*/ -#line 35 "packet-p1-template.h" +#line 35 "../../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 1b5d7718ee..646b872425 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -5,7 +5,7 @@ /* Input file: packet-p22-template.c */ -#line 1 "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 @@ -92,7 +92,7 @@ static const value_string charsetreg_vals [] = { /*--- Included file: packet-p22-val.h ---*/ -#line 1 "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" @@ -342,11 +342,11 @@ static const value_string charsetreg_vals [] = { #define ub_telephone_number 32 /*--- End of included file: packet-p22-val.h ---*/ -#line 86 "packet-p22-template.c" +#line 86 "../../asn1/p22/packet-p22-template.c" /*--- Included file: packet-p22-hf.c ---*/ -#line 1 "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 */ @@ -727,13 +727,13 @@ 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 88 "packet-p22-template.c" +#line 88 "../../asn1/p22/packet-p22-template.c" /* Initialize the subtree pointers */ static gint ett_p22 = -1; /*--- Included file: packet-p22-ett.c ---*/ -#line 1 "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; @@ -861,11 +861,11 @@ 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 92 "packet-p22-template.c" +#line 92 "../../asn1/p22/packet-p22-template.c" /*--- Included file: packet-p22-fn.c ---*/ -#line 1 "packet-p22-fn.c" +#line 1 "../../asn1/p22/packet-p22-fn.c" /*--- Cyclic dependencies ---*/ /* IPM -> Body -> BodyPart -> BodyPart/basic -> MessageBodyPart -> MessageData -> IPM */ @@ -1036,7 +1036,7 @@ dissect_p22_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_p22_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 221 "p22.cnf" +#line 221 "../../asn1/p22/p22.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1054,7 +1054,7 @@ dissect_p22_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_p22_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 229 "p22.cnf" +#line 229 "../../asn1/p22/p22.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1231,7 +1231,7 @@ dissect_p22_RelatedIPMsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_p22_SubjectField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 249 "p22.cnf" +#line 249 "../../asn1/p22/p22.cnf" tvbuff_t *subject=NULL; offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -1497,7 +1497,7 @@ dissect_p22_G3FacsimileBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_p22_Interchange_Data_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 267 "p22.cnf" +#line 267 "../../asn1/p22/p22.cnf" /* XXX Not implemented yet */ @@ -1738,7 +1738,7 @@ dissect_p22_BilaterallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_p22_NationallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 270 "p22.cnf" +#line 270 "../../asn1/p22/p22.cnf" /* XXX Not implemented yet */ @@ -1852,7 +1852,7 @@ static const ber_sequence_t IPM_sequence[] = { int dissect_p22_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 233 "p22.cnf" +#line 233 "../../asn1/p22/p22.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); @@ -2123,7 +2123,7 @@ static const ber_sequence_t IPN_set[] = { int dissect_p22_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 240 "p22.cnf" +#line 240 "../../asn1/p22/p22.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); @@ -2708,7 +2708,7 @@ dissect_p22_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p22_CharacterSetRegistration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 260 "p22.cnf" +#line 260 "../../asn1/p22/p22.cnf" guint32 crs; offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset, 1U, 32767U, hf_index, &crs); @@ -2949,7 +2949,7 @@ dissect_p22_Document_Type_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p22_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 273 "p22.cnf" +#line 273 "../../asn1/p22/p22.cnf" /* XXX: Not implemented yet */ @@ -3105,7 +3105,7 @@ dissect_p22_EnvironmentParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_p22_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 276 "p22.cnf" +#line 276 "../../asn1/p22/p22.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -3117,7 +3117,7 @@ dissect_p22_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_p22_T_compression_algorithm_param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 279 "p22.cnf" +#line 279 "../../asn1/p22/p22.cnf" /* XXX: Not implemented yet */ @@ -4511,7 +4511,7 @@ static void dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-p22-fn.c ---*/ -#line 94 "packet-p22-template.c" +#line 94 "../../asn1/p22/packet-p22-template.c" /* * Dissect P22 PDUs inside a PPDU. @@ -4545,7 +4545,7 @@ void proto_register_p22(void) { { /*--- Included file: packet-p22-hfarr.c ---*/ -#line 1 "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, @@ -6056,7 +6056,7 @@ void proto_register_p22(void) { NULL, HFILL }}, /*--- End of included file: packet-p22-hfarr.c ---*/ -#line 126 "packet-p22-template.c" +#line 126 "../../asn1/p22/packet-p22-template.c" }; /* List of subtrees */ @@ -6064,7 +6064,7 @@ void proto_register_p22(void) { &ett_p22, /*--- Included file: packet-p22-ettarr.c ---*/ -#line 1 "packet-p22-ettarr.c" +#line 1 "../../asn1/p22/packet-p22-ettarr.c" &ett_p22_InformationObject, &ett_p22_IPM, &ett_p22_IPMSExtension, @@ -6192,7 +6192,7 @@ void proto_register_p22(void) { &ett_p22_T_choice, /*--- End of included file: packet-p22-ettarr.c ---*/ -#line 132 "packet-p22-template.c" +#line 132 "../../asn1/p22/packet-p22-template.c" }; /* Register protocol */ @@ -6210,7 +6210,7 @@ void proto_reg_handoff_p22(void) { /*--- Included file: packet-p22-dis-tab.c ---*/ -#line 1 "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"); @@ -6312,7 +6312,7 @@ void proto_reg_handoff_p22(void) { /*--- End of included file: packet-p22-dis-tab.c ---*/ -#line 148 "packet-p22-template.c" +#line 148 "../../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 c45ab909cc..8df17deeec 100644 --- a/epan/dissectors/packet-p22.h +++ b/epan/dissectors/packet-p22.h @@ -5,7 +5,7 @@ /* Input file: packet-p22-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-p22-exp.h ---*/ -#line 1 "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[]; @@ -51,7 +51,7 @@ int dissect_p22_DiscardReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _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 30 "packet-p22-template.h" +#line 30 "../../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 2b13933df6..92e06c72a0 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -5,7 +5,7 @@ /* Input file: packet-p7-template.c */ -#line 1 "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 @@ -66,7 +66,7 @@ static int proto_p7 = -1; /*--- Included file: packet-p7-val.h ---*/ -#line 1 "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 @@ -123,11 +123,11 @@ static int proto_p7 = -1; #define ub_ua_restrictions 16 /*--- End of included file: packet-p7-val.h ---*/ -#line 60 "packet-p7-template.c" +#line 60 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-hf.c ---*/ -#line 1 "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 */ @@ -495,13 +495,13 @@ 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 62 "packet-p7-template.c" +#line 62 "../../asn1/p7/packet-p7-template.c" /* Initialize the subtree pointers */ static gint ett_p7 = -1; /*--- Included file: packet-p7-ett.c ---*/ -#line 1 "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; @@ -637,11 +637,11 @@ static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; /*--- End of included file: packet-p7-ett.c ---*/ -#line 66 "packet-p7-template.c" +#line 66 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table.c ---*/ -#line 1 "packet-p7-table.c" +#line 1 "../../asn1/p7/packet-p7-table.c" /* P7 ABSTRACT-OPERATIONS */ const value_string p7_opr_code_string_vals[] = { @@ -680,11 +680,11 @@ static const value_string p7_err_code_string_vals[] = { /*--- End of included file: packet-p7-table.c ---*/ -#line 68 "packet-p7-template.c" +#line 68 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-fn.c ---*/ -#line 1 "packet-p7-fn.c" +#line 1 "../../asn1/p7/packet-p7-fn.c" /*--- Cyclic dependencies ---*/ /* Filter -> Filter/and -> Filter */ @@ -4089,11 +4089,11 @@ static void dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-p7-fn.c ---*/ -#line 70 "packet-p7-template.c" +#line 70 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table11.c ---*/ -#line 1 "packet-p7-table11.c" +#line 1 "../../asn1/p7/packet-p7-table11.c" static const ros_opr_t p7_opr_tab[] = { /* ms-bind */ @@ -4121,10 +4121,10 @@ static const ros_opr_t p7_opr_tab[] = { /*--- End of included file: packet-p7-table11.c ---*/ -#line 72 "packet-p7-template.c" +#line 72 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table21.c ---*/ -#line 1 "packet-p7-table21.c" +#line 1 "../../asn1/p7/packet-p7-table21.c" static const ros_err_t p7_err_tab[] = { /* ms-bind-error*/ @@ -4160,7 +4160,7 @@ static const ros_err_t p7_err_tab[] = { /*--- End of included file: packet-p7-table21.c ---*/ -#line 73 "packet-p7-template.c" +#line 73 "../../asn1/p7/packet-p7-template.c" static const ros_info_t p7_ros_info = { "P7", @@ -4181,7 +4181,7 @@ void proto_register_p7(void) { { /*--- Included file: packet-p7-hfarr.c ---*/ -#line 1 "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, @@ -5640,7 +5640,7 @@ void proto_register_p7(void) { NULL, HFILL }}, /*--- End of included file: packet-p7-hfarr.c ---*/ -#line 92 "packet-p7-template.c" +#line 92 "../../asn1/p7/packet-p7-template.c" }; /* List of subtrees */ @@ -5648,7 +5648,7 @@ void proto_register_p7(void) { &ett_p7, /*--- Included file: packet-p7-ettarr.c ---*/ -#line 1 "packet-p7-ettarr.c" +#line 1 "../../asn1/p7/packet-p7-ettarr.c" &ett_p7_Attribute, &ett_p7_AttributeValues, &ett_p7_AutoActionRegistration, @@ -5784,7 +5784,7 @@ void proto_register_p7(void) { &ett_p7_RTABapdu, /*--- End of included file: packet-p7-ettarr.c ---*/ -#line 98 "packet-p7-template.c" +#line 98 "../../asn1/p7/packet-p7-template.c" }; module_t *p7_module; @@ -5812,7 +5812,7 @@ void proto_reg_handoff_p7(void) { /*--- Included file: packet-p7-dis-tab.c ---*/ -#line 1 "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"); @@ -5843,7 +5843,7 @@ void proto_reg_handoff_p7(void) { /*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 124 "packet-p7-template.c" +#line 124 "../../asn1/p7/packet-p7-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-p7.h b/epan/dissectors/packet-p7.h index 7957b26202..68beba3fa9 100644 --- a/epan/dissectors/packet-p7.h +++ b/epan/dissectors/packet-p7.h @@ -5,7 +5,7 @@ /* Input file: packet-p7-template.h */ -#line 1 "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 @@ -36,12 +36,12 @@ /*--- Included file: packet-p7-exp.h ---*/ -#line 1 "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 30 "packet-p7-template.h" +#line 30 "../../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 121154b097..bbc829784e 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -5,7 +5,7 @@ /* Input file: packet-p772-template.c */ -#line 1 "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 @@ -56,7 +56,7 @@ static int proto_p772 = -1; /*--- Included file: packet-p772-val.h ---*/ -#line 1 "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" @@ -164,11 +164,11 @@ static int proto_p772 = -1; #define ub_data_size 65535 /*--- End of included file: packet-p772-val.h ---*/ -#line 50 "packet-p772-template.c" +#line 50 "../../asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-hf.c ---*/ -#line 1 "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 */ @@ -250,13 +250,13 @@ 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 52 "packet-p772-template.c" +#line 52 "../../asn1/p772/packet-p772-template.c" /* Initialize the subtree pointers */ static gint ett_p772 = -1; /*--- Included file: packet-p772-ett.c ---*/ -#line 1 "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; @@ -286,11 +286,11 @@ static gint ett_p772_MMMessageParameters = -1; static gint ett_p772_Acp127NotificationType = -1; /*--- End of included file: packet-p772-ett.c ---*/ -#line 56 "packet-p772-template.c" +#line 56 "../../asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-fn.c ---*/ -#line 1 "packet-p772-fn.c" +#line 1 "../../asn1/p772/packet-p772-fn.c" static const value_string p772_InformationObject_vals[] = { { 0, "mm" }, @@ -501,7 +501,7 @@ dissect_p772_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_p772_T_dist_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 99 "p772.cnf" +#line 99 "../../asn1/p772/p772.cnf" /* XXX: not implemented */ offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree); @@ -649,7 +649,7 @@ static const value_string p772_PrimaryPrecedence_vals[] = { static int dissect_p772_PrimaryPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 105 "p772.cnf" +#line 105 "../../asn1/p772/p772.cnf" int precedence = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &precedence); @@ -679,7 +679,7 @@ static const value_string p772_CopyPrecedence_vals[] = { static int dissect_p772_CopyPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 113 "p772.cnf" +#line 113 "../../asn1/p772/p772.cnf" int precedence = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &precedence); @@ -1237,7 +1237,7 @@ static void dissect_Acp127NotificationType_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-p772-fn.c ---*/ -#line 58 "packet-p772-template.c" +#line 58 "../../asn1/p772/packet-p772-template.c" /* @@ -1273,7 +1273,7 @@ void proto_register_p772(void) { { /*--- Included file: packet-p772-hfarr.c ---*/ -#line 1 "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, @@ -1588,7 +1588,7 @@ void proto_register_p772(void) { NULL, HFILL }}, /*--- End of included file: packet-p772-hfarr.c ---*/ -#line 92 "packet-p772-template.c" +#line 92 "../../asn1/p772/packet-p772-template.c" }; /* List of subtrees */ @@ -1596,7 +1596,7 @@ void proto_register_p772(void) { &ett_p772, /*--- Included file: packet-p772-ettarr.c ---*/ -#line 1 "packet-p772-ettarr.c" +#line 1 "../../asn1/p772/packet-p772-ettarr.c" &ett_p772_InformationObject, &ett_p772_Acp127NotificationResponse, &ett_p772_AddressListIndicator, @@ -1626,7 +1626,7 @@ void proto_register_p772(void) { &ett_p772_Acp127NotificationType, /*--- End of included file: packet-p772-ettarr.c ---*/ -#line 98 "packet-p772-template.c" +#line 98 "../../asn1/p772/packet-p772-template.c" }; /* Register protocol */ @@ -1645,7 +1645,7 @@ void proto_register_p772(void) { void proto_reg_handoff_p772(void) { /*--- Included file: packet-p772-dis-tab.c ---*/ -#line 1 "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"); @@ -1679,7 +1679,7 @@ void proto_reg_handoff_p772(void) { /*--- End of included file: packet-p772-dis-tab.c ---*/ -#line 115 "packet-p772-template.c" +#line 115 "../../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 8f3153a217..a1078a5862 100644 --- a/epan/dissectors/packet-p772.h +++ b/epan/dissectors/packet-p772.h @@ -5,7 +5,7 @@ /* Input file: packet-p772-template.h */ -#line 1 "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 b09fe6473b..ef5aff7e10 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -5,7 +5,7 @@ /* Input file: packet-pcap-template.c */ -#line 1 "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 * @@ -67,7 +67,7 @@ static dissector_table_t sccp_ssn_table; /*--- Included file: packet-pcap-val.h ---*/ -#line 1 "packet-pcap-val.h" +#line 1 "../../asn1/pcap/packet-pcap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -245,7 +245,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-pcap-val.h ---*/ -#line 61 "packet-pcap-template.c" +#line 61 "../../asn1/pcap/packet-pcap-template.c" static dissector_handle_t pcap_handle = NULL; @@ -254,7 +254,7 @@ static int proto_pcap = -1; /*--- Included file: packet-pcap-hf.c ---*/ -#line 1 "packet-pcap-hf.c" +#line 1 "../../asn1/pcap/packet-pcap-hf.c" static int hf_pcap_AccuracyFulfilmentIndicator_PDU = -1; /* AccuracyFulfilmentIndicator */ static int hf_pcap_Cause_PDU = -1; /* Cause */ static int hf_pcap_CellId_MeasuredResultsSets_PDU = -1; /* CellId_MeasuredResultsSets */ @@ -1372,14 +1372,14 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-pcap-hf.c ---*/ -#line 68 "packet-pcap-template.c" +#line 68 "../../asn1/pcap/packet-pcap-template.c" /* Initialize the subtree pointers */ static int ett_pcap = -1; /*--- Included file: packet-pcap-ett.c ---*/ -#line 1 "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; @@ -1766,7 +1766,7 @@ static gint ett_pcap_UnsuccessfulOutcome = -1; static gint ett_pcap_Outcome = -1; /*--- End of included file: packet-pcap-ett.c ---*/ -#line 73 "packet-pcap-template.c" +#line 73 "../../asn1/pcap/packet-pcap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1792,7 +1792,7 @@ static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /*--- Included file: packet-pcap-fn.c ---*/ -#line 1 "packet-pcap-fn.c" +#line 1 "../../asn1/pcap/packet-pcap-fn.c" static const value_string pcap_Criticality_vals[] = { { 0, "reject" }, @@ -13172,7 +13172,7 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pcap-fn.c ---*/ -#line 97 "packet-pcap-template.c" +#line 97 "../../asn1/pcap/packet-pcap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -13248,7 +13248,7 @@ proto_reg_handoff_pcap(void) prefs_initialized = TRUE; /*--- Included file: packet-pcap-dis-tab.c ---*/ -#line 1 "packet-pcap-dis-tab.c" +#line 1 "../../asn1/pcap/packet-pcap-dis-tab.c" dissector_add_uint("pcap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_pcap)); dissector_add_uint("pcap.ies", id_GPS_UTRAN_TRU, new_create_dissector_handle(dissect_GPS_UTRAN_TRU_PDU, proto_pcap)); @@ -13371,7 +13371,7 @@ proto_reg_handoff_pcap(void) /*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 171 "packet-pcap-template.c" +#line 171 "../../asn1/pcap/packet-pcap-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -13389,7 +13389,7 @@ void proto_register_pcap(void) { /*--- Included file: packet-pcap-hfarr.c ---*/ -#line 1 "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, @@ -17848,7 +17848,7 @@ void proto_register_pcap(void) { NULL, HFILL }}, /*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 187 "packet-pcap-template.c" +#line 187 "../../asn1/pcap/packet-pcap-template.c" }; /* List of subtrees */ @@ -17856,7 +17856,7 @@ void proto_register_pcap(void) { &ett_pcap, /*--- Included file: packet-pcap-ettarr.c ---*/ -#line 1 "packet-pcap-ettarr.c" +#line 1 "../../asn1/pcap/packet-pcap-ettarr.c" &ett_pcap_PrivateIE_ID, &ett_pcap_TransactionID, &ett_pcap_ProtocolIE_Container, @@ -18243,7 +18243,7 @@ void proto_register_pcap(void) { &ett_pcap_Outcome, /*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 193 "packet-pcap-template.c" +#line 193 "../../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 4b7272b898..365906e09c 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -5,7 +5,7 @@ /* Input file: packet-pkcs1-template.c */ -#line 1 "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 @@ -51,7 +51,7 @@ static int proto_pkcs1 = -1; /*--- Included file: packet-pkcs1-hf.c ---*/ -#line 1 "packet-pkcs1-hf.c" +#line 1 "../../asn1/pkcs1/packet-pkcs1-hf.c" static int hf_pkcs1_modulus = -1; /* INTEGER */ static int hf_pkcs1_publicExponent = -1; /* INTEGER */ static int hf_pkcs1_version = -1; /* Version */ @@ -65,22 +65,22 @@ static int hf_pkcs1_digestAlgorithm = -1; /* DigestAlgorithmIdentifier * static int hf_pkcs1_digest = -1; /* Digest */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 45 "packet-pkcs1-template.c" +#line 45 "../../asn1/pkcs1/packet-pkcs1-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkcs1-ett.c ---*/ -#line 1 "packet-pkcs1-ett.c" +#line 1 "../../asn1/pkcs1/packet-pkcs1-ett.c" static gint ett_pkcs1_RSAPublicKey = -1; static gint ett_pkcs1_RSAPrivateKey = -1; static gint ett_pkcs1_DigestInfo = -1; /*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 48 "packet-pkcs1-template.c" +#line 48 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ -#line 1 "packet-pkcs1-fn.c" +#line 1 "../../asn1/pkcs1/packet-pkcs1-fn.c" static int @@ -174,7 +174,7 @@ dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 50 "packet-pkcs1-template.c" +#line 50 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -183,7 +183,7 @@ void proto_register_pkcs1(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkcs1-hfarr.c ---*/ -#line 1 "packet-pkcs1-hfarr.c" +#line 1 "../../asn1/pkcs1/packet-pkcs1-hfarr.c" { &hf_pkcs1_modulus, { "modulus", "pkcs1.modulus", FT_INT32, BASE_DEC, NULL, 0, @@ -230,20 +230,20 @@ void proto_register_pkcs1(void) { NULL, HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 57 "packet-pkcs1-template.c" +#line 57 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-pkcs1-ettarr.c ---*/ -#line 1 "packet-pkcs1-ettarr.c" +#line 1 "../../asn1/pkcs1/packet-pkcs1-ettarr.c" &ett_pkcs1_RSAPublicKey, &ett_pkcs1_RSAPrivateKey, &ett_pkcs1_DigestInfo, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 62 "packet-pkcs1-template.c" +#line 62 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h index 618b232615..34ba56e288 100644 --- a/epan/dissectors/packet-pkcs1.h +++ b/epan/dissectors/packet-pkcs1.h @@ -5,7 +5,7 @@ /* Input file: packet-pkcs1-template.h */ -#line 1 "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 @@ -36,13 +36,13 @@ /*--- Included file: packet-pkcs1-exp.h ---*/ -#line 1 "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_RSAPrivateKey(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 30 "packet-pkcs1-template.h" +#line 30 "../../asn1/pkcs1/packet-pkcs1-template.h" #endif /* PACKET_PKCS1_H */ diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 38c259e574..10335b422a 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -5,7 +5,7 @@ /* Input file: packet-pkcs12-template.c */ -#line 1 "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 @@ -85,7 +85,7 @@ static void dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_ /*--- Included file: packet-pkcs12-hf.c ---*/ -#line 1 "packet-pkcs12-hf.c" +#line 1 "../../asn1/pkcs12/packet-pkcs12-hf.c" static int hf_pkcs12_PFX_PDU = -1; /* PFX */ static int hf_pkcs12_AuthenticatedSafe_PDU = -1; /* AuthenticatedSafe */ static int hf_pkcs12_SafeContents_PDU = -1; /* SafeContents */ @@ -142,12 +142,12 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 79 "packet-pkcs12-template.c" +#line 79 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkcs12-ett.c ---*/ -#line 1 "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_DigestInfo = -1; @@ -170,7 +170,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 82 "packet-pkcs12-template.c" +#line 82 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -473,7 +473,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t /*--- Included file: packet-pkcs12-fn.c ---*/ -#line 1 "packet-pkcs12-fn.c" +#line 1 "../../asn1/pkcs12/packet-pkcs12-fn.c" static const value_string pkcs12_T_version_vals[] = { { 3, "v3" }, @@ -550,7 +550,7 @@ static const ber_sequence_t PFX_sequence[] = { static int dissect_pkcs12_PFX(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 60 "pkcs12.cnf" +#line 60 "../../asn1/pkcs12/pkcs12.cnf" dissector_handle_t dissector_handle; /* we change the CMS id-data dissector to dissect as AuthenticatedSafe @@ -577,7 +577,7 @@ static const ber_sequence_t AuthenticatedSafe_sequence_of[1] = { static int dissect_pkcs12_AuthenticatedSafe(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 73 "pkcs12.cnf" +#line 73 "../../asn1/pkcs12/pkcs12.cnf" dissector_handle_t dissector_handle; /* we change the CMS id-data dissector to dissect as SafeContents */ @@ -602,7 +602,7 @@ static int dissect_pkcs12_T_bagId(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); -#line 86 "pkcs12.cnf" +#line 86 "../../asn1/pkcs12/pkcs12.cnf" append_oid(tree, object_identifier_id); return offset; @@ -612,7 +612,7 @@ dissect_pkcs12_T_bagId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_pkcs12_T_bagValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 110 "pkcs12.cnf" +#line 110 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -627,7 +627,7 @@ static int dissect_pkcs12_T_attrId(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); -#line 106 "pkcs12.cnf" +#line 106 "../../asn1/pkcs12/pkcs12.cnf" append_oid(tree, object_identifier_id); return offset; @@ -637,7 +637,7 @@ dissect_pkcs12_T_attrId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_pkcs12_T_attrValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 114 "pkcs12.cnf" +#line 114 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -784,7 +784,7 @@ dissect_pkcs12_KeyBag(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_pkcs12_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 141 "pkcs12.cnf" +#line 141 "../../asn1/pkcs12/pkcs12.cnf" tvbuff_t *encrypted_tvb; dissector_handle_t dissector_handle; @@ -792,7 +792,7 @@ dissect_pkcs12_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &encrypted_tvb); -#line 147 "pkcs12.cnf" +#line 147 "../../asn1/pkcs12/pkcs12.cnf" @@ -838,7 +838,7 @@ static int dissect_pkcs12_T_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_) { offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); -#line 91 "pkcs12.cnf" +#line 91 "../../asn1/pkcs12/pkcs12.cnf" append_oid(tree, object_identifier_id); return offset; @@ -848,7 +848,7 @@ dissect_pkcs12_T_certId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_pkcs12_T_certValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 118 "pkcs12.cnf" +#line 118 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -878,7 +878,7 @@ static int dissect_pkcs12_T_crlId(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); -#line 96 "pkcs12.cnf" +#line 96 "../../asn1/pkcs12/pkcs12.cnf" append_oid(tree, object_identifier_id); return offset; @@ -888,7 +888,7 @@ dissect_pkcs12_T_crlId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_pkcs12_T_crlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 122 "pkcs12.cnf" +#line 122 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -918,7 +918,7 @@ static int dissect_pkcs12_T_secretTypeId(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); -#line 101 "pkcs12.cnf" +#line 101 "../../asn1/pkcs12/pkcs12.cnf" append_oid(tree, object_identifier_id); return offset; @@ -928,7 +928,7 @@ dissect_pkcs12_T_secretTypeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_pkcs12_T_secretValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 126 "pkcs12.cnf" +#line 126 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -961,7 +961,7 @@ static const ber_sequence_t PBEParameter_sequence[] = { static int dissect_pkcs12_PBEParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 130 "pkcs12.cnf" +#line 130 "../../asn1/pkcs12/pkcs12.cnf" /* initialise the encryption parameters */ PBE_reset_parameters(); @@ -1126,7 +1126,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 383 "packet-pkcs12-template.c" +#line 383 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1195,7 +1195,7 @@ void proto_register_pkcs12(void) { "pkcs12.X509Certificate", HFILL }}, /*--- Included file: packet-pkcs12-hfarr.c ---*/ -#line 1 "packet-pkcs12-hfarr.c" +#line 1 "../../asn1/pkcs12/packet-pkcs12-hfarr.c" { &hf_pkcs12_PFX_PDU, { "PFX", "pkcs12.PFX", FT_NONE, BASE_NONE, NULL, 0, @@ -1414,7 +1414,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 450 "packet-pkcs12-template.c" +#line 450 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1422,7 +1422,7 @@ void proto_register_pkcs12(void) { &ett_decrypted_pbe, /*--- Included file: packet-pkcs12-ettarr.c ---*/ -#line 1 "packet-pkcs12-ettarr.c" +#line 1 "../../asn1/pkcs12/packet-pkcs12-ettarr.c" &ett_pkcs12_PFX, &ett_pkcs12_MacData, &ett_pkcs12_DigestInfo, @@ -1445,7 +1445,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 456 "packet-pkcs12-template.c" +#line 456 "../../asn1/pkcs12/packet-pkcs12-template.c" }; module_t *pkcs12_module; @@ -1479,7 +1479,7 @@ void proto_register_pkcs12(void) { void proto_reg_handoff_pkcs12(void) { /*--- Included file: packet-pkcs12-dis-tab.c ---*/ -#line 1 "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"); @@ -1506,7 +1506,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 488 "packet-pkcs12-template.c" +#line 488 "../../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 d220e04396..529c8c4ede 100644 --- a/epan/dissectors/packet-pkcs12.h +++ b/epan/dissectors/packet-pkcs12.h @@ -5,7 +5,7 @@ /* Input file: packet-pkcs12-template.h */ -#line 1 "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 f50d713f41..e301bd7ee3 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -5,7 +5,7 @@ /* Input file: packet-pkinit-template.c */ -#line 1 "packet-pkinit-template.c" +#line 1 "../../asn1/pkinit/packet-pkinit-template.c" /* packet-pkinit.c * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 @@ -53,7 +53,7 @@ static int proto_pkinit = -1; /*--- Included file: packet-pkinit-hf.c ---*/ -#line 1 "packet-pkinit-hf.c" +#line 1 "../../asn1/pkinit/packet-pkinit-hf.c" static int hf_pkinit_AuthPack_PDU = -1; /* AuthPack */ static int hf_pkinit_KDCDHKeyInfo_PDU = -1; /* KDCDHKeyInfo */ static int hf_pkinit_signedAuthPack = -1; /* ContentInfo */ @@ -77,12 +77,12 @@ static int hf_pkinit_dhNonce = -1; /* INTEGER */ static int hf_pkinit_dhKeyExpiration = -1; /* KerberosTime */ /*--- End of included file: packet-pkinit-hf.c ---*/ -#line 47 "packet-pkinit-template.c" +#line 47 "../../asn1/pkinit/packet-pkinit-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkinit-ett.c ---*/ -#line 1 "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; @@ -93,14 +93,14 @@ static gint ett_pkinit_PaPkAsRep = -1; static gint ett_pkinit_KDCDHKeyInfo = -1; /*--- End of included file: packet-pkinit-ett.c ---*/ -#line 50 "packet-pkinit-template.c" +#line 50 "../../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_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); /*--- Included file: packet-pkinit-fn.c ---*/ -#line 1 "packet-pkinit-fn.c" +#line 1 "../../asn1/pkinit/packet-pkinit-fn.c" static const value_string pkinit_TrustedCA_vals[] = { { 0, "caName" }, @@ -282,7 +282,7 @@ static void dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkinit-fn.c ---*/ -#line 55 "packet-pkinit-template.c" +#line 55 "../../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_) { @@ -316,7 +316,7 @@ void proto_register_pkinit(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkinit-hfarr.c ---*/ -#line 1 "packet-pkinit-hfarr.c" +#line 1 "../../asn1/pkinit/packet-pkinit-hfarr.c" { &hf_pkinit_AuthPack_PDU, { "AuthPack", "pkinit.AuthPack", FT_NONE, BASE_NONE, NULL, 0, @@ -403,14 +403,14 @@ void proto_register_pkinit(void) { "KerberosTime", HFILL }}, /*--- End of included file: packet-pkinit-hfarr.c ---*/ -#line 87 "packet-pkinit-template.c" +#line 87 "../../asn1/pkinit/packet-pkinit-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-pkinit-ettarr.c ---*/ -#line 1 "packet-pkinit-ettarr.c" +#line 1 "../../asn1/pkinit/packet-pkinit-ettarr.c" &ett_pkinit_PaPkAsReq, &ett_pkinit_SEQUENCE_OF_TrustedCA, &ett_pkinit_TrustedCA, @@ -421,7 +421,7 @@ void proto_register_pkinit(void) { &ett_pkinit_KDCDHKeyInfo, /*--- End of included file: packet-pkinit-ettarr.c ---*/ -#line 92 "packet-pkinit-template.c" +#line 92 "../../asn1/pkinit/packet-pkinit-template.c" }; /* Register protocol */ @@ -438,12 +438,12 @@ void proto_register_pkinit(void) { void proto_reg_handoff_pkinit(void) { /*--- Included file: packet-pkinit-dis-tab.c ---*/ -#line 1 "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"); /*--- End of included file: packet-pkinit-dis-tab.c ---*/ -#line 107 "packet-pkinit-template.c" +#line 107 "../../asn1/pkinit/packet-pkinit-template.c" } diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h index b8fa6d0a14..54654b1737 100644 --- a/epan/dissectors/packet-pkinit.h +++ b/epan/dissectors/packet-pkinit.h @@ -5,7 +5,7 @@ /* Input file: packet-pkinit-template.h */ -#line 1 "packet-pkinit-template.h" +#line 1 "../../asn1/pkinit/packet-pkinit-template.h" /* packet-pkinit.h * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 @@ -39,13 +39,13 @@ int dissect_pkinit_PA_PK_AS_REP(proto_tree *tree, tvbuff_t *tvb, int offset, asn /*--- Included file: packet-pkinit-exp.h ---*/ -#line 1 "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_); /*--- End of included file: packet-pkinit-exp.h ---*/ -#line 33 "packet-pkinit-template.h" +#line 33 "../../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 d8f7cada8a..65c1af9141 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -5,7 +5,7 @@ /* Input file: packet-pkix1explicit-template.c */ -#line 1 "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 @@ -62,7 +62,7 @@ static int ett_pkix1explicit_addressFamily = -1; /*--- Included file: packet-pkix1explicit-hf.c ---*/ -#line 1 "packet-pkix1explicit-hf.c" +#line 1 "../../asn1/pkix1explicit/packet-pkix1explicit-hf.c" static int hf_pkix1explicit_DomainParameters_PDU = -1; /* DomainParameters */ static int hf_pkix1explicit_DirectoryString_PDU = -1; /* DirectoryString */ static int hf_pkix1explicit_IPAddrBlocks_PDU = -1; /* IPAddrBlocks */ @@ -108,12 +108,12 @@ 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 56 "packet-pkix1explicit-template.c" +#line 56 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkix1explicit-ett.c ---*/ -#line 1 "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; @@ -138,7 +138,7 @@ static gint ett_pkix1explicit_ASIdOrRange = -1; static gint ett_pkix1explicit_ASRange = -1; /*--- End of included file: packet-pkix1explicit-ett.c ---*/ -#line 59 "packet-pkix1explicit-template.c" +#line 59 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" static const char *object_identifier_id; @@ -184,7 +184,7 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, /*--- Included file: packet-pkix1explicit-fn.c ---*/ -#line 1 "packet-pkix1explicit-fn.c" +#line 1 "../../asn1/pkix1explicit/packet-pkix1explicit-fn.c" int @@ -285,7 +285,7 @@ dissect_pkix1explicit_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_pkix1explicit_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 56 "pkix1explicit.cnf" +#line 56 "../../asn1/pkix1explicit/pkix1explicit.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -397,7 +397,7 @@ dissect_pkix1explicit_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_pkix1explicit_T_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 44 "pkix1explicit.cnf" +#line 44 "../../asn1/pkix1explicit/pkix1explicit.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -437,7 +437,7 @@ dissect_pkix1explicit_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_pkix1explicit_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 50 "pkix1explicit.cnf" +#line 50 "../../asn1/pkix1explicit/pkix1explicit.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -490,7 +490,7 @@ dissect_pkix1explicit_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_pkix1explicit_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 38 "pkix1explicit.cnf" +#line 38 "../../asn1/pkix1explicit/pkix1explicit.cnf" offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -548,7 +548,7 @@ dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, t static int dissect_pkix1explicit_T_addressFamily(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 68 "pkix1explicit.cnf" +#line 68 "../../asn1/pkix1explicit/pkix1explicit.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -811,7 +811,7 @@ static void dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkix1explicit-fn.c ---*/ -#line 103 "packet-pkix1explicit-template.c" +#line 103 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" /*--- proto_register_pkix1explicit ----------------------------------------------*/ @@ -832,7 +832,7 @@ void proto_register_pkix1explicit(void) { "Subsequent Address Family Identifiers (SAFI) RFC4760", HFILL }}, /*--- Included file: packet-pkix1explicit-hfarr.c ---*/ -#line 1 "packet-pkix1explicit-hfarr.c" +#line 1 "../../asn1/pkix1explicit/packet-pkix1explicit-hfarr.c" { &hf_pkix1explicit_DomainParameters_PDU, { "DomainParameters", "pkix1explicit.DomainParameters", FT_NONE, BASE_NONE, NULL, 0, @@ -1007,7 +1007,7 @@ void proto_register_pkix1explicit(void) { "ASId", HFILL }}, /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ -#line 122 "packet-pkix1explicit-template.c" +#line 122 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* List of subtrees */ @@ -1015,7 +1015,7 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_addressFamily, /*--- Included file: packet-pkix1explicit-ettarr.c ---*/ -#line 1 "packet-pkix1explicit-ettarr.c" +#line 1 "../../asn1/pkix1explicit/packet-pkix1explicit-ettarr.c" &ett_pkix1explicit_Time, &ett_pkix1explicit_Extensions, &ett_pkix1explicit_Extension, @@ -1040,7 +1040,7 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_ASRange, /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ -#line 128 "packet-pkix1explicit-template.c" +#line 128 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* Register protocol */ @@ -1058,7 +1058,7 @@ void proto_reg_handoff_pkix1explicit(void) { oid_add_from_string("id-pkix","1.3.6.1.5.5.7"); /*--- Included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 1 "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"); @@ -1066,6 +1066,6 @@ void proto_reg_handoff_pkix1explicit(void) { /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 144 "packet-pkix1explicit-template.c" +#line 144 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" } diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h index 867a8427b6..a9aa68758a 100644 --- a/epan/dissectors/packet-pkix1explicit.h +++ b/epan/dissectors/packet-pkix1explicit.h @@ -5,7 +5,7 @@ /* Input file: packet-pkix1explicit-template.h */ -#line 1 "packet-pkix1explicit-template.h" +#line 1 "../../asn1/pkix1explicit/packet-pkix1explicit-template.h" /* packet-pkix1explicit.h * Routines for PKIX1Explicit packet dissection * @@ -44,7 +44,7 @@ int dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t * /*--- Included file: packet-pkix1explicit-exp.h ---*/ -#line 1 "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[]; @@ -63,7 +63,7 @@ int dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb 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 38 "packet-pkix1explicit-template.h" +#line 38 "../../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 016e9b1689..7efbf095f3 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -5,7 +5,7 @@ /* Input file: packet-pkix1implicit-template.c */ -#line 1 "packet-pkix1implicit-template.c" +#line 1 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" /* packet-pkix1implicit.c * Routines for PKIX1Implitic packet dissection * @@ -51,7 +51,7 @@ static int proto_pkix1implicit = -1; /*--- Included file: packet-pkix1implicit-hf.c ---*/ -#line 1 "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 */ @@ -69,12 +69,12 @@ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ /*--- End of included file: packet-pkix1implicit-hf.c ---*/ -#line 45 "packet-pkix1implicit-template.c" +#line 45 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkix1implicit-ett.c ---*/ -#line 1 "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; @@ -83,7 +83,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; /*--- End of included file: packet-pkix1implicit-ett.c ---*/ -#line 48 "packet-pkix1implicit-template.c" +#line 48 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" int @@ -101,7 +101,7 @@ dissect_pkix1implicit_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int /*--- Included file: packet-pkix1implicit-fn.c ---*/ -#line 1 "packet-pkix1implicit-fn.c" +#line 1 "../../asn1/pkix1implicit/packet-pkix1implicit-fn.c" int @@ -301,7 +301,7 @@ static void dissect_UserNotice_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-pkix1implicit-fn.c ---*/ -#line 64 "packet-pkix1implicit-template.c" +#line 64 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" /*--- proto_register_pkix1implicit ----------------------------------------------*/ @@ -311,7 +311,7 @@ void proto_register_pkix1implicit(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkix1implicit-hfarr.c ---*/ -#line 1 "packet-pkix1implicit-hfarr.c" +#line 1 "../../asn1/pkix1implicit/packet-pkix1implicit-hfarr.c" { &hf_pkix1implicit_Dummy_PDU, { "Dummy", "pkix1implicit.Dummy", FT_NONE, BASE_NONE, NULL, 0, @@ -374,14 +374,14 @@ void proto_register_pkix1implicit(void) { NULL, HFILL }}, /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ -#line 72 "packet-pkix1implicit-template.c" +#line 72 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-pkix1implicit-ettarr.c ---*/ -#line 1 "packet-pkix1implicit-ettarr.c" +#line 1 "../../asn1/pkix1implicit/packet-pkix1implicit-ettarr.c" &ett_pkix1implicit_AuthorityInfoAccessSyntax, &ett_pkix1implicit_AccessDescription, &ett_pkix1implicit_UserNotice, @@ -390,7 +390,7 @@ void proto_register_pkix1implicit(void) { &ett_pkix1implicit_DisplayText, /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ -#line 77 "packet-pkix1implicit-template.c" +#line 77 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* Register protocol */ @@ -407,7 +407,7 @@ void proto_register_pkix1implicit(void) { void proto_reg_handoff_pkix1implicit(void) { /*--- Included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 1 "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-authorityInfoAccessSyntax"); register_ber_oid_dissector("1.3.6.1.5.5.7.3.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-serverAuth"); register_ber_oid_dissector("1.3.6.1.5.5.7.3.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-clientAuth"); @@ -446,6 +446,6 @@ void proto_reg_handoff_pkix1implicit(void) { /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 92 "packet-pkix1implicit-template.c" +#line 92 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" } diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index 8353dc24e1..5ca0887dfe 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -5,7 +5,7 @@ /* Input file: packet-pkix1implicit-template.h */ -#line 1 "packet-pkix1implicit-template.h" +#line 1 "../../asn1/pkix1implicit/packet-pkix1implicit-template.h" /* packet-pkix1implicit.h * Routines for PKIX1Implicit packet dissection * @@ -38,13 +38,13 @@ int dissect_pkix1implicit_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb, /*--- Included file: packet-pkix1implicit-exp.h ---*/ -#line 1 "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 32 "packet-pkix1implicit-template.h" +#line 32 "../../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 46aa811820..a27ab1acfb 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -5,7 +5,7 @@ /* Input file: packet-pkixac-template.c */ -#line 1 "packet-pkixac-template.c" +#line 1 "../../asn1/pkixac/packet-pkixac-template.c" /* packet-pkixac.c * * Routines for PKIXAttributeCertificate (RFC3281) packet dissection. @@ -55,7 +55,7 @@ static int proto_pkixac = -1; /*--- Included file: packet-pkixac-hf.c ---*/ -#line 1 "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 */ @@ -108,13 +108,13 @@ static int hf_pkixac_ClassList_secret = -1; static int hf_pkixac_ClassList_topSecret = -1; /*--- End of included file: packet-pkixac-hf.c ---*/ -#line 49 "packet-pkixac-template.c" +#line 49 "../../asn1/pkixac/packet-pkixac-template.c" /* Initialize the subtree pointers */ static gint ett_pkixac = -1; /*--- Included file: packet-pkixac-ett.c ---*/ -#line 1 "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; @@ -134,13 +134,13 @@ static gint ett_pkixac_AttrSpec = -1; static gint ett_pkixac_ProxyInfo = -1; /*--- End of included file: packet-pkixac-ett.c ---*/ -#line 53 "packet-pkixac-template.c" +#line 53 "../../asn1/pkixac/packet-pkixac-template.c" static const char *object_identifier_id; /*--- Included file: packet-pkixac-fn.c ---*/ -#line 1 "packet-pkixac-fn.c" +#line 1 "../../asn1/pkixac/packet-pkixac-fn.c" static const value_string pkixac_T_digestedObjectType_vals[] = { { 0, "publicKey" }, @@ -401,7 +401,7 @@ dissect_pkixac_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_pkixac_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 59 "pkixac.cnf" +#line 59 "../../asn1/pkixac/pkixac.cnf" if (object_identifier_id) offset = call_ber_oid_callback (object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -419,7 +419,7 @@ static const ber_sequence_t SecurityCategory_sequence[] = { static int dissect_pkixac_SecurityCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 52 "pkixac.cnf" +#line 52 "../../asn1/pkixac/pkixac.cnf" object_identifier_id = NULL; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, SecurityCategory_sequence, hf_index, ett_pkixac_SecurityCategory); @@ -561,7 +561,7 @@ static void dissect_ProxyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-pkixac-fn.c ---*/ -#line 57 "packet-pkixac-template.c" +#line 57 "../../asn1/pkixac/packet-pkixac-template.c" /*--- proto_register_pkixac ----------------------------------------------*/ void proto_register_pkixac(void) { @@ -570,7 +570,7 @@ void proto_register_pkixac(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkixac-hfarr.c ---*/ -#line 1 "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, @@ -769,7 +769,7 @@ void proto_register_pkixac(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixac-hfarr.c ---*/ -#line 64 "packet-pkixac-template.c" +#line 64 "../../asn1/pkixac/packet-pkixac-template.c" }; /* List of subtrees */ @@ -777,7 +777,7 @@ void proto_register_pkixac(void) { &ett_pkixac, /*--- Included file: packet-pkixac-ettarr.c ---*/ -#line 1 "packet-pkixac-ettarr.c" +#line 1 "../../asn1/pkixac/packet-pkixac-ettarr.c" &ett_pkixac_ObjectDigestInfo, &ett_pkixac_IssuerSerial, &ett_pkixac_Targets, @@ -797,7 +797,7 @@ void proto_register_pkixac(void) { &ett_pkixac_ProxyInfo, /*--- End of included file: packet-pkixac-ettarr.c ---*/ -#line 70 "packet-pkixac-template.c" +#line 70 "../../asn1/pkixac/packet-pkixac-template.c" }; /* Register protocol */ @@ -814,7 +814,7 @@ void proto_register_pkixac(void) { void proto_reg_handoff_pkixac(void) { /*--- Included file: packet-pkixac-dis-tab.c ---*/ -#line 1 "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"); @@ -828,6 +828,6 @@ void proto_reg_handoff_pkixac(void) { /*--- End of included file: packet-pkixac-dis-tab.c ---*/ -#line 85 "packet-pkixac-template.c" +#line 85 "../../asn1/pkixac/packet-pkixac-template.c" } diff --git a/epan/dissectors/packet-pkixac.h b/epan/dissectors/packet-pkixac.h index 842ab42654..df5b2ebe7b 100644 --- a/epan/dissectors/packet-pkixac.h +++ b/epan/dissectors/packet-pkixac.h @@ -5,7 +5,7 @@ /* Input file: packet-pkixac-template.h */ -#line 1 "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 73463e743f..63dc84f988 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -5,7 +5,7 @@ /* Input file: packet-pkixproxy-template.c */ -#line 1 "packet-pkixproxy-template.c" +#line 1 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /* packet-pkixproxy.c * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 @@ -51,7 +51,7 @@ static int proto_pkixproxy = -1; /*--- Included file: packet-pkixproxy-hf.c ---*/ -#line 1 "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 */ @@ -59,21 +59,21 @@ 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 45 "packet-pkixproxy-template.c" +#line 45 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkixproxy-ett.c ---*/ -#line 1 "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 48 "packet-pkixproxy-template.c" +#line 48 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ -#line 1 "packet-pkixproxy-fn.c" +#line 1 "../../asn1/pkixproxy/packet-pkixproxy-fn.c" static int @@ -143,7 +143,7 @@ static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 50 "packet-pkixproxy-template.c" +#line 50 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -153,7 +153,7 @@ void proto_register_pkixproxy(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkixproxy-hfarr.c ---*/ -#line 1 "packet-pkixproxy-hfarr.c" +#line 1 "../../asn1/pkixproxy/packet-pkixproxy-hfarr.c" { &hf_pkixproxy_ProxyCertInfoExtension_PDU, { "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension", FT_NONE, BASE_NONE, NULL, 0, @@ -176,19 +176,19 @@ void proto_register_pkixproxy(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 58 "packet-pkixproxy-template.c" +#line 58 "../../asn1/pkixproxy/packet-pkixproxy-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-pkixproxy-ettarr.c ---*/ -#line 1 "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 63 "packet-pkixproxy-template.c" +#line 63 "../../asn1/pkixproxy/packet-pkixproxy-template.c" }; /* Register protocol */ @@ -205,12 +205,12 @@ void proto_register_pkixproxy(void) { void proto_reg_handoff_pkixproxy(void) { /*--- Included file: packet-pkixproxy-dis-tab.c ---*/ -#line 1 "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 78 "packet-pkixproxy-template.c" +#line 78 "../../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 85431d63d1..7d515be126 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -5,7 +5,7 @@ /* Input file: packet-pkixproxy-template.h */ -#line 1 "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 d77ca533d0..f14bd4aabf 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -5,7 +5,7 @@ /* Input file: packet-pkixqualified-template.c */ -#line 1 "packet-pkixqualified-template.c" +#line 1 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /* packet-pkixqualified.c * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 @@ -53,7 +53,7 @@ static int proto_pkixqualified = -1; /*--- Included file: packet-pkixqualified-hf.c ---*/ -#line 1 "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 */ @@ -76,12 +76,12 @@ static int hf_pkixqualified_nameRegistrationAuthorities = -1; /* NameRegistrati static int hf_pkixqualified_NameRegistrationAuthorities_item = -1; /* GeneralName */ /*--- End of included file: packet-pkixqualified-hf.c ---*/ -#line 47 "packet-pkixqualified-template.c" +#line 47 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-pkixqualified-ett.c ---*/ -#line 1 "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; @@ -91,13 +91,13 @@ static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 50 "packet-pkixqualified-template.c" +#line 50 "../../asn1/pkixqualified/packet-pkixqualified-template.c" static const char *object_identifier_id; /*--- Included file: packet-pkixqualified-fn.c ---*/ -#line 1 "packet-pkixqualified-fn.c" +#line 1 "../../asn1/pkixqualified/packet-pkixqualified-fn.c" static int @@ -238,7 +238,7 @@ dissect_pkixqualified_T_statementId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_pkixqualified_T_statementInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 34 "pkixqualified.cnf" +#line 34 "../../asn1/pkixqualified/pkixqualified.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -353,7 +353,7 @@ static void dissect_XmppAddr_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 54 "packet-pkixqualified-template.c" +#line 54 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /*--- proto_register_pkixqualified ----------------------------------------------*/ @@ -363,7 +363,7 @@ void proto_register_pkixqualified(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkixqualified-hfarr.c ---*/ -#line 1 "packet-pkixqualified-hfarr.c" +#line 1 "../../asn1/pkixqualified/packet-pkixqualified-hfarr.c" { &hf_pkixqualified_Generalizedtime_PDU, { "Generalizedtime", "pkixqualified.Generalizedtime", FT_STRING, BASE_NONE, NULL, 0, @@ -446,14 +446,14 @@ void proto_register_pkixqualified(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 62 "packet-pkixqualified-template.c" +#line 62 "../../asn1/pkixqualified/packet-pkixqualified-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-pkixqualified-ettarr.c ---*/ -#line 1 "packet-pkixqualified-ettarr.c" +#line 1 "../../asn1/pkixqualified/packet-pkixqualified-ettarr.c" &ett_pkixqualified_BiometricSyntax, &ett_pkixqualified_BiometricData, &ett_pkixqualified_TypeOfBiometricData, @@ -463,7 +463,7 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_NameRegistrationAuthorities, /*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 67 "packet-pkixqualified-template.c" +#line 67 "../../asn1/pkixqualified/packet-pkixqualified-template.c" }; /* Register protocol */ @@ -480,7 +480,7 @@ void proto_register_pkixqualified(void) { void proto_reg_handoff_pkixqualified(void) { /*--- Included file: packet-pkixqualified-dis-tab.c ---*/ -#line 1 "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"); @@ -494,6 +494,6 @@ void proto_reg_handoff_pkixqualified(void) { /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 82 "packet-pkixqualified-template.c" +#line 82 "../../asn1/pkixqualified/packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h index 4804b16442..6c2a64d034 100644 --- a/epan/dissectors/packet-pkixqualified.h +++ b/epan/dissectors/packet-pkixqualified.h @@ -5,7 +5,7 @@ /* Input file: packet-pkixqualified-template.h */ -#line 1 "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 b9e7db1d01..878ad03194 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -5,7 +5,7 @@ /* Input file: packet-pkixtsp-template.c */ -#line 1 "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 @@ -53,7 +53,7 @@ static int proto_pkixtsp = -1; /*--- Included file: packet-pkixtsp-hf.c ---*/ -#line 1 "packet-pkixtsp-hf.c" +#line 1 "../../asn1/pkixtsp/packet-pkixtsp-hf.c" static int hf_pkixtsp_TSTInfo_PDU = -1; /* TSTInfo */ static int hf_pkixtsp_version = -1; /* T_version */ static int hf_pkixtsp_messageImprint = -1; /* MessageImprint */ @@ -88,13 +88,13 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; /*--- End of included file: packet-pkixtsp-hf.c ---*/ -#line 47 "packet-pkixtsp-template.c" +#line 47 "../../asn1/pkixtsp/packet-pkixtsp-template.c" /* Initialize the subtree pointers */ static gint ett_pkixtsp = -1; /*--- Included file: packet-pkixtsp-ett.c ---*/ -#line 1 "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; @@ -104,12 +104,12 @@ static gint ett_pkixtsp_TSTInfo = -1; static gint ett_pkixtsp_Accuracy = -1; /*--- End of included file: packet-pkixtsp-ett.c ---*/ -#line 51 "packet-pkixtsp-template.c" +#line 51 "../../asn1/pkixtsp/packet-pkixtsp-template.c" /*--- Included file: packet-pkixtsp-fn.c ---*/ -#line 1 "packet-pkixtsp-fn.c" +#line 1 "../../asn1/pkixtsp/packet-pkixtsp-fn.c" static const value_string pkixtsp_T_version_vals[] = { { 1, "v1" }, @@ -361,7 +361,7 @@ static void dissect_TSTInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pkixtsp-fn.c ---*/ -#line 54 "packet-pkixtsp-template.c" +#line 54 "../../asn1/pkixtsp/packet-pkixtsp-template.c" static int @@ -414,7 +414,7 @@ void proto_register_pkixtsp(void) { static hf_register_info hf[] = { /*--- Included file: packet-pkixtsp-hfarr.c ---*/ -#line 1 "packet-pkixtsp-hfarr.c" +#line 1 "../../asn1/pkixtsp/packet-pkixtsp-hfarr.c" { &hf_pkixtsp_TSTInfo_PDU, { "TSTInfo", "pkixtsp.TSTInfo", FT_NONE, BASE_NONE, NULL, 0, @@ -541,7 +541,7 @@ void proto_register_pkixtsp(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 105 "packet-pkixtsp-template.c" +#line 105 "../../asn1/pkixtsp/packet-pkixtsp-template.c" }; /* List of subtrees */ @@ -549,7 +549,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp, /*--- Included file: packet-pkixtsp-ettarr.c ---*/ -#line 1 "packet-pkixtsp-ettarr.c" +#line 1 "../../asn1/pkixtsp/packet-pkixtsp-ettarr.c" &ett_pkixtsp_TimeStampReq, &ett_pkixtsp_MessageImprint, &ett_pkixtsp_TimeStampResp, @@ -559,7 +559,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_Accuracy, /*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 111 "packet-pkixtsp-template.c" +#line 111 "../../asn1/pkixtsp/packet-pkixtsp-template.c" }; /* Register protocol */ @@ -585,11 +585,11 @@ void proto_reg_handoff_pkixtsp(void) { /*--- Included file: packet-pkixtsp-dis-tab.c ---*/ -#line 1 "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.1.4", dissect_TSTInfo_PDU, proto_pkixtsp, "id-ct-TSTInfo"); /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 135 "packet-pkixtsp-template.c" +#line 135 "../../asn1/pkixtsp/packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h index 1140ca3d76..519a70beba 100644 --- a/epan/dissectors/packet-pkixtsp.h +++ b/epan/dissectors/packet-pkixtsp.h @@ -5,7 +5,7 @@ /* Input file: packet-pkixtsp-template.h */ -#line 1 "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 6a34a8d8cb..4e4450b687 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -5,7 +5,7 @@ /* Input file: packet-pres-template.c */ -#line 1 "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 @@ -103,7 +103,7 @@ static int hf_pres_Typed_data_type = -1; /*--- Included file: packet-pres-hf.c ---*/ -#line 1 "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_UDC_type_PDU = -1; /* UDC_type */ static int hf_pres_mode_selector = -1; /* Mode_selector */ @@ -185,14 +185,14 @@ 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 97 "packet-pres-template.c" +#line 97 "../../asn1/pres/packet-pres-template.c" /* Initialize the subtree pointers */ static gint ett_pres = -1; /*--- Included file: packet-pres-ett.c ---*/ -#line 1 "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; @@ -231,7 +231,7 @@ static gint ett_pres_User_session_requirements = -1; static gint ett_pres_UD_type = -1; /*--- End of included file: packet-pres-ett.c ---*/ -#line 102 "packet-pres-template.c" +#line 102 "../../asn1/pres/packet-pres-template.c" UAT_DEC_CB_DEF(pres_users, ctx_id, pres_user_t) UAT_CSTRING_CB_DEF(pres_users, oid, pres_user_t) @@ -360,7 +360,7 @@ pres_try_users_table(guint32 ctx_id, tvbuff_t *tvb, int offset, packet_info *pin /*--- Included file: packet-pres-fn.c ---*/ -#line 1 "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" }, @@ -438,7 +438,7 @@ dissect_pres_Called_presentation_selector(gboolean implicit_tag _U_, tvbuff_t *t static int dissect_pres_Presentation_context_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_) { -#line 76 "pres.cnf" +#line 76 "../../asn1/pres/pres.cnf" const char *name; char *oid; @@ -501,13 +501,13 @@ static const ber_sequence_t Context_list_item_sequence[] = { static int dissect_pres_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 101 "pres.cnf" +#line 101 "../../asn1/pres/pres.cnf" abstract_syntax_name_oid=NULL; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Context_list_item_sequence, hf_index, ett_pres_Context_list_item); -#line 104 "pres.cnf" +#line 104 "../../asn1/pres/pres.cnf" register_ctx_id_and_oid(actx->pinfo, presentation_context_identifier, abstract_syntax_name_oid); return offset; @@ -637,7 +637,7 @@ dissect_pres_Simply_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 37 "pres.cnf" +#line 37 "../../asn1/pres/pres.cnf" tvbuff_t *next_tvb; char *oid; @@ -661,7 +661,7 @@ dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 52 "pres.cnf" +#line 52 "../../asn1/pres/pres.cnf" tvbuff_t *next_tvb; char *oid; @@ -1092,7 +1092,7 @@ static const value_string pres_Abort_reason_vals[] = { static int dissect_pres_Abort_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 94 "pres.cnf" +#line 94 "../../asn1/pres/pres.cnf" guint32 reason; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1378,7 +1378,7 @@ static void dissect_UDC_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pres-fn.c ---*/ -#line 229 "packet-pres-template.c" +#line 229 "../../asn1/pres/packet-pres-template.c" /* @@ -1554,7 +1554,7 @@ void proto_register_pres(void) { /*--- Included file: packet-pres-hfarr.c ---*/ -#line 1 "packet-pres-hfarr.c" +#line 1 "../../asn1/pres/packet-pres-hfarr.c" { &hf_pres_UD_type_PDU, { "UD-type", "pres.UD_type", FT_NONE, BASE_NONE, NULL, 0, @@ -1869,7 +1869,7 @@ void proto_register_pres(void) { NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 403 "packet-pres-template.c" +#line 403 "../../asn1/pres/packet-pres-template.c" }; /* List of subtrees */ @@ -1877,7 +1877,7 @@ void proto_register_pres(void) { &ett_pres, /*--- Included file: packet-pres-ettarr.c ---*/ -#line 1 "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, @@ -1916,7 +1916,7 @@ void proto_register_pres(void) { &ett_pres_UD_type, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 409 "packet-pres-template.c" +#line 409 "../../asn1/pres/packet-pres-template.c" }; static uat_field_t users_flds[] = { diff --git a/epan/dissectors/packet-pres.h b/epan/dissectors/packet-pres.h index 6adf3edd0c..000cbc88c9 100644 --- a/epan/dissectors/packet-pres.h +++ b/epan/dissectors/packet-pres.h @@ -5,7 +5,7 @@ /* Input file: packet-pres-template.h */ -#line 1 "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 bf56b7f914..0e3e060d9b 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -5,7 +5,7 @@ /* Input file: packet-q932-ros-template.c */ -#line 1 "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 @@ -50,7 +50,7 @@ static int proto_q932_ros = -1; /*--- Included file: packet-q932-ros-hf.c ---*/ -#line 1 "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 */ @@ -77,12 +77,12 @@ 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 44 "packet-q932-ros-template.c" +#line 44 "../../asn1/q932-ros/packet-q932-ros-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-q932-ros-ett.c ---*/ -#line 1 "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; @@ -95,7 +95,7 @@ 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 47 "packet-q932-ros-template.c" +#line 47 "../../asn1/q932-ros/packet-q932-ros-template.c" /* Preferences */ @@ -112,7 +112,7 @@ static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; /*--- Included file: packet-q932-ros-fn.c ---*/ -#line 1 "packet-q932-ros-fn.c" +#line 1 "../../asn1/q932-ros/packet-q932-ros-fn.c" static int @@ -151,7 +151,7 @@ dissect_q932_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ Code_choice, hf_index, ett_q932_ros_Code, &actx->rose_ctx->d.code); -#line 43 "q932-ros.cnf" +#line 43 "../../asn1/q932-ros/q932-ros.cnf" actx->rose_ctx->d.code_item = actx->created_item; return offset; @@ -243,7 +243,7 @@ dissect_q932_ros_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_q932_ros_InvokeArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "q932-ros.cnf" +#line 69 "../../asn1/q932-ros/q932-ros.cnf" gint len; len = tvb_length_remaining(tvb, offset); @@ -268,7 +268,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 8 "ros-inv.cnf" +#line 8 "../../asn1/ros/ros-inv.cnf" dissector_handle_t arg_handle = NULL; const gchar *descr = ""; @@ -277,7 +277,7 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Invoke_sequence, hf_index, ett_q932_ros_Invoke); -#line 13 "ros-inv.cnf" +#line 13 "../../asn1/ros/ros-inv.cnf" actx->rose_ctx->d.pdu = 1; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->arg_local_dissector_table) { @@ -321,7 +321,7 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_q932_ros_ResultArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 87 "q932-ros.cnf" +#line 87 "../../asn1/q932-ros/q932-ros.cnf" gint len; len = tvb_length_remaining(tvb, offset); @@ -360,7 +360,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 7 "ros-res.cnf" +#line 7 "../../asn1/ros/ros-res.cnf" dissector_handle_t res_handle = NULL; const gchar *descr = ""; @@ -370,7 +370,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult); -#line 13 "ros-res.cnf" +#line 13 "../../asn1/ros/ros-res.cnf" actx->rose_ctx->d.pdu = 2; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) { @@ -416,7 +416,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_q932_ros_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 106 "q932-ros.cnf" +#line 106 "../../asn1/q932-ros/q932-ros.cnf" gint len; @@ -441,7 +441,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 7 "ros-err.cnf" +#line 7 "../../asn1/ros/ros-err.cnf" dissector_handle_t err_handle = NULL; const gchar *descr = ""; @@ -450,7 +450,7 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ReturnError_sequence, hf_index, ett_q932_ros_ReturnError); -#line 12 "ros-err.cnf" +#line 12 "../../asn1/ros/ros-err.cnf" actx->rose_ctx->d.pdu = 3; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->err_local_dissector_table) { @@ -504,7 +504,7 @@ dissect_q932_ros_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &problem_val); -#line 54 "q932-ros.cnf" +#line 54 "../../asn1/q932-ros/q932-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_GeneralProblem_vals), ""), 64); return offset; @@ -529,7 +529,7 @@ dissect_q932_ros_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &problem_val); -#line 56 "q932-ros.cnf" +#line 56 "../../asn1/q932-ros/q932-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_InvokeProblem_vals), ""), 64); return offset; @@ -549,7 +549,7 @@ dissect_q932_ros_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &problem_val); -#line 58 "q932-ros.cnf" +#line 58 "../../asn1/q932-ros/q932-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_ReturnResultProblem_vals), ""), 64); return offset; @@ -571,7 +571,7 @@ dissect_q932_ros_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &problem_val); -#line 60 "q932-ros.cnf" +#line 60 "../../asn1/q932-ros/q932-ros.cnf" g_strlcpy(problem_str, val_to_str(problem_val, VALS(q932_ros_ReturnErrorProblem_vals), ""), 64); return offset; @@ -612,7 +612,7 @@ static const ber_sequence_t Reject_sequence[] = { static int dissect_q932_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 7 "ros-rej.cnf" +#line 7 "../../asn1/ros/ros-rej.cnf" const gchar *descr = ""; problem_str[0] = '\0'; @@ -620,7 +620,7 @@ dissect_q932_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Reject_sequence, hf_index, ett_q932_ros_Reject); -#line 11 "ros-rej.cnf" +#line 11 "../../asn1/ros/ros-rej.cnf" descr = ep_strdup_printf("REJ: %s", problem_str); if (actx->rose_ctx->apdu_depth >= 0) @@ -652,7 +652,7 @@ static const ber_choice_t ROS_choice[] = { static int dissect_q932_ros_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_) { -#line 31 "q932-ros.cnf" +#line 31 "../../asn1/q932-ros/q932-ros.cnf" /* will be moved to ROS_PDU when PDU function can be alternated from conformance file */ actx->rose_ctx = rose_ctx_tmp; rose_ctx_clean_data(actx->rose_ctx); @@ -676,7 +676,7 @@ 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 62 "packet-q932-ros-template.c" +#line 62 "../../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) { @@ -692,7 +692,7 @@ void proto_register_q932_ros(void) { static hf_register_info hf[] = { /*--- Included file: packet-q932-ros-hfarr.c ---*/ -#line 1 "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, @@ -791,14 +791,14 @@ void proto_register_q932_ros(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 76 "packet-q932-ros-template.c" +#line 76 "../../asn1/q932-ros/packet-q932-ros-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-q932-ros-ettarr.c ---*/ -#line 1 "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, @@ -811,7 +811,7 @@ void proto_register_q932_ros(void) { &ett_q932_ros_InvokeId, /*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 81 "packet-q932-ros-template.c" +#line 81 "../../asn1/q932-ros/packet-q932-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 3694b953ae..cf2ff1b0b1 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -5,7 +5,7 @@ /* Input file: packet-q932-template.c */ -#line 1 "packet-q932-template.c" +#line 1 "../../asn1/q932/packet-q932-template.c" /* packet-q932.c * Routines for Q.932 packet dissection * 2007 Tomas Kukosa @@ -55,7 +55,7 @@ static int hf_q932_pp = -1; static int hf_q932_nd = -1; /*--- Included file: packet-q932-hf.c ---*/ -#line 1 "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 */ @@ -95,14 +95,14 @@ static int hf_q932_destinationEntity = -1; /* EntityType */ static int hf_q932_destinationEntityAddress = -1; /* AddressInformation */ /*--- End of included file: packet-q932-hf.c ---*/ -#line 49 "packet-q932-template.c" +#line 49 "../../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 "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; @@ -118,7 +118,7 @@ static gint ett_q932_UserSpecifiedSubaddress = -1; static gint ett_q932_NetworkFacilityExtension_U = -1; /*--- End of included file: packet-q932-ett.c ---*/ -#line 54 "packet-q932-template.c" +#line 54 "../../asn1/q932/packet-q932-template.c" /* Preferences */ @@ -190,7 +190,7 @@ static const value_string str_nd[] = { /*--- Included file: packet-q932-fn.c ---*/ -#line 1 "packet-q932-fn.c" +#line 1 "../../asn1/q932/packet-q932-fn.c" static int @@ -634,7 +634,7 @@ static void dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info * /*--- End of included file: packet-q932-fn.c ---*/ -#line 124 "packet-q932-template.c" +#line 124 "../../asn1/q932/packet-q932-template.c" /*--- dissect_q932_facility_ie -------------------------------------------------------*/ /*static*/ void @@ -805,7 +805,7 @@ void proto_register_q932(void) { NULL, HFILL }}, /*--- Included file: packet-q932-hfarr.c ---*/ -#line 1 "packet-q932-hfarr.c" +#line 1 "../../asn1/q932/packet-q932-hfarr.c" { &hf_q932_NetworkFacilityExtension_PDU, { "NetworkFacilityExtension", "q932.NetworkFacilityExtension", FT_NONE, BASE_NONE, NULL, 0, @@ -956,7 +956,7 @@ void proto_register_q932(void) { "AddressInformation", HFILL }}, /*--- End of included file: packet-q932-hfarr.c ---*/ -#line 293 "packet-q932-template.c" +#line 293 "../../asn1/q932/packet-q932-template.c" }; /* List of subtrees */ @@ -965,7 +965,7 @@ void proto_register_q932(void) { &ett_q932_ie, /*--- Included file: packet-q932-ettarr.c ---*/ -#line 1 "packet-q932-ettarr.c" +#line 1 "../../asn1/q932/packet-q932-ettarr.c" &ett_q932_PresentedAddressScreened, &ett_q932_PresentedAddressUnscreened, &ett_q932_PresentedNumberScreened, @@ -981,7 +981,7 @@ void proto_register_q932(void) { &ett_q932_NetworkFacilityExtension_U, /*--- End of included file: packet-q932-ettarr.c ---*/ -#line 300 "packet-q932-template.c" +#line 300 "../../asn1/q932/packet-q932-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h index fd45cdbb50..3bbf6d7d08 100644 --- a/epan/dissectors/packet-q932.h +++ b/epan/dissectors/packet-q932.h @@ -5,7 +5,7 @@ /* Input file: packet-q932-template.h */ -#line 1 "packet-q932-template.h" +#line 1 "../../asn1/q932/packet-q932-template.h" /* packet-q932.h * Routines for Q.932 packet dissection * 2007 Tomas Kukosa @@ -36,7 +36,7 @@ /*--- Included file: packet-q932-exp.h ---*/ -#line 1 "packet-q932-exp.h" +#line 1 "../../asn1/q932/packet-q932-exp.h" static const value_string q932_PresentedAddressScreened_vals[] = { { 0, "presentationAlIowedAddress" }, @@ -105,7 +105,7 @@ extern int dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvbuff_t * extern 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 30 "packet-q932-template.h" +#line 30 "../../asn1/q932/packet-q932-template.h" #endif /* PACKET_Q932_H */ diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index de87a19975..145df0fa97 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -5,7 +5,7 @@ /* Input file: packet-ranap-template.c */ -#line 1 "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 @@ -69,7 +69,7 @@ /*--- Included file: packet-ranap-val.h ---*/ -#line 1 "packet-ranap-val.h" +#line 1 "../../asn1/ranap/packet-ranap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -394,7 +394,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-ranap-val.h ---*/ -#line 63 "packet-ranap-template.c" +#line 63 "../../asn1/ranap/packet-ranap-template.c" /* Initialize the protocol and registered fields */ static int proto_ranap = -1; @@ -409,7 +409,7 @@ static int hf_ranap_transportLayerAddress_ipv6 = -1; /*--- Included file: packet-ranap-hf.c ---*/ -#line 1 "packet-ranap-hf.c" +#line 1 "../../asn1/ranap/packet-ranap-hf.c" static int hf_ranap_AccuracyFulfilmentIndicator_PDU = -1; /* AccuracyFulfilmentIndicator */ static int hf_ranap_Alt_RAB_Parameters_PDU = -1; /* Alt_RAB_Parameters */ static int hf_ranap_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_PDU = -1; /* Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf */ @@ -1050,7 +1050,7 @@ static int hf_ranap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_valu static int hf_ranap_value = -1; /* T_value */ /*--- End of included file: packet-ranap-hf.c ---*/ -#line 76 "packet-ranap-template.c" +#line 76 "../../asn1/ranap/packet-ranap-template.c" /* Initialize the subtree pointers */ static int ett_ranap = -1; @@ -1058,7 +1058,7 @@ static int ett_ranap_TransportLayerAddress = -1; /*--- Included file: packet-ranap-ett.c ---*/ -#line 1 "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; @@ -1356,7 +1356,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; /*--- End of included file: packet-ranap-ett.c ---*/ -#line 82 "packet-ranap-template.c" +#line 82 "../../asn1/ranap/packet-ranap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1418,7 +1418,7 @@ void proto_reg_handoff_ranap(void); /*--- Included file: packet-ranap-fn.c ---*/ -#line 1 "packet-ranap-fn.c" +#line 1 "../../asn1/ranap/packet-ranap-fn.c" static const value_string ranap_Criticality_vals[] = { { 0, "reject" }, @@ -1537,7 +1537,7 @@ dissect_ranap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 91 "ranap.cnf" +#line 91 "../../asn1/ranap/ranap.cnf" col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str_ext_const(ProcedureCode, &ranap_ProcedureCode_vals_ext, "unknown message")); @@ -1807,7 +1807,7 @@ dissect_ranap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &ProtocolIE_ID, FALSE); -#line 75 "ranap.cnf" +#line 75 "../../asn1/ranap/ranap.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &ranap_ProtocolIE_ID_vals_ext, "unknown (%d)")); } @@ -1929,7 +1929,7 @@ static const per_sequence_t ProtocolIE_ContainerList_sequence_of[1] = { static int dissect_ranap_ProtocolIE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 115 "ranap.cnf" +#line 115 "../../asn1/ranap/ranap.cnf" static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = { { "lowerBound", ASN1_PAR_INTEGER }, { "upperBound", ASN1_PAR_INTEGER }, @@ -1951,7 +1951,7 @@ static const per_sequence_t ProtocolIE_ContainerPairList_sequence_of[1] = { static int dissect_ranap_ProtocolIE_ContainerPairList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 131 "ranap.cnf" +#line 131 "../../asn1/ranap/ranap.cnf" static const asn1_par_def_t ProtocolIE_ContainerPairList_pars[] = { { "lowerBound", ASN1_PAR_INTEGER }, { "upperBound", ASN1_PAR_INTEGER }, @@ -2520,7 +2520,7 @@ dissect_ranap_APN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto static int dissect_ranap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 271 "ranap.cnf" +#line 271 "../../asn1/ranap/ranap.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4282,7 +4282,7 @@ dissect_ranap_GlobalRNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_ranap_GTP_TEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 312 "ranap.cnf" +#line 312 "../../asn1/ranap/ranap.cnf" tvbuff_t *parameter_tvb=NULL; int saved_hf; @@ -4315,7 +4315,7 @@ dissect_ranap_HS_DSCH_MAC_d_Flow_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_ranap_IMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 188 "ranap.cnf" +#line 188 "../../asn1/ranap/ranap.cnf" tvbuff_t* imsi_tvb; const char *digit_str; @@ -5024,7 +5024,7 @@ dissect_ranap_LocationRelatedDataRequestTypeSpecificToGERANIuMode(tvbuff_t *tvb static int dissect_ranap_L3_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 259 "ranap.cnf" +#line 259 "../../asn1/ranap/ranap.cnf" tvbuff_t *l3_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -5196,7 +5196,7 @@ dissect_ranap_MBMSSessionRepetitionNumber(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_ranap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 211 "ranap.cnf" +#line 211 "../../asn1/ranap/ranap.cnf" tvbuff_t *nas_pdu_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -5234,7 +5234,7 @@ dissect_ranap_NAS_SynchronisationIndicator(tvbuff_t *tvb _U_, int offset _U_, as static int dissect_ranap_NewBSS_To_OldBSS_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 251 "ranap.cnf" +#line 251 "../../asn1/ranap/ranap.cnf" tvbuff_t *bss_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -5287,7 +5287,7 @@ dissect_ranap_NumberOfSteps(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_ranap_OldBSS_ToNewBSS_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 243 "ranap.cnf" +#line 243 "../../asn1/ranap/ranap.cnf" tvbuff_t *bss_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -6302,7 +6302,7 @@ dissect_ranap_ResponseTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_ranap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 220 "ranap.cnf" +#line 220 "../../asn1/ranap/ranap.cnf" tvbuff_t *rrc_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -6407,7 +6407,7 @@ dissect_ranap_Service_Handover(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_ranap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 338 "ranap.cnf" +#line 338 "../../asn1/ranap/ranap.cnf" dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU ); @@ -6484,7 +6484,7 @@ static const per_sequence_t SourceRNC_ToTargetRNC_TransparentContainer_sequence[ static int dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 324 "ranap.cnf" +#line 324 "../../asn1/ranap/ranap.cnf" /* If SourceRNC-ToTargetRNC-TransparentContainer is called trough dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU ProtocolIE_ID may be unset @@ -6610,7 +6610,7 @@ dissect_ranap_SRVCC_Operation_Possible(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_ranap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 348 "ranap.cnf" +#line 348 "../../asn1/ranap/ranap.cnf" dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU ); @@ -6795,7 +6795,7 @@ dissect_ranap_UnsuccessfullyTransmittedDataVolume(tvbuff_t *tvb _U_, int offset static int dissect_ranap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 290 "ranap.cnf" +#line 290 "../../asn1/ranap/ranap.cnf" tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; @@ -7180,7 +7180,7 @@ dissect_ranap_VerticalAccuracyCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_ranap_RAB_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 141 "ranap.cnf" +#line 141 "../../asn1/ranap/ranap.cnf" asn1_stack_frame_push(actx, "ProtocolIE-ContainerList"); asn1_param_push_integer(actx, 1); asn1_param_push_integer(actx, maxNrOfRABs); @@ -7196,7 +7196,7 @@ dissect_ranap_RAB_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_ranap_RAB_IE_ContainerPairList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 149 "ranap.cnf" +#line 149 "../../asn1/ranap/ranap.cnf" asn1_stack_frame_push(actx, "ProtocolIE-ContainerPairList"); asn1_param_push_integer(actx, 1); asn1_param_push_integer(actx, maxNrOfRABs); @@ -7212,7 +7212,7 @@ dissect_ranap_RAB_IE_ContainerPairList(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_ranap_IuSigConId_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 166 "ranap.cnf" +#line 166 "../../asn1/ranap/ranap.cnf" asn1_stack_frame_push(actx, "ProtocolIE-ContainerList"); asn1_param_push_integer(actx, 1); asn1_param_push_integer(actx, maxNrOfIuSigConIds); @@ -7228,7 +7228,7 @@ dissect_ranap_IuSigConId_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_ranap_DirectTransfer_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 174 "ranap.cnf" +#line 174 "../../asn1/ranap/ranap.cnf" asn1_stack_frame_push(actx, "ProtocolIE-ContainerList"); asn1_param_push_integer(actx, 1); asn1_param_push_integer(actx, maxNrOfDTs); @@ -11921,7 +11921,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ranap-fn.c ---*/ -#line 142 "packet-ranap-template.c" +#line 142 "../../asn1/ranap/packet-ranap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -12094,7 +12094,7 @@ void proto_register_ranap(void) { /*--- Included file: packet-ranap-hfarr.c ---*/ -#line 1 "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, @@ -14649,7 +14649,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 313 "packet-ranap-template.c" +#line 313 "../../asn1/ranap/packet-ranap-template.c" }; /* List of subtrees */ @@ -14658,7 +14658,7 @@ void proto_register_ranap(void) { &ett_ranap_TransportLayerAddress, /*--- Included file: packet-ranap-ettarr.c ---*/ -#line 1 "packet-ranap-ettarr.c" +#line 1 "../../asn1/ranap/packet-ranap-ettarr.c" &ett_ranap_PrivateIE_ID, &ett_ranap_ProtocolIE_Container, &ett_ranap_ProtocolIE_Field, @@ -14956,7 +14956,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 320 "packet-ranap-template.c" +#line 320 "../../asn1/ranap/packet-ranap-template.c" }; @@ -15003,7 +15003,7 @@ proto_reg_handoff_ranap(void) initialized = TRUE; /*--- Included file: packet-ranap-dis-tab.c ---*/ -#line 1 "packet-ranap-dis-tab.c" +#line 1 "../../asn1/ranap/packet-ranap-dis-tab.c" dissector_add_uint("ranap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_ranap)); dissector_add_uint("ranap.ies", id_RAB_DataVolumeReportList, new_create_dissector_handle(dissect_RAB_DataVolumeReportList_PDU, proto_ranap)); dissector_add_uint("ranap.ies", id_RAB_ReleasedList_IuRelComp, new_create_dissector_handle(dissect_RAB_ReleasedList_IuRelComp_PDU, proto_ranap)); @@ -15320,7 +15320,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 365 "packet-ranap-template.c" +#line 365 "../../asn1/ranap/packet-ranap-template.c" } else { dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h index 7bc194bc2c..7f845a7118 100644 --- a/epan/dissectors/packet-ranap.h +++ b/epan/dissectors/packet-ranap.h @@ -5,7 +5,7 @@ /* Input file: packet-ranap-template.h */ -#line 1 "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 @@ -33,7 +33,7 @@ #define PACKET_RANAP_H /*--- Included file: packet-ranap-exp.h ---*/ -#line 1 "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_); @@ -44,6 +44,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_); /*--- End of included file: packet-ranap-exp.h ---*/ -#line 27 "packet-ranap-template.h" +#line 27 "../../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 58522937ad..8f67d41d57 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -5,7 +5,7 @@ /* Input file: packet-rnsap-template.c */ -#line 1 "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 @@ -60,7 +60,7 @@ /*--- Included file: packet-rnsap-val.h ---*/ -#line 1 "packet-rnsap-val.h" +#line 1 "../../asn1/rnsap/packet-rnsap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -1133,7 +1133,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rnsap-val.h ---*/ -#line 54 "packet-rnsap-template.c" +#line 54 "../../asn1/rnsap/packet-rnsap-template.c" static dissector_handle_t rrc_dl_dcch_handle = NULL; @@ -1142,7 +1142,7 @@ static int proto_rnsap = -1; /*--- Included file: packet-rnsap-hf.c ---*/ -#line 1 "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 */ @@ -3866,14 +3866,14 @@ 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 61 "packet-rnsap-template.c" +#line 61 "../../asn1/rnsap/packet-rnsap-template.c" /* Initialize the subtree pointers */ static int ett_rnsap = -1; /*--- Included file: packet-rnsap-ett.c ---*/ -#line 1 "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; @@ -5153,7 +5153,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1; static gint ett_rnsap_Outcome = -1; /*--- End of included file: packet-rnsap-ett.c ---*/ -#line 66 "packet-rnsap-template.c" +#line 66 "../../asn1/rnsap/packet-rnsap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -5176,7 +5176,7 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p /*--- Included file: packet-rnsap-fn.c ---*/ -#line 1 "packet-rnsap-fn.c" +#line 1 "../../asn1/rnsap/packet-rnsap-fn.c" static const value_string rnsap_Criticality_vals[] = { { 0, "reject" }, @@ -5304,7 +5304,7 @@ dissect_rnsap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 77 "rnsap.cnf" +#line 77 "../../asn1/rnsap/rnsap.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext, @@ -5339,7 +5339,7 @@ static const per_sequence_t ProcedureID_sequence[] = { static int dissect_rnsap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 85 "rnsap.cnf" +#line 85 "../../asn1/rnsap/rnsap.cnf" ProcedureCode = 0xFFFF; ddMode = 0xFFFF; ProcedureID = NULL; @@ -5347,7 +5347,7 @@ dissect_rnsap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rnsap_ProcedureID, ProcedureID_sequence); -#line 91 "rnsap.cnf" +#line 91 "../../asn1/rnsap/rnsap.cnf" ProcedureID = ep_strdup_printf("%s/%s", val_to_str_ext(ProcedureCode, &rnsap_ProcedureCode_vals_ext, "unknown(%u)"), val_to_str(ddMode, rnsap_DdMode_vals, "unknown(%u)")); @@ -22926,7 +22926,7 @@ dissect_rnsap_List_Of_PLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_rnsap_L3_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 104 "rnsap.cnf" +#line 104 "../../asn1/rnsap/rnsap.cnf" tvbuff_t *parameter_tvb; dissector_handle_t parameter_handle = NULL; @@ -43108,7 +43108,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-rnsap-fn.c ---*/ -#line 87 "packet-rnsap-template.c" +#line 87 "../../asn1/rnsap/packet-rnsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -43162,7 +43162,7 @@ void proto_register_rnsap(void) { static hf_register_info hf[] = { /*--- Included file: packet-rnsap-hfarr.c ---*/ -#line 1 "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, @@ -54049,7 +54049,7 @@ void proto_register_rnsap(void) { "Outcome_value", HFILL }}, /*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 139 "packet-rnsap-template.c" +#line 139 "../../asn1/rnsap/packet-rnsap-template.c" }; /* List of subtrees */ @@ -54057,7 +54057,7 @@ void proto_register_rnsap(void) { &ett_rnsap, /*--- Included file: packet-rnsap-ettarr.c ---*/ -#line 1 "packet-rnsap-ettarr.c" +#line 1 "../../asn1/rnsap/packet-rnsap-ettarr.c" &ett_rnsap_PrivateIE_ID, &ett_rnsap_ProcedureID, &ett_rnsap_TransactionID, @@ -55337,7 +55337,7 @@ void proto_register_rnsap(void) { &ett_rnsap_Outcome, /*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 145 "packet-rnsap-template.c" +#line 145 "../../asn1/rnsap/packet-rnsap-template.c" }; @@ -55378,7 +55378,7 @@ proto_reg_handoff_rnsap(void) /*--- Included file: packet-rnsap-dis-tab.c ---*/ -#line 1 "packet-rnsap-dis-tab.c" +#line 1 "../../asn1/rnsap/packet-rnsap-dis-tab.c" dissector_add_uint("rnsap.ies", id_RTLoadValue, new_create_dissector_handle(dissect_RTLoadValue_PDU, proto_rnsap)); dissector_add_uint("rnsap.ies", id_NRTLoadInformationValue, new_create_dissector_handle(dissect_NRTLoadInformationValue_PDU, proto_rnsap)); dissector_add_uint("rnsap.ies", id_UpPTSInterferenceValue, new_create_dissector_handle(dissect_UpPTSInterferenceValue_PDU, proto_rnsap)); @@ -56169,7 +56169,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 184 "packet-rnsap-template.c" +#line 184 "../../asn1/rnsap/packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 5dbf6e6bba..fa69a2e0cf 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -5,7 +5,7 @@ /* Input file: packet-ros-template.c */ -#line 1 "packet-ros-template.c" +#line 1 "../../asn1/ros/packet-ros-template.c" /* packet-ros_asn1.c * Routines for ROS packet dissection * Graeme Lunt 2005 @@ -82,7 +82,7 @@ static int hf_ros_time = -1; /*--- Included file: packet-ros-hf.c ---*/ -#line 1 "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 */ @@ -112,13 +112,13 @@ static int hf_ros_local = -1; /* INTEGER */ static int hf_ros_global = -1; /* OBJECT_IDENTIFIER */ /*--- End of included file: packet-ros-hf.c ---*/ -#line 76 "packet-ros-template.c" +#line 76 "../../asn1/ros/packet-ros-template.c" /* Initialize the subtree pointers */ static gint ett_ros = -1; /*--- Included file: packet-ros-ett.c ---*/ -#line 1 "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; @@ -130,7 +130,7 @@ static gint ett_ros_InvokeId = -1; static gint ett_ros_Code = -1; /*--- End of included file: packet-ros-ett.c ---*/ -#line 80 "packet-ros-template.c" +#line 80 "../../asn1/ros/packet-ros-template.c" static dissector_table_t ros_oid_dissector_table=NULL; @@ -424,7 +424,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui /*--- Included file: packet-ros-fn.c ---*/ -#line 1 "packet-ros-fn.c" +#line 1 "../../asn1/ros/packet-ros-fn.c" static int @@ -490,7 +490,7 @@ dissect_ros_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_ros_T_argument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 30 "ros.cnf" +#line 30 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -533,7 +533,7 @@ dissect_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_ros_OperationResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 47 "ros.cnf" +#line 47 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -599,7 +599,7 @@ dissect_ros_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_ros_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 64 "ros.cnf" +#line 64 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -648,7 +648,7 @@ static const value_string ros_GeneralProblem_vals[] = { static int dissect_ros_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 169 "ros.cnf" +#line 169 "../../asn1/ros/ros.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -680,7 +680,7 @@ static const value_string ros_InvokeProblem_vals[] = { static int dissect_ros_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 181 "ros.cnf" +#line 181 "../../asn1/ros/ros.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -707,7 +707,7 @@ static const value_string ros_ReturnResultProblem_vals[] = { static int dissect_ros_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 193 "ros.cnf" +#line 193 "../../asn1/ros/ros.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -736,7 +736,7 @@ static const value_string ros_ReturnErrorProblem_vals[] = { static int dissect_ros_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 205 "ros.cnf" +#line 205 "../../asn1/ros/ros.cnf" guint32 problem; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -797,7 +797,7 @@ dissect_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_ros_T_reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 161 "ros.cnf" +#line 161 "../../asn1/ros/ros.cnf" if(check_col(actx->pinfo->cinfo, COL_INFO)) col_set_str(actx->pinfo->cinfo, COL_INFO, "Reject"); offset = dissect_ros_Reject(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -812,7 +812,7 @@ dissect_ros_T_reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_ros_T_bind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 81 "ros.cnf" +#line 81 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -834,7 +834,7 @@ dissect_ros_T_bind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_ros_T_bind_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 94 "ros.cnf" +#line 94 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -856,7 +856,7 @@ dissect_ros_T_bind_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_ros_T_bind_error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 107 "ros.cnf" +#line 107 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -879,7 +879,7 @@ dissect_ros_T_bind_error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_ros_T_unbind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 121 "ros.cnf" +#line 121 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -902,7 +902,7 @@ dissect_ros_T_unbind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_ros_T_unbind_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 135 "ros.cnf" +#line 135 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -924,7 +924,7 @@ dissect_ros_T_unbind_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_ros_T_unbind_error(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 148 "ros.cnf" +#line 148 "../../asn1/ros/ros.cnf" char *oid; struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE *)actx->pinfo->private_data; @@ -1013,7 +1013,7 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ros-fn.c ---*/ -#line 372 "packet-ros-template.c" +#line 372 "../../asn1/ros/packet-ros-template.c" /* * Dissect ROS PDUs inside a PPDU. @@ -1134,7 +1134,7 @@ void proto_register_ros(void) { /*--- Included file: packet-ros-hfarr.c ---*/ -#line 1 "packet-ros-hfarr.c" +#line 1 "../../asn1/ros/packet-ros-hfarr.c" { &hf_ros_invoke, { "invoke", "ros.invoke", FT_NONE, BASE_NONE, NULL, 0, @@ -1245,7 +1245,7 @@ void proto_register_ros(void) { "OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 491 "packet-ros-template.c" +#line 491 "../../asn1/ros/packet-ros-template.c" }; /* List of subtrees */ @@ -1254,7 +1254,7 @@ void proto_register_ros(void) { &ett_ros_unknown, /*--- Included file: packet-ros-ettarr.c ---*/ -#line 1 "packet-ros-ettarr.c" +#line 1 "../../asn1/ros/packet-ros-ettarr.c" &ett_ros_ROS, &ett_ros_Invoke, &ett_ros_ReturnResult, @@ -1266,7 +1266,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 498 "packet-ros-template.c" +#line 498 "../../asn1/ros/packet-ros-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index 738cb16a97..db1088057f 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -5,7 +5,7 @@ /* Input file: packet-ros-template.h */ -#line 1 "packet-ros-template.h" +#line 1 "../../asn1/ros/packet-ros-template.h" /* packet-ros.h * Routines for ROS packet dissection * Graeme Lunt 2005 @@ -36,7 +36,7 @@ /*--- Included file: packet-ros-exp.h ---*/ -#line 1 "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[]; @@ -45,7 +45,7 @@ int dissect_ros_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse 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 30 "packet-ros-template.h" +#line 30 "../../asn1/ros/packet-ros-template.h" # include "packet-ses.h" diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 0517a10885..57f1fad5cf 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -5,7 +5,7 @@ /* Input file: packet-rrc-template.c */ -#line 1 "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 @@ -73,7 +73,7 @@ static void dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info /* Include constants */ /*--- Included file: packet-rrc-val.h ---*/ -#line 1 "packet-rrc-val.h" +#line 1 "../../asn1/rrc/packet-rrc-val.h" #define hiPDSCHidentities 64 #define hiPUSCHidentities 64 #define hiRM 256 @@ -229,14 +229,14 @@ static void dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 67 "packet-rrc-template.c" +#line 67 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; static int hf_test; /*--- Included file: packet-rrc-hf.c ---*/ -#line 1 "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 */ @@ -8567,14 +8567,14 @@ 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 72 "packet-rrc-template.c" +#line 72 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; /*--- Included file: packet-rrc-ett.c ---*/ -#line 1 "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; @@ -13795,14 +13795,14 @@ 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 77 "packet-rrc-template.c" +#line 77 "../../asn1/rrc/packet-rrc-template.c" /* Global variables */ static proto_tree *top_tree; /*--- Included file: packet-rrc-fn.c ---*/ -#line 1 "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_); static int dissect_CellUpdateConfirm_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); @@ -24684,7 +24684,7 @@ static const per_choice_t ActiveSetUpdate_choice[] = { static int dissect_rrc_ActiveSetUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 125 "rrc.cnf" +#line 125 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdate, ActiveSetUpdate_choice, @@ -29009,7 +29009,7 @@ static const per_choice_t AssistanceDataDelivery_choice[] = { static int dissect_rrc_AssistanceDataDelivery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 137 "rrc.cnf" +#line 137 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_AssistanceDataDelivery, AssistanceDataDelivery_choice, @@ -29407,7 +29407,7 @@ static const per_choice_t CellChangeOrderFromUTRAN_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 141 "rrc.cnf" +#line 141 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRAN, CellChangeOrderFromUTRAN_choice, @@ -48612,7 +48612,7 @@ static const per_choice_t CellUpdateConfirm_choice[] = { static int dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 157 "rrc.cnf" +#line 157 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm, CellUpdateConfirm_choice, @@ -48765,7 +48765,7 @@ static const per_choice_t CounterCheck_choice[] = { static int dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 161 "rrc.cnf" +#line 161 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheck, CounterCheck_choice, @@ -48781,7 +48781,7 @@ dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_rrc_NAS_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 107 "rrc.cnf" +#line 107 "../../asn1/rrc/rrc.cnf" tvbuff_t *nas_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -48898,7 +48898,7 @@ static const per_choice_t DownlinkDirectTransfer_choice[] = { static int dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 169 "rrc.cnf" +#line 169 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_DownlinkDirectTransfer, DownlinkDirectTransfer_choice, @@ -48917,7 +48917,7 @@ static const per_sequence_t T_single_GSM_Message_r3_sequence[] = { static int dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 457 "rrc.cnf" +#line 457 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -48942,7 +48942,7 @@ dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_rrc_GSM_MessageList_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 449 "rrc.cnf" +#line 449 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_messagelist_tvb=NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, @@ -49226,7 +49226,7 @@ static const per_sequence_t T_single_GSM_Message_r6_sequence[] = { static int dissect_rrc_T_single_GSM_Message_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 471 "rrc.cnf" +#line 471 "../../asn1/rrc/rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -49432,7 +49432,7 @@ static const per_choice_t HandoverFromUTRANCommand_GSM_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 181 "rrc.cnf" +#line 181 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GSM, HandoverFromUTRANCommand_GSM_choice, @@ -49586,7 +49586,7 @@ static const per_choice_t HandoverFromUTRANCommand_CDMA2000_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_CDMA2000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 185 "rrc.cnf" +#line 185 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_CDMA2000, HandoverFromUTRANCommand_CDMA2000_choice, @@ -59031,7 +59031,7 @@ static const per_choice_t MeasurementControl_choice[] = { static int dissect_rrc_MeasurementControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 237 "rrc.cnf" +#line 237 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControl, MeasurementControl_choice, @@ -59123,7 +59123,7 @@ static const per_sequence_t PagingType2_sequence[] = { static int dissect_rrc_PagingType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 253 "rrc.cnf" +#line 253 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType2, PagingType2_sequence); @@ -60573,7 +60573,7 @@ static const per_choice_t PhysicalChannelReconfiguration_choice[] = { static int dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 257 "rrc.cnf" +#line 257 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfiguration, PhysicalChannelReconfiguration_choice, @@ -61877,7 +61877,7 @@ static const per_choice_t PhysicalSharedChannelAllocation_choice[] = { static int dissect_rrc_PhysicalSharedChannelAllocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 269 "rrc.cnf" +#line 269 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalSharedChannelAllocation, PhysicalSharedChannelAllocation_choice, @@ -64156,7 +64156,7 @@ static const per_choice_t RadioBearerReconfiguration_choice[] = { static int dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 277 "rrc.cnf" +#line 277 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfiguration, RadioBearerReconfiguration_choice, @@ -65641,7 +65641,7 @@ static const per_choice_t RadioBearerRelease_choice[] = { static int dissect_rrc_RadioBearerRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 289 "rrc.cnf" +#line 289 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerRelease, RadioBearerRelease_choice, @@ -67878,7 +67878,7 @@ static const per_choice_t RadioBearerSetup_choice[] = { static int dissect_rrc_RadioBearerSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 301 "rrc.cnf" +#line 301 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetup, RadioBearerSetup_choice, @@ -68528,7 +68528,7 @@ static const per_choice_t RRCConnectionRelease_choice[] = { static int dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 317 "rrc.cnf" +#line 317 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease, RRCConnectionRelease_choice, @@ -68807,7 +68807,7 @@ static const per_choice_t SecurityModeCommand_choice[] = { static int dissect_rrc_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 345 "rrc.cnf" +#line 345 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeCommand, SecurityModeCommand_choice, @@ -68920,7 +68920,7 @@ static const per_choice_t SignallingConnectionRelease_choice[] = { static int dissect_rrc_SignallingConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 357 "rrc.cnf" +#line 357 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionRelease, SignallingConnectionRelease_choice, @@ -70408,7 +70408,7 @@ static const per_choice_t TransportChannelReconfiguration_choice[] = { static int dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 377 "rrc.cnf" +#line 377 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfiguration, TransportChannelReconfiguration_choice, @@ -70553,7 +70553,7 @@ static const per_sequence_t TransportFormatCombinationControl_sequence[] = { static int dissect_rrc_TransportFormatCombinationControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 389 "rrc.cnf" +#line 389 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControl, TransportFormatCombinationControl_sequence); @@ -70919,7 +70919,7 @@ static const per_choice_t UECapabilityEnquiry_choice[] = { static int dissect_rrc_UECapabilityEnquiry(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 397 "rrc.cnf" +#line 397 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityEnquiry, UECapabilityEnquiry_choice, @@ -71077,7 +71077,7 @@ static const per_choice_t UECapabilityInformationConfirm_choice[] = { static int dissect_rrc_UECapabilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 405 "rrc.cnf" +#line 405 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformationConfirm, UECapabilityInformationConfirm_choice, @@ -71841,7 +71841,7 @@ static const per_choice_t UplinkPhysicalChannelControl_choice[] = { static int dissect_rrc_UplinkPhysicalChannelControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 413 "rrc.cnf" +#line 413 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkPhysicalChannelControl, UplinkPhysicalChannelControl_choice, @@ -72184,7 +72184,7 @@ static const per_choice_t URAUpdateConfirm_choice[] = { static int dissect_rrc_URAUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 421 "rrc.cnf" +#line 421 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm, URAUpdateConfirm_choice, @@ -73637,7 +73637,7 @@ static const per_choice_t UTRANMobilityInformation_choice[] = { static int dissect_rrc_UTRANMobilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 429 "rrc.cnf" +#line 429 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformation, UTRANMobilityInformation_choice, @@ -73824,7 +73824,7 @@ static const per_sequence_t HandoverFromUTRANCommand_GERANIu_sequence[] = { static int dissect_rrc_HandoverFromUTRANCommand_GERANIu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 177 "rrc.cnf" +#line 177 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GERANIu, HandoverFromUTRANCommand_GERANIu_sequence); @@ -74262,7 +74262,7 @@ static const per_sequence_t MBMSModifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSModifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 221 "rrc.cnf" +#line 221 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModifiedServicesInformation, MBMSModifiedServicesInformation_sequence); @@ -74644,7 +74644,7 @@ static const per_sequence_t ActiveSetUpdateComplete_sequence[] = { static int dissect_rrc_ActiveSetUpdateComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 129 "rrc.cnf" +#line 129 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateComplete, ActiveSetUpdateComplete_sequence); @@ -74815,7 +74815,7 @@ static const per_sequence_t ActiveSetUpdateFailure_sequence[] = { static int dissect_rrc_ActiveSetUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 133 "rrc.cnf" +#line 133 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateFailure, ActiveSetUpdateFailure_sequence); @@ -74962,7 +74962,7 @@ static const per_choice_t CellChangeOrderFromUTRANFailure_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 145 "rrc.cnf" +#line 145 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRANFailure, CellChangeOrderFromUTRANFailure_choice, @@ -75052,7 +75052,7 @@ static const per_sequence_t CounterCheckResponse_sequence[] = { static int dissect_rrc_CounterCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 165 "rrc.cnf" +#line 165 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheckResponse, CounterCheckResponse_sequence); @@ -75101,7 +75101,7 @@ static const per_sequence_t HandoverToUTRANComplete_sequence[] = { static int dissect_rrc_HandoverToUTRANComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 173 "rrc.cnf" +#line 173 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverToUTRANComplete, HandoverToUTRANComplete_sequence); @@ -76028,7 +76028,7 @@ static const per_sequence_t InitialDirectTransfer_sequence[] = { static int dissect_rrc_InitialDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 193 "rrc.cnf" +#line 193 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_InitialDirectTransfer, InitialDirectTransfer_sequence); @@ -76236,7 +76236,7 @@ static const per_sequence_t HandoverFromUTRANFailure_sequence[] = { static int dissect_rrc_HandoverFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 189 "rrc.cnf" +#line 189 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANFailure, HandoverFromUTRANFailure_sequence); @@ -76314,7 +76314,7 @@ static const per_sequence_t MeasurementControlFailure_sequence[] = { static int dissect_rrc_MeasurementControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 241 "rrc.cnf" +#line 241 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControlFailure, MeasurementControlFailure_sequence); @@ -80800,7 +80800,7 @@ static const per_sequence_t MeasurementReport_sequence[] = { static int dissect_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 245 "rrc.cnf" +#line 245 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementReport, MeasurementReport_sequence); @@ -80898,7 +80898,7 @@ static const per_sequence_t PhysicalChannelReconfigurationComplete_sequence[] = static int dissect_rrc_PhysicalChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 261 "rrc.cnf" +#line 261 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationComplete, PhysicalChannelReconfigurationComplete_sequence); @@ -80947,7 +80947,7 @@ static const per_sequence_t PhysicalChannelReconfigurationFailure_sequence[] = { static int dissect_rrc_PhysicalChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 265 "rrc.cnf" +#line 265 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationFailure, PhysicalChannelReconfigurationFailure_sequence); @@ -81045,7 +81045,7 @@ static const per_sequence_t RadioBearerReconfigurationComplete_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 281 "rrc.cnf" +#line 281 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationComplete, RadioBearerReconfigurationComplete_sequence); @@ -81109,7 +81109,7 @@ static const per_sequence_t RadioBearerReconfigurationFailure_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 285 "rrc.cnf" +#line 285 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationFailure, RadioBearerReconfigurationFailure_sequence); @@ -81207,7 +81207,7 @@ static const per_sequence_t RadioBearerReleaseComplete_sequence[] = { static int dissect_rrc_RadioBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 293 "rrc.cnf" +#line 293 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseComplete, RadioBearerReleaseComplete_sequence); @@ -81257,7 +81257,7 @@ static const per_sequence_t RadioBearerReleaseFailure_sequence[] = { static int dissect_rrc_RadioBearerReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 297 "rrc.cnf" +#line 297 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseFailure, RadioBearerReleaseFailure_sequence); @@ -81356,7 +81356,7 @@ static const per_sequence_t RadioBearerSetupComplete_sequence[] = { static int dissect_rrc_RadioBearerSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 305 "rrc.cnf" +#line 305 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupComplete, RadioBearerSetupComplete_sequence); @@ -81406,7 +81406,7 @@ static const per_sequence_t RadioBearerSetupFailure_sequence[] = { static int dissect_rrc_RadioBearerSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 309 "rrc.cnf" +#line 309 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupFailure, RadioBearerSetupFailure_sequence); @@ -81455,7 +81455,7 @@ static const per_sequence_t RRCConnectionReleaseComplete_sequence[] = { static int dissect_rrc_RRCConnectionReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 325 "rrc.cnf" +#line 325 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReleaseComplete, RRCConnectionReleaseComplete_sequence); @@ -82470,7 +82470,7 @@ dissect_rrc_UE_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 485 "rrc.cnf" +#line 485 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -82489,7 +82489,7 @@ tvbuff_t *parameter_tvb=NULL; static int dissect_rrc_GSM_Classmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 493 "rrc.cnf" +#line 493 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -83898,7 +83898,7 @@ static const per_sequence_t RRCConnectionSetupComplete_sequence[] = { static int dissect_rrc_RRCConnectionSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 337 "rrc.cnf" +#line 337 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetupComplete, RRCConnectionSetupComplete_sequence); @@ -84077,7 +84077,7 @@ static const per_sequence_t RRCStatus_sequence[] = { static int dissect_rrc_RRCStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 341 "rrc.cnf" +#line 341 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCStatus, RRCStatus_sequence); @@ -84127,7 +84127,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = { static int dissect_rrc_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 349 "rrc.cnf" +#line 349 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeComplete, SecurityModeComplete_sequence); @@ -84176,7 +84176,7 @@ static const per_sequence_t SecurityModeFailure_sequence[] = { static int dissect_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 353 "rrc.cnf" +#line 353 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeFailure, SecurityModeFailure_sequence); @@ -84269,7 +84269,7 @@ static const per_sequence_t SignallingConnectionReleaseIndication_sequence[] = { static int dissect_rrc_SignallingConnectionReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 361 "rrc.cnf" +#line 361 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionReleaseIndication, SignallingConnectionReleaseIndication_sequence); @@ -84367,7 +84367,7 @@ static const per_sequence_t TransportChannelReconfigurationComplete_sequence[] = static int dissect_rrc_TransportChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 381 "rrc.cnf" +#line 381 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationComplete, TransportChannelReconfigurationComplete_sequence); @@ -84416,7 +84416,7 @@ static const per_sequence_t TransportChannelReconfigurationFailure_sequence[] = static int dissect_rrc_TransportChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 385 "rrc.cnf" +#line 385 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationFailure, TransportChannelReconfigurationFailure_sequence); @@ -84465,7 +84465,7 @@ static const per_sequence_t TransportFormatCombinationControlFailure_sequence[] static int dissect_rrc_TransportFormatCombinationControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 393 "rrc.cnf" +#line 393 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControlFailure, TransportFormatCombinationControlFailure_sequence); @@ -84741,7 +84741,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = { static int dissect_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 401 "rrc.cnf" +#line 401 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformation, UECapabilityInformation_sequence); @@ -84878,7 +84878,7 @@ static const per_sequence_t UplinkDirectTransfer_sequence[] = { static int dissect_rrc_UplinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 409 "rrc.cnf" +#line 409 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkDirectTransfer, UplinkDirectTransfer_sequence); @@ -84974,7 +84974,7 @@ static const per_sequence_t UTRANMobilityInformationConfirm_sequence[] = { static int dissect_rrc_UTRANMobilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 433 "rrc.cnf" +#line 433 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationConfirm, UTRANMobilityInformationConfirm_sequence); @@ -85023,7 +85023,7 @@ static const per_sequence_t UTRANMobilityInformationFailure_sequence[] = { static int dissect_rrc_UTRANMobilityInformationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 437 "rrc.cnf" +#line 437 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationFailure, UTRANMobilityInformationFailure_sequence); @@ -85180,7 +85180,7 @@ static const per_sequence_t MBMSModificationRequest_sequence[] = { static int dissect_rrc_MBMSModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 217 "rrc.cnf" +#line 217 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModificationRequest, MBMSModificationRequest_sequence); @@ -85931,7 +85931,7 @@ static const per_choice_t CellUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 153 "rrc.cnf" +#line 153 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm_CCCH, CellUpdateConfirm_CCCH_choice, @@ -86385,7 +86385,7 @@ static const per_choice_t RRCConnectionReject_choice[] = { static int dissect_rrc_RRCConnectionReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 313 "rrc.cnf" +#line 313 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReject, RRCConnectionReject_choice, @@ -86881,7 +86881,7 @@ static const per_choice_t RRCConnectionRelease_CCCH_choice[] = { static int dissect_rrc_RRCConnectionRelease_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 321 "rrc.cnf" +#line 321 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease_CCCH, RRCConnectionRelease_CCCH_choice, @@ -88518,7 +88518,7 @@ static const per_choice_t RRCConnectionSetup_choice[] = { static int dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 333 "rrc.cnf" +#line 333 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetup, RRCConnectionSetup_choice, @@ -88662,7 +88662,7 @@ static const per_choice_t URAUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_URAUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 425 "rrc.cnf" +#line 425 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm_CCCH, URAUpdateConfirm_CCCH_choice, @@ -89194,7 +89194,7 @@ static const per_sequence_t CellUpdate_sequence[] = { static int dissect_rrc_CellUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 149 "rrc.cnf" +#line 149 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdate, CellUpdate_sequence); @@ -89863,7 +89863,7 @@ static const per_sequence_t RRCConnectionRequest_sequence[] = { static int dissect_rrc_RRCConnectionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 329 "rrc.cnf" +#line 329 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRequest, RRCConnectionRequest_sequence); @@ -90114,7 +90114,7 @@ static const per_sequence_t URAUpdate_sequence[] = { static int dissect_rrc_URAUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 417 "rrc.cnf" +#line 417 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdate, URAUpdate_sequence); @@ -90537,7 +90537,7 @@ static const per_sequence_t PagingType1_sequence[] = { static int dissect_rrc_PagingType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 249 "rrc.cnf" +#line 249 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType1, PagingType1_sequence); @@ -90742,7 +90742,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = { static int dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 273 "rrc.cnf" +#line 273 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PUSCHCapacityRequest, PUSCHCapacityRequest_sequence); @@ -91118,7 +91118,7 @@ static const per_sequence_t SystemInformation_FACH_sequence[] = { static int dissect_rrc_SystemInformation_FACH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 369 "rrc.cnf" +#line 369 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_FACH, SystemInformation_FACH_sequence); @@ -91195,7 +91195,7 @@ static const per_sequence_t SystemInformationChangeIndication_sequence[] = { static int dissect_rrc_SystemInformationChangeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 373 "rrc.cnf" +#line 373 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformationChangeIndication, SystemInformationChangeIndication_sequence); @@ -91376,7 +91376,7 @@ static const per_sequence_t SystemInformation_BCH_sequence[] = { static int dissect_rrc_SystemInformation_BCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 365 "rrc.cnf" +#line 365 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_BCH, SystemInformation_BCH_sequence); @@ -91516,7 +91516,7 @@ static const per_sequence_t MBMSAccessInformation_sequence[] = { static int dissect_rrc_MBMSAccessInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 197 "rrc.cnf" +#line 197 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSAccessInformation, MBMSAccessInformation_sequence); @@ -92385,7 +92385,7 @@ static const per_sequence_t MBMSCommonPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCommonPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 201 "rrc.cnf" +#line 201 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCommonPTMRBInformation, MBMSCommonPTMRBInformation_sequence); @@ -92773,7 +92773,7 @@ static const per_sequence_t MBMSCurrentCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCurrentCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 205 "rrc.cnf" +#line 205 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence); @@ -93551,7 +93551,7 @@ static const per_sequence_t MBMSGeneralInformation_sequence[] = { static int dissect_rrc_MBMSGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 213 "rrc.cnf" +#line 213 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSGeneralInformation, MBMSGeneralInformation_sequence); @@ -94225,7 +94225,7 @@ static const per_sequence_t MBMSNeighbouringCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSNeighbouringCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 225 "rrc.cnf" +#line 225 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSNeighbouringCellPTMRBInformation, MBMSNeighbouringCellPTMRBInformation_sequence); @@ -94362,7 +94362,7 @@ static const per_sequence_t MBMSUnmodifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSUnmodifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 233 "rrc.cnf" +#line 233 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSUnmodifiedServicesInformation, MBMSUnmodifiedServicesInformation_sequence); @@ -94518,7 +94518,7 @@ static const per_sequence_t MBMSSchedulingInformation_sequence[] = { static int dissect_rrc_MBMSSchedulingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 229 "rrc.cnf" +#line 229 "../../asn1/rrc/rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSSchedulingInformation, MBMSSchedulingInformation_sequence); @@ -97536,7 +97536,7 @@ dissect_rrc_T_uE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_rrc_T_present(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 115 "rrc.cnf" +#line 115 "../../asn1/rrc/rrc.cnf" tvbuff_t *ue_radio_access_cap_info_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -116378,7 +116378,7 @@ dissect_rrc_UE_HistoryInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_rrc_T_interRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 500 "rrc.cnf" +#line 500 "../../asn1/rrc/rrc.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -120740,7 +120740,7 @@ dissect_rrc_ToTargetRNC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_rrc_T_dL_DCCHmessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 441 "rrc.cnf" +#line 441 "../../asn1/rrc/rrc.cnf" tvbuff_t *dl_dcch_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -121307,7 +121307,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 82 "packet-rrc-template.c" +#line 82 "../../asn1/rrc/packet-rrc-template.c" #include "packet-rrc.h" @@ -121361,7 +121361,7 @@ void proto_register_rrc(void) { /*--- Included file: packet-rrc-hfarr.c ---*/ -#line 1 "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", FT_NONE, BASE_NONE, NULL, 0, @@ -154672,7 +154672,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 134 "packet-rrc-template.c" +#line 134 "../../asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -154685,7 +154685,7 @@ void proto_register_rrc(void) { &ett_rrc, /*--- Included file: packet-rrc-ettarr.c ---*/ -#line 1 "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, @@ -159906,7 +159906,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 145 "packet-rrc-template.c" +#line 145 "../../asn1/rrc/packet-rrc-template.c" }; @@ -159920,7 +159920,7 @@ void proto_register_rrc(void) { /*--- Included file: packet-rrc-dis-reg.c ---*/ -#line 1 "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); @@ -159983,7 +159983,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 157 "packet-rrc-template.c" +#line 157 "../../asn1/rrc/packet-rrc-template.c" } diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index 21039572f3..39cff66ed9 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -5,7 +5,7 @@ /* Input file: packet-rrc-template.h */ -#line 1 "packet-rrc-template.h" +#line 1 "../../asn1/rrc/packet-rrc-template.h" /* packet-rrc-template.h * Copyright 2009, Anders Broman * @@ -36,7 +36,7 @@ extern int proto_rrc; /*--- Included file: packet-rrc-exp.h ---*/ -#line 1 "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_); void dissect_rrc_HandoverToUTRANCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); void dissect_rrc_InterRATHandoverInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); @@ -44,7 +44,7 @@ void dissect_rrc_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo void dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-rrc-exp.h ---*/ -#line 30 "packet-rrc-template.h" +#line 30 "../../asn1/rrc/packet-rrc-template.h" enum rrc_message_type { RRC_MESSAGE_TYPE_INVALID = 0, diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 3dc8783bed..81734f03f8 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -5,7 +5,7 @@ /* Input file: packet-rrlp-template.c */ -#line 1 "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 @@ -64,7 +64,7 @@ static int proto_rrlp = -1; /*--- Included file: packet-rrlp-hf.c ---*/ -#line 1 "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 */ @@ -875,13 +875,13 @@ static int hf_rrlp_GANSSModelID_model7 = -1; static int hf_rrlp_GANSSModelID_model8 = -1; /*--- End of included file: packet-rrlp-hf.c ---*/ -#line 58 "packet-rrlp-template.c" +#line 58 "../../asn1/rrlp/packet-rrlp-template.c" /* Initialize the subtree pointers */ static gint ett_rrlp = -1; /*--- Included file: packet-rrlp-ett.c ---*/ -#line 1 "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; @@ -1126,24 +1126,24 @@ static gint ett_rrlp_GANSSModelID = -1; static gint ett_rrlp_AssistanceNeeded = -1; /*--- End of included file: packet-rrlp-ett.c ---*/ -#line 62 "packet-rrlp-template.c" +#line 62 "../../asn1/rrlp/packet-rrlp-template.c" /* Include constants */ /*--- Included file: packet-rrlp-val.h ---*/ -#line 1 "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 65 "packet-rrlp-template.c" +#line 65 "../../asn1/rrlp/packet-rrlp-template.c" /*--- Included file: packet-rrlp-fn.c ---*/ -#line 1 "packet-rrlp-fn.c" +#line 1 "../../asn1/rrlp/packet-rrlp-fn.c" static int @@ -1223,7 +1223,7 @@ dissect_rrlp_ExtensionContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_rrlp_Ext_GeographicalInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 34 "rrlp.cnf" +#line 34 "../../asn1/rrlp/rrlp.cnf" tvbuff_t *parameter_tvb = NULL; @@ -7007,7 +7007,7 @@ static const per_sequence_t PDU_sequence[] = { static int dissect_rrlp_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 26 "rrlp.cnf" +#line 26 "../../asn1/rrlp/rrlp.cnf" proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE); @@ -7029,7 +7029,7 @@ static void dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-rrlp-fn.c ---*/ -#line 68 "packet-rrlp-template.c" +#line 68 "../../asn1/rrlp/packet-rrlp-template.c" /*--- proto_register_rrlp -------------------------------------------*/ @@ -7040,7 +7040,7 @@ void proto_register_rrlp(void) { /*--- Included file: packet-rrlp-hfarr.c ---*/ -#line 1 "packet-rrlp-hfarr.c" +#line 1 "../../asn1/rrlp/packet-rrlp-hfarr.c" { &hf_rrlp_PDU_PDU, { "PDU", "rrlp.PDU", FT_NONE, BASE_NONE, NULL, 0, @@ -10271,7 +10271,7 @@ void proto_register_rrlp(void) { NULL, HFILL }}, /*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 77 "packet-rrlp-template.c" +#line 77 "../../asn1/rrlp/packet-rrlp-template.c" }; /* List of subtrees */ @@ -10279,7 +10279,7 @@ void proto_register_rrlp(void) { &ett_rrlp, /*--- Included file: packet-rrlp-ettarr.c ---*/ -#line 1 "packet-rrlp-ettarr.c" +#line 1 "../../asn1/rrlp/packet-rrlp-ettarr.c" &ett_rrlp_ExtensionContainer, &ett_rrlp_PrivateExtensionList, &ett_rrlp_PrivateExtension, @@ -10524,7 +10524,7 @@ void proto_register_rrlp(void) { &ett_rrlp_AssistanceNeeded, /*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 83 "packet-rrlp-template.c" +#line 83 "../../asn1/rrlp/packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index 8825263971..473dc54707 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -5,7 +5,7 @@ /* Input file: packet-rua-template.c */ -#line 1 "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 @@ -60,7 +60,7 @@ /*--- Included file: packet-rua-val.h ---*/ -#line 1 "packet-rua-val.h" +#line 1 "../../asn1/rua/packet-rua-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -87,14 +87,14 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rua-val.h ---*/ -#line 54 "packet-rua-template.c" +#line 54 "../../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 "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 */ @@ -164,7 +164,7 @@ 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 59 "packet-rua-template.c" +#line 59 "../../asn1/rua/packet-rua-template.c" /* Initialize the subtree pointers */ static int ett_rua = -1; @@ -174,7 +174,7 @@ static int ett_rua = -1; /*--- Included file: packet-rua-ett.c ---*/ -#line 1 "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; @@ -213,7 +213,7 @@ static gint ett_rua_SuccessfulOutcome = -1; static gint ett_rua_UnsuccessfulOutcome = -1; /*--- End of included file: packet-rua-ett.c ---*/ -#line 67 "packet-rua-template.c" +#line 67 "../../asn1/rua/packet-rua-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -237,7 +237,7 @@ void proto_reg_handoff_rua(void); /*--- Included file: packet-rua-fn.c ---*/ -#line 1 "packet-rua-fn.c" +#line 1 "../../asn1/rua/packet-rua-fn.c" static const value_string rua_Criticality_vals[] = { { 0, "reject" }, @@ -272,7 +272,7 @@ dissect_rua_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 53 "rua.cnf" +#line 53 "../../asn1/rua/rua.cnf" if (strcmp(val_to_str(ProcedureCode, rua_ProcedureCode_vals, "Unknown"), "Unknown") == 0) { col_set_str(actx->pinfo->cinfo, COL_INFO, "Unknown Message "); @@ -342,7 +342,7 @@ dissect_rua_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, maxProtocolIEs, &ProtocolIE_ID, FALSE); -#line 42 "rua.cnf" +#line 42 "../../asn1/rua/rua.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(rua_ProtocolIE_ID_vals), "unknown (%d)")); } @@ -832,7 +832,7 @@ dissect_rua_IntraDomainNasNodeSelector(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_rua_RANAP_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 96 "rua.cnf" +#line 96 "../../asn1/rua/rua.cnf" tvbuff_t *ranap_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, &ranap_message_tvb); @@ -1021,7 +1021,7 @@ static const per_sequence_t Connect_sequence[] = { static int dissect_rua_Connect(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 65 "rua.cnf" +#line 65 "../../asn1/rua/rua.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "CONNECT "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1042,7 +1042,7 @@ static const per_sequence_t DirectTransfer_sequence[] = { static int dissect_rua_DirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 70 "rua.cnf" +#line 70 "../../asn1/rua/rua.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "DIRECT_TRANSFER "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1063,7 +1063,7 @@ static const per_sequence_t Disconnect_sequence[] = { static int dissect_rua_Disconnect(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 75 "rua.cnf" +#line 75 "../../asn1/rua/rua.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "DISCONNECT "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1084,7 +1084,7 @@ static const per_sequence_t ConnectionlessTransfer_sequence[] = { static int dissect_rua_ConnectionlessTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 80 "rua.cnf" +#line 80 "../../asn1/rua/rua.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "CONNECTIONLESS_TRANSFER "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1105,7 +1105,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_rua_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 85 "rua.cnf" +#line 85 "../../asn1/rua/rua.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "ERROR_INDICATION "); col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */ @@ -1126,7 +1126,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_rua_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 91 "rua.cnf" +#line 91 "../../asn1/rua/rua.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO, "PRIVATE_MESSAGE "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1359,7 +1359,7 @@ static void dissect_RUA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-rua-fn.c ---*/ -#line 89 "packet-rua-template.c" +#line 89 "../../asn1/rua/packet-rua-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -1412,7 +1412,7 @@ module_t *rua_module; /*--- Included file: packet-rua-hfarr.c ---*/ -#line 1 "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, @@ -1683,7 +1683,7 @@ module_t *rua_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-rua-hfarr.c ---*/ -#line 140 "packet-rua-template.c" +#line 140 "../../asn1/rua/packet-rua-template.c" }; /* List of subtrees */ @@ -1691,7 +1691,7 @@ module_t *rua_module; &ett_rua, /*--- Included file: packet-rua-ettarr.c ---*/ -#line 1 "packet-rua-ettarr.c" +#line 1 "../../asn1/rua/packet-rua-ettarr.c" &ett_rua_PrivateIE_ID, &ett_rua_ProtocolIE_Container, &ett_rua_ProtocolIE_Field, @@ -1730,7 +1730,7 @@ module_t *rua_module; &ett_rua_UnsuccessfulOutcome, /*--- End of included file: packet-rua-ettarr.c ---*/ -#line 146 "packet-rua-template.c" +#line 146 "../../asn1/rua/packet-rua-template.c" }; @@ -1771,7 +1771,7 @@ proto_reg_handoff_rua(void) initialized = TRUE; /*--- Included file: packet-rua-dis-tab.c ---*/ -#line 1 "packet-rua-dis-tab.c" +#line 1 "../../asn1/rua/packet-rua-dis-tab.c" dissector_add_uint("rua.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_rua)); dissector_add_uint("rua.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_rua)); dissector_add_uint("rua.ies", id_Context_ID, new_create_dissector_handle(dissect_Context_ID_PDU, proto_rua)); @@ -1789,7 +1789,7 @@ proto_reg_handoff_rua(void) /*--- End of included file: packet-rua-dis-tab.c ---*/ -#line 185 "packet-rua-template.c" +#line 185 "../../asn1/rua/packet-rua-template.c" } else { dissector_delete_uint("sctp.port", sctp_port, rua_handle); diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index feab1b9e93..cd8f5ed29f 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -5,7 +5,7 @@ /* Input file: packet-s1ap-template.c */ -#line 1 "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-2010, Anders Broman @@ -70,7 +70,7 @@ static dissector_handle_t nas_eps_handle; /*--- Included file: packet-s1ap-val.h ---*/ -#line 1 "packet-s1ap-val.h" +#line 1 "../../asn1/s1ap/packet-s1ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -305,7 +305,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-s1ap-val.h ---*/ -#line 64 "packet-s1ap-template.c" +#line 64 "../../asn1/s1ap/packet-s1ap-template.c" /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -314,7 +314,7 @@ static int hf_s1ap_transportLayerAddressIPv4 = -1; static int hf_s1ap_transportLayerAddressIPv6 = -1; /*--- Included file: packet-s1ap-hf.c ---*/ -#line 1 "packet-s1ap-hf.c" +#line 1 "../../asn1/s1ap/packet-s1ap-hf.c" static int hf_s1ap_Bearers_SubjectToStatusTransfer_Item_PDU = -1; /* Bearers_SubjectToStatusTransfer_Item */ static int hf_s1ap_BroadcastCancelledAreaList_PDU = -1; /* BroadcastCancelledAreaList */ static int hf_s1ap_BroadcastCompletedAreaList_PDU = -1; /* BroadcastCompletedAreaList */ @@ -748,7 +748,7 @@ static int hf_s1ap_candidateCellList = -1; /* CandidateCellList */ static int hf_s1ap_CandidateCellList_item = -1; /* IRAT_Cell_ID */ /*--- End of included file: packet-s1ap-hf.c ---*/ -#line 71 "packet-s1ap-template.c" +#line 71 "../../asn1/s1ap/packet-s1ap-template.c" /* Initialize the subtree pointers */ static int ett_s1ap = -1; @@ -760,7 +760,7 @@ static int ett_s1ap_UERadioCapability = -1; /*--- Included file: packet-s1ap-ett.c ---*/ -#line 1 "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; @@ -986,7 +986,7 @@ static gint ett_s1ap_HOReport = -1; static gint ett_s1ap_CandidateCellList = -1; /*--- End of included file: packet-s1ap-ett.c ---*/ -#line 81 "packet-s1ap-template.c" +#line 81 "../../asn1/s1ap/packet-s1ap-template.c" enum{ INITIATING_MESSAGE, @@ -1030,7 +1030,7 @@ static int dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU(tvbuff_t *tvb, /*--- Included file: packet-s1ap-fn.c ---*/ -#line 1 "packet-s1ap-fn.c" +#line 1 "../../asn1/s1ap/packet-s1ap-fn.c" static const value_string s1ap_Criticality_vals[] = { { 0, "reject" }, @@ -1150,7 +1150,7 @@ dissect_s1ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 106 "s1ap.cnf" +#line 106 "../../asn1/s1ap/s1ap.cnf" col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str_ext(ProcedureCode, &s1ap_ProcedureCode_vals_ext, "unknown message")); @@ -1332,7 +1332,7 @@ dissect_s1ap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &ProtocolIE_ID, FALSE); -#line 89 "s1ap.cnf" +#line 89 "../../asn1/s1ap/s1ap.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &s1ap_ProtocolIE_ID_vals_ext, "unknown (%d)")); } @@ -1412,7 +1412,7 @@ static const per_sequence_t ProtocolIE_ContainerList_sequence_of[1] = { static int dissect_s1ap_ProtocolIE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 131 "s1ap.cnf" +#line 131 "../../asn1/s1ap/s1ap.cnf" static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = { { "lowerBound", ASN1_PAR_INTEGER }, { "upperBound", ASN1_PAR_INTEGER }, @@ -1675,7 +1675,7 @@ dissect_s1ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_s1ap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 193 "s1ap.cnf" +#line 193 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -2871,7 +2871,7 @@ dissect_s1ap_ENB_UE_S1AP_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 206 "s1ap.cnf" +#line 206 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb=NULL; int length; int p_offset; @@ -2905,7 +2905,7 @@ dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_s1ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 241 "s1ap.cnf" +#line 241 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; @@ -3309,7 +3309,7 @@ static const value_string s1ap_HandoverType_vals[] = { static int dissect_s1ap_HandoverType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 276 "s1ap.cnf" +#line 276 "../../asn1/s1ap/s1ap.cnf" offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 5, &handover_type_value, TRUE, 0, NULL); @@ -3514,7 +3514,7 @@ dissect_s1ap_MSClassmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 232 "s1ap.cnf" +#line 232 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb=NULL; @@ -3761,7 +3761,7 @@ dissect_s1ap_RepetitionPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 406 "s1ap.cnf" +#line 406 "../../asn1/s1ap/s1ap.cnf" gint32 start_offset; @@ -3994,7 +3994,7 @@ dissect_s1ap_SONConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 295 "s1ap.cnf" +#line 295 "../../asn1/s1ap/s1ap.cnf" gint32 start_offset; tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -4365,7 +4365,7 @@ dissect_s1ap_TargeteNB_ToSourceeNB_TransparentContainer(tvbuff_t *tvb _U_, int o static int dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 349 "s1ap.cnf" +#line 349 "../../asn1/s1ap/s1ap.cnf" gint32 start_offset; tvbuff_t *parameter_tvb; @@ -4619,7 +4619,7 @@ dissect_s1ap_UEPagingID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_s1ap_UERadioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 466 "s1ap.cnf" +#line 466 "../../asn1/s1ap/s1ap.cnf" gint32 start_offset; tvbuff_t *parameter_tvb; @@ -4715,7 +4715,7 @@ dissect_s1ap_WarningMessageContents(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_s1ap_E_RAB_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 158 "s1ap.cnf" +#line 158 "../../asn1/s1ap/s1ap.cnf" asn1_stack_frame_push(actx, "ProtocolIE-ContainerList"); asn1_param_push_integer(actx, 1); asn1_param_push_integer(actx, maxNrOfE_RABs); @@ -4735,7 +4735,7 @@ static const per_sequence_t HandoverRequired_sequence[] = { static int dissect_s1ap_HandoverRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 281 "s1ap.cnf" +#line 281 "../../asn1/s1ap/s1ap.cnf" handover_type_value = 0; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4752,7 +4752,7 @@ static const per_sequence_t HandoverCommand_sequence[] = { static int dissect_s1ap_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 283 "s1ap.cnf" +#line 283 "../../asn1/s1ap/s1ap.cnf" handover_type_value = 0; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -4811,7 +4811,7 @@ static const per_sequence_t HandoverRequest_sequence[] = { static int dissect_s1ap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 285 "s1ap.cnf" +#line 285 "../../asn1/s1ap/s1ap.cnf" handover_type_value = 0; @@ -5559,7 +5559,7 @@ static const per_sequence_t DownlinkNASTransport_sequence[] = { static int dissect_s1ap_DownlinkNASTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 268 "s1ap.cnf" +#line 268 "../../asn1/s1ap/s1ap.cnf" /* Set the direction of the message */ actx->pinfo->link_dir=P2P_DIR_DL; @@ -5578,7 +5578,7 @@ static const per_sequence_t InitialUEMessage_sequence[] = { static int dissect_s1ap_InitialUEMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 264 "s1ap.cnf" +#line 264 "../../asn1/s1ap/s1ap.cnf" /* Set the direction of the message */ actx->pinfo->link_dir=P2P_DIR_UL; @@ -5597,7 +5597,7 @@ static const per_sequence_t UplinkNASTransport_sequence[] = { static int dissect_s1ap_UplinkNASTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 272 "s1ap.cnf" +#line 272 "../../asn1/s1ap/s1ap.cnf" /* Set the direction of the message */ actx->pinfo->link_dir=P2P_DIR_UL; @@ -6257,7 +6257,7 @@ dissect_s1ap_UplinkNonUEAssociatedLPPaTransport(tvbuff_t *tvb _U_, int offset _U static int dissect_s1ap_InitiatingMessage_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 113 "s1ap.cnf" +#line 113 "../../asn1/s1ap/s1ap.cnf" message_type = INITIATING_MESSAGE; offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_InitiatingMessageValue); @@ -6285,7 +6285,7 @@ dissect_s1ap_InitiatingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_s1ap_SuccessfulOutcome_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 116 "s1ap.cnf" +#line 116 "../../asn1/s1ap/s1ap.cnf" message_type = SUCCESSFUL_OUTCOME; offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_SuccessfulOutcomeValue); @@ -6313,7 +6313,7 @@ dissect_s1ap_SuccessfulOutcome(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_s1ap_UnsuccessfulOutcome_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 119 "s1ap.cnf" +#line 119 "../../asn1/s1ap/s1ap.cnf" message_type = UNSUCCESSFUL_OUTCOME; @@ -8354,7 +8354,7 @@ int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-s1ap-fn.c ---*/ -#line 123 "packet-s1ap-template.c" +#line 123 "../../asn1/s1ap/packet-s1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -8426,7 +8426,7 @@ proto_reg_handoff_s1ap(void) Initialized=TRUE; /*--- Included file: packet-s1ap-dis-tab.c ---*/ -#line 1 "packet-s1ap-dis-tab.c" +#line 1 "../../asn1/s1ap/packet-s1ap-dis-tab.c" dissector_add_uint("s1ap.ies", id_MME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap)); dissector_add_uint("s1ap.ies", id_HandoverType, new_create_dissector_handle(dissect_HandoverType_PDU, proto_s1ap)); dissector_add_uint("s1ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_s1ap)); @@ -8628,7 +8628,7 @@ proto_reg_handoff_s1ap(void) /*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 193 "packet-s1ap-template.c" +#line 193 "../../asn1/s1ap/packet-s1ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, s1ap_handle); @@ -8658,7 +8658,7 @@ void proto_register_s1ap(void) { /*--- Included file: packet-s1ap-hfarr.c ---*/ -#line 1 "packet-s1ap-hfarr.c" +#line 1 "../../asn1/s1ap/packet-s1ap-hfarr.c" { &hf_s1ap_Bearers_SubjectToStatusTransfer_Item_PDU, { "Bearers-SubjectToStatusTransfer-Item", "s1ap.Bearers_SubjectToStatusTransfer_Item", FT_NONE, BASE_NONE, NULL, 0, @@ -10385,7 +10385,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, /*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 221 "packet-s1ap-template.c" +#line 221 "../../asn1/s1ap/packet-s1ap-template.c" }; /* List of subtrees */ @@ -10398,7 +10398,7 @@ void proto_register_s1ap(void) { &ett_s1ap_UERadioCapability, /*--- Included file: packet-s1ap-ettarr.c ---*/ -#line 1 "packet-s1ap-ettarr.c" +#line 1 "../../asn1/s1ap/packet-s1ap-ettarr.c" &ett_s1ap_PrivateIE_ID, &ett_s1ap_ProtocolIE_Container, &ett_s1ap_ProtocolIE_Field, @@ -10624,7 +10624,7 @@ void proto_register_s1ap(void) { &ett_s1ap_CandidateCellList, /*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 232 "packet-s1ap-template.c" +#line 232 "../../asn1/s1ap/packet-s1ap-template.c" }; module_t *s1ap_module; diff --git a/epan/dissectors/packet-s1ap.h b/epan/dissectors/packet-s1ap.h index 3d511c4761..72e1581a92 100644 --- a/epan/dissectors/packet-s1ap.h +++ b/epan/dissectors/packet-s1ap.h @@ -5,7 +5,7 @@ /* Input file: packet-s1ap-template.h */ -#line 1 "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 * @@ -35,7 +35,7 @@ /*--- Included file: packet-s1ap-exp.h ---*/ -#line 1 "packet-s1ap-exp.h" +#line 1 "../../asn1/s1ap/packet-s1ap-exp.h" WS_VAR_IMPORT const value_string s1ap_CauseMisc_vals[]; WS_VAR_IMPORT const value_string s1ap_CauseProtocol_vals[]; WS_VAR_IMPORT const value_string s1ap_CauseRadioNetwork_vals[]; @@ -54,6 +54,6 @@ int dissect_s1ap_SONtransferResponseContainer_PDU(tvbuff_t *tvb _U_, packet_info int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-s1ap-exp.h ---*/ -#line 29 "packet-s1ap-template.h" +#line 29 "../../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 1722228556..9c05e01d34 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -5,7 +5,7 @@ /* Input file: packet-sabp-template.c */ -#line 1 "packet-sabp-template.c" +#line 1 "../../asn1/sabp/packet-sabp-template.c" /* packet-sbap.c * Routines for UTRAN Iu-BC Interface: Service Area Broadcast Protocol (SBAP) packet dissection * Copyright 2007, Tomas Kukosa @@ -55,7 +55,7 @@ /*--- Included file: packet-sabp-val.h ---*/ -#line 1 "packet-sabp-val.h" +#line 1 "../../asn1/sabp/packet-sabp-val.h" #define maxNrOfErrors 256 #define maxnoofSAI 65535 #define maxProtocolExtensions 65535 @@ -99,7 +99,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sabp-val.h ---*/ -#line 49 "packet-sabp-template.c" +#line 49 "../../asn1/sabp/packet-sabp-template.c" /* Initialize the protocol and registered fields */ static int proto_sabp = -1; @@ -107,7 +107,7 @@ static int proto_sabp = -1; static int hf_sabp_no_of_pages = -1; /*--- Included file: packet-sabp-hf.c ---*/ -#line 1 "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 */ @@ -189,7 +189,7 @@ 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 55 "packet-sabp-template.c" +#line 55 "../../asn1/sabp/packet-sabp-template.c" /* Initialize the subtree pointers */ static int ett_sabp = -1; @@ -199,7 +199,7 @@ static int ett_sabp_bcast_msg = -1; /*--- Included file: packet-sabp-ett.c ---*/ -#line 1 "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; @@ -241,7 +241,7 @@ static gint ett_sabp_SuccessfulOutcome = -1; static gint ett_sabp_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sabp-ett.c ---*/ -#line 63 "packet-sabp-template.c" +#line 63 "../../asn1/sabp/packet-sabp-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -267,7 +267,7 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p /*--- Included file: packet-sabp-fn.c ---*/ -#line 1 "packet-sabp-fn.c" +#line 1 "../../asn1/sabp/packet-sabp-fn.c" static const value_string sabp_Criticality_vals[] = { { 0, "reject" }, @@ -306,7 +306,7 @@ dissect_sabp_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 59 "sabp.cnf" +#line 59 "../../asn1/sabp/sabp.cnf" col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str_ext(ProcedureCode, &sabp_ProcedureCode_vals_ext, "unknown message")); @@ -359,7 +359,7 @@ dissect_sabp_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &ProtocolIE_ID, FALSE); -#line 46 "sabp.cnf" +#line 46 "../../asn1/sabp/sabp.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &sabp_ProtocolIE_ID_vals_ext, "unknown (%d)")); } @@ -653,7 +653,7 @@ dissect_sabp_MessageStructure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act static int dissect_sabp_Data_Coding_Scheme(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 173 "sabp.cnf" +#line 173 "../../asn1/sabp/sabp.cnf" tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; @@ -676,7 +676,7 @@ dissect_sabp_Data_Coding_Scheme(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_sabp_T_pLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 161 "sabp.cnf" +#line 161 "../../asn1/sabp/sabp.cnf" tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; @@ -1682,7 +1682,7 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-sabp-fn.c ---*/ -#line 87 "packet-sabp-template.c" +#line 87 "../../asn1/sabp/packet-sabp-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -1774,7 +1774,7 @@ void proto_register_sabp(void) { /*--- Included file: packet-sabp-hfarr.c ---*/ -#line 1 "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, @@ -2093,7 +2093,7 @@ void proto_register_sabp(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sabp-hfarr.c ---*/ -#line 177 "packet-sabp-template.c" +#line 177 "../../asn1/sabp/packet-sabp-template.c" }; /* List of subtrees */ @@ -2104,7 +2104,7 @@ void proto_register_sabp(void) { &ett_sabp_bcast_msg, /*--- Included file: packet-sabp-ettarr.c ---*/ -#line 1 "packet-sabp-ettarr.c" +#line 1 "../../asn1/sabp/packet-sabp-ettarr.c" &ett_sabp_ProtocolIE_Container, &ett_sabp_ProtocolIE_Field, &ett_sabp_ProtocolExtensionContainer, @@ -2146,7 +2146,7 @@ void proto_register_sabp(void) { &ett_sabp_UnsuccessfulOutcome, /*--- End of included file: packet-sabp-ettarr.c ---*/ -#line 186 "packet-sabp-template.c" +#line 186 "../../asn1/sabp/packet-sabp-template.c" }; @@ -2185,7 +2185,7 @@ proto_reg_handoff_sabp(void) /*--- Included file: packet-sabp-dis-tab.c ---*/ -#line 1 "packet-sabp-dis-tab.c" +#line 1 "../../asn1/sabp/packet-sabp-dis-tab.c" dissector_add_uint("sabp.ies", id_Message_Identifier, new_create_dissector_handle(dissect_Message_Identifier_PDU, proto_sabp)); dissector_add_uint("sabp.ies", id_New_Serial_Number, new_create_dissector_handle(dissect_New_Serial_Number_PDU, proto_sabp)); dissector_add_uint("sabp.ies", id_Old_Serial_Number, new_create_dissector_handle(dissect_Old_Serial_Number_PDU, proto_sabp)); @@ -2229,7 +2229,7 @@ proto_reg_handoff_sabp(void) /*--- End of included file: packet-sabp-dis-tab.c ---*/ -#line 223 "packet-sabp-template.c" +#line 223 "../../asn1/sabp/packet-sabp-template.c" } diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index d90420735d..231f213edf 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -5,7 +5,7 @@ /* Input file: packet-smrse-template.c */ -#line 1 "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 @@ -56,7 +56,7 @@ static int hf_smrse_length = -1; static int hf_smrse_Octet_Format = -1; /*--- Included file: packet-smrse-hf.c ---*/ -#line 1 "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 */ @@ -85,13 +85,13 @@ 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 50 "packet-smrse-template.c" +#line 50 "../../asn1/smrse/packet-smrse-template.c" /* Initialize the subtree pointers */ static gint ett_smrse = -1; /*--- Included file: packet-smrse-ett.c ---*/ -#line 1 "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; @@ -105,12 +105,12 @@ static gint ett_smrse_RPError = -1; static gint ett_smrse_RPAlertSC = -1; /*--- End of included file: packet-smrse-ett.c ---*/ -#line 54 "packet-smrse-template.c" +#line 54 "../../asn1/smrse/packet-smrse-template.c" /*--- Included file: packet-smrse-fn.c ---*/ -#line 1 "packet-smrse-fn.c" +#line 1 "../../asn1/smrse/packet-smrse-fn.c" static const value_string smrse_T_address_type_vals[] = { { 0, "unknown-type" }, @@ -155,7 +155,7 @@ dissect_smrse_T_numbering_plan(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_smrse_T_octet_format(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 21 "smrse.cnf" +#line 21 "../../asn1/smrse/smrse.cnf" char *strp,tmpstr[21]; guint32 i, start_offset; gint8 class; @@ -481,7 +481,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-smrse-fn.c ---*/ -#line 57 "packet-smrse-template.c" +#line 57 "../../asn1/smrse/packet-smrse-template.c" static const value_string tag_vals[] = { { 1, "AliveTest" }, @@ -589,7 +589,7 @@ void proto_register_smrse(void) { /*--- Included file: packet-smrse-hfarr.c ---*/ -#line 1 "packet-smrse-hfarr.c" +#line 1 "../../asn1/smrse/packet-smrse-hfarr.c" { &hf_smrse_sc_address, { "sc-address", "smrse.sc_address", FT_NONE, BASE_NONE, NULL, 0, @@ -696,7 +696,7 @@ void proto_register_smrse(void) { "SMS_Address", HFILL }}, /*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 163 "packet-smrse-template.c" +#line 163 "../../asn1/smrse/packet-smrse-template.c" }; /* List of subtrees */ @@ -704,7 +704,7 @@ void proto_register_smrse(void) { &ett_smrse, /*--- Included file: packet-smrse-ettarr.c ---*/ -#line 1 "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, @@ -718,7 +718,7 @@ void proto_register_smrse(void) { &ett_smrse_RPAlertSC, /*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 169 "packet-smrse-template.c" +#line 169 "../../asn1/smrse/packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h index 7ae76b8017..d4816858f6 100644 --- a/epan/dissectors/packet-smrse.h +++ b/epan/dissectors/packet-smrse.h @@ -5,7 +5,7 @@ /* Input file: packet-smrse-template.h */ -#line 1 "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-spnego.c b/epan/dissectors/packet-spnego.c index 90b3a9d9d1..3033b17c41 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1137,10 +1137,13 @@ rrc_rotate(void *data, int len, guint16 rrc, int unrotate) left = len - rrc; - if (rrc <= sizeof(buf)) + if (rrc <= sizeof(buf)) { tmp = buf; - else + } else { tmp = g_malloc(rrc); + if (tmp == NULL) + return -1; + } if (unrotate) { memcpy(tmp, data, rrc); diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index 4e845e2e5f..284b2555bc 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -5,7 +5,7 @@ /* Input file: packet-sv-template.c */ -#line 1 "packet-sv-template.c" +#line 1 "../../asn1/sv/packet-sv-template.c" /* packet-sv.c * Routines for IEC 61850 Sampled Vales packet dissection * Michael Bernhard 2008 @@ -108,7 +108,7 @@ static int hf_sv_phsmeas_q_derived = -1; /*--- Included file: packet-sv-hf.c ---*/ -#line 1 "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 */ @@ -120,7 +120,7 @@ static int hf_sv_smpSynch = -1; /* T_smpSynch */ static int hf_sv_seqData = -1; /* Data */ /*--- End of included file: packet-sv-hf.c ---*/ -#line 102 "packet-sv-template.c" +#line 102 "../../asn1/sv/packet-sv-template.c" /* Initialize the subtree pointers */ static int ett_sv = -1; @@ -129,14 +129,14 @@ static int ett_phsmeas_q = -1; /*--- Included file: packet-sv-ett.c ---*/ -#line 1 "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 109 "packet-sv-template.c" +#line 109 "../../asn1/sv/packet-sv-template.c" static const value_string sv_q_validity_vals[] = { { 0, "good" }, @@ -217,7 +217,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv /*--- Included file: packet-sv-fn.c ---*/ -#line 1 "packet-sv-fn.c" +#line 1 "../../asn1/sv/packet-sv-fn.c" static int @@ -243,7 +243,7 @@ dissect_sv_VisibleString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_sv_T_smpCnt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 19 "sv.cnf" +#line 19 "../../asn1/sv/sv.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &value); sv_data.smpCnt = value; @@ -273,7 +273,7 @@ static const value_string sv_T_smpSynch_vals[] = { static int dissect_sv_T_smpSynch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 25 "sv.cnf" +#line 25 "../../asn1/sv/sv.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &value); sv_data.smpSynch = value; @@ -286,7 +286,7 @@ dissect_sv_T_smpSynch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_sv_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 31 "sv.cnf" +#line 31 "../../asn1/sv/sv.cnf" offset = dissect_PhsMeas1(implicit_tag, actx->pinfo, tree, tvb, offset, hf_index); @@ -361,7 +361,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-sv-fn.c ---*/ -#line 188 "packet-sv-template.c" +#line 188 "../../asn1/sv/packet-sv-template.c" /* * Dissect SV PDUs inside a PPDU. @@ -481,7 +481,7 @@ void proto_register_sv(void) { /*--- Included file: packet-sv-hfarr.c ---*/ -#line 1 "packet-sv-hfarr.c" +#line 1 "../../asn1/sv/packet-sv-hfarr.c" { &hf_sv_savPdu, { "savPdu", "sv.savPdu", FT_NONE, BASE_NONE, NULL, 0, @@ -520,7 +520,7 @@ void proto_register_sv(void) { "Data", HFILL }}, /*--- End of included file: packet-sv-hfarr.c ---*/ -#line 306 "packet-sv-template.c" +#line 306 "../../asn1/sv/packet-sv-template.c" }; /* List of subtrees */ @@ -530,14 +530,14 @@ void proto_register_sv(void) { &ett_phsmeas_q, /*--- Included file: packet-sv-ettarr.c ---*/ -#line 1 "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 314 "packet-sv-template.c" +#line 314 "../../asn1/sv/packet-sv-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-sv.h b/epan/dissectors/packet-sv.h index 29b5f22d14..5671ab806a 100644 --- a/epan/dissectors/packet-sv.h +++ b/epan/dissectors/packet-sv.h @@ -5,7 +5,7 @@ /* Input file: packet-sv-template.h */ -#line 1 "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-t125.c b/epan/dissectors/packet-t125.c index 76229679e7..d66d6cbfc9 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -5,7 +5,7 @@ /* Input file: packet-t125-template.c */ -#line 1 "packet-t125-template.c" +#line 1 "../../asn1/t125/packet-t125-template.c" /* packet-t125.c * Routines for t125 packet dissection * Copyright 2007, Ronnie Sahlberg @@ -51,7 +51,7 @@ static int proto_t125 = -1; /*--- Included file: packet-t125-hf.c ---*/ -#line 1 "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 */ @@ -171,13 +171,13 @@ static int hf_t125_Segmentation_begin = -1; static int hf_t125_Segmentation_end = -1; /*--- End of included file: packet-t125-hf.c ---*/ -#line 45 "packet-t125-template.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 "packet-t125-ett.c" +#line 1 "../../asn1/t125/packet-t125-ett.c" static gint ett_t125_Segmentation = -1; static gint ett_t125_DomainParameters = -1; static gint ett_t125_Connect_Initial_U = -1; @@ -247,11 +247,11 @@ static gint ett_t125_ConnectMCSPDU = -1; static gint ett_t125_DomainMCSPDU = -1; /*--- End of included file: packet-t125-ett.c ---*/ -#line 49 "packet-t125-template.c" +#line 49 "../../asn1/t125/packet-t125-template.c" /*--- Included file: packet-t125-fn.c ---*/ -#line 1 "packet-t125-fn.c" +#line 1 "../../asn1/t125/packet-t125-fn.c" static int @@ -1977,7 +1977,7 @@ static const ber_choice_t ConnectMCSPDU_choice[] = { static int dissect_t125_ConnectMCSPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 22 "t125.cnf" +#line 22 "../../asn1/t125/t125.cnf" gint connectmcs_value; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -2091,7 +2091,7 @@ static const ber_choice_t DomainMCSPDU_choice[] = { static int dissect_t125_DomainMCSPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 33 "t125.cnf" +#line 33 "../../asn1/t125/t125.cnf" gint domainmcs_value; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -2120,7 +2120,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-t125-fn.c ---*/ -#line 51 "packet-t125-template.c" +#line 51 "../../asn1/t125/packet-t125-template.c" static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) @@ -2157,7 +2157,7 @@ void proto_register_t125(void) { static hf_register_info hf[] = { /*--- Included file: packet-t125-hfarr.c ---*/ -#line 1 "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, @@ -2624,7 +2624,7 @@ void proto_register_t125(void) { NULL, HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 86 "packet-t125-template.c" +#line 86 "../../asn1/t125/packet-t125-template.c" }; /* List of subtrees */ @@ -2632,7 +2632,7 @@ void proto_register_t125(void) { &ett_t125, /*--- Included file: packet-t125-ettarr.c ---*/ -#line 1 "packet-t125-ettarr.c" +#line 1 "../../asn1/t125/packet-t125-ettarr.c" &ett_t125_Segmentation, &ett_t125_DomainParameters, &ett_t125_Connect_Initial_U, @@ -2702,7 +2702,7 @@ void proto_register_t125(void) { &ett_t125_DomainMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 92 "packet-t125-template.c" +#line 92 "../../asn1/t125/packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t125.h b/epan/dissectors/packet-t125.h index b842dda62a..2da0aca016 100644 --- a/epan/dissectors/packet-t125.h +++ b/epan/dissectors/packet-t125.h @@ -5,7 +5,7 @@ /* Input file: packet-t125-template.h */ -#line 1 "packet-t125-template.h" +#line 1 "../../asn1/t125/packet-t125-template.h" /* packet-t125.h * Routines for t125 packet dissection * Copyright 2007, Ronnie Sahlberg diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index e25d0a8eae..3806596831 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -5,7 +5,7 @@ /* Input file: packet-tcap-template.c */ -#line 1 "packet-tcap-template.c" +#line 1 "../../asn1/tcap/packet-tcap-template.c" /* packet-tcap-template.c * Routines for TCAP * Copyright 2004 - 2005, Tim Endean @@ -68,7 +68,7 @@ int hf_tcapsrt_SessionTime=-1; /*--- Included file: packet-tcap-hf.c ---*/ -#line 1 "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 */ @@ -138,7 +138,7 @@ 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 62 "packet-tcap-template.c" +#line 62 "../../asn1/tcap/packet-tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -156,7 +156,7 @@ static struct tcaphash_context_t * gp_tcap_context=NULL; /*--- Included file: packet-tcap-ett.c ---*/ -#line 1 "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; @@ -193,7 +193,7 @@ 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 78 "packet-tcap-template.c" +#line 78 "../../asn1/tcap/packet-tcap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -258,7 +258,7 @@ dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { /*--- Included file: packet-tcap-fn.c ---*/ -#line 1 "packet-tcap-fn.c" +#line 1 "../../asn1/tcap/packet-tcap-fn.c" static int @@ -272,7 +272,7 @@ dissect_tcap_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_tcap_Dialog1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "tcap.cnf" +#line 69 "../../asn1/tcap/tcap.cnf" offset = dissect_tcap_DialoguePDU(TRUE, tvb, offset, actx, tree, -1); @@ -300,7 +300,7 @@ dissect_tcap_ExternalPDU_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_tcap_ExternalPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 64 "tcap.cnf" +#line 64 "../../asn1/tcap/tcap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_UNI, 8, TRUE, dissect_tcap_ExternalPDU_U); @@ -315,7 +315,7 @@ dissect_tcap_ExternalPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_tcap_DialogueOC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 59 "tcap.cnf" +#line 59 "../../asn1/tcap/tcap.cnf" offset = dissect_tcap_ExternalPDU(FALSE /*implicit_tag*/, tvb, offset, actx, tree, -1); @@ -380,7 +380,7 @@ dissect_tcap_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_tcap_Parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 74 "tcap.cnf" +#line 74 "../../asn1/tcap/tcap.cnf" offset = dissect_tcap_param(actx,tree,tvb,offset); @@ -652,7 +652,7 @@ static const ber_choice_t Component_choice[] = { static int dissect_tcap_Component(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 79 "tcap.cnf" +#line 79 "../../asn1/tcap/tcap.cnf" tvbuff_t *next_tvb; gint8 class; gboolean pc; @@ -734,7 +734,7 @@ dissect_tcap_OCTET_STRING_SIZE_1_4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_tcap_OrigTransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 117 "tcap.cnf" +#line 117 "../../asn1/tcap/tcap.cnf" tvbuff_t *parameter_tvb; guint8 len, i; proto_item *tid_item; @@ -787,7 +787,7 @@ static const ber_sequence_t Begin_sequence[] = { static int dissect_tcap_Begin(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 191 "tcap.cnf" +#line 191 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_BEGIN; /* Do not change col_add_str() to col_append_str() here: we _want_ this call @@ -810,7 +810,7 @@ if (check_col(actx->pinfo->cinfo, COL_INFO)) static int dissect_tcap_DestTransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 156 "tcap.cnf" +#line 156 "../../asn1/tcap/tcap.cnf" tvbuff_t *parameter_tvb; guint8 len , i; proto_item *tid_item; @@ -860,7 +860,7 @@ static const ber_sequence_t End_sequence[] = { static int dissect_tcap_End(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 206 "tcap.cnf" +#line 206 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_END; if (check_col(actx->pinfo->cinfo, COL_INFO)) @@ -883,7 +883,7 @@ static const ber_sequence_t Continue_sequence[] = { static int dissect_tcap_Continue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 214 "tcap.cnf" +#line 214 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_CONT; if (check_col(actx->pinfo->cinfo, COL_INFO)) @@ -955,7 +955,7 @@ static const ber_sequence_t Abort_sequence[] = { static int dissect_tcap_Abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 222 "tcap.cnf" +#line 222 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_ABORT; if (check_col(actx->pinfo->cinfo, COL_INFO)) @@ -1036,7 +1036,7 @@ dissect_tcap_AUDT_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_tcap_AUDT_application_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 102 "tcap.cnf" +#line 102 "../../asn1/tcap/tcap.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid); tcap_private.oid= (void*) cur_oid; @@ -1133,7 +1133,7 @@ dissect_tcap_AARQ_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_tcap_AARQ_application_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 107 "tcap.cnf" +#line 107 "../../asn1/tcap/tcap.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid); tcap_private.oid= (void*) cur_oid; @@ -1201,7 +1201,7 @@ dissect_tcap_AARE_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_tcap_AARE_application_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 112 "tcap.cnf" +#line 112 "../../asn1/tcap/tcap.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &cur_oid); tcap_private.oid= (void*) cur_oid; @@ -1417,7 +1417,7 @@ static void dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-tcap-fn.c ---*/ -#line 141 "packet-tcap-template.c" +#line 141 "../../asn1/tcap/packet-tcap-template.c" @@ -1531,13 +1531,13 @@ proto_reg_handoff_tcap(void) /*--- Included file: packet-tcap-dis-tab.c ---*/ -#line 1 "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 253 "packet-tcap-template.c" +#line 253 "../../asn1/tcap/packet-tcap-template.c" } static void init_tcap(void); @@ -1601,7 +1601,7 @@ proto_register_tcap(void) }, /*--- Included file: packet-tcap-hfarr.c ---*/ -#line 1 "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, @@ -1868,7 +1868,7 @@ proto_register_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 315 "packet-tcap-template.c" +#line 315 "../../asn1/tcap/packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -1880,7 +1880,7 @@ proto_register_tcap(void) &ett_tcap_stat, /*--- Included file: packet-tcap-ettarr.c ---*/ -#line 1 "packet-tcap-ettarr.c" +#line 1 "../../asn1/tcap/packet-tcap-ettarr.c" &ett_tcap_ExternalPDU_U, &ett_tcap_TCMessage, &ett_tcap_Unidirectional, @@ -1917,7 +1917,7 @@ proto_register_tcap(void) &ett_tcap_Associate_source_diagnostic, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 325 "packet-tcap-template.c" +#line 325 "../../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 ad37f15b15..e4ac2fe0ad 100644 --- a/epan/dissectors/packet-tcap.h +++ b/epan/dissectors/packet-tcap.h @@ -5,7 +5,7 @@ /* Input file: packet-tcap-template.h */ -#line 1 "packet-tcap-template.h" +#line 1 "../../asn1/tcap/packet-tcap-template.h" /* packet-tcap.h * * $Id$ @@ -94,13 +94,13 @@ extern void call_tcap_dissector(dissector_handle_t, tvbuff_t*, packet_info*, pro /*--- Included file: packet-tcap-exp.h ---*/ -#line 1 "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 88 "packet-tcap-template.h" +#line 88 "../../asn1/tcap/packet-tcap-template.h" #endif /* PACKET_tcap_H */ diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index 8eae40703c..b50a27c564 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -5,7 +5,7 @@ /* Input file: packet-ulp-template.c */ -#line 1 "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 @@ -69,7 +69,7 @@ static gboolean ulp_desegment = TRUE; /*--- Included file: packet-ulp-hf.c ---*/ -#line 1 "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 */ @@ -669,13 +669,13 @@ static int hf_ulp_GANSSSignals_signal7 = -1; static int hf_ulp_GANSSSignals_signal8 = -1; /*--- End of included file: packet-ulp-hf.c ---*/ -#line 63 "packet-ulp-template.c" +#line 63 "../../asn1/ulp/packet-ulp-template.c" /* Initialize the subtree pointers */ static gint ett_ulp = -1; /*--- Included file: packet-ulp-ett.c ---*/ -#line 1 "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; @@ -886,12 +886,12 @@ static gint ett_ulp_PolygonArea = -1; static gint ett_ulp_PolygonDescription = -1; /*--- End of included file: packet-ulp-ett.c ---*/ -#line 67 "packet-ulp-template.c" +#line 67 "../../asn1/ulp/packet-ulp-template.c" /* Include constants */ /*--- Included file: packet-ulp-val.h ---*/ -#line 1 "packet-ulp-val.h" +#line 1 "../../asn1/ulp/packet-ulp-val.h" #define maxReqLength 50 #define maxClientLength 50 #define maxNumGeoArea 32 @@ -909,12 +909,12 @@ static gint ett_ulp_PolygonDescription = -1; #define maxWimaxBSMeas 32 /*--- End of included file: packet-ulp-val.h ---*/ -#line 70 "packet-ulp-template.c" +#line 70 "../../asn1/ulp/packet-ulp-template.c" /*--- Included file: packet-ulp-fn.c ---*/ -#line 1 "packet-ulp-fn.c" +#line 1 "../../asn1/ulp/packet-ulp-fn.c" static int @@ -3488,7 +3488,7 @@ dissect_ulp_MultipleLocationIds(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_ulp_T_sip_uri(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 59 "ulp.cnf" +#line 59 "../../asn1/ulp/ulp.cnf" offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%#@?", 72, NULL); @@ -3501,7 +3501,7 @@ dissect_ulp_T_sip_uri(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_ulp_T_ims_public_identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 64 "ulp.cnf" +#line 64 "../../asn1/ulp/ulp.cnf" offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:./-_~%#@?", 72, NULL); @@ -3514,7 +3514,7 @@ dissect_ulp_T_ims_public_identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_ulp_T_uri(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "ulp.cnf" +#line 69 "../../asn1/ulp/ulp.cnf" offset = dissect_per_restricted_character_string(tvb, offset, actx, tree, hf_index, 1, 255, FALSE, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./-_~%#", 69, NULL); @@ -4462,7 +4462,7 @@ dissect_ulp_OCTET_STRING_SIZE_1_8192(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_ulp_T_rrlpPayload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 48 "ulp.cnf" +#line 48 "../../asn1/ulp/ulp.cnf" tvbuff_t *rrlp_tvb; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -6200,7 +6200,7 @@ static const per_choice_t UlpMessage_choice[] = { static int dissect_ulp_UlpMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 36 "ulp.cnf" +#line 36 "../../asn1/ulp/ulp.cnf" guint32 UlpMessage; @@ -6229,7 +6229,7 @@ static const per_sequence_t ULP_PDU_sequence[] = { static int dissect_ulp_ULP_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 29 "ulp.cnf" +#line 29 "../../asn1/ulp/ulp.cnf" proto_tree_add_item(tree, proto_ulp, tvb, 0, -1, FALSE); col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, PSNAME); @@ -6251,7 +6251,7 @@ static void dissect_ULP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-ulp-fn.c ---*/ -#line 73 "packet-ulp-template.c" +#line 73 "../../asn1/ulp/packet-ulp-template.c" static guint @@ -6278,7 +6278,7 @@ void proto_register_ulp(void) { /*--- Included file: packet-ulp-hfarr.c ---*/ -#line 1 "packet-ulp-hfarr.c" +#line 1 "../../asn1/ulp/packet-ulp-hfarr.c" { &hf_ulp_ULP_PDU_PDU, { "ULP-PDU", "ulp.ULP_PDU", FT_NONE, BASE_NONE, NULL, 0, @@ -8665,7 +8665,7 @@ void proto_register_ulp(void) { NULL, HFILL }}, /*--- End of included file: packet-ulp-hfarr.c ---*/ -#line 98 "packet-ulp-template.c" +#line 98 "../../asn1/ulp/packet-ulp-template.c" }; /* List of subtrees */ @@ -8673,7 +8673,7 @@ void proto_register_ulp(void) { &ett_ulp, /*--- Included file: packet-ulp-ettarr.c ---*/ -#line 1 "packet-ulp-ettarr.c" +#line 1 "../../asn1/ulp/packet-ulp-ettarr.c" &ett_ulp_ULP_PDU, &ett_ulp_UlpMessage, &ett_ulp_SUPLINIT, @@ -8884,7 +8884,7 @@ void proto_register_ulp(void) { &ett_ulp_PolygonDescription, /*--- End of included file: packet-ulp-ettarr.c ---*/ -#line 104 "packet-ulp-template.c" +#line 104 "../../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 9e703d396c..08bf1fb5fb 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -5,7 +5,7 @@ /* Input file: packet-wlancertextn-template.c */ -#line 1 "packet-wlancertextn-template.c" +#line 1 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /* packet-wlancertextn.c * Routines for Wireless Certificate Extension (RFC3770) * Ronnie Sahlberg 2005 @@ -54,25 +54,25 @@ static int proto_wlancertextn = -1; /*--- Included file: packet-wlancertextn-hf.c ---*/ -#line 1 "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 48 "packet-wlancertextn-template.c" +#line 48 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-wlancertextn-ett.c ---*/ -#line 1 "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 51 "packet-wlancertextn-template.c" +#line 51 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /*--- Included file: packet-wlancertextn-fn.c ---*/ -#line 1 "packet-wlancertextn-fn.c" +#line 1 "../../asn1/wlancertextn/packet-wlancertextn-fn.c" static int @@ -106,7 +106,7 @@ static void dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 53 "packet-wlancertextn-template.c" +#line 53 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /*--- proto_register_wlancertextn ----------------------------------------------*/ @@ -116,7 +116,7 @@ void proto_register_wlancertextn(void) { static hf_register_info hf[] = { /*--- Included file: packet-wlancertextn-hfarr.c ---*/ -#line 1 "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, @@ -127,18 +127,18 @@ void proto_register_wlancertextn(void) { NULL, HFILL }}, /*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 61 "packet-wlancertextn-template.c" +#line 61 "../../asn1/wlancertextn/packet-wlancertextn-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-wlancertextn-ettarr.c ---*/ -#line 1 "packet-wlancertextn-ettarr.c" +#line 1 "../../asn1/wlancertextn/packet-wlancertextn-ettarr.c" &ett_wlancertextn_SSIDList, /*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 66 "packet-wlancertextn-template.c" +#line 66 "../../asn1/wlancertextn/packet-wlancertextn-template.c" }; /* Register protocol */ @@ -155,13 +155,13 @@ void proto_register_wlancertextn(void) { void proto_reg_handoff_wlancertextn(void) { /*--- Included file: packet-wlancertextn-dis-tab.c ---*/ -#line 1 "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 81 "packet-wlancertextn-template.c" +#line 81 "../../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 d51022bb40..c3e0be86b6 100644 --- a/epan/dissectors/packet-wlancertextn.h +++ b/epan/dissectors/packet-wlancertextn.h @@ -5,7 +5,7 @@ /* Input file: packet-wlancertextn-template.h */ -#line 1 "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 337832b476..474b8091f5 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -5,7 +5,7 @@ /* Input file: packet-x2ap-template.c */ -#line 1 "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); @@ -66,7 +66,7 @@ /*--- Included file: packet-x2ap-val.h ---*/ -#line 1 "packet-x2ap-val.h" +#line 1 "../../asn1/x2ap/packet-x2ap-val.h" #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 @@ -170,7 +170,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ -#line 60 "packet-x2ap-template.c" +#line 60 "../../asn1/x2ap/packet-x2ap-template.c" /* Initialize the protocol and registered fields */ static int proto_x2ap = -1; @@ -178,7 +178,7 @@ static int hf_x2ap_transportLayerAddressIPv4 = -1; static int hf_x2ap_transportLayerAddressIPv6 = -1; /*--- Included file: packet-x2ap-hf.c ---*/ -#line 1 "packet-x2ap-hf.c" +#line 1 "../../asn1/x2ap/packet-x2ap-hf.c" static int hf_x2ap_Cause_PDU = -1; /* Cause */ static int hf_x2ap_CompositeAvailableCapacityGroup_PDU = -1; /* CompositeAvailableCapacityGroup */ static int hf_x2ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ @@ -447,14 +447,14 @@ 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 66 "packet-x2ap-template.c" +#line 66 "../../asn1/x2ap/packet-x2ap-template.c" /* Initialize the subtree pointers */ static int ett_x2ap = -1; static int ett_x2ap_TransportLayerAddress = -1; /*--- Included file: packet-x2ap-ett.c ---*/ -#line 1 "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; @@ -577,7 +577,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1; static gint ett_x2ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-x2ap-ett.c ---*/ -#line 71 "packet-x2ap-template.c" +#line 71 "../../asn1/x2ap/packet-x2ap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -600,7 +600,7 @@ void proto_reg_handoff_x2ap(void); /*--- Included file: packet-x2ap-fn.c ---*/ -#line 1 "packet-x2ap-fn.c" +#line 1 "../../asn1/x2ap/packet-x2ap-fn.c" static const value_string x2ap_Criticality_vals[] = { { 0, "reject" }, @@ -683,13 +683,13 @@ static const value_string x2ap_ProcedureCode_vals[] = { static int dissect_x2ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 67 "x2ap.cnf" +#line 67 "../../asn1/x2ap/x2ap.cnf" ProcedureCode = 0xFFFF; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 61 "x2ap.cnf" +#line 61 "../../asn1/x2ap/x2ap.cnf" col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(ProcedureCode, x2ap_ProcedureCode_vals, "unknown message")); @@ -768,7 +768,7 @@ dissect_x2ap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, maxProtocolIEs, &ProtocolIE_ID, FALSE); -#line 50 "x2ap.cnf" +#line 50 "../../asn1/x2ap/x2ap.cnf" if (tree) { proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(x2ap_ProtocolIE_ID_vals), "unknown (%d)")); } @@ -1036,7 +1036,7 @@ dissect_x2ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_x2ap_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 78 "x2ap.cnf" +#line 78 "../../asn1/x2ap/x2ap.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -1956,7 +1956,7 @@ dissect_x2ap_GlobalENB_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static int dissect_x2ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 111 "x2ap.cnf" +#line 111 "../../asn1/x2ap/x2ap.cnf" tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; @@ -2689,7 +2689,7 @@ dissect_x2ap_ReportCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 136 "x2ap.cnf" +#line 136 "../../asn1/x2ap/x2ap.cnf" tvbuff_t *parameter_tvb=NULL; gint32 start_offset; @@ -2891,7 +2891,7 @@ dissect_x2ap_SubscriberProfileIDforRFP(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_x2ap_TargeteNBtoSource_eNBTransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 91 "x2ap.cnf" +#line 91 "../../asn1/x2ap/x2ap.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4577,7 +4577,7 @@ static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-x2ap-fn.c ---*/ -#line 92 "packet-x2ap-template.c" +#line 92 "../../asn1/x2ap/packet-x2ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -4637,7 +4637,7 @@ void proto_register_x2ap(void) { /*--- Included file: packet-x2ap-hfarr.c ---*/ -#line 1 "packet-x2ap-hfarr.c" +#line 1 "../../asn1/x2ap/packet-x2ap-hfarr.c" { &hf_x2ap_Cause_PDU, { "Cause", "x2ap.Cause", FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0, @@ -5704,7 +5704,7 @@ void proto_register_x2ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 150 "packet-x2ap-template.c" +#line 150 "../../asn1/x2ap/packet-x2ap-template.c" }; /* List of subtrees */ @@ -5713,7 +5713,7 @@ void proto_register_x2ap(void) { &ett_x2ap_TransportLayerAddress, /*--- Included file: packet-x2ap-ettarr.c ---*/ -#line 1 "packet-x2ap-ettarr.c" +#line 1 "../../asn1/x2ap/packet-x2ap-ettarr.c" &ett_x2ap_PrivateIE_ID, &ett_x2ap_ProtocolIE_Container, &ett_x2ap_ProtocolIE_Field, @@ -5836,7 +5836,7 @@ void proto_register_x2ap(void) { &ett_x2ap_UnsuccessfulOutcome, /*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 157 "packet-x2ap-template.c" +#line 157 "../../asn1/x2ap/packet-x2ap-template.c" }; module_t *x2ap_module; @@ -5884,7 +5884,7 @@ proto_reg_handoff_x2ap(void) Initialized=TRUE; /*--- Included file: packet-x2ap-dis-tab.c ---*/ -#line 1 "packet-x2ap-dis-tab.c" +#line 1 "../../asn1/x2ap/packet-x2ap-dis-tab.c" dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_Item, new_create_dissector_handle(dissect_E_RABs_Admitted_Item_PDU, proto_x2ap)); dissector_add_uint("x2ap.ies", id_E_RABs_Admitted_List, new_create_dissector_handle(dissect_E_RABs_Admitted_List_PDU, proto_x2ap)); dissector_add_uint("x2ap.ies", id_E_RAB_Item, new_create_dissector_handle(dissect_E_RAB_Item_PDU, proto_x2ap)); @@ -5976,7 +5976,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 203 "packet-x2ap-template.c" +#line 203 "../../asn1/x2ap/packet-x2ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, x2ap_handle); diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 5994cb6737..636803ae13 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -5,7 +5,7 @@ /* Input file: packet-x509af-template.c */ -#line 1 "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 @@ -57,7 +57,7 @@ static int hf_x509af_algorithm_id = -1; static int hf_x509af_extension_id = -1; /*--- Included file: packet-x509af-hf.c ---*/ -#line 1 "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_CertificatePair_PDU = -1; /* CertificatePair */ static int hf_x509af_CertificateList_PDU = -1; /* CertificateList */ @@ -134,13 +134,13 @@ static int hf_x509af_q = -1; /* INTEGER */ static int hf_x509af_g = -1; /* INTEGER */ /*--- End of included file: packet-x509af-hf.c ---*/ -#line 51 "packet-x509af-template.c" +#line 51 "../../asn1/x509af/packet-x509af-template.c" /* Initialize the subtree pointers */ static gint ett_pkix_crl = -1; /*--- Included file: packet-x509af-ett.c ---*/ -#line 1 "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; @@ -175,14 +175,14 @@ static gint ett_x509af_SET_OF_AttributeType = -1; static gint ett_x509af_DSS_Params = -1; /*--- End of included file: packet-x509af-ett.c ---*/ -#line 55 "packet-x509af-template.c" +#line 55 "../../asn1/x509af/packet-x509af-template.c" static const char *algorithm_id; static const char *extension_id; /*--- Included file: packet-x509af-fn.c ---*/ -#line 1 "packet-x509af-fn.c" +#line 1 "../../asn1/x509af/packet-x509af-fn.c" const value_string x509af_Version_vals[] = { { 0, "v1" }, @@ -214,7 +214,7 @@ dissect_x509af_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 70 "x509af.cnf" +#line 70 "../../asn1/x509af/x509af.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id); @@ -235,7 +235,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_x509af_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 81 "x509af.cnf" +#line 81 "../../asn1/x509af/x509af.cnf" offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree); @@ -326,7 +326,7 @@ static const ber_choice_t SubjectName_choice[] = { static int dissect_x509af_SubjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 108 "x509af.cnf" +#line 108 "../../asn1/x509af/x509af.cnf" const char* str; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -372,7 +372,7 @@ dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 87 "x509af.cnf" +#line 87 "../../asn1/x509af/x509af.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, &extension_id); @@ -402,7 +402,7 @@ dissect_x509af_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_x509af_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 98 "x509af.cnf" +#line 98 "../../asn1/x509af/x509af.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -889,7 +889,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-x509af-fn.c ---*/ -#line 60 "packet-x509af-template.c" +#line 60 "../../asn1/x509af/packet-x509af-template.c" const char *x509af_get_last_algorithm_id(void) { return algorithm_id; @@ -932,7 +932,7 @@ void proto_register_x509af(void) { NULL, HFILL }}, /*--- Included file: packet-x509af-hfarr.c ---*/ -#line 1 "packet-x509af-hfarr.c" +#line 1 "../../asn1/x509af/packet-x509af-hfarr.c" { &hf_x509af_x509af_Certificate_PDU, { "Certificate", "x509af.Certificate", FT_NONE, BASE_NONE, NULL, 0, @@ -1231,7 +1231,7 @@ void proto_register_x509af(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 101 "packet-x509af-template.c" +#line 101 "../../asn1/x509af/packet-x509af-template.c" }; /* List of subtrees */ @@ -1239,7 +1239,7 @@ void proto_register_x509af(void) { &ett_pkix_crl, /*--- Included file: packet-x509af-ettarr.c ---*/ -#line 1 "packet-x509af-ettarr.c" +#line 1 "../../asn1/x509af/packet-x509af-ettarr.c" &ett_x509af_Certificate, &ett_x509af_T_signedCertificate, &ett_x509af_SubjectName, @@ -1274,7 +1274,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 107 "packet-x509af-template.c" +#line 107 "../../asn1/x509af/packet-x509af-template.c" }; /* Register protocol */ @@ -1304,7 +1304,7 @@ void proto_reg_handoff_x509af(void) { /*--- Included file: packet-x509af-dis-tab.c ---*/ -#line 1 "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"); @@ -1316,7 +1316,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 135 "packet-x509af-template.c" +#line 135 "../../asn1/x509af/packet-x509af-template.c" /*XXX these should really go to a better place but since that I have not that ITU standard, ill put it here for the time diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index a619d5ee06..5cd8db1808 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -5,7 +5,7 @@ /* Input file: packet-x509af-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-x509af-exp.h ---*/ -#line 1 "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_); @@ -64,7 +64,7 @@ int dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbu void dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-x509af-exp.h ---*/ -#line 30 "packet-x509af-template.h" +#line 30 "../../asn1/x509af/packet-x509af-template.h" extern const char* x509af_get_last_algorithm_id(void); diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 29425c0d67..aecdb33977 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -5,7 +5,7 @@ /* Input file: packet-x509ce-template.c */ -#line 1 "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 @@ -58,7 +58,7 @@ static int hf_x509ce_object_identifier_id = -1; static int hf_x509ce_IPAddress = -1; /*--- Included file: packet-x509ce-hf.c ---*/ -#line 1 "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 */ @@ -253,12 +253,12 @@ static int hf_x509ce_EntrustInfoFlags_webCategory = -1; static int hf_x509ce_EntrustInfoFlags_sETCategory = -1; /*--- End of included file: packet-x509ce-hf.c ---*/ -#line 52 "packet-x509ce-template.c" +#line 52 "../../asn1/x509ce/packet-x509ce-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-x509ce-ett.c ---*/ -#line 1 "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; @@ -320,13 +320,13 @@ static gint ett_x509ce_EntrustVersionInfo = -1; static gint ett_x509ce_EntrustInfoFlags = -1; /*--- End of included file: packet-x509ce-ett.c ---*/ -#line 55 "packet-x509ce-template.c" +#line 55 "../../asn1/x509ce/packet-x509ce-template.c" static const char *object_identifier_id; /*--- Included file: packet-x509ce-fn.c ---*/ -#line 1 "packet-x509ce-fn.c" +#line 1 "../../asn1/x509ce/packet-x509ce-fn.c" int @@ -350,7 +350,7 @@ dissect_x509ce_OtherNameType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_x509ce_OtherNameValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 172 "x509ce.cnf" +#line 172 "../../asn1/x509ce/x509ce.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -407,7 +407,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t * actx, tree, tvb, offset, hf_index, NULL); -#line 175 "x509ce.cnf" +#line 175 "../../asn1/x509ce/x509ce.cnf" PROTO_ITEM_SET_URL(actx->created_item); @@ -419,7 +419,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t * static int dissect_x509ce_T_iPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 165 "x509ce.cnf" +#line 165 "../../asn1/x509ce/x509ce.cnf" proto_tree_add_item(tree, hf_x509ce_IPAddress, tvb, offset, 4, FALSE); offset+=4; @@ -602,7 +602,7 @@ dissect_x509ce_T_policyQualifierId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_x509ce_T_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_) { -#line 162 "x509ce.cnf" +#line 162 "../../asn1/x509ce/x509ce.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1814,7 +1814,7 @@ static void dissect_EntrustVersionInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-x509ce-fn.c ---*/ -#line 59 "packet-x509ce-template.c" +#line 59 "../../asn1/x509ce/packet-x509ce-template.c" static void @@ -1856,7 +1856,7 @@ void proto_register_x509ce(void) { /*--- Included file: packet-x509ce-hfarr.c ---*/ -#line 1 "packet-x509ce-hfarr.c" +#line 1 "../../asn1/x509ce/packet-x509ce-hfarr.c" { &hf_x509ce_AuthorityKeyIdentifier_PDU, { "AuthorityKeyIdentifier", "x509ce.AuthorityKeyIdentifier", FT_NONE, BASE_NONE, NULL, 0, @@ -2623,14 +2623,14 @@ void proto_register_x509ce(void) { NULL, HFILL }}, /*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 99 "packet-x509ce-template.c" +#line 99 "../../asn1/x509ce/packet-x509ce-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-x509ce-ettarr.c ---*/ -#line 1 "packet-x509ce-ettarr.c" +#line 1 "../../asn1/x509ce/packet-x509ce-ettarr.c" &ett_x509ce_AuthorityKeyIdentifier, &ett_x509ce_KeyUsage, &ett_x509ce_KeyPurposeIDs, @@ -2692,7 +2692,7 @@ void proto_register_x509ce(void) { &ett_x509ce_EntrustInfoFlags, /*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 104 "packet-x509ce-template.c" +#line 104 "../../asn1/x509ce/packet-x509ce-template.c" }; /* Register protocol */ @@ -2709,7 +2709,7 @@ void proto_register_x509ce(void) { void proto_reg_handoff_x509ce(void) { /*--- Included file: packet-x509ce-dis-tab.c ---*/ -#line 1 "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"); @@ -2755,7 +2755,7 @@ void proto_reg_handoff_x509ce(void) { /*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 119 "packet-x509ce-template.c" +#line 119 "../../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"); } diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h index d04ee652c5..4b70139690 100644 --- a/epan/dissectors/packet-x509ce.h +++ b/epan/dissectors/packet-x509ce.h @@ -5,7 +5,7 @@ /* Input file: packet-x509ce-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-x509ce-exp.h ---*/ -#line 1 "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[]; @@ -97,7 +97,7 @@ int dissect_x509ce_CertificateListAssertion(gboolean implicit_tag _U_, tvbuff_t int dissect_x509ce_PkiPathMatchSyntax(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 30 "packet-x509ce-template.h" +#line 30 "../../asn1/x509ce/packet-x509ce-template.h" #endif /* PACKET_X509CE_H */ diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index e9fe185ef0..b34d72aafe 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -5,7 +5,7 @@ /* Input file: packet-x509sat-template.c */ -#line 1 "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 @@ -53,7 +53,7 @@ static int proto_x509sat = -1; /*--- Included file: packet-x509sat-hf.c ---*/ -#line 1 "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 */ @@ -221,12 +221,12 @@ 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 47 "packet-x509sat-template.c" +#line 47 "../../asn1/x509sat/packet-x509sat-template.c" /* Initialize the subtree pointers */ /*--- Included file: packet-x509sat-ett.c ---*/ -#line 1 "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; @@ -276,11 +276,11 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 50 "packet-x509sat-template.c" +#line 50 "../../asn1/x509sat/packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ -#line 1 "packet-x509sat-fn.c" +#line 1 "../../asn1/x509sat/packet-x509sat-fn.c" /*--- Cyclic dependencies ---*/ /* Criteria -> Criteria/and -> Criteria */ @@ -1506,7 +1506,7 @@ dissect_x509sat_SyntaxIA5String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 351 "x509sat.cnf" +#line 351 "../../asn1/x509sat/x509sat.cnf" tvbuff_t *wide_tvb = NULL; char *string; @@ -1514,7 +1514,7 @@ dissect_x509sat_SyntaxBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in actx, tree, tvb, offset, hf_index, &wide_tvb); -#line 356 "x509sat.cnf" +#line 356 "../../asn1/x509sat/x509sat.cnf" if (! wide_tvb) { return offset; } @@ -1628,7 +1628,7 @@ dissect_x509sat_SyntaxGeneralString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_x509sat_GUID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 365 "x509sat.cnf" +#line 365 "../../asn1/x509sat/x509sat.cnf" gint8 class; gboolean pc; gint32 tag; @@ -1845,7 +1845,7 @@ static void dissect_GUID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr /*--- End of included file: packet-x509sat-fn.c ---*/ -#line 52 "packet-x509sat-template.c" +#line 52 "../../asn1/x509sat/packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -1855,7 +1855,7 @@ void proto_register_x509sat(void) { static hf_register_info hf[] = { /*--- Included file: packet-x509sat-hfarr.c ---*/ -#line 1 "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, @@ -2514,14 +2514,14 @@ void proto_register_x509sat(void) { NULL, HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 60 "packet-x509sat-template.c" +#line 60 "../../asn1/x509sat/packet-x509sat-template.c" }; /* List of subtrees */ static gint *ett[] = { /*--- Included file: packet-x509sat-ettarr.c ---*/ -#line 1 "packet-x509sat-ettarr.c" +#line 1 "../../asn1/x509sat/packet-x509sat-ettarr.c" &ett_x509sat_DirectoryString, &ett_x509sat_Guide, &ett_x509sat_Criteria, @@ -2571,7 +2571,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 65 "packet-x509sat-template.c" +#line 65 "../../asn1/x509sat/packet-x509sat-template.c" }; /* Register protocol */ @@ -2583,7 +2583,7 @@ void proto_register_x509sat(void) { /*--- Included file: packet-x509sat-syn-reg.c ---*/ -#line 1 "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); @@ -2624,7 +2624,7 @@ void proto_register_x509sat(void) { register_ber_syntax_dissector("X121Address", proto_x509sat, dissect_X121Address_PDU); /*--- End of included file: packet-x509sat-syn-reg.c ---*/ -#line 75 "packet-x509sat-template.c" +#line 75 "../../asn1/x509sat/packet-x509sat-template.c" } @@ -2633,7 +2633,7 @@ void proto_register_x509sat(void) { void proto_reg_handoff_x509sat(void) { /*--- Included file: packet-x509sat-dis-tab.c ---*/ -#line 1 "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"); @@ -2791,7 +2791,7 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 82 "packet-x509sat-template.c" +#line 82 "../../asn1/x509sat/packet-x509sat-template.c" /* OBJECT CLASSES */ diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index d0c2df7c42..f4aff4ce7f 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -5,7 +5,7 @@ /* Input file: packet-x509sat-template.h */ -#line 1 "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 @@ -36,7 +36,7 @@ /*--- Included file: packet-x509sat-exp.h ---*/ -#line 1 "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[]; @@ -75,7 +75,7 @@ int dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _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 30 "packet-x509sat-template.h" +#line 30 "../../asn1/x509sat/packet-x509sat-template.h" #endif /* PACKET_X509SAT_H */ -- cgit v1.2.3