diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-18 15:19:48 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-18 17:47:40 +0000 |
commit | d9d6106044065ed748748ba2135a9ac3cd6c5108 (patch) | |
tree | f0eb8d1016998eb008b603a393e344560916a4d6 /epan | |
parent | 47726eafe572686e5b36ea2e8798096cf1a07bf9 (diff) |
ASN.1: update auto generated dissectors
Change-Id: Ic73e72b3d2e7590eaed07f6eb30f74f4303e7a65
Reviewed-on: https://code.wireshark.org/review/25880
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
145 files changed, 650 insertions, 650 deletions
diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index 881aaeb09f..155a1ae265 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -354,7 +354,7 @@ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ /*--- End of included file: packet-HI2Operations-hf.c ---*/ -#line 43 "./asn1/HI2Operations/packet-HI2Operations-template.c" +#line 31 "./asn1/HI2Operations/packet-HI2Operations-template.c" /* Initialize the subtree pointers */ @@ -464,7 +464,7 @@ static gint ett_HI2Operations_TETRACGIType = -1; static gint ett_HI2Operations_TSIType = -1; /*--- End of included file: packet-HI2Operations-ett.c ---*/ -#line 46 "./asn1/HI2Operations/packet-HI2Operations-template.c" +#line 34 "./asn1/HI2Operations/packet-HI2Operations-template.c" /*--- Included file: packet-HI2Operations-fn.c ---*/ @@ -3755,7 +3755,7 @@ static int dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-HI2Operations-fn.c ---*/ -#line 48 "./asn1/HI2Operations/packet-HI2Operations-template.c" +#line 36 "./asn1/HI2Operations/packet-HI2Operations-template.c" /*--- proto_register_HI2Operations ----------------------------------------------*/ @@ -5024,7 +5024,7 @@ void proto_register_HI2Operations(void) { "SSIType", HFILL }}, /*--- End of included file: packet-HI2Operations-hfarr.c ---*/ -#line 56 "./asn1/HI2Operations/packet-HI2Operations-template.c" +#line 44 "./asn1/HI2Operations/packet-HI2Operations-template.c" }; /* List of subtrees */ @@ -5136,7 +5136,7 @@ void proto_register_HI2Operations(void) { &ett_HI2Operations_TSIType, /*--- End of included file: packet-HI2Operations-ettarr.c ---*/ -#line 61 "./asn1/HI2Operations/packet-HI2Operations-template.c" +#line 49 "./asn1/HI2Operations/packet-HI2Operations-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 436ab4a329..6735248009 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -136,7 +136,7 @@ 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 52 "./asn1/acp133/packet-acp133-template.c" +#line 40 "./asn1/acp133/packet-acp133-template.c" /* Initialize the subtree pointers */ static gint ett_acp133 = -1; @@ -165,7 +165,7 @@ static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; /*--- End of included file: packet-acp133-ett.c ---*/ -#line 56 "./asn1/acp133/packet-acp133-template.c" +#line 44 "./asn1/acp133/packet-acp133-template.c" /*--- Included file: packet-acp133-fn.c ---*/ @@ -1208,7 +1208,7 @@ static int dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-acp133-fn.c ---*/ -#line 58 "./asn1/acp133/packet-acp133-template.c" +#line 46 "./asn1/acp133/packet-acp133-template.c" /*--- proto_register_acp133 -------------------------------------------*/ @@ -1566,7 +1566,7 @@ void proto_register_acp133(void) { NULL, HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 67 "./asn1/acp133/packet-acp133-template.c" +#line 55 "./asn1/acp133/packet-acp133-template.c" }; /* List of subtrees */ @@ -1597,7 +1597,7 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_ExtendedContentType, /*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 73 "./asn1/acp133/packet-acp133-template.c" +#line 61 "./asn1/acp133/packet-acp133-template.c" }; /* Register protocol */ @@ -1669,7 +1669,7 @@ void proto_reg_handoff_acp133(void) { /*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 89 "./asn1/acp133/packet-acp133-template.c" +#line 77 "./asn1/acp133/packet-acp133-template.c" /* X.402 Object Classes */ oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index ebd531488a..db455c402a 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -173,7 +173,7 @@ 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 68 "./asn1/acse/packet-acse-template.c" +#line 56 "./asn1/acse/packet-acse-template.c" static gint hf_acse_user_data = -1; /* Initialize the subtree pointers */ @@ -218,7 +218,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 73 "./asn1/acse/packet-acse-template.c" +#line 61 "./asn1/acse/packet-acse-template.c" static expert_field ei_acse_dissector_not_available = EI_INIT; static expert_field ei_acse_malformed = EI_INIT; @@ -1673,7 +1673,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ /*--- End of included file: packet-acse-fn.c ---*/ -#line 138 "./asn1/acse/packet-acse-template.c" +#line 126 "./asn1/acse/packet-acse-template.c" /* @@ -2219,7 +2219,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 251 "./asn1/acse/packet-acse-template.c" +#line 239 "./asn1/acse/packet-acse-template.c" }; /* List of subtrees */ @@ -2265,7 +2265,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 257 "./asn1/acse/packet-acse-template.c" +#line 245 "./asn1/acse/packet-acse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h index a40a04f105..aeab3033ad 100644 --- a/epan/dissectors/packet-acse.h +++ b/epan/dissectors/packet-acse.h @@ -36,7 +36,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 29 "./asn1/acse/packet-acse-template.h" +#line 17 "./asn1/acse/packet-acse-template.h" #endif /* PACKET_ACSE_H */ diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 9f720b950f..868ddf3dfa 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -873,7 +873,7 @@ static int hf_ansi_map_interSystemSMSDeliveryPointToPointRes = -1; /* InterSyst static int hf_ansi_map_qualificationRequest2Res = -1; /* QualificationRequest2Res */ /*--- End of included file: packet-ansi_map-hf.c ---*/ -#line 329 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 317 "./asn1/ansi_map/packet-ansi_map-template.c" /* Initialize the subtree pointers */ static gint ett_ansi_map = -1; @@ -1133,7 +1133,7 @@ static gint ett_ansi_map_InvokeData = -1; static gint ett_ansi_map_ReturnData = -1; /*--- End of included file: packet-ansi_map-ett.c ---*/ -#line 361 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 349 "./asn1/ansi_map/packet-ansi_map-template.c" static expert_field ei_ansi_map_nr_not_used = EI_INIT; static expert_field ei_ansi_map_unknown_invokeData_blob = EI_INIT; @@ -15261,7 +15261,7 @@ dissect_ansi_map_QualificationRequest2Res(gboolean implicit_tag _U_, tvbuff_t *t /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3628 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 3616 "./asn1/ansi_map/packet-ansi_map-template.c" /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 @@ -19209,7 +19209,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5383 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 5371 "./asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19470,7 +19470,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5416 "./asn1/ansi_map/packet-ansi_map-template.c" +#line 5404 "./asn1/ansi_map/packet-ansi_map-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 61de1c51f3..31ce01baff 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -113,7 +113,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 65 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 53 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -161,7 +161,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 86 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 74 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" #define MAX_SSN 254 @@ -1360,7 +1360,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int /*--- End of included file: packet-ansi_tcap-fn.c ---*/ -#line 315 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 303 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" @@ -1702,7 +1702,7 @@ proto_register_ansi_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-ansi_tcap-hfarr.c ---*/ -#line 448 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 436 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" }; /* Setup protocol subtree array */ @@ -1740,7 +1740,7 @@ proto_register_ansi_tcap(void) &ett_ansi_tcap_T_paramSet, /*--- End of included file: packet-ansi_tcap-ettarr.c ---*/ -#line 459 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 447 "./asn1/ansi_tcap/packet-ansi_tcap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-atn-cm.c b/epan/dissectors/packet-atn-cm.c index 337be47eb6..4f4dfaa7c9 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -92,7 +92,7 @@ static int hf_atn_cm_hours = -1; /* Timehours */ static int hf_atn_cm_minutes = -1; /* Timeminutes */ /*--- End of included file: packet-atn-cm-hf.c ---*/ -#line 55 "./asn1/atn-cm/packet-atn-cm-template.c" +#line 43 "./asn1/atn-cm/packet-atn-cm-template.c" /*--- Included file: packet-atn-cm-ett.c ---*/ @@ -114,7 +114,7 @@ static gint ett_atn_cm_ShortTsap = -1; static gint ett_atn_cm_Time = -1; /*--- End of included file: packet-atn-cm-ett.c ---*/ -#line 57 "./asn1/atn-cm/packet-atn-cm-template.c" +#line 45 "./asn1/atn-cm/packet-atn-cm-template.c" static gint ett_atn_cm = -1; @@ -617,7 +617,7 @@ static int dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-atn-cm-fn.c ---*/ -#line 60 "./asn1/atn-cm/packet-atn-cm-template.c" +#line 48 "./asn1/atn-cm/packet-atn-cm-template.c" static int proto_atn_cm = -1; static int @@ -917,7 +917,7 @@ void proto_register_atn_cm (void) "Timeminutes", HFILL }}, /*--- End of included file: packet-atn-cm-hfarr.c ---*/ -#line 195 "./asn1/atn-cm/packet-atn-cm-template.c" +#line 183 "./asn1/atn-cm/packet-atn-cm-template.c" }; static gint *ett[] = { @@ -940,7 +940,7 @@ void proto_register_atn_cm (void) &ett_atn_cm_Time, /*--- End of included file: packet-atn-cm-ettarr.c ---*/ -#line 198 "./asn1/atn-cm/packet-atn-cm-template.c" +#line 186 "./asn1/atn-cm/packet-atn-cm-template.c" &ett_atn_cm }; diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index 863f97d19a..26fe9613c1 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -695,7 +695,7 @@ static int hf_atn_cpdlc_windSpeedEnglish = -1; /* WindSpeedEnglish */ static int hf_atn_cpdlc_windSpeedMetric = -1; /* WindSpeedMetric */ /*--- End of included file: packet-atn-cpdlc-hf.c ---*/ -#line 97 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 85 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /*--- Included file: packet-atn-cpdlc-ett.c ---*/ @@ -844,7 +844,7 @@ static gint ett_atn_cpdlc_Winds = -1; static gint ett_atn_cpdlc_WindSpeed = -1; /*--- End of included file: packet-atn-cpdlc-ett.c ---*/ -#line 99 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 87 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" static gint ett_atn_cpdlc = -1; @@ -5295,7 +5295,7 @@ static int dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pin /*--- End of included file: packet-atn-cpdlc-fn.c ---*/ -#line 102 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 90 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /* Wireshark ID of CPDLC protocol */ static int proto_atn_cpdlc = -1; @@ -7919,7 +7919,7 @@ void proto_register_atn_cpdlc (void) NULL, HFILL }}, /*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 317 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 305 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" }; static gint *ett[] = { @@ -8070,7 +8070,7 @@ void proto_register_atn_cpdlc (void) &ett_atn_cpdlc_WindSpeed, /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 321 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 309 "./asn1/atn-cpdlc/packet-atn-cpdlc-template.c" &ett_atn_cpdlc }; diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index 337f272f88..c77c4521b4 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -260,7 +260,7 @@ static int hf_atn_ulcs_ACSE_requirements_authentication = -1; static int hf_atn_ulcs_ACSE_requirements_application_context_negotiation = -1; /*--- End of included file: packet-atn-ulcs-hf.c ---*/ -#line 190 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 178 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" /*--- Included file: packet-atn-ulcs-ett.c ---*/ @@ -292,7 +292,7 @@ static gint ett_atn_ulcs_RelativeDistinguishedName = -1; static gint ett_atn_ulcs_AttributeTypeAndValue = -1; /*--- End of included file: packet-atn-ulcs-ett.c ---*/ -#line 192 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 180 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" static gint ett_atn_ulcs = -1; static gint ett_atn_acse = -1; @@ -1583,7 +1583,7 @@ static int dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-atn-ulcs-fn.c ---*/ -#line 196 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 184 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" #if 0 /* re-implementing external data: packet-per.c */ @@ -2468,7 +2468,7 @@ void proto_register_atn_ulcs (void) NULL, HFILL }}, /*--- End of included file: packet-atn-ulcs-hfarr.c ---*/ -#line 788 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 776 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" {&hf_atn_ses_type, { "SPDU Type", "atn-ulcs.ses.type", @@ -2554,7 +2554,7 @@ void proto_register_atn_ulcs (void) &ett_atn_ulcs_AttributeTypeAndValue, /*--- End of included file: packet-atn-ulcs-ettarr.c ---*/ -#line 844 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 832 "./asn1/atn-ulcs/packet-atn-ulcs-template.c" &ett_atn_ses, &ett_atn_pres, &ett_atn_acse, diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 966fa95642..b7213dfdcd 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -106,7 +106,7 @@ static int hf_c1222_c1221_auth_request = -1; /* OCTET_STRING_SIZE_1_255 */ static int hf_c1222_c1221_auth_response = -1; /* OCTET_STRING_SIZE_CONSTR002 */ /*--- End of included file: packet-c1222-hf.c ---*/ -#line 84 "./asn1/c1222/packet-c1222-template.c" +#line 72 "./asn1/c1222/packet-c1222-template.c" /* These are the EPSEM pieces */ /* first, the flag components */ static int hf_c1222_epsem_flags = -1; @@ -211,7 +211,7 @@ static gint ett_c1222_Calling_authentication_value_c1222_U = -1; static gint ett_c1222_Calling_authentication_value_c1221_U = -1; /*--- End of included file: packet-c1222-ett.c ---*/ -#line 176 "./asn1/c1222/packet-c1222-template.c" +#line 164 "./asn1/c1222/packet-c1222-template.c" static expert_field ei_c1222_command_truncated = EI_INIT; static expert_field ei_c1222_bad_checksum = EI_INIT; @@ -1520,7 +1520,7 @@ static int dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-c1222-fn.c ---*/ -#line 1016 "./asn1/c1222/packet-c1222-template.c" +#line 1004 "./asn1/c1222/packet-c1222-template.c" /** * Dissects a a full (reassembled) C12.22 message. @@ -1912,7 +1912,7 @@ void proto_register_c1222(void) { "OCTET_STRING_SIZE_CONSTR002", HFILL }}, /*--- End of included file: packet-c1222-hfarr.c ---*/ -#line 1303 "./asn1/c1222/packet-c1222-template.c" +#line 1291 "./asn1/c1222/packet-c1222-template.c" }; /* List of subtrees */ @@ -1935,7 +1935,7 @@ void proto_register_c1222(void) { &ett_c1222_Calling_authentication_value_c1221_U, /*--- End of included file: packet-c1222-ettarr.c ---*/ -#line 1313 "./asn1/c1222/packet-c1222-template.c" +#line 1301 "./asn1/c1222/packet-c1222-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index d0660ccd93..62092f2210 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -598,7 +598,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 115 "./asn1/camel/packet-camel-template.c" +#line 103 "./asn1/camel/packet-camel-template.c" static struct camelsrt_info_t * gp_camelsrt_info; @@ -831,7 +831,7 @@ static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 147 "./asn1/camel/packet-camel-template.c" +#line 135 "./asn1/camel/packet-camel-template.c" static expert_field ei_camel_unknown_invokeData = EI_INIT; static expert_field ei_camel_unknown_returnResultData = EI_INIT; @@ -1178,7 +1178,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define noInvokeId NULL /*--- End of included file: packet-camel-val.h ---*/ -#line 309 "./asn1/camel/packet-camel-template.c" +#line 297 "./asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table.c ---*/ @@ -1268,7 +1268,7 @@ static const value_string camel_err_code_string_vals[] = { /*--- End of included file: packet-camel-table.c ---*/ -#line 311 "./asn1/camel/packet-camel-template.c" +#line 299 "./asn1/camel/packet-camel-template.c" /* * DEBUG fonctions @@ -7152,7 +7152,7 @@ static int dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-camel-fn.c ---*/ -#line 412 "./asn1/camel/packet-camel-template.c" +#line 400 "./asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table2.c ---*/ @@ -7359,7 +7359,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-camel-table2.c ---*/ -#line 414 "./asn1/camel/packet-camel-template.c" +#line 402 "./asn1/camel/packet-camel-template.c" /* * Functions needed for Hash-Table @@ -8272,7 +8272,7 @@ void proto_reg_handoff_camel(void) { /*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 1319 "./asn1/camel/packet-camel-template.c" +#line 1307 "./asn1/camel/packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback, NULL); wmem_free(wmem_epan_scope(), ssn_range); @@ -10394,7 +10394,7 @@ void proto_register_camel(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 1492 "./asn1/camel/packet-camel-template.c" +#line 1480 "./asn1/camel/packet-camel-template.c" }; /* List of subtrees */ @@ -10612,7 +10612,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 1509 "./asn1/camel/packet-camel-template.c" +#line 1497 "./asn1/camel/packet-camel-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index 423190212c..788ea7a17a 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -67,7 +67,7 @@ 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 61 "./asn1/cdt/packet-cdt-template.c" +#line 49 "./asn1/cdt/packet-cdt-template.c" /* Initialize the subtree pointers */ @@ -79,7 +79,7 @@ static gint ett_cdt_CompressedContentInfo = -1; static gint ett_cdt_T_contentType = -1; /*--- End of included file: packet-cdt-ett.c ---*/ -#line 64 "./asn1/cdt/packet-cdt-template.c" +#line 52 "./asn1/cdt/packet-cdt-template.c" static expert_field ei_cdt_unable_compress_content = EI_INIT; static expert_field ei_cdt_unable_uncompress_content = EI_INIT; @@ -324,7 +324,7 @@ static int dissect_CompressedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-cdt-fn.c ---*/ -#line 69 "./asn1/cdt/packet-cdt-template.c" +#line 57 "./asn1/cdt/packet-cdt-template.c" /*--- proto_register_cdt -------------------------------------------*/ @@ -397,7 +397,7 @@ void proto_register_cdt (void) { NULL, HFILL }}, /*--- End of included file: packet-cdt-hfarr.c ---*/ -#line 101 "./asn1/cdt/packet-cdt-template.c" +#line 89 "./asn1/cdt/packet-cdt-template.c" }; /* List of subtrees */ @@ -411,7 +411,7 @@ void proto_register_cdt (void) { &ett_cdt_T_contentType, /*--- End of included file: packet-cdt-ettarr.c ---*/ -#line 106 "./asn1/cdt/packet-cdt-template.c" +#line 94 "./asn1/cdt/packet-cdt-template.c" }; static ei_register_info ei[] = { @@ -441,5 +441,5 @@ void proto_reg_handoff_cdt (void) { /*--- End of included file: packet-cdt-dis-tab.c ---*/ -#line 129 "./asn1/cdt/packet-cdt-template.c" +#line 117 "./asn1/cdt/packet-cdt-template.c" } diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h index 23217940bf..63d6097c21 100644 --- a/epan/dissectors/packet-cdt.h +++ b/epan/dissectors/packet-cdt.h @@ -29,7 +29,7 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); 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 31 "./asn1/cdt/packet-cdt-template.h" +#line 19 "./asn1/cdt/packet-cdt-template.h" #endif /* PACKET_CDT_H */ diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index b3377fd46a..d811d667a4 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -103,7 +103,7 @@ 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 44 "./asn1/charging_ase/packet-charging_ase-template.c" +#line 32 "./asn1/charging_ase/packet-charging_ase-template.c" static int ett_charging_ase = -1; @@ -141,7 +141,7 @@ 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 47 "./asn1/charging_ase/packet-charging_ase-template.c" +#line 35 "./asn1/charging_ase/packet-charging_ase-template.c" static expert_field ei_charging_ase_extensions_not_dissected = EI_INIT; @@ -829,7 +829,7 @@ int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-charging_ase-fn.c ---*/ -#line 53 "./asn1/charging_ase/packet-charging_ase-template.c" +#line 41 "./asn1/charging_ase/packet-charging_ase-template.c" static int dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -1102,7 +1102,7 @@ proto_register_charging_ase(void) NULL, HFILL }}, /*--- End of included file: packet-charging_ase-hfarr.c ---*/ -#line 77 "./asn1/charging_ase/packet-charging_ase-template.c" +#line 65 "./asn1/charging_ase/packet-charging_ase-template.c" }; /* List of subtrees */ @@ -1143,7 +1143,7 @@ proto_register_charging_ase(void) &ett_charging_ase_ChargingReferenceIdentification, /*--- End of included file: packet-charging_ase-ettarr.c ---*/ -#line 83 "./asn1/charging_ase/packet-charging_ase-template.c" +#line 71 "./asn1/charging_ase/packet-charging_ase-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-charging_ase.h b/epan/dissectors/packet-charging_ase.h index ce493895b6..05781b4d1e 100644 --- a/epan/dissectors/packet-charging_ase.h +++ b/epan/dissectors/packet-charging_ase.h @@ -27,6 +27,6 @@ int dissect_charging_ase_ChargingMessageType(gboolean implicit_tag _U_, tvbuff_t int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-charging_ase-exp.h ---*/ -#line 27 "./asn1/charging_ase/packet-charging_ase-template.h" +#line 15 "./asn1/charging_ase/packet-charging_ase-template.h" #endif /* PACKET_CHARGING_ASE_H */ diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 4942cfa00b..588e8a23e2 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -331,7 +331,7 @@ 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 58 "./asn1/cmip/packet-cmip-template.c" +#line 46 "./asn1/cmip/packet-cmip-template.c" /* Initialize the subtree pointers */ static gint ett_cmip = -1; @@ -461,7 +461,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 62 "./asn1/cmip/packet-cmip-template.c" +#line 50 "./asn1/cmip/packet-cmip-template.c" static expert_field ei_wrong_spdu_type = EI_INIT; @@ -524,7 +524,7 @@ static const value_string cmip_error_code_vals[] = { /*--- End of included file: packet-cmip-table.c ---*/ -#line 73 "./asn1/cmip/packet-cmip-template.c" +#line 61 "./asn1/cmip/packet-cmip-template.c" static int opcode_type; #define OPCODE_INVOKE 1 @@ -623,7 +623,7 @@ static const char *object_identifier_id; #define noInvokeId NULL /*--- End of included file: packet-cmip-val.h ---*/ -#line 83 "./asn1/cmip/packet-cmip-template.c" +#line 71 "./asn1/cmip/packet-cmip-template.c" /*--- Included file: packet-cmip-fn.c ---*/ #line 1 "./asn1/cmip/packet-cmip-fn.c" @@ -4458,7 +4458,7 @@ static int dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-cmip-fn.c ---*/ -#line 84 "./asn1/cmip/packet-cmip-template.c" +#line 72 "./asn1/cmip/packet-cmip-template.c" @@ -5655,7 +5655,7 @@ void proto_register_cmip(void) { NULL, HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 176 "./asn1/cmip/packet-cmip-template.c" +#line 164 "./asn1/cmip/packet-cmip-template.c" }; /* List of subtrees */ @@ -5787,7 +5787,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 182 "./asn1/cmip/packet-cmip-template.c" +#line 170 "./asn1/cmip/packet-cmip-template.c" }; static ei_register_info ei[] = { @@ -5882,7 +5882,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 201 "./asn1/cmip/packet-cmip-template.c" +#line 189 "./asn1/cmip/packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", proto_cmip, FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index 02bf9b46a6..53d657f864 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -43,7 +43,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 28 "./asn1/cmip/packet-cmip-template.h" +#line 16 "./asn1/cmip/packet-cmip-template.h" #endif /* PACKET_CMIP_H */ diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index d175ecc493..1c741e9bb6 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -222,7 +222,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 67 "./asn1/cmp/packet-cmp-template.c" +#line 55 "./asn1/cmp/packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; @@ -278,7 +278,7 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 71 "./asn1/cmp/packet-cmp-template.c" +#line 59 "./asn1/cmp/packet-cmp-template.c" /*--- Included file: packet-cmp-fn.c ---*/ #line 1 "./asn1/cmp/packet-cmp-fn.c" @@ -1470,7 +1470,7 @@ static int dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-cmp-fn.c ---*/ -#line 72 "./asn1/cmp/packet-cmp-template.c" +#line 60 "./asn1/cmp/packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -2350,7 +2350,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 319 "./asn1/cmp/packet-cmp-template.c" +#line 307 "./asn1/cmp/packet-cmp-template.c" }; /* List of subtrees */ @@ -2408,7 +2408,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 325 "./asn1/cmp/packet-cmp-template.c" +#line 313 "./asn1/cmp/packet-cmp-template.c" }; module_t *cmp_module; @@ -2495,7 +2495,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 390 "./asn1/cmp/packet-cmp-template.c" +#line 378 "./asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index 9ef1896d77..24c31f0f91 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -69,7 +69,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 30 "./asn1/cmp/packet-cmp-template.h" +#line 18 "./asn1/cmp/packet-cmp-template.h" #endif /* PACKET_CMP_H */ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index b604814d6f..c62c92be44 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -220,7 +220,7 @@ static int hf_cms_config_item = -1; /* CurrentFWConfig */ static int hf_cms_msgDigest = -1; /* OCTET_STRING */ /*--- End of included file: packet-cms-hf.c ---*/ -#line 51 "./asn1/cms/packet-cms-template.c" +#line 39 "./asn1/cms/packet-cms-template.c" /* Initialize the subtree pointers */ @@ -304,7 +304,7 @@ static gint ett_cms_HardwareModuleName = -1; static gint ett_cms_FirmwarePackageMessageDigest = -1; /*--- End of included file: packet-cms-ett.c ---*/ -#line 54 "./asn1/cms/packet-cms-template.c" +#line 42 "./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 */ @@ -2487,7 +2487,7 @@ static int dissect_FirmwarePackageMessageDigest_PDU(tvbuff_t *tvb _U_, packet_in /*--- End of included file: packet-cms-fn.c ---*/ -#line 114 "./asn1/cms/packet-cms-template.c" +#line 102 "./asn1/cms/packet-cms-template.c" /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -3191,7 +3191,7 @@ void proto_register_cms(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ -#line 125 "./asn1/cms/packet-cms-template.c" +#line 113 "./asn1/cms/packet-cms-template.c" }; /* List of subtrees */ @@ -3277,7 +3277,7 @@ void proto_register_cms(void) { &ett_cms_FirmwarePackageMessageDigest, /*--- End of included file: packet-cms-ettarr.c ---*/ -#line 130 "./asn1/cms/packet-cms-template.c" +#line 118 "./asn1/cms/packet-cms-template.c" }; /* Register protocol */ @@ -3337,7 +3337,7 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 153 "./asn1/cms/packet-cms-template.c" +#line 141 "./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 66eee11252..2ff60140a7 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -44,7 +44,7 @@ int dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i int dissect_cms_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-cms-exp.h ---*/ -#line 29 "./asn1/cms/packet-cms-template.h" +#line 17 "./asn1/cms/packet-cms-template.h" #endif /* PACKET_CMS_H */ diff --git a/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c index 15df371ec0..d4bc3abaad 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -73,7 +73,7 @@ static int hf_credssp_authInfo = -1; /* T_authInfo */ static int hf_credssp_pubKeyAuth = -1; /* OCTET_STRING */ /*--- End of included file: packet-credssp-hf.c ---*/ -#line 55 "./asn1/credssp/packet-credssp-template.c" +#line 43 "./asn1/credssp/packet-credssp-template.c" /* Initialize the subtree pointers */ static gint ett_credssp = -1; @@ -89,7 +89,7 @@ static gint ett_credssp_TSCredentials = -1; static gint ett_credssp_TSRequest = -1; /*--- End of included file: packet-credssp-ett.c ---*/ -#line 59 "./asn1/credssp/packet-credssp-template.c" +#line 47 "./asn1/credssp/packet-credssp-template.c" /*--- Included file: packet-credssp-fn.c ---*/ @@ -320,7 +320,7 @@ static int dissect_TSRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-credssp-fn.c ---*/ -#line 61 "./asn1/credssp/packet-credssp-template.c" +#line 49 "./asn1/credssp/packet-credssp-template.c" /* * Dissect CredSSP PDUs @@ -495,7 +495,7 @@ void proto_register_credssp(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-credssp-hfarr.c ---*/ -#line 147 "./asn1/credssp/packet-credssp-template.c" +#line 135 "./asn1/credssp/packet-credssp-template.c" }; /* List of subtrees */ @@ -513,7 +513,7 @@ void proto_register_credssp(void) { &ett_credssp_TSRequest, /*--- End of included file: packet-credssp-ettarr.c ---*/ -#line 153 "./asn1/credssp/packet-credssp-template.c" +#line 141 "./asn1/credssp/packet-credssp-template.c" }; diff --git a/epan/dissectors/packet-credssp.h b/epan/dissectors/packet-credssp.h index 9d67dabc9c..440b171622 100644 --- a/epan/dissectors/packet-credssp.h +++ b/epan/dissectors/packet-credssp.h @@ -25,7 +25,7 @@ #line 1 "./asn1/credssp/packet-credssp-val.h" /*--- End of included file: packet-credssp-val.h ---*/ -#line 28 "./asn1/credssp/packet-credssp-template.h" +#line 16 "./asn1/credssp/packet-credssp-template.h" void proto_reg_handoff_credssp(void); void proto_register_credssp(void); diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index a85140e843..366a5151da 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -124,7 +124,7 @@ static int hf_crmf_attributes = -1; /* Attributes */ static int hf_crmf_Attributes_item = -1; /* Attribute */ /*--- End of included file: packet-crmf-hf.c ---*/ -#line 47 "./asn1/crmf/packet-crmf-template.c" +#line 35 "./asn1/crmf/packet-crmf-template.c" /* Initialize the subtree pointers */ @@ -158,7 +158,7 @@ static gint ett_crmf_PrivateKeyInfo = -1; static gint ett_crmf_Attributes = -1; /*--- End of included file: packet-crmf-ett.c ---*/ -#line 50 "./asn1/crmf/packet-crmf-template.c" +#line 38 "./asn1/crmf/packet-crmf-template.c" /*--- Included file: packet-crmf-fn.c ---*/ #line 1 "./asn1/crmf/packet-crmf-fn.c" @@ -891,7 +891,7 @@ static int dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-crmf-fn.c ---*/ -#line 51 "./asn1/crmf/packet-crmf-template.c" +#line 39 "./asn1/crmf/packet-crmf-template.c" /*--- proto_register_crmf ----------------------------------------------*/ @@ -1228,7 +1228,7 @@ void proto_register_crmf(void) { NULL, HFILL }}, /*--- End of included file: packet-crmf-hfarr.c ---*/ -#line 63 "./asn1/crmf/packet-crmf-template.c" +#line 51 "./asn1/crmf/packet-crmf-template.c" }; /* List of subtrees */ @@ -1264,7 +1264,7 @@ void proto_register_crmf(void) { &ett_crmf_Attributes, /*--- End of included file: packet-crmf-ettarr.c ---*/ -#line 68 "./asn1/crmf/packet-crmf-template.c" +#line 56 "./asn1/crmf/packet-crmf-template.c" }; /* Register protocol */ @@ -1298,6 +1298,6 @@ void proto_reg_handoff_crmf(void) { /*--- End of included file: packet-crmf-dis-tab.c ---*/ -#line 86 "./asn1/crmf/packet-crmf-template.c" +#line 74 "./asn1/crmf/packet-crmf-template.c" } diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h index 98a9d2327e..7ff68b0ec1 100644 --- a/epan/dissectors/packet-crmf.h +++ b/epan/dissectors/packet-crmf.h @@ -60,7 +60,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 28 "./asn1/crmf/packet-crmf-template.h" +#line 16 "./asn1/crmf/packet-crmf-template.h" #endif /* PACKET_CRMF_H */ diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 1655430893..18b09b7a30 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -463,7 +463,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 61 "./asn1/dap/packet-dap-template.c" +#line 49 "./asn1/dap/packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; @@ -642,7 +642,7 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 65 "./asn1/dap/packet-dap-template.c" +#line 53 "./asn1/dap/packet-dap-template.c" static expert_field ei_dap_anonymous = EI_INIT; @@ -669,7 +669,7 @@ static expert_field ei_dap_anonymous = EI_INIT; #define id_errcode_dsaReferral 9 /*--- End of included file: packet-dap-val.h ---*/ -#line 69 "./asn1/dap/packet-dap-template.c" +#line 57 "./asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table.c ---*/ @@ -707,7 +707,7 @@ static const value_string dap_err_code_string_vals[] = { /*--- End of included file: packet-dap-table.c ---*/ -#line 71 "./asn1/dap/packet-dap-template.c" +#line 59 "./asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ @@ -4757,7 +4757,7 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-dap-fn.c ---*/ -#line 73 "./asn1/dap/packet-dap-template.c" +#line 61 "./asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table11.c ---*/ @@ -4789,7 +4789,7 @@ static const ros_opr_t dap_opr_tab[] = { /*--- End of included file: packet-dap-table11.c ---*/ -#line 75 "./asn1/dap/packet-dap-template.c" +#line 63 "./asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table21.c ---*/ #line 1 "./asn1/dap/packet-dap-table21.c" @@ -4818,7 +4818,7 @@ static const ros_err_t dap_err_tab[] = { /*--- End of included file: packet-dap-table21.c ---*/ -#line 76 "./asn1/dap/packet-dap-template.c" +#line 64 "./asn1/dap/packet-dap-template.c" static const ros_info_t dap_ros_info = { "DAP", @@ -6458,7 +6458,7 @@ void proto_register_dap(void) { NULL, HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 95 "./asn1/dap/packet-dap-template.c" +#line 83 "./asn1/dap/packet-dap-template.c" }; /* List of subtrees */ @@ -6639,7 +6639,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 101 "./asn1/dap/packet-dap-template.c" +#line 89 "./asn1/dap/packet-dap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-dap.h b/epan/dissectors/packet-dap.h index 81061dcbbf..c5b50cac19 100644 --- a/epan/dissectors/packet-dap.h +++ b/epan/dissectors/packet-dap.h @@ -94,6 +94,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 28 "./asn1/dap/packet-dap-template.h" +#line 16 "./asn1/dap/packet-dap-template.h" #endif /* PACKET_DAP_H */ diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 5bf2246805..e13d54fe8c 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -165,7 +165,7 @@ static int hf_disp_signedShadowError = -1; /* T_signedShadowError */ static int hf_disp_shadowError = -1; /* ShadowErrorData */ /*--- End of included file: packet-disp-hf.c ---*/ -#line 61 "./asn1/disp/packet-disp-template.c" +#line 49 "./asn1/disp/packet-disp-template.c" /* Initialize the subtree pointers */ static gint ett_disp = -1; @@ -228,7 +228,7 @@ static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; /*--- End of included file: packet-disp-ett.c ---*/ -#line 65 "./asn1/disp/packet-disp-template.c" +#line 53 "./asn1/disp/packet-disp-template.c" static expert_field ei_disp_unsupported_opcode = EI_INIT; static expert_field ei_disp_unsupported_errcode = EI_INIT; @@ -1467,7 +1467,7 @@ static int dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-disp-fn.c ---*/ -#line 74 "./asn1/disp/packet-disp-template.c" +#line 62 "./asn1/disp/packet-disp-template.c" /* * Dissect DISP PDUs inside a ROS PDUs @@ -2025,7 +2025,7 @@ void proto_register_disp(void) { "ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 199 "./asn1/disp/packet-disp-template.c" +#line 187 "./asn1/disp/packet-disp-template.c" }; /* List of subtrees */ @@ -2090,7 +2090,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 205 "./asn1/disp/packet-disp-template.c" +#line 193 "./asn1/disp/packet-disp-template.c" }; static ei_register_info ei[] = { @@ -2139,7 +2139,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 243 "./asn1/disp/packet-disp-template.c" +#line 231 "./asn1/disp/packet-disp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-disp.h b/epan/dissectors/packet-disp.h index ae5ac27b4a..947a96cec6 100644 --- a/epan/dissectors/packet-disp.h +++ b/epan/dissectors/packet-disp.h @@ -26,6 +26,6 @@ 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 28 "./asn1/disp/packet-disp-template.h" +#line 16 "./asn1/disp/packet-disp-template.h" #endif /* PACKET_DISP_H */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index f7e0a43c1c..63e2babbda 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -249,7 +249,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; /*--- End of included file: packet-dop-hf.c ---*/ -#line 61 "./asn1/dop/packet-dop-template.c" +#line 49 "./asn1/dop/packet-dop-template.c" /* Initialize the subtree pointers */ static gint ett_dop = -1; @@ -326,7 +326,7 @@ static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; /*--- End of included file: packet-dop-ett.c ---*/ -#line 66 "./asn1/dop/packet-dop-template.c" +#line 54 "./asn1/dop/packet-dop-template.c" static expert_field ei_dop_unknown_binding_parameter = EI_INIT; static expert_field ei_dop_unsupported_opcode = EI_INIT; @@ -2027,7 +2027,7 @@ static int dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-dop-fn.c ---*/ -#line 87 "./asn1/dop/packet-dop-template.c" +#line 75 "./asn1/dop/packet-dop-template.c" static int call_dop_oid_callback(const char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, const char *col_info, void* data) @@ -2944,7 +2944,7 @@ void proto_register_dop(void) { NULL, HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 239 "./asn1/dop/packet-dop-template.c" +#line 227 "./asn1/dop/packet-dop-template.c" }; /* List of subtrees */ @@ -3023,7 +3023,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 246 "./asn1/dop/packet-dop-template.c" +#line 234 "./asn1/dop/packet-dop-template.c" }; static ei_register_info ei[] = { @@ -3089,7 +3089,7 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 289 "./asn1/dop/packet-dop-template.c" +#line 277 "./asn1/dop/packet-dop-template.c" /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3"); diff --git a/epan/dissectors/packet-dop.h b/epan/dissectors/packet-dop.h index 8699e0fd1d..2ebcfeade5 100644 --- a/epan/dissectors/packet-dop.h +++ b/epan/dissectors/packet-dop.h @@ -28,6 +28,6 @@ int dissect_dop_SupplierAndConsumers(gboolean implicit_tag _U_, tvbuff_t *tvb _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 28 "./asn1/dop/packet-dop-template.h" +#line 16 "./asn1/dop/packet-dop-template.h" #endif /* PACKET_X501_H */ diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index d2083dc96c..7501207a13 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -189,7 +189,7 @@ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ /*--- End of included file: packet-dsp-hf.c ---*/ -#line 55 "./asn1/dsp/packet-dsp-template.c" +#line 43 "./asn1/dsp/packet-dsp-template.c" /* Initialize the subtree pointers */ static gint ett_dsp = -1; @@ -269,7 +269,7 @@ static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; /*--- End of included file: packet-dsp-ett.c ---*/ -#line 59 "./asn1/dsp/packet-dsp-template.c" +#line 47 "./asn1/dsp/packet-dsp-template.c" static expert_field ei_dsp_unsupported_opcode = EI_INIT; static expert_field ei_dsp_unsupported_errcode = EI_INIT; @@ -1676,7 +1676,7 @@ static int dissect_DitBridgeKnowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-dsp-fn.c ---*/ -#line 66 "./asn1/dsp/packet-dsp-template.c" +#line 54 "./asn1/dsp/packet-dsp-template.c" static dissector_handle_t dsp_handle; @@ -2434,7 +2434,7 @@ void proto_register_dsp(void) { "EXTERNAL", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 271 "./asn1/dsp/packet-dsp-template.c" +#line 259 "./asn1/dsp/packet-dsp-template.c" }; /* List of subtrees */ @@ -2516,7 +2516,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 277 "./asn1/dsp/packet-dsp-template.c" +#line 265 "./asn1/dsp/packet-dsp-template.c" }; static ei_register_info ei[] = { { &ei_dsp_unsupported_opcode, { "dsp.unsupported_opcode", PI_UNDECODED, PI_WARN, "Unsupported DSP opcode", EXPFILL }}, @@ -2565,7 +2565,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 315 "./asn1/dsp/packet-dsp-template.c" +#line 303 "./asn1/dsp/packet-dsp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-dsp.h b/epan/dissectors/packet-dsp.h index c0230347fb..fe913d9a51 100644 --- a/epan/dissectors/packet-dsp.h +++ b/epan/dissectors/packet-dsp.h @@ -33,6 +33,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 28 "./asn1/dsp/packet-dsp-template.h" +#line 16 "./asn1/dsp/packet-dsp-template.h" #endif /* PACKET_DSP_H */ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index dbab13099c..6fe8c85923 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -130,7 +130,7 @@ static int hf_ess_issuer = -1; /* GeneralNames */ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ /*--- End of included file: packet-ess-hf.c ---*/ -#line 63 "./asn1/ess/packet-ess-template.c" +#line 51 "./asn1/ess/packet-ess-template.c" /*--- Included file: packet-ess-val.h ---*/ @@ -154,7 +154,7 @@ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ #define id_sha256 "2.16.840.1.101.3.4.2.1" /*--- End of included file: packet-ess-val.h ---*/ -#line 65 "./asn1/ess/packet-ess-template.c" +#line 53 "./asn1/ess/packet-ess-template.c" /* Initialize the subtree pointers */ @@ -193,7 +193,7 @@ static gint ett_ess_ESSCertID = -1; static gint ett_ess_IssuerSerial = -1; /*--- End of included file: packet-ess-ett.c ---*/ -#line 68 "./asn1/ess/packet-ess-template.c" +#line 56 "./asn1/ess/packet-ess-template.c" static const char *object_identifier_id; @@ -1141,7 +1141,7 @@ static int dissect_SigningCertificateV2_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-ess-fn.c ---*/ -#line 139 "./asn1/ess/packet-ess-template.c" +#line 127 "./asn1/ess/packet-ess-template.c" /*--- proto_register_ess ----------------------------------------------*/ void proto_register_ess(void) { @@ -1439,7 +1439,7 @@ void proto_register_ess(void) { "CertificateSerialNumber", HFILL }}, /*--- End of included file: packet-ess-hfarr.c ---*/ -#line 152 "./asn1/ess/packet-ess-template.c" +#line 140 "./asn1/ess/packet-ess-template.c" }; /* List of subtrees */ @@ -1481,7 +1481,7 @@ void proto_register_ess(void) { &ett_ess_IssuerSerial, /*--- End of included file: packet-ess-ettarr.c ---*/ -#line 158 "./asn1/ess/packet-ess-template.c" +#line 146 "./asn1/ess/packet-ess-template.c" }; static uat_field_t attributes_flds[] = { @@ -1549,6 +1549,6 @@ void proto_reg_handoff_ess(void) { /*--- End of included file: packet-ess-dis-tab.c ---*/ -#line 204 "./asn1/ess/packet-ess-template.c" +#line 192 "./asn1/ess/packet-ess-template.c" } diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h index 6ba811c316..8441bf908c 100644 --- a/epan/dissectors/packet-ess.h +++ b/epan/dissectors/packet-ess.h @@ -27,7 +27,7 @@ int dissect_ess_ESSSecurityLabel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-ess-exp.h ---*/ -#line 29 "./asn1/ess/packet-ess-template.h" +#line 17 "./asn1/ess/packet-ess-template.h" #endif /* PACKET_ESS_H */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 7f87754864..2c11394021 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -468,7 +468,7 @@ 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 56 "./asn1/ftam/packet-ftam-template.c" +#line 44 "./asn1/ftam/packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; @@ -639,7 +639,7 @@ static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 60 "./asn1/ftam/packet-ftam-template.c" +#line 48 "./asn1/ftam/packet-ftam-template.c" static expert_field ei_ftam_zero_pdu = EI_INIT; @@ -4731,7 +4731,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 "./asn1/ftam/packet-ftam-template.c" +#line 52 "./asn1/ftam/packet-ftam-template.c" /* * Dissect FTAM unstructured text @@ -6459,7 +6459,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 131 "./asn1/ftam/packet-ftam-template.c" +#line 119 "./asn1/ftam/packet-ftam-template.c" }; /* List of subtrees */ @@ -6632,7 +6632,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 137 "./asn1/ftam/packet-ftam-template.c" +#line 125 "./asn1/ftam/packet-ftam-template.c" }; static ei_register_info ei[] = { { &ei_ftam_zero_pdu, { "ftam.zero_pdu", PI_PROTOCOL, PI_ERROR, "Internal error, zero-byte FTAM PDU", EXPFILL }}, diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h index 4cdb06db27..505f3d7c90 100644 --- a/epan/dissectors/packet-ftam.h +++ b/epan/dissectors/packet-ftam.h @@ -44,6 +44,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 33 "./asn1/ftam/packet-ftam-template.h" +#line 21 "./asn1/ftam/packet-ftam-template.h" #endif /* PACKET_FTAM_H */ diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index 38b046e630..58e3e387c2 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -108,7 +108,7 @@ static int hf_goose_mMSString = -1; /* MMSString */ static int hf_goose_utc_time = -1; /* UtcTime */ /*--- End of included file: packet-goose-hf.c ---*/ -#line 52 "./asn1/goose/packet-goose-template.c" +#line 40 "./asn1/goose/packet-goose-template.c" /* Initialize the subtree pointers */ static int ett_goose = -1; @@ -135,7 +135,7 @@ static gint ett_goose_SEQUENCE_OF_Data = -1; static gint ett_goose_Data = -1; /*--- End of included file: packet-goose-ett.c ---*/ -#line 57 "./asn1/goose/packet-goose-template.c" +#line 45 "./asn1/goose/packet-goose-template.c" /*--- Included file: packet-goose-fn.c ---*/ @@ -692,7 +692,7 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-goose-fn.c ---*/ -#line 59 "./asn1/goose/packet-goose-template.c" +#line 47 "./asn1/goose/packet-goose-template.c" static dissector_handle_t goose_handle = NULL; @@ -1003,7 +1003,7 @@ void proto_register_goose(void) { "UtcTime", HFILL }}, /*--- End of included file: packet-goose-hfarr.c ---*/ -#line 129 "./asn1/goose/packet-goose-template.c" +#line 117 "./asn1/goose/packet-goose-template.c" }; /* List of subtrees */ @@ -1031,7 +1031,7 @@ void proto_register_goose(void) { &ett_goose_Data, /*--- End of included file: packet-goose-ettarr.c ---*/ -#line 135 "./asn1/goose/packet-goose-template.c" +#line 123 "./asn1/goose/packet-goose-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 27f04f12ce..18959a7bb8 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -476,7 +476,7 @@ static int hf_gprscdr_ServiceConditionChange_servingPLMNRateControlChange = -1; static int hf_gprscdr_ServiceConditionChange_aPNRateControlChange = -1; /*--- End of included file: packet-gprscdr-hf.c ---*/ -#line 48 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 36 "./asn1/gprscdr/packet-gprscdr-template.c" static int ett_gprscdr = -1; static int ett_gprscdr_timestamp = -1; @@ -576,7 +576,7 @@ static gint ett_gprscdr_UserCSGInformation = -1; static gint ett_gprscdr_UWANUserLocationInfo = -1; /*--- End of included file: packet-gprscdr-ett.c ---*/ -#line 57 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 45 "./asn1/gprscdr/packet-gprscdr-template.c" static expert_field ei_gprscdr_not_dissected = EI_INIT; static expert_field ei_gprscdr_choice_not_found = EI_INIT; @@ -4710,7 +4710,7 @@ int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-gprscdr-fn.c ---*/ -#line 125 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 113 "./asn1/gprscdr/packet-gprscdr-template.c" @@ -6445,7 +6445,7 @@ proto_register_gprscdr(void) NULL, HFILL }}, /*--- End of included file: packet-gprscdr-hfarr.c ---*/ -#line 135 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 123 "./asn1/gprscdr/packet-gprscdr-template.c" }; /* List of subtrees */ @@ -6548,7 +6548,7 @@ proto_register_gprscdr(void) &ett_gprscdr_UWANUserLocationInfo, /*--- End of included file: packet-gprscdr-ettarr.c ---*/ -#line 147 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 135 "./asn1/gprscdr/packet-gprscdr-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-gprscdr.h b/epan/dissectors/packet-gprscdr.h index 14e71e37fa..1137644756 100644 --- a/epan/dissectors/packet-gprscdr.h +++ b/epan/dissectors/packet-gprscdr.h @@ -32,7 +32,7 @@ int dissect_gprscdr_GPRSCallEventRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinf int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-gprscdr-exp.h ---*/ -#line 29 "./asn1/gprscdr/packet-gprscdr-template.h" +#line 17 "./asn1/gprscdr/packet-gprscdr-template.h" #endif /* PACKET_GPRSCDR_H */ diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index f6f0cf5a8e..c2bfc44577 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1977,7 +1977,7 @@ static int hf_NokiaMAP_Extensions_AccessSubscriptionListExt_item = -1; /* Acces static int hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed = -1; /*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 171 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 159 "./asn1/gsm_map/packet-gsm_map-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -2703,7 +2703,7 @@ static gint ett_NokiaMAP_Extensions_AccessSubscriptionListExt = -1; static gint ett_NokiaMAP_Extensions_AllowedServiceData = -1; /*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 205 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 193 "./asn1/gsm_map/packet-gsm_map-template.c" static expert_field ei_gsm_map_unknown_sequence3 = EI_INIT; static expert_field ei_gsm_map_unknown_sequence = EI_INIT; @@ -21364,7 +21364,7 @@ dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 1110 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 1098 "./asn1/gsm_map/packet-gsm_map-template.c" /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { @@ -21586,7 +21586,7 @@ const value_string gsm_map_opr_code_strings[] = { /* Unknown or empty loop list OPERATION */ /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 1121 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 1109 "./asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; @@ -21803,7 +21803,7 @@ static const value_string gsm_map_err_code_string_vals[] = { /* Unknown or empty loop list OPERATION */ /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 1127 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 1115 "./asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; #endif @@ -31164,7 +31164,7 @@ void proto_register_gsm_map(void) { NULL, HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 3410 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 3398 "./asn1/gsm_map/packet-gsm_map-template.c" }; /* List of subtrees */ @@ -31892,7 +31892,7 @@ void proto_register_gsm_map(void) { &ett_NokiaMAP_Extensions_AllowedServiceData, /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 3446 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 3434 "./asn1/gsm_map/packet-gsm_map-template.c" }; static ei_register_info ei[] = { @@ -32036,7 +32036,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 3506 "./asn1/gsm_map/packet-gsm_map-template.c" +#line 3494 "./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 17e4f146f4..5e985ed153 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -285,7 +285,7 @@ int dissect_gsm_ss_LocationMethod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_NokiaMAP_Extensions_ServiceKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-gsm_map-exp.h ---*/ -#line 79 "./asn1/gsm_map/packet-gsm_map-template.h" +#line 67 "./asn1/gsm_map/packet-gsm_map-template.h" #endif /* PACKET_GSM_MAP_H */ diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index f6ed6e66fc..efa638308b 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -897,7 +897,7 @@ static int hf_h225_stopped = -1; /* NULL */ static int hf_h225_notAvailable = -1; /* NULL */ /*--- End of included file: packet-h225-hf.c ---*/ -#line 129 "./asn1/h225/packet-h225-template.c" +#line 117 "./asn1/h225/packet-h225-template.c" /* Initialize the subtree pointers */ static gint ett_h225 = -1; @@ -1145,7 +1145,7 @@ static gint ett_h225_ServiceControlResponse = -1; static gint ett_h225_T_result = -1; /*--- End of included file: packet-h225-ett.c ---*/ -#line 133 "./asn1/h225/packet-h225-template.c" +#line 121 "./asn1/h225/packet-h225-template.c" /* Preferences */ static guint h225_tls_port = TLS_PORT_CS; @@ -7812,7 +7812,7 @@ static int dissect_RasMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-h225-fn.c ---*/ -#line 249 "./asn1/h225/packet-h225-template.c" +#line 237 "./asn1/h225/packet-h225-template.c" /* Forward declaration we need below */ void proto_reg_handoff_h225(void); @@ -11476,7 +11476,7 @@ void proto_register_h225(void) { NULL, HFILL }}, /*--- End of included file: packet-h225-hfarr.c ---*/ -#line 824 "./asn1/h225/packet-h225-template.c" +#line 812 "./asn1/h225/packet-h225-template.c" }; /* List of subtrees */ @@ -11726,7 +11726,7 @@ void proto_register_h225(void) { &ett_h225_T_result, /*--- End of included file: packet-h225-ettarr.c ---*/ -#line 830 "./asn1/h225/packet-h225-template.c" +#line 818 "./asn1/h225/packet-h225-template.c" }; static tap_param h225_stat_params[] = { diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index 90ca6bff41..63b52ce1af 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -137,7 +137,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_, void *data _U_); /*--- End of included file: packet-h225-exp.h ---*/ -#line 81 "./asn1/h225/packet-h225-template.h" +#line 69 "./asn1/h225/packet-h225-template.h" #endif /* PACKET_H225_H */ diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 922af50301..747727795d 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -150,7 +150,7 @@ static int hf_h235_fecBeforeSrtp = -1; /* NULL */ static int hf_h235_fecAfterSrtp = -1; /* NULL */ /*--- End of included file: packet-h235-hf.c ---*/ -#line 52 "./asn1/h235/packet-h235-template.c" +#line 40 "./asn1/h235/packet-h235-template.c" /* Initialize the subtree pointers */ @@ -190,7 +190,7 @@ static gint ett_h235_SEQUENCE_OF_GenericData = -1; static gint ett_h235_FecOrder = -1; /*--- End of included file: packet-h235-ett.c ---*/ -#line 55 "./asn1/h235/packet-h235-template.c" +#line 43 "./asn1/h235/packet-h235-template.c" static int @@ -1036,7 +1036,7 @@ static int dissect_SrtpCryptoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-h235-fn.c ---*/ -#line 64 "./asn1/h235/packet-h235-template.c" +#line 52 "./asn1/h235/packet-h235-template.c" /*--- proto_register_h235 ----------------------------------------------*/ @@ -1453,7 +1453,7 @@ void proto_register_h235(void) { NULL, HFILL }}, /*--- End of included file: packet-h235-hfarr.c ---*/ -#line 72 "./asn1/h235/packet-h235-template.c" +#line 60 "./asn1/h235/packet-h235-template.c" }; /* List of subtrees */ @@ -1495,7 +1495,7 @@ void proto_register_h235(void) { &ett_h235_FecOrder, /*--- End of included file: packet-h235-ettarr.c ---*/ -#line 77 "./asn1/h235/packet-h235-template.c" +#line 65 "./asn1/h235/packet-h235-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h index 6dc41650c0..dc7bda47d0 100644 --- a/epan/dissectors/packet-h235.h +++ b/epan/dissectors/packet-h235.h @@ -35,7 +35,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 28 "./asn1/h235/packet-h235-template.h" +#line 16 "./asn1/h235/packet-h235-template.h" #endif /* PACKET_H235_H */ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index ad0e1264ff..0e1c21237e 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -202,7 +202,7 @@ typedef enum _IndicationMessage_enum { } IndicationMessage_enum; /*--- End of included file: packet-h245-val.h ---*/ -#line 87 "./asn1/h245/packet-h245-template.c" +#line 75 "./asn1/h245/packet-h245-template.c" static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, @@ -1909,7 +1909,7 @@ static int hf_h245_encrypted = -1; /* OCTET_STRING */ static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ /*--- End of included file: packet-h245-hf.c ---*/ -#line 387 "./asn1/h245/packet-h245-template.c" +#line 375 "./asn1/h245/packet-h245-template.c" /* Initialize the subtree pointers */ static int ett_h245 = -1; @@ -2410,7 +2410,7 @@ static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; /*--- End of included file: packet-h245-ett.c ---*/ -#line 392 "./asn1/h245/packet-h245-template.c" +#line 380 "./asn1/h245/packet-h245-template.c" /* Forward declarations */ static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -14497,7 +14497,7 @@ static int dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-h245-fn.c ---*/ -#line 401 "./asn1/h245/packet-h245-template.c" +#line 389 "./asn1/h245/packet-h245-template.c" static int dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) @@ -20196,7 +20196,7 @@ void proto_register_h245(void) { NULL, HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ -#line 487 "./asn1/h245/packet-h245-template.c" +#line 475 "./asn1/h245/packet-h245-template.c" }; /* List of subtrees */ @@ -20699,7 +20699,7 @@ void proto_register_h245(void) { &ett_h245_MobileMultilinkReconfigurationIndication, /*--- End of included file: packet-h245-ettarr.c ---*/ -#line 494 "./asn1/h245/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 9dcde2ffcf..1bed464cec 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -138,7 +138,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 126 "./asn1/h245/packet-h245-template.h" +#line 114 "./asn1/h245/packet-h245-template.h" void dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str); diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index 509d4f96a8..c4759b2ff1 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -472,7 +472,7 @@ static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndica static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ /*--- End of included file: packet-h282-hf.c ---*/ -#line 42 "./asn1/h282/packet-h282-template.c" +#line 30 "./asn1/h282/packet-h282-template.c" /* Initialize the subtree pointers */ static int ett_h282 = -1; @@ -624,7 +624,7 @@ static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; /*--- End of included file: packet-h282-ett.c ---*/ -#line 46 "./asn1/h282/packet-h282-template.c" +#line 34 "./asn1/h282/packet-h282-template.c" /* Dissectors */ @@ -4383,7 +4383,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 52 "./asn1/h282/packet-h282-template.c" +#line 40 "./asn1/h282/packet-h282-template.c" static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -6141,7 +6141,7 @@ void proto_register_h282(void) { "NonStandardPDU", HFILL }}, /*--- End of included file: packet-h282-hfarr.c ---*/ -#line 73 "./asn1/h282/packet-h282-template.c" +#line 61 "./asn1/h282/packet-h282-template.c" }; /* List of subtrees */ @@ -6295,7 +6295,7 @@ void proto_register_h282(void) { &ett_h282_IndicationPDU, /*--- End of included file: packet-h282-ettarr.c ---*/ -#line 79 "./asn1/h282/packet-h282-template.c" +#line 67 "./asn1/h282/packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 096587ba5a..1ce46a8271 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -71,7 +71,7 @@ static int hf_h283_deviceListResp = -1; /* T_deviceListResp */ static int hf_h283_deviceChange = -1; /* NULL */ /*--- End of included file: packet-h283-hf.c ---*/ -#line 42 "./asn1/h283/packet-h283-template.c" +#line 30 "./asn1/h283/packet-h283-template.c" /* Initialize the subtree pointers */ static int ett_h283 = -1; @@ -94,7 +94,7 @@ static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; /*--- End of included file: packet-h283-ett.c ---*/ -#line 46 "./asn1/h283/packet-h283-template.c" +#line 34 "./asn1/h283/packet-h283-template.c" /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; @@ -554,7 +554,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 "./asn1/h283/packet-h283-template.c" +#line 45 "./asn1/h283/packet-h283-template.c" static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -710,7 +710,7 @@ void proto_register_h283(void) { NULL, HFILL }}, /*--- End of included file: packet-h283-hfarr.c ---*/ -#line 80 "./asn1/h283/packet-h283-template.c" +#line 68 "./asn1/h283/packet-h283-template.c" }; /* List of subtrees */ @@ -735,7 +735,7 @@ void proto_register_h283(void) { &ett_h283_NonStandardMessage, /*--- End of included file: packet-h283-ettarr.c ---*/ -#line 86 "./asn1/h283/packet-h283-template.c" +#line 74 "./asn1/h283/packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 621ee8dadf..6bbfa088b6 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -115,7 +115,7 @@ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ /*--- End of included file: packet-h323-hf.c ---*/ -#line 90 "./asn1/h323/packet-h323-template.c" +#line 78 "./asn1/h323/packet-h323-template.c" /* Initialize the subtree pointers */ @@ -136,7 +136,7 @@ static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; /*--- End of included file: packet-h323-ett.c ---*/ -#line 93 "./asn1/h323/packet-h323-template.c" +#line 81 "./asn1/h323/packet-h323-template.c" /*--- Included file: packet-h323-fn.c ---*/ @@ -427,7 +427,7 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h323-fn.c ---*/ -#line 95 "./asn1/h323/packet-h323-template.c" +#line 83 "./asn1/h323/packet-h323-template.c" /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { @@ -551,7 +551,7 @@ void proto_register_h323(void) { NULL, HFILL }}, /*--- End of included file: packet-h323-hfarr.c ---*/ -#line 102 "./asn1/h323/packet-h323-template.c" +#line 90 "./asn1/h323/packet-h323-template.c" }; /* List of subtrees */ @@ -574,7 +574,7 @@ void proto_register_h323(void) { &ett_h323_StatusInquiry_RD, /*--- End of included file: packet-h323-ettarr.c ---*/ -#line 107 "./asn1/h323/packet-h323-template.c" +#line 95 "./asn1/h323/packet-h323-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index c31b8e3ef0..d658fd30d9 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -61,7 +61,7 @@ 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 "./asn1/h450-ros/packet-h450-ros-template.c" +#line 32 "./asn1/h450-ros/packet-h450-ros-template.c" /* Initialize the subtree pointers */ @@ -77,7 +77,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 "./asn1/h450-ros/packet-h450-ros-template.c" +#line 35 "./asn1/h450-ros/packet-h450-ros-template.c" static expert_field ei_ros_undecoded = EI_INIT; @@ -573,7 +573,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 79 "./asn1/h450-ros/packet-h450-ros-template.c" +#line 67 "./asn1/h450-ros/packet-h450-ros-template.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { @@ -665,7 +665,7 @@ void proto_register_h450_ros(void) { "ReturnErrorProblem", HFILL }}, /*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 86 "./asn1/h450-ros/packet-h450-ros-template.c" +#line 74 "./asn1/h450-ros/packet-h450-ros-template.c" }; /* List of subtrees */ @@ -683,7 +683,7 @@ void proto_register_h450_ros(void) { &ett_h450_ros_T_problem, /*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 91 "./asn1/h450-ros/packet-h450-ros-template.c" +#line 79 "./asn1/h450-ros/packet-h450-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-h450-ros.h b/epan/dissectors/packet-h450-ros.h index b73f83d8b1..f9ebbd69f4 100644 --- a/epan/dissectors/packet-h450-ros.h +++ b/epan/dissectors/packet-h450-ros.h @@ -27,7 +27,7 @@ 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 28 "./asn1/h450-ros/packet-h450-ros-template.h" +#line 16 "./asn1/h450-ros/packet-h450-ros-template.h" #endif /* PACKET_H450_ROS_H */ diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 029074b68d..f5cae070d1 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -435,7 +435,7 @@ 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 "./asn1/h450/packet-h450-template.c" +#line 42 "./asn1/h450/packet-h450-template.c" /* Initialize the subtree pointers */ @@ -613,7 +613,7 @@ static gint ett_h450_12_FeatureValues = -1; static gint ett_h450_12_FeatureControl = -1; /*--- End of included file: packet-h450-ett.c ---*/ -#line 57 "./asn1/h450/packet-h450-template.c" +#line 45 "./asn1/h450/packet-h450-template.c" static expert_field ei_h450_unsupported_arg_type = EI_INIT; static expert_field ei_h450_unsupported_result_type = EI_INIT; @@ -720,7 +720,7 @@ static const value_string h450_str_operation[] = { { 85, "cmnInform" }, /*--- End of included file: packet-h450-table10.c ---*/ -#line 64 "./asn1/h450/packet-h450-template.c" +#line 52 "./asn1/h450/packet-h450-template.c" { 0, NULL} }; @@ -808,7 +808,7 @@ static const value_string h450_str_error[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table20.c ---*/ -#line 69 "./asn1/h450/packet-h450-template.c" +#line 57 "./asn1/h450/packet-h450-template.c" { 0, NULL} }; @@ -4473,7 +4473,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 78 "./asn1/h450/packet-h450-template.c" +#line 66 "./asn1/h450/packet-h450-template.c" typedef struct _h450_op_t { gint32 opcode; @@ -4582,7 +4582,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 87 "./asn1/h450/packet-h450-template.c" +#line 75 "./asn1/h450/packet-h450-template.c" }; typedef struct _h450_err_t { @@ -4674,7 +4674,7 @@ static const h450_err_t h450_err_tab[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table21.c ---*/ -#line 96 "./asn1/h450/packet-h450-template.c" +#line 84 "./asn1/h450/packet-h450-template.c" }; static const h450_op_t *get_op(gint32 opcode) { @@ -6276,7 +6276,7 @@ void proto_register_h450(void) { NULL, HFILL }}, /*--- End of included file: packet-h450-hfarr.c ---*/ -#line 265 "./asn1/h450/packet-h450-template.c" +#line 253 "./asn1/h450/packet-h450-template.c" }; /* List of subtrees */ @@ -6456,7 +6456,7 @@ void proto_register_h450(void) { &ett_h450_12_FeatureControl, /*--- End of included file: packet-h450-ettarr.c ---*/ -#line 270 "./asn1/h450/packet-h450-template.c" +#line 258 "./asn1/h450/packet-h450-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index e2a1afee54..0474546ca2 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -242,7 +242,7 @@ 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 45 "./asn1/h460/packet-h460-template.c" +#line 33 "./asn1/h460/packet-h460-template.c" /* Initialize the subtree pointers */ @@ -339,7 +339,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 48 "./asn1/h460/packet-h460-template.c" +#line 36 "./asn1/h460/packet-h460-template.c" /* Subdissectors */ static dissector_handle_t q931_ie_handle = NULL; @@ -1950,7 +1950,7 @@ static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet /*--- End of included file: packet-h460-fn.c ---*/ -#line 54 "./asn1/h460/packet-h460-template.c" +#line 42 "./asn1/h460/packet-h460-template.c" static int dissect_ies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2859,7 +2859,7 @@ void proto_register_h460(void) { "UnicastAddress", HFILL }}, /*--- End of included file: packet-h460-hfarr.c ---*/ -#line 248 "./asn1/h460/packet-h460-template.c" +#line 236 "./asn1/h460/packet-h460-template.c" }; /* List of subtrees */ @@ -2958,7 +2958,7 @@ void proto_register_h460(void) { &ett_h460_21_TransmitCapabilities, /*--- End of included file: packet-h460-ettarr.c ---*/ -#line 253 "./asn1/h460/packet-h460-template.c" +#line 241 "./asn1/h460/packet-h460-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index aca9fd7306..2a97e6c327 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -292,7 +292,7 @@ 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 45 "./asn1/h501/packet-h501-template.c" +#line 33 "./asn1/h501/packet-h501-template.c" /* Initialize the subtree pointers */ static int ett_h501 = -1; @@ -400,7 +400,7 @@ static gint ett_h501_Role = -1; static gint ett_h501_TerminationCause = -1; /*--- End of included file: packet-h501-ett.c ---*/ -#line 49 "./asn1/h501/packet-h501-template.c" +#line 37 "./asn1/h501/packet-h501-template.c" /* Dissectors */ static dissector_handle_t h501_pdu_handle; @@ -2501,7 +2501,7 @@ static int dissect_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-h501-fn.c ---*/ -#line 60 "./asn1/h501/packet-h501-template.c" +#line 48 "./asn1/h501/packet-h501-template.c" static int dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -3542,7 +3542,7 @@ void proto_register_h501(void) { "INTEGER_1_65535", HFILL }}, /*--- End of included file: packet-h501-hfarr.c ---*/ -#line 96 "./asn1/h501/packet-h501-template.c" +#line 84 "./asn1/h501/packet-h501-template.c" }; /* List of subtrees */ @@ -3652,7 +3652,7 @@ void proto_register_h501(void) { &ett_h501_TerminationCause, /*--- End of included file: packet-h501-ettarr.c ---*/ -#line 102 "./asn1/h501/packet-h501-template.c" +#line 90 "./asn1/h501/packet-h501-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index b7178ca7f5..267159ac1e 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -99,7 +99,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-hnbap-val.h ---*/ -#line 49 "./asn1/hnbap/packet-hnbap-template.c" +#line 37 "./asn1/hnbap/packet-hnbap-template.c" /* Initialize the protocol and registered fields */ static int proto_hnbap = -1; @@ -245,7 +245,7 @@ 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 54 "./asn1/hnbap/packet-hnbap-template.c" +#line 42 "./asn1/hnbap/packet-hnbap-template.c" /* Initialize the subtree pointers */ static int ett_hnbap = -1; @@ -319,7 +319,7 @@ static gint ett_hnbap_SuccessfulOutcome = -1; static gint ett_hnbap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-hnbap-ett.c ---*/ -#line 59 "./asn1/hnbap/packet-hnbap-template.c" +#line 47 "./asn1/hnbap/packet-hnbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -2578,7 +2578,7 @@ static int dissect_HNBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-hnbap-fn.c ---*/ -#line 82 "./asn1/hnbap/packet-hnbap-template.c" +#line 70 "./asn1/hnbap/packet-hnbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -3197,7 +3197,7 @@ module_t *hnbap_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-hnbap-hfarr.c ---*/ -#line 152 "./asn1/hnbap/packet-hnbap-template.c" +#line 140 "./asn1/hnbap/packet-hnbap-template.c" }; /* List of subtrees */ @@ -3272,7 +3272,7 @@ module_t *hnbap_module; &ett_hnbap_UnsuccessfulOutcome, /*--- End of included file: packet-hnbap-ettarr.c ---*/ -#line 158 "./asn1/hnbap/packet-hnbap-template.c" +#line 146 "./asn1/hnbap/packet-hnbap-template.c" }; @@ -3357,7 +3357,7 @@ proto_reg_handoff_hnbap(void) /*--- End of included file: packet-hnbap-dis-tab.c ---*/ -#line 193 "./asn1/hnbap/packet-hnbap-template.c" +#line 181 "./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 9f2d979958..f2e525c08b 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -159,7 +159,7 @@ static int hf_idmp_present = -1; /* INTEGER */ static int hf_idmp_absent = -1; /* NULL */ /*--- End of included file: packet-idmp-hf.c ---*/ -#line 130 "./asn1/idmp/packet-idmp-template.c" +#line 118 "./asn1/idmp/packet-idmp-template.c" /* Initialize the subtree pointers */ static gint ett_idmp = -1; @@ -178,7 +178,7 @@ static gint ett_idmp_Code = -1; static gint ett_idmp_InvokeId = -1; /*--- End of included file: packet-idmp-ett.c ---*/ -#line 134 "./asn1/idmp/packet-idmp-template.c" +#line 122 "./asn1/idmp/packet-idmp-template.c" /*--- Included file: packet-idmp-fn.c ---*/ @@ -606,7 +606,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 136 "./asn1/idmp/packet-idmp-template.c" +#line 124 "./asn1/idmp/packet-idmp-template.c" void register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name) @@ -914,7 +914,7 @@ void proto_register_idmp(void) NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 311 "./asn1/idmp/packet-idmp-template.c" +#line 299 "./asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -937,7 +937,7 @@ void proto_register_idmp(void) &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 319 "./asn1/idmp/packet-idmp-template.c" +#line 307 "./asn1/idmp/packet-idmp-template.c" }; module_t *idmp_module; diff --git a/epan/dissectors/packet-ilp.c b/epan/dissectors/packet-ilp.c index f42b9bd179..e9253a5fe1 100644 --- a/epan/dissectors/packet-ilp.c +++ b/epan/dissectors/packet-ilp.c @@ -442,7 +442,7 @@ static int hf_ilp_GANSSSignals_signal7 = -1; static int hf_ilp_GANSSSignals_signal8 = -1; /*--- End of included file: packet-ilp-hf.c ---*/ -#line 64 "./asn1/ilp/packet-ilp-template.c" +#line 52 "./asn1/ilp/packet-ilp-template.c" static int hf_ilp_mobile_directory_number = -1; /* Initialize the subtree pointers */ @@ -588,7 +588,7 @@ static gint ett_ilp_T_lPPPayload = -1; static gint ett_ilp_T_tia801Payload = -1; /*--- End of included file: packet-ilp-ett.c ---*/ -#line 70 "./asn1/ilp/packet-ilp-template.c" +#line 58 "./asn1/ilp/packet-ilp-template.c" /* Include constants */ @@ -605,7 +605,7 @@ static gint ett_ilp_T_tia801Payload = -1; #define maxPosSize 1024 /*--- End of included file: packet-ilp-val.h ---*/ -#line 73 "./asn1/ilp/packet-ilp-template.c" +#line 61 "./asn1/ilp/packet-ilp-template.c" @@ -4135,7 +4135,7 @@ static int dissect_ILP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-ilp-fn.c ---*/ -#line 76 "./asn1/ilp/packet-ilp-template.c" +#line 64 "./asn1/ilp/packet-ilp-template.c" static guint @@ -5686,7 +5686,7 @@ void proto_register_ilp(void) { NULL, HFILL }}, /*--- End of included file: packet-ilp-hfarr.c ---*/ -#line 102 "./asn1/ilp/packet-ilp-template.c" +#line 90 "./asn1/ilp/packet-ilp-template.c" { &hf_ilp_mobile_directory_number, { "Mobile Directory Number", "ilp.mobile_directory_number", FT_STRING, BASE_NONE, NULL, 0, @@ -5837,7 +5837,7 @@ void proto_register_ilp(void) { &ett_ilp_T_tia801Payload, /*--- End of included file: packet-ilp-ettarr.c ---*/ -#line 113 "./asn1/ilp/packet-ilp-template.c" +#line 101 "./asn1/ilp/packet-ilp-template.c" }; module_t *ilp_module; diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 60dc85ce9f..4b6c312bc9 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -447,7 +447,7 @@ static int proto_inap = -1; #define noInvokeId NULL /*--- End of included file: packet-inap-val.h ---*/ -#line 57 "./asn1/inap/packet-inap-template.c" +#line 45 "./asn1/inap/packet-inap-template.c" /*--- Included file: packet-inap-hf.c ---*/ @@ -1014,7 +1014,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 "./asn1/inap/packet-inap-template.c" +#line 47 "./asn1/inap/packet-inap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1282,7 +1282,7 @@ static gint ett_inap_T_problem_01 = -1; static gint ett_inap_InvokeId = -1; /*--- End of included file: packet-inap-ett.c ---*/ -#line 86 "./asn1/inap/packet-inap-template.c" +#line 74 "./asn1/inap/packet-inap-template.c" static expert_field ei_inap_unknown_invokeData = EI_INIT; static expert_field ei_inap_unknown_returnResultData = EI_INIT; @@ -1412,7 +1412,7 @@ static const value_string inap_err_code_string_vals[] = { /*--- End of included file: packet-inap-table.c ---*/ -#line 92 "./asn1/inap/packet-inap-template.c" +#line 80 "./asn1/inap/packet-inap-template.c" const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, @@ -8998,7 +8998,7 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-inap-fn.c ---*/ -#line 106 "./asn1/inap/packet-inap-template.c" +#line 94 "./asn1/inap/packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9348,7 +9348,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-inap-table2.c ---*/ -#line 127 "./asn1/inap/packet-inap-template.c" +#line 115 "./asn1/inap/packet-inap-template.c" static guint8 inap_pdu_type = 0; @@ -11676,7 +11676,7 @@ void proto_register_inap(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 210 "./asn1/inap/packet-inap-template.c" +#line 198 "./asn1/inap/packet-inap-template.c" }; @@ -11932,7 +11932,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 225 "./asn1/inap/packet-inap-template.c" +#line 213 "./asn1/inap/packet-inap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index f68cb88d19..d913b79569 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -40,6 +40,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 29 "./asn1/inap/packet-inap-template.h" +#line 17 "./asn1/inap/packet-inap-template.h" #endif /* PACKET_INAP_H */ diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c index 1e0652790b..85ca77c0cb 100644 --- a/epan/dissectors/packet-isdn-sup.c +++ b/epan/dissectors/packet-isdn-sup.c @@ -39,7 +39,7 @@ void proto_reg_handoff_isdn_sup(void); #define fPHOID "0.4.0.210.1" /*--- End of included file: packet-isdn-sup-val.h ---*/ -#line 41 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 29 "./asn1/isdn-sup/packet-isdn-sup-template.c" /* Initialize the protocol and registered fields */ static int proto_isdn_sup = -1; @@ -109,7 +109,7 @@ static const value_string isdn_sup_str_operation[] = { { 46, "partyDISC" }, /*--- End of included file: packet-isdn-sup-table10.c ---*/ -#line 74 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 62 "./asn1/isdn-sup/packet-isdn-sup-template.c" { 0, NULL} }; @@ -151,7 +151,7 @@ static const value_string isdn_sup_str_error[] = { { 44, "unauthorizedPrecedenceLevel" }, /*--- End of included file: packet-isdn-sup-table20.c ---*/ -#line 80 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 68 "./asn1/isdn-sup/packet-isdn-sup-template.c" { 0, NULL} }; @@ -330,7 +330,7 @@ static int hf_isdn_sup_statusQuery = -1; /* StatusQuery */ static int hf_isdn_sup_location = -1; /* Location */ /*--- End of included file: packet-isdn-sup-hf.c ---*/ -#line 86 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 74 "./asn1/isdn-sup/packet-isdn-sup-template.c" /* Initialize the subtree pointers */ @@ -408,7 +408,7 @@ static gint ett_isdn_sup_MLPPParams = -1; static gint ett_isdn_sup_MLPPLFBResp = -1; /*--- End of included file: packet-isdn-sup-ett.c ---*/ -#line 92 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 80 "./asn1/isdn-sup/packet-isdn-sup-template.c" /* static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; */ static expert_field ei_isdn_sup_unsupported_result_type = EI_INIT; @@ -2706,7 +2706,7 @@ static int dissect_PreemptParams_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-isdn-sup-fn.c ---*/ -#line 102 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 90 "./asn1/isdn-sup/packet-isdn-sup-template.c" static const isdn_sup_op_t isdn_sup_op_tab[] = { @@ -2746,7 +2746,7 @@ static const isdn_sup_op_t isdn_sup_op_tab[] = { /* mLPPCallPreemption */ { 26, dissect_PreemptParams_PDU, NULL }, /*--- End of included file: packet-isdn-sup-table11.c ---*/ -#line 105 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 93 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; @@ -2761,7 +2761,7 @@ static const isdn_sup_global_op_t isdn_sup_global_op_tab[] = { /* call-T-FPH */ { fPHOID".4", dissect_Call_T_FPHArg_PDU, NULL }, /*--- End of included file: packet-isdn-sup-table31.c ---*/ -#line 111 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 99 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; static const isdn_sup_err_t isdn_sup_err_tab[] = { @@ -2801,7 +2801,7 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = { /* unauthorizedPrecedenceLevel */ { 44, NULL }, /*--- End of included file: packet-isdn-sup-table21.c ---*/ -#line 115 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 103 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; @@ -3711,7 +3711,7 @@ void proto_register_isdn_sup(void) { NULL, HFILL }}, /*--- End of included file: packet-isdn-sup-hfarr.c ---*/ -#line 348 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 336 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; /* List of subtrees */ @@ -3790,7 +3790,7 @@ void proto_register_isdn_sup(void) { &ett_isdn_sup_MLPPLFBResp, /*--- End of included file: packet-isdn-sup-ettarr.c ---*/ -#line 355 "./asn1/isdn-sup/packet-isdn-sup-template.c" +#line 343 "./asn1/isdn-sup/packet-isdn-sup-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 8fd20faa82..f5d70c32a2 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -371,7 +371,7 @@ static int hf_kerberos_KDCOptions_renew = -1; static int hf_kerberos_KDCOptions_validate = -1; /*--- End of included file: packet-kerberos-hf.c ---*/ -#line 179 "./asn1/kerberos/packet-kerberos-template.c" +#line 167 "./asn1/kerberos/packet-kerberos-template.c" /* Initialize the subtree pointers */ static gint ett_kerberos = -1; @@ -455,7 +455,7 @@ static gint ett_kerberos_PA_FX_FAST_REPLY = -1; static gint ett_kerberos_KrbFastArmoredRep = -1; /*--- End of included file: packet-kerberos-ett.c ---*/ -#line 193 "./asn1/kerberos/packet-kerberos-template.c" +#line 181 "./asn1/kerberos/packet-kerberos-template.c" static expert_field ei_kerberos_decrypted_keytype = EI_INIT; static expert_field ei_kerberos_address = EI_INIT; @@ -484,7 +484,7 @@ static gboolean gbl_do_col_info; #define KERBEROS_ADDR_TYPE_IPV6 24 /*--- End of included file: packet-kerberos-val.h ---*/ -#line 206 "./asn1/kerberos/packet-kerberos-template.c" +#line 194 "./asn1/kerberos/packet-kerberos-template.c" static void call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb) @@ -4459,7 +4459,7 @@ dissect_kerberos_EncryptedChallenge(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1877 "./asn1/kerberos/packet-kerberos-template.c" +#line 1865 "./asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -5621,7 +5621,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 2258 "./asn1/kerberos/packet-kerberos-template.c" +#line 2246 "./asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -5707,7 +5707,7 @@ void proto_register_kerberos(void) { &ett_kerberos_KrbFastArmoredRep, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 2274 "./asn1/kerberos/packet-kerberos-template.c" +#line 2262 "./asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-kerberos.h b/epan/dissectors/packet-kerberos.h index e537d63689..8af3a90835 100644 --- a/epan/dissectors/packet-kerberos.h +++ b/epan/dissectors/packet-kerberos.h @@ -116,7 +116,7 @@ extern gboolean krb_decrypt; int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-kerberos-exp.h ---*/ -#line 98 "./asn1/kerberos/packet-kerberos-template.h" +#line 86 "./asn1/kerberos/packet-kerberos-template.h" #ifdef __cplusplus } diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c index 963126372b..edc6a69d5b 100644 --- a/epan/dissectors/packet-lcsap.c +++ b/epan/dissectors/packet-lcsap.c @@ -99,7 +99,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-lcsap-val.h ---*/ -#line 58 "./asn1/lcsap/packet-lcsap-template.c" +#line 46 "./asn1/lcsap/packet-lcsap-template.c" /* Initialize the protocol and registered fields */ static int proto_lcsap = -1; @@ -227,7 +227,7 @@ static int hf_lcsap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_lcsap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-lcsap-hf.c ---*/ -#line 68 "./asn1/lcsap/packet-lcsap-template.c" +#line 56 "./asn1/lcsap/packet-lcsap-template.c" /* Initialize the subtree pointers */ static int ett_lcsap = -1; @@ -286,7 +286,7 @@ static gint ett_lcsap_SuccessfulOutcome = -1; static gint ett_lcsap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-lcsap-ett.c ---*/ -#line 76 "./asn1/lcsap/packet-lcsap-template.c" +#line 64 "./asn1/lcsap/packet-lcsap-template.c" static expert_field ei_lcsap_civic_data_not_xml = EI_INIT; @@ -2344,7 +2344,7 @@ static int dissect_LCS_AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-lcsap-fn.c ---*/ -#line 197 "./asn1/lcsap/packet-lcsap-template.c" +#line 185 "./asn1/lcsap/packet-lcsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2448,7 +2448,7 @@ proto_reg_handoff_lcsap(void) /*--- End of included file: packet-lcsap-dis-tab.c ---*/ -#line 257 "./asn1/lcsap/packet-lcsap-template.c" +#line 245 "./asn1/lcsap/packet-lcsap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, lcsap_handle); @@ -2950,7 +2950,7 @@ void proto_register_lcsap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-lcsap-hfarr.c ---*/ -#line 302 "./asn1/lcsap/packet-lcsap-template.c" +#line 290 "./asn1/lcsap/packet-lcsap-template.c" }; /* List of subtrees */ @@ -3010,7 +3010,7 @@ void proto_register_lcsap(void) { &ett_lcsap_UnsuccessfulOutcome, /*--- End of included file: packet-lcsap-ettarr.c ---*/ -#line 311 "./asn1/lcsap/packet-lcsap-template.c" +#line 299 "./asn1/lcsap/packet-lcsap-template.c" }; module_t *lcsap_module; diff --git a/epan/dissectors/packet-lcsap.h b/epan/dissectors/packet-lcsap.h index 9ad9bdcf2d..5abcdd0b34 100644 --- a/epan/dissectors/packet-lcsap.h +++ b/epan/dissectors/packet-lcsap.h @@ -30,6 +30,6 @@ int dissect_lcsap_Correlation_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int dissect_lcsap_Positioning_Data_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-lcsap-exp.h ---*/ -#line 31 "./asn1/lcsap/packet-lcsap-template.h" +#line 19 "./asn1/lcsap/packet-lcsap-template.h" #endif /* PACKET_LCSAP_H */ diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 731acb927c..95a1774876 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -80,7 +80,7 @@ static int hf_logotypecertextn_hashAlg = -1; /* AlgorithmIdentifier */ static int hf_logotypecertextn_hashValue = -1; /* OCTET_STRING */ /*--- End of included file: packet-logotypecertextn-hf.c ---*/ -#line 42 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 30 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" /* Initialize the subtree pointers */ @@ -107,7 +107,7 @@ static gint ett_logotypecertextn_T_refStructURI = -1; static gint ett_logotypecertextn_HashAlgAndValue = -1; /*--- End of included file: packet-logotypecertextn-ett.c ---*/ -#line 45 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 33 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" @@ -506,7 +506,7 @@ static int dissect_LogotypeExtn_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-logotypecertextn-fn.c ---*/ -#line 48 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 36 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" /*--- proto_register_logotypecertextn ----------------------------------------------*/ @@ -683,7 +683,7 @@ void proto_register_logotypecertextn(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/ -#line 56 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 44 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* List of subtrees */ @@ -712,7 +712,7 @@ void proto_register_logotypecertextn(void) { &ett_logotypecertextn_HashAlgAndValue, /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/ -#line 61 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 49 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* Register protocol */ @@ -736,6 +736,6 @@ void proto_reg_handoff_logotypecertextn(void) { /*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/ -#line 76 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 64 "./asn1/logotypecertextn/packet-logotypecertextn-template.c" } diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 291a179052..30bf987948 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -1312,7 +1312,7 @@ static int hf_lpp_T_bt_MeasSupported_r13_rssi_r13 = -1; static int dummy_hf_lpp_eag_field = -1; /* never registered */ /*--- End of included file: packet-lpp-hf.c ---*/ -#line 49 "./asn1/lpp/packet-lpp-template.c" +#line 37 "./asn1/lpp/packet-lpp-template.c" static int hf_lpp_svHealthExt_v1240_e5bhs = -1; static int hf_lpp_svHealthExt_v1240_e1_bhs = -1; static int hf_lpp_kepSV_StatusINAV_e5bhs = -1; @@ -1753,7 +1753,7 @@ static gint ett_lpp_BT_LocationServerErrorCauses_r13 = -1; static gint ett_lpp_BT_TargetDeviceErrorCauses_r13 = -1; /*--- End of included file: packet-lpp-ett.c ---*/ -#line 71 "./asn1/lpp/packet-lpp-template.c" +#line 59 "./asn1/lpp/packet-lpp-template.c" /* Include constants */ @@ -1791,7 +1791,7 @@ typedef enum _T_GNSS_ID_enum { } T_GNSS_ID_enum; /*--- End of included file: packet-lpp-val.h ---*/ -#line 74 "./asn1/lpp/packet-lpp-template.c" +#line 62 "./asn1/lpp/packet-lpp-template.c" static const value_string lpp_ePDU_ID_vals[] = { { 1, "OMA LPP extensions (LPPe)"}, @@ -15223,7 +15223,7 @@ int dissect_lpp_Polygon_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-lpp-fn.c ---*/ -#line 1725 "./asn1/lpp/packet-lpp-template.c" +#line 1713 "./asn1/lpp/packet-lpp-template.c" static int dissect_lpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_tree *subtree; @@ -20303,7 +20303,7 @@ void proto_register_lpp(void) { NULL, HFILL }}, /*--- End of included file: packet-lpp-hfarr.c ---*/ -#line 1744 "./asn1/lpp/packet-lpp-template.c" +#line 1732 "./asn1/lpp/packet-lpp-template.c" { &hf_lpp_svHealthExt_v1240_e5bhs, { "E5b Signal Health Status", "lpp.svHealthExt_v1240.e5bhs", FT_UINT8, BASE_DEC, VALS(lpp_signal_health_status_vals), 0, @@ -20769,7 +20769,7 @@ void proto_register_lpp(void) { &ett_lpp_BT_TargetDeviceErrorCauses_r13, /*--- End of included file: packet-lpp-ettarr.c ---*/ -#line 1791 "./asn1/lpp/packet-lpp-template.c" +#line 1779 "./asn1/lpp/packet-lpp-template.c" }; diff --git a/epan/dissectors/packet-lpp.h b/epan/dissectors/packet-lpp.h index 31ca374e28..d0417b2337 100644 --- a/epan/dissectors/packet-lpp.h +++ b/epan/dissectors/packet-lpp.h @@ -56,6 +56,6 @@ int dissect_lpp_HorizontalVelocity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ int dissect_lpp_Polygon_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-lpp-exp.h ---*/ -#line 31 "./asn1/lpp/packet-lpp-template.h" +#line 19 "./asn1/lpp/packet-lpp-template.h" #endif /* PACKET_LPP_H */ diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c index ba8cabefaa..039a75d6a1 100644 --- a/epan/dissectors/packet-lppa.c +++ b/epan/dissectors/packet-lppa.c @@ -251,7 +251,7 @@ static int hf_lppa_oTDOA_Information_Type_Item = -1; /* OTDOA_Information_Item static int hf_lppa_privateIEs = -1; /* PrivateIE_Container */ /*--- End of included file: packet-lppa-hf.c ---*/ -#line 45 "./asn1/lppa/packet-lppa-template.c" +#line 33 "./asn1/lppa/packet-lppa-template.c" /* Initialize the subtree pointers */ static gint ett_lppa = -1; @@ -339,7 +339,7 @@ static gint ett_lppa_ErrorIndication = -1; static gint ett_lppa_PrivateMessage = -1; /*--- End of included file: packet-lppa-ett.c ---*/ -#line 49 "./asn1/lppa/packet-lppa-template.c" +#line 37 "./asn1/lppa/packet-lppa-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -409,7 +409,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-lppa-val.h ---*/ -#line 62 "./asn1/lppa/packet-lppa-template.c" +#line 50 "./asn1/lppa/packet-lppa-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); @@ -3582,7 +3582,7 @@ static int dissect_PrivateMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-lppa-fn.c ---*/ -#line 69 "./asn1/lppa/packet-lppa-template.c" +#line 57 "./asn1/lppa/packet-lppa-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -4451,7 +4451,7 @@ void proto_register_lppa(void) { "PrivateIE_Container", HFILL }}, /*--- End of included file: packet-lppa-hfarr.c ---*/ -#line 97 "./asn1/lppa/packet-lppa-template.c" +#line 85 "./asn1/lppa/packet-lppa-template.c" }; /* List of subtrees */ @@ -4541,7 +4541,7 @@ void proto_register_lppa(void) { &ett_lppa_PrivateMessage, /*--- End of included file: packet-lppa-ettarr.c ---*/ -#line 103 "./asn1/lppa/packet-lppa-template.c" +#line 91 "./asn1/lppa/packet-lppa-template.c" }; /* Register protocol */ @@ -4606,5 +4606,5 @@ proto_reg_handoff_lppa(void) /*--- End of included file: packet-lppa-dis-tab.c ---*/ -#line 125 "./asn1/lppa/packet-lppa-template.c" +#line 113 "./asn1/lppa/packet-lppa-template.c" } diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index 8fe0c9ac63..0302fd03ce 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -1653,7 +1653,7 @@ static int hf_lppe_T_srnMeasurements_rssi = -1; static int hf_lppe_T_srnMeasurements_rtd = -1; /*--- End of included file: packet-lppe-hf.c ---*/ -#line 50 "./asn1/lppe/packet-lppe-template.c" +#line 38 "./asn1/lppe/packet-lppe-template.c" /* Initialize the subtree pointers */ static gint ett_lppe = -1; @@ -2297,7 +2297,7 @@ static gint ett_lppe_OMA_LPPe_SRN_MeasurementMask = -1; static gint ett_lppe_T_srnMeasurements = -1; /*--- End of included file: packet-lppe-ett.c ---*/ -#line 54 "./asn1/lppe/packet-lppe-template.c" +#line 42 "./asn1/lppe/packet-lppe-template.c" /* Include constants */ @@ -2336,7 +2336,7 @@ static gint ett_lppe_T_srnMeasurements = -1; #define maxChannels 512 /*--- End of included file: packet-lppe-val.h ---*/ -#line 57 "./asn1/lppe/packet-lppe-template.c" +#line 45 "./asn1/lppe/packet-lppe-template.c" @@ -15416,7 +15416,7 @@ static int dissect_OMA_LPPe_MessageExtension_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-lppe-fn.c ---*/ -#line 60 "./asn1/lppe/packet-lppe-template.c" +#line 48 "./asn1/lppe/packet-lppe-template.c" /*--- proto_register_lpp -------------------------------------------*/ @@ -21850,7 +21850,7 @@ void proto_register_lppe(void) { NULL, HFILL }}, /*--- End of included file: packet-lppe-hfarr.c ---*/ -#line 69 "./asn1/lppe/packet-lppe-template.c" +#line 57 "./asn1/lppe/packet-lppe-template.c" }; /* List of subtrees */ @@ -22496,7 +22496,7 @@ void proto_register_lppe(void) { &ett_lppe_T_srnMeasurements, /*--- End of included file: packet-lppe-ettarr.c ---*/ -#line 75 "./asn1/lppe/packet-lppe-template.c" +#line 63 "./asn1/lppe/packet-lppe-template.c" }; diff --git a/epan/dissectors/packet-m2ap.c b/epan/dissectors/packet-m2ap.c index 63a2bdd894..da75cd2bb0 100644 --- a/epan/dissectors/packet-m2ap.c +++ b/epan/dissectors/packet-m2ap.c @@ -122,7 +122,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-m2ap-val.h ---*/ -#line 47 "./asn1/m2ap/packet-m2ap-template.c" +#line 35 "./asn1/m2ap/packet-m2ap-template.c" /* Initialize the protocol and registered fields */ static int proto_m2ap = -1; @@ -314,7 +314,7 @@ static int hf_m2ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_m2ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-m2ap-hf.c ---*/ -#line 54 "./asn1/m2ap/packet-m2ap-template.c" +#line 42 "./asn1/m2ap/packet-m2ap-template.c" /* Initialize the subtree pointers */ static int ett_m2ap = -1; @@ -411,7 +411,7 @@ static gint ett_m2ap_SuccessfulOutcome = -1; static gint ett_m2ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-m2ap-ett.c ---*/ -#line 60 "./asn1/m2ap/packet-m2ap-template.c" +#line 48 "./asn1/m2ap/packet-m2ap-template.c" static expert_field ei_m2ap_invalid_ip_address_len = EI_INIT; @@ -3447,7 +3447,7 @@ static int dissect_M2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-m2ap-fn.c ---*/ -#line 89 "./asn1/m2ap/packet-m2ap-template.c" +#line 77 "./asn1/m2ap/packet-m2ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -4239,7 +4239,7 @@ proto_register_m2ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-m2ap-hfarr.c ---*/ -#line 156 "./asn1/m2ap/packet-m2ap-template.c" +#line 144 "./asn1/m2ap/packet-m2ap-template.c" }; /* List of subtrees */ @@ -4338,7 +4338,7 @@ proto_register_m2ap(void) { &ett_m2ap_UnsuccessfulOutcome, /*--- End of included file: packet-m2ap-ettarr.c ---*/ -#line 164 "./asn1/m2ap/packet-m2ap-template.c" +#line 152 "./asn1/m2ap/packet-m2ap-template.c" }; expert_module_t* expert_m2ap; @@ -4450,5 +4450,5 @@ proto_reg_handoff_m2ap(void) /*--- End of included file: packet-m2ap-dis-tab.c ---*/ -#line 196 "./asn1/m2ap/packet-m2ap-template.c" +#line 184 "./asn1/m2ap/packet-m2ap-template.c" } diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index 6372fd1e16..b72d605c4e 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -96,7 +96,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-m3ap-val.h ---*/ -#line 52 "./asn1/m3ap/packet-m3ap-template.c" +#line 40 "./asn1/m3ap/packet-m3ap-template.c" /* Initialize the protocol and registered fields */ static int proto_m3ap = -1; @@ -209,7 +209,7 @@ static int hf_m3ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_m3ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-m3ap-hf.c ---*/ -#line 61 "./asn1/m3ap/packet-m3ap-template.c" +#line 49 "./asn1/m3ap/packet-m3ap-template.c" /* Initialize the subtree pointers */ static int ett_m3ap = -1; @@ -265,7 +265,7 @@ static gint ett_m3ap_SuccessfulOutcome = -1; static gint ett_m3ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-m3ap-ett.c ---*/ -#line 66 "./asn1/m3ap/packet-m3ap-template.c" +#line 54 "./asn1/m3ap/packet-m3ap-template.c" static expert_field ei_m3ap_invalid_ip_address_len = EI_INIT; @@ -2087,7 +2087,7 @@ static int dissect_M3AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-m3ap-fn.c ---*/ -#line 96 "./asn1/m3ap/packet-m3ap-template.c" +#line 84 "./asn1/m3ap/packet-m3ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2557,7 +2557,7 @@ void proto_register_m3ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-m3ap-hfarr.c ---*/ -#line 165 "./asn1/m3ap/packet-m3ap-template.c" +#line 153 "./asn1/m3ap/packet-m3ap-template.c" }; /* List of subtrees */ @@ -2615,7 +2615,7 @@ void proto_register_m3ap(void) { &ett_m3ap_UnsuccessfulOutcome, /*--- End of included file: packet-m3ap-ettarr.c ---*/ -#line 172 "./asn1/m3ap/packet-m3ap-template.c" +#line 160 "./asn1/m3ap/packet-m3ap-template.c" }; expert_module_t* expert_m3ap; @@ -2701,7 +2701,7 @@ proto_reg_handoff_m3ap(void) /*--- End of included file: packet-m3ap-dis-tab.c ---*/ -#line 210 "./asn1/m3ap/packet-m3ap-template.c" +#line 198 "./asn1/m3ap/packet-m3ap-template.c" dissector_add_uint("m3ap.extension", 17, create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap)); } else { diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 3b7f8f564d..e805d9d33a 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -710,7 +710,7 @@ 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 46 "./asn1/mms/packet-mms-template.c" +#line 34 "./asn1/mms/packet-mms-template.c" /* Initialize the subtree pointers */ static gint ett_mms = -1; @@ -927,7 +927,7 @@ static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; /*--- End of included file: packet-mms-ett.c ---*/ -#line 50 "./asn1/mms/packet-mms-template.c" +#line 38 "./asn1/mms/packet-mms-template.c" static expert_field ei_mms_mal_timeofday_encoding = EI_INIT; static expert_field ei_mms_mal_utctime_encoding = EI_INIT; @@ -7035,7 +7035,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, /*--- End of included file: packet-mms-fn.c ---*/ -#line 56 "./asn1/mms/packet-mms-template.c" +#line 44 "./asn1/mms/packet-mms-template.c" /* * Dissect MMS PDUs inside a PPDU. @@ -9744,7 +9744,7 @@ void proto_register_mms(void) { NULL, HFILL }}, /*--- End of included file: packet-mms-hfarr.c ---*/ -#line 96 "./asn1/mms/packet-mms-template.c" +#line 84 "./asn1/mms/packet-mms-template.c" }; /* List of subtrees */ @@ -9963,7 +9963,7 @@ void proto_register_mms(void) { &ett_mms_FileAttributes, /*--- End of included file: packet-mms-ettarr.c ---*/ -#line 102 "./asn1/mms/packet-mms-template.c" +#line 90 "./asn1/mms/packet-mms-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index 94d6ffe87d..4b2543a5cb 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -27,7 +27,7 @@ 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 28 "./asn1/mms/packet-mms-template.h" +#line 16 "./asn1/mms/packet-mms-template.h" #endif /* PACKET_MMS_H */ diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index cbf0924f97..1a78ae1725 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -52,7 +52,7 @@ 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 33 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 21 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-ett.c ---*/ #line 1 "./asn1/mpeg-audio/packet-mpeg-audio-ett.c" @@ -60,7 +60,7 @@ static gint ett_mpeg_audio_Audio = -1; static gint ett_mpeg_audio_ID3v1 = -1; /*--- End of included file: packet-mpeg-audio-ett.c ---*/ -#line 34 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 22 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-fn.c ---*/ #line 1 "./asn1/mpeg-audio/packet-mpeg-audio-fn.c" @@ -431,7 +431,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 35 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 23 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" void proto_register_mpeg_audio(void); void proto_reg_handoff_mpeg_audio(void); @@ -638,7 +638,7 @@ proto_register_mpeg_audio(void) NULL, HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 149 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 137 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" { &hf_mpeg_audio_data, { "Data", "mpeg-audio.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -662,7 +662,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 166 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 154 "./asn1/mpeg-audio/packet-mpeg-audio-template.c" }; proto_mpeg_audio = proto_register_protocol( diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index c86a3e266e..e9539d7838 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -80,7 +80,7 @@ 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 33 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 21 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-ett.c ---*/ #line 1 "./asn1/mpeg-pes/packet-mpeg-pes-ett.c" @@ -92,7 +92,7 @@ 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 34 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 22 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-fn.c ---*/ #line 1 "./asn1/mpeg-pes/packet-mpeg-pes-fn.c" @@ -460,7 +460,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 35 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 23 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" void proto_register_mpeg_pes(void); void proto_reg_handoff_mpeg_pes(void); @@ -1174,7 +1174,7 @@ proto_register_mpeg_pes(void) "BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 544 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 532 "./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 }}, @@ -1292,7 +1292,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 651 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 639 "./asn1/mpeg-pes/packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, &ett_mpeg_pes_trick_mode diff --git a/epan/dissectors/packet-mudurl.c b/epan/dissectors/packet-mudurl.c index df4178a27c..ef9a2cb71c 100644 --- a/epan/dissectors/packet-mudurl.c +++ b/epan/dissectors/packet-mudurl.c @@ -42,7 +42,7 @@ static int proto_mudurl = -1; static int hf_mudurl_MUDURLSyntax_PDU = -1; /* MUDURLSyntax */ /*--- End of included file: packet-mudurl-hf.c ---*/ -#line 44 "./asn1/mudurl/packet-mudurl-template.c" +#line 32 "./asn1/mudurl/packet-mudurl-template.c" /* Initialize the subtree pointers */ /* #include "packet-mudurl-ett.c" */ @@ -75,7 +75,7 @@ static int dissect_MUDURLSyntax_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-mudurl-fn.c ---*/ -#line 51 "./asn1/mudurl/packet-mudurl-template.c" +#line 39 "./asn1/mudurl/packet-mudurl-template.c" /*--- proto_register_mudurl ----------------------------------------------*/ @@ -92,7 +92,7 @@ void proto_register_mudurl(void) { NULL, HFILL }}, /*--- End of included file: packet-mudurl-hfarr.c ---*/ -#line 59 "./asn1/mudurl/packet-mudurl-template.c" +#line 47 "./asn1/mudurl/packet-mudurl-template.c" }; /* List of subtrees */ @@ -119,5 +119,5 @@ void proto_reg_handoff_mudurl(void) { /*--- End of included file: packet-mudurl-dis-tab.c ---*/ -#line 79 "./asn1/mudurl/packet-mudurl-template.c" +#line 67 "./asn1/mudurl/packet-mudurl-template.c" } diff --git a/epan/dissectors/packet-novell_pkis.c b/epan/dissectors/packet-novell_pkis.c index 86e84025dd..b3e67026e8 100644 --- a/epan/dissectors/packet-novell_pkis.c +++ b/epan/dissectors/packet-novell_pkis.c @@ -77,7 +77,7 @@ static int hf_novell_pkis_amount = -1; /* INTEGER */ static int hf_novell_pkis_amtExp10 = -1; /* INTEGER */ /*--- End of included file: packet-novell_pkis-hf.c ---*/ -#line 35 "./asn1/novell_pkis/packet-novell_pkis-template.c" +#line 23 "./asn1/novell_pkis/packet-novell_pkis-template.c" /*--- Included file: packet-novell_pkis-ett.c ---*/ #line 1 "./asn1/novell_pkis/packet-novell_pkis-ett.c" @@ -99,7 +99,7 @@ static gint ett_novell_pkis_RelianceLimits = -1; static gint ett_novell_pkis_MonetaryValue = -1; /*--- End of included file: packet-novell_pkis-ett.c ---*/ -#line 36 "./asn1/novell_pkis/packet-novell_pkis-template.c" +#line 24 "./asn1/novell_pkis/packet-novell_pkis-template.c" /*--- Included file: packet-novell_pkis-fn.c ---*/ #line 1 "./asn1/novell_pkis/packet-novell_pkis-fn.c" @@ -497,7 +497,7 @@ static int dissect_RelianceLimits_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-novell_pkis-fn.c ---*/ -#line 37 "./asn1/novell_pkis/packet-novell_pkis-template.c" +#line 25 "./asn1/novell_pkis/packet-novell_pkis-template.c" void proto_register_novell_pkis (void); void proto_reg_handoff_novell_pkis(void); @@ -514,7 +514,7 @@ void proto_reg_handoff_novell_pkis(void) /*--- End of included file: packet-novell_pkis-dis-tab.c ---*/ -#line 46 "./asn1/novell_pkis/packet-novell_pkis-template.c" +#line 34 "./asn1/novell_pkis/packet-novell_pkis-template.c" } void proto_register_novell_pkis (void) @@ -705,7 +705,7 @@ void proto_register_novell_pkis (void) "INTEGER", HFILL }}, /*--- End of included file: packet-novell_pkis-hfarr.c ---*/ -#line 52 "./asn1/novell_pkis/packet-novell_pkis-template.c" +#line 40 "./asn1/novell_pkis/packet-novell_pkis-template.c" }; static gint *ett[] = { @@ -729,7 +729,7 @@ void proto_register_novell_pkis (void) &ett_novell_pkis_MonetaryValue, /*--- End of included file: packet-novell_pkis-ettarr.c ---*/ -#line 55 "./asn1/novell_pkis/packet-novell_pkis-template.c" +#line 43 "./asn1/novell_pkis/packet-novell_pkis-template.c" }; /* execute protocol initialization only once */ diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index d0d7b5f04d..b4e1157a2f 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -54,7 +54,7 @@ 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 40 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 28 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /* Initialize the subtree pointers */ @@ -63,7 +63,7 @@ static int hf_ns_cert_exts_CertType_object_signing_ca = -1; static gint ett_ns_cert_exts_CertType = -1; /*--- End of included file: packet-ns_cert_exts-ett.c ---*/ -#line 43 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 31 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /*--- Included file: packet-ns_cert_exts-fn.c ---*/ @@ -228,7 +228,7 @@ static int dissect_CertType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-ns_cert_exts-fn.c ---*/ -#line 45 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 33 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /*--- proto_register_ns_cert_exts -------------------------------------------*/ @@ -305,7 +305,7 @@ void proto_register_ns_cert_exts(void) { NULL, HFILL }}, /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 53 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 41 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* List of subtrees */ @@ -316,7 +316,7 @@ void proto_register_ns_cert_exts(void) { &ett_ns_cert_exts_CertType, /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/ -#line 58 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 46 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* Register protocol */ @@ -345,6 +345,6 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 73 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 61 "./asn1/ns_cert_exts/packet-ns_cert_exts-template.c" } diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 3585deeec8..e1f3e02d5f 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -97,7 +97,7 @@ static int hf_ocsp_crlNum = -1; /* INTEGER */ static int hf_ocsp_crlTime = -1; /* GeneralizedTime */ /*--- End of included file: packet-ocsp-hf.c ---*/ -#line 48 "./asn1/ocsp/packet-ocsp-template.c" +#line 36 "./asn1/ocsp/packet-ocsp-template.c" /* Initialize the subtree pointers */ static gint ett_ocsp = -1; @@ -125,7 +125,7 @@ static gint ett_ocsp_ServiceLocator = -1; static gint ett_ocsp_CrlID = -1; /*--- End of included file: packet-ocsp-ett.c ---*/ -#line 52 "./asn1/ocsp/packet-ocsp-template.c" +#line 40 "./asn1/ocsp/packet-ocsp-template.c" /*--- Included file: packet-ocsp-fn.c ---*/ @@ -663,7 +663,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-ocsp-fn.c ---*/ -#line 54 "./asn1/ocsp/packet-ocsp-template.c" +#line 42 "./asn1/ocsp/packet-ocsp-template.c" static int @@ -931,7 +931,7 @@ void proto_register_ocsp(void) { "GeneralizedTime", HFILL }}, /*--- End of included file: packet-ocsp-hfarr.c ---*/ -#line 109 "./asn1/ocsp/packet-ocsp-template.c" +#line 97 "./asn1/ocsp/packet-ocsp-template.c" }; /* List of subtrees */ @@ -961,7 +961,7 @@ void proto_register_ocsp(void) { &ett_ocsp_CrlID, /*--- End of included file: packet-ocsp-ettarr.c ---*/ -#line 115 "./asn1/ocsp/packet-ocsp-template.c" +#line 103 "./asn1/ocsp/packet-ocsp-template.c" }; /* Register protocol */ @@ -997,6 +997,6 @@ void proto_reg_handoff_ocsp(void) { /*--- End of included file: packet-ocsp-dis-tab.c ---*/ -#line 138 "./asn1/ocsp/packet-ocsp-template.c" +#line 126 "./asn1/ocsp/packet-ocsp-template.c" } diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index f5d3e0f4c1..cdbef328d2 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -619,7 +619,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 59 "./asn1/p1/packet-p1-template.c" +#line 47 "./asn1/p1/packet-p1-template.c" /* Initialize the subtree pointers */ static gint ett_p1 = -1; @@ -814,7 +814,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 70 "./asn1/p1/packet-p1-template.c" +#line 58 "./asn1/p1/packet-p1-template.c" static expert_field ei_p1_unknown_extension_attribute_type = EI_INIT; static expert_field ei_p1_unknown_standard_extension = EI_INIT; @@ -874,7 +874,7 @@ static const value_string p3_err_code_string_vals[] = { /*--- End of included file: packet-p1-table.c ---*/ -#line 86 "./asn1/p1/packet-p1-template.c" +#line 74 "./asn1/p1/packet-p1-template.c" #define P1_ADDRESS_CTX "p1-address-ctx" typedef struct p1_address_ctx { @@ -8376,7 +8376,7 @@ static int dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-p1-fn.c ---*/ -#line 163 "./asn1/p1/packet-p1-template.c" +#line 151 "./asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-table11.c ---*/ @@ -8408,7 +8408,7 @@ static const ros_opr_t p3_opr_tab[] = { /*--- End of included file: packet-p1-table11.c ---*/ -#line 165 "./asn1/p1/packet-p1-template.c" +#line 153 "./asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-table21.c ---*/ #line 1 "./asn1/p1/packet-p1-table21.c" @@ -8453,7 +8453,7 @@ static const ros_err_t p3_err_tab[] = { /*--- End of included file: packet-p1-table21.c ---*/ -#line 166 "./asn1/p1/packet-p1-template.c" +#line 154 "./asn1/p1/packet-p1-template.c" static const ros_info_t p3_ros_info = { "P3", @@ -10875,7 +10875,7 @@ void proto_register_p1(void) { NULL, HFILL }}, /*--- End of included file: packet-p1-hfarr.c ---*/ -#line 335 "./asn1/p1/packet-p1-template.c" +#line 323 "./asn1/p1/packet-p1-template.c" }; /* List of subtrees */ @@ -11072,7 +11072,7 @@ void proto_register_p1(void) { &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, /*--- End of included file: packet-p1-ettarr.c ---*/ -#line 348 "./asn1/p1/packet-p1-template.c" +#line 336 "./asn1/p1/packet-p1-template.c" }; static ei_register_info ei[] = { @@ -11122,7 +11122,7 @@ void proto_register_p1(void) { register_ber_syntax_dissector("ORName", proto_p1, dissect_ORName_PDU); /*--- End of included file: packet-p1-syn-reg.c ---*/ -#line 390 "./asn1/p1/packet-p1-template.c" +#line 378 "./asn1/p1/packet-p1-template.c" } @@ -11286,7 +11286,7 @@ void proto_reg_handoff_p1(void) { /*--- End of included file: packet-p1-dis-tab.c ---*/ -#line 396 "./asn1/p1/packet-p1-template.c" +#line 384 "./asn1/p1/packet-p1-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-p1.h b/epan/dissectors/packet-p1.h index 1f456d32e6..e994ee7874 100644 --- a/epan/dissectors/packet-p1.h +++ b/epan/dissectors/packet-p1.h @@ -158,7 +158,7 @@ #define ub_x121_address_length 16 /*--- End of included file: packet-p1-val.h ---*/ -#line 28 "./asn1/p1/packet-p1-template.h" +#line 16 "./asn1/p1/packet-p1-template.h" void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean report_unknown_cont_type); const char* p1_get_last_oraddress(asn1_ctx_t* actx); @@ -219,7 +219,7 @@ int dissect_p1_SecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o int dissect_p1_MessageSecurityLabel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-p1-exp.h ---*/ -#line 33 "./asn1/p1/packet-p1-template.h" +#line 21 "./asn1/p1/packet-p1-template.h" void proto_reg_handoff_p1(void); void proto_register_p1(void); diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index 269d4e2731..7e57e50dd7 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -323,7 +323,7 @@ static const value_string charsetreg_vals [] = { #define ub_telephone_number 32 /*--- End of included file: packet-p22-val.h ---*/ -#line 79 "./asn1/p22/packet-p22-template.c" +#line 67 "./asn1/p22/packet-p22-template.c" /*--- Included file: packet-p22-hf.c ---*/ @@ -708,7 +708,7 @@ 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 81 "./asn1/p22/packet-p22-template.c" +#line 69 "./asn1/p22/packet-p22-template.c" /* Initialize the subtree pointers */ static gint ett_p22 = -1; @@ -842,7 +842,7 @@ 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 85 "./asn1/p22/packet-p22-template.c" +#line 73 "./asn1/p22/packet-p22-template.c" /*--- Included file: packet-p22-fn.c ---*/ @@ -4659,7 +4659,7 @@ static int dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pin /*--- End of included file: packet-p22-fn.c ---*/ -#line 87 "./asn1/p22/packet-p22-template.c" +#line 75 "./asn1/p22/packet-p22-template.c" /* * Dissect P22 PDUs inside a PPDU. @@ -6205,7 +6205,7 @@ void proto_register_p22(void) { NULL, HFILL }}, /*--- End of included file: packet-p22-hfarr.c ---*/ -#line 120 "./asn1/p22/packet-p22-template.c" +#line 108 "./asn1/p22/packet-p22-template.c" }; /* List of subtrees */ @@ -6341,7 +6341,7 @@ void proto_register_p22(void) { &ett_p22_T_choice, /*--- End of included file: packet-p22-ettarr.c ---*/ -#line 126 "./asn1/p22/packet-p22-template.c" +#line 114 "./asn1/p22/packet-p22-template.c" }; /* Register protocol */ @@ -6461,7 +6461,7 @@ void proto_reg_handoff_p22(void) { /*--- End of included file: packet-p22-dis-tab.c ---*/ -#line 142 "./asn1/p22/packet-p22-template.c" +#line 130 "./asn1/p22/packet-p22-template.c" register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); diff --git a/epan/dissectors/packet-p22.h b/epan/dissectors/packet-p22.h index 666d8d4476..7f4162dfb1 100644 --- a/epan/dissectors/packet-p22.h +++ b/epan/dissectors/packet-p22.h @@ -37,7 +37,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 28 "./asn1/p22/packet-p22-template.h" +#line 16 "./asn1/p22/packet-p22-template.h" void proto_reg_handoff_p22(void); void proto_register_p22(void); diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 03153f5c9e..d079f023a6 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -104,7 +104,7 @@ static int proto_p7 = -1; #define ub_ua_restrictions 16 /*--- End of included file: packet-p7-val.h ---*/ -#line 53 "./asn1/p7/packet-p7-template.c" +#line 41 "./asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-hf.c ---*/ @@ -476,7 +476,7 @@ 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 55 "./asn1/p7/packet-p7-template.c" +#line 43 "./asn1/p7/packet-p7-template.c" /* Initialize the subtree pointers */ static gint ett_p7 = -1; @@ -618,7 +618,7 @@ static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; /*--- End of included file: packet-p7-ett.c ---*/ -#line 59 "./asn1/p7/packet-p7-template.c" +#line 47 "./asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table.c ---*/ @@ -661,7 +661,7 @@ static const value_string p7_err_code_string_vals[] = { /*--- End of included file: packet-p7-table.c ---*/ -#line 61 "./asn1/p7/packet-p7-template.c" +#line 49 "./asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-fn.c ---*/ @@ -4106,7 +4106,7 @@ static int dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-p7-fn.c ---*/ -#line 63 "./asn1/p7/packet-p7-template.c" +#line 51 "./asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table11.c ---*/ @@ -4138,7 +4138,7 @@ static const ros_opr_t p7_opr_tab[] = { /*--- End of included file: packet-p7-table11.c ---*/ -#line 65 "./asn1/p7/packet-p7-template.c" +#line 53 "./asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table21.c ---*/ #line 1 "./asn1/p7/packet-p7-table21.c" @@ -4177,7 +4177,7 @@ static const ros_err_t p7_err_tab[] = { /*--- End of included file: packet-p7-table21.c ---*/ -#line 66 "./asn1/p7/packet-p7-template.c" +#line 54 "./asn1/p7/packet-p7-template.c" static const ros_info_t p7_ros_info = { "P7", @@ -5657,7 +5657,7 @@ void proto_register_p7(void) { NULL, HFILL }}, /*--- End of included file: packet-p7-hfarr.c ---*/ -#line 85 "./asn1/p7/packet-p7-template.c" +#line 73 "./asn1/p7/packet-p7-template.c" }; /* List of subtrees */ @@ -5801,7 +5801,7 @@ void proto_register_p7(void) { &ett_p7_RTABapdu, /*--- End of included file: packet-p7-ettarr.c ---*/ -#line 91 "./asn1/p7/packet-p7-template.c" +#line 79 "./asn1/p7/packet-p7-template.c" }; module_t *p7_module; @@ -5860,7 +5860,7 @@ void proto_reg_handoff_p7(void) { /*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 117 "./asn1/p7/packet-p7-template.c" +#line 105 "./asn1/p7/packet-p7-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-p7.h b/epan/dissectors/packet-p7.h index 5b21c82550..670b677694 100644 --- a/epan/dissectors/packet-p7.h +++ b/epan/dissectors/packet-p7.h @@ -28,6 +28,6 @@ int dissect_p7_SequenceNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int 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 28 "./asn1/p7/packet-p7-template.h" +#line 16 "./asn1/p7/packet-p7-template.h" #endif /* PACKET_P7_H */ diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index bd79679830..5ae0fc0874 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -151,7 +151,7 @@ static int proto_p772 = -1; #define ub_data_size 65535 /*--- End of included file: packet-p772-val.h ---*/ -#line 49 "./asn1/p772/packet-p772-template.c" +#line 37 "./asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-hf.c ---*/ @@ -237,7 +237,7 @@ 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 51 "./asn1/p772/packet-p772-template.c" +#line 39 "./asn1/p772/packet-p772-template.c" /* Initialize the subtree pointers */ static gint ett_p772 = -1; @@ -273,7 +273,7 @@ static gint ett_p772_MMMessageParameters = -1; static gint ett_p772_Acp127NotificationType = -1; /*--- End of included file: packet-p772-ett.c ---*/ -#line 55 "./asn1/p772/packet-p772-template.c" +#line 43 "./asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-fn.c ---*/ @@ -1278,7 +1278,7 @@ static int dissect_Acp127NotificationType_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-p772-fn.c ---*/ -#line 57 "./asn1/p772/packet-p772-template.c" +#line 45 "./asn1/p772/packet-p772-template.c" /* @@ -1630,7 +1630,7 @@ void proto_register_p772(void) { NULL, HFILL }}, /*--- End of included file: packet-p772-hfarr.c ---*/ -#line 92 "./asn1/p772/packet-p772-template.c" +#line 80 "./asn1/p772/packet-p772-template.c" }; /* List of subtrees */ @@ -1668,7 +1668,7 @@ void proto_register_p772(void) { &ett_p772_Acp127NotificationType, /*--- End of included file: packet-p772-ettarr.c ---*/ -#line 98 "./asn1/p772/packet-p772-template.c" +#line 86 "./asn1/p772/packet-p772-template.c" }; /* Register protocol */ @@ -1722,7 +1722,7 @@ void proto_reg_handoff_p772(void) { /*--- End of included file: packet-p772-dis-tab.c ---*/ -#line 116 "./asn1/p772/packet-p772-template.c" +#line 104 "./asn1/p772/packet-p772-template.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406"); } diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 22a4183c61..70f66e9166 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -240,7 +240,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-pcap-val.h ---*/ -#line 60 "./asn1/pcap/packet-pcap-template.c" +#line 48 "./asn1/pcap/packet-pcap-template.c" static dissector_handle_t pcap_handle = NULL; @@ -1393,7 +1393,7 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-pcap-hf.c ---*/ -#line 67 "./asn1/pcap/packet-pcap-template.c" +#line 55 "./asn1/pcap/packet-pcap-template.c" /* Initialize the subtree pointers */ static int ett_pcap = -1; @@ -1796,7 +1796,7 @@ static gint ett_pcap_UnsuccessfulOutcome = -1; static gint ett_pcap_Outcome = -1; /*--- End of included file: packet-pcap-ett.c ---*/ -#line 72 "./asn1/pcap/packet-pcap-template.c" +#line 60 "./asn1/pcap/packet-pcap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -13506,7 +13506,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 96 "./asn1/pcap/packet-pcap-template.c" +#line 84 "./asn1/pcap/packet-pcap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -13706,7 +13706,7 @@ proto_reg_handoff_pcap(void) /*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 155 "./asn1/pcap/packet-pcap-template.c" +#line 143 "./asn1/pcap/packet-pcap-template.c" } else { dissector_delete_uint_range("sccp.ssn", ssn_range, pcap_handle); wmem_free(wmem_epan_scope(), ssn_range); @@ -18287,7 +18287,7 @@ void proto_register_pcap(void) { NULL, HFILL }}, /*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 171 "./asn1/pcap/packet-pcap-template.c" +#line 159 "./asn1/pcap/packet-pcap-template.c" }; /* List of subtrees */ @@ -18691,7 +18691,7 @@ void proto_register_pcap(void) { &ett_pcap_Outcome, /*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 177 "./asn1/pcap/packet-pcap-template.c" +#line 165 "./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 d3d65cd96a..7740de2b62 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -65,7 +65,7 @@ static int hf_pkcs1_r = -1; /* INTEGER */ static int hf_pkcs1_s = -1; /* INTEGER */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 44 "./asn1/pkcs1/packet-pkcs1-template.c" +#line 32 "./asn1/pkcs1/packet-pkcs1-template.c" /* Initialize the subtree pointers */ @@ -82,7 +82,7 @@ static gint ett_pkcs1_DSA_Sig_Value = -1; static gint ett_pkcs1_ECDSA_Sig_Value = -1; /*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 47 "./asn1/pkcs1/packet-pkcs1-template.c" +#line 35 "./asn1/pkcs1/packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ @@ -332,7 +332,7 @@ static int dissect_ECParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 49 "./asn1/pkcs1/packet-pkcs1-template.c" +#line 37 "./asn1/pkcs1/packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -440,7 +440,7 @@ void proto_register_pkcs1(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 56 "./asn1/pkcs1/packet-pkcs1-template.c" +#line 44 "./asn1/pkcs1/packet-pkcs1-template.c" }; /* List of subtrees */ @@ -459,7 +459,7 @@ void proto_register_pkcs1(void) { &ett_pkcs1_ECDSA_Sig_Value, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 61 "./asn1/pkcs1/packet-pkcs1-template.c" +#line 49 "./asn1/pkcs1/packet-pkcs1-template.c" }; /* Register protocol */ @@ -488,7 +488,7 @@ void proto_reg_handoff_pkcs1(void) { /*--- End of included file: packet-pkcs1-dis-tab.c ---*/ -#line 76 "./asn1/pkcs1/packet-pkcs1-template.c" +#line 64 "./asn1/pkcs1/packet-pkcs1-template.c" register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h index 92e1ae444e..ac2fd70a3e 100644 --- a/epan/dissectors/packet-pkcs1.h +++ b/epan/dissectors/packet-pkcs1.h @@ -27,7 +27,7 @@ int dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int 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 28 "./asn1/pkcs1/packet-pkcs1-template.h" +#line 16 "./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 fa991f95c8..2a636eb3f8 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -124,7 +124,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 76 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 64 "./asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -151,7 +151,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 79 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 67 "./asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1107,7 +1107,7 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 374 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 362 "./asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1392,7 +1392,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 450 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 438 "./asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1422,7 +1422,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 456 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 444 "./asn1/pkcs12/packet-pkcs12-template.c" }; static ei_register_info ei[] = { { &ei_pkcs12_octet_string_expected, { "pkcs12.octet_string_expected", PI_PROTOCOL, PI_WARN, "BER Error: OCTET STRING expected", EXPFILL }}, @@ -1490,7 +1490,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 495 "./asn1/pkcs12/packet-pkcs12-template.c" +#line 483 "./asn1/pkcs12/packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index fd4eb25e22..9375ac5124 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -66,7 +66,7 @@ static int hf_pkinit_dhNonce = -1; /* INTEGER */ static int hf_pkinit_dhKeyExpiration = -1; /* KerberosTime */ /*--- End of included file: packet-pkinit-hf.c ---*/ -#line 45 "./asn1/pkinit/packet-pkinit-template.c" +#line 33 "./asn1/pkinit/packet-pkinit-template.c" /* Initialize the subtree pointers */ @@ -83,7 +83,7 @@ static gint ett_pkinit_PaPkAsRep = -1; static gint ett_pkinit_KDCDHKeyInfo = -1; /*--- End of included file: packet-pkinit-ett.c ---*/ -#line 48 "./asn1/pkinit/packet-pkinit-template.c" +#line 36 "./asn1/pkinit/packet-pkinit-template.c" static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); @@ -300,7 +300,7 @@ static int dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkinit-fn.c ---*/ -#line 55 "./asn1/pkinit/packet-pkinit-template.c" +#line 43 "./asn1/pkinit/packet-pkinit-template.c" int dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { @@ -445,7 +445,7 @@ void proto_register_pkinit(void) { "KerberosTime", HFILL }}, /*--- End of included file: packet-pkinit-hfarr.c ---*/ -#line 99 "./asn1/pkinit/packet-pkinit-template.c" +#line 87 "./asn1/pkinit/packet-pkinit-template.c" }; /* List of subtrees */ @@ -464,7 +464,7 @@ void proto_register_pkinit(void) { &ett_pkinit_KDCDHKeyInfo, /*--- End of included file: packet-pkinit-ettarr.c ---*/ -#line 104 "./asn1/pkinit/packet-pkinit-template.c" +#line 92 "./asn1/pkinit/packet-pkinit-template.c" }; /* Register protocol */ @@ -488,6 +488,6 @@ void proto_reg_handoff_pkinit(void) { /*--- End of included file: packet-pkinit-dis-tab.c ---*/ -#line 119 "./asn1/pkinit/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 51f3cb2008..72a540469c 100644 --- a/epan/dissectors/packet-pkinit.h +++ b/epan/dissectors/packet-pkinit.h @@ -31,7 +31,7 @@ int dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o 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 31 "./asn1/pkinit/packet-pkinit-template.h" +#line 19 "./asn1/pkinit/packet-pkinit-template.h" #endif /* PACKET_PKINIT_H */ diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index fd3eb86d5c..0805184893 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -94,7 +94,7 @@ 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 54 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 42 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" /* Initialize the subtree pointers */ @@ -124,7 +124,7 @@ static gint ett_pkix1explicit_ASIdOrRange = -1; static gint ett_pkix1explicit_ASRange = -1; /*--- End of included file: packet-pkix1explicit-ett.c ---*/ -#line 57 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 45 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" int dissect_pkix1explicit_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) { @@ -812,7 +812,7 @@ static int dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkix1explicit-fn.c ---*/ -#line 98 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 86 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" /*--- proto_register_pkix1explicit ----------------------------------------------*/ @@ -1008,7 +1008,7 @@ void proto_register_pkix1explicit(void) { "ASId", HFILL }}, /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ -#line 117 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 105 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* List of subtrees */ @@ -1041,7 +1041,7 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_ASRange, /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ -#line 123 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 111 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* Register protocol */ @@ -1068,6 +1068,6 @@ void proto_reg_handoff_pkix1explicit(void) { /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 140 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 128 "./asn1/pkix1explicit/packet-pkix1explicit-template.c" } diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h index 9f4483897c..da14990163 100644 --- a/epan/dissectors/packet-pkix1explicit.h +++ b/epan/dissectors/packet-pkix1explicit.h @@ -51,7 +51,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 "./asn1/pkix1explicit/packet-pkix1explicit-template.h" +#line 26 "./asn1/pkix1explicit/packet-pkix1explicit-template.h" #endif /* PACKET_PKIX1EXPLICIT_H */ diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 3fd2b56297..cf643d2fc8 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -55,7 +55,7 @@ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ /*--- End of included file: packet-pkix1implicit-hf.c ---*/ -#line 43 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 31 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" /* Initialize the subtree pointers */ @@ -69,7 +69,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; /*--- End of included file: packet-pkix1implicit-ett.c ---*/ -#line 46 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 34 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" int @@ -293,7 +293,7 @@ static int dissect_UserNotice_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-pkix1implicit-fn.c ---*/ -#line 62 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 50 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" /*--- proto_register_pkix1implicit ----------------------------------------------*/ @@ -366,7 +366,7 @@ void proto_register_pkix1implicit(void) { NULL, HFILL }}, /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ -#line 70 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 58 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* List of subtrees */ @@ -382,7 +382,7 @@ void proto_register_pkix1implicit(void) { &ett_pkix1implicit_DisplayText, /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ -#line 75 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 63 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* Register protocol */ @@ -438,6 +438,6 @@ void proto_reg_handoff_pkix1implicit(void) { /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 90 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 78 "./asn1/pkix1implicit/packet-pkix1implicit-template.c" } diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index e3e58595ad..1710607b84 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -30,7 +30,7 @@ int dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, t 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 30 "./asn1/pkix1implicit/packet-pkix1implicit-template.h" +#line 18 "./asn1/pkix1implicit/packet-pkix1implicit-template.h" #endif /* PACKET_PKIX1IMPLICIT_H */ diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index 9fb1ca219a..5a59226dfb 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -95,7 +95,7 @@ static int hf_pkixac_ClassList_secret = -1; static int hf_pkixac_ClassList_topSecret = -1; /*--- End of included file: packet-pkixac-hf.c ---*/ -#line 47 "./asn1/pkixac/packet-pkixac-template.c" +#line 35 "./asn1/pkixac/packet-pkixac-template.c" /* Initialize the subtree pointers */ static gint ett_pkixac = -1; @@ -122,7 +122,7 @@ static gint ett_pkixac_AttrSpec = -1; static gint ett_pkixac_ProxyInfo = -1; /*--- End of included file: packet-pkixac-ett.c ---*/ -#line 51 "./asn1/pkixac/packet-pkixac-template.c" +#line 39 "./asn1/pkixac/packet-pkixac-template.c" static const char *object_identifier_id; @@ -586,7 +586,7 @@ static int dissect_ProxyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pkixac-fn.c ---*/ -#line 55 "./asn1/pkixac/packet-pkixac-template.c" +#line 43 "./asn1/pkixac/packet-pkixac-template.c" /*--- proto_register_pkixac ----------------------------------------------*/ void proto_register_pkixac(void) { @@ -798,7 +798,7 @@ void proto_register_pkixac(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixac-hfarr.c ---*/ -#line 62 "./asn1/pkixac/packet-pkixac-template.c" +#line 50 "./asn1/pkixac/packet-pkixac-template.c" }; /* List of subtrees */ @@ -827,7 +827,7 @@ void proto_register_pkixac(void) { &ett_pkixac_ProxyInfo, /*--- End of included file: packet-pkixac-ettarr.c ---*/ -#line 68 "./asn1/pkixac/packet-pkixac-template.c" +#line 56 "./asn1/pkixac/packet-pkixac-template.c" }; /* Register protocol */ @@ -845,7 +845,7 @@ void proto_register_pkixac(void) { register_ber_syntax_dissector("RFC3281Clearance", proto_pkixac, dissect_RFC3281Clearance_PDU); /*--- End of included file: packet-pkixac-syn-reg.c ---*/ -#line 78 "./asn1/pkixac/packet-pkixac-template.c" +#line 66 "./asn1/pkixac/packet-pkixac-template.c" } @@ -868,6 +868,6 @@ void proto_reg_handoff_pkixac(void) { /*--- End of included file: packet-pkixac-dis-tab.c ---*/ -#line 85 "./asn1/pkixac/packet-pkixac-template.c" +#line 73 "./asn1/pkixac/packet-pkixac-template.c" } diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index ebd028d5d2..c7b576a01d 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -45,7 +45,7 @@ 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 43 "./asn1/pkixproxy/packet-pkixproxy-template.c" +#line 31 "./asn1/pkixproxy/packet-pkixproxy-template.c" /* Initialize the subtree pointers */ @@ -55,7 +55,7 @@ static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; /*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 46 "./asn1/pkixproxy/packet-pkixproxy-template.c" +#line 34 "./asn1/pkixproxy/packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ @@ -131,7 +131,7 @@ static int dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 48 "./asn1/pkixproxy/packet-pkixproxy-template.c" +#line 36 "./asn1/pkixproxy/packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -164,7 +164,7 @@ void proto_register_pkixproxy(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 56 "./asn1/pkixproxy/packet-pkixproxy-template.c" +#line 44 "./asn1/pkixproxy/packet-pkixproxy-template.c" }; /* List of subtrees */ @@ -176,7 +176,7 @@ void proto_register_pkixproxy(void) { &ett_pkixproxy_ProxyPolicy, /*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 61 "./asn1/pkixproxy/packet-pkixproxy-template.c" +#line 49 "./asn1/pkixproxy/packet-pkixproxy-template.c" }; /* Register protocol */ @@ -198,7 +198,7 @@ void proto_reg_handoff_pkixproxy(void) { /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 76 "./asn1/pkixproxy/packet-pkixproxy-template.c" +#line 64 "./asn1/pkixproxy/packet-pkixproxy-template.c" oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 8ce60b6807..564db0e447 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -63,7 +63,7 @@ static int hf_pkixqualified_nameRegistrationAuthorities = -1; /* NameRegistrati static int hf_pkixqualified_NameRegistrationAuthorities_item = -1; /* GeneralName */ /*--- End of included file: packet-pkixqualified-hf.c ---*/ -#line 46 "./asn1/pkixqualified/packet-pkixqualified-template.c" +#line 34 "./asn1/pkixqualified/packet-pkixqualified-template.c" /* Initialize the subtree pointers */ @@ -78,7 +78,7 @@ static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 49 "./asn1/pkixqualified/packet-pkixqualified-template.c" +#line 37 "./asn1/pkixqualified/packet-pkixqualified-template.c" static const char *object_identifier_id; @@ -354,7 +354,7 @@ static int dissect_XmppAddr_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 53 "./asn1/pkixqualified/packet-pkixqualified-template.c" +#line 41 "./asn1/pkixqualified/packet-pkixqualified-template.c" /*--- proto_register_pkixqualified ----------------------------------------------*/ @@ -447,7 +447,7 @@ void proto_register_pkixqualified(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 61 "./asn1/pkixqualified/packet-pkixqualified-template.c" +#line 49 "./asn1/pkixqualified/packet-pkixqualified-template.c" }; /* List of subtrees */ @@ -464,7 +464,7 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_NameRegistrationAuthorities, /*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 66 "./asn1/pkixqualified/packet-pkixqualified-template.c" +#line 54 "./asn1/pkixqualified/packet-pkixqualified-template.c" }; /* Register protocol */ @@ -495,6 +495,6 @@ void proto_reg_handoff_pkixqualified(void) { /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 81 "./asn1/pkixqualified/packet-pkixqualified-template.c" +#line 69 "./asn1/pkixqualified/packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 75d32f153f..1812f85b67 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -75,7 +75,7 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; /*--- End of included file: packet-pkixtsp-hf.c ---*/ -#line 45 "./asn1/pkixtsp/packet-pkixtsp-template.c" +#line 33 "./asn1/pkixtsp/packet-pkixtsp-template.c" /* Initialize the subtree pointers */ static gint ett_pkixtsp = -1; @@ -91,7 +91,7 @@ static gint ett_pkixtsp_TSTInfo = -1; static gint ett_pkixtsp_Accuracy = -1; /*--- End of included file: packet-pkixtsp-ett.c ---*/ -#line 49 "./asn1/pkixtsp/packet-pkixtsp-template.c" +#line 37 "./asn1/pkixtsp/packet-pkixtsp-template.c" @@ -366,7 +366,7 @@ static int dissect_SignatureTimeStampToken_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-pkixtsp-fn.c ---*/ -#line 52 "./asn1/pkixtsp/packet-pkixtsp-template.c" +#line 40 "./asn1/pkixtsp/packet-pkixtsp-template.c" static int @@ -550,7 +550,7 @@ void proto_register_pkixtsp(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 103 "./asn1/pkixtsp/packet-pkixtsp-template.c" +#line 91 "./asn1/pkixtsp/packet-pkixtsp-template.c" }; /* List of subtrees */ @@ -568,7 +568,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_Accuracy, /*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 109 "./asn1/pkixtsp/packet-pkixtsp-template.c" +#line 97 "./asn1/pkixtsp/packet-pkixtsp-template.c" }; /* Register protocol */ @@ -600,6 +600,6 @@ void proto_reg_handoff_pkixtsp(void) { /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 133 "./asn1/pkixtsp/packet-pkixtsp-template.c" +#line 121 "./asn1/pkixtsp/packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index b020efc6b9..ac29f34c6d 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -164,7 +164,7 @@ 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 89 "./asn1/pres/packet-pres-template.c" +#line 77 "./asn1/pres/packet-pres-template.c" /* Initialize the subtree pointers */ static gint ett_pres = -1; @@ -210,7 +210,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 94 "./asn1/pres/packet-pres-template.c" +#line 82 "./asn1/pres/packet-pres-template.c" static expert_field ei_pres_dissector_not_available = EI_INIT; static expert_field ei_pres_wrong_spdu_type = EI_INIT; @@ -1331,7 +1331,7 @@ static int dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-pres-fn.c ---*/ -#line 208 "./asn1/pres/packet-pres-template.c" +#line 196 "./asn1/pres/packet-pres-template.c" /* @@ -1813,7 +1813,7 @@ void proto_register_pres(void) { NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 377 "./asn1/pres/packet-pres-template.c" +#line 365 "./asn1/pres/packet-pres-template.c" }; /* List of subtrees */ @@ -1860,7 +1860,7 @@ void proto_register_pres(void) { &ett_pres_UD_type, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 383 "./asn1/pres/packet-pres-template.c" +#line 371 "./asn1/pres/packet-pres-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 049f93e7e1..c7c62cf8eb 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -64,7 +64,7 @@ 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 43 "./asn1/q932-ros/packet-q932-ros-template.c" +#line 31 "./asn1/q932-ros/packet-q932-ros-template.c" /* Initialize the subtree pointers */ @@ -82,7 +82,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 46 "./asn1/q932-ros/packet-q932-ros-template.c" +#line 34 "./asn1/q932-ros/packet-q932-ros-template.c" static expert_field ei_ros_undecoded = EI_INIT; @@ -665,7 +665,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 63 "./asn1/q932-ros/packet-q932-ros-template.c" +#line 51 "./asn1/q932-ros/packet-q932-ros-template.c" /*--- dissect_q932_ros -----------------------------------------------------*/ static int dissect_q932_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { @@ -783,7 +783,7 @@ void proto_register_q932_ros(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 80 "./asn1/q932-ros/packet-q932-ros-template.c" +#line 68 "./asn1/q932-ros/packet-q932-ros-template.c" }; /* List of subtrees */ @@ -803,7 +803,7 @@ void proto_register_q932_ros(void) { &ett_q932_ros_InvokeId, /*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 85 "./asn1/q932-ros/packet-q932-ros-template.c" +#line 73 "./asn1/q932-ros/packet-q932-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 399548e4ac..be38882c9a 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -83,7 +83,7 @@ static int hf_q932_destinationEntity = -1; /* EntityType */ static int hf_q932_destinationEntityAddress = -1; /* AddressInformation */ /*--- End of included file: packet-q932-hf.c ---*/ -#line 49 "./asn1/q932/packet-q932-template.c" +#line 37 "./asn1/q932/packet-q932-template.c" /* Initialize the subtree pointers */ static gint ett_q932 = -1; @@ -106,7 +106,7 @@ static gint ett_q932_UserSpecifiedSubaddress = -1; static gint ett_q932_NetworkFacilityExtension_U = -1; /*--- End of included file: packet-q932-ett.c ---*/ -#line 54 "./asn1/q932/packet-q932-template.c" +#line 42 "./asn1/q932/packet-q932-template.c" static expert_field ei_q932_dse_not_supported = EI_INIT; static expert_field ei_q932_acse_not_supported = EI_INIT; @@ -704,7 +704,7 @@ static int dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-q932-fn.c ---*/ -#line 143 "./asn1/q932/packet-q932-template.c" +#line 131 "./asn1/q932/packet-q932-template.c" /*--- dissect_q932_facility_ie -------------------------------------------------------*/ static void @@ -1027,7 +1027,7 @@ void proto_register_q932(void) { "AddressInformation", HFILL }}, /*--- End of included file: packet-q932-hfarr.c ---*/ -#line 313 "./asn1/q932/packet-q932-template.c" +#line 301 "./asn1/q932/packet-q932-template.c" }; /* List of subtrees */ @@ -1052,7 +1052,7 @@ void proto_register_q932(void) { &ett_q932_NetworkFacilityExtension_U, /*--- End of included file: packet-q932-ettarr.c ---*/ -#line 320 "./asn1/q932/packet-q932-template.c" +#line 308 "./asn1/q932/packet-q932-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h index f64174985e..f1fbe16c59 100644 --- a/epan/dissectors/packet-q932.h +++ b/epan/dissectors/packet-q932.h @@ -41,7 +41,7 @@ WS_DLL_PUBLIC int dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvb WS_DLL_PUBLIC int dissect_q932_PresentationAllowedIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-q932-exp.h ---*/ -#line 28 "./asn1/q932/packet-q932-template.h" +#line 16 "./asn1/q932/packet-q932-template.h" #endif /* PACKET_Q932_H */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 9c21f11851..84fc56b412 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -478,7 +478,7 @@ static const value_string qsig_str_operation[] = { { 120, "mIDMailboxID" }, /*--- End of included file: packet-qsig-table10.c ---*/ -#line 273 "./asn1/qsig/packet-qsig-template.c" +#line 261 "./asn1/qsig/packet-qsig-template.c" { 0, NULL} }; @@ -670,7 +670,7 @@ static const value_string qsig_str_error[] = { { 1008, "unspecified" }, /*--- End of included file: packet-qsig-table20.c ---*/ -#line 278 "./asn1/qsig/packet-qsig-template.c" +#line 266 "./asn1/qsig/packet-qsig-template.c" { 0, NULL} }; @@ -1565,7 +1565,7 @@ static int hf_qsig_mid_multipleExtension = -1; /* SEQUENCE_OF_Extension */ static int hf_qsig_mid_multipleExtension_item = -1; /* Extension */ /*--- End of included file: packet-qsig-hf.c ---*/ -#line 294 "./asn1/qsig/packet-qsig-template.c" +#line 282 "./asn1/qsig/packet-qsig-template.c" static int *hf_qsig_ie_type_arr[] = { NULL, @@ -2025,7 +2025,7 @@ static gint ett_qsig_mid_MIDExtensions = -1; static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1; /*--- End of included file: packet-qsig-ett.c ---*/ -#line 311 "./asn1/qsig/packet-qsig-template.c" +#line 299 "./asn1/qsig/packet-qsig-template.c" static gint ett_cnq_PSS1InformationElement = -1; /* static expert_field ei_qsig_unsupported_arg_type = EI_INIT; */ @@ -11917,7 +11917,7 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-qsig-fn.c ---*/ -#line 329 "./asn1/qsig/packet-qsig-template.c" +#line 317 "./asn1/qsig/packet-qsig-template.c" typedef struct _qsig_op_t { gint32 opcode; @@ -12139,7 +12139,7 @@ static const qsig_op_t qsig_op_tab[] = { /* mIDMailboxID */ { 120, dissect_qsig_mid_MIDMailboxIDArg_PDU, dissect_qsig_mid_MIDDummyRes_PDU }, /*--- End of included file: packet-qsig-table11.c ---*/ -#line 338 "./asn1/qsig/packet-qsig-template.c" +#line 326 "./asn1/qsig/packet-qsig-template.c" }; typedef struct _qsig_err_t { @@ -12335,7 +12335,7 @@ static const qsig_err_t qsig_err_tab[] = { /* unspecified */ { 1008, dissect_qsig_mid_Extension_PDU }, /*--- End of included file: packet-qsig-table21.c ---*/ -#line 347 "./asn1/qsig/packet-qsig-template.c" +#line 335 "./asn1/qsig/packet-qsig-template.c" }; static const qsig_op_t *get_op(gint32 opcode) { @@ -15871,7 +15871,7 @@ void proto_register_qsig(void) { NULL, HFILL }}, /*--- End of included file: packet-qsig-hfarr.c ---*/ -#line 645 "./asn1/qsig/packet-qsig-template.c" +#line 633 "./asn1/qsig/packet-qsig-template.c" }; /* List of subtrees */ @@ -16322,7 +16322,7 @@ void proto_register_qsig(void) { &ett_qsig_mid_SEQUENCE_OF_Extension, /*--- End of included file: packet-qsig-ettarr.c ---*/ -#line 653 "./asn1/qsig/packet-qsig-template.c" +#line 641 "./asn1/qsig/packet-qsig-template.c" &ett_cnq_PSS1InformationElement, }; diff --git a/epan/dissectors/packet-qsig.h b/epan/dissectors/packet-qsig.h index af4092eaee..d9a045a2de 100644 --- a/epan/dissectors/packet-qsig.h +++ b/epan/dissectors/packet-qsig.h @@ -119,7 +119,7 @@ WS_DLL_PUBLIC int dissect_qsig_na_Name(gboolean implicit_tag _U_, tvbuff_t *tvb /*--- End of included file: packet-qsig-exp.h ---*/ -#line 28 "./asn1/qsig/packet-qsig-template.h" +#line 16 "./asn1/qsig/packet-qsig-template.h" #endif /* PACKET_QSIG_H */ diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 6a4a47665a..aa0913856e 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -445,7 +445,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-ranap-val.h ---*/ -#line 61 "./asn1/ranap/packet-ranap-template.c" +#line 49 "./asn1/ranap/packet-ranap-template.c" void proto_register_ranap(void); void proto_reg_handoff_ranap(void); @@ -1259,7 +1259,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 79 "./asn1/ranap/packet-ranap-template.c" +#line 67 "./asn1/ranap/packet-ranap-template.c" /* Initialize the subtree pointers */ static int ett_ranap = -1; @@ -1622,7 +1622,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; /*--- End of included file: packet-ranap-ett.c ---*/ -#line 86 "./asn1/ranap/packet-ranap-template.c" +#line 74 "./asn1/ranap/packet-ranap-template.c" /*****************************************************************************/ /* Packet private data */ @@ -14956,7 +14956,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 210 "./asn1/ranap/packet-ranap-template.c" +#line 198 "./asn1/ranap/packet-ranap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -18336,7 +18336,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 421 "./asn1/ranap/packet-ranap-template.c" +#line 409 "./asn1/ranap/packet-ranap-template.c" }; /* List of subtrees */ @@ -18700,7 +18700,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 429 "./asn1/ranap/packet-ranap-template.c" +#line 417 "./asn1/ranap/packet-ranap-template.c" }; @@ -19127,7 +19127,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 478 "./asn1/ranap/packet-ranap-template.c" +#line 466 "./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 2aeaba89e9..064d0d5a5f 100644 --- a/epan/dissectors/packet-ranap.h +++ b/epan/dissectors/packet-ranap.h @@ -36,7 +36,7 @@ int dissect_ranap_TargetRNC_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-ranap-exp.h ---*/ -#line 27 "./asn1/ranap/packet-ranap-template.h" +#line 15 "./asn1/ranap/packet-ranap-template.h" #endif /* PACKET_RANAP_H */ diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 51162fd893..920846ae5e 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -1263,7 +1263,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rnsap-val.h ---*/ -#line 49 "./asn1/rnsap/packet-rnsap-template.c" +#line 37 "./asn1/rnsap/packet-rnsap-template.c" void proto_register_rnsap(void); void proto_reg_handoff_rnsap(void); @@ -4384,7 +4384,7 @@ 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 "./asn1/rnsap/packet-rnsap-template.c" +#line 49 "./asn1/rnsap/packet-rnsap-template.c" /* Initialize the subtree pointers */ static int ett_rnsap = -1; @@ -5821,7 +5821,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1; static gint ett_rnsap_Outcome = -1; /*--- End of included file: packet-rnsap-ett.c ---*/ -#line 66 "./asn1/rnsap/packet-rnsap-template.c" +#line 54 "./asn1/rnsap/packet-rnsap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -49033,7 +49033,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 92 "./asn1/rnsap/packet-rnsap-template.c" +#line 80 "./asn1/rnsap/packet-rnsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -61511,7 +61511,7 @@ void proto_register_rnsap(void) { "Outcome_value", HFILL }}, /*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 149 "./asn1/rnsap/packet-rnsap-template.c" +#line 137 "./asn1/rnsap/packet-rnsap-template.c" }; /* List of subtrees */ @@ -62949,7 +62949,7 @@ void proto_register_rnsap(void) { &ett_rnsap_Outcome, /*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 155 "./asn1/rnsap/packet-rnsap-template.c" +#line 143 "./asn1/rnsap/packet-rnsap-template.c" }; @@ -63910,7 +63910,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 190 "./asn1/rnsap/packet-rnsap-template.c" +#line 178 "./asn1/rnsap/packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 4ffa88d38c..b0335be2e6 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -94,7 +94,7 @@ static int hf_ros_local = -1; /* INTEGER */ static int hf_ros_global = -1; /* OBJECT_IDENTIFIER */ /*--- End of included file: packet-ros-hf.c ---*/ -#line 70 "./asn1/ros/packet-ros-template.c" +#line 58 "./asn1/ros/packet-ros-template.c" /* Initialize the subtree pointers */ static gint ett_ros = -1; @@ -121,7 +121,7 @@ static gint ett_ros_InvokeId = -1; static gint ett_ros_Code = -1; /*--- End of included file: packet-ros-ett.c ---*/ -#line 83 "./asn1/ros/packet-ros-template.c" +#line 71 "./asn1/ros/packet-ros-template.c" static expert_field ei_ros_dissector_oid_not_implemented = EI_INIT; static expert_field ei_ros_unknown_ros_pdu = EI_INIT; @@ -998,7 +998,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 375 "./asn1/ros/packet-ros-template.c" +#line 363 "./asn1/ros/packet-ros-template.c" /* * Dissect ROS PDUs inside a PPDU. @@ -1194,7 +1194,7 @@ void proto_register_ros(void) { "OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 458 "./asn1/ros/packet-ros-template.c" +#line 446 "./asn1/ros/packet-ros-template.c" }; /* List of subtrees */ @@ -1224,7 +1224,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 474 "./asn1/ros/packet-ros-template.c" +#line 462 "./asn1/ros/packet-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index 010280666e..ff5106976f 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -31,7 +31,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 28 "./asn1/ros/packet-ros-template.h" +#line 16 "./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 e185e14d40..b9df2f4cbc 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -468,7 +468,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr #define maxWLANs 64 /*--- End of included file: packet-rrc-val.h ---*/ -#line 277 "./asn1/rrc/packet-rrc-template.c" +#line 265 "./asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -11307,7 +11307,7 @@ 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 282 "./asn1/rrc/packet-rrc-template.c" +#line 270 "./asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -18211,7 +18211,7 @@ 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 287 "./asn1/rrc/packet-rrc-template.c" +#line 275 "./asn1/rrc/packet-rrc-template.c" static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; @@ -163318,7 +163318,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 420 "./asn1/rrc/packet-rrc-template.c" +#line 408 "./asn1/rrc/packet-rrc-template.c" static int @@ -206718,7 +206718,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 503 "./asn1/rrc/packet-rrc-template.c" +#line 491 "./asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -213667,7 +213667,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 553 "./asn1/rrc/packet-rrc-template.c" +#line 541 "./asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, &ett_rrc_ims_info, @@ -213768,7 +213768,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 578 "./asn1/rrc/packet-rrc-template.c" +#line 566 "./asn1/rrc/packet-rrc-template.c" diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index c3c0835117..b595088893 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -57,7 +57,7 @@ int dissect_rrc_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo int dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-rrc-exp.h ---*/ -#line 30 "./asn1/rrc/packet-rrc-template.h" +#line 18 "./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 0e646206e7..e4e63d88b4 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -872,7 +872,7 @@ static int hf_rrlp_GANSSModelID_model7 = -1; static int hf_rrlp_GANSSModelID_model8 = -1; /*--- End of included file: packet-rrlp-hf.c ---*/ -#line 55 "./asn1/rrlp/packet-rrlp-template.c" +#line 43 "./asn1/rrlp/packet-rrlp-template.c" /* Initialize the subtree pointers */ static gint ett_rrlp = -1; @@ -1133,7 +1133,7 @@ static gint ett_rrlp_GANSSModelID = -1; static gint ett_rrlp_AssistanceNeeded = -1; /*--- End of included file: packet-rrlp-ett.c ---*/ -#line 59 "./asn1/rrlp/packet-rrlp-template.c" +#line 47 "./asn1/rrlp/packet-rrlp-template.c" /* Include constants */ @@ -1145,7 +1145,7 @@ static gint ett_rrlp_AssistanceNeeded = -1; #define maxGANSSAssistanceData 40 /*--- End of included file: packet-rrlp-val.h ---*/ -#line 62 "./asn1/rrlp/packet-rrlp-template.c" +#line 50 "./asn1/rrlp/packet-rrlp-template.c" @@ -7101,7 +7101,7 @@ static int dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree /*--- End of included file: packet-rrlp-fn.c ---*/ -#line 65 "./asn1/rrlp/packet-rrlp-template.c" +#line 53 "./asn1/rrlp/packet-rrlp-template.c" /*--- proto_register_rrlp -------------------------------------------*/ @@ -10391,7 +10391,7 @@ void proto_register_rrlp(void) { NULL, HFILL }}, /*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 74 "./asn1/rrlp/packet-rrlp-template.c" +#line 62 "./asn1/rrlp/packet-rrlp-template.c" }; /* List of subtrees */ @@ -10654,7 +10654,7 @@ void proto_register_rrlp(void) { &ett_rrlp_AssistanceNeeded, /*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 80 "./asn1/rrlp/packet-rrlp-template.c" +#line 68 "./asn1/rrlp/packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 1235aaac04..30cbb86f5e 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -81,7 +81,7 @@ static int hf_rtse_t61String = -1; /* T_t61String */ static int hf_rtse_octetString = -1; /* T_octetString */ /*--- End of included file: packet-rtse-hf.c ---*/ -#line 60 "./asn1/rtse/packet-rtse-template.c" +#line 48 "./asn1/rtse/packet-rtse-template.c" /* Initialize the subtree pointers */ static gint ett_rtse = -1; @@ -98,7 +98,7 @@ static gint ett_rtse_SessionConnectionIdentifier = -1; static gint ett_rtse_CallingSSuserReference = -1; /*--- End of included file: packet-rtse-ett.c ---*/ -#line 64 "./asn1/rtse/packet-rtse-template.c" +#line 52 "./asn1/rtse/packet-rtse-template.c" static expert_field ei_rtse_dissector_oid_not_implemented = EI_INIT; static expert_field ei_rtse_unknown_rtse_pdu = EI_INIT; @@ -720,7 +720,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 188 "./asn1/rtse/packet-rtse-template.c" +#line 176 "./asn1/rtse/packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -980,7 +980,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 347 "./asn1/rtse/packet-rtse-template.c" +#line 335 "./asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1002,7 +1002,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 356 "./asn1/rtse/packet-rtse-template.c" +#line 344 "./asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h index 6a1d51e7ed..eaac1034f0 100644 --- a/epan/dissectors/packet-rtse.h +++ b/epan/dissectors/packet-rtse.h @@ -29,7 +29,7 @@ int dissect_rtse_RTORJapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off int dissect_rtse_RTABapdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-rtse-exp.h ---*/ -#line 28 "./asn1/rtse/packet-rtse-template.h" +#line 16 "./asn1/rtse/packet-rtse-template.h" void register_rtse_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name, gboolean uses_ros); diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index 9189f1ce3c..71c5a28c08 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -70,7 +70,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rua-val.h ---*/ -#line 49 "./asn1/rua/packet-rua-template.c" +#line 37 "./asn1/rua/packet-rua-template.c" /* Initialize the protocol and registered fields */ static int proto_rua = -1; @@ -147,7 +147,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 54 "./asn1/rua/packet-rua-template.c" +#line 42 "./asn1/rua/packet-rua-template.c" /* Initialize the subtree pointers */ static int ett_rua = -1; @@ -196,7 +196,7 @@ static gint ett_rua_SuccessfulOutcome = -1; static gint ett_rua_UnsuccessfulOutcome = -1; /*--- End of included file: packet-rua-ett.c ---*/ -#line 62 "./asn1/rua/packet-rua-template.c" +#line 50 "./asn1/rua/packet-rua-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1347,7 +1347,7 @@ static int dissect_RUA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-rua-fn.c ---*/ -#line 86 "./asn1/rua/packet-rua-template.c" +#line 74 "./asn1/rua/packet-rua-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -1671,7 +1671,7 @@ module_t *rua_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-rua-hfarr.c ---*/ -#line 137 "./asn1/rua/packet-rua-template.c" +#line 125 "./asn1/rua/packet-rua-template.c" }; /* List of subtrees */ @@ -1718,7 +1718,7 @@ module_t *rua_module; &ett_rua_UnsuccessfulOutcome, /*--- End of included file: packet-rua-ettarr.c ---*/ -#line 143 "./asn1/rua/packet-rua-template.c" +#line 131 "./asn1/rua/packet-rua-template.c" }; @@ -1775,7 +1775,7 @@ proto_reg_handoff_rua(void) /*--- End of included file: packet-rua-dis-tab.c ---*/ -#line 180 "./asn1/rua/packet-rua-template.c" +#line 168 "./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 bb12bc8837..9d05c2e243 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -459,7 +459,7 @@ typedef enum _RAT_Type_enum { } RAT_Type_enum; /*--- End of included file: packet-s1ap-val.h ---*/ -#line 73 "./asn1/s1ap/packet-s1ap-template.c" +#line 61 "./asn1/s1ap/packet-s1ap-template.c" /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -1243,7 +1243,7 @@ static int hf_s1ap_eHRPD_Sector_ID_01 = -1; /* EHRPD_Sector_ID */ static int hf_s1ap_eHRPDSectorLoadReportingResponse = -1; /* EHRPDSectorLoadReportingResponse */ /*--- End of included file: packet-s1ap-hf.c ---*/ -#line 123 "./asn1/s1ap/packet-s1ap-template.c" +#line 111 "./asn1/s1ap/packet-s1ap-template.c" /* Initialize the subtree pointers */ static int ett_s1ap = -1; @@ -1635,7 +1635,7 @@ static gint ett_s1ap_EHRPDCompositeAvailableCapacity = -1; static gint ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem = -1; /*--- End of included file: packet-s1ap-ett.c ---*/ -#line 158 "./asn1/s1ap/packet-s1ap-template.c" +#line 146 "./asn1/s1ap/packet-s1ap-template.c" static expert_field ei_s1ap_number_pages_le15 = EI_INIT; @@ -14804,7 +14804,7 @@ int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-s1ap-fn.c ---*/ -#line 362 "./asn1/s1ap/packet-s1ap-template.c" +#line 350 "./asn1/s1ap/packet-s1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -15268,7 +15268,7 @@ proto_reg_handoff_s1ap(void) /*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 482 "./asn1/s1ap/packet-s1ap-template.c" +#line 470 "./asn1/s1ap/packet-s1ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, s1ap_handle); @@ -18388,7 +18388,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, /*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 681 "./asn1/s1ap/packet-s1ap-template.c" +#line 669 "./asn1/s1ap/packet-s1ap-template.c" }; /* List of subtrees */ @@ -18782,7 +18782,7 @@ void proto_register_s1ap(void) { &ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem, /*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 718 "./asn1/s1ap/packet-s1ap-template.c" +#line 706 "./asn1/s1ap/packet-s1ap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-s1ap.h b/epan/dissectors/packet-s1ap.h index 452b76b5bd..3c678965ef 100644 --- a/epan/dissectors/packet-s1ap.h +++ b/epan/dissectors/packet-s1ap.h @@ -54,7 +54,7 @@ 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_, void *data _U_); /*--- End of included file: packet-s1ap-exp.h ---*/ -#line 39 "./asn1/s1ap/packet-s1ap-template.h" +#line 27 "./asn1/s1ap/packet-s1ap-template.h" #endif /* PACKET_S1AP_H */ diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 50dc76c049..a9fff4fd03 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -83,7 +83,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sabp-val.h ---*/ -#line 45 "./asn1/sabp/packet-sabp-template.c" +#line 33 "./asn1/sabp/packet-sabp-template.c" void proto_register_sabp(void); void proto_reg_handoff_sabp(void); @@ -179,7 +179,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 57 "./asn1/sabp/packet-sabp-template.c" +#line 45 "./asn1/sabp/packet-sabp-template.c" /* Initialize the subtree pointers */ static int ett_sabp = -1; @@ -235,7 +235,7 @@ static gint ett_sabp_SuccessfulOutcome = -1; static gint ett_sabp_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sabp-ett.c ---*/ -#line 69 "./asn1/sabp/packet-sabp-template.c" +#line 57 "./asn1/sabp/packet-sabp-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1717,7 +1717,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 96 "./asn1/sabp/packet-sabp-template.c" +#line 84 "./asn1/sabp/packet-sabp-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2193,7 +2193,7 @@ void proto_register_sabp(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sabp-hfarr.c ---*/ -#line 251 "./asn1/sabp/packet-sabp-template.c" +#line 239 "./asn1/sabp/packet-sabp-template.c" }; /* List of subtrees */ @@ -2250,7 +2250,7 @@ void proto_register_sabp(void) { &ett_sabp_UnsuccessfulOutcome, /*--- End of included file: packet-sabp-ettarr.c ---*/ -#line 264 "./asn1/sabp/packet-sabp-template.c" +#line 252 "./asn1/sabp/packet-sabp-template.c" }; @@ -2327,7 +2327,7 @@ proto_reg_handoff_sabp(void) /*--- End of included file: packet-sabp-dis-tab.c ---*/ -#line 295 "./asn1/sabp/packet-sabp-template.c" +#line 283 "./asn1/sabp/packet-sabp-template.c" } diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 0ba04cff65..5c3fbcde37 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -71,7 +71,7 @@ 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 48 "./asn1/smrse/packet-smrse-template.c" +#line 36 "./asn1/smrse/packet-smrse-template.c" /* Initialize the subtree pointers */ static gint ett_smrse = -1; @@ -91,7 +91,7 @@ static gint ett_smrse_RPError = -1; static gint ett_smrse_RPAlertSC = -1; /*--- End of included file: packet-smrse-ett.c ---*/ -#line 52 "./asn1/smrse/packet-smrse-template.c" +#line 40 "./asn1/smrse/packet-smrse-template.c" @@ -467,7 +467,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-smrse-fn.c ---*/ -#line 55 "./asn1/smrse/packet-smrse-template.c" +#line 43 "./asn1/smrse/packet-smrse-template.c" static const value_string tag_vals[] = { { 1, "AliveTest" }, @@ -679,7 +679,7 @@ void proto_register_smrse(void) { "SMS_Address", HFILL }}, /*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 158 "./asn1/smrse/packet-smrse-template.c" +#line 146 "./asn1/smrse/packet-smrse-template.c" }; /* List of subtrees */ @@ -701,7 +701,7 @@ void proto_register_smrse(void) { &ett_smrse_RPAlertSC, /*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 164 "./asn1/smrse/packet-smrse-template.c" +#line 152 "./asn1/smrse/packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index abc73f6084..f0266f6c6e 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -303,7 +303,7 @@ static int hf_snmp_priority = -1; /* INTEGER_M1_2147483647 */ static int hf_snmp_operation = -1; /* T_operation */ /*--- End of included file: packet-snmp-hf.c ---*/ -#line 241 "./asn1/snmp/packet-snmp-template.c" +#line 229 "./asn1/snmp/packet-snmp-template.c" /* Initialize the subtree pointers */ static gint ett_smux = -1; @@ -343,7 +343,7 @@ static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; /*--- End of included file: packet-snmp-ett.c ---*/ -#line 257 "./asn1/snmp/packet-snmp-template.c" +#line 245 "./asn1/snmp/packet-snmp-template.c" static expert_field ei_snmp_failed_decrypted_data_pdu = EI_INIT; static expert_field ei_snmp_decrypted_data_bad_formatted = EI_INIT; @@ -2996,7 +2996,7 @@ static int dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1803 "./asn1/snmp/packet-snmp-template.c" +#line 1791 "./asn1/snmp/packet-snmp-template.c" guint @@ -3763,7 +3763,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2305 "./asn1/snmp/packet-snmp-template.c" +#line 2293 "./asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3803,7 +3803,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2321 "./asn1/snmp/packet-snmp-template.c" +#line 2309 "./asn1/snmp/packet-snmp-template.c" }; static ei_register_info ei[] = { { &ei_snmp_failed_decrypted_data_pdu, { "snmp.failed_decrypted_data_pdu", PI_MALFORMED, PI_WARN, "Failed to decrypt encryptedPDU", EXPFILL }}, diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index f32d34e443..6548ca7a92 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -97,7 +97,7 @@ static int hf_spnego_ContextFlags_confFlag = -1; static int hf_spnego_ContextFlags_integFlag = -1; /*--- End of included file: packet-spnego-hf.c ---*/ -#line 76 "./asn1/spnego/packet-spnego-template.c" +#line 64 "./asn1/spnego/packet-spnego-template.c" /* Global variables */ static const char *MechType_oid; @@ -124,7 +124,7 @@ static gint ett_spnego_NegTokenTarg = -1; static gint ett_spnego_InitialContextToken_U = -1; /*--- End of included file: packet-spnego-ett.c ---*/ -#line 90 "./asn1/spnego/packet-spnego-template.c" +#line 78 "./asn1/spnego/packet-spnego-template.c" static expert_field ei_spnego_decrypted_keytype = EI_INIT; static expert_field ei_spnego_unknown_header = EI_INIT; @@ -547,7 +547,7 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-spnego-fn.c ---*/ -#line 111 "./asn1/spnego/packet-spnego-template.c" +#line 99 "./asn1/spnego/packet-spnego-template.c" /* * This is the SPNEGO KRB5 dissector. It is not true KRB5, but some ASN.1 * wrapped blob with an OID, USHORT token ID, and a Ticket, that is also @@ -1922,7 +1922,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1389 "./asn1/spnego/packet-spnego-template.c" +#line 1377 "./asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1945,7 +1945,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1399 "./asn1/spnego/packet-spnego-template.c" +#line 1387 "./asn1/spnego/packet-spnego-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index 0ce833c44f..4ec7de588b 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -108,7 +108,7 @@ static int hf_sv_seqData = -1; /* Data */ static int hf_sv_smpMod = -1; /* T_smpMod */ /*--- End of included file: packet-sv-hf.c ---*/ -#line 98 "./asn1/sv/packet-sv-template.c" +#line 86 "./asn1/sv/packet-sv-template.c" /* Initialize the subtree pointers */ static int ett_sv = -1; @@ -124,7 +124,7 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1; static gint ett_sv_ASDU = -1; /*--- End of included file: packet-sv-ett.c ---*/ -#line 105 "./asn1/sv/packet-sv-template.c" +#line 93 "./asn1/sv/packet-sv-template.c" static expert_field ei_sv_mal_utctime = EI_INIT; static expert_field ei_sv_zero_pdu = EI_INIT; @@ -426,7 +426,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-sv-fn.c ---*/ -#line 187 "./asn1/sv/packet-sv-template.c" +#line 175 "./asn1/sv/packet-sv-template.c" /* * Dissect SV PDUs inside a PPDU. @@ -595,7 +595,7 @@ void proto_register_sv(void) { NULL, HFILL }}, /*--- End of included file: packet-sv-hfarr.c ---*/ -#line 299 "./asn1/sv/packet-sv-template.c" +#line 287 "./asn1/sv/packet-sv-template.c" }; /* List of subtrees */ @@ -612,7 +612,7 @@ void proto_register_sv(void) { &ett_sv_ASDU, /*--- End of included file: packet-sv-ettarr.c ---*/ -#line 307 "./asn1/sv/packet-sv-template.c" +#line 295 "./asn1/sv/packet-sv-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index ac540bfe98..a103755aee 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -273,7 +273,7 @@ static int hf_t124_Segmentation_begin = -1; static int hf_t124_Segmentation_end = -1; /*--- End of included file: packet-t124-hf.c ---*/ -#line 53 "./asn1/t124/packet-t124-template.c" +#line 41 "./asn1/t124/packet-t124-template.c" /* Initialize the subtree pointers */ static int ett_t124 = -1; @@ -394,7 +394,7 @@ static gint ett_t124_TokenTestConfirm = -1; static gint ett_t124_DomainMCSPDU = -1; /*--- End of included file: packet-t124-ett.c ---*/ -#line 68 "./asn1/t124/packet-t124-template.c" +#line 56 "./asn1/t124/packet-t124-template.c" /*--- Included file: packet-t124-fn.c ---*/ @@ -2864,7 +2864,7 @@ dissect_t124_DomainMCSPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U /*--- End of included file: packet-t124-fn.c ---*/ -#line 70 "./asn1/t124/packet-t124-template.c" +#line 58 "./asn1/t124/packet-t124-template.c" static const per_sequence_t t124Heur_sequence[] = { { &hf_t124_t124Identifier , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_t124_Key }, @@ -3878,7 +3878,7 @@ void proto_register_t124(void) { NULL, HFILL }}, /*--- End of included file: packet-t124-hfarr.c ---*/ -#line 191 "./asn1/t124/packet-t124-template.c" +#line 179 "./asn1/t124/packet-t124-template.c" }; /* List of subtrees */ @@ -3991,7 +3991,7 @@ void proto_register_t124(void) { &ett_t124_DomainMCSPDU, /*--- End of included file: packet-t124-ettarr.c ---*/ -#line 198 "./asn1/t124/packet-t124-template.c" +#line 186 "./asn1/t124/packet-t124-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t124.h b/epan/dissectors/packet-t124.h index 2f5cbe95c7..bcaa0a4c72 100644 --- a/epan/dissectors/packet-t124.h +++ b/epan/dissectors/packet-t124.h @@ -38,7 +38,7 @@ int dissect_t124_ConnectData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx int dissect_t124_ConnectGCCPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-t124-exp.h ---*/ -#line 38 "./asn1/t124/packet-t124-template.h" +#line 26 "./asn1/t124/packet-t124-template.h" #endif /* PACKET_T124_H */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 3302eb8f26..d87b9321c2 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -69,7 +69,7 @@ static int hf_t125_connect_additional = -1; /* Connect_Additional */ static int hf_t125_connect_result = -1; /* Connect_Result */ /*--- End of included file: packet-t125-hf.c ---*/ -#line 47 "./asn1/t125/packet-t125-template.c" +#line 35 "./asn1/t125/packet-t125-template.c" /* Initialize the subtree pointers */ static int ett_t125 = -1; @@ -85,7 +85,7 @@ static gint ett_t125_Connect_Result_U = -1; static gint ett_t125_ConnectMCSPDU = -1; /*--- End of included file: packet-t125-ett.c ---*/ -#line 52 "./asn1/t125/packet-t125-template.c" +#line 40 "./asn1/t125/packet-t125-template.c" static heur_dissector_list_t t125_heur_subdissector_list; @@ -371,7 +371,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-t125-fn.c ---*/ -#line 56 "./asn1/t125/packet-t125-template.c" +#line 44 "./asn1/t125/packet-t125-template.c" static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) @@ -546,7 +546,7 @@ void proto_register_t125(void) { NULL, HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 126 "./asn1/t125/packet-t125-template.c" +#line 114 "./asn1/t125/packet-t125-template.c" }; /* List of subtrees */ @@ -563,7 +563,7 @@ void proto_register_t125(void) { &ett_t125_ConnectMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 132 "./asn1/t125/packet-t125-template.c" +#line 120 "./asn1/t125/packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index ea853ad225..b4437e0815 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -130,7 +130,7 @@ static int hf_t38_fec_data = -1; /* T_fec_data */ static int hf_t38_fec_data_item = -1; /* OCTET_STRING */ /*--- End of included file: packet-t38-hf.c ---*/ -#line 115 "./asn1/t38/packet-t38-template.c" +#line 103 "./asn1/t38/packet-t38-template.c" /* T38 setup fields */ static int hf_t38_setup = -1; @@ -164,7 +164,7 @@ static gint ett_t38_T_fec_info = -1; static gint ett_t38_T_fec_data = -1; /*--- End of included file: packet-t38-ett.c ---*/ -#line 135 "./asn1/t38/packet-t38-template.c" +#line 123 "./asn1/t38/packet-t38-template.c" static gint ett_t38_setup = -1; static gint ett_data_fragment = -1; @@ -955,7 +955,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-t38-fn.c ---*/ -#line 382 "./asn1/t38/packet-t38-template.c" +#line 370 "./asn1/t38/packet-t38-template.c" /* initialize the tap t38_info and the conversation */ static void @@ -1296,7 +1296,7 @@ proto_register_t38(void) "OCTET_STRING", HFILL }}, /*--- End of included file: packet-t38-hfarr.c ---*/ -#line 646 "./asn1/t38/packet-t38-template.c" +#line 634 "./asn1/t38/packet-t38-template.c" { &hf_t38_setup, { "Stream setup", "t38.setup", FT_STRING, BASE_NONE, NULL, 0x0, "Stream setup, method and frame number", HFILL }}, @@ -1357,7 +1357,7 @@ proto_register_t38(void) &ett_t38_T_fec_data, /*--- End of included file: packet-t38-ettarr.c ---*/ -#line 693 "./asn1/t38/packet-t38-template.c" +#line 681 "./asn1/t38/packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h index 7e18b4f2bd..d10f9c47a4 100644 --- a/epan/dissectors/packet-t38.h +++ b/epan/dissectors/packet-t38.h @@ -82,7 +82,7 @@ WS_DLL_PUBLIC const value_string t38_T30_indicator_vals[]; WS_DLL_PUBLIC const value_string t38_T30_data_vals[]; /*--- End of included file: packet-t38-exp.h ---*/ -#line 83 "./asn1/t38/packet-t38-template.h" +#line 71 "./asn1/t38/packet-t38-template.h" diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 6ef997eab2..e153c9c06e 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -125,7 +125,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 61 "./asn1/tcap/packet-tcap-template.c" +#line 49 "./asn1/tcap/packet-tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -181,7 +181,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 79 "./asn1/tcap/packet-tcap-template.c" +#line 67 "./asn1/tcap/packet-tcap-template.c" /* When several Tcap components are received in a single TCAP message, we have to use several buffers for the stored parameters @@ -1422,7 +1422,7 @@ static int dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-tcap-fn.c ---*/ -#line 155 "./asn1/tcap/packet-tcap-template.c" +#line 143 "./asn1/tcap/packet-tcap-template.c" /* * DEBUG functions @@ -3208,7 +3208,7 @@ proto_reg_handoff_tcap(void) /*--- End of included file: packet-tcap-dis-tab.c ---*/ -#line 1933 "./asn1/tcap/packet-tcap-template.c" +#line 1921 "./asn1/tcap/packet-tcap-template.c" } static void init_tcap(void); @@ -3550,7 +3550,7 @@ proto_register_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 2006 "./asn1/tcap/packet-tcap-template.c" +#line 1994 "./asn1/tcap/packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -3598,7 +3598,7 @@ proto_register_tcap(void) &ett_tcap_Associate_source_diagnostic, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 2016 "./asn1/tcap/packet-tcap-template.c" +#line 2004 "./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 6d207bace9..e4613d37b5 100644 --- a/epan/dissectors/packet-tcap.h +++ b/epan/dissectors/packet-tcap.h @@ -232,6 +232,6 @@ int dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in 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 231 "./asn1/tcap/packet-tcap-template.h" +#line 219 "./asn1/tcap/packet-tcap-template.h" #endif /* PACKET_tcap_H */ diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index e28f2b0c32..96102494f0 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -668,7 +668,7 @@ static int hf_tetra_proprietary_element_owner_extension = -1; /* BIT_STRING */ static int hf_tetra_simplex_duplex_selection_06 = -1; /* T_simplex_duplex_selection_05 */ /*--- End of included file: packet-tetra-hf.c ---*/ -#line 79 "./asn1/tetra/packet-tetra-template.c" +#line 67 "./asn1/tetra/packet-tetra-template.c" /* Initialize the subtree pointers */ /* These are the ids of the subtrees that we may be creating */ @@ -953,7 +953,7 @@ static gint ett_tetra_Type2 = -1; static gint ett_tetra_Modify_type = -1; /*--- End of included file: packet-tetra-ett.c ---*/ -#line 89 "./asn1/tetra/packet-tetra-template.c" +#line 77 "./asn1/tetra/packet-tetra-template.c" static expert_field ei_tetra_channels_incorrect = EI_INIT; @@ -8799,7 +8799,7 @@ static int dissect_MAC_ACCESS_DEFINE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-tetra-fn.c ---*/ -#line 93 "./asn1/tetra/packet-tetra-template.c" +#line 81 "./asn1/tetra/packet-tetra-template.c" static const value_string channeltypenames[] = { { 0, "Reserved" }, @@ -11696,7 +11696,7 @@ void proto_register_tetra (void) "T_simplex_duplex_selection_05", HFILL }}, /*--- End of included file: packet-tetra-hfarr.c ---*/ -#line 617 "./asn1/tetra/packet-tetra-template.c" +#line 605 "./asn1/tetra/packet-tetra-template.c" }; /* List of subtrees */ @@ -11981,7 +11981,7 @@ void proto_register_tetra (void) &ett_tetra_Modify_type, /*--- End of included file: packet-tetra-ettarr.c ---*/ -#line 627 "./asn1/tetra/packet-tetra-template.c" +#line 615 "./asn1/tetra/packet-tetra-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index 2ba0ac676e..c7ef892618 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -697,7 +697,7 @@ static int hf_ulp_GANSSSignals_signal7 = -1; static int hf_ulp_GANSSSignals_signal8 = -1; /*--- End of included file: packet-ulp-hf.c ---*/ -#line 65 "./asn1/ulp/packet-ulp-template.c" +#line 53 "./asn1/ulp/packet-ulp-template.c" static int hf_ulp_mobile_directory_number = -1; static int hf_ulp_ganssTimeModels_bit0 = -1; static int hf_ulp_ganssTimeModels_bit1 = -1; @@ -928,7 +928,7 @@ static gint ett_ulp_PolygonArea = -1; static gint ett_ulp_PolygonDescription = -1; /*--- End of included file: packet-ulp-ett.c ---*/ -#line 79 "./asn1/ulp/packet-ulp-template.c" +#line 67 "./asn1/ulp/packet-ulp-template.c" static dissector_handle_t ulp_tcp_handle; @@ -1198,7 +1198,7 @@ ulp_Coordinate_longitude_fmt(gchar *s, guint32 v) #define maxWimaxBSMeas 32 /*--- End of included file: packet-ulp-val.h ---*/ -#line 329 "./asn1/ulp/packet-ulp-template.c" +#line 317 "./asn1/ulp/packet-ulp-template.c" typedef struct { @@ -7410,7 +7410,7 @@ static int dissect_ULP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-ulp-fn.c ---*/ -#line 345 "./asn1/ulp/packet-ulp-template.c" +#line 333 "./asn1/ulp/packet-ulp-template.c" static guint @@ -9977,7 +9977,7 @@ void proto_register_ulp(void) { NULL, HFILL }}, /*--- End of included file: packet-ulp-hfarr.c ---*/ -#line 371 "./asn1/ulp/packet-ulp-template.c" +#line 359 "./asn1/ulp/packet-ulp-template.c" { &hf_ulp_mobile_directory_number, { "Mobile Directory Number", "ulp.mobile_directory_number", FT_STRING, BASE_NONE, NULL, 0, @@ -10231,7 +10231,7 @@ void proto_register_ulp(void) { &ett_ulp_PolygonDescription, /*--- End of included file: packet-ulp-ettarr.c ---*/ -#line 408 "./asn1/ulp/packet-ulp-template.c" +#line 396 "./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 d96fdafa26..d78ecf4370 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -45,7 +45,7 @@ static int hf_wlancertextn_SSIDList_PDU = -1; /* SSIDList */ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ /*--- End of included file: packet-wlancertextn-hf.c ---*/ -#line 46 "./asn1/wlancertextn/packet-wlancertextn-template.c" +#line 34 "./asn1/wlancertextn/packet-wlancertextn-template.c" /* Initialize the subtree pointers */ @@ -54,7 +54,7 @@ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ static gint ett_wlancertextn_SSIDList = -1; /*--- End of included file: packet-wlancertextn-ett.c ---*/ -#line 49 "./asn1/wlancertextn/packet-wlancertextn-template.c" +#line 37 "./asn1/wlancertextn/packet-wlancertextn-template.c" /*--- Included file: packet-wlancertextn-fn.c ---*/ @@ -94,7 +94,7 @@ static int dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 51 "./asn1/wlancertextn/packet-wlancertextn-template.c" +#line 39 "./asn1/wlancertextn/packet-wlancertextn-template.c" /*--- proto_register_wlancertextn ----------------------------------------------*/ @@ -115,7 +115,7 @@ void proto_register_wlancertextn(void) { NULL, HFILL }}, /*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 59 "./asn1/wlancertextn/packet-wlancertextn-template.c" +#line 47 "./asn1/wlancertextn/packet-wlancertextn-template.c" }; /* List of subtrees */ @@ -126,7 +126,7 @@ void proto_register_wlancertextn(void) { &ett_wlancertextn_SSIDList, /*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 64 "./asn1/wlancertextn/packet-wlancertextn-template.c" +#line 52 "./asn1/wlancertextn/packet-wlancertextn-template.c" }; /* Register protocol */ @@ -149,7 +149,7 @@ void proto_reg_handoff_wlancertextn(void) { /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ -#line 79 "./asn1/wlancertextn/packet-wlancertextn-template.c" +#line 67 "./asn1/wlancertextn/packet-wlancertextn-template.c" oid_add_from_string("id-kp-eapOverPPP","1.3.6.1.5.5.7.3.13"); oid_add_from_string("id-kp-eapOverLAN","1.3.6.1.5.5.7.3.14"); } diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 3b342311db..91863c0cdc 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -419,7 +419,7 @@ typedef enum _TriggeringMessage_enum { } TriggeringMessage_enum; /*--- End of included file: packet-x2ap-val.h ---*/ -#line 60 "./asn1/x2ap/packet-x2ap-template.c" +#line 48 "./asn1/x2ap/packet-x2ap-template.c" /* Initialize the protocol and registered fields */ static int proto_x2ap = -1; @@ -1324,7 +1324,7 @@ 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 125 "./asn1/x2ap/packet-x2ap-template.c" +#line 113 "./asn1/x2ap/packet-x2ap-template.c" /* Initialize the subtree pointers */ static int ett_x2ap = -1; @@ -1785,7 +1785,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1; static gint ett_x2ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-x2ap-ett.c ---*/ -#line 154 "./asn1/x2ap/packet-x2ap-template.c" +#line 142 "./asn1/x2ap/packet-x2ap-template.c" typedef enum { RRC_CONTAINER_TYPE_UNKNOWN, @@ -15309,7 +15309,7 @@ static int dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-x2ap-fn.c ---*/ -#line 251 "./asn1/x2ap/packet-x2ap-template.c" +#line 239 "./asn1/x2ap/packet-x2ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -18959,7 +18959,7 @@ void proto_register_x2ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 556 "./asn1/x2ap/packet-x2ap-template.c" +#line 544 "./asn1/x2ap/packet-x2ap-template.c" }; /* List of subtrees */ @@ -19422,7 +19422,7 @@ void proto_register_x2ap(void) { &ett_x2ap_UnsuccessfulOutcome, /*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 587 "./asn1/x2ap/packet-x2ap-template.c" +#line 575 "./asn1/x2ap/packet-x2ap-template.c" }; module_t *x2ap_module; @@ -19810,7 +19810,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 633 "./asn1/x2ap/packet-x2ap-template.c" +#line 621 "./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 c716d57cc6..605e7e7a14 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -124,7 +124,7 @@ static int hf_x509af_q = -1; /* INTEGER */ static int hf_x509af_g = -1; /* INTEGER */ /*--- End of included file: packet-x509af-hf.c ---*/ -#line 53 "./asn1/x509af/packet-x509af-template.c" +#line 41 "./asn1/x509af/packet-x509af-template.c" /* Initialize the subtree pointers */ static gint ett_pkix_crl = -1; @@ -165,7 +165,7 @@ static gint ett_x509af_SET_OF_AttributeType = -1; static gint ett_x509af_DSS_Params = -1; /*--- End of included file: packet-x509af-ett.c ---*/ -#line 57 "./asn1/x509af/packet-x509af-template.c" +#line 45 "./asn1/x509af/packet-x509af-template.c" static const char *algorithm_id = NULL; static void x509af_export_publickey(tvbuff_t *tvb, asn1_ctx_t *actx, int offset, int len); @@ -927,7 +927,7 @@ static int dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-x509af-fn.c ---*/ -#line 61 "./asn1/x509af/packet-x509af-template.c" +#line 49 "./asn1/x509af/packet-x509af-template.c" /* Exports the SubjectPublicKeyInfo structure as gnutls_datum_t. * actx->private_data is assumed to be a gnutls_datum_t pointer which will be @@ -1287,7 +1287,7 @@ void proto_register_x509af(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 120 "./asn1/x509af/packet-x509af-template.c" +#line 108 "./asn1/x509af/packet-x509af-template.c" }; /* List of subtrees */ @@ -1330,7 +1330,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 126 "./asn1/x509af/packet-x509af-template.c" +#line 114 "./asn1/x509af/packet-x509af-template.c" }; /* Register protocol */ @@ -1374,7 +1374,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 155 "./asn1/x509af/packet-x509af-template.c" +#line 143 "./asn1/x509af/packet-x509af-template.c" /*XXX these should really go to a better place but since I have not that ITU standard, I'll put it here for the time diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index 7f83213809..95b4ebed06 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -50,7 +50,7 @@ int dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbu int dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); /*--- End of included file: packet-x509af-exp.h ---*/ -#line 28 "./asn1/x509af/packet-x509af-template.h" +#line 16 "./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 cfe8afde58..0c07904d82 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -244,7 +244,7 @@ static int hf_x509ce_EntrustInfoFlags_webCategory = -1; static int hf_x509ce_EntrustInfoFlags_sETCategory = -1; /*--- End of included file: packet-x509ce-hf.c ---*/ -#line 50 "./asn1/x509ce/packet-x509ce-template.c" +#line 38 "./asn1/x509ce/packet-x509ce-template.c" /* Initialize the subtree pointers */ @@ -312,7 +312,7 @@ static gint ett_x509ce_EntrustInfoFlags = -1; static gint ett_x509ce_ScramblerCapabilities = -1; /*--- End of included file: packet-x509ce-ett.c ---*/ -#line 53 "./asn1/x509ce/packet-x509ce-template.c" +#line 41 "./asn1/x509ce/packet-x509ce-template.c" /*--- Included file: packet-x509ce-fn.c ---*/ #line 1 "./asn1/x509ce/packet-x509ce-fn.c" @@ -1934,7 +1934,7 @@ static int dissect_CicamBrandId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-x509ce-fn.c ---*/ -#line 54 "./asn1/x509ce/packet-x509ce-template.c" +#line 42 "./asn1/x509ce/packet-x509ce-template.c" /* CI+ (www.ci-plus.com) defines some X.509 certificate extensions that use OIDs which are not officially assigned @@ -2788,7 +2788,7 @@ void proto_register_x509ce(void) { NULL, HFILL }}, /*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 119 "./asn1/x509ce/packet-x509ce-template.c" +#line 107 "./asn1/x509ce/packet-x509ce-template.c" }; /* List of subtrees */ @@ -2858,7 +2858,7 @@ void proto_register_x509ce(void) { &ett_x509ce_ScramblerCapabilities, /*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 124 "./asn1/x509ce/packet-x509ce-template.c" +#line 112 "./asn1/x509ce/packet-x509ce-template.c" }; /* Register protocol */ @@ -2921,7 +2921,7 @@ void proto_reg_handoff_x509ce(void) { /*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 139 "./asn1/x509ce/packet-x509ce-template.c" +#line 127 "./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 e627f6da67..be27dcc6c6 100644 --- a/epan/dissectors/packet-x509ce.h +++ b/epan/dissectors/packet-x509ce.h @@ -86,7 +86,7 @@ int dissect_x509ce_CiplusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int int dissect_x509ce_CicamBrandId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-x509ce-exp.h ---*/ -#line 28 "./asn1/x509ce/packet-x509ce-template.h" +#line 16 "./asn1/x509ce/packet-x509ce-template.h" void x509ce_enable_ciplus(void); void x509ce_disable_ciplus(void); diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index b2c5ad162b..c449c058c4 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -201,7 +201,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 49 "./asn1/x509if/packet-x509if-template.c" +#line 37 "./asn1/x509if/packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -282,7 +282,7 @@ static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /*--- End of included file: packet-x509if-ett.c ---*/ -#line 52 "./asn1/x509if/packet-x509if-template.c" +#line 40 "./asn1/x509if/packet-x509if-template.c" static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; @@ -2090,7 +2090,7 @@ static int dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-x509if-fn.c ---*/ -#line 88 "./asn1/x509if/packet-x509if-template.c" +#line 76 "./asn1/x509if/packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2756,7 +2756,7 @@ void proto_register_x509if(void) { NULL, HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 133 "./asn1/x509if/packet-x509if-template.c" +#line 121 "./asn1/x509if/packet-x509if-template.c" }; /* List of subtrees */ @@ -2839,7 +2839,7 @@ void proto_register_x509if(void) { &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 138 "./asn1/x509if/packet-x509if-template.c" +#line 126 "./asn1/x509if/packet-x509if-template.c" }; /* Register protocol */ @@ -2897,6 +2897,6 @@ void proto_reg_handoff_x509if(void) { /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 157 "./asn1/x509if/packet-x509if-template.c" +#line 145 "./asn1/x509if/packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h index 11b5f432d2..71cf45f182 100644 --- a/epan/dissectors/packet-x509if.h +++ b/epan/dissectors/packet-x509if.h @@ -69,7 +69,7 @@ int dissect_x509if_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off int dissect_x509if_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-x509if-exp.h ---*/ -#line 28 "./asn1/x509if/packet-x509if-template.h" +#line 16 "./asn1/x509if/packet-x509if-template.h" extern const char * x509if_get_last_dn(void); diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 0efed749f1..fa859c6537 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -207,7 +207,7 @@ 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 45 "./asn1/x509sat/packet-x509sat-template.c" +#line 33 "./asn1/x509sat/packet-x509sat-template.c" /* Initialize the subtree pointers */ @@ -262,7 +262,7 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 48 "./asn1/x509sat/packet-x509sat-template.c" +#line 36 "./asn1/x509sat/packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ @@ -1895,7 +1895,7 @@ static int dissect_GUID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-x509sat-fn.c ---*/ -#line 50 "./asn1/x509sat/packet-x509sat-template.c" +#line 38 "./asn1/x509sat/packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -2564,7 +2564,7 @@ void proto_register_x509sat(void) { NULL, HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 58 "./asn1/x509sat/packet-x509sat-template.c" +#line 46 "./asn1/x509sat/packet-x509sat-template.c" }; /* List of subtrees */ @@ -2621,7 +2621,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 63 "./asn1/x509sat/packet-x509sat-template.c" +#line 51 "./asn1/x509sat/packet-x509sat-template.c" }; /* Register protocol */ @@ -2674,7 +2674,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 73 "./asn1/x509sat/packet-x509sat-template.c" +#line 61 "./asn1/x509sat/packet-x509sat-template.c" } @@ -2867,7 +2867,7 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 80 "./asn1/x509sat/packet-x509sat-template.c" +#line 68 "./asn1/x509sat/packet-x509sat-template.c" /* OBJECT CLASSES */ diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index 6a00e1911b..0e46218152 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -61,7 +61,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 28 "./asn1/x509sat/packet-x509sat-template.h" +#line 16 "./asn1/x509sat/packet-x509sat-template.h" #endif /* PACKET_X509SAT_H */ |