diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-23 00:32:58 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-12-23 05:39:00 +0000 |
| commit | dd859eada4bd1dd563c2b40ea5aa43adac5d01a8 (patch) | |
| tree | 8e439521218764d94ba45d4d153d29bb663ce096 /epan | |
| parent | 17582d345da954b5b4c8ed2b561dc279cf364562 (diff) | |
asn1 generated dissectors: cleanup #include usage
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan')
99 files changed, 675 insertions, 874 deletions
diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index 53cb23f827..8c276a2a2c 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/oids.h> @@ -367,7 +366,7 @@ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ /*--- End of included file: packet-HI2Operations-hf.c ---*/ -#line 44 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 43 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /* Initialize the subtree pointers */ @@ -477,7 +476,7 @@ static gint ett_HI2Operations_TETRACGIType = -1; static gint ett_HI2Operations_TSIType = -1; /*--- End of included file: packet-HI2Operations-ett.c ---*/ -#line 47 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 46 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /*--- Included file: packet-HI2Operations-fn.c ---*/ @@ -3768,7 +3767,7 @@ static int dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-HI2Operations-fn.c ---*/ -#line 49 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 48 "../../asn1/HI2Operations/packet-HI2Operations-template.c" /*--- proto_register_HI2Operations ----------------------------------------------*/ @@ -5037,7 +5036,7 @@ void proto_register_HI2Operations(void) { "SSIType", HFILL }}, /*--- End of included file: packet-HI2Operations-hfarr.c ---*/ -#line 57 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 56 "../../asn1/HI2Operations/packet-HI2Operations-template.c" }; /* List of subtrees */ @@ -5149,7 +5148,7 @@ void proto_register_HI2Operations(void) { &ett_HI2Operations_TSIType, /*--- End of included file: packet-HI2Operations-ettarr.c ---*/ -#line 62 "../../asn1/HI2Operations/packet-HI2Operations-template.c" +#line 61 "../../asn1/HI2Operations/packet-HI2Operations-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index c344ce4a1b..28c8a328c2 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/oids.h> @@ -149,7 +148,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 53 "../../asn1/acp133/packet-acp133-template.c" +#line 52 "../../asn1/acp133/packet-acp133-template.c" /* Initialize the subtree pointers */ static gint ett_acp133 = -1; @@ -178,7 +177,7 @@ static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; /*--- End of included file: packet-acp133-ett.c ---*/ -#line 57 "../../asn1/acp133/packet-acp133-template.c" +#line 56 "../../asn1/acp133/packet-acp133-template.c" /*--- Included file: packet-acp133-fn.c ---*/ @@ -1221,7 +1220,7 @@ static int dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-acp133-fn.c ---*/ -#line 59 "../../asn1/acp133/packet-acp133-template.c" +#line 58 "../../asn1/acp133/packet-acp133-template.c" /*--- proto_register_acp133 -------------------------------------------*/ @@ -1579,7 +1578,7 @@ void proto_register_acp133(void) { NULL, HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 68 "../../asn1/acp133/packet-acp133-template.c" +#line 67 "../../asn1/acp133/packet-acp133-template.c" }; /* List of subtrees */ @@ -1610,7 +1609,7 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_ExtendedContentType, /*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 74 "../../asn1/acp133/packet-acp133-template.c" +#line 73 "../../asn1/acp133/packet-acp133-template.c" }; /* Register protocol */ @@ -1682,7 +1681,7 @@ void proto_reg_handoff_acp133(void) { /*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 90 "../../asn1/acp133/packet-acp133-template.c" +#line 89 "../../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 07d7cbf216..885db949bd 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -41,16 +41,12 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ses.h" @@ -189,7 +185,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 72 "../../asn1/acse/packet-acse-template.c" +#line 68 "../../asn1/acse/packet-acse-template.c" static gint hf_acse_user_data = -1; /* Initialize the subtree pointers */ @@ -234,7 +230,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 77 "../../asn1/acse/packet-acse-template.c" +#line 73 "../../asn1/acse/packet-acse-template.c" static expert_field ei_acse_dissector_not_available = EI_INIT; static expert_field ei_acse_malformed = EI_INIT; @@ -1681,7 +1677,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ /*--- End of included file: packet-acse-fn.c ---*/ -#line 155 "../../asn1/acse/packet-acse-template.c" +#line 151 "../../asn1/acse/packet-acse-template.c" /* @@ -2232,7 +2228,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 273 "../../asn1/acse/packet-acse-template.c" +#line 269 "../../asn1/acse/packet-acse-template.c" }; /* List of subtrees */ @@ -2278,7 +2274,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 279 "../../asn1/acse/packet-acse-template.c" +#line 275 "../../asn1/acse/packet-acse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index ac801182f7..a50252dc34 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -92,13 +92,11 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/tap.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-ansi_map.h" @@ -885,7 +883,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 327 "../../asn1/ansi_map/packet-ansi_map-template.c" /* Initialize the subtree pointers */ static gint ett_ansi_map = -1; @@ -1145,7 +1143,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 359 "../../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; @@ -15281,7 +15279,7 @@ dissect_ansi_map_QualificationRequest2Res(gboolean implicit_tag _U_, tvbuff_t *t /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3636 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 3634 "../../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 @@ -19131,7 +19129,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5293 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5291 "../../asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19392,7 +19390,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5326 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5324 "../../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 daa812cfec..9935d845eb 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -33,16 +33,13 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/oids.h> -#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include <epan/strutil.h> -#include <string.h> #include "packet-ber.h" #include "packet-tcap.h" #include "packet-ansi_tcap.h" @@ -125,7 +122,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 62 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -173,7 +170,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 83 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" #define MAX_SSN 254 @@ -1390,7 +1387,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int /*--- End of included file: packet-ansi_tcap-fn.c ---*/ -#line 359 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 356 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" @@ -1734,7 +1731,7 @@ proto_register_ansi_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-ansi_tcap-hfarr.c ---*/ -#line 494 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 491 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" }; /* Setup protocol subtree array */ @@ -1772,7 +1769,7 @@ proto_register_ansi_tcap(void) &ett_ansi_tcap_T_paramSet, /*--- End of included file: packet-ansi_tcap-ettarr.c ---*/ -#line 505 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c" +#line 502 "../../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 d2b5d38799..c679d41e87 100644 --- a/epan/dissectors/packet-atn-cm.c +++ b/epan/dissectors/packet-atn-cm.c @@ -53,13 +53,11 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/dissectors/packet-ber.h> -#include <epan/dissectors/packet-per.h> - +#include "packet-ber.h" +#include "packet-per.h" #include "packet-atn-ulcs.h" #define ATN_CM_PROTO "ICAO Doc9705 CM" @@ -112,7 +110,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 63 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 61 "../../asn1/atn-cm/packet-atn-cm-template.c" /*--- Included file: packet-atn-cm-ett.c ---*/ @@ -134,7 +132,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 65 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 63 "../../asn1/atn-cm/packet-atn-cm-template.c" static gint ett_atn_cm = -1; @@ -637,7 +635,7 @@ static int dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-atn-cm-fn.c ---*/ -#line 68 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 66 "../../asn1/atn-cm/packet-atn-cm-template.c" static int proto_atn_cm = -1; static int @@ -937,7 +935,7 @@ void proto_register_atn_cm (void) "Timeminutes", HFILL }}, /*--- End of included file: packet-atn-cm-hfarr.c ---*/ -#line 203 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 201 "../../asn1/atn-cm/packet-atn-cm-template.c" }; static gint *ett[] = { @@ -960,7 +958,7 @@ void proto_register_atn_cm (void) &ett_atn_cm_Time, /*--- End of included file: packet-atn-cm-ettarr.c ---*/ -#line 206 "../../asn1/atn-cm/packet-atn-cm-template.c" +#line 204 "../../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 fde245b700..6d4a5749b3 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -57,16 +57,11 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/dissectors/packet-ber.h> -#include <epan/dissectors/packet-per.h> - -#include <stdio.h> -#include <string.h> - +#include "packet-ber.h" +#include "packet-per.h" #include "packet-atn-ulcs.h" #define ATN_CPDLC_PROTO "ICAO Doc9705 CPDLC" @@ -704,7 +699,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 94 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 89 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /*--- Included file: packet-atn-cpdlc-ett.c ---*/ @@ -853,7 +848,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 96 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 91 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" static gint ett_atn_cpdlc = -1; @@ -5304,7 +5299,7 @@ static int dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pin /*--- End of included file: packet-atn-cpdlc-fn.c ---*/ -#line 99 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 94 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /* Wireshark ID of CPDLC protocol */ static int proto_atn_cpdlc = -1; @@ -7926,7 +7921,7 @@ void proto_register_atn_cpdlc (void) NULL, HFILL }}, /*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 312 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 307 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" }; static gint *ett[] = { @@ -8077,7 +8072,7 @@ void proto_register_atn_cpdlc (void) &ett_atn_cpdlc_WindSpeed, /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 316 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 311 "../../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 e1db7d3a32..f631933b16 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -121,20 +121,16 @@ which ATN standard is supported ? #include "config.h" -#include <glib.h> -#include <epan/packet.h> -#include <epan/dissectors/packet-ber.h> -#include <epan/dissectors/packet-per.h> -#include <epan/wmem/wmem.h> -#include <epan/address.h> -#include <epan/conversation.h> - -#include <stdio.h> -#include <string.h> #ifndef _MSC_VER #include <stdint.h> #endif + +#include <epan/packet.h> +#include <epan/address.h> +#include <epan/conversation.h> +#include "packet-ber.h" +#include "packet-per.h" #include "packet-atn-ulcs.h" #define ATN_ACSE_PROTO "ICAO Doc9705 ULCS ACSE (ISO 8649/8650-1:1996)" @@ -280,7 +276,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 198 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 194 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" /*--- Included file: packet-atn-ulcs-ett.c ---*/ @@ -312,7 +308,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 200 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 196 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" static gint ett_atn_ulcs = -1; static gint ett_atn_acse = -1; @@ -1603,7 +1599,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 204 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 200 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" #if 0 /* re-implementing external data: packet-per.c */ @@ -2488,7 +2484,7 @@ void proto_register_atn_ulcs (void) NULL, HFILL }}, /*--- End of included file: packet-atn-ulcs-hfarr.c ---*/ -#line 796 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 792 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" {&hf_atn_ses_type, { "SPDU Type", "atn-ulcs.ses.type", @@ -2576,7 +2572,7 @@ void proto_register_atn_ulcs (void) &ett_atn_ulcs_AttributeTypeAndValue, /*--- End of included file: packet-atn-ulcs-ettarr.c ---*/ -#line 854 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c" +#line 850 "../../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 7f2da409cc..2c1f752ff2 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -31,23 +31,16 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/eax.h> - +#include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <epan/dissectors/packet-ber.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/uat.h> #include <epan/oids.h> - -#include <stdio.h> -#include <string.h> - +#include <wsutil/eax.h> +#include "packet-ber.h" +#include "packet-tcp.h" #include "packet-c1222.h" #define PNAME "ANSI C12.22" @@ -131,7 +124,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 97 "../../asn1/c1222/packet-c1222-template.c" +#line 90 "../../asn1/c1222/packet-c1222-template.c" /* These are the EPSEM pieces */ /* first, the flag components */ static int hf_c1222_epsem_flags = -1; @@ -237,7 +230,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 190 "../../asn1/c1222/packet-c1222-template.c" +#line 183 "../../asn1/c1222/packet-c1222-template.c" static expert_field ei_c1222_command_truncated = EI_INIT; static expert_field ei_c1222_bad_checksum = EI_INIT; @@ -1569,7 +1562,7 @@ static int dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-c1222-fn.c ---*/ -#line 1051 "../../asn1/c1222/packet-c1222-template.c" +#line 1044 "../../asn1/c1222/packet-c1222-template.c" /** * Dissects a a full (reassembled) C12.22 message. @@ -1955,7 +1948,7 @@ void proto_register_c1222(void) { "OCTET_STRING_SIZE_CONSTR002", HFILL }}, /*--- End of included file: packet-c1222-hfarr.c ---*/ -#line 1332 "../../asn1/c1222/packet-c1222-template.c" +#line 1325 "../../asn1/c1222/packet-c1222-template.c" }; /* List of subtrees */ @@ -1978,7 +1971,7 @@ void proto_register_c1222(void) { &ett_c1222_Calling_authentication_value_c1221_U, /*--- End of included file: packet-c1222-ettarr.c ---*/ -#line 1342 "../../asn1/c1222/packet-c1222-template.c" +#line 1335 "../../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 e6fdfc035e..7add7c4e76 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -41,7 +41,8 @@ */ #include "config.h" -#include <glib.h> +#include <stdlib.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> @@ -49,9 +50,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <stdlib.h> -#include <string.h> - #include "packet-ber.h" #include "packet-camel.h" #include "packet-q931.h" @@ -607,7 +605,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 114 "../../asn1/camel/packet-camel-template.c" +#line 112 "../../asn1/camel/packet-camel-template.c" static struct camelsrt_info_t * gp_camelsrt_info; @@ -836,7 +834,7 @@ static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 144 "../../asn1/camel/packet-camel-template.c" +#line 142 "../../asn1/camel/packet-camel-template.c" static expert_field ei_camel_unknown_invokeData = EI_INIT; static expert_field ei_camel_unknown_returnResultData = EI_INIT; @@ -1181,7 +1179,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define noInvokeId NULL /*--- End of included file: packet-camel-val.h ---*/ -#line 304 "../../asn1/camel/packet-camel-template.c" +#line 302 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table.c ---*/ @@ -1271,7 +1269,7 @@ static const value_string camel_err_code_string_vals[] = { /*--- End of included file: packet-camel-table.c ---*/ -#line 306 "../../asn1/camel/packet-camel-template.c" +#line 304 "../../asn1/camel/packet-camel-template.c" /* * DEBUG fonctions @@ -7047,7 +7045,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 375 "../../asn1/camel/packet-camel-template.c" +#line 373 "../../asn1/camel/packet-camel-template.c" /*--- Included file: packet-camel-table2.c ---*/ @@ -7254,7 +7252,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-camel-table2.c ---*/ -#line 377 "../../asn1/camel/packet-camel-template.c" +#line 375 "../../asn1/camel/packet-camel-template.c" /* * Functions needed for Hash-Table @@ -8106,7 +8104,7 @@ void proto_reg_handoff_camel(void) { /*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 1221 "../../asn1/camel/packet-camel-template.c" +#line 1219 "../../asn1/camel/packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -10220,7 +10218,7 @@ void proto_register_camel(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 1394 "../../asn1/camel/packet-camel-template.c" +#line 1392 "../../asn1/camel/packet-camel-template.c" }; /* List of subtrees */ @@ -10435,7 +10433,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 1410 "../../asn1/camel/packet-camel-template.c" +#line 1408 "../../asn1/camel/packet-camel-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index 41d9c23478..5a342a764b 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/asn1.h> @@ -116,7 +115,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 45 "../../asn1/charging_ase/packet-charging_ase-template.c" +#line 44 "../../asn1/charging_ase/packet-charging_ase-template.c" static int ett_charging_ase = -1; @@ -154,7 +153,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 48 "../../asn1/charging_ase/packet-charging_ase-template.c" +#line 47 "../../asn1/charging_ase/packet-charging_ase-template.c" static expert_field ei_charging_ase_extensions_not_dissected = EI_INIT; @@ -842,7 +841,7 @@ int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-charging_ase-fn.c ---*/ -#line 54 "../../asn1/charging_ase/packet-charging_ase-template.c" +#line 53 "../../asn1/charging_ase/packet-charging_ase-template.c" static void dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -1114,7 +1113,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 76 "../../asn1/charging_ase/packet-charging_ase-template.c" }; /* List of subtrees */ @@ -1155,7 +1154,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 82 "../../asn1/charging_ase/packet-charging_ase-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 58d030cd1d..6d831145ee 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> @@ -344,7 +343,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 59 "../../asn1/cmip/packet-cmip-template.c" +#line 58 "../../asn1/cmip/packet-cmip-template.c" /* Initialize the subtree pointers */ static gint ett_cmip = -1; @@ -474,7 +473,7 @@ static gint ett_cmip_T_modificationList = -1; static gint ett_cmip_T_modificationList_item = -1; /*--- End of included file: packet-cmip-ett.c ---*/ -#line 63 "../../asn1/cmip/packet-cmip-template.c" +#line 62 "../../asn1/cmip/packet-cmip-template.c" static expert_field ei_wrong_spdu_type = EI_INIT; @@ -535,7 +534,7 @@ static const value_string cmip_error_code_vals[] = { /*--- End of included file: packet-cmip-table.c ---*/ -#line 72 "../../asn1/cmip/packet-cmip-template.c" +#line 71 "../../asn1/cmip/packet-cmip-template.c" static int opcode_type; #define OPCODE_INVOKE 1 @@ -647,7 +646,7 @@ static const char *objectclass_identifier_id; #define noInvokeId NULL /*--- End of included file: packet-cmip-val.h ---*/ -#line 95 "../../asn1/cmip/packet-cmip-template.c" +#line 94 "../../asn1/cmip/packet-cmip-template.c" /*--- Included file: packet-cmip-fn.c ---*/ #line 1 "../../asn1/cmip/packet-cmip-fn.c" @@ -4491,7 +4490,7 @@ static int dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-cmip-fn.c ---*/ -#line 96 "../../asn1/cmip/packet-cmip-template.c" +#line 95 "../../asn1/cmip/packet-cmip-template.c" @@ -5688,7 +5687,7 @@ void proto_register_cmip(void) { NULL, HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 188 "../../asn1/cmip/packet-cmip-template.c" +#line 187 "../../asn1/cmip/packet-cmip-template.c" }; /* List of subtrees */ @@ -5820,7 +5819,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 194 "../../asn1/cmip/packet-cmip-template.c" +#line 193 "../../asn1/cmip/packet-cmip-template.c" }; static ei_register_info ei[] = { @@ -5915,7 +5914,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 213 "../../asn1/cmip/packet-cmip-template.c" +#line 212 "../../asn1/cmip/packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", FT_UINT32, BASE_DEC); diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 030072e69a..8e66a8e7a8 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> @@ -236,7 +235,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 69 "../../asn1/cmp/packet-cmp-template.c" +#line 68 "../../asn1/cmp/packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; @@ -292,7 +291,7 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 73 "../../asn1/cmp/packet-cmp-template.c" +#line 72 "../../asn1/cmp/packet-cmp-template.c" /*--- Included file: packet-cmp-fn.c ---*/ #line 1 "../../asn1/cmp/packet-cmp-fn.c" @@ -1484,7 +1483,7 @@ static int dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-cmp-fn.c ---*/ -#line 74 "../../asn1/cmp/packet-cmp-template.c" +#line 73 "../../asn1/cmp/packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx) @@ -2368,7 +2367,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 325 "../../asn1/cmp/packet-cmp-template.c" +#line 324 "../../asn1/cmp/packet-cmp-template.c" }; /* List of subtrees */ @@ -2426,7 +2425,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 331 "../../asn1/cmp/packet-cmp-template.c" +#line 330 "../../asn1/cmp/packet-cmp-template.c" }; module_t *cmp_module; @@ -2520,7 +2519,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 403 "../../asn1/cmp/packet-cmp-template.c" +#line 402 "../../asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 533fb26b19..c08056ee21 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -32,16 +32,11 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/sha1.h> -#include <wsutil/md5.h> - #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> - -#include <string.h> +#include <wsutil/sha1.h> +#include <wsutil/md5.h> #include "packet-ber.h" #include "packet-cms.h" @@ -189,7 +184,7 @@ static int hf_cms_issuerUniqueID = -1; /* UniqueIdentifier */ static int hf_cms_extensions = -1; /* Extensions */ /*--- End of included file: packet-cms-hf.c ---*/ -#line 57 "../../asn1/cms/packet-cms-template.c" +#line 52 "../../asn1/cms/packet-cms-template.c" /* Initialize the subtree pointers */ @@ -251,7 +246,7 @@ static gint ett_cms_T_subject = -1; static gint ett_cms_SEQUENCE_OF_Attribute = -1; /*--- End of included file: packet-cms-ett.c ---*/ -#line 60 "../../asn1/cms/packet-cms-template.c" +#line 55 "../../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 */ @@ -1855,7 +1850,7 @@ static int dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U /*--- End of included file: packet-cms-fn.c ---*/ -#line 138 "../../asn1/cms/packet-cms-template.c" +#line 133 "../../asn1/cms/packet-cms-template.c" /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -2363,7 +2358,7 @@ void proto_register_cms(void) { NULL, HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ -#line 149 "../../asn1/cms/packet-cms-template.c" +#line 144 "../../asn1/cms/packet-cms-template.c" }; /* List of subtrees */ @@ -2427,7 +2422,7 @@ void proto_register_cms(void) { &ett_cms_SEQUENCE_OF_Attribute, /*--- End of included file: packet-cms-ettarr.c ---*/ -#line 154 "../../asn1/cms/packet-cms-template.c" +#line 149 "../../asn1/cms/packet-cms-template.c" }; /* Register protocol */ @@ -2474,7 +2469,7 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 177 "../../asn1/cms/packet-cms-template.c" +#line 172 "../../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-credssp.c b/epan/dissectors/packet-credssp.c index 11b43d1ff5..03eea460da 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/tap.h> @@ -86,7 +85,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 56 "../../asn1/credssp/packet-credssp-template.c" +#line 55 "../../asn1/credssp/packet-credssp-template.c" /* Initialize the subtree pointers */ static gint ett_credssp = -1; @@ -102,7 +101,7 @@ static gint ett_credssp_TSCredentials = -1; static gint ett_credssp_TSRequest = -1; /*--- End of included file: packet-credssp-ett.c ---*/ -#line 60 "../../asn1/credssp/packet-credssp-template.c" +#line 59 "../../asn1/credssp/packet-credssp-template.c" /*--- Included file: packet-credssp-fn.c ---*/ @@ -333,7 +332,7 @@ static int dissect_TSRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-credssp-fn.c ---*/ -#line 62 "../../asn1/credssp/packet-credssp-template.c" +#line 61 "../../asn1/credssp/packet-credssp-template.c" /* * Dissect CredSSP PDUs @@ -514,7 +513,7 @@ void proto_register_credssp(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-credssp-hfarr.c ---*/ -#line 154 "../../asn1/credssp/packet-credssp-template.c" +#line 153 "../../asn1/credssp/packet-credssp-template.c" }; /* List of subtrees */ @@ -532,7 +531,7 @@ void proto_register_credssp(void) { &ett_credssp_TSRequest, /*--- End of included file: packet-credssp-ettarr.c ---*/ -#line 160 "../../asn1/credssp/packet-credssp-template.c" +#line 159 "../../asn1/credssp/packet-credssp-template.c" }; diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 348d9f1a22..ef67a6be3c 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -137,7 +136,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 48 "../../asn1/crmf/packet-crmf-template.c" +#line 47 "../../asn1/crmf/packet-crmf-template.c" /* Initialize the subtree pointers */ @@ -171,7 +170,7 @@ static gint ett_crmf_PrivateKeyInfo = -1; static gint ett_crmf_Attributes = -1; /*--- End of included file: packet-crmf-ett.c ---*/ -#line 51 "../../asn1/crmf/packet-crmf-template.c" +#line 50 "../../asn1/crmf/packet-crmf-template.c" /*--- Included file: packet-crmf-fn.c ---*/ #line 1 "../../asn1/crmf/packet-crmf-fn.c" @@ -904,7 +903,7 @@ static int dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-crmf-fn.c ---*/ -#line 52 "../../asn1/crmf/packet-crmf-template.c" +#line 51 "../../asn1/crmf/packet-crmf-template.c" /*--- proto_register_crmf ----------------------------------------------*/ @@ -1241,7 +1240,7 @@ void proto_register_crmf(void) { NULL, HFILL }}, /*--- End of included file: packet-crmf-hfarr.c ---*/ -#line 64 "../../asn1/crmf/packet-crmf-template.c" +#line 63 "../../asn1/crmf/packet-crmf-template.c" }; /* List of subtrees */ @@ -1277,7 +1276,7 @@ void proto_register_crmf(void) { &ett_crmf_Attributes, /*--- End of included file: packet-crmf-ettarr.c ---*/ -#line 69 "../../asn1/crmf/packet-crmf-template.c" +#line 68 "../../asn1/crmf/packet-crmf-template.c" }; /* Register protocol */ @@ -1311,6 +1310,6 @@ void proto_reg_handoff_crmf(void) { /*--- End of included file: packet-crmf-dis-tab.c ---*/ -#line 87 "../../asn1/crmf/packet-crmf-template.c" +#line 86 "../../asn1/crmf/packet-crmf-template.c" } diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index c74352e2f2..261f231fc5 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> @@ -481,7 +480,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 67 "../../asn1/dap/packet-dap-template.c" +#line 66 "../../asn1/dap/packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; @@ -660,7 +659,7 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 71 "../../asn1/dap/packet-dap-template.c" +#line 70 "../../asn1/dap/packet-dap-template.c" static expert_field ei_dap_anonymous = EI_INIT; @@ -687,7 +686,7 @@ static expert_field ei_dap_anonymous = EI_INIT; #define id_errcode_dsaReferral 9 /*--- End of included file: packet-dap-val.h ---*/ -#line 75 "../../asn1/dap/packet-dap-template.c" +#line 74 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table.c ---*/ @@ -725,7 +724,7 @@ static const value_string dap_err_code_string_vals[] = { /*--- End of included file: packet-dap-table.c ---*/ -#line 77 "../../asn1/dap/packet-dap-template.c" +#line 76 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ @@ -4775,7 +4774,7 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-dap-fn.c ---*/ -#line 79 "../../asn1/dap/packet-dap-template.c" +#line 78 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table11.c ---*/ @@ -4807,7 +4806,7 @@ static const ros_opr_t dap_opr_tab[] = { /*--- End of included file: packet-dap-table11.c ---*/ -#line 81 "../../asn1/dap/packet-dap-template.c" +#line 80 "../../asn1/dap/packet-dap-template.c" /*--- Included file: packet-dap-table21.c ---*/ #line 1 "../../asn1/dap/packet-dap-table21.c" @@ -4836,7 +4835,7 @@ static const ros_err_t dap_err_tab[] = { /*--- End of included file: packet-dap-table21.c ---*/ -#line 82 "../../asn1/dap/packet-dap-template.c" +#line 81 "../../asn1/dap/packet-dap-template.c" static const ros_info_t dap_ros_info = { "DAP", @@ -6476,7 +6475,7 @@ void proto_register_dap(void) { NULL, HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 101 "../../asn1/dap/packet-dap-template.c" +#line 100 "../../asn1/dap/packet-dap-template.c" }; /* List of subtrees */ @@ -6657,7 +6656,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 107 "../../asn1/dap/packet-dap-template.c" +#line 106 "../../asn1/dap/packet-dap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 7e7efb4239..cc5e4459de 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> @@ -183,7 +182,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 67 "../../asn1/disp/packet-disp-template.c" +#line 66 "../../asn1/disp/packet-disp-template.c" /* Initialize the subtree pointers */ static gint ett_disp = -1; @@ -246,7 +245,7 @@ static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; /*--- End of included file: packet-disp-ett.c ---*/ -#line 71 "../../asn1/disp/packet-disp-template.c" +#line 70 "../../asn1/disp/packet-disp-template.c" static expert_field ei_disp_unsupported_opcode = EI_INIT; static expert_field ei_disp_unsupported_errcode = EI_INIT; @@ -1483,7 +1482,7 @@ static int dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-disp-fn.c ---*/ -#line 78 "../../asn1/disp/packet-disp-template.c" +#line 77 "../../asn1/disp/packet-disp-template.c" /* * Dissect DISP PDUs inside a ROS PDUs @@ -2041,7 +2040,7 @@ void proto_register_disp(void) { "ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 203 "../../asn1/disp/packet-disp-template.c" +#line 202 "../../asn1/disp/packet-disp-template.c" }; /* List of subtrees */ @@ -2106,7 +2105,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 209 "../../asn1/disp/packet-disp-template.c" +#line 208 "../../asn1/disp/packet-disp-template.c" }; static ei_register_info ei[] = { @@ -2156,7 +2155,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 248 "../../asn1/disp/packet-disp-template.c" +#line 247 "../../asn1/disp/packet-disp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 76a154c3f3..42c1007b00 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -31,13 +31,11 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-acse.h" @@ -267,7 +265,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; /*--- End of included file: packet-dop-hf.c ---*/ -#line 67 "../../asn1/dop/packet-dop-template.c" +#line 65 "../../asn1/dop/packet-dop-template.c" /* Initialize the subtree pointers */ static gint ett_dop = -1; @@ -344,7 +342,7 @@ static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; /*--- End of included file: packet-dop-ett.c ---*/ -#line 72 "../../asn1/dop/packet-dop-template.c" +#line 70 "../../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; @@ -2043,7 +2041,7 @@ static int dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-dop-fn.c ---*/ -#line 91 "../../asn1/dop/packet-dop-template.c" +#line 89 "../../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) @@ -2960,7 +2958,7 @@ void proto_register_dop(void) { NULL, HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 243 "../../asn1/dop/packet-dop-template.c" +#line 241 "../../asn1/dop/packet-dop-template.c" }; /* List of subtrees */ @@ -3039,7 +3037,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 250 "../../asn1/dop/packet-dop-template.c" +#line 248 "../../asn1/dop/packet-dop-template.c" }; static ei_register_info ei[] = { @@ -3106,7 +3104,7 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 294 "../../asn1/dop/packet-dop-template.c" +#line 292 "../../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-dsp.c b/epan/dissectors/packet-dsp.c index 0c20a462e3..4f4e8a8274 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> @@ -207,7 +206,7 @@ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ /*--- End of included file: packet-dsp-hf.c ---*/ -#line 61 "../../asn1/dsp/packet-dsp-template.c" +#line 60 "../../asn1/dsp/packet-dsp-template.c" /* Initialize the subtree pointers */ static gint ett_dsp = -1; @@ -287,7 +286,7 @@ static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; /*--- End of included file: packet-dsp-ett.c ---*/ -#line 65 "../../asn1/dsp/packet-dsp-template.c" +#line 64 "../../asn1/dsp/packet-dsp-template.c" static expert_field ei_dsp_unsupported_opcode = EI_INIT; static expert_field ei_dsp_unsupported_errcode = EI_INIT; @@ -1694,7 +1693,7 @@ static int dissect_DitBridgeKnowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-dsp-fn.c ---*/ -#line 72 "../../asn1/dsp/packet-dsp-template.c" +#line 71 "../../asn1/dsp/packet-dsp-template.c" /* * Dissect X518 PDUs inside a ROS PDUs @@ -2450,7 +2449,7 @@ void proto_register_dsp(void) { "EXTERNAL", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 275 "../../asn1/dsp/packet-dsp-template.c" +#line 274 "../../asn1/dsp/packet-dsp-template.c" }; /* List of subtrees */ @@ -2532,7 +2531,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 281 "../../asn1/dsp/packet-dsp-template.c" +#line 280 "../../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 }}, @@ -2583,7 +2582,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 321 "../../asn1/dsp/packet-dsp-template.c" +#line 320 "../../asn1/dsp/packet-dsp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 90bb94c440..a49624455a 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -33,9 +33,6 @@ #include "config.h" -#include <glib.h> -#include <string.h> - #include <epan/packet.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -145,7 +142,7 @@ static int hf_ess_issuer = -1; /* GeneralNames */ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ /*--- End of included file: packet-ess-hf.c ---*/ -#line 66 "../../asn1/ess/packet-ess-template.c" +#line 63 "../../asn1/ess/packet-ess-template.c" /*--- Included file: packet-ess-val.h ---*/ @@ -169,7 +166,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 68 "../../asn1/ess/packet-ess-template.c" +#line 65 "../../asn1/ess/packet-ess-template.c" /* Initialize the subtree pointers */ @@ -208,7 +205,7 @@ static gint ett_ess_ESSCertID = -1; static gint ett_ess_IssuerSerial = -1; /*--- End of included file: packet-ess-ett.c ---*/ -#line 71 "../../asn1/ess/packet-ess-template.c" +#line 68 "../../asn1/ess/packet-ess-template.c" static const char *object_identifier_id; @@ -1156,7 +1153,7 @@ static int dissect_SigningCertificateV2_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-ess-fn.c ---*/ -#line 142 "../../asn1/ess/packet-ess-template.c" +#line 139 "../../asn1/ess/packet-ess-template.c" /*--- proto_register_ess ----------------------------------------------*/ void proto_register_ess(void) { @@ -1454,7 +1451,7 @@ void proto_register_ess(void) { "CertificateSerialNumber", HFILL }}, /*--- End of included file: packet-ess-hfarr.c ---*/ -#line 155 "../../asn1/ess/packet-ess-template.c" +#line 152 "../../asn1/ess/packet-ess-template.c" }; /* List of subtrees */ @@ -1496,7 +1493,7 @@ void proto_register_ess(void) { &ett_ess_IssuerSerial, /*--- End of included file: packet-ess-ettarr.c ---*/ -#line 161 "../../asn1/ess/packet-ess-template.c" +#line 158 "../../asn1/ess/packet-ess-template.c" }; static uat_field_t attributes_flds[] = { @@ -1563,6 +1560,6 @@ void proto_reg_handoff_ess(void) { /*--- End of included file: packet-ess-dis-tab.c ---*/ -#line 206 "../../asn1/ess/packet-ess-template.c" +#line 203 "../../asn1/ess/packet-ess-template.c" } diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index f0ebe155a4..c7bcdb4a82 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> @@ -482,7 +481,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 58 "../../asn1/ftam/packet-ftam-template.c" +#line 57 "../../asn1/ftam/packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; @@ -653,7 +652,7 @@ static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 62 "../../asn1/ftam/packet-ftam-template.c" +#line 61 "../../asn1/ftam/packet-ftam-template.c" static expert_field ei_ftam_zero_pdu = EI_INIT; @@ -4739,7 +4738,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 66 "../../asn1/ftam/packet-ftam-template.c" +#line 65 "../../asn1/ftam/packet-ftam-template.c" /* * Dissect FTAM unstructured text @@ -6464,7 +6463,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 130 "../../asn1/ftam/packet-ftam-template.c" +#line 129 "../../asn1/ftam/packet-ftam-template.c" }; /* List of subtrees */ @@ -6637,7 +6636,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 136 "../../asn1/ftam/packet-ftam-template.c" +#line 135 "../../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-goose.c b/epan/dissectors/packet-goose.c index 08fac1f3b3..a02ba3d533 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/etypes.h> @@ -121,7 +120,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 53 "../../asn1/goose/packet-goose-template.c" +#line 52 "../../asn1/goose/packet-goose-template.c" /* Initialize the subtree pointers */ static int ett_goose = -1; @@ -148,7 +147,7 @@ static gint ett_goose_SEQUENCE_OF_Data = -1; static gint ett_goose_Data = -1; /*--- End of included file: packet-goose-ett.c ---*/ -#line 58 "../../asn1/goose/packet-goose-template.c" +#line 57 "../../asn1/goose/packet-goose-template.c" /*--- Included file: packet-goose-fn.c ---*/ @@ -705,7 +704,7 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-goose-fn.c ---*/ -#line 60 "../../asn1/goose/packet-goose-template.c" +#line 59 "../../asn1/goose/packet-goose-template.c" /* * Dissect GOOSE PDUs inside a PPDU. @@ -1014,7 +1013,7 @@ void proto_register_goose(void) { "UtcTime", HFILL }}, /*--- End of included file: packet-goose-hfarr.c ---*/ -#line 128 "../../asn1/goose/packet-goose-template.c" +#line 127 "../../asn1/goose/packet-goose-template.c" }; /* List of subtrees */ @@ -1042,7 +1041,7 @@ void proto_register_goose(void) { &ett_goose_Data, /*--- End of included file: packet-goose-ettarr.c ---*/ -#line 134 "../../asn1/goose/packet-goose-template.c" +#line 133 "../../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 10d9f3b8ea..e287decbab 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/asn1.h> @@ -363,7 +362,7 @@ static int hf_gprscdr_ServiceConditionChange_tAIChange = -1; static int hf_gprscdr_ServiceConditionChange_userLocationChange = -1; /*--- End of included file: packet-gprscdr-hf.c ---*/ -#line 46 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 45 "../../asn1/gprscdr/packet-gprscdr-template.c" static int ett_gprscdr = -1; static int ett_gprscdr_timestamp = -1; @@ -435,7 +434,7 @@ static gint ett_gprscdr_TWANUserLocationInfo = -1; static gint ett_gprscdr_UserCSGInformation = -1; /*--- End of included file: packet-gprscdr-ett.c ---*/ -#line 52 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 51 "../../asn1/gprscdr/packet-gprscdr-template.c" static expert_field ei_gprscdr_not_dissected = EI_INIT; @@ -3153,7 +3152,7 @@ int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-gprscdr-fn.c ---*/ -#line 67 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 66 "../../asn1/gprscdr/packet-gprscdr-template.c" @@ -4396,7 +4395,7 @@ proto_register_gprscdr(void) NULL, HFILL }}, /*--- End of included file: packet-gprscdr-hfarr.c ---*/ -#line 77 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 76 "../../asn1/gprscdr/packet-gprscdr-template.c" }; /* List of subtrees */ @@ -4471,7 +4470,7 @@ proto_register_gprscdr(void) &ett_gprscdr_UserCSGInformation, /*--- End of included file: packet-gprscdr-ettarr.c ---*/ -#line 86 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 85 "../../asn1/gprscdr/packet-gprscdr-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index cfbb5a230b..590f63fa78 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -52,17 +52,14 @@ #include "config.h" -#include <glib.h> +#include <stdlib.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/oids.h> #include <epan/expert.h> -#include <stdlib.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" #include "packet-per.h" @@ -1893,7 +1890,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 152 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 149 "../../asn1/gsm_map/packet-gsm_map-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -2600,7 +2597,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 182 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 179 "../../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; @@ -20272,7 +20269,7 @@ dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 830 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 827 "../../asn1/gsm_map/packet-gsm_map-template.c" /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { @@ -20494,7 +20491,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 841 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 838 "../../asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; @@ -20711,7 +20708,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 847 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 844 "../../asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; #endif @@ -29535,7 +29532,7 @@ void proto_register_gsm_map(void) { NULL, HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 2901 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 2898 "../../asn1/gsm_map/packet-gsm_map-template.c" }; /* List of subtrees */ @@ -30244,7 +30241,7 @@ void proto_register_gsm_map(void) { &ett_NokiaMAP_Extensions_AllowedServiceData, /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 2933 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 2930 "../../asn1/gsm_map/packet-gsm_map-template.c" }; static ei_register_info ei[] = { @@ -30348,7 +30345,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 2971 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 2968 "../../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-h225.c b/epan/dissectors/packet-h225.c index 103dc9b340..13a6bfaacb 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -40,22 +40,18 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - -#include <string.h> #include <epan/prefs.h> #include <epan/oids.h> #include <epan/next_tvb.h> #include <epan/asn1.h> +#include <epan/t35.h> #include <epan/tap.h> #include "packet-tpkt.h" #include "packet-per.h" #include "packet-h225.h" -#include <epan/t35.h> #include <epan/h225-persistentdata.h> #include "packet-h235.h" #include "packet-h245.h" @@ -886,7 +882,7 @@ static int hf_h225_stopped = -1; /* NULL */ static int hf_h225_notAvailable = -1; /* NULL */ /*--- End of included file: packet-h225-hf.c ---*/ -#line 107 "../../asn1/h225/packet-h225-template.c" +#line 103 "../../asn1/h225/packet-h225-template.c" /* Initialize the subtree pointers */ static gint ett_h225 = -1; @@ -1134,7 +1130,7 @@ static gint ett_h225_ServiceControlResponse = -1; static gint ett_h225_T_result = -1; /*--- End of included file: packet-h225-ett.c ---*/ -#line 111 "../../asn1/h225/packet-h225-template.c" +#line 107 "../../asn1/h225/packet-h225-template.c" /* Preferences */ static guint h225_tls_port = TLS_PORT_CS; @@ -7514,7 +7510,7 @@ static int dissect_RasMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-h225-fn.c ---*/ -#line 135 "../../asn1/h225/packet-h225-template.c" +#line 131 "../../asn1/h225/packet-h225-template.c" /* Forward declaration we need below */ @@ -10699,7 +10695,7 @@ void proto_register_h225(void) { NULL, HFILL }}, /*--- End of included file: packet-h225-hfarr.c ---*/ -#line 235 "../../asn1/h225/packet-h225-template.c" +#line 231 "../../asn1/h225/packet-h225-template.c" }; /* List of subtrees */ @@ -10949,7 +10945,7 @@ void proto_register_h225(void) { &ett_h225_T_result, /*--- End of included file: packet-h225-ettarr.c ---*/ -#line 241 "../../asn1/h225/packet-h225-template.c" +#line 237 "../../asn1/h225/packet-h225-template.c" }; module_t *h225_module; diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index c0f437c605..0ba9bdb5ca 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -163,7 +162,7 @@ static int hf_h235_fecBeforeSrtp = -1; /* NULL */ static int hf_h235_fecAfterSrtp = -1; /* NULL */ /*--- End of included file: packet-h235-hf.c ---*/ -#line 53 "../../asn1/h235/packet-h235-template.c" +#line 52 "../../asn1/h235/packet-h235-template.c" /* Initialize the subtree pointers */ @@ -203,7 +202,7 @@ static gint ett_h235_SEQUENCE_OF_GenericData = -1; static gint ett_h235_FecOrder = -1; /*--- End of included file: packet-h235-ett.c ---*/ -#line 56 "../../asn1/h235/packet-h235-template.c" +#line 55 "../../asn1/h235/packet-h235-template.c" static int @@ -1049,7 +1048,7 @@ static int dissect_SrtpCryptoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-h235-fn.c ---*/ -#line 65 "../../asn1/h235/packet-h235-template.c" +#line 64 "../../asn1/h235/packet-h235-template.c" /*--- proto_register_h235 ----------------------------------------------*/ @@ -1466,7 +1465,7 @@ void proto_register_h235(void) { NULL, HFILL }}, /*--- End of included file: packet-h235-hfarr.c ---*/ -#line 73 "../../asn1/h235/packet-h235-template.c" +#line 72 "../../asn1/h235/packet-h235-template.c" }; /* List of subtrees */ @@ -1508,7 +1507,7 @@ void proto_register_h235(void) { &ett_h235_FecOrder, /*--- End of included file: packet-h235-ettarr.c ---*/ -#line 78 "../../asn1/h235/packet-h235-template.c" +#line 77 "../../asn1/h235/packet-h235-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 086eee7aea..c656b6361d 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -40,21 +40,16 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/strutil.h> -#include <wsutil/pint.h> #include <epan/addr_resolv.h> - -#include <string.h> - #include <epan/prefs.h> #include <epan/t35.h> -#include <epan/wmem/wmem.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/tap.h> +#include <wsutil/pint.h> #include "packet-tpkt.h" #include "packet-per.h" #include "packet-h323.h" @@ -217,7 +212,7 @@ typedef enum _IndicationMessage_enum { } IndicationMessage_enum; /*--- End of included file: packet-h245-val.h ---*/ -#line 90 "../../asn1/h245/packet-h245-template.c" +#line 85 "../../asn1/h245/packet-h245-template.c" static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, @@ -1922,7 +1917,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 388 "../../asn1/h245/packet-h245-template.c" +#line 383 "../../asn1/h245/packet-h245-template.c" /* Initialize the subtree pointers */ static int ett_h245 = -1; @@ -2423,7 +2418,7 @@ static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; /*--- End of included file: packet-h245-ett.c ---*/ -#line 393 "../../asn1/h245/packet-h245-template.c" +#line 388 "../../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_); @@ -14508,7 +14503,7 @@ static int dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-h245-fn.c ---*/ -#line 402 "../../asn1/h245/packet-h245-template.c" +#line 397 "../../asn1/h245/packet-h245-template.c" static void dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -20205,7 +20200,7 @@ void proto_register_h245(void) { NULL, HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ -#line 486 "../../asn1/h245/packet-h245-template.c" +#line 481 "../../asn1/h245/packet-h245-template.c" }; /* List of subtrees */ @@ -20708,7 +20703,7 @@ void proto_register_h245(void) { &ett_h245_MobileMultilinkReconfigurationIndication, /*--- End of included file: packet-h245-ettarr.c ---*/ -#line 493 "../../asn1/h245/packet-h245-template.c" +#line 488 "../../asn1/h245/packet-h245-template.c" }; module_t *h245_module; diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 14ae46eae1..24de3dfe14 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -33,12 +33,12 @@ #include "config.h" -#include "packet-h248.h" +#include <packet.h> #include <epan/exceptions.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include "packet-tpkt.h" #include "packet-mtp3.h" +#include "packet-h248.h" #define PNAME "H.248 MEGACO" #define PSNAME "H248" diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index b4725ed59a..665895d89c 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -485,7 +484,7 @@ static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndica static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ /*--- End of included file: packet-h282-hf.c ---*/ -#line 43 "../../asn1/h282/packet-h282-template.c" +#line 42 "../../asn1/h282/packet-h282-template.c" /* Initialize the subtree pointers */ static int ett_h282 = -1; @@ -637,7 +636,7 @@ static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; /*--- End of included file: packet-h282-ett.c ---*/ -#line 47 "../../asn1/h282/packet-h282-template.c" +#line 46 "../../asn1/h282/packet-h282-template.c" /* Dissectors */ @@ -4396,7 +4395,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 53 "../../asn1/h282/packet-h282-template.c" +#line 52 "../../asn1/h282/packet-h282-template.c" static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -6154,7 +6153,7 @@ void proto_register_h282(void) { "NonStandardPDU", HFILL }}, /*--- End of included file: packet-h282-hfarr.c ---*/ -#line 74 "../../asn1/h282/packet-h282-template.c" +#line 73 "../../asn1/h282/packet-h282-template.c" }; /* List of subtrees */ @@ -6308,7 +6307,7 @@ void proto_register_h282(void) { &ett_h282_IndicationPDU, /*--- End of included file: packet-h282-ettarr.c ---*/ -#line 80 "../../asn1/h282/packet-h282-template.c" +#line 79 "../../asn1/h282/packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 4b972ce357..d991e791a5 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -84,7 +83,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 43 "../../asn1/h283/packet-h283-template.c" +#line 42 "../../asn1/h283/packet-h283-template.c" /* Initialize the subtree pointers */ static int ett_h283 = -1; @@ -107,7 +106,7 @@ static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; /*--- End of included file: packet-h283-ett.c ---*/ -#line 47 "../../asn1/h283/packet-h283-template.c" +#line 46 "../../asn1/h283/packet-h283-template.c" /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; @@ -565,7 +564,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 56 "../../asn1/h283/packet-h283-template.c" +#line 55 "../../asn1/h283/packet-h283-template.c" static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -721,7 +720,7 @@ void proto_register_h283(void) { NULL, HFILL }}, /*--- End of included file: packet-h283-hfarr.c ---*/ -#line 79 "../../asn1/h283/packet-h283-template.c" +#line 78 "../../asn1/h283/packet-h283-template.c" }; /* List of subtrees */ @@ -746,7 +745,7 @@ void proto_register_h283(void) { &ett_h283_NonStandardMessage, /*--- End of included file: packet-h283-ettarr.c ---*/ -#line 85 "../../asn1/h283/packet-h283-template.c" +#line 84 "../../asn1/h283/packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index f06af3c03e..c3d2f2fc45 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -31,11 +31,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include "packet-per.h" #include "packet-h225.h" @@ -129,7 +127,7 @@ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ /*--- End of included file: packet-h323-hf.c ---*/ -#line 92 "../../asn1/h323/packet-h323-template.c" +#line 90 "../../asn1/h323/packet-h323-template.c" /* Initialize the subtree pointers */ @@ -150,7 +148,7 @@ static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; /*--- End of included file: packet-h323-ett.c ---*/ -#line 95 "../../asn1/h323/packet-h323-template.c" +#line 93 "../../asn1/h323/packet-h323-template.c" /*--- Included file: packet-h323-fn.c ---*/ @@ -441,7 +439,7 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h323-fn.c ---*/ -#line 97 "../../asn1/h323/packet-h323-template.c" +#line 95 "../../asn1/h323/packet-h323-template.c" /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { @@ -565,7 +563,7 @@ void proto_register_h323(void) { NULL, HFILL }}, /*--- End of included file: packet-h323-hfarr.c ---*/ -#line 104 "../../asn1/h323/packet-h323-template.c" +#line 102 "../../asn1/h323/packet-h323-template.c" }; /* List of subtrees */ @@ -588,7 +586,7 @@ void proto_register_h323(void) { &ett_h323_StatusInquiry_RD, /*--- End of included file: packet-h323-ettarr.c ---*/ -#line 109 "../../asn1/h323/packet-h323-template.c" +#line 107 "../../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 b12841ae30..0c160e8891 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -35,7 +35,6 @@ #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-per.h" #include "packet-h450-ros.h" @@ -74,7 +73,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 45 "../../asn1/h450-ros/packet-h450-ros-template.c" +#line 44 "../../asn1/h450-ros/packet-h450-ros-template.c" /* Initialize the subtree pointers */ @@ -90,7 +89,7 @@ static gint ett_h450_ros_Reject = -1; static gint ett_h450_ros_T_problem = -1; /*--- End of included file: packet-h450-ros-ett.c ---*/ -#line 48 "../../asn1/h450-ros/packet-h450-ros-template.c" +#line 47 "../../asn1/h450-ros/packet-h450-ros-template.c" static expert_field ei_ros_undecoded = EI_INIT; @@ -583,7 +582,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 77 "../../asn1/h450-ros/packet-h450-ros-template.c" +#line 76 "../../asn1/h450-ros/packet-h450-ros-template.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { @@ -675,7 +674,7 @@ void proto_register_h450_ros(void) { "ReturnErrorProblem", HFILL }}, /*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 84 "../../asn1/h450-ros/packet-h450-ros-template.c" +#line 83 "../../asn1/h450-ros/packet-h450-ros-template.c" }; /* List of subtrees */ @@ -693,7 +692,7 @@ void proto_register_h450_ros(void) { &ett_h450_ros_T_problem, /*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 89 "../../asn1/h450-ros/packet-h450-ros-template.c" +#line 88 "../../asn1/h450-ros/packet-h450-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 66df7f3e69..1ff0f345c8 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> @@ -448,7 +447,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 55 "../../asn1/h450/packet-h450-template.c" +#line 54 "../../asn1/h450/packet-h450-template.c" /* Initialize the subtree pointers */ @@ -626,7 +625,7 @@ static gint ett_h450_12_FeatureValues = -1; static gint ett_h450_12_FeatureControl = -1; /*--- End of included file: packet-h450-ett.c ---*/ -#line 58 "../../asn1/h450/packet-h450-template.c" +#line 57 "../../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; @@ -733,7 +732,7 @@ static const value_string h450_str_operation[] = { { 85, "cmnInform" }, /*--- End of included file: packet-h450-table10.c ---*/ -#line 65 "../../asn1/h450/packet-h450-template.c" +#line 64 "../../asn1/h450/packet-h450-template.c" { 0, NULL} }; @@ -821,7 +820,7 @@ static const value_string h450_str_error[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table20.c ---*/ -#line 70 "../../asn1/h450/packet-h450-template.c" +#line 69 "../../asn1/h450/packet-h450-template.c" { 0, NULL} }; @@ -4486,7 +4485,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 79 "../../asn1/h450/packet-h450-template.c" +#line 78 "../../asn1/h450/packet-h450-template.c" typedef struct _h450_op_t { gint32 opcode; @@ -4595,7 +4594,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 88 "../../asn1/h450/packet-h450-template.c" +#line 87 "../../asn1/h450/packet-h450-template.c" }; typedef struct _h450_err_t { @@ -4687,7 +4686,7 @@ static const h450_err_t h450_err_tab[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table21.c ---*/ -#line 97 "../../asn1/h450/packet-h450-template.c" +#line 96 "../../asn1/h450/packet-h450-template.c" }; static const h450_op_t *get_op(gint32 opcode) { @@ -6289,7 +6288,7 @@ void proto_register_h450(void) { NULL, HFILL }}, /*--- End of included file: packet-h450-hfarr.c ---*/ -#line 266 "../../asn1/h450/packet-h450-template.c" +#line 265 "../../asn1/h450/packet-h450-template.c" }; /* List of subtrees */ @@ -6469,7 +6468,7 @@ void proto_register_h450(void) { &ett_h450_12_FeatureControl, /*--- End of included file: packet-h450-ettarr.c ---*/ -#line 271 "../../asn1/h450/packet-h450-template.c" +#line 270 "../../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 0e15a8043d..dc2937aaf0 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -31,13 +31,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-h225.h" #include "packet-h235.h" @@ -257,7 +254,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 48 "../../asn1/h460/packet-h460-template.c" +#line 45 "../../asn1/h460/packet-h460-template.c" /* Initialize the subtree pointers */ @@ -354,7 +351,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 51 "../../asn1/h460/packet-h460-template.c" +#line 48 "../../asn1/h460/packet-h460-template.c" /* Subdissectors */ static dissector_handle_t q931_ie_handle = NULL; @@ -1965,7 +1962,7 @@ static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet /*--- End of included file: packet-h460-fn.c ---*/ -#line 57 "../../asn1/h460/packet-h460-template.c" +#line 54 "../../asn1/h460/packet-h460-template.c" static int dissect_ies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2874,7 +2871,7 @@ void proto_register_h460(void) { "UnicastAddress", HFILL }}, /*--- End of included file: packet-h460-hfarr.c ---*/ -#line 251 "../../asn1/h460/packet-h460-template.c" +#line 248 "../../asn1/h460/packet-h460-template.c" }; /* List of subtrees */ @@ -2973,7 +2970,7 @@ void proto_register_h460(void) { &ett_h460_21_TransmitCapabilities, /*--- End of included file: packet-h460-ettarr.c ---*/ -#line 256 "../../asn1/h460/packet-h460-template.c" +#line 253 "../../asn1/h460/packet-h460-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index de61793f58..85f9b52427 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> @@ -305,7 +304,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 46 "../../asn1/h501/packet-h501-template.c" +#line 45 "../../asn1/h501/packet-h501-template.c" /* Initialize the subtree pointers */ static int ett_h501 = -1; @@ -413,7 +412,7 @@ static gint ett_h501_Role = -1; static gint ett_h501_TerminationCause = -1; /*--- End of included file: packet-h501-ett.c ---*/ -#line 50 "../../asn1/h501/packet-h501-template.c" +#line 49 "../../asn1/h501/packet-h501-template.c" /* Dissectors */ static dissector_handle_t h501_pdu_handle; @@ -2515,7 +2514,7 @@ static int dissect_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-h501-fn.c ---*/ -#line 62 "../../asn1/h501/packet-h501-template.c" +#line 61 "../../asn1/h501/packet-h501-template.c" static int dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -3556,7 +3555,7 @@ void proto_register_h501(void) { "INTEGER_1_65535", HFILL }}, /*--- End of included file: packet-h501-hfarr.c ---*/ -#line 98 "../../asn1/h501/packet-h501-template.c" +#line 97 "../../asn1/h501/packet-h501-template.c" }; /* List of subtrees */ @@ -3666,7 +3665,7 @@ void proto_register_h501(void) { &ett_h501_TerminationCause, /*--- End of included file: packet-h501-ettarr.c ---*/ -#line 104 "../../asn1/h501/packet-h501-template.c" +#line 103 "../../asn1/h501/packet-h501-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index 07478561d4..4162644c96 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -33,9 +33,6 @@ #include "config.h" -#include <glib.h> -#include <string.h> - #include <epan/packet.h> #include <epan/sctpppids.h> #include <epan/asn1.h> @@ -114,7 +111,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-hnbap-val.h ---*/ -#line 52 "../../asn1/hnbap/packet-hnbap-template.c" +#line 49 "../../asn1/hnbap/packet-hnbap-template.c" /* Initialize the protocol and registered fields */ static int proto_hnbap = -1; @@ -260,7 +257,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 57 "../../asn1/hnbap/packet-hnbap-template.c" +#line 54 "../../asn1/hnbap/packet-hnbap-template.c" /* Initialize the subtree pointers */ static int ett_hnbap = -1; @@ -334,7 +331,7 @@ static gint ett_hnbap_SuccessfulOutcome = -1; static gint ett_hnbap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-hnbap-ett.c ---*/ -#line 62 "../../asn1/hnbap/packet-hnbap-template.c" +#line 59 "../../asn1/hnbap/packet-hnbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -2591,7 +2588,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 83 "../../asn1/hnbap/packet-hnbap-template.c" +#line 80 "../../asn1/hnbap/packet-hnbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -3210,7 +3207,7 @@ module_t *hnbap_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-hnbap-hfarr.c ---*/ -#line 153 "../../asn1/hnbap/packet-hnbap-template.c" +#line 150 "../../asn1/hnbap/packet-hnbap-template.c" }; /* List of subtrees */ @@ -3285,7 +3282,7 @@ module_t *hnbap_module; &ett_hnbap_UnsuccessfulOutcome, /*--- End of included file: packet-hnbap-ettarr.c ---*/ -#line 159 "../../asn1/hnbap/packet-hnbap-template.c" +#line 156 "../../asn1/hnbap/packet-hnbap-template.c" }; @@ -3372,7 +3369,7 @@ proto_reg_handoff_hnbap(void) /*--- End of included file: packet-hnbap-dis-tab.c ---*/ -#line 196 "../../asn1/hnbap/packet-hnbap-template.c" +#line 193 "../../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 5a16b18e84..f2f45598d7 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -31,23 +31,21 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/ipproto.h> +#include <epan/strutil.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" #include "packet-ber.h" #include "packet-ros.h" #include "packet-x509ce.h" -#include <epan/strutil.h> #define PNAME "X.519 Internet Directly Mapped Protocol" #define PSNAME "IDMP" @@ -173,7 +171,7 @@ static int hf_idmp_present = -1; /* INTEGER */ static int hf_idmp_absent = -1; /* NULL */ /*--- End of included file: packet-idmp-hf.c ---*/ -#line 132 "../../asn1/idmp/packet-idmp-template.c" +#line 130 "../../asn1/idmp/packet-idmp-template.c" /* Initialize the subtree pointers */ static gint ett_idmp = -1; @@ -192,7 +190,7 @@ static gint ett_idmp_Code = -1; static gint ett_idmp_InvokeId = -1; /*--- End of included file: packet-idmp-ett.c ---*/ -#line 136 "../../asn1/idmp/packet-idmp-template.c" +#line 134 "../../asn1/idmp/packet-idmp-template.c" /*--- Included file: packet-idmp-fn.c ---*/ @@ -620,7 +618,7 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U /*--- End of included file: packet-idmp-fn.c ---*/ -#line 138 "../../asn1/idmp/packet-idmp-template.c" +#line 136 "../../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) @@ -931,7 +929,7 @@ void proto_register_idmp(void) NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 316 "../../asn1/idmp/packet-idmp-template.c" +#line 314 "../../asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -954,7 +952,7 @@ void proto_register_idmp(void) &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 324 "../../asn1/idmp/packet-idmp-template.c" +#line 322 "../../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 0e405d5023..d510b21ca3 100644 --- a/epan/dissectors/packet-ilp.c +++ b/epan/dissectors/packet-ilp.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/asn1.h> @@ -451,7 +450,7 @@ static int hf_ilp_GANSSSignals_signal7 = -1; static int hf_ilp_GANSSSignals_signal8 = -1; /*--- End of included file: packet-ilp-hf.c ---*/ -#line 61 "../../asn1/ilp/packet-ilp-template.c" +#line 60 "../../asn1/ilp/packet-ilp-template.c" /* Initialize the subtree pointers */ static gint ett_ilp = -1; @@ -595,7 +594,7 @@ static gint ett_ilp_T_lPPPayload = -1; static gint ett_ilp_T_tia801Payload = -1; /*--- End of included file: packet-ilp-ett.c ---*/ -#line 65 "../../asn1/ilp/packet-ilp-template.c" +#line 64 "../../asn1/ilp/packet-ilp-template.c" /* Include constants */ @@ -612,7 +611,7 @@ static gint ett_ilp_T_tia801Payload = -1; #define maxPosSize 1024 /*--- End of included file: packet-ilp-val.h ---*/ -#line 68 "../../asn1/ilp/packet-ilp-template.c" +#line 67 "../../asn1/ilp/packet-ilp-template.c" @@ -4090,7 +4089,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 71 "../../asn1/ilp/packet-ilp-template.c" +#line 70 "../../asn1/ilp/packet-ilp-template.c" static guint @@ -5641,7 +5640,7 @@ void proto_register_ilp(void) { NULL, HFILL }}, /*--- End of included file: packet-ilp-hfarr.c ---*/ -#line 97 "../../asn1/ilp/packet-ilp-template.c" +#line 96 "../../asn1/ilp/packet-ilp-template.c" }; /* List of subtrees */ @@ -5787,7 +5786,7 @@ void proto_register_ilp(void) { &ett_ilp_T_tia801Payload, /*--- End of included file: packet-ilp-ettarr.c ---*/ -#line 103 "../../asn1/ilp/packet-ilp-template.c" +#line 102 "../../asn1/ilp/packet-ilp-template.c" }; module_t *ilp_module; diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index e32ee57250..7a44242cb0 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> @@ -460,7 +459,7 @@ static int proto_inap = -1; #define noInvokeId NULL /*--- End of included file: packet-inap-val.h ---*/ -#line 58 "../../asn1/inap/packet-inap-template.c" +#line 57 "../../asn1/inap/packet-inap-template.c" /*--- Included file: packet-inap-hf.c ---*/ @@ -1027,7 +1026,7 @@ static int hf_inap_present = -1; /* INTEGER */ static int hf_inap_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-inap-hf.c ---*/ -#line 60 "../../asn1/inap/packet-inap-template.c" +#line 59 "../../asn1/inap/packet-inap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1292,7 +1291,7 @@ static gint ett_inap_T_problem_01 = -1; static gint ett_inap_InvokeId = -1; /*--- End of included file: packet-inap-ett.c ---*/ -#line 84 "../../asn1/inap/packet-inap-template.c" +#line 83 "../../asn1/inap/packet-inap-template.c" static expert_field ei_inap_unknown_invokeData = EI_INIT; static expert_field ei_inap_unknown_returnResultData = EI_INIT; @@ -1422,7 +1421,7 @@ static const value_string inap_err_code_string_vals[] = { /*--- End of included file: packet-inap-table.c ---*/ -#line 90 "../../asn1/inap/packet-inap-template.c" +#line 89 "../../asn1/inap/packet-inap-template.c" const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, @@ -8983,7 +8982,7 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-inap-fn.c ---*/ -#line 104 "../../asn1/inap/packet-inap-template.c" +#line 103 "../../asn1/inap/packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9333,7 +9332,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-inap-table2.c ---*/ -#line 125 "../../asn1/inap/packet-inap-template.c" +#line 124 "../../asn1/inap/packet-inap-template.c" static guint8 inap_pdu_type = 0; @@ -11659,7 +11658,7 @@ void proto_register_inap(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 206 "../../asn1/inap/packet-inap-template.c" +#line 205 "../../asn1/inap/packet-inap-template.c" }; @@ -11914,7 +11913,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 220 "../../asn1/inap/packet-inap-template.c" +#line 219 "../../asn1/inap/packet-inap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c index 1fc58092ef..338c7f3b44 100644 --- a/epan/dissectors/packet-isdn-sup.c +++ b/epan/dissectors/packet-isdn-sup.c @@ -33,7 +33,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> @@ -52,7 +51,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 42 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 41 "../../asn1/isdn-sup/packet-isdn-sup-template.c" /* Initialize the protocol and registered fields */ static int proto_isdn_sup = -1; @@ -119,7 +118,7 @@ static const value_string isdn_sup_str_operation[] = { { 46, "partyDISC" }, /*--- End of included file: packet-isdn-sup-table10.c ---*/ -#line 75 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 74 "../../asn1/isdn-sup/packet-isdn-sup-template.c" { 0, NULL} }; @@ -160,7 +159,7 @@ static const value_string isdn_sup_str_error[] = { { 2, "rejectedByTheUser" }, /*--- End of included file: packet-isdn-sup-table20.c ---*/ -#line 81 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 80 "../../asn1/isdn-sup/packet-isdn-sup-template.c" { 0, NULL} }; @@ -327,7 +326,7 @@ static int hf_isdn_sup_fPHReference = -1; /* FPHReference */ static int hf_isdn_sup_calledFreephoneNr = -1; /* CalledFreephoneNr */ /*--- End of included file: packet-isdn-sup-hf.c ---*/ -#line 87 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 86 "../../asn1/isdn-sup/packet-isdn-sup-template.c" /* Initialize the subtree pointers */ @@ -402,7 +401,7 @@ static gint ett_isdn_sup_Free_T_FPHArg = -1; static gint ett_isdn_sup_Call_T_FPHArg = -1; /*--- End of included file: packet-isdn-sup-ett.c ---*/ -#line 93 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 92 "../../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; @@ -2501,7 +2500,7 @@ static int dissect_Call_T_FPHArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-isdn-sup-fn.c ---*/ -#line 103 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 102 "../../asn1/isdn-sup/packet-isdn-sup-template.c" static const isdn_sup_op_t isdn_sup_op_tab[] = { @@ -2538,7 +2537,7 @@ static const isdn_sup_op_t isdn_sup_op_tab[] = { /* userUserService */ { 1, dissect_UserUserServiceArg_PDU, NULL }, /*--- End of included file: packet-isdn-sup-table11.c ---*/ -#line 106 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 105 "../../asn1/isdn-sup/packet-isdn-sup-template.c" }; @@ -2553,7 +2552,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 112 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 111 "../../asn1/isdn-sup/packet-isdn-sup-template.c" }; static const isdn_sup_err_t isdn_sup_err_tab[] = { @@ -2592,7 +2591,7 @@ static const isdn_sup_err_t isdn_sup_err_tab[] = { /* rejectedByTheUser */ { 2, NULL }, /*--- End of included file: packet-isdn-sup-table21.c ---*/ -#line 116 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 115 "../../asn1/isdn-sup/packet-isdn-sup-template.c" }; @@ -3454,7 +3453,7 @@ void proto_register_isdn_sup(void) { NULL, HFILL }}, /*--- End of included file: packet-isdn-sup-hfarr.c ---*/ -#line 349 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 348 "../../asn1/isdn-sup/packet-isdn-sup-template.c" }; /* List of subtrees */ @@ -3530,7 +3529,7 @@ void proto_register_isdn_sup(void) { &ett_isdn_sup_Call_T_FPHArg, /*--- End of included file: packet-isdn-sup-ettarr.c ---*/ -#line 356 "../../asn1/isdn-sup/packet-isdn-sup-template.c" +#line 355 "../../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 63cd8c8eb6..f6427900c0 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -62,34 +62,29 @@ #include "config.h" -#include <stdio.h> -#include <string.h> -#include <glib.h> - -#include <wsutil/file_util.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/strutil.h> - #include <epan/conversation.h> #include <epan/asn1.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-kerberos.h> -#include <epan/dissectors/packet-netbios.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-ber.h> -#include <epan/dissectors/packet-pkinit.h> -#include <epan/dissectors/packet-cms.h> -#include <epan/dissectors/packet-windows-common.h> +#include <wsutil/file_util.h> +#include <wsutil/ws_diag_control.h> +#include "packet-kerberos.h" +#include "packet-netbios.h" +#include "packet-tcp.h" +#include "packet-ber.h" +#include "packet-pkinit.h" +#include "packet-cms.h" +#include "packet-windows-common.h" -#include <epan/dissectors/packet-dcerpc-netlogon.h> -#include <epan/dissectors/packet-dcerpc.h> +#include "packet-dcerpc-netlogon.h" +#include "packet-dcerpc.h" -#include <epan/dissectors/packet-gssapi.h> -#include <epan/dissectors/packet-smb-common.h> +#include "packet-gssapi.h" +#include "packet-smb-common.h" -#include <wsutil/ws_diag_control.h> void proto_register_kerberos(void); void proto_reg_handoff_kerberos(void); @@ -348,7 +343,7 @@ static int hf_kerberos_KDCOptions_renew = -1; static int hf_kerberos_KDCOptions_validate = -1; /*--- End of included file: packet-kerberos-hf.c ---*/ -#line 175 "../../asn1/kerberos/packet-kerberos-template.c" +#line 170 "../../asn1/kerberos/packet-kerberos-template.c" /* Initialize the subtree pointers */ static gint ett_kerberos = -1; @@ -420,7 +415,7 @@ static gint ett_kerberos_KERB_PA_PAC_REQUEST = -1; static gint ett_kerberos_ChangePasswdData = -1; /*--- End of included file: packet-kerberos-ett.c ---*/ -#line 189 "../../asn1/kerberos/packet-kerberos-template.c" +#line 184 "../../asn1/kerberos/packet-kerberos-template.c" static expert_field ei_kerberos_decrypted_keytype = EI_INIT; static expert_field ei_kerberos_address = EI_INIT; @@ -449,7 +444,7 @@ static gboolean gbl_do_col_info; #define KERBEROS_ADDR_TYPE_IPV6 24 /*--- End of included file: packet-kerberos-val.h ---*/ -#line 202 "../../asn1/kerberos/packet-kerberos-template.c" +#line 197 "../../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) @@ -4267,7 +4262,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 2007 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2002 "../../asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -5305,7 +5300,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 2388 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2383 "../../asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -5379,7 +5374,7 @@ void proto_register_kerberos(void) { &ett_kerberos_ChangePasswdData, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 2404 "../../asn1/kerberos/packet-kerberos-template.c" +#line 2399 "../../asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c index 73adfeccce..de78ab235a 100644 --- a/epan/dissectors/packet-lcsap.c +++ b/epan/dissectors/packet-lcsap.c @@ -34,13 +34,9 @@ #include "config.h" -#include <glib.h> -#include <epan/packet.h> - -#include <stdio.h> -#include <string.h> #include <math.h> +#include <epan/packet.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -112,7 +108,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-lcsap-val.h ---*/ -#line 64 "../../asn1/lcsap/packet-lcsap-template.c" +#line 60 "../../asn1/lcsap/packet-lcsap-template.c" /* Initialize the protocol and registered fields */ static int proto_lcsap = -1; @@ -235,7 +231,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 74 "../../asn1/lcsap/packet-lcsap-template.c" +#line 70 "../../asn1/lcsap/packet-lcsap-template.c" /* Initialize the subtree pointers */ static int ett_lcsap = -1; @@ -290,7 +286,7 @@ static gint ett_lcsap_SuccessfulOutcome = -1; static gint ett_lcsap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-lcsap-ett.c ---*/ -#line 79 "../../asn1/lcsap/packet-lcsap-template.c" +#line 75 "../../asn1/lcsap/packet-lcsap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -2206,7 +2202,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 192 "../../asn1/lcsap/packet-lcsap-template.c" +#line 188 "../../asn1/lcsap/packet-lcsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2305,7 +2301,7 @@ proto_reg_handoff_lcsap(void) /*--- End of included file: packet-lcsap-dis-tab.c ---*/ -#line 252 "../../asn1/lcsap/packet-lcsap-template.c" +#line 248 "../../asn1/lcsap/packet-lcsap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, lcsap_handle); @@ -2787,7 +2783,7 @@ void proto_register_lcsap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-lcsap-hfarr.c ---*/ -#line 297 "../../asn1/lcsap/packet-lcsap-template.c" +#line 293 "../../asn1/lcsap/packet-lcsap-template.c" }; /* List of subtrees */ @@ -2843,7 +2839,7 @@ void proto_register_lcsap(void) { &ett_lcsap_UnsuccessfulOutcome, /*--- End of included file: packet-lcsap-ettarr.c ---*/ -#line 303 "../../asn1/lcsap/packet-lcsap-template.c" +#line 299 "../../asn1/lcsap/packet-lcsap-template.c" }; module_t *lcsap_module; diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index be57259ed2..c04321d190 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -90,26 +90,21 @@ #include "config.h" -#include <string.h> - -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/oids.h> #include <epan/strutil.h> #include <epan/show_exception.h> -#include <epan/dissectors/packet-frame.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-windows-common.h> -#include <epan/dissectors/packet-dcerpc.h> #include <epan/asn1.h> #include <epan/expert.h> #include <epan/uat.h> +#include "packet-frame.h" +#include "packet-tcp.h" +#include "packet-windows-common.h" +#include "packet-dcerpc.h" #include "packet-ldap.h" #include "packet-ntlmssp.h" @@ -346,7 +341,7 @@ static int hf_ldap_graceAuthNsRemaining = -1; /* INTEGER_0_maxInt */ static int hf_ldap_error = -1; /* T_error */ /*--- End of included file: packet-ldap-hf.c ---*/ -#line 196 "../../asn1/ldap/packet-ldap-template.c" +#line 191 "../../asn1/ldap/packet-ldap-template.c" /* Initialize the subtree pointers */ static gint ett_ldap = -1; @@ -418,7 +413,7 @@ static gint ett_ldap_PasswordPolicyResponseValue = -1; static gint ett_ldap_T_warning = -1; /*--- End of included file: packet-ldap-ett.c ---*/ -#line 208 "../../asn1/ldap/packet-ldap-template.c" +#line 203 "../../asn1/ldap/packet-ldap-template.c" static expert_field ei_ldap_exceeded_filter_length = EI_INIT; static expert_field ei_ldap_too_many_filter_elements = EI_INIT; @@ -3820,7 +3815,7 @@ static int dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_inf /*--- End of included file: packet-ldap-fn.c ---*/ -#line 886 "../../asn1/ldap/packet-ldap-template.c" +#line 881 "../../asn1/ldap/packet-ldap-template.c" static int dissect_LDAPMessage_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ldap_conv_info_t *ldap_info) { int offset = 0; @@ -5736,7 +5731,7 @@ void proto_register_ldap(void) { NULL, HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 2233 "../../asn1/ldap/packet-ldap-template.c" +#line 2228 "../../asn1/ldap/packet-ldap-template.c" }; /* List of subtrees */ @@ -5810,7 +5805,7 @@ void proto_register_ldap(void) { &ett_ldap_T_warning, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 2247 "../../asn1/ldap/packet-ldap-template.c" +#line 2242 "../../asn1/ldap/packet-ldap-template.c" }; /* UAT for header fields */ static uat_field_t custom_attribute_types_uat_fields[] = { @@ -5976,7 +5971,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2396 "../../asn1/ldap/packet-ldap-template.c" +#line 2391 "../../asn1/ldap/packet-ldap-template.c" } diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 4aceb26509..79278d9da1 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-ber.h" @@ -93,7 +92,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 43 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 42 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" /* Initialize the subtree pointers */ @@ -120,7 +119,7 @@ static gint ett_logotypecertextn_T_refStructURI = -1; static gint ett_logotypecertextn_HashAlgAndValue = -1; /*--- End of included file: packet-logotypecertextn-ett.c ---*/ -#line 46 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 45 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" @@ -519,7 +518,7 @@ static int dissect_LogotypeExtn_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-logotypecertextn-fn.c ---*/ -#line 49 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 48 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" /*--- proto_register_logotypecertextn ----------------------------------------------*/ @@ -696,7 +695,7 @@ void proto_register_logotypecertextn(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/ -#line 57 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 56 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* List of subtrees */ @@ -725,7 +724,7 @@ void proto_register_logotypecertextn(void) { &ett_logotypecertextn_HashAlgAndValue, /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/ -#line 62 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 61 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" }; /* Register protocol */ @@ -749,6 +748,6 @@ void proto_reg_handoff_logotypecertextn(void) { /*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/ -#line 77 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" +#line 76 "../../asn1/logotypecertextn/packet-logotypecertextn-template.c" } diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 144c619e16..9a1bc36175 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -33,9 +33,9 @@ */ #include "config.h" + #include "math.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c index 82e9f1bc94..333d7b8910 100644 --- a/epan/dissectors/packet-lppa.c +++ b/epan/dissectors/packet-lppa.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -187,7 +186,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 46 "../../asn1/lppa/packet-lppa-template.c" +#line 45 "../../asn1/lppa/packet-lppa-template.c" /* Initialize the subtree pointers */ static gint ett_lppa = -1; @@ -248,7 +247,7 @@ static gint ett_lppa_ErrorIndication = -1; static gint ett_lppa_PrivateMessage = -1; /*--- End of included file: packet-lppa-ett.c ---*/ -#line 50 "../../asn1/lppa/packet-lppa-template.c" +#line 49 "../../asn1/lppa/packet-lppa-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -304,7 +303,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-lppa-val.h ---*/ -#line 63 "../../asn1/lppa/packet-lppa-template.c" +#line 62 "../../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 *); @@ -2304,7 +2303,7 @@ static int dissect_PrivateMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-lppa-fn.c ---*/ -#line 70 "../../asn1/lppa/packet-lppa-template.c" +#line 69 "../../asn1/lppa/packet-lppa-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2865,7 +2864,7 @@ void proto_register_lppa(void) { "PrivateIE_Container", HFILL }}, /*--- End of included file: packet-lppa-hfarr.c ---*/ -#line 98 "../../asn1/lppa/packet-lppa-template.c" +#line 97 "../../asn1/lppa/packet-lppa-template.c" }; /* List of subtrees */ @@ -2928,7 +2927,7 @@ void proto_register_lppa(void) { &ett_lppa_PrivateMessage, /*--- End of included file: packet-lppa-ettarr.c ---*/ -#line 104 "../../asn1/lppa/packet-lppa-template.c" +#line 103 "../../asn1/lppa/packet-lppa-template.c" }; /* Register protocol */ @@ -2985,5 +2984,5 @@ proto_reg_handoff_lppa(void) /*--- End of included file: packet-lppa-dis-tab.c ---*/ -#line 126 "../../asn1/lppa/packet-lppa-template.c" +#line 125 "../../asn1/lppa/packet-lppa-template.c" } diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index e2a4db8d8d..91cf2d60a2 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -33,7 +33,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -1754,7 +1753,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 51 "../../asn1/lppe/packet-lppe-template.c" +#line 50 "../../asn1/lppe/packet-lppe-template.c" /* Initialize the subtree pointers */ static gint ett_lppe = -1; @@ -2448,7 +2447,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 55 "../../asn1/lppe/packet-lppe-template.c" +#line 54 "../../asn1/lppe/packet-lppe-template.c" /* Include constants */ @@ -2495,7 +2494,7 @@ static gint ett_lppe_T_srnMeasurements = -1; #define maxChannels 512 /*--- End of included file: packet-lppe-val.h ---*/ -#line 58 "../../asn1/lppe/packet-lppe-template.c" +#line 57 "../../asn1/lppe/packet-lppe-template.c" @@ -16447,7 +16446,7 @@ static int dissect_OMA_LPPe_MessageExtension_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-lppe-fn.c ---*/ -#line 61 "../../asn1/lppe/packet-lppe-template.c" +#line 60 "../../asn1/lppe/packet-lppe-template.c" /*--- proto_register_lpp -------------------------------------------*/ @@ -23233,7 +23232,7 @@ void proto_register_lppe(void) { NULL, HFILL }}, /*--- End of included file: packet-lppe-hfarr.c ---*/ -#line 70 "../../asn1/lppe/packet-lppe-template.c" +#line 69 "../../asn1/lppe/packet-lppe-template.c" }; /* List of subtrees */ @@ -23929,7 +23928,7 @@ void proto_register_lppe(void) { &ett_lppe_T_srnMeasurements, /*--- End of included file: packet-lppe-ettarr.c ---*/ -#line 76 "../../asn1/lppe/packet-lppe-template.c" +#line 75 "../../asn1/lppe/packet-lppe-template.c" }; diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index f716c428c6..9d29653a50 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -35,15 +35,12 @@ #include "config.h" -#include <glib.h> - #include <stdlib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/asn1.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-per.h" #include "packet-rrc.h" @@ -184,7 +181,7 @@ typedef enum _RAT_Type_enum { } RAT_Type_enum; /*--- End of included file: packet-lte-rrc-val.h ---*/ -#line 79 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 76 "../../asn1/lte-rrc/packet-lte-rrc-template.c" /* Initialize the protocol and registered fields */ static int proto_lte_rrc = -1; @@ -2555,7 +2552,7 @@ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1; /* CandidateCellInfo static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ /*--- End of included file: packet-lte-rrc-hf.c ---*/ -#line 84 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 81 "../../asn1/lte-rrc/packet-lte-rrc-template.c" static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1; static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1; @@ -3867,7 +3864,7 @@ static gint ett_lte_rrc_CandidateCellInfoList_r10 = -1; static gint ett_lte_rrc_CandidateCellInfo_r10 = -1; /*--- End of included file: packet-lte-rrc-ett.c ---*/ -#line 204 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 201 "../../asn1/lte-rrc/packet-lte-rrc-template.c" static gint ett_lte_rrc_featureGroupIndicators = -1; static gint ett_lte_rrc_featureGroupIndRel9Add = -1; @@ -38170,7 +38167,7 @@ static int dissect_UEAssistanceInformation_r11_PDU(tvbuff_t *tvb _U_, packet_inf /*--- End of included file: packet-lte-rrc-fn.c ---*/ -#line 2297 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2294 "../../asn1/lte-rrc/packet-lte-rrc-template.c" static void dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -47785,7 +47782,7 @@ void proto_register_lte_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 2467 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2464 "../../asn1/lte-rrc/packet-lte-rrc-template.c" { &hf_lte_rrc_eutra_cap_feat_group_ind_1, { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1", @@ -49440,7 +49437,7 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_CandidateCellInfo_r10, /*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 2930 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2927 "../../asn1/lte-rrc/packet-lte-rrc-template.c" &ett_lte_rrc_featureGroupIndicators, &ett_lte_rrc_featureGroupIndRel9Add, @@ -49511,7 +49508,7 @@ void proto_register_lte_rrc(void) { /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 2985 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2982 "../../asn1/lte-rrc/packet-lte-rrc-template.c" register_init_routine(<e_rrc_init_protocol); } diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index 81805c3cd5..26ccc9e5f4 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> @@ -104,7 +103,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 51 "../../asn1/m3ap/packet-m3ap-template.c" /* Initialize the protocol and registered fields */ static int proto_m3ap = -1; @@ -212,7 +211,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 60 "../../asn1/m3ap/packet-m3ap-template.c" +#line 59 "../../asn1/m3ap/packet-m3ap-template.c" /* Initialize the subtree pointers */ static int ett_m3ap = -1; @@ -266,7 +265,7 @@ static gint ett_m3ap_SuccessfulOutcome = -1; static gint ett_m3ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-m3ap-ett.c ---*/ -#line 65 "../../asn1/m3ap/packet-m3ap-template.c" +#line 64 "../../asn1/m3ap/packet-m3ap-template.c" enum{ INITIATING_MESSAGE, @@ -2003,7 +2002,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 93 "../../asn1/m3ap/packet-m3ap-template.c" +#line 92 "../../asn1/m3ap/packet-m3ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2449,7 +2448,7 @@ void proto_register_m3ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-m3ap-hfarr.c ---*/ -#line 154 "../../asn1/m3ap/packet-m3ap-template.c" +#line 153 "../../asn1/m3ap/packet-m3ap-template.c" }; /* List of subtrees */ @@ -2504,7 +2503,7 @@ void proto_register_m3ap(void) { &ett_m3ap_UnsuccessfulOutcome, /*--- End of included file: packet-m3ap-ettarr.c ---*/ -#line 160 "../../asn1/m3ap/packet-m3ap-template.c" +#line 159 "../../asn1/m3ap/packet-m3ap-template.c" }; @@ -2579,7 +2578,7 @@ proto_reg_handoff_m3ap(void) /*--- End of included file: packet-m3ap-dis-tab.c ---*/ -#line 190 "../../asn1/m3ap/packet-m3ap-template.c" +#line 189 "../../asn1/m3ap/packet-m3ap-template.c" dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap)); } else { diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 509423577c..74cc6fdd63 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -31,9 +31,8 @@ #include "config.h" -#include <glib.h> -#include <epan/prefs.h> #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/asn1.h> #include <epan/expert.h> @@ -723,7 +722,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 47 "../../asn1/mms/packet-mms-template.c" +#line 46 "../../asn1/mms/packet-mms-template.c" /* Initialize the subtree pointers */ static gint ett_mms = -1; @@ -940,7 +939,7 @@ static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; /*--- End of included file: packet-mms-ett.c ---*/ -#line 51 "../../asn1/mms/packet-mms-template.c" +#line 50 "../../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; @@ -7048,7 +7047,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, /*--- End of included file: packet-mms-fn.c ---*/ -#line 57 "../../asn1/mms/packet-mms-template.c" +#line 56 "../../asn1/mms/packet-mms-template.c" /* * Dissect MMS PDUs inside a PPDU. @@ -9756,7 +9755,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 95 "../../asn1/mms/packet-mms-template.c" }; /* List of subtrees */ @@ -9975,7 +9974,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 101 "../../asn1/mms/packet-mms-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 466cde97b8..83efa901f4 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -30,8 +30,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/asn1.h> @@ -66,7 +64,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 35 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 33 "../../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" @@ -74,7 +72,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 36 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 34 "../../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" @@ -445,7 +443,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 37 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 35 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" void proto_register_mpeg_audio(void); void proto_reg_handoff_mpeg_audio(void); @@ -654,7 +652,7 @@ proto_register_mpeg_audio(void) NULL, HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 153 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 151 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" { &hf_mpeg_audio_data, { "Data", "mpeg-audio.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -678,7 +676,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 170 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 168 "../../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 8d5e1ba749..e1667c92dc 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/asn1.h> @@ -94,7 +92,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 35 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 33 "../../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" @@ -106,7 +104,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 36 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 34 "../../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" @@ -474,7 +472,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 37 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 35 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" void proto_register_mpeg_pes(void); void proto_reg_handoff_mpeg_pes(void); @@ -1191,7 +1189,7 @@ proto_register_mpeg_pes(void) "BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 549 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 547 "../../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 }}, @@ -1309,7 +1307,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 656 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 654 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, &ett_mpeg_pes_trick_mode diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index cf3e651901..77f564411d 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -33,12 +33,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/sctpppids.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> @@ -1547,7 +1544,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-nbap-val.h ---*/ -#line 85 "../../asn1/nbap/packet-nbap-template.c" +#line 82 "../../asn1/nbap/packet-nbap-template.c" /* Initialize the protocol and registered fields */ static int proto_nbap = -1; @@ -4851,7 +4848,7 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1; static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-nbap-hf.c ---*/ -#line 93 "../../asn1/nbap/packet-nbap-template.c" +#line 90 "../../asn1/nbap/packet-nbap-template.c" /* Initialize the subtree pointers */ static int ett_nbap = -1; @@ -6490,7 +6487,7 @@ static gint ett_nbap_UnsuccessfulOutcome = -1; static gint ett_nbap_Outcome = -1; /*--- End of included file: packet-nbap-ett.c ---*/ -#line 101 "../../asn1/nbap/packet-nbap-template.c" +#line 98 "../../asn1/nbap/packet-nbap-template.c" static expert_field ei_nbap_no_find_comm_context_id = EI_INIT; static expert_field ei_nbap_no_find_port_info = EI_INIT; @@ -55171,7 +55168,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-nbap-fn.c ---*/ -#line 323 "../../asn1/nbap/packet-nbap-template.c" +#line 320 "../../asn1/nbap/packet-nbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -68505,7 +68502,7 @@ void proto_register_nbap(void) NULL, HFILL }}, /*--- End of included file: packet-nbap-hfarr.c ---*/ -#line 492 "../../asn1/nbap/packet-nbap-template.c" +#line 489 "../../asn1/nbap/packet-nbap-template.c" }; /* List of subtrees */ @@ -70145,7 +70142,7 @@ void proto_register_nbap(void) &ett_nbap_Outcome, /*--- End of included file: packet-nbap-ettarr.c ---*/ -#line 501 "../../asn1/nbap/packet-nbap-template.c" +#line 498 "../../asn1/nbap/packet-nbap-template.c" }; static ei_register_info ei[] = { @@ -71299,7 +71296,7 @@ proto_reg_handoff_nbap(void) /*--- End of included file: packet-nbap-dis-tab.c ---*/ -#line 558 "../../asn1/nbap/packet-nbap-template.c" +#line 555 "../../asn1/nbap/packet-nbap-template.c" } diff --git a/epan/dissectors/packet-novell_pkis.c b/epan/dissectors/packet-novell_pkis.c index fa0f45ae6e..eb732594fc 100644 --- a/epan/dissectors/packet-novell_pkis.c +++ b/epan/dissectors/packet-novell_pkis.c @@ -29,18 +29,14 @@ #include "config.h" -#include <glib.h> -#include <epan/expert.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/prefs.h> #include <epan/oids.h> #include <epan/conversation.h> #include <epan/asn1.h> -#include <stdio.h> -#include <string.h> - -#include <epan/dissectors/packet-per.h> +#include "packet-per.h" #include "packet-ber.h" @@ -93,7 +89,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 39 "../../asn1/novell_pkis/packet-novell_pkis-template.c" +#line 35 "../../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" @@ -115,7 +111,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 40 "../../asn1/novell_pkis/packet-novell_pkis-template.c" +#line 36 "../../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" @@ -513,7 +509,7 @@ static int dissect_RelianceLimits_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-novell_pkis-fn.c ---*/ -#line 41 "../../asn1/novell_pkis/packet-novell_pkis-template.c" +#line 37 "../../asn1/novell_pkis/packet-novell_pkis-template.c" void proto_register_novell_pkis (void); void proto_reg_handoff_novell_pkis(void); @@ -530,7 +526,7 @@ void proto_reg_handoff_novell_pkis(void) /*--- End of included file: packet-novell_pkis-dis-tab.c ---*/ -#line 50 "../../asn1/novell_pkis/packet-novell_pkis-template.c" +#line 46 "../../asn1/novell_pkis/packet-novell_pkis-template.c" } void proto_register_novell_pkis (void) @@ -721,7 +717,7 @@ void proto_register_novell_pkis (void) "INTEGER", HFILL }}, /*--- End of included file: packet-novell_pkis-hfarr.c ---*/ -#line 56 "../../asn1/novell_pkis/packet-novell_pkis-template.c" +#line 52 "../../asn1/novell_pkis/packet-novell_pkis-template.c" }; static gint *ett[] = { @@ -745,7 +741,7 @@ void proto_register_novell_pkis (void) &ett_novell_pkis_MonetaryValue, /*--- End of included file: packet-novell_pkis-ettarr.c ---*/ -#line 59 "../../asn1/novell_pkis/packet-novell_pkis-template.c" +#line 55 "../../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 362efdb414..138e6ec4ec 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-ber.h" @@ -67,7 +66,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 41 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 40 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /* Initialize the subtree pointers */ @@ -76,7 +75,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 44 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 43 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /*--- Included file: packet-ns_cert_exts-fn.c ---*/ @@ -241,7 +240,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 46 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 45 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" /*--- proto_register_ns_cert_exts -------------------------------------------*/ @@ -318,7 +317,7 @@ void proto_register_ns_cert_exts(void) { NULL, HFILL }}, /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 54 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 53 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* List of subtrees */ @@ -329,7 +328,7 @@ void proto_register_ns_cert_exts(void) { &ett_ns_cert_exts_CertType, /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/ -#line 59 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 58 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" }; /* Register protocol */ @@ -358,6 +357,6 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 74 "../../asn1/ns_cert_exts/packet-ns_cert_exts-template.c" +#line 73 "../../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 b6cbad6df6..322a5794a7 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <asn1.h> @@ -110,7 +109,7 @@ static int hf_ocsp_crlNum = -1; /* INTEGER */ static int hf_ocsp_crlTime = -1; /* GeneralizedTime */ /*--- End of included file: packet-ocsp-hf.c ---*/ -#line 49 "../../asn1/ocsp/packet-ocsp-template.c" +#line 48 "../../asn1/ocsp/packet-ocsp-template.c" /* Initialize the subtree pointers */ static gint ett_ocsp = -1; @@ -138,7 +137,7 @@ static gint ett_ocsp_ServiceLocator = -1; static gint ett_ocsp_CrlID = -1; /*--- End of included file: packet-ocsp-ett.c ---*/ -#line 53 "../../asn1/ocsp/packet-ocsp-template.c" +#line 52 "../../asn1/ocsp/packet-ocsp-template.c" static const char *responseType_id; @@ -672,7 +671,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 58 "../../asn1/ocsp/packet-ocsp-template.c" +#line 57 "../../asn1/ocsp/packet-ocsp-template.c" static int @@ -940,7 +939,7 @@ void proto_register_ocsp(void) { "GeneralizedTime", HFILL }}, /*--- End of included file: packet-ocsp-hfarr.c ---*/ -#line 113 "../../asn1/ocsp/packet-ocsp-template.c" +#line 112 "../../asn1/ocsp/packet-ocsp-template.c" }; /* List of subtrees */ @@ -970,7 +969,7 @@ void proto_register_ocsp(void) { &ett_ocsp_CrlID, /*--- End of included file: packet-ocsp-ettarr.c ---*/ -#line 119 "../../asn1/ocsp/packet-ocsp-template.c" +#line 118 "../../asn1/ocsp/packet-ocsp-template.c" }; /* Register protocol */ @@ -1006,6 +1005,6 @@ void proto_reg_handoff_ocsp(void) { /*--- End of included file: packet-ocsp-dis-tab.c ---*/ -#line 142 "../../asn1/ocsp/packet-ocsp-template.c" +#line 141 "../../asn1/ocsp/packet-ocsp-template.c" } diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 48d33bbdf8..aa8891faed 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -31,13 +31,12 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> +#include <epan/strutil.h> #include "packet-ber.h" #include "packet-acse.h" @@ -50,7 +49,6 @@ #include "packet-x509sat.h" #include "packet-p1.h" -#include <epan/strutil.h> #define PNAME "X.411 Message Transfer Service" #define PSNAME "P1" @@ -639,7 +637,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 65 "../../asn1/p1/packet-p1-template.c" +#line 63 "../../asn1/p1/packet-p1-template.c" /* Initialize the subtree pointers */ static gint ett_p1 = -1; @@ -836,7 +834,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 76 "../../asn1/p1/packet-p1-template.c" +#line 74 "../../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; @@ -894,7 +892,7 @@ static const value_string p3_err_code_string_vals[] = { /*--- End of included file: packet-p1-table.c ---*/ -#line 90 "../../asn1/p1/packet-p1-template.c" +#line 88 "../../asn1/p1/packet-p1-template.c" typedef struct p1_address_ctx { gboolean do_address; @@ -8420,7 +8418,7 @@ static int dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-p1-fn.c ---*/ -#line 151 "../../asn1/p1/packet-p1-template.c" +#line 149 "../../asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-table11.c ---*/ @@ -8452,7 +8450,7 @@ static const ros_opr_t p3_opr_tab[] = { /*--- End of included file: packet-p1-table11.c ---*/ -#line 153 "../../asn1/p1/packet-p1-template.c" +#line 151 "../../asn1/p1/packet-p1-template.c" /*--- Included file: packet-p1-table21.c ---*/ #line 1 "../../asn1/p1/packet-p1-table21.c" @@ -8497,7 +8495,7 @@ static const ros_err_t p3_err_tab[] = { /*--- End of included file: packet-p1-table21.c ---*/ -#line 154 "../../asn1/p1/packet-p1-template.c" +#line 152 "../../asn1/p1/packet-p1-template.c" static const ros_info_t p3_ros_info = { "P3", @@ -10924,7 +10922,7 @@ void proto_register_p1(void) { NULL, HFILL }}, /*--- End of included file: packet-p1-hfarr.c ---*/ -#line 320 "../../asn1/p1/packet-p1-template.c" +#line 318 "../../asn1/p1/packet-p1-template.c" }; /* List of subtrees */ @@ -11123,7 +11121,7 @@ void proto_register_p1(void) { &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, /*--- End of included file: packet-p1-ettarr.c ---*/ -#line 333 "../../asn1/p1/packet-p1-template.c" +#line 331 "../../asn1/p1/packet-p1-template.c" }; static ei_register_info ei[] = { @@ -11172,7 +11170,7 @@ void proto_register_p1(void) { new_register_ber_syntax_dissector("ORName", proto_p1, dissect_ORName_PDU); /*--- End of included file: packet-p1-syn-reg.c ---*/ -#line 374 "../../asn1/p1/packet-p1-template.c" +#line 372 "../../asn1/p1/packet-p1-template.c" } @@ -11338,7 +11336,7 @@ void proto_reg_handoff_p1(void) { /*--- End of included file: packet-p1-dis-tab.c ---*/ -#line 382 "../../asn1/p1/packet-p1-template.c" +#line 380 "../../asn1/p1/packet-p1-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index a91b45e6a6..f0670d3f0e 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -336,7 +335,7 @@ static const value_string charsetreg_vals [] = { #define ub_telephone_number 32 /*--- End of included file: packet-p22-val.h ---*/ -#line 80 "../../asn1/p22/packet-p22-template.c" +#line 79 "../../asn1/p22/packet-p22-template.c" /*--- Included file: packet-p22-hf.c ---*/ @@ -721,7 +720,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 82 "../../asn1/p22/packet-p22-template.c" +#line 81 "../../asn1/p22/packet-p22-template.c" /* Initialize the subtree pointers */ static gint ett_p22 = -1; @@ -855,7 +854,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 86 "../../asn1/p22/packet-p22-template.c" +#line 85 "../../asn1/p22/packet-p22-template.c" /*--- Included file: packet-p22-fn.c ---*/ @@ -4671,7 +4670,7 @@ static int dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pin /*--- End of included file: packet-p22-fn.c ---*/ -#line 88 "../../asn1/p22/packet-p22-template.c" +#line 87 "../../asn1/p22/packet-p22-template.c" /* * Dissect P22 PDUs inside a PPDU. @@ -6216,7 +6215,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 119 "../../asn1/p22/packet-p22-template.c" }; /* List of subtrees */ @@ -6352,7 +6351,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 125 "../../asn1/p22/packet-p22-template.c" }; /* Register protocol */ @@ -6472,7 +6471,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 141 "../../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-p7.c b/epan/dissectors/packet-p7.c index df9f7517b7..e17393d3f1 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> @@ -122,7 +121,7 @@ static int proto_p7 = -1; #define ub_ua_restrictions 16 /*--- End of included file: packet-p7-val.h ---*/ -#line 59 "../../asn1/p7/packet-p7-template.c" +#line 58 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-hf.c ---*/ @@ -494,7 +493,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 61 "../../asn1/p7/packet-p7-template.c" +#line 60 "../../asn1/p7/packet-p7-template.c" /* Initialize the subtree pointers */ static gint ett_p7 = -1; @@ -636,7 +635,7 @@ static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; /*--- End of included file: packet-p7-ett.c ---*/ -#line 65 "../../asn1/p7/packet-p7-template.c" +#line 64 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table.c ---*/ @@ -679,7 +678,7 @@ static const value_string p7_err_code_string_vals[] = { /*--- End of included file: packet-p7-table.c ---*/ -#line 67 "../../asn1/p7/packet-p7-template.c" +#line 66 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-fn.c ---*/ @@ -4124,7 +4123,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 69 "../../asn1/p7/packet-p7-template.c" +#line 68 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table11.c ---*/ @@ -4156,7 +4155,7 @@ static const ros_opr_t p7_opr_tab[] = { /*--- End of included file: packet-p7-table11.c ---*/ -#line 71 "../../asn1/p7/packet-p7-template.c" +#line 70 "../../asn1/p7/packet-p7-template.c" /*--- Included file: packet-p7-table21.c ---*/ #line 1 "../../asn1/p7/packet-p7-table21.c" @@ -4195,7 +4194,7 @@ static const ros_err_t p7_err_tab[] = { /*--- End of included file: packet-p7-table21.c ---*/ -#line 72 "../../asn1/p7/packet-p7-template.c" +#line 71 "../../asn1/p7/packet-p7-template.c" static const ros_info_t p7_ros_info = { "P7", @@ -5675,7 +5674,7 @@ void proto_register_p7(void) { NULL, HFILL }}, /*--- End of included file: packet-p7-hfarr.c ---*/ -#line 91 "../../asn1/p7/packet-p7-template.c" +#line 90 "../../asn1/p7/packet-p7-template.c" }; /* List of subtrees */ @@ -5819,7 +5818,7 @@ void proto_register_p7(void) { &ett_p7_RTABapdu, /*--- End of included file: packet-p7-ettarr.c ---*/ -#line 97 "../../asn1/p7/packet-p7-template.c" +#line 96 "../../asn1/p7/packet-p7-template.c" }; module_t *p7_module; @@ -5878,7 +5877,7 @@ void proto_reg_handoff_p7(void) { /*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 123 "../../asn1/p7/packet-p7-template.c" +#line 122 "../../asn1/p7/packet-p7-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index 452f70fb8e..35a5cd7800 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -164,7 +163,7 @@ static int proto_p772 = -1; #define ub_data_size 65535 /*--- End of included file: packet-p772-val.h ---*/ -#line 50 "../../asn1/p772/packet-p772-template.c" +#line 49 "../../asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-hf.c ---*/ @@ -250,7 +249,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 52 "../../asn1/p772/packet-p772-template.c" +#line 51 "../../asn1/p772/packet-p772-template.c" /* Initialize the subtree pointers */ static gint ett_p772 = -1; @@ -286,7 +285,7 @@ static gint ett_p772_MMMessageParameters = -1; static gint ett_p772_Acp127NotificationType = -1; /*--- End of included file: packet-p772-ett.c ---*/ -#line 56 "../../asn1/p772/packet-p772-template.c" +#line 55 "../../asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-fn.c ---*/ @@ -1291,7 +1290,7 @@ static int dissect_Acp127NotificationType_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-p772-fn.c ---*/ -#line 58 "../../asn1/p772/packet-p772-template.c" +#line 57 "../../asn1/p772/packet-p772-template.c" /* @@ -1642,7 +1641,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 91 "../../asn1/p772/packet-p772-template.c" }; /* List of subtrees */ @@ -1680,7 +1679,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 97 "../../asn1/p772/packet-p772-template.c" }; /* Register protocol */ @@ -1734,7 +1733,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 115 "../../asn1/p772/packet-p772-template.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406"); } diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index f066497e60..586a18d3fa 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> @@ -253,7 +252,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-pcap-val.h ---*/ -#line 61 "../../asn1/pcap/packet-pcap-template.c" +#line 60 "../../asn1/pcap/packet-pcap-template.c" static dissector_handle_t pcap_handle = NULL; @@ -1406,7 +1405,7 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-pcap-hf.c ---*/ -#line 68 "../../asn1/pcap/packet-pcap-template.c" +#line 67 "../../asn1/pcap/packet-pcap-template.c" /* Initialize the subtree pointers */ static int ett_pcap = -1; @@ -1809,7 +1808,7 @@ static gint ett_pcap_UnsuccessfulOutcome = -1; static gint ett_pcap_Outcome = -1; /*--- End of included file: packet-pcap-ett.c ---*/ -#line 73 "../../asn1/pcap/packet-pcap-template.c" +#line 72 "../../asn1/pcap/packet-pcap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -13519,7 +13518,7 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pcap-fn.c ---*/ -#line 97 "../../asn1/pcap/packet-pcap-template.c" +#line 96 "../../asn1/pcap/packet-pcap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -13719,7 +13718,7 @@ proto_reg_handoff_pcap(void) /*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 156 "../../asn1/pcap/packet-pcap-template.c" +#line 155 "../../asn1/pcap/packet-pcap-template.c" } else { dissector_delete_uint_range("sccp.ssn", ssn_range, pcap_handle); g_free(ssn_range); @@ -18300,7 +18299,7 @@ void proto_register_pcap(void) { NULL, HFILL }}, /*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 172 "../../asn1/pcap/packet-pcap-template.c" +#line 171 "../../asn1/pcap/packet-pcap-template.c" }; /* List of subtrees */ @@ -18704,7 +18703,7 @@ void proto_register_pcap(void) { &ett_pcap_Outcome, /*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 178 "../../asn1/pcap/packet-pcap-template.c" +#line 177 "../../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 292265d3a2..60cb3bd845 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -31,11 +31,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-pkcs1.h" @@ -86,7 +84,7 @@ static int hf_pkcs1_r = -1; /* INTEGER */ static int hf_pkcs1_s = -1; /* INTEGER */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 46 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 44 "../../asn1/pkcs1/packet-pkcs1-template.c" /* Initialize the subtree pointers */ @@ -104,7 +102,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 49 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 47 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ @@ -386,7 +384,7 @@ static int dissect_ECParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 51 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 49 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -522,7 +520,7 @@ void proto_register_pkcs1(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 58 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 56 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* List of subtrees */ @@ -542,7 +540,7 @@ void proto_register_pkcs1(void) { &ett_pkcs1_ECDSA_Sig_Value, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 63 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 61 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* Register protocol */ @@ -571,7 +569,7 @@ void proto_reg_handoff_pkcs1(void) { /*--- End of included file: packet-pkcs1-dis-tab.c ---*/ -#line 78 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 76 "../../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-pkcs12.c b/epan/dissectors/packet-pkcs12.c index bfbef4fffe..be24d87201 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -35,13 +35,15 @@ #include "config.h" -#include <glib.h> +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif + #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-pkcs12.h" @@ -49,10 +51,6 @@ #include "packet-x509if.h" #include "packet-cms.h" -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> #endif @@ -146,7 +144,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 83 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 81 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -174,7 +172,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 86 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 84 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1165,7 +1163,7 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 394 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 392 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1453,7 +1451,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 461 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 459 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1484,7 +1482,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 467 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 465 "../../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 }}, @@ -1552,7 +1550,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 506 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 504 "../../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 80767434b9..bd49d2ed80 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -79,7 +78,7 @@ static int hf_pkinit_dhNonce = -1; /* INTEGER */ static int hf_pkinit_dhKeyExpiration = -1; /* KerberosTime */ /*--- End of included file: packet-pkinit-hf.c ---*/ -#line 46 "../../asn1/pkinit/packet-pkinit-template.c" +#line 45 "../../asn1/pkinit/packet-pkinit-template.c" /* Initialize the subtree pointers */ @@ -96,7 +95,7 @@ static gint ett_pkinit_PaPkAsRep = -1; static gint ett_pkinit_KDCDHKeyInfo = -1; /*--- End of included file: packet-pkinit-ett.c ---*/ -#line 49 "../../asn1/pkinit/packet-pkinit-template.c" +#line 48 "../../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_); @@ -313,7 +312,7 @@ static int dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkinit-fn.c ---*/ -#line 56 "../../asn1/pkinit/packet-pkinit-template.c" +#line 55 "../../asn1/pkinit/packet-pkinit-template.c" int dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { @@ -458,7 +457,7 @@ void proto_register_pkinit(void) { "KerberosTime", HFILL }}, /*--- End of included file: packet-pkinit-hfarr.c ---*/ -#line 100 "../../asn1/pkinit/packet-pkinit-template.c" +#line 99 "../../asn1/pkinit/packet-pkinit-template.c" }; /* List of subtrees */ @@ -477,7 +476,7 @@ void proto_register_pkinit(void) { &ett_pkinit_KDCDHKeyInfo, /*--- End of included file: packet-pkinit-ettarr.c ---*/ -#line 105 "../../asn1/pkinit/packet-pkinit-template.c" +#line 104 "../../asn1/pkinit/packet-pkinit-template.c" }; /* Register protocol */ @@ -501,6 +500,6 @@ void proto_reg_handoff_pkinit(void) { /*--- End of included file: packet-pkinit-dis-tab.c ---*/ -#line 120 "../../asn1/pkinit/packet-pkinit-template.c" +#line 119 "../../asn1/pkinit/packet-pkinit-template.c" } diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index d2e297a040..993b27f681 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/oids.h> @@ -107,7 +106,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 55 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 54 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" /* Initialize the subtree pointers */ @@ -137,7 +136,7 @@ static gint ett_pkix1explicit_ASIdOrRange = -1; static gint ett_pkix1explicit_ASRange = -1; /*--- End of included file: packet-pkix1explicit-ett.c ---*/ -#line 58 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 57 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" static const char *object_identifier_id; @@ -818,7 +817,7 @@ static int dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkix1explicit-fn.c ---*/ -#line 102 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 101 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" /*--- proto_register_pkix1explicit ----------------------------------------------*/ @@ -1014,7 +1013,7 @@ void proto_register_pkix1explicit(void) { "ASId", HFILL }}, /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ -#line 121 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 120 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* List of subtrees */ @@ -1047,7 +1046,7 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_ASRange, /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ -#line 127 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 126 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" }; /* Register protocol */ @@ -1074,6 +1073,6 @@ void proto_reg_handoff_pkix1explicit(void) { /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 144 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" +#line 143 "../../asn1/pkix1explicit/packet-pkix1explicit-template.c" } diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 2c75bc240e..77b2c0d15d 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -68,7 +67,7 @@ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ /*--- End of included file: packet-pkix1implicit-hf.c ---*/ -#line 44 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 43 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" /* Initialize the subtree pointers */ @@ -82,7 +81,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; /*--- End of included file: packet-pkix1implicit-ett.c ---*/ -#line 47 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 46 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" int @@ -306,7 +305,7 @@ static int dissect_UserNotice_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-pkix1implicit-fn.c ---*/ -#line 63 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 62 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" /*--- proto_register_pkix1implicit ----------------------------------------------*/ @@ -379,7 +378,7 @@ void proto_register_pkix1implicit(void) { NULL, HFILL }}, /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ -#line 71 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 70 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* List of subtrees */ @@ -395,7 +394,7 @@ void proto_register_pkix1implicit(void) { &ett_pkix1implicit_DisplayText, /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ -#line 76 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 75 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" }; /* Register protocol */ @@ -451,6 +450,6 @@ void proto_reg_handoff_pkix1implicit(void) { /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 91 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" +#line 90 "../../asn1/pkix1implicit/packet-pkix1implicit-template.c" } diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index 3307f60d96..e659531ae2 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -33,7 +33,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -108,7 +107,7 @@ static int hf_pkixac_ClassList_secret = -1; static int hf_pkixac_ClassList_topSecret = -1; /*--- End of included file: packet-pkixac-hf.c ---*/ -#line 48 "../../asn1/pkixac/packet-pkixac-template.c" +#line 47 "../../asn1/pkixac/packet-pkixac-template.c" /* Initialize the subtree pointers */ static gint ett_pkixac = -1; @@ -135,7 +134,7 @@ static gint ett_pkixac_AttrSpec = -1; static gint ett_pkixac_ProxyInfo = -1; /*--- End of included file: packet-pkixac-ett.c ---*/ -#line 52 "../../asn1/pkixac/packet-pkixac-template.c" +#line 51 "../../asn1/pkixac/packet-pkixac-template.c" static const char *object_identifier_id; @@ -599,7 +598,7 @@ static int dissect_ProxyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pkixac-fn.c ---*/ -#line 56 "../../asn1/pkixac/packet-pkixac-template.c" +#line 55 "../../asn1/pkixac/packet-pkixac-template.c" /*--- proto_register_pkixac ----------------------------------------------*/ void proto_register_pkixac(void) { @@ -811,7 +810,7 @@ void proto_register_pkixac(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixac-hfarr.c ---*/ -#line 63 "../../asn1/pkixac/packet-pkixac-template.c" +#line 62 "../../asn1/pkixac/packet-pkixac-template.c" }; /* List of subtrees */ @@ -840,7 +839,7 @@ void proto_register_pkixac(void) { &ett_pkixac_ProxyInfo, /*--- End of included file: packet-pkixac-ettarr.c ---*/ -#line 69 "../../asn1/pkixac/packet-pkixac-template.c" +#line 68 "../../asn1/pkixac/packet-pkixac-template.c" }; /* Register protocol */ @@ -858,7 +857,7 @@ void proto_register_pkixac(void) { new_register_ber_syntax_dissector("RFC3281Clearance", proto_pkixac, dissect_RFC3281Clearance_PDU); /*--- End of included file: packet-pkixac-syn-reg.c ---*/ -#line 79 "../../asn1/pkixac/packet-pkixac-template.c" +#line 78 "../../asn1/pkixac/packet-pkixac-template.c" } @@ -881,6 +880,6 @@ void proto_reg_handoff_pkixac(void) { /*--- End of included file: packet-pkixac-dis-tab.c ---*/ -#line 86 "../../asn1/pkixac/packet-pkixac-template.c" +#line 85 "../../asn1/pkixac/packet-pkixac-template.c" } diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 40b54ef8fc..3e25f4bfb3 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -58,7 +57,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 44 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 43 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /* Initialize the subtree pointers */ @@ -68,7 +67,7 @@ static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; /*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 47 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 46 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ @@ -144,7 +143,7 @@ static int dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 49 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 48 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -177,7 +176,7 @@ void proto_register_pkixproxy(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 57 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 56 "../../asn1/pkixproxy/packet-pkixproxy-template.c" }; /* List of subtrees */ @@ -189,7 +188,7 @@ void proto_register_pkixproxy(void) { &ett_pkixproxy_ProxyPolicy, /*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 62 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 61 "../../asn1/pkixproxy/packet-pkixproxy-template.c" }; /* Register protocol */ @@ -211,7 +210,7 @@ void proto_reg_handoff_pkixproxy(void) { /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 77 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 76 "../../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 6274af2302..6d854e4515 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -76,7 +75,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 47 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 46 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /* Initialize the subtree pointers */ @@ -91,7 +90,7 @@ static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 50 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 49 "../../asn1/pkixqualified/packet-pkixqualified-template.c" static const char *object_identifier_id; @@ -367,7 +366,7 @@ static int dissect_XmppAddr_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 54 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 53 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /*--- proto_register_pkixqualified ----------------------------------------------*/ @@ -460,7 +459,7 @@ void proto_register_pkixqualified(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 62 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 61 "../../asn1/pkixqualified/packet-pkixqualified-template.c" }; /* List of subtrees */ @@ -477,7 +476,7 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_NameRegistrationAuthorities, /*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 67 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 66 "../../asn1/pkixqualified/packet-pkixqualified-template.c" }; /* Register protocol */ @@ -508,6 +507,6 @@ void proto_reg_handoff_pkixqualified(void) { /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 82 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 81 "../../asn1/pkixqualified/packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 057e09e185..a2f6bfe2ba 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -87,7 +86,7 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; /*--- End of included file: packet-pkixtsp-hf.c ---*/ -#line 46 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 45 "../../asn1/pkixtsp/packet-pkixtsp-template.c" /* Initialize the subtree pointers */ static gint ett_pkixtsp = -1; @@ -103,7 +102,7 @@ static gint ett_pkixtsp_TSTInfo = -1; static gint ett_pkixtsp_Accuracy = -1; /*--- End of included file: packet-pkixtsp-ett.c ---*/ -#line 50 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 49 "../../asn1/pkixtsp/packet-pkixtsp-template.c" @@ -362,7 +361,7 @@ static int dissect_TSTInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-pkixtsp-fn.c ---*/ -#line 53 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 52 "../../asn1/pkixtsp/packet-pkixtsp-template.c" static int @@ -542,7 +541,7 @@ void proto_register_pkixtsp(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 104 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 103 "../../asn1/pkixtsp/packet-pkixtsp-template.c" }; /* List of subtrees */ @@ -560,7 +559,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_Accuracy, /*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 110 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 109 "../../asn1/pkixtsp/packet-pkixtsp-template.c" }; /* Register protocol */ @@ -591,6 +590,6 @@ void proto_reg_handoff_pkixtsp(void) { /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 134 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 133 "../../asn1/pkixtsp/packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 5acb1d62f5..7e914841fc 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -32,17 +32,13 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/uat.h> -#include <string.h> - #include <epan/asn1.h> #include <epan/oids.h> #include "packet-ber.h" @@ -180,7 +176,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 93 "../../asn1/pres/packet-pres-template.c" +#line 89 "../../asn1/pres/packet-pres-template.c" /* Initialize the subtree pointers */ static gint ett_pres = -1; @@ -226,7 +222,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 98 "../../asn1/pres/packet-pres-template.c" +#line 94 "../../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; @@ -1362,7 +1358,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 227 "../../asn1/pres/packet-pres-template.c" +#line 223 "../../asn1/pres/packet-pres-template.c" /* @@ -1846,7 +1842,7 @@ void proto_register_pres(void) { NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 398 "../../asn1/pres/packet-pres-template.c" +#line 394 "../../asn1/pres/packet-pres-template.c" }; /* List of subtrees */ @@ -1893,7 +1889,7 @@ void proto_register_pres(void) { &ett_pres_UD_type, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 404 "../../asn1/pres/packet-pres-template.c" +#line 400 "../../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 861278e5c2..0133ae5571 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -35,7 +35,6 @@ #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-ber.h" @@ -77,7 +76,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 44 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 43 "../../asn1/q932-ros/packet-q932-ros-template.c" /* Initialize the subtree pointers */ @@ -95,7 +94,7 @@ static gint ett_q932_ros_T_problem = -1; static gint ett_q932_ros_InvokeId = -1; /*--- End of included file: packet-q932-ros-ett.c ---*/ -#line 47 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 46 "../../asn1/q932-ros/packet-q932-ros-template.c" static expert_field ei_ros_undecoded = EI_INIT; @@ -678,7 +677,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 64 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 63 "../../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) { @@ -796,7 +795,7 @@ void proto_register_q932_ros(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 81 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 80 "../../asn1/q932-ros/packet-q932-ros-template.c" }; /* List of subtrees */ @@ -816,7 +815,7 @@ void proto_register_q932_ros(void) { &ett_q932_ros_InvokeId, /*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 86 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 85 "../../asn1/q932-ros/packet-q932-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 4a3b2c0323..d6475cd397 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -33,10 +33,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -409,7 +407,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-ranap-val.h ---*/ -#line 60 "../../asn1/ranap/packet-ranap-template.c" +#line 58 "../../asn1/ranap/packet-ranap-template.c" void proto_register_ranap(void); void proto_reg_handoff_ranap(void); @@ -1147,7 +1145,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 77 "../../asn1/ranap/packet-ranap-template.c" +#line 75 "../../asn1/ranap/packet-ranap-template.c" /* Initialize the subtree pointers */ static int ett_ranap = -1; @@ -1483,7 +1481,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; /*--- End of included file: packet-ranap-ett.c ---*/ -#line 84 "../../asn1/ranap/packet-ranap-template.c" +#line 82 "../../asn1/ranap/packet-ranap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -4774,7 +4772,7 @@ dissect_ranap_IMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot PROTO_ITEM_SET_HIDDEN(actx->created_item); digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree, 0, tvb_reported_length(imsi_tvb), FALSE); - sccp_info = (sccp_msg_info_t *)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_ranap, 0); + sccp_info = (sccp_msg_info_t *)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_ranap, actx->pinfo->curr_layer_num); if ( sccp_info && sccp_info->data.co.assoc @@ -13070,7 +13068,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 143 "../../asn1/ranap/packet-ranap-template.c" +#line 141 "../../asn1/ranap/packet-ranap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -13171,7 +13169,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) /* Save the sccp_msg_info_t data (if present) because it can't be passed through function calls */ - p_add_proto_data(pinfo->pool, pinfo, proto_ranap, 0, data); + p_add_proto_data(pinfo->pool, pinfo, proto_ranap, pinfo->curr_layer_num, data); dissect_RANAP_PDU_PDU(tvb, pinfo, ranap_tree, NULL); if (sccp_msg_lcl) { @@ -16122,7 +16120,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 326 "../../asn1/ranap/packet-ranap-template.c" +#line 324 "../../asn1/ranap/packet-ranap-template.c" }; /* List of subtrees */ @@ -16459,7 +16457,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 334 "../../asn1/ranap/packet-ranap-template.c" +#line 332 "../../asn1/ranap/packet-ranap-template.c" }; @@ -16842,7 +16840,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 384 "../../asn1/ranap/packet-ranap-template.c" +#line 382 "../../asn1/ranap/packet-ranap-template.c" } else { dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 7b12a16b2d..592dbaf82e 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -36,10 +36,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> - #include <epan/asn1.h> #include "packet-per.h" @@ -1131,7 +1128,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rnsap-val.h ---*/ -#line 52 "../../asn1/rnsap/packet-rnsap-template.c" +#line 49 "../../asn1/rnsap/packet-rnsap-template.c" void proto_register_rnsap(void); void proto_reg_handoff_rnsap(void); @@ -3868,7 +3865,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 62 "../../asn1/rnsap/packet-rnsap-template.c" +#line 59 "../../asn1/rnsap/packet-rnsap-template.c" /* Initialize the subtree pointers */ static int ett_rnsap = -1; @@ -5153,7 +5150,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1; static gint ett_rnsap_Outcome = -1; /*--- End of included file: packet-rnsap-ett.c ---*/ -#line 67 "../../asn1/rnsap/packet-rnsap-template.c" +#line 64 "../../asn1/rnsap/packet-rnsap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -43105,7 +43102,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 91 "../../asn1/rnsap/packet-rnsap-template.c" +#line 88 "../../asn1/rnsap/packet-rnsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -54055,7 +54052,7 @@ void proto_register_rnsap(void) { "Outcome_value", HFILL }}, /*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 148 "../../asn1/rnsap/packet-rnsap-template.c" +#line 145 "../../asn1/rnsap/packet-rnsap-template.c" }; /* List of subtrees */ @@ -55341,7 +55338,7 @@ void proto_register_rnsap(void) { &ett_rnsap_Outcome, /*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 154 "../../asn1/rnsap/packet-rnsap-template.c" +#line 151 "../../asn1/rnsap/packet-rnsap-template.c" }; @@ -56177,7 +56174,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 193 "../../asn1/rnsap/packet-rnsap-template.c" +#line 190 "../../asn1/rnsap/packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 4167605019..4dd23d28f1 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -31,10 +31,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include <epan/expert.h> @@ -111,7 +109,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 75 "../../asn1/ros/packet-ros-template.c" +#line 73 "../../asn1/ros/packet-ros-template.c" /* Initialize the subtree pointers */ static gint ett_ros = -1; @@ -138,7 +136,7 @@ static gint ett_ros_InvokeId = -1; static gint ett_ros_Code = -1; /*--- End of included file: packet-ros-ett.c ---*/ -#line 88 "../../asn1/ros/packet-ros-template.c" +#line 86 "../../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; @@ -1010,7 +1008,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 373 "../../asn1/ros/packet-ros-template.c" /* * Dissect ROS PDUs inside a PPDU. @@ -1232,7 +1230,7 @@ void proto_register_ros(void) { "OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 484 "../../asn1/ros/packet-ros-template.c" +#line 482 "../../asn1/ros/packet-ros-template.c" }; /* List of subtrees */ @@ -1262,7 +1260,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 500 "../../asn1/ros/packet-ros-template.c" +#line 498 "../../asn1/ros/packet-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 1b1ae6f79e..1b8682e9c0 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -41,10 +41,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> @@ -278,7 +276,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 97 "../../asn1/rrc/packet-rrc-template.c" +#line 95 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -9949,7 +9947,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 102 "../../asn1/rrc/packet-rrc-template.c" +#line 100 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -16098,7 +16096,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 107 "../../asn1/rrc/packet-rrc-template.c" +#line 105 "../../asn1/rrc/packet-rrc-template.c" static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; @@ -143766,7 +143764,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 184 "../../asn1/rrc/packet-rrc-template.c" +#line 182 "../../asn1/rrc/packet-rrc-template.c" #include "packet-rrc.h" @@ -182491,7 +182489,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 264 "../../asn1/rrc/packet-rrc-template.c" +#line 262 "../../asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -188661,7 +188659,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 290 "../../asn1/rrc/packet-rrc-template.c" +#line 288 "../../asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, }; @@ -188750,7 +188748,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 311 "../../asn1/rrc/packet-rrc-template.c" +#line 309 "../../asn1/rrc/packet-rrc-template.c" diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 4aa84d88d1..fc6535d282 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -886,7 +885,7 @@ static int hf_rrlp_GANSSModelID_model7 = -1; static int hf_rrlp_GANSSModelID_model8 = -1; /*--- End of included file: packet-rrlp-hf.c ---*/ -#line 56 "../../asn1/rrlp/packet-rrlp-template.c" +#line 55 "../../asn1/rrlp/packet-rrlp-template.c" /* Initialize the subtree pointers */ static gint ett_rrlp = -1; @@ -1147,7 +1146,7 @@ static gint ett_rrlp_GANSSModelID = -1; static gint ett_rrlp_AssistanceNeeded = -1; /*--- End of included file: packet-rrlp-ett.c ---*/ -#line 60 "../../asn1/rrlp/packet-rrlp-template.c" +#line 59 "../../asn1/rrlp/packet-rrlp-template.c" /* Include constants */ @@ -1159,7 +1158,7 @@ static gint ett_rrlp_AssistanceNeeded = -1; #define maxGANSSAssistanceData 40 /*--- End of included file: packet-rrlp-val.h ---*/ -#line 63 "../../asn1/rrlp/packet-rrlp-template.c" +#line 62 "../../asn1/rrlp/packet-rrlp-template.c" @@ -7155,7 +7154,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 66 "../../asn1/rrlp/packet-rrlp-template.c" +#line 65 "../../asn1/rrlp/packet-rrlp-template.c" /*--- proto_register_rrlp -------------------------------------------*/ @@ -10449,7 +10448,7 @@ void proto_register_rrlp(void) { NULL, HFILL }}, /*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 75 "../../asn1/rrlp/packet-rrlp-template.c" +#line 74 "../../asn1/rrlp/packet-rrlp-template.c" }; /* List of subtrees */ @@ -10712,7 +10711,7 @@ void proto_register_rrlp(void) { &ett_rrlp_AssistanceNeeded, /*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 81 "../../asn1/rrlp/packet-rrlp-template.c" +#line 80 "../../asn1/rrlp/packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 1bd2bca492..62f5632f63 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> @@ -92,7 +91,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 59 "../../asn1/rtse/packet-rtse-template.c" +#line 58 "../../asn1/rtse/packet-rtse-template.c" /* Initialize the subtree pointers */ static gint ett_rtse = -1; @@ -109,7 +108,7 @@ static gint ett_rtse_SessionConnectionIdentifier = -1; static gint ett_rtse_CallingSSuserReference = -1; /*--- End of included file: packet-rtse-ett.c ---*/ -#line 63 "../../asn1/rtse/packet-rtse-template.c" +#line 62 "../../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; @@ -728,7 +727,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 186 "../../asn1/rtse/packet-rtse-template.c" +#line 185 "../../asn1/rtse/packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -995,7 +994,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 352 "../../asn1/rtse/packet-rtse-template.c" +#line 351 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1017,7 +1016,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 361 "../../asn1/rtse/packet-rtse-template.c" +#line 360 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index a30a02d18a..a573449a6f 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -33,9 +33,6 @@ #include "config.h" -#include <glib.h> -#include <string.h> - #include <epan/packet.h> #include <epan/sctpppids.h> #include <epan/asn1.h> @@ -85,7 +82,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rua-val.h ---*/ -#line 52 "../../asn1/rua/packet-rua-template.c" +#line 49 "../../asn1/rua/packet-rua-template.c" /* Initialize the protocol and registered fields */ static int proto_rua = -1; @@ -162,7 +159,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 57 "../../asn1/rua/packet-rua-template.c" +#line 54 "../../asn1/rua/packet-rua-template.c" /* Initialize the subtree pointers */ static int ett_rua = -1; @@ -211,7 +208,7 @@ static gint ett_rua_SuccessfulOutcome = -1; static gint ett_rua_UnsuccessfulOutcome = -1; /*--- End of included file: packet-rua-ett.c ---*/ -#line 65 "../../asn1/rua/packet-rua-template.c" +#line 62 "../../asn1/rua/packet-rua-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1360,7 +1357,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 87 "../../asn1/rua/packet-rua-template.c" +#line 84 "../../asn1/rua/packet-rua-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -1684,7 +1681,7 @@ module_t *rua_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-rua-hfarr.c ---*/ -#line 138 "../../asn1/rua/packet-rua-template.c" +#line 135 "../../asn1/rua/packet-rua-template.c" }; /* List of subtrees */ @@ -1731,7 +1728,7 @@ module_t *rua_module; &ett_rua_UnsuccessfulOutcome, /*--- End of included file: packet-rua-ettarr.c ---*/ -#line 144 "../../asn1/rua/packet-rua-template.c" +#line 141 "../../asn1/rua/packet-rua-template.c" }; @@ -1790,7 +1787,7 @@ proto_reg_handoff_rua(void) /*--- End of included file: packet-rua-dis-tab.c ---*/ -#line 183 "../../asn1/rua/packet-rua-template.c" +#line 180 "../../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 337f10329a..1ceb9f0be4 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -35,7 +35,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> @@ -362,7 +361,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-s1ap-val.h ---*/ -#line 68 "../../asn1/s1ap/packet-s1ap-template.c" +#line 67 "../../asn1/s1ap/packet-s1ap-template.c" /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -920,7 +919,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 75 "../../asn1/s1ap/packet-s1ap-template.c" +#line 74 "../../asn1/s1ap/packet-s1ap-template.c" /* Initialize the subtree pointers */ static int ett_s1ap = -1; @@ -1210,7 +1209,7 @@ static gint ett_s1ap_EHRPDCompositeAvailableCapacity = -1; static gint ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem = -1; /*--- End of included file: packet-s1ap-ett.c ---*/ -#line 88 "../../asn1/s1ap/packet-s1ap-template.c" +#line 87 "../../asn1/s1ap/packet-s1ap-template.c" enum{ INITIATING_MESSAGE, @@ -10495,7 +10494,7 @@ int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-s1ap-fn.c ---*/ -#line 137 "../../asn1/s1ap/packet-s1ap-template.c" +#line 136 "../../asn1/s1ap/packet-s1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -10832,7 +10831,7 @@ proto_reg_handoff_s1ap(void) /*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 224 "../../asn1/s1ap/packet-s1ap-template.c" +#line 223 "../../asn1/s1ap/packet-s1ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, s1ap_handle); @@ -13049,7 +13048,7 @@ void proto_register_s1ap(void) { NULL, HFILL }}, /*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 252 "../../asn1/s1ap/packet-s1ap-template.c" +#line 251 "../../asn1/s1ap/packet-s1ap-template.c" }; /* List of subtrees */ @@ -13340,7 +13339,7 @@ void proto_register_s1ap(void) { &ett_s1ap_EHRPDMultiSectorLoadReportingResponseItem, /*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 266 "../../asn1/s1ap/packet-s1ap-template.c" +#line 265 "../../asn1/s1ap/packet-s1ap-template.c" }; module_t *s1ap_module; diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index b5a5736d60..eb1a02ce4c 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -33,7 +33,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -96,7 +95,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sabp-val.h ---*/ -#line 46 "../../asn1/sabp/packet-sabp-template.c" +#line 45 "../../asn1/sabp/packet-sabp-template.c" void proto_register_sabp(void); void proto_reg_handoff_sabp(void); @@ -192,7 +191,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 58 "../../asn1/sabp/packet-sabp-template.c" +#line 57 "../../asn1/sabp/packet-sabp-template.c" /* Initialize the subtree pointers */ static int ett_sabp = -1; @@ -248,7 +247,7 @@ static gint ett_sabp_SuccessfulOutcome = -1; static gint ett_sabp_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sabp-ett.c ---*/ -#line 70 "../../asn1/sabp/packet-sabp-template.c" +#line 69 "../../asn1/sabp/packet-sabp-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1728,7 +1727,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 95 "../../asn1/sabp/packet-sabp-template.c" +#line 94 "../../asn1/sabp/packet-sabp-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2202,7 +2201,7 @@ void proto_register_sabp(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sabp-hfarr.c ---*/ -#line 248 "../../asn1/sabp/packet-sabp-template.c" +#line 247 "../../asn1/sabp/packet-sabp-template.c" }; /* List of subtrees */ @@ -2259,7 +2258,7 @@ void proto_register_sabp(void) { &ett_sabp_UnsuccessfulOutcome, /*--- End of included file: packet-sabp-ettarr.c ---*/ -#line 261 "../../asn1/sabp/packet-sabp-template.c" +#line 260 "../../asn1/sabp/packet-sabp-template.c" }; @@ -2341,7 +2340,7 @@ proto_reg_handoff_sabp(void) /*--- End of included file: packet-sabp-dis-tab.c ---*/ -#line 297 "../../asn1/sabp/packet-sabp-template.c" +#line 296 "../../asn1/sabp/packet-sabp-template.c" } diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index 6e75888485..4c5f5798a3 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -32,11 +32,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> - -#include <stdio.h> -#include <string.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/sctpppids.h> @@ -102,7 +98,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sbc-ap-val.h ---*/ -#line 55 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 51 "../../asn1/sbc-ap/packet-sbc-ap-template.c" /* Initialize the protocol and registered fields */ static int proto_sbc_ap = -1; @@ -167,7 +163,7 @@ static int hf_sbc_ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value * static int hf_sbc_ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-sbc-ap-hf.c ---*/ -#line 60 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 56 "../../asn1/sbc-ap/packet-sbc-ap-template.c" /* Initialize the subtree pointers */ static int ett_sbc_ap = -1; @@ -200,7 +196,7 @@ static gint ett_sbc_ap_SuccessfulOutcome = -1; static gint ett_sbc_ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sbc-ap-ett.c ---*/ -#line 65 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 61 "../../asn1/sbc-ap/packet-sbc-ap-template.c" enum{ INITIATING_MESSAGE, @@ -1129,7 +1125,7 @@ static int dissect_SBC_AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-sbc-ap-fn.c ---*/ -#line 92 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 88 "../../asn1/sbc-ap/packet-sbc-ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -1416,7 +1412,7 @@ void proto_register_sbc_ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sbc-ap-hfarr.c ---*/ -#line 154 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 150 "../../asn1/sbc-ap/packet-sbc-ap-template.c" }; /* List of subtrees */ @@ -1450,7 +1446,7 @@ void proto_register_sbc_ap(void) { &ett_sbc_ap_UnsuccessfulOutcome, /*--- End of included file: packet-sbc-ap-ettarr.c ---*/ -#line 160 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 156 "../../asn1/sbc-ap/packet-sbc-ap-template.c" }; @@ -1508,7 +1504,7 @@ proto_reg_handoff_sbc_ap(void) /*--- End of included file: packet-sbc-ap-dis-tab.c ---*/ -#line 193 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 189 "../../asn1/sbc-ap/packet-sbc-ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, sbc_ap_handle); diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 691ad79274..2a91522b07 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -84,7 +83,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 49 "../../asn1/smrse/packet-smrse-template.c" +#line 48 "../../asn1/smrse/packet-smrse-template.c" /* Initialize the subtree pointers */ static gint ett_smrse = -1; @@ -104,7 +103,7 @@ static gint ett_smrse_RPError = -1; static gint ett_smrse_RPAlertSC = -1; /*--- End of included file: packet-smrse-ett.c ---*/ -#line 53 "../../asn1/smrse/packet-smrse-template.c" +#line 52 "../../asn1/smrse/packet-smrse-template.c" @@ -480,7 +479,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-smrse-fn.c ---*/ -#line 56 "../../asn1/smrse/packet-smrse-template.c" +#line 55 "../../asn1/smrse/packet-smrse-template.c" static const value_string tag_vals[] = { { 1, "AliveTest" }, @@ -692,7 +691,7 @@ void proto_register_smrse(void) { "SMS_Address", HFILL }}, /*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 159 "../../asn1/smrse/packet-smrse-template.c" +#line 158 "../../asn1/smrse/packet-smrse-template.c" }; /* List of subtrees */ @@ -714,7 +713,7 @@ void proto_register_smrse(void) { &ett_smrse_RPAlertSC, /*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 165 "../../asn1/smrse/packet-smrse-template.c" +#line 164 "../../asn1/smrse/packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index abd19c07c1..6c25e7d873 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -50,35 +50,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#if 0 +#include <stdio.h> #define D(args) do {printf args; fflush(stdout); } while(0) +#endif #include "config.h" -#include <string.h> - -#include <glib.h> - -#include <wsutil/sha1.h> -#include <wsutil/md5.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/conversation.h> #include <epan/etypes.h> #include <epan/prefs.h> #include <epan/sminmpec.h> -#include <epan/emem.h> -#include <epan/wmem/wmem.h> #include <epan/next_tvb.h> #include <epan/uat.h> #include <epan/asn1.h> -#include "packet-ipx.h" -#include "packet-hpext.h" #include <epan/expert.h> #include <epan/oids.h> - +#include <wsutil/sha1.h> +#include <wsutil/md5.h> +#include "packet-ipx.h" +#include "packet-hpext.h" #include "packet-ber.h" - #include "packet-snmp.h" #ifdef HAVE_LIBGCRYPT @@ -308,7 +302,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 237 "../../asn1/snmp/packet-snmp-template.c" +#line 228 "../../asn1/snmp/packet-snmp-template.c" /* Initialize the subtree pointers */ static gint ett_smux = -1; @@ -348,7 +342,7 @@ static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; /*--- End of included file: packet-snmp-ett.c ---*/ -#line 253 "../../asn1/snmp/packet-snmp-template.c" +#line 244 "../../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; @@ -3082,7 +3076,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 1873 "../../asn1/snmp/packet-snmp-template.c" +#line 1864 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3904,7 +3898,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2430 "../../asn1/snmp/packet-snmp-template.c" +#line 2421 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3944,7 +3938,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2446 "../../asn1/snmp/packet-snmp-template.c" +#line 2437 "../../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 e5a3e1110c..250010469e 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -39,25 +39,17 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/rc4.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/asn1.h> +#include <epan/conversation.h> +#include <epan/asn1.h> +#include <wsutil/rc4.h> #include "packet-dcerpc.h" #include "packet-gssapi.h" #include "packet-kerberos.h" -#include <epan/conversation.h> -#include <epan/wmem/wmem.h> -#include <epan/asn1.h> - -#include <string.h> - #include "packet-ber.h" - #define PNAME "Simple Protected Negotiation" #define PSNAME "SPNEGO" #define PFNAME "spnego" @@ -89,7 +81,7 @@ static int hf_spnego_krb5_cfx_rrc = -1; static int hf_spnego_krb5_cfx_seq = -1; -/*--- Included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-hf.c ---*/ +/*--- Included file: packet-spnego-hf.c ---*/ #line 1 "../../asn1/spnego/packet-spnego-hf.c" static int hf_spnego_negTokenInit = -1; /* T_negTokenInit */ static int hf_spnego_negTokenTarg = -1; /* NegTokenTarg */ @@ -116,8 +108,8 @@ static int hf_spnego_ContextFlags_anonFlag = -1; static int hf_spnego_ContextFlags_confFlag = -1; static int hf_spnego_ContextFlags_integFlag = -1; -/*--- End of included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-hf.c ---*/ -#line 84 "../../asn1/spnego/packet-spnego-template.c" +/*--- End of included file: packet-spnego-hf.c ---*/ +#line 76 "../../asn1/spnego/packet-spnego-template.c" /* Global variables */ static const char *MechType_oid; @@ -132,7 +124,7 @@ static gint ett_spnego_krb5 = -1; static gint ett_spnego_krb5_cfx_flags = -1; -/*--- Included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-ett.c ---*/ +/*--- Included file: packet-spnego-ett.c ---*/ #line 1 "../../asn1/spnego/packet-spnego-ett.c" static gint ett_spnego_NegotiationToken = -1; static gint ett_spnego_MechTypeList = -1; @@ -143,8 +135,8 @@ static gint ett_spnego_ContextFlags = -1; static gint ett_spnego_NegTokenTarg = -1; static gint ett_spnego_InitialContextToken_U = -1; -/*--- End of included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-ett.c ---*/ -#line 98 "../../asn1/spnego/packet-spnego-template.c" +/*--- End of included file: packet-spnego-ett.c ---*/ +#line 90 "../../asn1/spnego/packet-spnego-template.c" static expert_field ei_spnego_decrypted_keytype = EI_INIT; static expert_field ei_spnego_unknown_header = EI_INIT; @@ -162,7 +154,7 @@ static int dissect_spnego_NegTokenInit2(gboolean implicit_tag, tvbuff_t *tvb, proto_tree *tree, int hf_index); -/*--- Included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-fn.c ---*/ +/*--- Included file: packet-spnego-fn.c ---*/ #line 1 "../../asn1/spnego/packet-spnego-fn.c" @@ -562,8 +554,8 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -/*--- End of included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-fn.c ---*/ -#line 115 "../../asn1/spnego/packet-spnego-template.c" +/*--- End of included file: packet-spnego-fn.c ---*/ +#line 107 "../../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 @@ -1851,7 +1843,7 @@ void proto_register_spnego(void) { NULL, 0, "KRB5 Sequence Number", HFILL}}, -/*--- Included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-hfarr.c ---*/ +/*--- Included file: packet-spnego-hfarr.c ---*/ #line 1 "../../asn1/spnego/packet-spnego-hfarr.c" { &hf_spnego_negTokenInit, { "negTokenInit", "spnego.negTokenInit_element", @@ -1946,8 +1938,8 @@ void proto_register_spnego(void) { FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, -/*--- End of included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-hfarr.c ---*/ -#line 1402 "../../asn1/spnego/packet-spnego-template.c" +/*--- End of included file: packet-spnego-hfarr.c ---*/ +#line 1394 "../../asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1958,7 +1950,7 @@ void proto_register_spnego(void) { &ett_spnego_krb5_cfx_flags, -/*--- Included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-ettarr.c ---*/ +/*--- Included file: packet-spnego-ettarr.c ---*/ #line 1 "../../asn1/spnego/packet-spnego-ettarr.c" &ett_spnego_NegotiationToken, &ett_spnego_MechTypeList, @@ -1969,8 +1961,8 @@ void proto_register_spnego(void) { &ett_spnego_NegTokenTarg, &ett_spnego_InitialContextToken_U, -/*--- End of included file: /home/mmann/wireshark/asn1/spnego/packet-spnego-ettarr.c ---*/ -#line 1412 "../../asn1/spnego/packet-spnego-template.c" +/*--- End of included file: packet-spnego-ettarr.c ---*/ +#line 1404 "../../asn1/spnego/packet-spnego-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index b906d9990e..2665968047 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -31,15 +31,11 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/etypes.h> #include <epan/expert.h> -#include <stdio.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" @@ -124,7 +120,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 102 "../../asn1/sv/packet-sv-template.c" +#line 98 "../../asn1/sv/packet-sv-template.c" /* Initialize the subtree pointers */ static int ett_sv = -1; @@ -140,7 +136,7 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1; static gint ett_sv_ASDU = -1; /*--- End of included file: packet-sv-ett.c ---*/ -#line 109 "../../asn1/sv/packet-sv-template.c" +#line 105 "../../asn1/sv/packet-sv-template.c" static expert_field ei_sv_mal_utctime = EI_INIT; static expert_field ei_sv_zero_pdu = EI_INIT; @@ -436,7 +432,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-sv-fn.c ---*/ -#line 190 "../../asn1/sv/packet-sv-template.c" +#line 186 "../../asn1/sv/packet-sv-template.c" /* * Dissect SV PDUs inside a PPDU. @@ -609,7 +605,7 @@ void proto_register_sv(void) { NULL, HFILL }}, /*--- End of included file: packet-sv-hfarr.c ---*/ -#line 306 "../../asn1/sv/packet-sv-template.c" +#line 302 "../../asn1/sv/packet-sv-template.c" }; /* List of subtrees */ @@ -626,7 +622,7 @@ void proto_register_sv(void) { &ett_sv_ASDU, /*--- End of included file: packet-sv-ettarr.c ---*/ -#line 314 "../../asn1/sv/packet-sv-template.c" +#line 310 "../../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 c0c12753aa..b4592f36e9 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> @@ -286,7 +285,7 @@ static int hf_t124_Segmentation_begin = -1; static int hf_t124_Segmentation_end = -1; /*--- End of included file: packet-t124-hf.c ---*/ -#line 54 "../../asn1/t124/packet-t124-template.c" +#line 53 "../../asn1/t124/packet-t124-template.c" /* Initialize the subtree pointers */ static int ett_t124 = -1; @@ -409,7 +408,7 @@ static gint ett_t124_TokenTestConfirm = -1; static gint ett_t124_DomainMCSPDU = -1; /*--- End of included file: packet-t124-ett.c ---*/ -#line 71 "../../asn1/t124/packet-t124-template.c" +#line 70 "../../asn1/t124/packet-t124-template.c" /*--- Included file: packet-t124-fn.c ---*/ @@ -2879,7 +2878,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 73 "../../asn1/t124/packet-t124-template.c" +#line 72 "../../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 }, @@ -3901,7 +3900,7 @@ void proto_register_t124(void) { NULL, HFILL }}, /*--- End of included file: packet-t124-hfarr.c ---*/ -#line 202 "../../asn1/t124/packet-t124-template.c" +#line 201 "../../asn1/t124/packet-t124-template.c" }; /* List of subtrees */ @@ -4014,7 +4013,7 @@ void proto_register_t124(void) { &ett_t124_DomainMCSPDU, /*--- End of included file: packet-t124-ettarr.c ---*/ -#line 209 "../../asn1/t124/packet-t124-template.c" +#line 208 "../../asn1/t124/packet-t124-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 87514835ce..9f3e105a49 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> @@ -82,7 +81,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 48 "../../asn1/t125/packet-t125-template.c" +#line 47 "../../asn1/t125/packet-t125-template.c" /* Initialize the subtree pointers */ static int ett_t125 = -1; @@ -98,7 +97,7 @@ static gint ett_t125_Connect_Result_U = -1; static gint ett_t125_ConnectMCSPDU = -1; /*--- End of included file: packet-t125-ett.c ---*/ -#line 53 "../../asn1/t125/packet-t125-template.c" +#line 52 "../../asn1/t125/packet-t125-template.c" static heur_dissector_list_t t125_heur_subdissector_list; @@ -384,7 +383,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-t125-fn.c ---*/ -#line 57 "../../asn1/t125/packet-t125-template.c" +#line 56 "../../asn1/t125/packet-t125-template.c" static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) @@ -559,7 +558,7 @@ void proto_register_t125(void) { NULL, HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 127 "../../asn1/t125/packet-t125-template.c" +#line 126 "../../asn1/t125/packet-t125-template.c" }; /* List of subtrees */ @@ -576,7 +575,7 @@ void proto_register_t125(void) { &ett_t125_ConnectMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 133 "../../asn1/t125/packet-t125-template.c" +#line 132 "../../asn1/t125/packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 6bc4495279..a02d1ed787 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -52,23 +52,19 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/conversation.h> #include <epan/tap.h> #include <epan/expert.h> - -#include <string.h> - -#include "packet-t38.h" +#include <epan/strutil.h> #include <epan/prefs.h> #include <epan/ipproto.h> #include <epan/asn1.h> + +#include "packet-t38.h" #include "packet-per.h" #include "packet-tpkt.h" -#include <epan/wmem/wmem.h> -#include <epan/strutil.h> void proto_register_t38(void); @@ -149,7 +145,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 122 "../../asn1/t38/packet-t38-template.c" +#line 118 "../../asn1/t38/packet-t38-template.c" /* T38 setup fields */ static int hf_t38_setup = -1; @@ -183,7 +179,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 142 "../../asn1/t38/packet-t38-template.c" +#line 138 "../../asn1/t38/packet-t38-template.c" static gint ett_t38_setup = -1; static gint ett_data_fragment = -1; @@ -979,7 +975,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-t38-fn.c ---*/ -#line 396 "../../asn1/t38/packet-t38-template.c" +#line 392 "../../asn1/t38/packet-t38-template.c" /* initialize the tap t38_info and the conversation */ static void @@ -1318,7 +1314,7 @@ proto_register_t38(void) "OCTET_STRING", HFILL }}, /*--- End of included file: packet-t38-hfarr.c ---*/ -#line 658 "../../asn1/t38/packet-t38-template.c" +#line 654 "../../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 }}, @@ -1379,7 +1375,7 @@ proto_register_t38(void) &ett_t38_T_fec_data, /*--- End of included file: packet-t38-ettarr.c ---*/ -#line 705 "../../asn1/t38/packet-t38-template.c" +#line 701 "../../asn1/t38/packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index ab640762dc..57c2289e92 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -33,7 +33,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> @@ -42,7 +41,6 @@ #include <epan/strutil.h> #include <epan/show_exception.h> -#include <string.h> #include "packet-ber.h" #include "packet-tcap.h" #include "packet-mtp3.h" @@ -138,7 +136,7 @@ static int hf_tcap_AARQ_protocol_version_version1 = -1; static int hf_tcap_AARE_protocol_version_version1 = -1; /*--- End of included file: packet-tcap-hf.c ---*/ -#line 62 "../../asn1/tcap/packet-tcap-template.c" +#line 60 "../../asn1/tcap/packet-tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -193,7 +191,7 @@ static gint ett_tcap_ABRT_user_information = -1; static gint ett_tcap_Associate_source_diagnostic = -1; /*--- End of included file: packet-tcap-ett.c ---*/ -#line 78 "../../asn1/tcap/packet-tcap-template.c" +#line 76 "../../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 @@ -1425,7 +1423,7 @@ static int dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-tcap-fn.c ---*/ -#line 158 "../../asn1/tcap/packet-tcap-template.c" +#line 156 "../../asn1/tcap/packet-tcap-template.c" /* * DEBUG functions @@ -3348,7 +3346,7 @@ proto_reg_handoff_tcap(void) /*--- End of included file: packet-tcap-dis-tab.c ---*/ -#line 2073 "../../asn1/tcap/packet-tcap-template.c" +#line 2071 "../../asn1/tcap/packet-tcap-template.c" } static void init_tcap(void); @@ -3689,7 +3687,7 @@ proto_register_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 2145 "../../asn1/tcap/packet-tcap-template.c" +#line 2143 "../../asn1/tcap/packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -3738,7 +3736,7 @@ proto_register_tcap(void) &ett_tcap_Associate_source_diagnostic, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 2155 "../../asn1/tcap/packet-tcap-template.c" +#line 2153 "../../asn1/tcap/packet-tcap-template.c" }; /*static enum_val_t tcap_options[] = { diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index 88f983321a..8fef0a56ca 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -36,18 +36,14 @@ #include "config.h" -#include <glib.h> -#include <epan/expert.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/prefs.h> #include <epan/oids.h> #include <epan/conversation.h> #include <epan/asn1.h> -#include <stdio.h> -#include <string.h> - -#include <epan/dissectors/packet-per.h> +#include "packet-per.h" #include "packet-tetra.h" #define PROTO_TAG_tetra "TETRA" @@ -688,7 +684,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 87 "../../asn1/tetra/packet-tetra-template.c" +#line 83 "../../asn1/tetra/packet-tetra-template.c" /* Initialize the subtree pointers */ /* These are the ids of the subtrees that we may be creating */ @@ -973,7 +969,7 @@ static gint ett_tetra_Type2 = -1; static gint ett_tetra_Modify_type = -1; /*--- End of included file: packet-tetra-ett.c ---*/ -#line 97 "../../asn1/tetra/packet-tetra-template.c" +#line 93 "../../asn1/tetra/packet-tetra-template.c" static expert_field ei_tetra_channels_incorrect = EI_INIT; @@ -8819,7 +8815,7 @@ static int dissect_MAC_ACCESS_DEFINE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-tetra-fn.c ---*/ -#line 101 "../../asn1/tetra/packet-tetra-template.c" +#line 97 "../../asn1/tetra/packet-tetra-template.c" static const value_string channeltypenames[] = { { 0, "Reserved" }, @@ -11722,7 +11718,7 @@ void proto_register_tetra (void) "T_simplex_duplex_selection_05", HFILL }}, /*--- End of included file: packet-tetra-hfarr.c ---*/ -#line 631 "../../asn1/tetra/packet-tetra-template.c" +#line 627 "../../asn1/tetra/packet-tetra-template.c" }; /* List of subtrees */ @@ -12007,7 +12003,7 @@ void proto_register_tetra (void) &ett_tetra_Modify_type, /*--- End of included file: packet-tetra-ettarr.c ---*/ -#line 641 "../../asn1/tetra/packet-tetra-template.c" +#line 637 "../../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 658e46976a..285b07a481 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/asn1.h> @@ -691,7 +690,7 @@ static int hf_ulp_GANSSSignals_signal7 = -1; static int hf_ulp_GANSSSignals_signal8 = -1; /*--- End of included file: packet-ulp-hf.c ---*/ -#line 63 "../../asn1/ulp/packet-ulp-template.c" +#line 62 "../../asn1/ulp/packet-ulp-template.c" /* Initialize the subtree pointers */ static gint ett_ulp = -1; @@ -912,7 +911,7 @@ static gint ett_ulp_PolygonArea = -1; static gint ett_ulp_PolygonDescription = -1; /*--- End of included file: packet-ulp-ett.c ---*/ -#line 67 "../../asn1/ulp/packet-ulp-template.c" +#line 66 "../../asn1/ulp/packet-ulp-template.c" /* Include constants */ @@ -935,7 +934,7 @@ static gint ett_ulp_PolygonDescription = -1; #define maxWimaxBSMeas 32 /*--- End of included file: packet-ulp-val.h ---*/ -#line 70 "../../asn1/ulp/packet-ulp-template.c" +#line 69 "../../asn1/ulp/packet-ulp-template.c" @@ -6481,7 +6480,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 73 "../../asn1/ulp/packet-ulp-template.c" +#line 72 "../../asn1/ulp/packet-ulp-template.c" static guint @@ -8984,7 +8983,7 @@ void proto_register_ulp(void) { NULL, HFILL }}, /*--- End of included file: packet-ulp-hfarr.c ---*/ -#line 99 "../../asn1/ulp/packet-ulp-template.c" +#line 98 "../../asn1/ulp/packet-ulp-template.c" }; /* List of subtrees */ @@ -9207,7 +9206,7 @@ void proto_register_ulp(void) { &ett_ulp_PolygonDescription, /*--- End of included file: packet-ulp-ettarr.c ---*/ -#line 105 "../../asn1/ulp/packet-ulp-template.c" +#line 104 "../../asn1/ulp/packet-ulp-template.c" }; module_t *ulp_module; diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index e2182df297..06303a7855 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -58,7 +57,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 47 "../../asn1/wlancertextn/packet-wlancertextn-template.c" +#line 46 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /* Initialize the subtree pointers */ @@ -67,7 +66,7 @@ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ static gint ett_wlancertextn_SSIDList = -1; /*--- End of included file: packet-wlancertextn-ett.c ---*/ -#line 50 "../../asn1/wlancertextn/packet-wlancertextn-template.c" +#line 49 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /*--- Included file: packet-wlancertextn-fn.c ---*/ @@ -107,7 +106,7 @@ static int dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 52 "../../asn1/wlancertextn/packet-wlancertextn-template.c" +#line 51 "../../asn1/wlancertextn/packet-wlancertextn-template.c" /*--- proto_register_wlancertextn ----------------------------------------------*/ @@ -128,7 +127,7 @@ void proto_register_wlancertextn(void) { NULL, HFILL }}, /*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 60 "../../asn1/wlancertextn/packet-wlancertextn-template.c" +#line 59 "../../asn1/wlancertextn/packet-wlancertextn-template.c" }; /* List of subtrees */ @@ -139,7 +138,7 @@ void proto_register_wlancertextn(void) { &ett_wlancertextn_SSIDList, /*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 65 "../../asn1/wlancertextn/packet-wlancertextn-template.c" +#line 64 "../../asn1/wlancertextn/packet-wlancertextn-template.c" }; /* Register protocol */ @@ -162,7 +161,7 @@ void proto_reg_handoff_wlancertextn(void) { /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ -#line 80 "../../asn1/wlancertextn/packet-wlancertextn-template.c" +#line 79 "../../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 a63ed9a9ce..065ebabb2a 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -218,7 +217,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ -#line 57 "../../asn1/x2ap/packet-x2ap-template.c" +#line 56 "../../asn1/x2ap/packet-x2ap-template.c" /* Initialize the protocol and registered fields */ static int proto_x2ap = -1; @@ -589,7 +588,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 63 "../../asn1/x2ap/packet-x2ap-template.c" +#line 62 "../../asn1/x2ap/packet-x2ap-template.c" /* Initialize the subtree pointers */ static int ett_x2ap = -1; @@ -757,7 +756,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1; static gint ett_x2ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-x2ap-ett.c ---*/ -#line 68 "../../asn1/x2ap/packet-x2ap-template.c" +#line 67 "../../asn1/x2ap/packet-x2ap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -6221,7 +6220,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 89 "../../asn1/x2ap/packet-x2ap-template.c" +#line 88 "../../asn1/x2ap/packet-x2ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -7724,7 +7723,7 @@ void proto_register_x2ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 147 "../../asn1/x2ap/packet-x2ap-template.c" +#line 146 "../../asn1/x2ap/packet-x2ap-template.c" }; /* List of subtrees */ @@ -7894,7 +7893,7 @@ void proto_register_x2ap(void) { &ett_x2ap_UnsuccessfulOutcome, /*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 154 "../../asn1/x2ap/packet-x2ap-template.c" +#line 153 "../../asn1/x2ap/packet-x2ap-template.c" }; module_t *x2ap_module; @@ -8077,7 +8076,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 200 "../../asn1/x2ap/packet-x2ap-template.c" +#line 199 "../../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 094a2cbd79..8b68d54f33 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -133,7 +132,7 @@ static int hf_x509af_q = -1; /* INTEGER */ static int hf_x509af_g = -1; /* INTEGER */ /*--- End of included file: packet-x509af-hf.c ---*/ -#line 50 "../../asn1/x509af/packet-x509af-template.c" +#line 49 "../../asn1/x509af/packet-x509af-template.c" /* Initialize the subtree pointers */ static gint ett_pkix_crl = -1; @@ -174,7 +173,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 54 "../../asn1/x509af/packet-x509af-template.c" +#line 53 "../../asn1/x509af/packet-x509af-template.c" static const char *algorithm_id; /*--- Included file: packet-x509af-fn.c ---*/ @@ -897,7 +896,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 56 "../../asn1/x509af/packet-x509af-template.c" +#line 55 "../../asn1/x509af/packet-x509af-template.c" const char *x509af_get_last_algorithm_id(void) { return algorithm_id; @@ -1235,7 +1234,7 @@ void proto_register_x509af(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 93 "../../asn1/x509af/packet-x509af-template.c" +#line 92 "../../asn1/x509af/packet-x509af-template.c" }; /* List of subtrees */ @@ -1278,7 +1277,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 99 "../../asn1/x509af/packet-x509af-template.c" +#line 98 "../../asn1/x509af/packet-x509af-template.c" }; /* Register protocol */ @@ -1321,7 +1320,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 127 "../../asn1/x509af/packet-x509af-template.c" +#line 126 "../../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-x509ce.c b/epan/dissectors/packet-x509ce.c index 7f7ca080eb..ea0144f05d 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> @@ -257,7 +256,7 @@ static int hf_x509ce_EntrustInfoFlags_webCategory = -1; static int hf_x509ce_EntrustInfoFlags_sETCategory = -1; /*--- End of included file: packet-x509ce-hf.c ---*/ -#line 51 "../../asn1/x509ce/packet-x509ce-template.c" +#line 50 "../../asn1/x509ce/packet-x509ce-template.c" /* Initialize the subtree pointers */ @@ -325,7 +324,7 @@ static gint ett_x509ce_EntrustInfoFlags = -1; static gint ett_x509ce_ScramblerCapabilities = -1; /*--- End of included file: packet-x509ce-ett.c ---*/ -#line 54 "../../asn1/x509ce/packet-x509ce-template.c" +#line 53 "../../asn1/x509ce/packet-x509ce-template.c" /*--- Included file: packet-x509ce-fn.c ---*/ #line 1 "../../asn1/x509ce/packet-x509ce-fn.c" @@ -1947,7 +1946,7 @@ static int dissect_CicamBrandId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-x509ce-fn.c ---*/ -#line 55 "../../asn1/x509ce/packet-x509ce-template.c" +#line 54 "../../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 @@ -2801,7 +2800,7 @@ void proto_register_x509ce(void) { NULL, HFILL }}, /*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 120 "../../asn1/x509ce/packet-x509ce-template.c" +#line 119 "../../asn1/x509ce/packet-x509ce-template.c" }; /* List of subtrees */ @@ -2871,7 +2870,7 @@ void proto_register_x509ce(void) { &ett_x509ce_ScramblerCapabilities, /*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 125 "../../asn1/x509ce/packet-x509ce-template.c" +#line 124 "../../asn1/x509ce/packet-x509ce-template.c" }; /* Register protocol */ @@ -2934,7 +2933,7 @@ void proto_reg_handoff_x509ce(void) { /*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 140 "../../asn1/x509ce/packet-x509ce-template.c" +#line 139 "../../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-x509if.c b/epan/dissectors/packet-x509if.c index f315ebfd84..9405247b5a 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -31,18 +31,16 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> +#include <epan/strutil.h> #include "packet-ber.h" #include "packet-dap.h" #include "packet-x509if.h" #include "packet-x509sat.h" -#include <epan/strutil.h> -#include <epan/dissectors/packet-frame.h> +#include "packet-frame.h" #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" @@ -215,7 +213,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 51 "../../asn1/x509if/packet-x509if-template.c" +#line 49 "../../asn1/x509if/packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -296,7 +294,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 54 "../../asn1/x509if/packet-x509if-template.c" +#line 52 "../../asn1/x509if/packet-x509if-template.c" static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; @@ -2105,7 +2103,7 @@ static int dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-x509if-fn.c ---*/ -#line 90 "../../asn1/x509if/packet-x509if-template.c" +#line 88 "../../asn1/x509if/packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2771,7 +2769,7 @@ void proto_register_x509if(void) { NULL, HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 135 "../../asn1/x509if/packet-x509if-template.c" +#line 133 "../../asn1/x509if/packet-x509if-template.c" }; /* List of subtrees */ @@ -2854,7 +2852,7 @@ void proto_register_x509if(void) { &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 140 "../../asn1/x509if/packet-x509if-template.c" +#line 138 "../../asn1/x509if/packet-x509if-template.c" }; /* Register protocol */ @@ -2912,6 +2910,6 @@ void proto_reg_handoff_x509if(void) { /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 159 "../../asn1/x509if/packet-x509if-template.c" +#line 157 "../../asn1/x509if/packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index c76fe537f8..a53d66a368 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -220,7 +219,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 46 "../../asn1/x509sat/packet-x509sat-template.c" +#line 45 "../../asn1/x509sat/packet-x509sat-template.c" /* Initialize the subtree pointers */ @@ -275,7 +274,7 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 49 "../../asn1/x509sat/packet-x509sat-template.c" +#line 48 "../../asn1/x509sat/packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ @@ -1908,7 +1907,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 51 "../../asn1/x509sat/packet-x509sat-template.c" +#line 50 "../../asn1/x509sat/packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -2577,7 +2576,7 @@ void proto_register_x509sat(void) { NULL, HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 59 "../../asn1/x509sat/packet-x509sat-template.c" +#line 58 "../../asn1/x509sat/packet-x509sat-template.c" }; /* List of subtrees */ @@ -2634,7 +2633,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 64 "../../asn1/x509sat/packet-x509sat-template.c" +#line 63 "../../asn1/x509sat/packet-x509sat-template.c" }; /* Register protocol */ @@ -2687,7 +2686,7 @@ void proto_register_x509sat(void) { new_register_ber_syntax_dissector("X121Address", proto_x509sat, dissect_X121Address_PDU); /*--- End of included file: packet-x509sat-syn-reg.c ---*/ -#line 74 "../../asn1/x509sat/packet-x509sat-template.c" +#line 73 "../../asn1/x509sat/packet-x509sat-template.c" } @@ -2880,7 +2879,7 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 81 "../../asn1/x509sat/packet-x509sat-template.c" +#line 80 "../../asn1/x509sat/packet-x509sat-template.c" /* OBJECT CLASSES */ |