diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2023-06-22 14:42:09 +0200 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-11-02 22:56:41 +0000 |
| commit | 2cac1ca9e0a937993d3784ba84c671d4792a0a47 (patch) | |
| tree | c39a2bbc26a461622c835e9fff920c5f5d96233d /epan/dissectors/asn1 | |
| parent | 660cefa708d078f48f9e82a79dfe5e0e95d812bf (diff) | |
asn2wrs: Update to not initialize static proto values
Diffstat (limited to 'epan/dissectors/asn1')
128 files changed, 2632 insertions, 2632 deletions
diff --git a/epan/dissectors/asn1/acp133/packet-acp133-template.c b/epan/dissectors/asn1/acp133/packet-acp133-template.c index 22d3c38592..030156ef0b 100644 --- a/epan/dissectors/asn1/acp133/packet-acp133-template.c +++ b/epan/dissectors/asn1/acp133/packet-acp133-template.c @@ -33,13 +33,13 @@ void proto_register_acp133(void); void proto_reg_handoff_acp133(void); /* Initialize the protocol and registered fields */ -static int proto_acp133 = -1; +static int proto_acp133; #include "packet-acp133-hf.c" /* Initialize the subtree pointers */ -static gint ett_acp133 = -1; +static gint ett_acp133; #include "packet-acp133-ett.c" #include "packet-acp133-fn.c" diff --git a/epan/dissectors/asn1/acse/packet-acse-template.c b/epan/dissectors/asn1/acse/packet-acse-template.c index d10208abb8..81cf9db14e 100644 --- a/epan/dissectors/asn1/acse/packet-acse-template.c +++ b/epan/dissectors/asn1/acse/packet-acse-template.c @@ -53,15 +53,15 @@ int proto_clacse = -1; #include "packet-acse-hf.c" -static gint hf_acse_user_data = -1; +static gint hf_acse_user_data; /* Initialize the subtree pointers */ -static gint ett_acse = -1; +static gint ett_acse; #include "packet-acse-ett.c" -static expert_field ei_acse_dissector_not_available = EI_INIT; -static expert_field ei_acse_malformed = EI_INIT; -static expert_field ei_acse_invalid_oid = EI_INIT; +static expert_field ei_acse_dissector_not_available; +static expert_field ei_acse_malformed; +static expert_field ei_acse_invalid_oid; static dissector_handle_t acse_handle = NULL; diff --git a/epan/dissectors/asn1/ain/packet-ain-template.c b/epan/dissectors/asn1/ain/packet-ain-template.c index cf64e68a5f..e9e598adac 100644 --- a/epan/dissectors/asn1/ain/packet-ain-template.c +++ b/epan/dissectors/asn1/ain/packet-ain-template.c @@ -41,37 +41,37 @@ void proto_reg_handoff_ain(void); /* Initialize the protocol and registered fields */ -static int proto_ain = -1; +static int proto_ain; static dissector_handle_t ain_handle; /* include constants */ #include "packet-ain-val.h" -static int hf_ain_ext_type_oid = -1; -static int hf_ain_odd_even_indicator = -1; -static int hf_ain_nature_of_address = -1; -static int hf_ain_numbering_plan = -1; -static int hf_ain_bcd_digits = -1; -static int hf_ain_carrier_selection = -1; -static int hf_ain_nature_of_carrier = -1; -static int hf_ain_nr_digits = -1; -static int hf_ain_carrier_bcd_digits = -1; -static int hf_ain_amaslpid = -1; +static int hf_ain_ext_type_oid; +static int hf_ain_odd_even_indicator; +static int hf_ain_nature_of_address; +static int hf_ain_numbering_plan; +static int hf_ain_bcd_digits; +static int hf_ain_carrier_selection; +static int hf_ain_nature_of_carrier; +static int hf_ain_nr_digits; +static int hf_ain_carrier_bcd_digits; +static int hf_ain_amaslpid; #include "packet-ain-hf.c" /* Initialize the subtree pointers */ -static int ett_ain = -1; -static int ett_ain_digits = -1; -static int ett_ain_carrierformat = -1; -static int ett_ain_amaslpid = -1; +static int ett_ain; +static int ett_ain_digits; +static int ett_ain_carrierformat; +static int ett_ain_amaslpid; #include "packet-ain-ett.c" -static expert_field ei_ain_unknown_invokeData = EI_INIT; -static expert_field ei_ain_unknown_returnResultData = EI_INIT; -static expert_field ei_ain_unknown_returnErrorData = EI_INIT; +static expert_field ei_ain_unknown_invokeData; +static expert_field ei_ain_unknown_returnResultData; +static expert_field ei_ain_unknown_returnErrorData; /* Global variables */ static guint32 opcode = 0; diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c index 6eae4ee57a..308320904d 100644 --- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c +++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c @@ -106,252 +106,252 @@ static dissector_handle_t ansi_map_handle=NULL; /* Initialize the protocol and registered fields */ static int ansi_map_tap = -1; -static int proto_ansi_map = -1; +static int proto_ansi_map; #if 0 -static int hf_ansi_map_op_code_fam = -1; -static int hf_ansi_map_op_code = -1; +static int hf_ansi_map_op_code_fam; +static int hf_ansi_map_op_code; #endif -static int hf_ansi_map_reservedBitH = -1; -static int hf_ansi_map_reservedBitHG = -1; -static int hf_ansi_map_reservedBitHGFE = -1; -static int hf_ansi_map_reservedBitFED = -1; -static int hf_ansi_map_reservedBitD = -1; -static int hf_ansi_map_reservedBitED = -1; - -static int hf_ansi_map_type_of_digits = -1; -static int hf_ansi_map_na = -1; -static int hf_ansi_map_pi = -1; -static int hf_ansi_map_navail = -1; -static int hf_ansi_map_si = -1; -static int hf_ansi_map_digits_enc = -1; -static int hf_ansi_map_np = -1; -static int hf_ansi_map_nr_digits = -1; -static int hf_ansi_map_bcd_digits = -1; -static int hf_ansi_map_ia5_digits = -1; -static int hf_ansi_map_subaddr_type = -1; -static int hf_ansi_map_subaddr_odd_even = -1; -static int hf_ansi_alertcode_cadence = -1; -static int hf_ansi_alertcode_pitch = -1; -static int hf_ansi_alertcode_alertaction = -1; -static int hf_ansi_map_announcementcode_tone = -1; -static int hf_ansi_map_announcementcode_class = -1; -static int hf_ansi_map_announcementcode_std_ann = -1; -static int hf_ansi_map_announcementcode_cust_ann = -1; -static int hf_ansi_map_authorizationperiod_period = -1; -static int hf_ansi_map_value = -1; -static int hf_ansi_map_msc_type = -1; -static int hf_ansi_map_handoffstate_pi = -1; -static int hf_ansi_map_tgn = -1; -static int hf_ansi_map_tmn = -1; -static int hf_ansi_map_messagewaitingnotificationcount_tom = -1; -static int hf_ansi_map_messagewaitingnotificationcount_no_mw = -1; -static int hf_ansi_map_messagewaitingnotificationtype_mwi = -1; -static int hf_ansi_map_messagewaitingnotificationtype_apt = -1; -static int hf_ansi_map_messagewaitingnotificationtype_pt = -1; - -static int hf_ansi_map_trans_cap_prof = -1; -static int hf_ansi_map_trans_cap_busy = -1; -static int hf_ansi_map_trans_cap_ann = -1; -static int hf_ansi_map_trans_cap_rui = -1; -static int hf_ansi_map_trans_cap_spini = -1; -static int hf_ansi_map_trans_cap_uzci = -1; -static int hf_ansi_map_trans_cap_ndss = -1; -static int hf_ansi_map_trans_cap_nami = -1; -static int hf_ansi_trans_cap_multerm = -1; -static int hf_ansi_map_terminationtriggers_busy = -1; -static int hf_ansi_map_terminationtriggers_rf = -1; -static int hf_ansi_map_terminationtriggers_npr = -1; -static int hf_ansi_map_terminationtriggers_na = -1; -static int hf_ansi_map_terminationtriggers_nr = -1; -static int hf_ansi_trans_cap_tl = -1; -static int hf_ansi_map_cdmaserviceoption = -1; -static int hf_ansi_trans_cap_waddr = -1; -static int hf_ansi_map_MarketID = -1; -static int hf_ansi_map_swno = -1; -static int hf_ansi_map_idno = -1; -static int hf_ansi_map_segcount = -1; -static int hf_ansi_map_sms_originationrestrictions_fmc = -1; -static int hf_ansi_map_sms_originationrestrictions_direct = -1; -static int hf_ansi_map_sms_originationrestrictions_default = -1; -static int hf_ansi_map_systemcapabilities_auth = -1; -static int hf_ansi_map_systemcapabilities_se = -1; -static int hf_ansi_map_systemcapabilities_vp = -1; -static int hf_ansi_map_systemcapabilities_cave = -1; -static int hf_ansi_map_systemcapabilities_ssd = -1; -static int hf_ansi_map_systemcapabilities_dp = -1; - -static int hf_ansi_map_mslocation_lat = -1; -static int hf_ansi_map_mslocation_long = -1; -static int hf_ansi_map_mslocation_res = -1; -static int hf_ansi_map_nampscallmode_namps = -1; -static int hf_ansi_map_nampscallmode_amps = -1; -static int hf_ansi_map_nampschanneldata_navca = -1; -static int hf_ansi_map_nampschanneldata_CCIndicator = -1; - -static int hf_ansi_map_callingfeaturesindicator_cfufa = -1; -static int hf_ansi_map_callingfeaturesindicator_cfbfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cfnafa = -1; -static int hf_ansi_map_callingfeaturesindicator_cwfa = -1; -static int hf_ansi_map_callingfeaturesindicator_3wcfa = -1; -static int hf_ansi_map_callingfeaturesindicator_pcwfa =-1; -static int hf_ansi_map_callingfeaturesindicator_dpfa = -1; -static int hf_ansi_map_callingfeaturesindicator_ahfa = -1; -static int hf_ansi_map_callingfeaturesindicator_uscfvmfa = -1; -static int hf_ansi_map_callingfeaturesindicator_uscfmsfa = -1; -static int hf_ansi_map_callingfeaturesindicator_uscfnrfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cpdsfa = -1; -static int hf_ansi_map_callingfeaturesindicator_ccsfa = -1; -static int hf_ansi_map_callingfeaturesindicator_epefa = -1; -static int hf_ansi_map_callingfeaturesindicator_cdfa = -1; -static int hf_ansi_map_callingfeaturesindicator_vpfa = -1; -static int hf_ansi_map_callingfeaturesindicator_ctfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cnip1fa = -1; -static int hf_ansi_map_callingfeaturesindicator_cnip2fa = -1; -static int hf_ansi_map_callingfeaturesindicator_cnirfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cniroverfa = -1; -static int hf_ansi_map_cdmacallmode_cdma = -1; -static int hf_ansi_map_cdmacallmode_amps = -1; -static int hf_ansi_map_cdmacallmode_namps = -1; -static int hf_ansi_map_cdmacallmode_cls1 = -1; -static int hf_ansi_map_cdmacallmode_cls2 = -1; -static int hf_ansi_map_cdmacallmode_cls3 = -1; -static int hf_ansi_map_cdmacallmode_cls4 = -1; -static int hf_ansi_map_cdmacallmode_cls5 = -1; -static int hf_ansi_map_cdmacallmode_cls6 = -1; -static int hf_ansi_map_cdmacallmode_cls7 = -1; -static int hf_ansi_map_cdmacallmode_cls8 = -1; -static int hf_ansi_map_cdmacallmode_cls9 = -1; -static int hf_ansi_map_cdmacallmode_cls10 = -1; -static int hf_ansi_map_cdmachanneldata_Frame_Offset = -1; -static int hf_ansi_map_cdmachanneldata_CDMA_ch_no = -1; -static int hf_ansi_map_cdmachanneldata_band_cls = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b6 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b5 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b4 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b3 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b2 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b1 = -1; -static int hf_ansi_map_cdmachanneldata_np_ext = -1; -static int hf_ansi_map_cdmachanneldata_nominal_pwr = -1; -static int hf_ansi_map_cdmachanneldata_nr_preamble = -1; - -static int hf_ansi_map_cdmastationclassmark_pc = -1; -static int hf_ansi_map_cdmastationclassmark_dtx = -1; -static int hf_ansi_map_cdmastationclassmark_smi = -1; -static int hf_ansi_map_cdmastationclassmark_dmi = -1; -static int hf_ansi_map_channeldata_vmac = -1; -static int hf_ansi_map_channeldata_dtx = -1; -static int hf_ansi_map_channeldata_scc = -1; -static int hf_ansi_map_channeldata_chno = -1; -static int hf_ansi_map_ConfidentialityModes_vp = -1; -static int hf_ansi_map_controlchanneldata_dcc = -1; -static int hf_ansi_map_controlchanneldata_cmac = -1; -static int hf_ansi_map_controlchanneldata_chno = -1; -static int hf_ansi_map_controlchanneldata_sdcc1 = -1; -static int hf_ansi_map_controlchanneldata_sdcc2 = -1; -static int hf_ansi_map_ConfidentialityModes_se = -1; -static int hf_ansi_map_deniedauthorizationperiod_period = -1; -static int hf_ansi_map_ConfidentialityModes_dp = -1; - -static int hf_ansi_map_originationtriggers_all = -1; -static int hf_ansi_map_originationtriggers_local = -1; -static int hf_ansi_map_originationtriggers_ilata = -1; -static int hf_ansi_map_originationtriggers_olata = -1; -static int hf_ansi_map_originationtriggers_int = -1; -static int hf_ansi_map_originationtriggers_wz = -1; -static int hf_ansi_map_originationtriggers_unrec = -1; -static int hf_ansi_map_originationtriggers_rvtc = -1; -static int hf_ansi_map_originationtriggers_star = -1; -static int hf_ansi_map_originationtriggers_ds = -1; -static int hf_ansi_map_originationtriggers_pound = -1; -static int hf_ansi_map_originationtriggers_dp = -1; -static int hf_ansi_map_originationtriggers_pa = -1; -static int hf_ansi_map_originationtriggers_nodig = -1; -static int hf_ansi_map_originationtriggers_onedig = -1; -static int hf_ansi_map_originationtriggers_twodig = -1; -static int hf_ansi_map_originationtriggers_threedig = -1; -static int hf_ansi_map_originationtriggers_fourdig = -1; -static int hf_ansi_map_originationtriggers_fivedig = -1; -static int hf_ansi_map_originationtriggers_sixdig = -1; -static int hf_ansi_map_originationtriggers_sevendig = -1; -static int hf_ansi_map_originationtriggers_eightdig = -1; -static int hf_ansi_map_originationtriggers_ninedig = -1; -static int hf_ansi_map_originationtriggers_tendig = -1; -static int hf_ansi_map_originationtriggers_elevendig = -1; -static int hf_ansi_map_originationtriggers_twelvedig = -1; -static int hf_ansi_map_originationtriggers_thirteendig = -1; -static int hf_ansi_map_originationtriggers_fourteendig = -1; -static int hf_ansi_map_originationtriggers_fifteendig = -1; -static int hf_ansi_map_triggercapability_init = -1; -static int hf_ansi_map_triggercapability_kdigit = -1; -static int hf_ansi_map_triggercapability_all = -1; -static int hf_ansi_map_triggercapability_rvtc = -1; -static int hf_ansi_map_triggercapability_oaa = -1; -static int hf_ansi_map_triggercapability_oans = -1; -static int hf_ansi_map_triggercapability_odisc = -1; -static int hf_ansi_map_triggercapability_ona = -1; -static int hf_ansi_map_triggercapability_ct = -1; -static int hf_ansi_map_triggercapability_unrec =-1; -static int hf_ansi_map_triggercapability_pa = -1; -static int hf_ansi_map_triggercapability_at = -1; -static int hf_ansi_map_triggercapability_cgraa = -1; -static int hf_ansi_map_triggercapability_it = -1; -static int hf_ansi_map_triggercapability_cdraa = -1; -static int hf_ansi_map_triggercapability_obsy = -1; -static int hf_ansi_map_triggercapability_tra = -1; -static int hf_ansi_map_triggercapability_tbusy = -1; -static int hf_ansi_map_triggercapability_tna = -1; -static int hf_ansi_map_triggercapability_tans = -1; -static int hf_ansi_map_triggercapability_tdisc = -1; -static int hf_ansi_map_winoperationscapability_conn = -1; -static int hf_ansi_map_winoperationscapability_ccdir = -1; -static int hf_ansi_map_winoperationscapability_pos = -1; -static int hf_ansi_map_PACA_Level = -1; -static int hf_ansi_map_pacaindicator_pa = -1; - -static int hf_ansi_map_point_code = -1; -static int hf_ansi_map_SSN = -1; -static int hf_ansi_map_win_trigger_list = -1; +static int hf_ansi_map_reservedBitH; +static int hf_ansi_map_reservedBitHG; +static int hf_ansi_map_reservedBitHGFE; +static int hf_ansi_map_reservedBitFED; +static int hf_ansi_map_reservedBitD; +static int hf_ansi_map_reservedBitED; + +static int hf_ansi_map_type_of_digits; +static int hf_ansi_map_na; +static int hf_ansi_map_pi; +static int hf_ansi_map_navail; +static int hf_ansi_map_si; +static int hf_ansi_map_digits_enc; +static int hf_ansi_map_np; +static int hf_ansi_map_nr_digits; +static int hf_ansi_map_bcd_digits; +static int hf_ansi_map_ia5_digits; +static int hf_ansi_map_subaddr_type; +static int hf_ansi_map_subaddr_odd_even; +static int hf_ansi_alertcode_cadence; +static int hf_ansi_alertcode_pitch; +static int hf_ansi_alertcode_alertaction; +static int hf_ansi_map_announcementcode_tone; +static int hf_ansi_map_announcementcode_class; +static int hf_ansi_map_announcementcode_std_ann; +static int hf_ansi_map_announcementcode_cust_ann; +static int hf_ansi_map_authorizationperiod_period; +static int hf_ansi_map_value; +static int hf_ansi_map_msc_type; +static int hf_ansi_map_handoffstate_pi; +static int hf_ansi_map_tgn; +static int hf_ansi_map_tmn; +static int hf_ansi_map_messagewaitingnotificationcount_tom; +static int hf_ansi_map_messagewaitingnotificationcount_no_mw; +static int hf_ansi_map_messagewaitingnotificationtype_mwi; +static int hf_ansi_map_messagewaitingnotificationtype_apt; +static int hf_ansi_map_messagewaitingnotificationtype_pt; + +static int hf_ansi_map_trans_cap_prof; +static int hf_ansi_map_trans_cap_busy; +static int hf_ansi_map_trans_cap_ann; +static int hf_ansi_map_trans_cap_rui; +static int hf_ansi_map_trans_cap_spini; +static int hf_ansi_map_trans_cap_uzci; +static int hf_ansi_map_trans_cap_ndss; +static int hf_ansi_map_trans_cap_nami; +static int hf_ansi_trans_cap_multerm; +static int hf_ansi_map_terminationtriggers_busy; +static int hf_ansi_map_terminationtriggers_rf; +static int hf_ansi_map_terminationtriggers_npr; +static int hf_ansi_map_terminationtriggers_na; +static int hf_ansi_map_terminationtriggers_nr; +static int hf_ansi_trans_cap_tl; +static int hf_ansi_map_cdmaserviceoption; +static int hf_ansi_trans_cap_waddr; +static int hf_ansi_map_MarketID; +static int hf_ansi_map_swno; +static int hf_ansi_map_idno; +static int hf_ansi_map_segcount; +static int hf_ansi_map_sms_originationrestrictions_fmc; +static int hf_ansi_map_sms_originationrestrictions_direct; +static int hf_ansi_map_sms_originationrestrictions_default; +static int hf_ansi_map_systemcapabilities_auth; +static int hf_ansi_map_systemcapabilities_se; +static int hf_ansi_map_systemcapabilities_vp; +static int hf_ansi_map_systemcapabilities_cave; +static int hf_ansi_map_systemcapabilities_ssd; +static int hf_ansi_map_systemcapabilities_dp; + +static int hf_ansi_map_mslocation_lat; +static int hf_ansi_map_mslocation_long; +static int hf_ansi_map_mslocation_res; +static int hf_ansi_map_nampscallmode_namps; +static int hf_ansi_map_nampscallmode_amps; +static int hf_ansi_map_nampschanneldata_navca; +static int hf_ansi_map_nampschanneldata_CCIndicator; + +static int hf_ansi_map_callingfeaturesindicator_cfufa; +static int hf_ansi_map_callingfeaturesindicator_cfbfa; +static int hf_ansi_map_callingfeaturesindicator_cfnafa; +static int hf_ansi_map_callingfeaturesindicator_cwfa; +static int hf_ansi_map_callingfeaturesindicator_3wcfa; +static int hf_ansi_map_callingfeaturesindicator_pcwfa; +static int hf_ansi_map_callingfeaturesindicator_dpfa; +static int hf_ansi_map_callingfeaturesindicator_ahfa; +static int hf_ansi_map_callingfeaturesindicator_uscfvmfa; +static int hf_ansi_map_callingfeaturesindicator_uscfmsfa; +static int hf_ansi_map_callingfeaturesindicator_uscfnrfa; +static int hf_ansi_map_callingfeaturesindicator_cpdsfa; +static int hf_ansi_map_callingfeaturesindicator_ccsfa; +static int hf_ansi_map_callingfeaturesindicator_epefa; +static int hf_ansi_map_callingfeaturesindicator_cdfa; +static int hf_ansi_map_callingfeaturesindicator_vpfa; +static int hf_ansi_map_callingfeaturesindicator_ctfa; +static int hf_ansi_map_callingfeaturesindicator_cnip1fa; +static int hf_ansi_map_callingfeaturesindicator_cnip2fa; +static int hf_ansi_map_callingfeaturesindicator_cnirfa; +static int hf_ansi_map_callingfeaturesindicator_cniroverfa; +static int hf_ansi_map_cdmacallmode_cdma; +static int hf_ansi_map_cdmacallmode_amps; +static int hf_ansi_map_cdmacallmode_namps; +static int hf_ansi_map_cdmacallmode_cls1; +static int hf_ansi_map_cdmacallmode_cls2; +static int hf_ansi_map_cdmacallmode_cls3; +static int hf_ansi_map_cdmacallmode_cls4; +static int hf_ansi_map_cdmacallmode_cls5; +static int hf_ansi_map_cdmacallmode_cls6; +static int hf_ansi_map_cdmacallmode_cls7; +static int hf_ansi_map_cdmacallmode_cls8; +static int hf_ansi_map_cdmacallmode_cls9; +static int hf_ansi_map_cdmacallmode_cls10; +static int hf_ansi_map_cdmachanneldata_Frame_Offset; +static int hf_ansi_map_cdmachanneldata_CDMA_ch_no; +static int hf_ansi_map_cdmachanneldata_band_cls; +static int hf_ansi_map_cdmachanneldata_lc_mask_b6; +static int hf_ansi_map_cdmachanneldata_lc_mask_b5; +static int hf_ansi_map_cdmachanneldata_lc_mask_b4; +static int hf_ansi_map_cdmachanneldata_lc_mask_b3; +static int hf_ansi_map_cdmachanneldata_lc_mask_b2; +static int hf_ansi_map_cdmachanneldata_lc_mask_b1; +static int hf_ansi_map_cdmachanneldata_np_ext; +static int hf_ansi_map_cdmachanneldata_nominal_pwr; +static int hf_ansi_map_cdmachanneldata_nr_preamble; + +static int hf_ansi_map_cdmastationclassmark_pc; +static int hf_ansi_map_cdmastationclassmark_dtx; +static int hf_ansi_map_cdmastationclassmark_smi; +static int hf_ansi_map_cdmastationclassmark_dmi; +static int hf_ansi_map_channeldata_vmac; +static int hf_ansi_map_channeldata_dtx; +static int hf_ansi_map_channeldata_scc; +static int hf_ansi_map_channeldata_chno; +static int hf_ansi_map_ConfidentialityModes_vp; +static int hf_ansi_map_controlchanneldata_dcc; +static int hf_ansi_map_controlchanneldata_cmac; +static int hf_ansi_map_controlchanneldata_chno; +static int hf_ansi_map_controlchanneldata_sdcc1; +static int hf_ansi_map_controlchanneldata_sdcc2; +static int hf_ansi_map_ConfidentialityModes_se; +static int hf_ansi_map_deniedauthorizationperiod_period; +static int hf_ansi_map_ConfidentialityModes_dp; + +static int hf_ansi_map_originationtriggers_all; +static int hf_ansi_map_originationtriggers_local; +static int hf_ansi_map_originationtriggers_ilata; +static int hf_ansi_map_originationtriggers_olata; +static int hf_ansi_map_originationtriggers_int; +static int hf_ansi_map_originationtriggers_wz; +static int hf_ansi_map_originationtriggers_unrec; +static int hf_ansi_map_originationtriggers_rvtc; +static int hf_ansi_map_originationtriggers_star; +static int hf_ansi_map_originationtriggers_ds; +static int hf_ansi_map_originationtriggers_pound; +static int hf_ansi_map_originationtriggers_dp; +static int hf_ansi_map_originationtriggers_pa; +static int hf_ansi_map_originationtriggers_nodig; +static int hf_ansi_map_originationtriggers_onedig; +static int hf_ansi_map_originationtriggers_twodig; +static int hf_ansi_map_originationtriggers_threedig; +static int hf_ansi_map_originationtriggers_fourdig; +static int hf_ansi_map_originationtriggers_fivedig; +static int hf_ansi_map_originationtriggers_sixdig; +static int hf_ansi_map_originationtriggers_sevendig; +static int hf_ansi_map_originationtriggers_eightdig; +static int hf_ansi_map_originationtriggers_ninedig; +static int hf_ansi_map_originationtriggers_tendig; +static int hf_ansi_map_originationtriggers_elevendig; +static int hf_ansi_map_originationtriggers_twelvedig; +static int hf_ansi_map_originationtriggers_thirteendig; +static int hf_ansi_map_originationtriggers_fourteendig; +static int hf_ansi_map_originationtriggers_fifteendig; +static int hf_ansi_map_triggercapability_init; +static int hf_ansi_map_triggercapability_kdigit; +static int hf_ansi_map_triggercapability_all; +static int hf_ansi_map_triggercapability_rvtc; +static int hf_ansi_map_triggercapability_oaa; +static int hf_ansi_map_triggercapability_oans; +static int hf_ansi_map_triggercapability_odisc; +static int hf_ansi_map_triggercapability_ona; +static int hf_ansi_map_triggercapability_ct; +static int hf_ansi_map_triggercapability_unrec; +static int hf_ansi_map_triggercapability_pa; +static int hf_ansi_map_triggercapability_at; +static int hf_ansi_map_triggercapability_cgraa; +static int hf_ansi_map_triggercapability_it; +static int hf_ansi_map_triggercapability_cdraa; +static int hf_ansi_map_triggercapability_obsy; +static int hf_ansi_map_triggercapability_tra; +static int hf_ansi_map_triggercapability_tbusy; +static int hf_ansi_map_triggercapability_tna; +static int hf_ansi_map_triggercapability_tans; +static int hf_ansi_map_triggercapability_tdisc; +static int hf_ansi_map_winoperationscapability_conn; +static int hf_ansi_map_winoperationscapability_ccdir; +static int hf_ansi_map_winoperationscapability_pos; +static int hf_ansi_map_PACA_Level; +static int hf_ansi_map_pacaindicator_pa; + +static int hf_ansi_map_point_code; +static int hf_ansi_map_SSN; +static int hf_ansi_map_win_trigger_list; #include "packet-ansi_map-hf.c" /* Initialize the subtree pointers */ -static gint ett_ansi_map = -1; -static gint ett_mintype = -1; -static gint ett_digitstype = -1; -static gint ett_billingid = -1; -static gint ett_sms_bearer_data = -1; -static gint ett_sms_teleserviceIdentifier = -1; -static gint ett_extendedmscid = -1; -static gint ett_extendedsystemmytypecode = -1; -static gint ett_handoffstate = -1; -static gint ett_mscid = -1; -static gint ett_cdmachanneldata = -1; -static gint ett_cdmastationclassmark = -1; -static gint ett_channeldata = -1; -static gint ett_confidentialitymodes = -1; -static gint ett_controlchanneldata = -1; -static gint ett_CDMA2000HandoffInvokeIOSData = -1; -static gint ett_CDMA2000HandoffResponseIOSData = -1; -static gint ett_originationtriggers = -1; -static gint ett_pacaindicator = -1; -static gint ett_callingpartyname = -1; -static gint ett_triggercapability = -1; -static gint ett_winoperationscapability = -1; -static gint ett_win_trigger_list = -1; -static gint ett_controlnetworkid = -1; -static gint ett_transactioncapability = -1; -static gint ett_cdmaserviceoption = -1; -static gint ett_systemcapabilities = -1; -static gint ett_sms_originationrestrictions = -1; +static gint ett_ansi_map; +static gint ett_mintype; +static gint ett_digitstype; +static gint ett_billingid; +static gint ett_sms_bearer_data; +static gint ett_sms_teleserviceIdentifier; +static gint ett_extendedmscid; +static gint ett_extendedsystemmytypecode; +static gint ett_handoffstate; +static gint ett_mscid; +static gint ett_cdmachanneldata; +static gint ett_cdmastationclassmark; +static gint ett_channeldata; +static gint ett_confidentialitymodes; +static gint ett_controlchanneldata; +static gint ett_CDMA2000HandoffInvokeIOSData; +static gint ett_CDMA2000HandoffResponseIOSData; +static gint ett_originationtriggers; +static gint ett_pacaindicator; +static gint ett_callingpartyname; +static gint ett_triggercapability; +static gint ett_winoperationscapability; +static gint ett_win_trigger_list; +static gint ett_controlnetworkid; +static gint ett_transactioncapability; +static gint ett_cdmaserviceoption; +static gint ett_systemcapabilities; +static gint ett_sms_originationrestrictions; #include "packet-ansi_map-ett.c" -static expert_field ei_ansi_map_nr_not_used = EI_INIT; -static expert_field ei_ansi_map_unknown_invokeData_blob = EI_INIT; -static expert_field ei_ansi_map_no_data = EI_INIT; +static expert_field ei_ansi_map_nr_not_used; +static expert_field ei_ansi_map_unknown_invokeData_blob; +static expert_field ei_ansi_map_no_data; /* Global variables */ static dissector_table_t is637_tele_id_dissector_table; /* IS-637 Teleservice ID */ diff --git a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c index 10a5f4b72f..dd2b4912dd 100644 --- a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -38,31 +38,31 @@ void proto_reg_handoff_ansi_tcap(void); static gint ansi_tcap_response_matching_type = ANSI_TCAP_TID_ONLY; /* Initialize the protocol and registered fields */ -static int proto_ansi_tcap = -1; +static int proto_ansi_tcap; #if 0 -static int hf_ansi_tcapsrt_SessionId = -1; -static int hf_ansi_tcapsrt_Duplicate = -1; -static int hf_ansi_tcapsrt_BeginSession = -1; -static int hf_ansi_tcapsrt_EndSession = -1; -static int hf_ansi_tcapsrt_SessionTime = -1; +static int hf_ansi_tcapsrt_SessionId; +static int hf_ansi_tcapsrt_Duplicate; +static int hf_ansi_tcapsrt_BeginSession; +static int hf_ansi_tcapsrt_EndSession; +static int hf_ansi_tcapsrt_SessionTime; #endif -static int hf_ansi_tcap_bit_h = -1; -static int hf_ansi_tcap_op_family = -1; -static int hf_ansi_tcap_op_specifier = -1; +static int hf_ansi_tcap_bit_h; +static int hf_ansi_tcap_op_family; +static int hf_ansi_tcap_op_specifier; #include "packet-ansi_tcap-hf.c" /* Initialize the subtree pointers */ -static gint ett_tcap = -1; -static gint ett_param = -1; -static gint ett_ansi_tcap_op_code_nat = -1; +static gint ett_tcap; +static gint ett_param; +static gint ett_ansi_tcap_op_code_nat; -static gint ett_otid = -1; -static gint ett_dtid = -1; -static gint ett_ansi_tcap_stat = -1; +static gint ett_otid; +static gint ett_dtid; +static gint ett_ansi_tcap_stat; -static expert_field ei_ansi_tcap_dissector_not_implemented = EI_INIT; +static expert_field ei_ansi_tcap_dissector_not_implemented; static struct tcapsrt_info_t * gp_tcapsrt_info; static gboolean tcap_subdissector_used=FALSE; diff --git a/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c b/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c index e4628178ba..ed6cb46532 100644 --- a/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c +++ b/epan/dissectors/asn1/atn-cm/packet-atn-cm-template.c @@ -42,10 +42,10 @@ void proto_reg_handoff_atn_cm(void); #include "packet-atn-cm-hf.c" #include "packet-atn-cm-ett.c" -static gint ett_atn_cm = -1; +static gint ett_atn_cm; #include "packet-atn-cm-fn.c" -static int proto_atn_cm = -1; +static int proto_atn_cm; static int dissect_atn_cm( diff --git a/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index 0e8bca4d24..2981f3e18c 100644 --- a/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/epan/dissectors/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -84,12 +84,12 @@ static int dissect_ProtectedAircraftPDUs_PDU( #include "packet-atn-cpdlc-hf.c" #include "packet-atn-cpdlc-ett.c" -static gint ett_atn_cpdlc = -1; +static gint ett_atn_cpdlc; #include "packet-atn-cpdlc-fn.c" /* Wireshark ID of CPDLC protocol */ -static int proto_atn_cpdlc = -1; +static int proto_atn_cpdlc; static int diff --git a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c index 18e32836f6..142ce005f7 100644 --- a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -121,7 +121,7 @@ static heur_dissector_list_t atn_ulcs_heur_subdissector_list; static dissector_handle_t atn_cm_handle = NULL; static dissector_handle_t atn_cpdlc_handle = NULL; -static int proto_atn_ulcs = -1; +static int proto_atn_ulcs; static guint32 ulcs_context_value = 0; static const char *object_identifier_id; @@ -177,8 +177,8 @@ static gint dissect_atn_ulcs( #include "packet-atn-ulcs-hf.c" #include "packet-atn-ulcs-ett.c" -static gint ett_atn_ulcs = -1; -static gint ett_atn_acse = -1; +static gint ett_atn_ulcs; +static gint ett_atn_acse; #include "packet-atn-ulcs-fn.c" @@ -223,12 +223,12 @@ static const per_choice_t External_encoding_choice[] = #define SES_PARAM_B2_MASK 0x02 #define SES_PARAM_B1_MASK 0x01 -static int hf_atn_ses_type = -1; -static int hf_atn_ses_param_ind = -1; -static int hf_atn_ses_param_b1 = -1; -static int hf_atn_ses_param_b2 = -1; +static int hf_atn_ses_type; +static int hf_atn_ses_param_ind; +static int hf_atn_ses_param_b1; +static int hf_atn_ses_param_b2; -static gint ett_atn_ses = -1; +static gint ett_atn_ses; #define ATN_SES_PROTO "ICAO Doc9705 ULCS Session (ISO 8326/8327-1:1994)" @@ -273,9 +273,9 @@ const value_string atn_ses_type[] = /* ATN Presentation layer */ #define ATN_PRES_PROTO "ICAO Doc9705 ULCS Presentation (ISO 8822/8823-1:1994)" -static int hf_atn_pres_err = -1; -static int hf_atn_pres_pdu_type = -1; -static gint ett_atn_pres = -1; +static int hf_atn_pres_err; +static int hf_atn_pres_pdu_type; +static gint ett_atn_pres; #define ATN_SES_PRES_MASK 0xf803 #define PRES_CPR_ER_MASK 0x70 diff --git a/epan/dissectors/asn1/c1222/packet-c1222-template.c b/epan/dissectors/asn1/c1222/packet-c1222-template.c index ba6175bc1b..60252356a6 100644 --- a/epan/dissectors/asn1/c1222/packet-c1222-template.c +++ b/epan/dissectors/asn1/c1222/packet-c1222-template.c @@ -70,18 +70,18 @@ static dissector_handle_t c1222_handle=NULL; static dissector_handle_t c1222_udp_handle=NULL; /* Initialize the protocol and registered fields */ -static int proto_c1222 = -1; +static int proto_c1222; #include "packet-c1222-hf.c" /* These are the EPSEM pieces */ /* first, the flag components */ -static int hf_c1222_epsem_flags = -1; -static int hf_c1222_epsem_flags_reserved = -1; -static int hf_c1222_epsem_flags_recovery = -1; -static int hf_c1222_epsem_flags_proxy = -1; -static int hf_c1222_epsem_flags_ed_class = -1; -static int hf_c1222_epsem_flags_security_modes = -1; -static int hf_c1222_epsem_flags_response_control = -1; +static int hf_c1222_epsem_flags; +static int hf_c1222_epsem_flags_reserved; +static int hf_c1222_epsem_flags_recovery; +static int hf_c1222_epsem_flags_proxy; +static int hf_c1222_epsem_flags_ed_class; +static int hf_c1222_epsem_flags_security_modes; +static int hf_c1222_epsem_flags_response_control; /* and the structure of the flag components */ static int * const c1222_flags[] = { &hf_c1222_epsem_flags_reserved, @@ -93,53 +93,53 @@ static int * const c1222_flags[] = { NULL }; /* next the optional ed_class */ -static int hf_c1222_epsem_ed_class = -1; +static int hf_c1222_epsem_ed_class; /* now the aggregate epsem */ -static int hf_c1222_epsem_total = -1; +static int hf_c1222_epsem_total; /* generic command */ -static int hf_c1222_cmd = -1; -static int hf_c1222_err = -1; -static int hf_c1222_data = -1; +static int hf_c1222_cmd; +static int hf_c1222_err; +static int hf_c1222_data; /* individual epsem fields */ -static int hf_c1222_logon_id = -1; -static int hf_c1222_logon_user = -1; -static int hf_c1222_security_password = -1; -static int hf_c1222_auth_len = -1; -static int hf_c1222_auth_data = -1; -static int hf_c1222_read_table = -1; -static int hf_c1222_read_offset = -1; -static int hf_c1222_read_count = -1; -static int hf_c1222_write_table = -1; -static int hf_c1222_write_offset = -1; -static int hf_c1222_write_size = -1; -static int hf_c1222_write_data = -1; -static int hf_c1222_procedure_response = -1; -static int hf_c1222_procedure_mfg = -1; -static int hf_c1222_procedure_num = -1; -static int hf_c1222_procedure_sequence = -1; -static int hf_c1222_write_chksum = -1; -static int hf_c1222_write_chksum_status = -1; -static int hf_c1222_wait_secs = -1; -static int hf_c1222_neg_pkt_size = -1; -static int hf_c1222_neg_nbr_pkts = -1; -static int hf_c1222_timing_setup_traffic = -1; -static int hf_c1222_timing_setup_inter_char = -1; -static int hf_c1222_timing_setup_resp_to = -1; -static int hf_c1222_timing_setup_nbr_retries = -1; +static int hf_c1222_logon_id; +static int hf_c1222_logon_user; +static int hf_c1222_security_password; +static int hf_c1222_auth_len; +static int hf_c1222_auth_data; +static int hf_c1222_read_table; +static int hf_c1222_read_offset; +static int hf_c1222_read_count; +static int hf_c1222_write_table; +static int hf_c1222_write_offset; +static int hf_c1222_write_size; +static int hf_c1222_write_data; +static int hf_c1222_procedure_response; +static int hf_c1222_procedure_mfg; +static int hf_c1222_procedure_num; +static int hf_c1222_procedure_sequence; +static int hf_c1222_write_chksum; +static int hf_c1222_write_chksum_status; +static int hf_c1222_wait_secs; +static int hf_c1222_neg_pkt_size; +static int hf_c1222_neg_nbr_pkts; +static int hf_c1222_timing_setup_traffic; +static int hf_c1222_timing_setup_inter_char; +static int hf_c1222_timing_setup_resp_to; +static int hf_c1222_timing_setup_nbr_retries; /* the MAC */ -static int hf_c1222_epsem_mac = -1; +static int hf_c1222_epsem_mac; /* crypto result flags */ -static int hf_c1222_epsem_crypto_good = -1; -static int hf_c1222_epsem_crypto_bad = -1; +static int hf_c1222_epsem_crypto_good; +static int hf_c1222_epsem_crypto_bad; /* Initialize the subtree pointers */ -static int ett_c1222 = -1; -static int ett_c1222_epsem = -1; -static int ett_c1222_flags = -1; -static int ett_c1222_crypto = -1; -static int ett_c1222_cmd = -1; +static int ett_c1222; +static int ett_c1222_epsem; +static int ett_c1222_flags; +static int ett_c1222_crypto; +static int ett_c1222_cmd; /* these pointers are for the header elements that may be needed to verify the crypto */ static guint8 *aSO_context = NULL; @@ -182,15 +182,15 @@ static guint32 iv_element_allocated = 0; #include "packet-c1222-ett.c" -static expert_field ei_c1222_command_truncated = EI_INIT; -static expert_field ei_c1222_bad_checksum = EI_INIT; -static expert_field ei_c1222_epsem_missing = EI_INIT; -static expert_field ei_c1222_epsem_failed_authentication = EI_INIT; -static expert_field ei_c1222_epsem_not_decrypted = EI_INIT; -static expert_field ei_c1222_ed_class_missing = EI_INIT; -static expert_field ei_c1222_epsem_ber_length_error = EI_INIT; -static expert_field ei_c1222_epsem_field_length_error = EI_INIT; -static expert_field ei_c1222_mac_missing = EI_INIT; +static expert_field ei_c1222_command_truncated; +static expert_field ei_c1222_bad_checksum; +static expert_field ei_c1222_epsem_missing; +static expert_field ei_c1222_epsem_failed_authentication; +static expert_field ei_c1222_epsem_not_decrypted; +static expert_field ei_c1222_ed_class_missing; +static expert_field ei_c1222_epsem_ber_length_error; +static expert_field ei_c1222_epsem_field_length_error; +static expert_field ei_c1222_mac_missing; /* Preferences */ static gboolean c1222_desegment = TRUE; diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c index cf36f5c2bb..884c0a8757 100644 --- a/epan/dissectors/asn1/camel/packet-camel-template.c +++ b/epan/dissectors/asn1/camel/packet-camel-template.c @@ -48,7 +48,7 @@ #define PFNAME "camel" /* Initialize the protocol and registered fields */ -static int proto_camel = -1; +static int proto_camel; int date_format = 1; /*assume european date format */ int camel_tap = -1; /* Global variables */ @@ -66,40 +66,40 @@ static struct camelsrt_info_t camelsrt_global_info[MAX_CAMEL_INSTANCE]; /* ROSE context */ static rose_ctx_t camel_rose_ctx; -static int hf_digit = -1; -static int hf_camel_extension_code_local = -1; -static int hf_camel_error_code_local = -1; -static int hf_camel_cause_indicator = -1; -static int hf_camel_PDPTypeNumber_etsi = -1; -static int hf_camel_PDPTypeNumber_ietf = -1; -static int hf_camel_PDPAddress_IPv4 = -1; -static int hf_camel_PDPAddress_IPv6 = -1; -static int hf_camel_cellGlobalIdOrServiceAreaIdFixedLength = -1; -static int hf_camel_RP_Cause = -1; -static int hf_camel_CAMEL_AChBillingChargingCharacteristics = -1; -static int hf_camel_CAMEL_FCIBillingChargingCharacteristics = -1; -static int hf_camel_CAMEL_FCIGPRSBillingChargingCharacteristics = -1; -static int hf_camel_CAMEL_FCISMSBillingChargingCharacteristics = -1; -static int hf_camel_CAMEL_SCIBillingChargingCharacteristics = -1; -static int hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics = -1; -static int hf_camel_CAMEL_CallResult = -1; +static int hf_digit; +static int hf_camel_extension_code_local; +static int hf_camel_error_code_local; +static int hf_camel_cause_indicator; +static int hf_camel_PDPTypeNumber_etsi; +static int hf_camel_PDPTypeNumber_ietf; +static int hf_camel_PDPAddress_IPv4; +static int hf_camel_PDPAddress_IPv6; +static int hf_camel_cellGlobalIdOrServiceAreaIdFixedLength; +static int hf_camel_RP_Cause; +static int hf_camel_CAMEL_AChBillingChargingCharacteristics; +static int hf_camel_CAMEL_FCIBillingChargingCharacteristics; +static int hf_camel_CAMEL_FCIGPRSBillingChargingCharacteristics; +static int hf_camel_CAMEL_FCISMSBillingChargingCharacteristics; +static int hf_camel_CAMEL_SCIBillingChargingCharacteristics; +static int hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics; +static int hf_camel_CAMEL_CallResult; /* Used by persistent data */ -static int hf_camelsrt_SessionId=-1; -//static int hf_camelsrt_RequestNumber=-1; -static int hf_camelsrt_Duplicate=-1; -static int hf_camelsrt_RequestFrame=-1; -static int hf_camelsrt_ResponseFrame=-1; -//static int hf_camelsrt_DeltaTime=-1; -//static int hf_camelsrt_SessionTime=-1; -static int hf_camelsrt_DeltaTime31=-1; -static int hf_camelsrt_DeltaTime75=-1; -static int hf_camelsrt_DeltaTime65=-1; -static int hf_camelsrt_DeltaTime22=-1; -static int hf_camelsrt_DeltaTime35=-1; -static int hf_camelsrt_DeltaTime80=-1; -static int hf_camel_timeandtimezone_time = -1; -static int hf_camel_timeandtimezone_tz = -1; +static int hf_camelsrt_SessionId; +//static int hf_camelsrt_RequestNumber; +static int hf_camelsrt_Duplicate; +static int hf_camelsrt_RequestFrame; +static int hf_camelsrt_ResponseFrame; +//static int hf_camelsrt_DeltaTime; +//static int hf_camelsrt_SessionTime; +static int hf_camelsrt_DeltaTime31; +static int hf_camelsrt_DeltaTime75; +static int hf_camelsrt_DeltaTime65; +static int hf_camelsrt_DeltaTime22; +static int hf_camelsrt_DeltaTime35; +static int hf_camelsrt_DeltaTime80; +static int hf_camel_timeandtimezone_time; +static int hf_camel_timeandtimezone_tz; #include "packet-camel-hf.c" @@ -121,36 +121,36 @@ static gboolean gcamel_DisplaySRT=FALSE; gboolean gcamel_StatSRT=FALSE; /* Initialize the subtree pointers */ -static gint ett_camel = -1; -static gint ett_camelisup_parameter = -1; -static gint ett_camel_AccessPointName = -1; -static gint ett_camel_pdptypenumber = -1; -static gint ett_camel_cause = -1; -static gint ett_camel_RPcause = -1; -static gint ett_camel_stat = -1; -static gint ett_camel_calledpartybcdnumber = -1; -static gint ett_camel_callingpartynumber = -1; -static gint ett_camel_originalcalledpartyid = -1; -static gint ett_camel_redirectingpartyid = -1; -static gint ett_camel_locationnumber = -1; -static gint ett_camel_additionalcallingpartynumber = -1; -static gint ett_camel_calledAddressValue = -1; -static gint ett_camel_callingAddressValue = -1; -static gint ett_camel_assistingSSPIPRoutingAddress = -1; -static gint ett_camel_correlationID = -1; -static gint ett_camel_dTMFDigitsCompleted = -1; -static gint ett_camel_dTMFDigitsTimeOut = -1; -static gint ett_camel_number = -1; -static gint ett_camel_digitsResponse = -1; -static gint ett_camel_timeandtimezone = -1; +static gint ett_camel; +static gint ett_camelisup_parameter; +static gint ett_camel_AccessPointName; +static gint ett_camel_pdptypenumber; +static gint ett_camel_cause; +static gint ett_camel_RPcause; +static gint ett_camel_stat; +static gint ett_camel_calledpartybcdnumber; +static gint ett_camel_callingpartynumber; +static gint ett_camel_originalcalledpartyid; +static gint ett_camel_redirectingpartyid; +static gint ett_camel_locationnumber; +static gint ett_camel_additionalcallingpartynumber; +static gint ett_camel_calledAddressValue; +static gint ett_camel_callingAddressValue; +static gint ett_camel_assistingSSPIPRoutingAddress; +static gint ett_camel_correlationID; +static gint ett_camel_dTMFDigitsCompleted; +static gint ett_camel_dTMFDigitsTimeOut; +static gint ett_camel_number; +static gint ett_camel_digitsResponse; +static gint ett_camel_timeandtimezone; #include "packet-camel-ett.c" -static expert_field ei_camel_unknown_invokeData = EI_INIT; -static expert_field ei_camel_unknown_returnResultData = EI_INIT; -static expert_field ei_camel_unknown_returnErrorData = EI_INIT; -static expert_field ei_camel_par_wrong_length = EI_INIT; -static expert_field ei_camel_bcd_not_digit = EI_INIT; +static expert_field ei_camel_unknown_invokeData; +static expert_field ei_camel_unknown_returnResultData; +static expert_field ei_camel_unknown_returnErrorData; +static expert_field ei_camel_par_wrong_length; +static expert_field ei_camel_bcd_not_digit; /* Preference settings default */ #define MAX_SSN 254 diff --git a/epan/dissectors/asn1/cbrs-oids/packet-cbrs-oids-template.c b/epan/dissectors/asn1/cbrs-oids/packet-cbrs-oids-template.c index 542c01e556..063591419c 100644 --- a/epan/dissectors/asn1/cbrs-oids/packet-cbrs-oids-template.c +++ b/epan/dissectors/asn1/cbrs-oids/packet-cbrs-oids-template.c @@ -31,9 +31,9 @@ void proto_register_cbrs_oids(void); void proto_reg_handoff_cbrs_oids(void); /* Initialize the protocol and registered fields */ -static int proto_cbrs_oids = -1; +static int proto_cbrs_oids; #include "packet-cbrs-oids-hf.c" -static int hf_cbrs_oids_UTF8String_PDU = -1; +static int hf_cbrs_oids_UTF8String_PDU; /* Initialize the subtree pointers */ #include "packet-cbrs-oids-fn.c" diff --git a/epan/dissectors/asn1/cdt/packet-cdt-template.c b/epan/dissectors/asn1/cdt/packet-cdt-template.c index 8cf27bbdbe..7820380c13 100644 --- a/epan/dissectors/asn1/cdt/packet-cdt-template.c +++ b/epan/dissectors/asn1/cdt/packet-cdt-template.c @@ -44,14 +44,14 @@ static proto_item *cdt_item = NULL; static guint32 content_type = 0; /* Initialize the protocol and registered fields */ -static int proto_cdt = -1; +static int proto_cdt; #include "packet-cdt-hf.c" /* Initialize the subtree pointers */ #include "packet-cdt-ett.c" -static expert_field ei_cdt_unable_compress_content = EI_INIT; -static expert_field ei_cdt_unable_uncompress_content = EI_INIT; +static expert_field ei_cdt_unable_compress_content; +static expert_field ei_cdt_unable_uncompress_content; #include "packet-cdt-fn.c" diff --git a/epan/dissectors/asn1/charging_ase/packet-charging_ase-template.c b/epan/dissectors/asn1/charging_ase/packet-charging_ase-template.c index 72d02b5099..780e1cadc5 100644 --- a/epan/dissectors/asn1/charging_ase/packet-charging_ase-template.c +++ b/epan/dissectors/asn1/charging_ase/packet-charging_ase-template.c @@ -26,14 +26,14 @@ void proto_register_charging_ase(void); void proto_reg_handoff_charging_ase(void); /* Define the Charging ASE proto */ -static int proto_charging_ase = -1; +static int proto_charging_ase; #include "packet-charging_ase-hf.c" -static int ett_charging_ase = -1; +static int ett_charging_ase; #include "packet-charging_ase-ett.c" -static expert_field ei_charging_ase_extensions_not_dissected = EI_INIT; +static expert_field ei_charging_ase_extensions_not_dissected; static dissector_handle_t charging_ase_handle; diff --git a/epan/dissectors/asn1/cmip/packet-cmip-template.c b/epan/dissectors/asn1/cmip/packet-cmip-template.c index dbac6c6b54..ec2dee8547 100644 --- a/epan/dissectors/asn1/cmip/packet-cmip-template.c +++ b/epan/dissectors/asn1/cmip/packet-cmip-template.c @@ -33,19 +33,19 @@ void proto_reg_handoff_cmip(void); #include "packet-pres.h" /* Initialize the protocol and registered fields */ -static int proto_cmip = -1; -static int hf_cmip_actionType_OID = -1; -static int hf_cmip_eventType_OID = -1; -static int hf_cmip_attributeId_OID = -1; -static int hf_cmip_errorId_OID = -1; +static int proto_cmip; +static int hf_cmip_actionType_OID; +static int hf_cmip_eventType_OID; +static int hf_cmip_attributeId_OID; +static int hf_cmip_errorId_OID; #include "packet-cmip-hf.c" /* Initialize the subtree pointers */ -static gint ett_cmip = -1; +static gint ett_cmip; #include "packet-cmip-ett.c" -static expert_field ei_wrong_spdu_type = EI_INIT; +static expert_field ei_wrong_spdu_type; static guint32 opcode; diff --git a/epan/dissectors/asn1/cmp/packet-cmp-template.c b/epan/dissectors/asn1/cmp/packet-cmp-template.c index 9874ed5a6f..c57bd6eb88 100644 --- a/epan/dissectors/asn1/cmp/packet-cmp-template.c +++ b/epan/dissectors/asn1/cmp/packet-cmp-template.c @@ -47,19 +47,19 @@ static guint cmp_alternate_http_port = 0; static guint cmp_alternate_tcp_style_http_port = 0; /* Initialize the protocol and registered fields */ -static int proto_cmp = -1; -static int hf_cmp_type_oid = -1; -static int hf_cmp_tcptrans_len = -1; -static int hf_cmp_tcptrans_type = -1; -static int hf_cmp_tcptrans_poll_ref = -1; -static int hf_cmp_tcptrans_next_poll_ref = -1; -static int hf_cmp_tcptrans_ttcb = -1; -static int hf_cmp_tcptrans10_version = -1; -static int hf_cmp_tcptrans10_flags = -1; +static int proto_cmp; +static int hf_cmp_type_oid; +static int hf_cmp_tcptrans_len; +static int hf_cmp_tcptrans_type; +static int hf_cmp_tcptrans_poll_ref; +static int hf_cmp_tcptrans_next_poll_ref; +static int hf_cmp_tcptrans_ttcb; +static int hf_cmp_tcptrans10_version; +static int hf_cmp_tcptrans10_flags; #include "packet-cmp-hf.c" /* Initialize the subtree pointers */ -static gint ett_cmp = -1; +static gint ett_cmp; #include "packet-cmp-ett.c" #include "packet-cmp-fn.c" diff --git a/epan/dissectors/asn1/cms/packet-cms-template.c b/epan/dissectors/asn1/cms/packet-cms-template.c index aca1ecb0f9..fb3b3a316f 100644 --- a/epan/dissectors/asn1/cms/packet-cms-template.c +++ b/epan/dissectors/asn1/cms/packet-cms-template.c @@ -35,12 +35,12 @@ void proto_register_cms(void); void proto_reg_handoff_cms(void); /* Initialize the protocol and registered fields */ -static int proto_cms = -1; -static int hf_cms_ci_contentType = -1; +static int proto_cms; +static int hf_cms_ci_contentType; #include "packet-cms-hf.c" /* Initialize the subtree pointers */ -static gint ett_cms = -1; +static gint ett_cms; #include "packet-cms-ett.c" static dissector_handle_t cms_handle = NULL; diff --git a/epan/dissectors/asn1/credssp/packet-credssp-template.c b/epan/dissectors/asn1/credssp/packet-credssp-template.c index 5eef574188..0d5ef3a1ed 100644 --- a/epan/dissectors/asn1/credssp/packet-credssp-template.c +++ b/epan/dissectors/asn1/credssp/packet-credssp-template.c @@ -45,7 +45,7 @@ static gint credssp_TS_RGC_package; static gint exported_pdu_tap = -1; /* Initialize the protocol and registered fields */ -static int proto_credssp = -1; +static int proto_credssp; /* List of dissectors to call for negoToken data */ static heur_dissector_list_t credssp_heur_subdissector_list; @@ -53,16 +53,16 @@ static heur_dissector_list_t credssp_heur_subdissector_list; static dissector_handle_t gssapi_handle; static dissector_handle_t gssapi_wrap_handle; -static int hf_credssp_TSPasswordCreds = -1; /* TSPasswordCreds */ -static int hf_credssp_TSSmartCardCreds = -1; /* TSSmartCardCreds */ -static int hf_credssp_TSRemoteGuardCreds = -1;/* TSRemoteGuardCreds */ -static int hf_credssp_TSCredentials = -1; /* TSCredentials */ -static int hf_credssp_decr_PublicKeyAuth = -1;/* decr_PublicKeyAuth */ +static int hf_credssp_TSPasswordCreds; /* TSPasswordCreds */ +static int hf_credssp_TSSmartCardCreds; /* TSSmartCardCreds */ +static int hf_credssp_TSRemoteGuardCreds;/* TSRemoteGuardCreds */ +static int hf_credssp_TSCredentials; /* TSCredentials */ +static int hf_credssp_decr_PublicKeyAuth;/* decr_PublicKeyAuth */ #include "packet-credssp-hf.c" /* Initialize the subtree pointers */ -static gint ett_credssp = -1; -static gint ett_credssp_RGC_CredBuffer = -1; +static gint ett_credssp; +static gint ett_credssp_RGC_CredBuffer; #include "packet-credssp-ett.c" diff --git a/epan/dissectors/asn1/crmf/packet-crmf-template.c b/epan/dissectors/asn1/crmf/packet-crmf-template.c index 682f8bd114..152ad46f2b 100644 --- a/epan/dissectors/asn1/crmf/packet-crmf-template.c +++ b/epan/dissectors/asn1/crmf/packet-crmf-template.c @@ -29,8 +29,8 @@ void proto_register_crmf(void); void proto_reg_handoff_crmf(void); /* Initialize the protocol and registered fields */ -static int proto_crmf = -1; -static int hf_crmf_type_oid = -1; +static int proto_crmf; +static int hf_crmf_type_oid; #include "packet-crmf-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/dap/packet-dap-template.c b/epan/dissectors/asn1/dap/packet-dap-template.c index c5884becd6..359ed0cebf 100644 --- a/epan/dissectors/asn1/dap/packet-dap-template.c +++ b/epan/dissectors/asn1/dap/packet-dap-template.c @@ -42,16 +42,16 @@ void proto_register_dap(void); void proto_reg_handoff_dap(void); /* Initialize the protocol and registered fields */ -static int proto_dap = -1; +static int proto_dap; #include "packet-dap-hf.c" /* Initialize the subtree pointers */ -static gint ett_dap = -1; +static gint ett_dap; #include "packet-dap-ett.c" -static expert_field ei_dap_anonymous = EI_INIT; +static expert_field ei_dap_anonymous; #include "packet-dap-val.h" diff --git a/epan/dissectors/asn1/disp/packet-disp-template.c b/epan/dissectors/asn1/disp/packet-disp-template.c index 9f221558ef..156d5e8c42 100644 --- a/epan/dissectors/asn1/disp/packet-disp-template.c +++ b/epan/dissectors/asn1/disp/packet-disp-template.c @@ -43,18 +43,18 @@ void proto_register_disp(void); void proto_reg_handoff_disp(void); /* Initialize the protocol and registered fields */ -static int proto_disp = -1; +static int proto_disp; #include "packet-disp-hf.c" /* Initialize the subtree pointers */ -static gint ett_disp = -1; +static gint ett_disp; #include "packet-disp-ett.c" -static expert_field ei_disp_unsupported_opcode = EI_INIT; -static expert_field ei_disp_unsupported_errcode = EI_INIT; -static expert_field ei_disp_unsupported_pdu = EI_INIT; -static expert_field ei_disp_zero_pdu = EI_INIT; +static expert_field ei_disp_unsupported_opcode; +static expert_field ei_disp_unsupported_errcode; +static expert_field ei_disp_unsupported_pdu; +static expert_field ei_disp_zero_pdu; static dissector_handle_t disp_handle = NULL; diff --git a/epan/dissectors/asn1/dop/packet-dop-template.c b/epan/dissectors/asn1/dop/packet-dop-template.c index 56de6bca20..8182586832 100644 --- a/epan/dissectors/asn1/dop/packet-dop-template.c +++ b/epan/dissectors/asn1/dop/packet-dop-template.c @@ -39,7 +39,7 @@ void proto_register_dop(void); void proto_reg_handoff_dop(void); /* Initialize the protocol and registered fields */ -static int proto_dop = -1; +static int proto_dop; static const char *binding_type = NULL; /* binding_type */ @@ -48,15 +48,15 @@ static int call_dop_oid_callback(const char *base_string, tvbuff_t *tvb, int off #include "packet-dop-hf.c" /* Initialize the subtree pointers */ -static gint ett_dop = -1; -static gint ett_dop_unknown = -1; +static gint ett_dop; +static gint ett_dop_unknown; #include "packet-dop-ett.c" -static expert_field ei_dop_unknown_binding_parameter = EI_INIT; -static expert_field ei_dop_unsupported_opcode = EI_INIT; -static expert_field ei_dop_unsupported_errcode = EI_INIT; -static expert_field ei_dop_unsupported_pdu = EI_INIT; -static expert_field ei_dop_zero_pdu = EI_INIT; +static expert_field ei_dop_unknown_binding_parameter; +static expert_field ei_dop_unsupported_opcode; +static expert_field ei_dop_unsupported_errcode; +static expert_field ei_dop_unsupported_pdu; +static expert_field ei_dop_zero_pdu; static dissector_handle_t dop_handle = NULL; diff --git a/epan/dissectors/asn1/dsp/packet-dsp-template.c b/epan/dissectors/asn1/dsp/packet-dsp-template.c index 46fea89c5a..e47133ecf0 100644 --- a/epan/dissectors/asn1/dsp/packet-dsp-template.c +++ b/epan/dissectors/asn1/dsp/packet-dsp-template.c @@ -37,18 +37,18 @@ void proto_register_dsp(void); void proto_reg_handoff_dsp(void); /* Initialize the protocol and registered fields */ -static int proto_dsp = -1; +static int proto_dsp; #include "packet-dsp-hf.c" /* Initialize the subtree pointers */ -static gint ett_dsp = -1; +static gint ett_dsp; #include "packet-dsp-ett.c" -static expert_field ei_dsp_unsupported_opcode = EI_INIT; -static expert_field ei_dsp_unsupported_errcode = EI_INIT; -static expert_field ei_dsp_unsupported_pdu = EI_INIT; -static expert_field ei_dsp_zero_pdu = EI_INIT; +static expert_field ei_dsp_unsupported_opcode; +static expert_field ei_dsp_unsupported_errcode; +static expert_field ei_dsp_unsupported_pdu; +static expert_field ei_dsp_zero_pdu; #include "packet-dsp-fn.c" diff --git a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c index 0a3a0ff34e..831b63acb2 100644 --- a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c +++ b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c @@ -38,35 +38,35 @@ void proto_reg_handoff_e1ap(void); #include "packet-e1ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_e1ap = -1; - -static int hf_e1ap_transportLayerAddressIPv4 = -1; -static int hf_e1ap_transportLayerAddressIPv6 = -1; -static int hf_e1ap_InterfacesToTrace_NG_C = -1; -static int hf_e1ap_InterfacesToTrace_Xn_C = -1; -static int hf_e1ap_InterfacesToTrace_Uu = -1; -static int hf_e1ap_InterfacesToTrace_F1_C = -1; -static int hf_e1ap_InterfacesToTrace_E1 = -1; -static int hf_e1ap_InterfacesToTrace_Reserved = -1; -static int hf_e1ap_MeasurementsToActivate_Reserved1 = -1; -static int hf_e1ap_MeasurementsToActivate_M4 = -1; -static int hf_e1ap_MeasurementsToActivate_Reserved2 = -1; -static int hf_e1ap_MeasurementsToActivate_M6 = -1; -static int hf_e1ap_MeasurementsToActivate_M7 = -1; -static int hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic = -1; -static int hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic = -1; -static int hf_e1ap_ReportCharacteristics_Reserved = -1; -static int hf_e1ap_tcp_pdu_len = -1; +static int proto_e1ap; + +static int hf_e1ap_transportLayerAddressIPv4; +static int hf_e1ap_transportLayerAddressIPv6; +static int hf_e1ap_InterfacesToTrace_NG_C; +static int hf_e1ap_InterfacesToTrace_Xn_C; +static int hf_e1ap_InterfacesToTrace_Uu; +static int hf_e1ap_InterfacesToTrace_F1_C; +static int hf_e1ap_InterfacesToTrace_E1; +static int hf_e1ap_InterfacesToTrace_Reserved; +static int hf_e1ap_MeasurementsToActivate_Reserved1; +static int hf_e1ap_MeasurementsToActivate_M4; +static int hf_e1ap_MeasurementsToActivate_Reserved2; +static int hf_e1ap_MeasurementsToActivate_M6; +static int hf_e1ap_MeasurementsToActivate_M7; +static int hf_e1ap_ReportCharacteristics_TNLAvailableCapacityIndPeriodic; +static int hf_e1ap_ReportCharacteristics_HWCapacityIndPeriodic; +static int hf_e1ap_ReportCharacteristics_Reserved; +static int hf_e1ap_tcp_pdu_len; #include "packet-e1ap-hf.c" /* Initialize the subtree pointers */ -static gint ett_e1ap = -1; -static gint ett_e1ap_PLMN_Identity = -1; -static gint ett_e1ap_TransportLayerAddress = -1; -static gint ett_e1ap_InterfacesToTrace = -1; -static gint ett_e1ap_MeasurementsToActivate = -1; -static gint ett_e1ap_ReportCharacteristics = -1; -static gint ett_e1ap_BurstArrivalTime = -1; +static gint ett_e1ap; +static gint ett_e1ap_PLMN_Identity; +static gint ett_e1ap_TransportLayerAddress; +static gint ett_e1ap_InterfacesToTrace; +static gint ett_e1ap_MeasurementsToActivate; +static gint ett_e1ap_ReportCharacteristics; +static gint ett_e1ap_BurstArrivalTime; #include "packet-e1ap-ett.c" enum{ diff --git a/epan/dissectors/asn1/e2ap/packet-e2ap-template.c b/epan/dissectors/asn1/e2ap/packet-e2ap-template.c index 709469f615..1ac9e0ad71 100644 --- a/epan/dissectors/asn1/e2ap/packet-e2ap-template.c +++ b/epan/dissectors/asn1/e2ap/packet-e2ap-template.c @@ -43,26 +43,26 @@ static dissector_handle_t e2ap_handle; #include "packet-e2ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_e2ap = -1; +static int proto_e2ap; #include "packet-e2ap-hf.c" -static int hf_e2ap_unmapped_ran_function_id = -1; -static int hf_e2ap_ran_function_name_not_recognised = -1; -static int hf_e2ap_ran_function_setup_frame = -1; +static int hf_e2ap_unmapped_ran_function_id; +static int hf_e2ap_ran_function_name_not_recognised; +static int hf_e2ap_ran_function_setup_frame; -static int hf_e2ap_dissector_version= -1; -static int hf_e2ap_frame_version = -1; +static int hf_e2ap_dissector_version; +static int hf_e2ap_frame_version; -static int hf_e2ap_timestamp_string = -1; +static int hf_e2ap_timestamp_string; /* Initialize the subtree pointers */ -static gint ett_e2ap = -1; +static gint ett_e2ap; -static expert_field ei_e2ap_ran_function_names_no_match = EI_INIT; -static expert_field ei_e2ap_ran_function_id_not_mapped = EI_INIT; -static expert_field ei_e2ap_ran_function_dissector_mismatch = EI_INIT; -static expert_field ei_e2ap_ran_function_max_dissectors_registered = EI_INIT; +static expert_field ei_e2ap_ran_function_names_no_match; +static expert_field ei_e2ap_ran_function_id_not_mapped; +static expert_field ei_e2ap_ran_function_dissector_mismatch; +static expert_field ei_e2ap_ran_function_max_dissectors_registered; #include "packet-e2ap-ett.c" diff --git a/epan/dissectors/asn1/ess/packet-ess-template.c b/epan/dissectors/asn1/ess/packet-ess-template.c index c8d579f9c5..63e9abef0c 100644 --- a/epan/dissectors/asn1/ess/packet-ess-template.c +++ b/epan/dissectors/asn1/ess/packet-ess-template.c @@ -41,11 +41,11 @@ static ess_category_attributes_t *ess_category_attributes; static guint num_ess_category_attributes; /* Initialize the protocol and registered fields */ -static int proto_ess = -1; -static int hf_ess_SecurityCategory_type_OID = -1; -static int hf_ess_Category_attribute = -1; +static int proto_ess; +static int hf_ess_SecurityCategory_type_OID; +static int hf_ess_Category_attribute; -static gint ett_Category_attributes = -1; +static gint ett_Category_attributes; #include "packet-ess-hf.c" diff --git a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c index bc4e9b1e00..ac3d6f1fe1 100644 --- a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c +++ b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c @@ -41,114 +41,114 @@ void proto_reg_handoff_f1ap(void); #include "packet-f1ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_f1ap = -1; - -static int hf_f1ap_transportLayerAddressIPv4 = -1; -static int hf_f1ap_transportLayerAddressIPv6 = -1; -static int hf_f1ap_IABTNLAddressIPv4 = -1; -static int hf_f1ap_IABTNLAddressIPv6 = -1; -static int hf_f1ap_IABTNLAddressIPv6Prefix = -1; -static int hf_f1ap_interfacesToTrace_NG_C = -1; -static int hf_f1ap_interfacesToTrace_Xn_C = -1; -static int hf_f1ap_interfacesToTrace_Uu = -1; -static int hf_f1ap_interfacesToTrace_F1_C = -1; -static int hf_f1ap_interfacesToTrace_E1 = -1; -static int hf_f1ap_interfacesToTrace_Reserved = -1; -static int hf_f1ap_MeasurementsToActivate_Reserved1 = -1; -static int hf_f1ap_MeasurementsToActivate_M2 = -1; -static int hf_f1ap_MeasurementsToActivate_Reserved2 = -1; -static int hf_f1ap_MeasurementsToActivate_M5 = -1; -static int hf_f1ap_MeasurementsToActivate_Reserved3 = -1; -static int hf_f1ap_MeasurementsToActivate_M6 = -1; -static int hf_f1ap_MeasurementsToActivate_M7 = -1; -static int hf_f1ap_ReportCharacteristics_PRBPeriodic = -1; -static int hf_f1ap_ReportCharacteristics_TNLCapacityIndPeriodic = -1; -static int hf_f1ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; -static int hf_f1ap_ReportCharacteristics_HWLoadIndPeriodic = -1; -static int hf_f1ap_ReportCharacteristics_NumberOfActiveUEs = -1; -static int hf_f1ap_ReportCharacteristics_Reserved = -1; +static int proto_f1ap; + +static int hf_f1ap_transportLayerAddressIPv4; +static int hf_f1ap_transportLayerAddressIPv6; +static int hf_f1ap_IABTNLAddressIPv4; +static int hf_f1ap_IABTNLAddressIPv6; +static int hf_f1ap_IABTNLAddressIPv6Prefix; +static int hf_f1ap_interfacesToTrace_NG_C; +static int hf_f1ap_interfacesToTrace_Xn_C; +static int hf_f1ap_interfacesToTrace_Uu; +static int hf_f1ap_interfacesToTrace_F1_C; +static int hf_f1ap_interfacesToTrace_E1; +static int hf_f1ap_interfacesToTrace_Reserved; +static int hf_f1ap_MeasurementsToActivate_Reserved1; +static int hf_f1ap_MeasurementsToActivate_M2; +static int hf_f1ap_MeasurementsToActivate_Reserved2; +static int hf_f1ap_MeasurementsToActivate_M5; +static int hf_f1ap_MeasurementsToActivate_Reserved3; +static int hf_f1ap_MeasurementsToActivate_M6; +static int hf_f1ap_MeasurementsToActivate_M7; +static int hf_f1ap_ReportCharacteristics_PRBPeriodic; +static int hf_f1ap_ReportCharacteristics_TNLCapacityIndPeriodic; +static int hf_f1ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic; +static int hf_f1ap_ReportCharacteristics_HWLoadIndPeriodic; +static int hf_f1ap_ReportCharacteristics_NumberOfActiveUEs; +static int hf_f1ap_ReportCharacteristics_Reserved; #include "packet-f1ap-hf.c" /* Initialize the subtree pointers */ -static gint ett_f1ap = -1; -static gint ett_f1ap_ResourceCoordinationTransferContainer = -1; -static gint ett_f1ap_PLMN_Identity = -1; -static gint ett_f1ap_MIB_message = -1; -static gint ett_f1ap_SIB1_message = -1; -static gint ett_f1ap_CG_ConfigInfo = -1; -static gint ett_f1ap_CellGroupConfig = -1; -static gint ett_f1ap_TransportLayerAddress = -1; -static gint ett_f1ap_UE_CapabilityRAT_ContainerList = -1; -static gint ett_f1ap_measurementTimingConfiguration = -1; -static gint ett_f1ap_DUtoCURRCContainer = -1; -static gint ett_f1ap_requestedP_MaxFR1 = -1; -static gint ett_f1ap_HandoverPreparationInformation = -1; -static gint ett_f1ap_MeasConfig = -1; -static gint ett_f1ap_MeasGapConfig = -1; -static gint ett_f1ap_MeasGapSharingConfig = -1; -static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container = -1; -static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container = -1; -static gint ett_f1ap_ProtectedEUTRAResourceIndication = -1; -static gint ett_f1ap_RRCContainer = -1; -static gint ett_f1ap_RRCContainer_RRCSetupComplete = -1; -static gint ett_f1ap_sIBmessage = -1; -static gint ett_f1ap_UplinkTxDirectCurrentListInformation = -1; -static gint ett_f1ap_DRX_Config = -1; -static gint ett_f1ap_Ph_InfoSCG = -1; -static gint ett_f1ap_RequestedBandCombinationIndex = -1; -static gint ett_f1ap_RequestedFeatureSetEntryIndex = -1; -static gint ett_f1ap_RequestedP_MaxFR2 = -1; -static gint ett_f1ap_UEAssistanceInformation = -1; -static gint ett_f1ap_CG_Config = -1; -static gint ett_f1ap_Ph_InfoMCG = -1; -static gint ett_f1ap_BurstArrivalTime = -1; -static gint ett_f1ap_cSI_RS_Configuration = -1; -static gint ett_f1ap_sR_Configuration = -1; -static gint ett_f1ap_pDCCH_ConfigSIB1 = -1; -static gint ett_f1ap_sCS_Common = -1; -static gint ett_f1ap_IABTNLAddressIPv4Address = -1; -static gint ett_f1ap_IABTNLAddressIPv6Address = -1; -static gint ett_f1ap_IABTNLAddressIPv6Prefix = -1; -static gint ett_f1ap_InterfacesToTrace = -1; -static gint ett_f1ap_MeasurementsToActivate = -1; -static gint ett_f1ap_NRUERLFReportContainer = -1; -static gint ett_f1ap_RACH_Config_Common = -1; -static gint ett_f1ap_RACH_Config_Common_IAB = -1; -static gint ett_f1ap_RACHReportContainer = -1; -static gint ett_f1ap_ReferenceTime = -1; -static gint ett_f1ap_ReportCharacteristics = -1; -static gint ett_f1ap_SIB10_message = -1; -static gint ett_f1ap_SIB12_message = -1; -static gint ett_f1ap_SIB13_message = -1; -static gint ett_f1ap_SIB14_message = -1; -static gint ett_f1ap_SIB15_message = -1; -static gint ett_f1ap_SIB17_message = -1; -static gint ett_f1ap_SIB20_message = -1; -static gint ett_f1ap_SL_PHY_MAC_RLC_Config = -1; -static gint ett_f1ap_SL_RLC_ChannelToAddModList = -1; -static gint ett_f1ap_SL_ConfigDedicatedEUTRA_Info = -1; -static gint ett_f1ap_TDD_UL_DLConfigCommonNR = -1; -static gint ett_f1ap_UEAssistanceInformationEUTRA = -1; -static gint ett_f1ap_PosAssistance_Information = -1; -static gint ett_f1ap_LocationMeasurementInformation = -1; -static gint ett_f1ap_MUSIM_GapConfig = -1; -static gint ett_f1ap_SDT_MAC_PHY_CG_Config = -1; -static gint ett_f1ap_SDTRLCBearerConfiguration = -1; -static gint ett_f1ap_MBSInterestIndication = -1; -static gint ett_f1ap_NeedForGapsInfoNR = -1; -static gint ett_f1ap_NeedForGapNCSGInfoNR = -1; -static gint ett_f1ap_NeedForGapNCSGInfoEUTRA = -1; -static gint ett_f1ap_MBS_Broadcast_NeighbourCellList = -1; -static gint ett_f1ap_mRB_PDCP_Config_Broadcast = -1; -static gint ett_f1ap_posMeasGapPreConfigToAddModList = -1; -static gint ett_f1ap_posMeasGapPreConfigToReleaseList = -1; -static gint ett_f1ap_SidelinkConfigurationContainer = -1; -static gint ett_f1ap_SRSPosRRCInactiveConfig = -1; -static gint ett_f1ap_successfulHOReportContainer = -1; -static gint ett_f1ap_UL_GapFR2_Config = -1; -static gint ett_f1ap_ConfigRestrictInfoDAPS = -1; -static gint ett_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo = -1; -static gint ett_f1ap_Ncd_SSB_RedCapInitialBWP_SDT = -1; +static gint ett_f1ap; +static gint ett_f1ap_ResourceCoordinationTransferContainer; +static gint ett_f1ap_PLMN_Identity; +static gint ett_f1ap_MIB_message; +static gint ett_f1ap_SIB1_message; +static gint ett_f1ap_CG_ConfigInfo; +static gint ett_f1ap_CellGroupConfig; +static gint ett_f1ap_TransportLayerAddress; +static gint ett_f1ap_UE_CapabilityRAT_ContainerList; +static gint ett_f1ap_measurementTimingConfiguration; +static gint ett_f1ap_DUtoCURRCContainer; +static gint ett_f1ap_requestedP_MaxFR1; +static gint ett_f1ap_HandoverPreparationInformation; +static gint ett_f1ap_MeasConfig; +static gint ett_f1ap_MeasGapConfig; +static gint ett_f1ap_MeasGapSharingConfig; +static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReq_Container; +static gint ett_f1ap_EUTRA_NR_CellResourceCoordinationReqAck_Container; +static gint ett_f1ap_ProtectedEUTRAResourceIndication; +static gint ett_f1ap_RRCContainer; +static gint ett_f1ap_RRCContainer_RRCSetupComplete; +static gint ett_f1ap_sIBmessage; +static gint ett_f1ap_UplinkTxDirectCurrentListInformation; +static gint ett_f1ap_DRX_Config; +static gint ett_f1ap_Ph_InfoSCG; +static gint ett_f1ap_RequestedBandCombinationIndex; +static gint ett_f1ap_RequestedFeatureSetEntryIndex; +static gint ett_f1ap_RequestedP_MaxFR2; +static gint ett_f1ap_UEAssistanceInformation; +static gint ett_f1ap_CG_Config; +static gint ett_f1ap_Ph_InfoMCG; +static gint ett_f1ap_BurstArrivalTime; +static gint ett_f1ap_cSI_RS_Configuration; +static gint ett_f1ap_sR_Configuration; +static gint ett_f1ap_pDCCH_ConfigSIB1; +static gint ett_f1ap_sCS_Common; +static gint ett_f1ap_IABTNLAddressIPv4Address; +static gint ett_f1ap_IABTNLAddressIPv6Address; +static gint ett_f1ap_IABTNLAddressIPv6Prefix; +static gint ett_f1ap_InterfacesToTrace; +static gint ett_f1ap_MeasurementsToActivate; +static gint ett_f1ap_NRUERLFReportContainer; +static gint ett_f1ap_RACH_Config_Common; +static gint ett_f1ap_RACH_Config_Common_IAB; +static gint ett_f1ap_RACHReportContainer; +static gint ett_f1ap_ReferenceTime; +static gint ett_f1ap_ReportCharacteristics; +static gint ett_f1ap_SIB10_message; +static gint ett_f1ap_SIB12_message; +static gint ett_f1ap_SIB13_message; +static gint ett_f1ap_SIB14_message; +static gint ett_f1ap_SIB15_message; +static gint ett_f1ap_SIB17_message; +static gint ett_f1ap_SIB20_message; +static gint ett_f1ap_SL_PHY_MAC_RLC_Config; +static gint ett_f1ap_SL_RLC_ChannelToAddModList; +static gint ett_f1ap_SL_ConfigDedicatedEUTRA_Info; +static gint ett_f1ap_TDD_UL_DLConfigCommonNR; +static gint ett_f1ap_UEAssistanceInformationEUTRA; +static gint ett_f1ap_PosAssistance_Information; +static gint ett_f1ap_LocationMeasurementInformation; +static gint ett_f1ap_MUSIM_GapConfig; +static gint ett_f1ap_SDT_MAC_PHY_CG_Config; +static gint ett_f1ap_SDTRLCBearerConfiguration; +static gint ett_f1ap_MBSInterestIndication; +static gint ett_f1ap_NeedForGapsInfoNR; +static gint ett_f1ap_NeedForGapNCSGInfoNR; +static gint ett_f1ap_NeedForGapNCSGInfoEUTRA; +static gint ett_f1ap_MBS_Broadcast_NeighbourCellList; +static gint ett_f1ap_mRB_PDCP_Config_Broadcast; +static gint ett_f1ap_posMeasGapPreConfigToAddModList; +static gint ett_f1ap_posMeasGapPreConfigToReleaseList; +static gint ett_f1ap_SidelinkConfigurationContainer; +static gint ett_f1ap_SRSPosRRCInactiveConfig; +static gint ett_f1ap_successfulHOReportContainer; +static gint ett_f1ap_UL_GapFR2_Config; +static gint ett_f1ap_ConfigRestrictInfoDAPS; +static gint ett_f1ap_UplinkTxDirectCurrentTwoCarrierListInfo; +static gint ett_f1ap_Ncd_SSB_RedCapInitialBWP_SDT; #include "packet-f1ap-ett.c" enum{ diff --git a/epan/dissectors/asn1/ftam/packet-ftam-template.c b/epan/dissectors/asn1/ftam/packet-ftam-template.c index 5d88c6fefd..30917702fa 100644 --- a/epan/dissectors/asn1/ftam/packet-ftam-template.c +++ b/epan/dissectors/asn1/ftam/packet-ftam-template.c @@ -33,20 +33,20 @@ void proto_register_ftam(void); void proto_reg_handoff_ftam(void); /* Initialize the protocol and registered fields */ -static int proto_ftam = -1; +static int proto_ftam; /* Declare the function to avoid a compiler warning */ static int dissect_ftam_OR_Set(bool implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); -static int hf_ftam_unstructured_text = -1; /* ISO FTAM unstructured text */ -static int hf_ftam_unstructured_binary = -1; /* ISO FTAM unstructured binary */ +static int hf_ftam_unstructured_text; /* ISO FTAM unstructured text */ +static int hf_ftam_unstructured_binary; /* ISO FTAM unstructured binary */ #include "packet-ftam-hf.c" /* Initialize the subtree pointers */ -static gint ett_ftam = -1; +static gint ett_ftam; #include "packet-ftam-ett.c" -static expert_field ei_ftam_zero_pdu = EI_INIT; +static expert_field ei_ftam_zero_pdu; #include "packet-ftam-fn.c" diff --git a/epan/dissectors/asn1/gdt/packet-gdt-template.c b/epan/dissectors/asn1/gdt/packet-gdt-template.c index 7c21c83cc9..700ac5763c 100644 --- a/epan/dissectors/asn1/gdt/packet-gdt-template.c +++ b/epan/dissectors/asn1/gdt/packet-gdt-template.c @@ -28,13 +28,13 @@ #define PFNAME "gdt" /* Initialize the protocol and registered fields */ -static int proto_gdt = -1; +static int proto_gdt; static dissector_handle_t gdt_handle = NULL; #include "packet-gdt-hf.c" /* Initialize the subtree pointers */ -static int ett_gdt = -1; +static int ett_gdt; #include "packet-gdt-ett.c" #include "packet-gdt-fn.c" diff --git a/epan/dissectors/asn1/glow/packet-glow-template.c b/epan/dissectors/asn1/glow/packet-glow-template.c index af6f16fb20..fea6429d40 100644 --- a/epan/dissectors/asn1/glow/packet-glow-template.c +++ b/epan/dissectors/asn1/glow/packet-glow-template.c @@ -22,12 +22,12 @@ void proto_register_glow(void); static dissector_handle_t glow_handle=NULL; -static int proto_glow = -1; +static int proto_glow; #include "packet-glow-hf.c" /* Initialize the subtree pointers */ -static int ett_glow = -1; +static int ett_glow; #include "packet-glow-ett.c" diff --git a/epan/dissectors/asn1/goose/goose.cnf b/epan/dissectors/asn1/goose/goose.cnf index b0c84ffe81..aee647c50d 100644 --- a/epan/dissectors/asn1/goose/goose.cnf +++ b/epan/dissectors/asn1/goose/goose.cnf @@ -41,7 +41,7 @@ GOOSEpdu if(len != 8) { proto_tree_add_expert(tree, actx->pinfo, &ei_goose_mal_utctime, tvb, offset, len); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, "????"); } @@ -57,7 +57,7 @@ GOOSEpdu ptime = abs_time_to_str(actx->pinfo->pool, &ts, ABSOLUTE_TIME_UTC, TRUE); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, ptime); } diff --git a/epan/dissectors/asn1/goose/packet-goose-template.c b/epan/dissectors/asn1/goose/packet-goose-template.c index cc4f3af2b5..e034e88a51 100644 --- a/epan/dissectors/asn1/goose/packet-goose-template.c +++ b/epan/dissectors/asn1/goose/packet-goose-template.c @@ -34,40 +34,40 @@ void proto_register_goose(void); void proto_reg_handoff_goose(void); /* Initialize the protocol and registered fields */ -static int proto_goose = -1; -static int proto_r_goose = -1; - -static int hf_goose_session_header = -1; -static int hf_goose_spdu_id = -1; -static int hf_goose_session_hdr_length = -1; -static int hf_goose_hdr_length = -1; -static int hf_goose_content_id = -1; -static int hf_goose_spdu_lenth = -1; -static int hf_goose_spdu_num = -1; -static int hf_goose_version = -1; -static int hf_goose_security_info = -1; -static int hf_goose_current_key_t = -1; -static int hf_goose_next_key_t = -1; -static int hf_goose_key_id = -1; -static int hf_goose_init_vec_length = -1; -static int hf_goose_init_vec = -1; -static int hf_goose_session_user_info = -1; -static int hf_goose_payload = -1; -static int hf_goose_payload_length = -1; -static int hf_goose_apdu_tag = -1; -static int hf_goose_apdu_simulation = -1; -static int hf_goose_apdu_appid = -1; -static int hf_goose_apdu_length = -1; -static int hf_goose_padding_tag = -1; -static int hf_goose_padding_length = -1; -static int hf_goose_padding = -1; -static int hf_goose_hmac = -1; -static int hf_goose_appid = -1; -static int hf_goose_length = -1; -static int hf_goose_reserve1 = -1; -static int hf_goose_reserve1_s_bit = -1; -static int hf_goose_reserve2 = -1; -static int hf_goose_float_value = -1; +static int proto_goose; +static int proto_r_goose; + +static int hf_goose_session_header; +static int hf_goose_spdu_id; +static int hf_goose_session_hdr_length; +static int hf_goose_hdr_length; +static int hf_goose_content_id; +static int hf_goose_spdu_lenth; +static int hf_goose_spdu_num; +static int hf_goose_version; +static int hf_goose_security_info; +static int hf_goose_current_key_t; +static int hf_goose_next_key_t; +static int hf_goose_key_id; +static int hf_goose_init_vec_length; +static int hf_goose_init_vec; +static int hf_goose_session_user_info; +static int hf_goose_payload; +static int hf_goose_payload_length; +static int hf_goose_apdu_tag; +static int hf_goose_apdu_simulation; +static int hf_goose_apdu_appid; +static int hf_goose_apdu_length; +static int hf_goose_padding_tag; +static int hf_goose_padding_length; +static int hf_goose_padding; +static int hf_goose_hmac; +static int hf_goose_appid; +static int hf_goose_length; +static int hf_goose_reserve1; +static int hf_goose_reserve1_s_bit; +static int hf_goose_reserve2; +static int hf_goose_float_value; /* Bit fields in the Reserved fields */ @@ -79,9 +79,9 @@ typedef struct _goose_chk_data{ }goose_chk_data_t; #define GOOSE_CHK_DATA_LEN (sizeof(goose_chk_data_t)) -static expert_field ei_goose_mal_utctime = EI_INIT; -static expert_field ei_goose_zero_pdu = EI_INIT; -static expert_field ei_goose_invalid_sim = EI_INIT; +static expert_field ei_goose_mal_utctime; +static expert_field ei_goose_zero_pdu; +static expert_field ei_goose_invalid_sim; #define SINGLE_FLOAT_EXP_BITS 8 #define FLOAT_ENC_LENGTH 5 @@ -89,15 +89,15 @@ static expert_field ei_goose_invalid_sim = EI_INIT; #include "packet-goose-hf.c" /* Initialize the subtree pointers */ -static int ett_r_goose = -1; -static int ett_session_header = -1; -static int ett_security_info = -1; -static int ett_session_user_info = -1; -static int ett_payload = -1; -static int ett_padding = -1; -static int ett_goose = -1; -static int ett_reserve1 = -1; -static int ett_expert_inf_sim = -1; +static int ett_r_goose; +static int ett_session_header; +static int ett_security_info; +static int ett_session_user_info; +static int ett_payload; +static int ett_padding; +static int ett_goose; +static int ett_reserve1; +static int ett_expert_inf_sim; #include "packet-goose-ett.c" diff --git a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c index 160114f423..595bebd653 100644 --- a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c +++ b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c @@ -33,21 +33,21 @@ void proto_register_gprscdr(void); /* Define the GPRS CDR proto */ -static int proto_gprscdr = -1; +static int proto_gprscdr; #include "packet-gprscdr-hf.c" -static int ett_gprscdr = -1; -static int ett_gprscdr_timestamp = -1; -static int ett_gprscdr_plmn_id = -1; -static int ett_gprscdr_pdp_pdn_type = -1; -static int ett_gprscdr_eps_qos_arp = -1; -static int ett_gprscdr_managementextension_information = -1; -static int ett_gprscdr_userlocationinformation = -1; +static int ett_gprscdr; +static int ett_gprscdr_timestamp; +static int ett_gprscdr_plmn_id; +static int ett_gprscdr_pdp_pdn_type; +static int ett_gprscdr_eps_qos_arp; +static int ett_gprscdr_managementextension_information; +static int ett_gprscdr_userlocationinformation; #include "packet-gprscdr-ett.c" -static expert_field ei_gprscdr_not_dissected = EI_INIT; -static expert_field ei_gprscdr_choice_not_found = EI_INIT; +static expert_field ei_gprscdr_not_dissected; +static expert_field ei_gprscdr_choice_not_found; /* Global variables */ static const char *obj_id = NULL; diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c index c5c0625918..7c4868a374 100644 --- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c +++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c @@ -66,132 +66,132 @@ void proto_register_gsm_map(void); void proto_reg_handoff_gsm_map(void); /* Initialize the protocol and registered fields */ -static int proto_gsm_map = -1; -static int proto_gsm_map_dialogue = -1; -static int proto_gsm_map_ms = -1; - -static int hf_gsm_map_old_Component_PDU = -1; -static int hf_gsm_map_getPassword = -1; -static int hf_gsm_map_currentPassword = -1; -static int hf_gsm_map_extension = -1; -static int hf_gsm_map_nature_of_number = -1; -static int hf_gsm_map_number_plan = -1; -static int hf_gsm_map_address_digits = -1; -static int hf_gsm_map_TBCD_digits = -1; -static int hf_gsm_map_Ss_Status_unused = -1; -static int hf_gsm_map_Ss_Status_q_bit = -1; -static int hf_gsm_map_Ss_Status_p_bit = -1; -static int hf_gsm_map_Ss_Status_r_bit = -1; -static int hf_gsm_map_Ss_Status_a_bit = -1; -static int hf_gsm_map_notification_to_forwarding_party = -1; -static int hf_gsm_map_redirecting_presentation = -1; -static int hf_gsm_map_notification_to_calling_party = -1; -static int hf_gsm_map_forwarding_reason = -1; -static int hf_gsm_map_pdp_type_org = -1; -static int hf_gsm_map_etsi_pdp_type_number = -1; -static int hf_gsm_map_ietf_pdp_type_number = -1; -static int hf_gsm_map_ext_qos_subscribed_pri = -1; - -static int hf_gsm_map_qos_traffic_cls = -1; -static int hf_gsm_map_qos_del_order = -1; -static int hf_gsm_map_qos_del_of_err_sdu = -1; -static int hf_gsm_map_qos_ber = -1; -static int hf_gsm_map_qos_sdu_err_rat = -1; -static int hf_gsm_map_qos_traff_hdl_pri = -1; -static int hf_gsm_map_qos_max_sdu = -1; -static int hf_gsm_map_max_brate_ulink = -1; -static int hf_gsm_map_max_brate_dlink = -1; -static int hf_gsm_map_qos_transfer_delay = -1; -static int hf_gsm_map_guaranteed_max_brate_ulink = -1; -static int hf_gsm_map_guaranteed_max_brate_dlink = -1; -static int hf_gsm_map_GSNAddress_IPv4 = -1; -static int hf_gsm_map_GSNAddress_IPv6 = -1; -static int hf_gsm_map_ranap_service_Handover = -1; -static int hf_gsm_map_IntegrityProtectionInformation = -1; -static int hf_gsm_map_EncryptionInformation = -1; -static int hf_gsm_map_ss_SS_UserData = -1; -static int hf_gsm_map_cbs_coding_grp = -1; -static int hf_gsm_map_cbs_coding_grp0_lang = -1; -static int hf_gsm_map_cbs_coding_grp1_lang = -1; -static int hf_gsm_map_cbs_coding_grp2_lang = -1; -static int hf_gsm_map_cbs_coding_grp3_lang = -1; -static int hf_gsm_map_cbs_coding_grp4_7_comp = -1; -static int hf_gsm_map_cbs_coding_grp4_7_class_ind = -1; -static int hf_gsm_map_cbs_coding_grp4_7_char_set = -1; -static int hf_gsm_map_cbs_coding_grp4_7_class = -1; -static int hf_gsm_map_cbs_coding_grp15_mess_code = -1; -static int hf_gsm_map_cbs_coding_grp15_class = -1; -static int hf_gsm_map_ie_tag = -1; -static int hf_gsm_map_len = -1; -static int hf_gsm_map_disc_par = -1; -static int hf_gsm_map_dlci = -1; -static int hf_gsm_apn_str = -1; -static int hf_gsm_map_ericsson_locationInformation_rat = -1; -static int hf_gsm_map_ericsson_locationInformation_lac = -1; -static int hf_gsm_map_ericsson_locationInformation_ci = -1; -static int hf_gsm_map_ericsson_locationInformation_sac = -1; -static int hf_gsm_map_ussd_string = -1; -static int hf_gsm_map_spare_bits = -1; -static int hf_gsm_map_qos_signalling_ind = -1; +static int proto_gsm_map; +static int proto_gsm_map_dialogue; +static int proto_gsm_map_ms; + +static int hf_gsm_map_old_Component_PDU; +static int hf_gsm_map_getPassword; +static int hf_gsm_map_currentPassword; +static int hf_gsm_map_extension; +static int hf_gsm_map_nature_of_number; +static int hf_gsm_map_number_plan; +static int hf_gsm_map_address_digits; +static int hf_gsm_map_TBCD_digits; +static int hf_gsm_map_Ss_Status_unused; +static int hf_gsm_map_Ss_Status_q_bit; +static int hf_gsm_map_Ss_Status_p_bit; +static int hf_gsm_map_Ss_Status_r_bit; +static int hf_gsm_map_Ss_Status_a_bit; +static int hf_gsm_map_notification_to_forwarding_party; +static int hf_gsm_map_redirecting_presentation; +static int hf_gsm_map_notification_to_calling_party; +static int hf_gsm_map_forwarding_reason; +static int hf_gsm_map_pdp_type_org; +static int hf_gsm_map_etsi_pdp_type_number; +static int hf_gsm_map_ietf_pdp_type_number; +static int hf_gsm_map_ext_qos_subscribed_pri; + +static int hf_gsm_map_qos_traffic_cls; +static int hf_gsm_map_qos_del_order; +static int hf_gsm_map_qos_del_of_err_sdu; +static int hf_gsm_map_qos_ber; +static int hf_gsm_map_qos_sdu_err_rat; +static int hf_gsm_map_qos_traff_hdl_pri; +static int hf_gsm_map_qos_max_sdu; +static int hf_gsm_map_max_brate_ulink; +static int hf_gsm_map_max_brate_dlink; +static int hf_gsm_map_qos_transfer_delay; +static int hf_gsm_map_guaranteed_max_brate_ulink; +static int hf_gsm_map_guaranteed_max_brate_dlink; +static int hf_gsm_map_GSNAddress_IPv4; +static int hf_gsm_map_GSNAddress_IPv6; +static int hf_gsm_map_ranap_service_Handover; +static int hf_gsm_map_IntegrityProtectionInformation; +static int hf_gsm_map_EncryptionInformation; +static int hf_gsm_map_ss_SS_UserData; +static int hf_gsm_map_cbs_coding_grp; +static int hf_gsm_map_cbs_coding_grp0_lang; +static int hf_gsm_map_cbs_coding_grp1_lang; +static int hf_gsm_map_cbs_coding_grp2_lang; +static int hf_gsm_map_cbs_coding_grp3_lang; +static int hf_gsm_map_cbs_coding_grp4_7_comp; +static int hf_gsm_map_cbs_coding_grp4_7_class_ind; +static int hf_gsm_map_cbs_coding_grp4_7_char_set; +static int hf_gsm_map_cbs_coding_grp4_7_class; +static int hf_gsm_map_cbs_coding_grp15_mess_code; +static int hf_gsm_map_cbs_coding_grp15_class; +static int hf_gsm_map_ie_tag; +static int hf_gsm_map_len; +static int hf_gsm_map_disc_par; +static int hf_gsm_map_dlci; +static int hf_gsm_apn_str; +static int hf_gsm_map_ericsson_locationInformation_rat; +static int hf_gsm_map_ericsson_locationInformation_lac; +static int hf_gsm_map_ericsson_locationInformation_ci; +static int hf_gsm_map_ericsson_locationInformation_sac; +static int hf_gsm_map_ussd_string; +static int hf_gsm_map_spare_bits; +static int hf_gsm_map_qos_signalling_ind; static int hf_gsm_map_qos_source_stat_desc = - 1; -static int hf_gsm_map_qos_max_bitrate_upl_ext = -1; -static int hf_gsm_map_qos_max_bitrate_downl_ext = -1; -static int hf_gsm_map_qos_guar_bitrate_upl_ext = -1; -static int hf_gsm_map_qos_guar_bitrate_downl_ext = -1; +static int hf_gsm_map_qos_max_bitrate_upl_ext; +static int hf_gsm_map_qos_max_bitrate_downl_ext; +static int hf_gsm_map_qos_guar_bitrate_upl_ext; +static int hf_gsm_map_qos_guar_bitrate_downl_ext; /* -static int hf_gsm_map_qos_max_bitrate_upl_ext2 = -1; -static int hf_gsm_map_qos_max_bitrate_downl_ext2 = -1; -static int hf_gsm_map_qos_guar_bitrate_upl_ext2 = -1; -static int hf_gsm_map_qos_guar_bitrate_downl_ext2 = -1; +static int hf_gsm_map_qos_max_bitrate_upl_ext2; +static int hf_gsm_map_qos_max_bitrate_downl_ext2; +static int hf_gsm_map_qos_guar_bitrate_upl_ext2; +static int hf_gsm_map_qos_guar_bitrate_downl_ext2; */ -static int hf_gsm_map_earp_pci = -1; -static int hf_gsm_map_earp_pl = -1; -static int hf_gsm_map_earp_pvi = -1; +static int hf_gsm_map_earp_pci; +static int hf_gsm_map_earp_pl; +static int hf_gsm_map_earp_pvi; #include "packet-gsm_map-hf.c" /* Initialize the subtree pointers */ -static gint ett_gsm_map = -1; -static gint ett_gsm_map_InvokeId = -1; -static gint ett_gsm_map_InvokePDU = -1; -static gint ett_gsm_map_ReturnResultPDU = -1; -static gint ett_gsm_map_ReturnErrorPDU = -1; -static gint ett_gsm_map_ReturnResult_result = -1; -static gint ett_gsm_map_ReturnError_result = -1; -static gint ett_gsm_map_GSMMAPPDU = -1; -static gint ett_gsm_map_ext_qos_subscribed = -1; -static gint ett_gsm_map_pdptypenumber = -1; -static gint ett_gsm_map_RAIdentity = -1; -static gint ett_gsm_map_LAIFixedLength = -1; -static gint ett_gsm_map_isdn_address_string = -1; -static gint ett_gsm_map_geo_desc = -1; -static gint ett_gsm_map_LongSignalInfo = -1; -static gint ett_gsm_map_RadioResourceInformation =-1; -static gint ett_gsm_map_MSNetworkCapability =-1; -static gint ett_gsm_map_MSRadioAccessCapability = -1; -static gint ett_gsm_map_externalsignalinfo = -1; -static gint ett_gsm_map_cbs_data_coding = -1; -static gint ett_gsm_map_GlobalCellId = -1; -static gint ett_gsm_map_GeographicalInformation = -1; -static gint ett_gsm_map_apn_str = -1; -static gint ett_gsm_map_LocationNumber = -1; -static gint ett_gsm_map_ericsson_locationInformation = -1; -static gint ett_gsm_map_extension_data = -1; -static gint ett_gsm_map_tbcd_digits = -1; -static gint ett_gsm_map_ussd_string = -1; -static gint ett_gsm_map_ext2_qos_subscribed = -1; -static gint ett_gsm_map_ext3_qos_subscribed = -1; -static gint ett_gsm_map_e_utranCellGlobalIdentity = -1; -static gint ett_gsm_map_TA_id = -1; -static gint ett_gsm_map_GeodeticInformation = -1; +static gint ett_gsm_map; +static gint ett_gsm_map_InvokeId; +static gint ett_gsm_map_InvokePDU; +static gint ett_gsm_map_ReturnResultPDU; +static gint ett_gsm_map_ReturnErrorPDU; +static gint ett_gsm_map_ReturnResult_result; +static gint ett_gsm_map_ReturnError_result; +static gint ett_gsm_map_GSMMAPPDU; +static gint ett_gsm_map_ext_qos_subscribed; +static gint ett_gsm_map_pdptypenumber; +static gint ett_gsm_map_RAIdentity; +static gint ett_gsm_map_LAIFixedLength; +static gint ett_gsm_map_isdn_address_string; +static gint ett_gsm_map_geo_desc; +static gint ett_gsm_map_LongSignalInfo; +static gint ett_gsm_map_RadioResourceInformation; +static gint ett_gsm_map_MSNetworkCapability; +static gint ett_gsm_map_MSRadioAccessCapability; +static gint ett_gsm_map_externalsignalinfo; +static gint ett_gsm_map_cbs_data_coding; +static gint ett_gsm_map_GlobalCellId; +static gint ett_gsm_map_GeographicalInformation; +static gint ett_gsm_map_apn_str; +static gint ett_gsm_map_LocationNumber; +static gint ett_gsm_map_ericsson_locationInformation; +static gint ett_gsm_map_extension_data; +static gint ett_gsm_map_tbcd_digits; +static gint ett_gsm_map_ussd_string; +static gint ett_gsm_map_ext2_qos_subscribed; +static gint ett_gsm_map_ext3_qos_subscribed; +static gint ett_gsm_map_e_utranCellGlobalIdentity; +static gint ett_gsm_map_TA_id; +static gint ett_gsm_map_GeodeticInformation; #include "packet-gsm_map-ett.c" -static expert_field ei_gsm_map_unknown_sequence3 = EI_INIT; -static expert_field ei_gsm_map_unknown_sequence = EI_INIT; -static expert_field ei_gsm_map_unknown_parameter = EI_INIT; -static expert_field ei_gsm_map_unknown_invokeData = EI_INIT; -static expert_field ei_gsm_map_undecoded = EI_INIT; +static expert_field ei_gsm_map_unknown_sequence3; +static expert_field ei_gsm_map_unknown_sequence; +static expert_field ei_gsm_map_unknown_parameter; +static expert_field ei_gsm_map_unknown_invokeData; +static expert_field ei_gsm_map_undecoded; static dissector_handle_t gsm_sms_handle; /* SMS TPDU */ static dissector_handle_t ranap_handle; diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c index ab85ddbf0d..5ae860689a 100644 --- a/epan/dissectors/asn1/h225/packet-h225-template.c +++ b/epan/dissectors/asn1/h225/packet-h225-template.c @@ -104,19 +104,19 @@ static next_tvb_list_t *tp_list; /* Initialize the protocol and registered fields */ static int h225_tap = -1; -static int proto_h225 = -1; +static int proto_h225; -static int hf_h221Manufacturer = -1; -static int hf_h225_ras_req_frame = -1; -static int hf_h225_ras_rsp_frame = -1; -static int hf_h225_ras_dup = -1; -static int hf_h225_ras_deltatime = -1; -static int hf_h225_debug_dissector_try_string = -1; +static int hf_h221Manufacturer; +static int hf_h225_ras_req_frame; +static int hf_h225_ras_rsp_frame; +static int hf_h225_ras_dup; +static int hf_h225_ras_deltatime; +static int hf_h225_debug_dissector_try_string; #include "packet-h225-hf.c" /* Initialize the subtree pointers */ -static gint ett_h225 = -1; +static gint ett_h225; #include "packet-h225-ett.c" /* Preferences */ diff --git a/epan/dissectors/asn1/h235/packet-h235-template.c b/epan/dissectors/asn1/h235/packet-h235-template.c index 4441bbb845..665b49ad65 100644 --- a/epan/dissectors/asn1/h235/packet-h235-template.c +++ b/epan/dissectors/asn1/h235/packet-h235-template.c @@ -35,7 +35,7 @@ void proto_register_h235(void); void proto_reg_handoff_h235(void); /* Initialize the protocol and registered fields */ -static int proto_h235 = -1; +static int proto_h235; #include "packet-h235-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/h245/packet-h245-template.c b/epan/dissectors/asn1/h245/packet-h245-template.c index 9c7fc62703..76c7fdb80b 100644 --- a/epan/dissectors/asn1/h245/packet-h245-template.c +++ b/epan/dissectors/asn1/h245/packet-h245-template.c @@ -58,12 +58,12 @@ static dissector_handle_t h263_handle = NULL; static dissector_handle_t amr_handle = NULL; static void init_h245_packet_info(h245_packet_info *pi); -static int hf_h245_pdu_type = -1; -static int hf_h245Manufacturer = -1; -static int hf_h245_subMessageIdentifier_standard = -1; +static int hf_h245_pdu_type; +static int hf_h245Manufacturer; +static int hf_h245_subMessageIdentifier_standard; static int h245_tap = -1; static int h245dg_tap = -1; -static int hf_h245_debug_dissector_try_string = -1; +static int hf_h245_debug_dissector_try_string; h245_packet_info *h245_pi=NULL; @@ -370,12 +370,12 @@ static void print_info_column(column_info *cinfo, const gint32 *value, } /* Initialize the protocol and registered fields */ -static int proto_h245 = -1; +static int proto_h245; #include "packet-h245-hf.c" /* Initialize the subtree pointers */ -static int ett_h245 = -1; -static int ett_h245_returnedFunction = -1; +static int ett_h245; +static int ett_h245_returnedFunction; #include "packet-h245-ett.c" /* Forward declarations */ diff --git a/epan/dissectors/asn1/h248/packet-h248-template.c b/epan/dissectors/asn1/h248/packet-h248-template.c index 85cd0b86a0..91a12f24ba 100644 --- a/epan/dissectors/asn1/h248/packet-h248-template.c +++ b/epan/dissectors/asn1/h248/packet-h248-template.c @@ -34,49 +34,49 @@ void proto_register_h248(void); /* Initialize the protocol and registered fields */ -static int proto_h248 = -1; -static int hf_248_magic_num = -1; -static int hf_h248_mtpaddress_ni = -1; -static int hf_h248_mtpaddress_pc = -1; -static int hf_h248_pkg_name = -1; -static int hf_248_pkg_param = -1; -static int hf_h248_event_name = -1; -static int hf_h248_signal_name = -1; -static int hf_h248_signal_code = -1; -static int hf_h248_event_code = -1; -static int hf_h248_pkg_bcp_BNCChar_PDU = -1; - - - -static int hf_h248_context_id = -1; -static int hf_h248_term_wild_type = -1; -static int hf_h248_term_wild_level = -1; -static int hf_h248_term_wild_position = -1; - -static int hf_h248_no_pkg = -1; -static int hf_h248_no_sig = -1; -static int hf_h248_no_evt = -1; -static int hf_h248_param = -1; - -static int hf_h248_serviceChangeReasonStr = -1; -static int hf_h248_transactionId64 = -1; -static int hf_h248_context_id64 = -1; +static int proto_h248; +static int hf_248_magic_num; +static int hf_h248_mtpaddress_ni; +static int hf_h248_mtpaddress_pc; +static int hf_h248_pkg_name; +static int hf_248_pkg_param; +static int hf_h248_event_name; +static int hf_h248_signal_name; +static int hf_h248_signal_code; +static int hf_h248_event_code; +static int hf_h248_pkg_bcp_BNCChar_PDU; + + + +static int hf_h248_context_id; +static int hf_h248_term_wild_type; +static int hf_h248_term_wild_level; +static int hf_h248_term_wild_position; + +static int hf_h248_no_pkg; +static int hf_h248_no_sig; +static int hf_h248_no_evt; +static int hf_h248_param; + +static int hf_h248_serviceChangeReasonStr; +static int hf_h248_transactionId64; +static int hf_h248_context_id64; /* h248v1 support */ -static int hf_h248_auditValueReplyV1 = -1; +static int hf_h248_auditValueReplyV1; #include "packet-h248-hf.c" /* Initialize the subtree pointers */ -static gint ett_h248 = -1; -static gint ett_mtpaddress = -1; -static gint ett_packagename = -1; -static gint ett_codec = -1; -static gint ett_wildcard = -1; +static gint ett_h248; +static gint ett_mtpaddress; +static gint ett_packagename; +static gint ett_codec; +static gint ett_wildcard; -static gint ett_h248_no_pkg = -1; -static gint ett_h248_no_sig = -1; -static gint ett_h248_no_evt = -1; +static gint ett_h248_no_pkg; +static gint ett_h248_no_sig; +static gint ett_h248_no_evt; static int h248_tap = -1; @@ -87,10 +87,10 @@ static gint exported_pdu_tap = -1; #include "packet-h248-ett.c" -static expert_field ei_h248_errored_command = EI_INIT; -static expert_field ei_h248_transactionId64 = EI_INIT; -static expert_field ei_h248_context_id64 = EI_INIT; -static expert_field ei_h248_octet_string_expected = EI_INIT; +static expert_field ei_h248_errored_command; +static expert_field ei_h248_transactionId64; +static expert_field ei_h248_context_id64; +static expert_field ei_h248_octet_string_expected; static dissector_table_t subdissector_table; diff --git a/epan/dissectors/asn1/h282/packet-h282-template.c b/epan/dissectors/asn1/h282/packet-h282-template.c index d371529fc0..91eb679e69 100644 --- a/epan/dissectors/asn1/h282/packet-h282-template.c +++ b/epan/dissectors/asn1/h282/packet-h282-template.c @@ -25,11 +25,11 @@ void proto_register_h282(void); void proto_reg_handoff_h282(void); /* Initialize the protocol and registered fields */ -static int proto_h282 = -1; +static int proto_h282; #include "packet-h282-hf.c" /* Initialize the subtree pointers */ -static int ett_h282 = -1; +static int ett_h282; #include "packet-h282-ett.c" /* Dissectors */ diff --git a/epan/dissectors/asn1/h283/packet-h283-template.c b/epan/dissectors/asn1/h283/packet-h283-template.c index 6db8e76eaa..fa383dd705 100644 --- a/epan/dissectors/asn1/h283/packet-h283-template.c +++ b/epan/dissectors/asn1/h283/packet-h283-template.c @@ -25,11 +25,11 @@ void proto_register_h283(void); void proto_reg_handoff_h283(void); /* Initialize the protocol and registered fields */ -static int proto_h283 = -1; +static int proto_h283; #include "packet-h283-hf.c" /* Initialize the subtree pointers */ -static int ett_h283 = -1; +static int ett_h283; #include "packet-h283-ett.c" /* Subdissectors */ diff --git a/epan/dissectors/asn1/h323/packet-h323-template.c b/epan/dissectors/asn1/h323/packet-h323-template.c index 8adbaa7cf1..baf5cbd8bd 100644 --- a/epan/dissectors/asn1/h323/packet-h323-template.c +++ b/epan/dissectors/asn1/h323/packet-h323-template.c @@ -73,7 +73,7 @@ void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx) { } /* Initialize the protocol and registered fields */ -static int proto_h323 = -1; +static int proto_h323; #include "packet-h323-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c b/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c index df2a53db8d..792159b836 100644 --- a/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c +++ b/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c @@ -27,13 +27,13 @@ void proto_register_h450_ros(void); void proto_reg_handoff_h450_ros(void); /* Initialize the protocol and registered fields */ -static int proto_h450_ros = -1; +static int proto_h450_ros; #include "packet-h450-ros-hf.c" /* Initialize the subtree pointers */ #include "packet-h450-ros-ett.c" -static expert_field ei_ros_undecoded = EI_INIT; +static expert_field ei_ros_undecoded; /* Preferences */ diff --git a/epan/dissectors/asn1/h450/packet-h450-template.c b/epan/dissectors/asn1/h450/packet-h450-template.c index b9a72714b6..b0a5b4a2ba 100644 --- a/epan/dissectors/asn1/h450/packet-h450-template.c +++ b/epan/dissectors/asn1/h450/packet-h450-template.c @@ -38,17 +38,17 @@ static dissector_handle_t h450_res_handle; static dissector_handle_t h450_err_handle; /* Initialize the protocol and registered fields */ -static int proto_h450 = -1; -static int hf_h450_operation = -1; -static int hf_h450_error = -1; +static int proto_h450; +static int hf_h450_operation; +static int hf_h450_error; #include "packet-h450-hf.c" /* Initialize the subtree pointers */ #include "packet-h450-ett.c" -static expert_field ei_h450_unsupported_arg_type = EI_INIT; -static expert_field ei_h450_unsupported_result_type = EI_INIT; -static expert_field ei_h450_unsupported_error_type = EI_INIT; +static expert_field ei_h450_unsupported_arg_type; +static expert_field ei_h450_unsupported_result_type; +static expert_field ei_h450_unsupported_error_type; static const value_string h450_str_operation[] = { #include "packet-h450-table10.c" diff --git a/epan/dissectors/asn1/h460/packet-h460-template.c b/epan/dissectors/asn1/h460/packet-h460-template.c index 896427c1cc..3a3f819279 100644 --- a/epan/dissectors/asn1/h460/packet-h460-template.c +++ b/epan/dissectors/asn1/h460/packet-h460-template.c @@ -28,7 +28,7 @@ void proto_register_h460(void); void proto_reg_handoff_h460(void); /* Initialize the protocol and registered fields */ -static int proto_h460 = -1; +static int proto_h460; #include "packet-h460-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/h501/packet-h501-template.c b/epan/dissectors/asn1/h501/packet-h501-template.c index 4559654956..aaa4d2c79e 100644 --- a/epan/dissectors/asn1/h501/packet-h501-template.c +++ b/epan/dissectors/asn1/h501/packet-h501-template.c @@ -28,11 +28,11 @@ void proto_register_h501(void); /* Initialize the protocol and registered fields */ -static int proto_h501 = -1; +static int proto_h501; #include "packet-h501-hf.c" /* Initialize the subtree pointers */ -static int ett_h501 = -1; +static int ett_h501; #include "packet-h501-ett.c" /* Dissectors */ diff --git a/epan/dissectors/asn1/hnbap/packet-hnbap-template.c b/epan/dissectors/asn1/hnbap/packet-hnbap-template.c index 1568cca2b0..64d265f5de 100644 --- a/epan/dissectors/asn1/hnbap/packet-hnbap-template.c +++ b/epan/dissectors/asn1/hnbap/packet-hnbap-template.c @@ -38,13 +38,13 @@ void proto_register_hnbap(void); #include "packet-hnbap-val.h" /* Initialize the protocol and registered fields */ -static int proto_hnbap = -1; +static int proto_hnbap; #include "packet-hnbap-hf.c" /* Initialize the subtree pointers */ -static int ett_hnbap = -1; -static int ett_hnbap_imsi = -1; +static int ett_hnbap; +static int ett_hnbap_imsi; #include "packet-hnbap-ett.c" struct hnbap_private_data { diff --git a/epan/dissectors/asn1/idmp/packet-idmp-template.c b/epan/dissectors/asn1/idmp/packet-idmp-template.c index dbe118867d..74c888e05e 100644 --- a/epan/dissectors/asn1/idmp/packet-idmp-template.c +++ b/epan/dissectors/asn1/idmp/packet-idmp-template.c @@ -50,27 +50,27 @@ static guint32 opcode = -1; /* Initialize the protocol and registered fields */ int proto_idmp = -1; -static int hf_idmp_version = -1; -static int hf_idmp_final = -1; -static int hf_idmp_length = -1; -static int hf_idmp_PDU = -1; +static int hf_idmp_version; +static int hf_idmp_final; +static int hf_idmp_length; +static int hf_idmp_PDU; static reassembly_table idmp_reassembly_table; -static int hf_idmp_fragments = -1; -static int hf_idmp_fragment = -1; -static int hf_idmp_fragment_overlap = -1; -static int hf_idmp_fragment_overlap_conflicts = -1; -static int hf_idmp_fragment_multiple_tails = -1; -static int hf_idmp_fragment_too_long_fragment = -1; -static int hf_idmp_fragment_error = -1; -static int hf_idmp_fragment_count = -1; -static int hf_idmp_reassembled_in = -1; -static int hf_idmp_reassembled_length = -1; -static int hf_idmp_segment_data = -1; - -static gint ett_idmp_fragment = -1; -static gint ett_idmp_fragments = -1; +static int hf_idmp_fragments; +static int hf_idmp_fragment; +static int hf_idmp_fragment_overlap; +static int hf_idmp_fragment_overlap_conflicts; +static int hf_idmp_fragment_multiple_tails; +static int hf_idmp_fragment_too_long_fragment; +static int hf_idmp_fragment_error; +static int hf_idmp_fragment_count; +static int hf_idmp_reassembled_in; +static int hf_idmp_reassembled_length; +static int hf_idmp_segment_data; + +static gint ett_idmp_fragment; +static gint ett_idmp_fragments; static const fragment_items idmp_frag_items = { /* Fragment subtrees */ @@ -117,7 +117,7 @@ static int call_idmp_oid_callback(tvbuff_t *tvb, int offset, packet_info *pinfo, #include "packet-idmp-hf.c" /* Initialize the subtree pointers */ -static gint ett_idmp = -1; +static gint ett_idmp; #include "packet-idmp-ett.c" #include "packet-idmp-fn.c" diff --git a/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c b/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c index 6a2c4cdb94..bb60d04f82 100644 --- a/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c +++ b/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c @@ -40,7 +40,7 @@ dissector_handle_t proto_ieee1609dot2_handle = NULL; #include "packet-ieee1609dot2-hf.c" /* Initialize the subtree pointers */ -static int ett_ieee1609dot2_ssp = -1; +static int ett_ieee1609dot2_ssp; #include "packet-ieee1609dot2-ett.c" static dissector_table_t unsecured_data_subdissector_table; diff --git a/epan/dissectors/asn1/ilp/packet-ilp-template.c b/epan/dissectors/asn1/ilp/packet-ilp-template.c index 48cd9386eb..1a628839c7 100644 --- a/epan/dissectors/asn1/ilp/packet-ilp-template.c +++ b/epan/dissectors/asn1/ilp/packet-ilp-template.c @@ -42,7 +42,7 @@ static dissector_handle_t ilp_tcp_handle; #define ILP_TCP_PORT 7276 /* Initialize the protocol and registered fields */ -static int proto_ilp = -1; +static int proto_ilp; #define ILP_HEADER_SIZE 2 @@ -50,11 +50,11 @@ static int proto_ilp = -1; static gboolean ilp_desegment = TRUE; #include "packet-ilp-hf.c" -static int hf_ilp_mobile_directory_number = -1; +static int hf_ilp_mobile_directory_number; /* Initialize the subtree pointers */ -static gint ett_ilp = -1; -static gint ett_ilp_setid = -1; +static gint ett_ilp; +static gint ett_ilp_setid; #include "packet-ilp-ett.c" /* Include constants */ diff --git a/epan/dissectors/asn1/inap/packet-inap-template.c b/epan/dissectors/asn1/inap/packet-inap-template.c index 6baba991b4..a72cc3ada8 100644 --- a/epan/dissectors/asn1/inap/packet-inap-template.c +++ b/epan/dissectors/asn1/inap/packet-inap-template.c @@ -38,7 +38,7 @@ void proto_reg_handoff_inap(void); /* Initialize the protocol and registered fields */ -static int proto_inap = -1; +static int proto_inap; /* include constants */ #include "packet-inap-val.h" @@ -62,36 +62,36 @@ static int inap_opcode_type; #define INAP_OPCODE_RETURN_ERROR 3 #define INAP_OPCODE_REJECT 4 -static int hf_inap_cause_indicator = -1; +static int hf_inap_cause_indicator; /* Initialize the subtree pointers */ -static gint ett_inap = -1; -static gint ett_inapisup_parameter = -1; -static gint ett_inap_RedirectionInformation = -1; -static gint ett_inap_HighLayerCompatibility = -1; -static gint ett_inap_extension_data = -1; -static gint ett_inap_cause = -1; -static gint ett_inap_calledAddressValue = -1; -static gint ett_inap_callingAddressValue = -1; -static gint ett_inap_additionalCallingPartyNumber = -1; -static gint ett_inap_assistingSSPIPRoutingAddress = -1; -static gint ett_inap_correlationID = -1; -static gint ett_inap_number = -1; -static gint ett_inap_dialledNumber = -1; -static gint ett_inap_callingLineID = -1; -static gint ett_inap_iNServiceControlCode = -1; -static gint ett_inap_iNServiceControlCodeLow = -1; -static gint ett_inap_iNServiceControlCodeHigh = -1; -static gint ett_inap_lineID = -1; -static gint ett_inap_prefix = -1; -static gint ett_inap_iPAddressValue = -1; -static gint ett_inap_digitsResponse = -1; +static gint ett_inap; +static gint ett_inapisup_parameter; +static gint ett_inap_RedirectionInformation; +static gint ett_inap_HighLayerCompatibility; +static gint ett_inap_extension_data; +static gint ett_inap_cause; +static gint ett_inap_calledAddressValue; +static gint ett_inap_callingAddressValue; +static gint ett_inap_additionalCallingPartyNumber; +static gint ett_inap_assistingSSPIPRoutingAddress; +static gint ett_inap_correlationID; +static gint ett_inap_number; +static gint ett_inap_dialledNumber; +static gint ett_inap_callingLineID; +static gint ett_inap_iNServiceControlCode; +static gint ett_inap_iNServiceControlCodeLow; +static gint ett_inap_iNServiceControlCodeHigh; +static gint ett_inap_lineID; +static gint ett_inap_prefix; +static gint ett_inap_iPAddressValue; +static gint ett_inap_digitsResponse; #include "packet-inap-ett.c" -static expert_field ei_inap_unknown_invokeData = EI_INIT; -static expert_field ei_inap_unknown_returnResultData = EI_INIT; -static expert_field ei_inap_unknown_returnErrorData = EI_INIT; +static expert_field ei_inap_unknown_invokeData; +static expert_field ei_inap_unknown_returnResultData; +static expert_field ei_inap_unknown_returnErrorData; #include "packet-inap-table.c" diff --git a/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c b/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c index 60c4ff098c..f845814318 100644 --- a/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c +++ b/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c @@ -32,9 +32,9 @@ static dissector_handle_t isdn_sup_err_handle; #include "packet-isdn-sup-val.h" /* Initialize the protocol and registered fields */ -static int proto_isdn_sup = -1; -static int hf_isdn_sup_operation = -1; -static int hf_isdn_sup_error = -1; +static int proto_isdn_sup; +static int hf_isdn_sup_operation; +static int hf_isdn_sup_error; /* Global variables */ @@ -72,19 +72,19 @@ static const value_string isdn_sup_str_error[] = { { 0, NULL} }; -static int hf_isdn_sup = -1; +static int hf_isdn_sup; #include "packet-isdn-sup-hf.c" /* Initialize the subtree pointers */ -static gint ett_isdn_sup = -1; +static gint ett_isdn_sup; #include "packet-isdn-sup-ett.c" -/* static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; */ -static expert_field ei_isdn_sup_unsupported_result_type = EI_INIT; -static expert_field ei_isdn_sup_unsupported_error_type = EI_INIT; +/* static expert_field ei_isdn_sup_unsupported_arg_type; */ +static expert_field ei_isdn_sup_unsupported_result_type; +static expert_field ei_isdn_sup_unsupported_error_type; /* Preference settings default */ diff --git a/epan/dissectors/asn1/its/packet-its-template.c b/epan/dissectors/asn1/its/packet-its-template.c index 1dffe0545f..9fd7ad7676 100644 --- a/epan/dissectors/asn1/its/packet-its-template.c +++ b/epan/dissectors/asn1/its/packet-its-template.c @@ -109,88 +109,88 @@ void proto_register_its(void); static dissector_handle_t its_handle; -static expert_field ei_its_no_sub_dis = EI_INIT; +static expert_field ei_its_no_sub_dis; // TAP static int its_tap = -1; // Protocols -static int proto_its = -1; -static int proto_its_denm = -1; -static int proto_its_denmv1 = -1; -static int proto_its_cam = -1; -static int proto_its_camv1 = -1; -static int proto_its_evcsn = -1; -static int proto_its_evrsr = -1; -static int proto_its_ivimv1 = -1; -static int proto_its_ivim = -1; -static int proto_its_tistpg = -1; -static int proto_its_ssem = -1; -static int proto_its_srem = -1; -static int proto_its_rtcmemv1 = -1; -static int proto_its_rtcmem = -1; -static int proto_its_mapemv1 = -1; -static int proto_its_mapem = -1; -static int proto_its_spatemv1 = -1; -static int proto_its_spatem = -1; -static int proto_its_cpm = -1; -static int proto_its_imzm = -1; -static int proto_its_vam = -1; -static int proto_addgrpc = -1; +static int proto_its; +static int proto_its_denm; +static int proto_its_denmv1; +static int proto_its_cam; +static int proto_its_camv1; +static int proto_its_evcsn; +static int proto_its_evrsr; +static int proto_its_ivimv1; +static int proto_its_ivim; +static int proto_its_tistpg; +static int proto_its_ssem; +static int proto_its_srem; +static int proto_its_rtcmemv1; +static int proto_its_rtcmem; +static int proto_its_mapemv1; +static int proto_its_mapem; +static int proto_its_spatemv1; +static int proto_its_spatem; +static int proto_its_cpm; +static int proto_its_imzm; +static int proto_its_vam; +static int proto_addgrpc; /* * DENM SSP */ -static int hf_denmssp_version = -1; -static int hf_denmssp_flags = -1; -static int hf_denmssp_trafficCondition = -1; -static int hf_denmssp_accident = -1; -static int hf_denmssp_roadworks = -1; -static int hf_denmssp_adverseWeatherConditionAdhesion = -1; -static int hf_denmssp_hazardousLocationSurfaceCondition = -1; -static int hf_denmssp_hazardousLocationObstacleOnTheRoad = -1; -static int hf_denmssp_hazardousLocationAnimalOnTheRoad = -1; -static int hf_denmssp_humanPresenceOnTheRoad = -1; -static int hf_denmssp_wrongWayDriving = -1; -static int hf_denmssp_rescueAndRecoveryWorkInProgress = -1; -static int hf_denmssp_ExtremeWeatherCondition = -1; -static int hf_denmssp_adverseWeatherConditionVisibility = -1; -static int hf_denmssp_adverseWeatherConditionPrecipitation = -1; -static int hf_denmssp_slowVehicle = -1; -static int hf_denmssp_dangerousEndOfQueue = -1; -static int hf_denmssp_vehicleBreakdown = -1; -static int hf_denmssp_postCrash = -1; -static int hf_denmssp_humanProblem = -1; -static int hf_denmssp_stationaryVehicle = -1; -static int hf_denmssp_emergencyVehicleApproaching = -1; -static int hf_denmssp_hazardousLocationDangerousCurve = -1; -static int hf_denmssp_collisionRisk = -1; -static int hf_denmssp_signalViolation = -1; -static int hf_denmssp_dangerousSituation = -1; +static int hf_denmssp_version; +static int hf_denmssp_flags; +static int hf_denmssp_trafficCondition; +static int hf_denmssp_accident; +static int hf_denmssp_roadworks; +static int hf_denmssp_adverseWeatherConditionAdhesion; +static int hf_denmssp_hazardousLocationSurfaceCondition; +static int hf_denmssp_hazardousLocationObstacleOnTheRoad; +static int hf_denmssp_hazardousLocationAnimalOnTheRoad; +static int hf_denmssp_humanPresenceOnTheRoad; +static int hf_denmssp_wrongWayDriving; +static int hf_denmssp_rescueAndRecoveryWorkInProgress; +static int hf_denmssp_ExtremeWeatherCondition; +static int hf_denmssp_adverseWeatherConditionVisibility; +static int hf_denmssp_adverseWeatherConditionPrecipitation; +static int hf_denmssp_slowVehicle; +static int hf_denmssp_dangerousEndOfQueue; +static int hf_denmssp_vehicleBreakdown; +static int hf_denmssp_postCrash; +static int hf_denmssp_humanProblem; +static int hf_denmssp_stationaryVehicle; +static int hf_denmssp_emergencyVehicleApproaching; +static int hf_denmssp_hazardousLocationDangerousCurve; +static int hf_denmssp_collisionRisk; +static int hf_denmssp_signalViolation; +static int hf_denmssp_dangerousSituation; /* * CAM SSP */ -static int hf_camssp_version = -1; -static int hf_camssp_flags = -1; -static int hf_camssp_cenDsrcTollingZone = -1; -static int hf_camssp_publicTransport = -1; -static int hf_camssp_specialTransport = -1; -static int hf_camssp_dangerousGoods = -1; -static int hf_camssp_roadwork = -1; -static int hf_camssp_rescue = -1; -static int hf_camssp_emergency = -1; -static int hf_camssp_safetyCar = -1; -static int hf_camssp_closedLanes = -1; -static int hf_camssp_requestForRightOfWay = -1; -static int hf_camssp_requestForFreeCrossingAtATrafficLight = -1; -static int hf_camssp_noPassing = -1; -static int hf_camssp_noPassingForTrucks = -1; -static int hf_camssp_speedLimit = -1; -static int hf_camssp_reserved = -1; - -static gint ett_denmssp_flags = -1; -static gint ett_camssp_flags = -1; +static int hf_camssp_version; +static int hf_camssp_flags; +static int hf_camssp_cenDsrcTollingZone; +static int hf_camssp_publicTransport; +static int hf_camssp_specialTransport; +static int hf_camssp_dangerousGoods; +static int hf_camssp_roadwork; +static int hf_camssp_rescue; +static int hf_camssp_emergency; +static int hf_camssp_safetyCar; +static int hf_camssp_closedLanes; +static int hf_camssp_requestForRightOfWay; +static int hf_camssp_requestForFreeCrossingAtATrafficLight; +static int hf_camssp_noPassing; +static int hf_camssp_noPassingForTrucks; +static int hf_camssp_speedLimit; +static int hf_camssp_reserved; + +static gint ett_denmssp_flags; +static gint ett_camssp_flags; // Subdissectors static dissector_table_t its_version_subdissector_table; @@ -302,7 +302,7 @@ static int dissect_camssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree // Generated by asn2wrs #include "packet-its-hf.c" -static gint ett_its = -1; +static gint ett_its; #include "packet-its-ett.c" diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c index 4964637757..0e4b2bec41 100644 --- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c +++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c @@ -190,165 +190,165 @@ static int dissect_kerberos_FastOptions(bool implicit_tag _U_, tvbuff_t *tvb _U_ /* Desegment Kerberos over TCP messages */ static gboolean krb_desegment = TRUE; -static gint proto_kerberos = -1; - -static gint hf_krb_rm_reserved = -1; -static gint hf_krb_rm_reclen = -1; -static gint hf_krb_provsrv_location = -1; -static gint hf_krb_pw_salt = -1; -static gint hf_krb_ext_error_nt_status = -1; -static gint hf_krb_ext_error_reserved = -1; -static gint hf_krb_ext_error_flags = -1; -static gint hf_krb_address_ip = -1; -static gint hf_krb_address_netbios = -1; -static gint hf_krb_address_ipv6 = -1; -static gint hf_krb_gssapi_len = -1; -static gint hf_krb_gssapi_bnd = -1; -static gint hf_krb_gssapi_dlgopt = -1; -static gint hf_krb_gssapi_dlglen = -1; -static gint hf_krb_gssapi_c_flag_deleg = -1; -static gint hf_krb_gssapi_c_flag_mutual = -1; -static gint hf_krb_gssapi_c_flag_replay = -1; -static gint hf_krb_gssapi_c_flag_sequence = -1; -static gint hf_krb_gssapi_c_flag_conf = -1; -static gint hf_krb_gssapi_c_flag_integ = -1; -static gint hf_krb_gssapi_c_flag_dce_style = -1; -static gint hf_krb_midl_version = -1; -static gint hf_krb_midl_hdr_len = -1; -static gint hf_krb_midl_fill_bytes = -1; -static gint hf_krb_midl_blob_len = -1; -static gint hf_krb_pac_signature_type = -1; -static gint hf_krb_pac_signature_signature = -1; -static gint hf_krb_w2k_pac_entries = -1; -static gint hf_krb_w2k_pac_version = -1; -static gint hf_krb_w2k_pac_type = -1; -static gint hf_krb_w2k_pac_size = -1; -static gint hf_krb_w2k_pac_offset = -1; -static gint hf_krb_pac_clientid = -1; -static gint hf_krb_pac_namelen = -1; -static gint hf_krb_pac_clientname = -1; -static gint hf_krb_pac_logon_info = -1; -static gint hf_krb_pac_credential_data = -1; -static gint hf_krb_pac_credential_info = -1; -static gint hf_krb_pac_credential_info_version = -1; -static gint hf_krb_pac_credential_info_etype = -1; -static gint hf_krb_pac_s4u_delegation_info = -1; -static gint hf_krb_pac_upn_dns_info = -1; -static gint hf_krb_pac_upn_flags = -1; -static gint hf_krb_pac_upn_flag_upn_constructed = -1; -static gint hf_krb_pac_upn_flag_has_sam_name_and_sid = -1; -static gint hf_krb_pac_upn_upn_offset = -1; -static gint hf_krb_pac_upn_upn_len = -1; -static gint hf_krb_pac_upn_upn_name = -1; -static gint hf_krb_pac_upn_dns_offset = -1; -static gint hf_krb_pac_upn_dns_len = -1; -static gint hf_krb_pac_upn_dns_name = -1; -static gint hf_krb_pac_upn_samaccountname_offset = -1; -static gint hf_krb_pac_upn_samaccountname_len = -1; -static gint hf_krb_pac_upn_samaccountname = -1; -static gint hf_krb_pac_upn_objectsid_offset = -1; -static gint hf_krb_pac_upn_objectsid_len = -1; -static gint hf_krb_pac_server_checksum = -1; -static gint hf_krb_pac_privsvr_checksum = -1; -static gint hf_krb_pac_client_info_type = -1; -static gint hf_krb_pac_client_claims_info = -1; -static gint hf_krb_pac_device_info = -1; -static gint hf_krb_pac_device_claims_info = -1; -static gint hf_krb_pac_ticket_checksum = -1; -static gint hf_krb_pac_attributes_info = -1; -static gint hf_krb_pac_attributes_info_length = -1; -static gint hf_krb_pac_attributes_info_flags = -1; -static gint hf_krb_pac_attributes_info_flags_pac_was_requested = -1; -static gint hf_krb_pac_attributes_info_flags_pac_was_given_implicitly = -1; -static gint hf_krb_pac_requester_sid = -1; -static gint hf_krb_pa_supported_enctypes = -1; -static gint hf_krb_pa_supported_enctypes_des_cbc_crc = -1; -static gint hf_krb_pa_supported_enctypes_des_cbc_md5 = -1; -static gint hf_krb_pa_supported_enctypes_rc4_hmac = -1; -static gint hf_krb_pa_supported_enctypes_aes128_cts_hmac_sha1_96 = -1; -static gint hf_krb_pa_supported_enctypes_aes256_cts_hmac_sha1_96 = -1; -static gint hf_krb_pa_supported_enctypes_fast_supported = -1; -static gint hf_krb_pa_supported_enctypes_compound_identity_supported = -1; -static gint hf_krb_pa_supported_enctypes_claims_supported = -1; -static gint hf_krb_pa_supported_enctypes_resource_sid_compression_disabled = -1; -static gint hf_krb_ad_ap_options = -1; -static gint hf_krb_ad_ap_options_cbt = -1; -static gint hf_krb_ad_target_principal = -1; -static gint hf_krb_key_hidden_item = -1; -static gint hf_kerberos_KERB_TICKET_LOGON = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_MessageType = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_Flags = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_ServiceTicketLength = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_TicketGrantingTicketLength = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_ServiceTicket = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_TicketGrantingTicket = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_FLAG_ALLOW_EXPIRED_TICKET = -1; -static gint hf_kerberos_KERB_TICKET_LOGON_FLAG_REDIRECTED = -1; +static gint proto_kerberos; + +static gint hf_krb_rm_reserved; +static gint hf_krb_rm_reclen; +static gint hf_krb_provsrv_location; +static gint hf_krb_pw_salt; +static gint hf_krb_ext_error_nt_status; +static gint hf_krb_ext_error_reserved; +static gint hf_krb_ext_error_flags; +static gint hf_krb_address_ip; +static gint hf_krb_address_netbios; +static gint hf_krb_address_ipv6; +static gint hf_krb_gssapi_len; +static gint hf_krb_gssapi_bnd; +static gint hf_krb_gssapi_dlgopt; +static gint hf_krb_gssapi_dlglen; +static gint hf_krb_gssapi_c_flag_deleg; +static gint hf_krb_gssapi_c_flag_mutual; +static gint hf_krb_gssapi_c_flag_replay; +static gint hf_krb_gssapi_c_flag_sequence; +static gint hf_krb_gssapi_c_flag_conf; +static gint hf_krb_gssapi_c_flag_integ; +static gint hf_krb_gssapi_c_flag_dce_style; +static gint hf_krb_midl_version; +static gint hf_krb_midl_hdr_len; +static gint hf_krb_midl_fill_bytes; +static gint hf_krb_midl_blob_len; +static gint hf_krb_pac_signature_type; +static gint hf_krb_pac_signature_signature; +static gint hf_krb_w2k_pac_entries; +static gint hf_krb_w2k_pac_version; +static gint hf_krb_w2k_pac_type; +static gint hf_krb_w2k_pac_size; +static gint hf_krb_w2k_pac_offset; +static gint hf_krb_pac_clientid; +static gint hf_krb_pac_namelen; +static gint hf_krb_pac_clientname; +static gint hf_krb_pac_logon_info; +static gint hf_krb_pac_credential_data; +static gint hf_krb_pac_credential_info; +static gint hf_krb_pac_credential_info_version; +static gint hf_krb_pac_credential_info_etype; +static gint hf_krb_pac_s4u_delegation_info; +static gint hf_krb_pac_upn_dns_info; +static gint hf_krb_pac_upn_flags; +static gint hf_krb_pac_upn_flag_upn_constructed; +static gint hf_krb_pac_upn_flag_has_sam_name_and_sid; +static gint hf_krb_pac_upn_upn_offset; +static gint hf_krb_pac_upn_upn_len; +static gint hf_krb_pac_upn_upn_name; +static gint hf_krb_pac_upn_dns_offset; +static gint hf_krb_pac_upn_dns_len; +static gint hf_krb_pac_upn_dns_name; +static gint hf_krb_pac_upn_samaccountname_offset; +static gint hf_krb_pac_upn_samaccountname_len; +static gint hf_krb_pac_upn_samaccountname; +static gint hf_krb_pac_upn_objectsid_offset; +static gint hf_krb_pac_upn_objectsid_len; +static gint hf_krb_pac_server_checksum; +static gint hf_krb_pac_privsvr_checksum; +static gint hf_krb_pac_client_info_type; +static gint hf_krb_pac_client_claims_info; +static gint hf_krb_pac_device_info; +static gint hf_krb_pac_device_claims_info; +static gint hf_krb_pac_ticket_checksum; +static gint hf_krb_pac_attributes_info; +static gint hf_krb_pac_attributes_info_length; +static gint hf_krb_pac_attributes_info_flags; +static gint hf_krb_pac_attributes_info_flags_pac_was_requested; +static gint hf_krb_pac_attributes_info_flags_pac_was_given_implicitly; +static gint hf_krb_pac_requester_sid; +static gint hf_krb_pa_supported_enctypes; +static gint hf_krb_pa_supported_enctypes_des_cbc_crc; +static gint hf_krb_pa_supported_enctypes_des_cbc_md5; +static gint hf_krb_pa_supported_enctypes_rc4_hmac; +static gint hf_krb_pa_supported_enctypes_aes128_cts_hmac_sha1_96; +static gint hf_krb_pa_supported_enctypes_aes256_cts_hmac_sha1_96; +static gint hf_krb_pa_supported_enctypes_fast_supported; +static gint hf_krb_pa_supported_enctypes_compound_identity_supported; +static gint hf_krb_pa_supported_enctypes_claims_supported; +static gint hf_krb_pa_supported_enctypes_resource_sid_compression_disabled; +static gint hf_krb_ad_ap_options; +static gint hf_krb_ad_ap_options_cbt; +static gint hf_krb_ad_target_principal; +static gint hf_krb_key_hidden_item; +static gint hf_kerberos_KERB_TICKET_LOGON; +static gint hf_kerberos_KERB_TICKET_LOGON_MessageType; +static gint hf_kerberos_KERB_TICKET_LOGON_Flags; +static gint hf_kerberos_KERB_TICKET_LOGON_ServiceTicketLength; +static gint hf_kerberos_KERB_TICKET_LOGON_TicketGrantingTicketLength; +static gint hf_kerberos_KERB_TICKET_LOGON_ServiceTicket; +static gint hf_kerberos_KERB_TICKET_LOGON_TicketGrantingTicket; +static gint hf_kerberos_KERB_TICKET_LOGON_FLAG_ALLOW_EXPIRED_TICKET; +static gint hf_kerberos_KERB_TICKET_LOGON_FLAG_REDIRECTED; #ifdef HAVE_KERBEROS -static gint hf_kerberos_KrbFastResponse = -1; -static gint hf_kerberos_strengthen_key = -1; -static gint hf_kerberos_finished = -1; -static gint hf_kerberos_fast_options = -1; -static gint hf_kerberos_ticket_checksum = -1; -static gint hf_krb_patimestamp = -1; -static gint hf_krb_pausec = -1; -static gint hf_kerberos_FastOptions_reserved = -1; -static gint hf_kerberos_FastOptions_hide_client_names = -1; -static gint hf_kerberos_FastOptions_spare_bit2 = -1; -static gint hf_kerberos_FastOptions_spare_bit3 = -1; -static gint hf_kerberos_FastOptions_spare_bit4 = -1; -static gint hf_kerberos_FastOptions_spare_bit5 = -1; -static gint hf_kerberos_FastOptions_spare_bit6 = -1; -static gint hf_kerberos_FastOptions_spare_bit7 = -1; -static gint hf_kerberos_FastOptions_spare_bit8 = -1; -static gint hf_kerberos_FastOptions_spare_bit9 = -1; -static gint hf_kerberos_FastOptions_spare_bit10 = -1; -static gint hf_kerberos_FastOptions_spare_bit11 = -1; -static gint hf_kerberos_FastOptions_spare_bit12 = -1; -static gint hf_kerberos_FastOptions_spare_bit13 = -1; -static gint hf_kerberos_FastOptions_spare_bit14 = -1; -static gint hf_kerberos_FastOptions_spare_bit15 = -1; -static gint hf_kerberos_FastOptions_kdc_follow_referrals = -1; +static gint hf_kerberos_KrbFastResponse; +static gint hf_kerberos_strengthen_key; +static gint hf_kerberos_finished; +static gint hf_kerberos_fast_options; +static gint hf_kerberos_ticket_checksum; +static gint hf_krb_patimestamp; +static gint hf_krb_pausec; +static gint hf_kerberos_FastOptions_reserved; +static gint hf_kerberos_FastOptions_hide_client_names; +static gint hf_kerberos_FastOptions_spare_bit2; +static gint hf_kerberos_FastOptions_spare_bit3; +static gint hf_kerberos_FastOptions_spare_bit4; +static gint hf_kerberos_FastOptions_spare_bit5; +static gint hf_kerberos_FastOptions_spare_bit6; +static gint hf_kerberos_FastOptions_spare_bit7; +static gint hf_kerberos_FastOptions_spare_bit8; +static gint hf_kerberos_FastOptions_spare_bit9; +static gint hf_kerberos_FastOptions_spare_bit10; +static gint hf_kerberos_FastOptions_spare_bit11; +static gint hf_kerberos_FastOptions_spare_bit12; +static gint hf_kerberos_FastOptions_spare_bit13; +static gint hf_kerberos_FastOptions_spare_bit14; +static gint hf_kerberos_FastOptions_spare_bit15; +static gint hf_kerberos_FastOptions_kdc_follow_referrals; #endif #include "packet-kerberos-hf.c" /* Initialize the subtree pointers */ -static gint ett_kerberos = -1; -static gint ett_krb_recordmark = -1; -static gint ett_krb_pac = -1; -static gint ett_krb_pac_drep = -1; -static gint ett_krb_pac_midl_blob = -1; -static gint ett_krb_pac_logon_info = -1; -static gint ett_krb_pac_credential_info = -1; -static gint ett_krb_pac_s4u_delegation_info = -1; -static gint ett_krb_pac_upn_dns_info = -1; -static gint ett_krb_pac_upn_dns_info_flags = -1; -static gint ett_krb_pac_device_info = -1; -static gint ett_krb_pac_server_checksum = -1; -static gint ett_krb_pac_privsvr_checksum = -1; -static gint ett_krb_pac_client_info_type = -1; -static gint ett_krb_pac_ticket_checksum = -1; -static gint ett_krb_pac_attributes_info = -1; -static gint ett_krb_pac_attributes_info_flags = -1; -static gint ett_krb_pac_requester_sid = -1; -static gint ett_krb_pa_supported_enctypes = -1; -static gint ett_krb_ad_ap_options = -1; -static gint ett_kerberos_KERB_TICKET_LOGON = -1; +static gint ett_kerberos; +static gint ett_krb_recordmark; +static gint ett_krb_pac; +static gint ett_krb_pac_drep; +static gint ett_krb_pac_midl_blob; +static gint ett_krb_pac_logon_info; +static gint ett_krb_pac_credential_info; +static gint ett_krb_pac_s4u_delegation_info; +static gint ett_krb_pac_upn_dns_info; +static gint ett_krb_pac_upn_dns_info_flags; +static gint ett_krb_pac_device_info; +static gint ett_krb_pac_server_checksum; +static gint ett_krb_pac_privsvr_checksum; +static gint ett_krb_pac_client_info_type; +static gint ett_krb_pac_ticket_checksum; +static gint ett_krb_pac_attributes_info; +static gint ett_krb_pac_attributes_info_flags; +static gint ett_krb_pac_requester_sid; +static gint ett_krb_pa_supported_enctypes; +static gint ett_krb_ad_ap_options; +static gint ett_kerberos_KERB_TICKET_LOGON; #ifdef HAVE_KERBEROS -static gint ett_krb_pa_enc_ts_enc = -1; -static gint ett_kerberos_KrbFastFinished = -1; -static gint ett_kerberos_KrbFastResponse = -1; -static gint ett_kerberos_KrbFastReq = -1; -static gint ett_kerberos_FastOptions = -1; +static gint ett_krb_pa_enc_ts_enc; +static gint ett_kerberos_KrbFastFinished; +static gint ett_kerberos_KrbFastResponse; +static gint ett_kerberos_KrbFastReq; +static gint ett_kerberos_FastOptions; #endif #include "packet-kerberos-ett.c" -static expert_field ei_kerberos_missing_keytype = EI_INIT; -static expert_field ei_kerberos_decrypted_keytype = EI_INIT; -static expert_field ei_kerberos_learnt_keytype = EI_INIT; -static expert_field ei_kerberos_address = EI_INIT; -static expert_field ei_krb_gssapi_dlglen = EI_INIT; +static expert_field ei_kerberos_missing_keytype; +static expert_field ei_kerberos_decrypted_keytype; +static expert_field ei_kerberos_learnt_keytype; +static expert_field ei_kerberos_address; +static expert_field ei_krb_gssapi_dlglen; static dissector_handle_t krb4_handle=NULL; @@ -435,7 +435,7 @@ static int dissect_kerberos_defer_PA_FX_FAST_REQUEST(bool implicit_tag _U_, tvbu */ ws_assert(implicit_tag == FALSE); ws_assert(offset == 0); - ws_assert(hf_index == -1); + ws_assert(hf_index <= 0); if (private_data->PA_FX_FAST_REQUEST.defer) { /* diff --git a/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c b/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c index ebb8f41709..5cadf89c3d 100644 --- a/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c +++ b/epan/dissectors/asn1/kpm-v2/packet-kpm-v2-template.c @@ -32,10 +32,10 @@ void proto_reg_handoff_kpm_v2(void); #include "packet-kpm-v2-val.h" /* Initialize the protocol and registered fields */ -static int proto_kpm_v2 = -1; +static int proto_kpm_v2; #include "packet-kpm-v2-hf.c" -static int hf_kpm_v2_timestamp_string = -1; +static int hf_kpm_v2_timestamp_string; #include "packet-kpm-v2-ett.c" diff --git a/epan/dissectors/asn1/lcsap/packet-lcsap-template.c b/epan/dissectors/asn1/lcsap/packet-lcsap-template.c index b9ff0c8cfe..a0ae1b16b8 100644 --- a/epan/dissectors/asn1/lcsap/packet-lcsap-template.c +++ b/epan/dissectors/asn1/lcsap/packet-lcsap-template.c @@ -45,24 +45,24 @@ void proto_reg_handoff_lcsap(void); #include "packet-lcsap-val.h" /* Initialize the protocol and registered fields */ -static int proto_lcsap = -1; +static int proto_lcsap; -static int hf_lcsap_pos_method = -1; -static int hf_lcsap_pos_usage = -1; -static int hf_lcsap_gnss_pos_method = -1; -static int hf_lcsap_gnss_id = -1; -static int hf_lcsap_gnss_pos_usage = -1; +static int hf_lcsap_pos_method; +static int hf_lcsap_pos_usage; +static int hf_lcsap_gnss_pos_method; +static int hf_lcsap_gnss_id; +static int hf_lcsap_gnss_pos_usage; #include "packet-lcsap-hf.c" /* Initialize the subtree pointers */ -static int ett_lcsap = -1; -static int ett_lcsap_plmnd_id = -1; -static int ett_lcsap_imsi = -1; -static int ett_lcsap_civic_address = -1; +static int ett_lcsap; +static int ett_lcsap_plmnd_id; +static int ett_lcsap_imsi; +static int ett_lcsap_civic_address; #include "packet-lcsap-ett.c" -static expert_field ei_lcsap_civic_data_not_xml = EI_INIT; +static expert_field ei_lcsap_civic_data_not_xml; /* Global variables */ static guint32 ProcedureCode; diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 0a461ecd89..aad8ef31c8 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -109,96 +109,96 @@ void proto_reg_handoff_ldap(void); /* Initialize the protocol and registered fields */ static int ldap_tap = -1; -static int proto_ldap = -1; -static int proto_cldap = -1; - -static int hf_ldap_sasl_buffer_length = -1; -static int hf_ldap_response_in = -1; -static int hf_ldap_response_to = -1; -static int hf_ldap_time = -1; -static int hf_ldap_guid = -1; - -static int hf_mscldap_ntver_flags = -1; -static int hf_mscldap_ntver_flags_v1 = -1; -static int hf_mscldap_ntver_flags_v5 = -1; -static int hf_mscldap_ntver_flags_v5ex = -1; -static int hf_mscldap_ntver_flags_v5ep = -1; -static int hf_mscldap_ntver_flags_vcs = -1; -static int hf_mscldap_ntver_flags_vnt4 = -1; -static int hf_mscldap_ntver_flags_vpdc = -1; -static int hf_mscldap_ntver_flags_vip = -1; -static int hf_mscldap_ntver_flags_vl = -1; -static int hf_mscldap_ntver_flags_vgc = -1; - -static int hf_mscldap_netlogon_ipaddress_family = -1; -static int hf_mscldap_netlogon_ipaddress_port = -1; -static int hf_mscldap_netlogon_ipaddress = -1; -static int hf_mscldap_netlogon_ipaddress_ipv4 = -1; -static int hf_mscldap_netlogon_opcode = -1; -static int hf_mscldap_netlogon_flags = -1; -static int hf_mscldap_netlogon_flags_pdc = -1; -static int hf_mscldap_netlogon_flags_gc = -1; -static int hf_mscldap_netlogon_flags_ldap = -1; -static int hf_mscldap_netlogon_flags_ds = -1; -static int hf_mscldap_netlogon_flags_kdc = -1; -static int hf_mscldap_netlogon_flags_timeserv = -1; -static int hf_mscldap_netlogon_flags_closest = -1; -static int hf_mscldap_netlogon_flags_writable = -1; -static int hf_mscldap_netlogon_flags_good_timeserv = -1; -static int hf_mscldap_netlogon_flags_ndnc = -1; -static int hf_mscldap_netlogon_flags_fnc = -1; -static int hf_mscldap_netlogon_flags_dnc = -1; -static int hf_mscldap_netlogon_flags_dns = -1; -static int hf_mscldap_netlogon_flags_wdc = -1; -static int hf_mscldap_netlogon_flags_rodc = -1; -static int hf_mscldap_domain_guid = -1; -static int hf_mscldap_forest = -1; -static int hf_mscldap_domain = -1; -static int hf_mscldap_hostname = -1; -static int hf_mscldap_nb_domain_z = -1; -static int hf_mscldap_nb_domain = -1; -static int hf_mscldap_nb_hostname_z = -1; -static int hf_mscldap_nb_hostname = -1; -static int hf_mscldap_username_z = -1; -static int hf_mscldap_username = -1; -static int hf_mscldap_sitename = -1; -static int hf_mscldap_clientsitename = -1; -static int hf_mscldap_netlogon_lm_token = -1; -static int hf_mscldap_netlogon_nt_token = -1; -static int hf_ldap_sid = -1; -static int hf_ldap_AccessMask_ADS_CREATE_CHILD = -1; -static int hf_ldap_AccessMask_ADS_DELETE_CHILD = -1; -static int hf_ldap_AccessMask_ADS_LIST = -1; -static int hf_ldap_AccessMask_ADS_SELF_WRITE = -1; -static int hf_ldap_AccessMask_ADS_READ_PROP = -1; -static int hf_ldap_AccessMask_ADS_WRITE_PROP = -1; -static int hf_ldap_AccessMask_ADS_DELETE_TREE = -1; -static int hf_ldap_AccessMask_ADS_LIST_OBJECT = -1; -static int hf_ldap_AccessMask_ADS_CONTROL_ACCESS = -1; -static int hf_ldap_LDAPMessage_PDU = -1; -static int hf_ldap_object_security_flag = -1; -static int hf_ldap_ancestor_first_flag = -1; -static int hf_ldap_public_data_only_flag = -1; -static int hf_ldap_incremental_value_flag = -1; -static int hf_ldap_oid = -1; -static int hf_ldap_gssapi_encrypted_payload = -1; +static int proto_ldap; +static int proto_cldap; + +static int hf_ldap_sasl_buffer_length; +static int hf_ldap_response_in; +static int hf_ldap_response_to; +static int hf_ldap_time; +static int hf_ldap_guid; + +static int hf_mscldap_ntver_flags; +static int hf_mscldap_ntver_flags_v1; +static int hf_mscldap_ntver_flags_v5; +static int hf_mscldap_ntver_flags_v5ex; +static int hf_mscldap_ntver_flags_v5ep; +static int hf_mscldap_ntver_flags_vcs; +static int hf_mscldap_ntver_flags_vnt4; +static int hf_mscldap_ntver_flags_vpdc; +static int hf_mscldap_ntver_flags_vip; +static int hf_mscldap_ntver_flags_vl; +static int hf_mscldap_ntver_flags_vgc; + +static int hf_mscldap_netlogon_ipaddress_family; +static int hf_mscldap_netlogon_ipaddress_port; +static int hf_mscldap_netlogon_ipaddress; +static int hf_mscldap_netlogon_ipaddress_ipv4; +static int hf_mscldap_netlogon_opcode; +static int hf_mscldap_netlogon_flags; +static int hf_mscldap_netlogon_flags_pdc; +static int hf_mscldap_netlogon_flags_gc; +static int hf_mscldap_netlogon_flags_ldap; +static int hf_mscldap_netlogon_flags_ds; +static int hf_mscldap_netlogon_flags_kdc; +static int hf_mscldap_netlogon_flags_timeserv; +static int hf_mscldap_netlogon_flags_closest; +static int hf_mscldap_netlogon_flags_writable; +static int hf_mscldap_netlogon_flags_good_timeserv; +static int hf_mscldap_netlogon_flags_ndnc; +static int hf_mscldap_netlogon_flags_fnc; +static int hf_mscldap_netlogon_flags_dnc; +static int hf_mscldap_netlogon_flags_dns; +static int hf_mscldap_netlogon_flags_wdc; +static int hf_mscldap_netlogon_flags_rodc; +static int hf_mscldap_domain_guid; +static int hf_mscldap_forest; +static int hf_mscldap_domain; +static int hf_mscldap_hostname; +static int hf_mscldap_nb_domain_z; +static int hf_mscldap_nb_domain; +static int hf_mscldap_nb_hostname_z; +static int hf_mscldap_nb_hostname; +static int hf_mscldap_username_z; +static int hf_mscldap_username; +static int hf_mscldap_sitename; +static int hf_mscldap_clientsitename; +static int hf_mscldap_netlogon_lm_token; +static int hf_mscldap_netlogon_nt_token; +static int hf_ldap_sid; +static int hf_ldap_AccessMask_ADS_CREATE_CHILD; +static int hf_ldap_AccessMask_ADS_DELETE_CHILD; +static int hf_ldap_AccessMask_ADS_LIST; +static int hf_ldap_AccessMask_ADS_SELF_WRITE; +static int hf_ldap_AccessMask_ADS_READ_PROP; +static int hf_ldap_AccessMask_ADS_WRITE_PROP; +static int hf_ldap_AccessMask_ADS_DELETE_TREE; +static int hf_ldap_AccessMask_ADS_LIST_OBJECT; +static int hf_ldap_AccessMask_ADS_CONTROL_ACCESS; +static int hf_ldap_LDAPMessage_PDU; +static int hf_ldap_object_security_flag; +static int hf_ldap_ancestor_first_flag; +static int hf_ldap_public_data_only_flag; +static int hf_ldap_incremental_value_flag; +static int hf_ldap_oid; +static int hf_ldap_gssapi_encrypted_payload; #include "packet-ldap-hf.c" /* Initialize the subtree pointers */ -static gint ett_ldap = -1; -static gint ett_ldap_msg = -1; -static gint ett_ldap_sasl_blob = -1; -static gint ett_ldap_payload = -1; -static gint ett_mscldap_netlogon_flags = -1; -static gint ett_mscldap_ntver_flags = -1; -static gint ett_mscldap_ipdetails = -1; -static gint ett_ldap_DirSyncFlagsSubEntry = -1; +static gint ett_ldap; +static gint ett_ldap_msg; +static gint ett_ldap_sasl_blob; +static gint ett_ldap_payload; +static gint ett_mscldap_netlogon_flags; +static gint ett_mscldap_ntver_flags; +static gint ett_mscldap_ipdetails; +static gint ett_ldap_DirSyncFlagsSubEntry; #include "packet-ldap-ett.c" -static expert_field ei_ldap_exceeded_filter_length = EI_INIT; -static expert_field ei_ldap_too_many_filter_elements = EI_INIT; +static expert_field ei_ldap_exceeded_filter_length; +static expert_field ei_ldap_too_many_filter_elements; static dissector_table_t ldap_name_dissector_table=NULL; static const char *object_identifier_id = NULL; /* LDAP OID */ diff --git a/epan/dissectors/asn1/lix2/packet-lix2-template.c b/epan/dissectors/asn1/lix2/packet-lix2-template.c index 9a7c14e13b..5cfb767038 100644 --- a/epan/dissectors/asn1/lix2/packet-lix2-template.c +++ b/epan/dissectors/asn1/lix2/packet-lix2-template.c @@ -26,7 +26,7 @@ void proto_reg_handoff_lix2(void); void proto_register_lix2(void); /* Initialize the protocol and registered fields */ -static int proto_lix2 = -1; +static int proto_lix2; static dissector_handle_t lix2_handle = NULL; diff --git a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c index e1a989ff24..6dfc86d79b 100644 --- a/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c +++ b/epan/dissectors/asn1/lnpdqp/packet-lnpdqp-template.c @@ -35,30 +35,30 @@ void proto_reg_handoff_lnpdqp(void); void proto_register_lnpdqp(void); /* Initialize the protocol and registered fields */ -static int proto_lnpdqp = -1; +static int proto_lnpdqp; -static int hf_lnpdqp_type_of_digits = -1; -static int hf_lnpdqp_nature_of_number = -1; -static int hf_lnpdqp_digits_enc = -1; -static int hf_lnpdqp_np = -1; -static int hf_lnpdqp_nr_digits = -1; -static int hf_lnpdqp_bcd_digits = -1; -static int hf_lnpdqp_ia5_digits = -1; +static int hf_lnpdqp_type_of_digits; +static int hf_lnpdqp_nature_of_number; +static int hf_lnpdqp_digits_enc; +static int hf_lnpdqp_np; +static int hf_lnpdqp_nr_digits; +static int hf_lnpdqp_bcd_digits; +static int hf_lnpdqp_ia5_digits; /* asn2wrs/the ber dissector does not handle the same tag used multiple times * in asn1 description, do some magic to handle. */ -static int hf_lnpdqp_networkRoutingNumber = -1; /* Digits */ -static int hf_lnpdqp_callingPartyANI = -1; /* Digits */ -static int hf_lnpdqp_originatingLATA = -1; /* Digits */ -static int hf_lnpdqp_carrierID = -1; /* Digits */ +static int hf_lnpdqp_networkRoutingNumber; /* Digits */ +static int hf_lnpdqp_callingPartyANI; /* Digits */ +static int hf_lnpdqp_originatingLATA; /* Digits */ +static int hf_lnpdqp_carrierID; /* Digits */ #include "packet-lnpdqp-hf.c" -static int ett_lnpdqp = -1; -static int ett_lnpdqp_digitstype = -1; -static int ett_lnpdqp_digits = -1; +static int ett_lnpdqp; +static int ett_lnpdqp_digitstype; +static int ett_lnpdqp_digits; #include "packet-lnpdqp-ett.c" diff --git a/epan/dissectors/asn1/logotypecertextn/packet-logotypecertextn-template.c b/epan/dissectors/asn1/logotypecertextn/packet-logotypecertextn-template.c index a212905050..4564baf9bb 100644 --- a/epan/dissectors/asn1/logotypecertextn/packet-logotypecertextn-template.c +++ b/epan/dissectors/asn1/logotypecertextn/packet-logotypecertextn-template.c @@ -25,7 +25,7 @@ void proto_register_logotypecertextn(void); void proto_reg_handoff_logotypecertextn(void); /* Initialize the protocol and registered fields */ -static int proto_logotypecertextn = -1; +static int proto_logotypecertextn; #include "packet-logotypecertextn-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/lpp/packet-lpp-template.c b/epan/dissectors/asn1/lpp/packet-lpp-template.c index cfc24370b2..fff1a97d7d 100644 --- a/epan/dissectors/asn1/lpp/packet-lpp-template.c +++ b/epan/dissectors/asn1/lpp/packet-lpp-template.c @@ -32,31 +32,31 @@ void proto_register_lpp(void); void proto_reg_handoff_lpp(void); /* Initialize the protocol and registered fields */ -static int proto_lpp = -1; +static int proto_lpp; #include "packet-lpp-hf.c" -static int hf_lpp_svHealthExt_v1240_e5bhs = -1; -static int hf_lpp_svHealthExt_v1240_e1_bhs = -1; -static int hf_lpp_kepSV_StatusINAV_e5bhs = -1; -static int hf_lpp_kepSV_StatusINAV_e1_bhs = -1; -static int hf_lpp_kepSV_StatusFNAV_e5ahs = -1; -static int hf_lpp_bdsSvHealth_r12_sat_clock = -1; -static int hf_lpp_bdsSvHealth_r12_b1i = -1; -static int hf_lpp_bdsSvHealth_r12_b2i = -1; -static int hf_lpp_bdsSvHealth_r12_nav = -1; -static int hf_lpp_AssistanceDataSIBelement_r15_PDU = -1; +static int hf_lpp_svHealthExt_v1240_e5bhs; +static int hf_lpp_svHealthExt_v1240_e1_bhs; +static int hf_lpp_kepSV_StatusINAV_e5bhs; +static int hf_lpp_kepSV_StatusINAV_e1_bhs; +static int hf_lpp_kepSV_StatusFNAV_e5ahs; +static int hf_lpp_bdsSvHealth_r12_sat_clock; +static int hf_lpp_bdsSvHealth_r12_b1i; +static int hf_lpp_bdsSvHealth_r12_b2i; +static int hf_lpp_bdsSvHealth_r12_nav; +static int hf_lpp_AssistanceDataSIBelement_r15_PDU; static dissector_handle_t lppe_handle = NULL; static guint32 lpp_epdu_id = -1; /* Initialize the subtree pointers */ -static gint ett_lpp = -1; -static gint ett_lpp_svHealthExt_v1240 = -1; -static gint ett_kepSV_StatusINAV = -1; -static gint ett_kepSV_StatusFNAV = -1; -static gint ett_lpp_bdsSvHealth_r12 = -1; -static gint ett_lpp_assistanceDataElement_r15 = -1; +static gint ett_lpp; +static gint ett_lpp_svHealthExt_v1240; +static gint ett_kepSV_StatusINAV; +static gint ett_kepSV_StatusFNAV; +static gint ett_lpp_bdsSvHealth_r12; +static gint ett_lpp_assistanceDataElement_r15; #include "packet-lpp-ett.c" /* Include constants */ diff --git a/epan/dissectors/asn1/lppa/packet-lppa-template.c b/epan/dissectors/asn1/lppa/packet-lppa-template.c index 56277499a2..174246f9b3 100644 --- a/epan/dissectors/asn1/lppa/packet-lppa-template.c +++ b/epan/dissectors/asn1/lppa/packet-lppa-template.c @@ -29,12 +29,12 @@ void proto_register_lppa(void); void proto_reg_handoff_lppa(void); /* Initialize the protocol and registered fields */ -static int proto_lppa = -1; +static int proto_lppa; #include "packet-lppa-hf.c" /* Initialize the subtree pointers */ -static gint ett_lppa = -1; +static gint ett_lppa; #include "packet-lppa-ett.c" enum { diff --git a/epan/dissectors/asn1/lppe/packet-lppe-template.c b/epan/dissectors/asn1/lppe/packet-lppe-template.c index 8d8c488d73..0bb5cbd9a6 100644 --- a/epan/dissectors/asn1/lppe/packet-lppe-template.c +++ b/epan/dissectors/asn1/lppe/packet-lppe-template.c @@ -33,15 +33,15 @@ void proto_register_lppe(void); void proto_reg_handoff_lppe(void); /* Initialize the protocol and registered fields */ -static int proto_lppe = -1; +static int proto_lppe; static dissector_handle_t xml_handle; #include "packet-lppe-hf.c" /* Initialize the subtree pointers */ -static gint ett_lppe = -1; -static gint ett_lppe_civicLocation = -1; +static gint ett_lppe; +static gint ett_lppe_civicLocation; #include "packet-lppe-ett.c" /* Include constants */ diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c index a51ef54b34..13e9ce25e9 100644 --- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c @@ -76,269 +76,269 @@ extern int proto_pdcp_lte; #include "packet-lte-rrc-val.h" /* Initialize the protocol and registered fields */ -static int proto_lte_rrc = -1; +static int proto_lte_rrc; #include "packet-lte-rrc-hf.c" -static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_3 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_4 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_5 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_6 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_7 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_8 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_9 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_10 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_11 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_12 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_13 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_14 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_15 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_16 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_17 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_18 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_19 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_20 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_21 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_22 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_23 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_24 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_25 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_26 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_27 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_28 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_29 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_30 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_31 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_32 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_33 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_34 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_35 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_36 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_37 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_38 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_39 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_40 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_41 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_42 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_43 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_44 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_45 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_46 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_47 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_48 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_49 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_50 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_51 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_52 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_53 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_54 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_55 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_56 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_57 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_58 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_59 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_60 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_61 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_62 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_63 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_64 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_101 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_102 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_103 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_104 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_105 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_106 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_107 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_108 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_109 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_110 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_111 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_112 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_113 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_114 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_115 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_116 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_117 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_118 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_119 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_120 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_121 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_122 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_123 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_124 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_125 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_126 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_127 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_128 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_129 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_130 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_131 = -1; -static int hf_lte_rrc_eutra_cap_feat_group_ind_132 = -1; -static int hf_lte_rrc_serialNumber_gs = -1; -static int hf_lte_rrc_serialNumber_msg_code = -1; -static int hf_lte_rrc_serialNumber_upd_nb = -1; -static int hf_lte_rrc_warningType_value = -1; -static int hf_lte_rrc_warningType_emergency_user_alert = -1; -static int hf_lte_rrc_warningType_popup = -1; -static int hf_lte_rrc_warningMessageSegment_nb_pages = -1; -static int hf_lte_rrc_warningMessageSegment_decoded_page = -1; -static int hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1 = -1; -static int hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2 = -1; -static int hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1 = -1; -static int hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2 = -1; -static int hf_lte_rrc_aperiodicCSI_Reporting_r13_bit1 = -1; -static int hf_lte_rrc_aperiodicCSI_Reporting_r13_bit2 = -1; -static int hf_lte_rrc_codebook_HARQ_ACK_r13_bit1 = -1; -static int hf_lte_rrc_codebook_HARQ_ACK_r13_bit2 = -1; -static int hf_lte_rrc_sr_config_periodicity = -1; -static int hf_lte_rrc_sr_config_subframe_offset = -1; -static int hf_lte_rrc_cdma_time = -1; -static int hf_lte_rrc_utc_time = -1; -static int hf_lte_rrc_local_time = -1; -static int hf_lte_rrc_absolute_time = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm1 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm2 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm3 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm4 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm6 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm8 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm9 = -1; -static int hf_lte_rrc_transmissionModeList_r12_tm10 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_0 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_1 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_2 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_3 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_4 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_5 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_6 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_7 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_8 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_9 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_10 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_11 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_12 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_13 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_14 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_15 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_16 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_17 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_18 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_19 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_20 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_21 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_22 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_23 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_24 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_25 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_26 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_27 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_28 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_29 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_30 = -1; -static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31 = -1; -static int hf_lte_rrc_sib11_fragments = -1; -static int hf_lte_rrc_sib11_fragment = -1; -static int hf_lte_rrc_sib11_fragment_overlap = -1; -static int hf_lte_rrc_sib11_fragment_overlap_conflict = -1; -static int hf_lte_rrc_sib11_fragment_multiple_tails = -1; -static int hf_lte_rrc_sib11_fragment_too_long_fragment = -1; -static int hf_lte_rrc_sib11_fragment_error = -1; -static int hf_lte_rrc_sib11_fragment_count = -1; -static int hf_lte_rrc_sib11_reassembled_in = -1; -static int hf_lte_rrc_sib11_reassembled_length = -1; -static int hf_lte_rrc_sib11_reassembled_data = -1; -static int hf_lte_rrc_sib12_fragments = -1; -static int hf_lte_rrc_sib12_fragment = -1; -static int hf_lte_rrc_sib12_fragment_overlap = -1; -static int hf_lte_rrc_sib12_fragment_overlap_conflict = -1; -static int hf_lte_rrc_sib12_fragment_multiple_tails = -1; -static int hf_lte_rrc_sib12_fragment_too_long_fragment = -1; -static int hf_lte_rrc_sib12_fragment_error = -1; -static int hf_lte_rrc_sib12_fragment_count = -1; -static int hf_lte_rrc_sib12_reassembled_in = -1; -static int hf_lte_rrc_sib12_reassembled_length = -1; -static int hf_lte_rrc_sib12_reassembled_data = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit1 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit2 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit3 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit4 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit5 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit6 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit7 = -1; -static int hf_lte_rrc_measGapPatterns_r15_bit8 = -1; +static int hf_lte_rrc_eutra_cap_feat_group_ind_1; +static int hf_lte_rrc_eutra_cap_feat_group_ind_2; +static int hf_lte_rrc_eutra_cap_feat_group_ind_3; +static int hf_lte_rrc_eutra_cap_feat_group_ind_4; +static int hf_lte_rrc_eutra_cap_feat_group_ind_5; +static int hf_lte_rrc_eutra_cap_feat_group_ind_6; +static int hf_lte_rrc_eutra_cap_feat_group_ind_7; +static int hf_lte_rrc_eutra_cap_feat_group_ind_8; +static int hf_lte_rrc_eutra_cap_feat_group_ind_9; +static int hf_lte_rrc_eutra_cap_feat_group_ind_10; +static int hf_lte_rrc_eutra_cap_feat_group_ind_11; +static int hf_lte_rrc_eutra_cap_feat_group_ind_12; +static int hf_lte_rrc_eutra_cap_feat_group_ind_13; +static int hf_lte_rrc_eutra_cap_feat_group_ind_14; +static int hf_lte_rrc_eutra_cap_feat_group_ind_15; +static int hf_lte_rrc_eutra_cap_feat_group_ind_16; +static int hf_lte_rrc_eutra_cap_feat_group_ind_17; +static int hf_lte_rrc_eutra_cap_feat_group_ind_18; +static int hf_lte_rrc_eutra_cap_feat_group_ind_19; +static int hf_lte_rrc_eutra_cap_feat_group_ind_20; +static int hf_lte_rrc_eutra_cap_feat_group_ind_21; +static int hf_lte_rrc_eutra_cap_feat_group_ind_22; +static int hf_lte_rrc_eutra_cap_feat_group_ind_23; +static int hf_lte_rrc_eutra_cap_feat_group_ind_24; +static int hf_lte_rrc_eutra_cap_feat_group_ind_25; +static int hf_lte_rrc_eutra_cap_feat_group_ind_26; +static int hf_lte_rrc_eutra_cap_feat_group_ind_27; +static int hf_lte_rrc_eutra_cap_feat_group_ind_28; +static int hf_lte_rrc_eutra_cap_feat_group_ind_29; +static int hf_lte_rrc_eutra_cap_feat_group_ind_30; +static int hf_lte_rrc_eutra_cap_feat_group_ind_31; +static int hf_lte_rrc_eutra_cap_feat_group_ind_32; +static int hf_lte_rrc_eutra_cap_feat_group_ind_33; +static int hf_lte_rrc_eutra_cap_feat_group_ind_34; +static int hf_lte_rrc_eutra_cap_feat_group_ind_35; +static int hf_lte_rrc_eutra_cap_feat_group_ind_36; +static int hf_lte_rrc_eutra_cap_feat_group_ind_37; +static int hf_lte_rrc_eutra_cap_feat_group_ind_38; +static int hf_lte_rrc_eutra_cap_feat_group_ind_39; +static int hf_lte_rrc_eutra_cap_feat_group_ind_40; +static int hf_lte_rrc_eutra_cap_feat_group_ind_41; +static int hf_lte_rrc_eutra_cap_feat_group_ind_42; +static int hf_lte_rrc_eutra_cap_feat_group_ind_43; +static int hf_lte_rrc_eutra_cap_feat_group_ind_44; +static int hf_lte_rrc_eutra_cap_feat_group_ind_45; +static int hf_lte_rrc_eutra_cap_feat_group_ind_46; +static int hf_lte_rrc_eutra_cap_feat_group_ind_47; +static int hf_lte_rrc_eutra_cap_feat_group_ind_48; +static int hf_lte_rrc_eutra_cap_feat_group_ind_49; +static int hf_lte_rrc_eutra_cap_feat_group_ind_50; +static int hf_lte_rrc_eutra_cap_feat_group_ind_51; +static int hf_lte_rrc_eutra_cap_feat_group_ind_52; +static int hf_lte_rrc_eutra_cap_feat_group_ind_53; +static int hf_lte_rrc_eutra_cap_feat_group_ind_54; +static int hf_lte_rrc_eutra_cap_feat_group_ind_55; +static int hf_lte_rrc_eutra_cap_feat_group_ind_56; +static int hf_lte_rrc_eutra_cap_feat_group_ind_57; +static int hf_lte_rrc_eutra_cap_feat_group_ind_58; +static int hf_lte_rrc_eutra_cap_feat_group_ind_59; +static int hf_lte_rrc_eutra_cap_feat_group_ind_60; +static int hf_lte_rrc_eutra_cap_feat_group_ind_61; +static int hf_lte_rrc_eutra_cap_feat_group_ind_62; +static int hf_lte_rrc_eutra_cap_feat_group_ind_63; +static int hf_lte_rrc_eutra_cap_feat_group_ind_64; +static int hf_lte_rrc_eutra_cap_feat_group_ind_101; +static int hf_lte_rrc_eutra_cap_feat_group_ind_102; +static int hf_lte_rrc_eutra_cap_feat_group_ind_103; +static int hf_lte_rrc_eutra_cap_feat_group_ind_104; +static int hf_lte_rrc_eutra_cap_feat_group_ind_105; +static int hf_lte_rrc_eutra_cap_feat_group_ind_106; +static int hf_lte_rrc_eutra_cap_feat_group_ind_107; +static int hf_lte_rrc_eutra_cap_feat_group_ind_108; +static int hf_lte_rrc_eutra_cap_feat_group_ind_109; +static int hf_lte_rrc_eutra_cap_feat_group_ind_110; +static int hf_lte_rrc_eutra_cap_feat_group_ind_111; +static int hf_lte_rrc_eutra_cap_feat_group_ind_112; +static int hf_lte_rrc_eutra_cap_feat_group_ind_113; +static int hf_lte_rrc_eutra_cap_feat_group_ind_114; +static int hf_lte_rrc_eutra_cap_feat_group_ind_115; +static int hf_lte_rrc_eutra_cap_feat_group_ind_116; +static int hf_lte_rrc_eutra_cap_feat_group_ind_117; +static int hf_lte_rrc_eutra_cap_feat_group_ind_118; +static int hf_lte_rrc_eutra_cap_feat_group_ind_119; +static int hf_lte_rrc_eutra_cap_feat_group_ind_120; +static int hf_lte_rrc_eutra_cap_feat_group_ind_121; +static int hf_lte_rrc_eutra_cap_feat_group_ind_122; +static int hf_lte_rrc_eutra_cap_feat_group_ind_123; +static int hf_lte_rrc_eutra_cap_feat_group_ind_124; +static int hf_lte_rrc_eutra_cap_feat_group_ind_125; +static int hf_lte_rrc_eutra_cap_feat_group_ind_126; +static int hf_lte_rrc_eutra_cap_feat_group_ind_127; +static int hf_lte_rrc_eutra_cap_feat_group_ind_128; +static int hf_lte_rrc_eutra_cap_feat_group_ind_129; +static int hf_lte_rrc_eutra_cap_feat_group_ind_130; +static int hf_lte_rrc_eutra_cap_feat_group_ind_131; +static int hf_lte_rrc_eutra_cap_feat_group_ind_132; +static int hf_lte_rrc_serialNumber_gs; +static int hf_lte_rrc_serialNumber_msg_code; +static int hf_lte_rrc_serialNumber_upd_nb; +static int hf_lte_rrc_warningType_value; +static int hf_lte_rrc_warningType_emergency_user_alert; +static int hf_lte_rrc_warningType_popup; +static int hf_lte_rrc_warningMessageSegment_nb_pages; +static int hf_lte_rrc_warningMessageSegment_decoded_page; +static int hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1; +static int hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2; +static int hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1; +static int hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2; +static int hf_lte_rrc_aperiodicCSI_Reporting_r13_bit1; +static int hf_lte_rrc_aperiodicCSI_Reporting_r13_bit2; +static int hf_lte_rrc_codebook_HARQ_ACK_r13_bit1; +static int hf_lte_rrc_codebook_HARQ_ACK_r13_bit2; +static int hf_lte_rrc_sr_config_periodicity; +static int hf_lte_rrc_sr_config_subframe_offset; +static int hf_lte_rrc_cdma_time; +static int hf_lte_rrc_utc_time; +static int hf_lte_rrc_local_time; +static int hf_lte_rrc_absolute_time; +static int hf_lte_rrc_transmissionModeList_r12_tm1; +static int hf_lte_rrc_transmissionModeList_r12_tm2; +static int hf_lte_rrc_transmissionModeList_r12_tm3; +static int hf_lte_rrc_transmissionModeList_r12_tm4; +static int hf_lte_rrc_transmissionModeList_r12_tm6; +static int hf_lte_rrc_transmissionModeList_r12_tm8; +static int hf_lte_rrc_transmissionModeList_r12_tm9; +static int hf_lte_rrc_transmissionModeList_r12_tm10; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_0; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_2; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_3; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_4; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_5; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_6; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_7; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_8; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_9; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_10; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_11; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_12; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_13; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_14; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_15; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_16; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_17; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_18; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_19; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_20; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_21; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_22; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_23; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_24; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_25; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_26; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_27; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_28; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_29; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_30; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31; +static int hf_lte_rrc_sib11_fragments; +static int hf_lte_rrc_sib11_fragment; +static int hf_lte_rrc_sib11_fragment_overlap; +static int hf_lte_rrc_sib11_fragment_overlap_conflict; +static int hf_lte_rrc_sib11_fragment_multiple_tails; +static int hf_lte_rrc_sib11_fragment_too_long_fragment; +static int hf_lte_rrc_sib11_fragment_error; +static int hf_lte_rrc_sib11_fragment_count; +static int hf_lte_rrc_sib11_reassembled_in; +static int hf_lte_rrc_sib11_reassembled_length; +static int hf_lte_rrc_sib11_reassembled_data; +static int hf_lte_rrc_sib12_fragments; +static int hf_lte_rrc_sib12_fragment; +static int hf_lte_rrc_sib12_fragment_overlap; +static int hf_lte_rrc_sib12_fragment_overlap_conflict; +static int hf_lte_rrc_sib12_fragment_multiple_tails; +static int hf_lte_rrc_sib12_fragment_too_long_fragment; +static int hf_lte_rrc_sib12_fragment_error; +static int hf_lte_rrc_sib12_fragment_count; +static int hf_lte_rrc_sib12_reassembled_in; +static int hf_lte_rrc_sib12_reassembled_length; +static int hf_lte_rrc_sib12_reassembled_data; +static int hf_lte_rrc_measGapPatterns_r15_bit1; +static int hf_lte_rrc_measGapPatterns_r15_bit2; +static int hf_lte_rrc_measGapPatterns_r15_bit3; +static int hf_lte_rrc_measGapPatterns_r15_bit4; +static int hf_lte_rrc_measGapPatterns_r15_bit5; +static int hf_lte_rrc_measGapPatterns_r15_bit6; +static int hf_lte_rrc_measGapPatterns_r15_bit7; +static int hf_lte_rrc_measGapPatterns_r15_bit8; /* Initialize the subtree pointers */ -static int ett_lte_rrc = -1; +static int ett_lte_rrc; #include "packet-lte-rrc-ett.c" -static gint ett_lte_rrc_featureGroupIndicators = -1; -static gint ett_lte_rrc_featureGroupIndRel9Add = -1; -static gint ett_lte_rrc_featureGroupIndRel10 = -1; -static gint ett_lte_rrc_absTimeInfo = -1; -static gint ett_lte_rrc_nas_SecurityParam = -1; -static gint ett_lte_rrc_targetRAT_MessageContainer = -1; -static gint ett_lte_rrc_siPsiSibContainer = -1; -static gint ett_lte_rrc_dedicatedInfoNAS = -1; -static gint ett_lte_rrc_timeInfo = -1; -static gint ett_lte_rrc_serialNumber = -1; -static gint ett_lte_rrc_warningType = -1; -static gint ett_lte_rrc_dataCodingScheme = -1; -static gint ett_lte_rrc_warningMessageSegment = -1; -static gint ett_lte_rrc_interBandTDD_CA_WithDifferentConfig = -1; -static gint ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12 = -1; -static gint ett_lte_rrc_aperiodicCSI_Reporting_r13 = -1; -static gint ett_lte_rrc_codebook_HARQ_ACK_r13 = -1; -static gint ett_lte_rrc_sr_ConfigIndex = -1; -static gint ett_lte_rrc_transmissionModeList_r12 = -1; -static gint ett_lte_rrc_modifiedMPR_Behavior_r10 = -1; -static gint ett_lte_rrc_sib11_fragment = -1; -static gint ett_lte_rrc_sib11_fragments = -1; -static gint ett_lte_rrc_sib12_fragment = -1; -static gint ett_lte_rrc_sib12_fragments = -1; -static gint ett_lte_rrc_nr_SecondaryCellGroupConfig_r15 = -1; -static gint ett_lte_rrc_nr_RadioBearerConfig_r15 = -1; -static gint ett_lte_rrc_nr_RadioBearerConfigS_r15 = -1; -static gint ett_lte_rrc_sl_ConfigDedicatedForNR_r16 = -1; -static gint ett_lte_rrc_nr_SecondaryCellGroupConfig = -1; -static gint ett_lte_rrc_scg_ConfigResponseNR_r15 = -1; -static gint ett_lte_rrc_scg_ConfigResponseNR_r16 = -1; -static gint ett_lte_rrc_measResultSCG_r15 = -1; -static gint ett_lte_rrc_measResultSCG_r16 = -1; -static gint ett_lte_rrc_ul_DCCH_MessageNR_r15 = -1; -static gint ett_lte_rrc_ul_DCCH_MessageNR_r16 = -1; -static gint ett_lte_rrc_sourceRB_ConfigNR_r15 = -1; -static gint ett_lte_rrc_sourceRB_ConfigSN_NR_r15 = -1; -static gint ett_lte_rrc_sourceOtherConfigSN_NR_r15 = -1; -static gint ett_lte_rrc_sourceContextEN_DC_r15 = -1; -static gint ett_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1; -static gint ett_lte_rrc_measGapPatterns_r15 = -1; -static gint ett_lte_rrc_nas_Container_r15 = -1; -static gint ett_lte_rrc_sourceRB_ConfigIntra5GC_r15 = -1; -static gint ett_lte_rrc_selectedbandCombinationInfoEN_DC_v1540 = -1; -static gint ett_lte_rrc_requestedCapabilityCommon_r15 = -1; -static gint ett_lte_rrc_sidelinkUEInformationNR_r16 = -1; -static gint ett_lte_rrc_ueAssistanceInformationNR_r16 = -1; -static gint ett_lte_rrc_sl_ParameterNR_r16 = -1; -static gint ett_lte_rrc_v2x_BandParametersNR_r16 = -1; -static gint ett_lte_rrc_ueAssistanceInformationNR_SCG_r16 = -1; -static gint ett_lte_rrc_assistanceDataSIB_Element_r15 = -1; -static gint ett_lte_rrc_overheatingAssistanceForSCG_r16 = -1; -static gint ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17 = -1; -static gint ett_lte_rrc_triggerConditionSN_r17 = -1; - -static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT; -static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT; -static expert_field ei_lte_rrc_sibs_changing = EI_INIT; -static expert_field ei_lte_rrc_sibs_changing_edrx = EI_INIT; -static expert_field ei_lte_rrc_earthquake_warning_sys = EI_INIT; -static expert_field ei_lte_rrc_commercial_mobile_alert_sys = EI_INIT; -static expert_field ei_lte_rrc_unexpected_type_value = EI_INIT; -static expert_field ei_lte_rrc_unexpected_length_value = EI_INIT; -static expert_field ei_lte_rrc_too_many_group_a_rapids = EI_INIT; -static expert_field ei_lte_rrc_invalid_drx_config = EI_INIT; +static gint ett_lte_rrc_featureGroupIndicators; +static gint ett_lte_rrc_featureGroupIndRel9Add; +static gint ett_lte_rrc_featureGroupIndRel10; +static gint ett_lte_rrc_absTimeInfo; +static gint ett_lte_rrc_nas_SecurityParam; +static gint ett_lte_rrc_targetRAT_MessageContainer; +static gint ett_lte_rrc_siPsiSibContainer; +static gint ett_lte_rrc_dedicatedInfoNAS; +static gint ett_lte_rrc_timeInfo; +static gint ett_lte_rrc_serialNumber; +static gint ett_lte_rrc_warningType; +static gint ett_lte_rrc_dataCodingScheme; +static gint ett_lte_rrc_warningMessageSegment; +static gint ett_lte_rrc_interBandTDD_CA_WithDifferentConfig; +static gint ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12; +static gint ett_lte_rrc_aperiodicCSI_Reporting_r13; +static gint ett_lte_rrc_codebook_HARQ_ACK_r13; +static gint ett_lte_rrc_sr_ConfigIndex; +static gint ett_lte_rrc_transmissionModeList_r12; +static gint ett_lte_rrc_modifiedMPR_Behavior_r10; +static gint ett_lte_rrc_sib11_fragment; +static gint ett_lte_rrc_sib11_fragments; +static gint ett_lte_rrc_sib12_fragment; +static gint ett_lte_rrc_sib12_fragments; +static gint ett_lte_rrc_nr_SecondaryCellGroupConfig_r15; +static gint ett_lte_rrc_nr_RadioBearerConfig_r15; +static gint ett_lte_rrc_nr_RadioBearerConfigS_r15; +static gint ett_lte_rrc_sl_ConfigDedicatedForNR_r16; +static gint ett_lte_rrc_nr_SecondaryCellGroupConfig; +static gint ett_lte_rrc_scg_ConfigResponseNR_r15; +static gint ett_lte_rrc_scg_ConfigResponseNR_r16; +static gint ett_lte_rrc_measResultSCG_r15; +static gint ett_lte_rrc_measResultSCG_r16; +static gint ett_lte_rrc_ul_DCCH_MessageNR_r15; +static gint ett_lte_rrc_ul_DCCH_MessageNR_r16; +static gint ett_lte_rrc_sourceRB_ConfigNR_r15; +static gint ett_lte_rrc_sourceRB_ConfigSN_NR_r15; +static gint ett_lte_rrc_sourceOtherConfigSN_NR_r15; +static gint ett_lte_rrc_sourceContextEN_DC_r15; +static gint ett_lte_rrc_requestedFreqBandsNR_MRDC_r15; +static gint ett_lte_rrc_measGapPatterns_r15; +static gint ett_lte_rrc_nas_Container_r15; +static gint ett_lte_rrc_sourceRB_ConfigIntra5GC_r15; +static gint ett_lte_rrc_selectedbandCombinationInfoEN_DC_v1540; +static gint ett_lte_rrc_requestedCapabilityCommon_r15; +static gint ett_lte_rrc_sidelinkUEInformationNR_r16; +static gint ett_lte_rrc_ueAssistanceInformationNR_r16; +static gint ett_lte_rrc_sl_ParameterNR_r16; +static gint ett_lte_rrc_v2x_BandParametersNR_r16; +static gint ett_lte_rrc_ueAssistanceInformationNR_SCG_r16; +static gint ett_lte_rrc_assistanceDataSIB_Element_r15; +static gint ett_lte_rrc_overheatingAssistanceForSCG_r16; +static gint ett_lte_rrc_overheatingAssistanceForSCG_FR2_2_r17; +static gint ett_lte_rrc_triggerConditionSN_r17; + +static expert_field ei_lte_rrc_number_pages_le15; +static expert_field ei_lte_rrc_si_info_value_changed; +static expert_field ei_lte_rrc_sibs_changing; +static expert_field ei_lte_rrc_sibs_changing_edrx; +static expert_field ei_lte_rrc_earthquake_warning_sys; +static expert_field ei_lte_rrc_commercial_mobile_alert_sys; +static expert_field ei_lte_rrc_unexpected_type_value; +static expert_field ei_lte_rrc_unexpected_length_value; +static expert_field ei_lte_rrc_too_many_group_a_rapids; +static expert_field ei_lte_rrc_invalid_drx_config; static const unit_name_string units_sr_periods = { " SR period", " SR periods" }; static const unit_name_string units_short_drx_cycles = { " shortDRX-Cycle", " shortDRX-Cycles" }; diff --git a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c index b7d9c2297e..82cf49e2d1 100644 --- a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c +++ b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c @@ -35,19 +35,19 @@ void proto_reg_handoff_m2ap(void); #include "packet-m2ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_m2ap = -1; +static int proto_m2ap; -static int hf_m2ap_IPAddress_v4 = -1; -static int hf_m2ap_IPAddress_v6 = -1; +static int hf_m2ap_IPAddress_v4; +static int hf_m2ap_IPAddress_v6; #include "packet-m2ap-hf.c" /* Initialize the subtree pointers */ -static int ett_m2ap = -1; -static int ett_m2ap_PLMN_Identity = -1; -static int ett_m2ap_IPAddress = -1; +static int ett_m2ap; +static int ett_m2ap_PLMN_Identity; +static int ett_m2ap_IPAddress; #include "packet-m2ap-ett.c" -static expert_field ei_m2ap_invalid_ip_address_len = EI_INIT; +static expert_field ei_m2ap_invalid_ip_address_len; struct m2ap_private_data { e212_number_type_t number_type; diff --git a/epan/dissectors/asn1/m3ap/packet-m3ap-template.c b/epan/dissectors/asn1/m3ap/packet-m3ap-template.c index d2c2c38951..5718898825 100644 --- a/epan/dissectors/asn1/m3ap/packet-m3ap-template.c +++ b/epan/dissectors/asn1/m3ap/packet-m3ap-template.c @@ -39,20 +39,20 @@ static dissector_handle_t m3ap_handle=NULL; #include "packet-m3ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_m3ap = -1; +static int proto_m3ap; -static int hf_m3ap_Absolute_Time_ofMBMS_Data_value = -1; -static int hf_m3ap_IPAddress_v4 = -1; -static int hf_m3ap_IPAddress_v6 = -1; +static int hf_m3ap_Absolute_Time_ofMBMS_Data_value; +static int hf_m3ap_IPAddress_v4; +static int hf_m3ap_IPAddress_v6; #include "packet-m3ap-hf.c" /* Initialize the subtree pointers */ -static int ett_m3ap = -1; -static int ett_m3ap_IPAddress = -1; +static int ett_m3ap; +static int ett_m3ap_IPAddress; #include "packet-m3ap-ett.c" -static expert_field ei_m3ap_invalid_ip_address_len = EI_INIT; +static expert_field ei_m3ap_invalid_ip_address_len; struct m3ap_private_data { e212_number_type_t number_type; diff --git a/epan/dissectors/asn1/mms/mms.cnf b/epan/dissectors/asn1/mms/mms.cnf index 68190ade0b..30adfa666b 100644 --- a/epan/dissectors/asn1/mms/mms.cnf +++ b/epan/dissectors/asn1/mms/mms.cnf @@ -111,7 +111,7 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment- milliseconds = tvb_get_ntohl(tvb, offset); ptime = signed_time_msecs_to_str(actx->pinfo->pool, milliseconds); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, ptime); } @@ -130,7 +130,7 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment- ts.nsecs = (milliseconds %% 1000) * 1000000U; ptime = abs_time_to_str(actx->pinfo->pool, &ts, ABSOLUTE_TIME_UTC, TRUE); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, ptime); } @@ -140,7 +140,7 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment- proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_timeofday_encoding, tvb, offset, len, "BER Error: malformed TimeOfDay encoding, length must be 4 or 6 bytes"); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, "????"); } @@ -160,7 +160,7 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment- { proto_tree_add_expert_format(tree, actx->pinfo, &ei_mms_mal_utctime_encoding, tvb, offset, len, "BER Error: malformed IEC61850 UTCTime encoding, length must be 8 bytes"); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, "????"); } @@ -176,7 +176,7 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment- ptime = abs_time_to_str(actx->pinfo->pool, &ts, ABSOLUTE_TIME_UTC, TRUE); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, ptime); } diff --git a/epan/dissectors/asn1/mms/packet-mms-template.c b/epan/dissectors/asn1/mms/packet-mms-template.c index 2706003d5d..b1f790248d 100644 --- a/epan/dissectors/asn1/mms/packet-mms-template.c +++ b/epan/dissectors/asn1/mms/packet-mms-template.c @@ -29,17 +29,17 @@ void proto_register_mms(void); void proto_reg_handoff_mms(void); /* Initialize the protocol and registered fields */ -static int proto_mms = -1; +static int proto_mms; #include "packet-mms-hf.c" /* Initialize the subtree pointers */ -static gint ett_mms = -1; +static gint ett_mms; #include "packet-mms-ett.c" -static expert_field ei_mms_mal_timeofday_encoding = EI_INIT; -static expert_field ei_mms_mal_utctime_encoding = EI_INIT; -static expert_field ei_mms_zero_pdu = EI_INIT; +static expert_field ei_mms_mal_timeofday_encoding; +static expert_field ei_mms_mal_utctime_encoding; +static expert_field ei_mms_zero_pdu; /*****************************************************************************/ /* Packet private data */ diff --git a/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c b/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c index 29e42ae227..2e7e1be970 100644 --- a/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/epan/dissectors/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -26,15 +26,15 @@ void proto_reg_handoff_mpeg_audio(void); dissector_handle_t mpeg_audio_handle; -static int proto_mpeg_audio = -1; +static int proto_mpeg_audio; static dissector_handle_t id3v2_handle; -static int hf_mpeg_audio_header = -1; -static int hf_mpeg_audio_data = -1; -static int hf_mpeg_audio_padbytes = -1; -static int hf_id3v1 = -1; +static int hf_mpeg_audio_header; +static int hf_mpeg_audio_data; +static int hf_mpeg_audio_padbytes; +static int hf_id3v1; -static int ett_mpeg_audio = -1; +static int ett_mpeg_audio; static gboolean test_mpeg_audio(tvbuff_t *tvb, int offset) diff --git a/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c b/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c index c4e8990dc6..f37069549f 100644 --- a/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -25,47 +25,47 @@ void proto_register_mpeg_pes(void); void proto_reg_handoff_mpeg_pes(void); -static int proto_mpeg = -1; -static int proto_mpeg_pes = -1; - -static int ett_mpeg_pes_pack_header = -1; -static int ett_mpeg_pes_header_data = -1; -static int ett_mpeg_pes_trick_mode = -1; - -static int hf_mpeg_pes_pack_header = -1; -static int hf_mpeg_pes_scr = -1; -static int hf_mpeg_pes_program_mux_rate = -1; -static int hf_mpeg_pes_stuffing_length = -1; -static int hf_mpeg_pes_stuffing = -1; -static int hf_mpeg_pes_extension = -1; -static int hf_mpeg_pes_header_data = -1; -static int hf_mpeg_pes_pts = -1; -static int hf_mpeg_pes_dts = -1; -static int hf_mpeg_pes_escr = -1; -static int hf_mpeg_pes_es_rate = -1; -static int hf_mpeg_pes_dsm_trick_mode = -1; -static int hf_mpeg_pes_dsm_trick_mode_control = -1; -static int hf_mpeg_pes_dsm_trick_mode_field_id = -1; -static int hf_mpeg_pes_dsm_trick_mode_intra_slice_refresh = -1; -static int hf_mpeg_pes_dsm_trick_mode_frequency_truncation = -1; -static int hf_mpeg_pes_dsm_trick_mode_rep_cntrl = -1; -static int hf_mpeg_pes_copy_info = -1; -static int hf_mpeg_pes_crc = -1; -static int hf_mpeg_pes_extension_flags = -1; -static int hf_mpeg_pes_private_data = -1; -static int hf_mpeg_pes_pack_length = -1; -static int hf_mpeg_pes_sequence = -1; -static int hf_mpeg_pes_pstd_buffer = -1; -static int hf_mpeg_pes_extension2 = -1; -static int hf_mpeg_pes_padding = -1; -static int hf_mpeg_pes_data = -1; - -static int hf_mpeg_video_sequence_header = -1; -static int hf_mpeg_video_sequence_extension = -1; -static int hf_mpeg_video_group_of_pictures = -1; -static int hf_mpeg_video_picture = -1; -static int hf_mpeg_video_quantization_matrix = -1; -static int hf_mpeg_video_data = -1; +static int proto_mpeg; +static int proto_mpeg_pes; + +static int ett_mpeg_pes_pack_header; +static int ett_mpeg_pes_header_data; +static int ett_mpeg_pes_trick_mode; + +static int hf_mpeg_pes_pack_header; +static int hf_mpeg_pes_scr; +static int hf_mpeg_pes_program_mux_rate; +static int hf_mpeg_pes_stuffing_length; +static int hf_mpeg_pes_stuffing; +static int hf_mpeg_pes_extension; +static int hf_mpeg_pes_header_data; +static int hf_mpeg_pes_pts; +static int hf_mpeg_pes_dts; +static int hf_mpeg_pes_escr; +static int hf_mpeg_pes_es_rate; +static int hf_mpeg_pes_dsm_trick_mode; +static int hf_mpeg_pes_dsm_trick_mode_control; +static int hf_mpeg_pes_dsm_trick_mode_field_id; +static int hf_mpeg_pes_dsm_trick_mode_intra_slice_refresh; +static int hf_mpeg_pes_dsm_trick_mode_frequency_truncation; +static int hf_mpeg_pes_dsm_trick_mode_rep_cntrl; +static int hf_mpeg_pes_copy_info; +static int hf_mpeg_pes_crc; +static int hf_mpeg_pes_extension_flags; +static int hf_mpeg_pes_private_data; +static int hf_mpeg_pes_pack_length; +static int hf_mpeg_pes_sequence; +static int hf_mpeg_pes_pstd_buffer; +static int hf_mpeg_pes_extension2; +static int hf_mpeg_pes_padding; +static int hf_mpeg_pes_data; + +static int hf_mpeg_video_sequence_header; +static int hf_mpeg_video_sequence_extension; +static int hf_mpeg_video_group_of_pictures; +static int hf_mpeg_video_picture; +static int hf_mpeg_video_quantization_matrix; +static int hf_mpeg_video_data; static dissector_handle_t mpeg_handle; diff --git a/epan/dissectors/asn1/mudurl/packet-mudurl-template.c b/epan/dissectors/asn1/mudurl/packet-mudurl-template.c index 1861a39c61..98e6a6bda3 100644 --- a/epan/dissectors/asn1/mudurl/packet-mudurl-template.c +++ b/epan/dissectors/asn1/mudurl/packet-mudurl-template.c @@ -27,7 +27,7 @@ void proto_reg_handoff_mudurl(void); /* Initialize the protocol and registered fields */ -static int proto_mudurl = -1; +static int proto_mudurl; #include "packet-mudurl-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.c b/epan/dissectors/asn1/nbap/packet-nbap-template.c index 4e62365f8f..9865e4b516 100644 --- a/epan/dissectors/asn1/nbap/packet-nbap-template.c +++ b/epan/dissectors/asn1/nbap/packet-nbap-template.c @@ -60,25 +60,25 @@ static dissector_handle_t fp_handle; #include "packet-nbap-val.h" /* Initialize the protocol and registered fields */ -static int proto_nbap = -1; -static int hf_nbap_transportLayerAddress_ipv4 = -1; -static int hf_nbap_transportLayerAddress_ipv6 = -1; -static int hf_nbap_transportLayerAddress_nsap = -1; -static int hf_nbap_reassembled_information_block = -1; +static int proto_nbap; +static int hf_nbap_transportLayerAddress_ipv4; +static int hf_nbap_transportLayerAddress_ipv6; +static int hf_nbap_transportLayerAddress_nsap; +static int hf_nbap_reassembled_information_block; #include "packet-nbap-hf.c" /* Initialize the subtree pointers */ -static int ett_nbap = -1; -static int ett_nbap_TransportLayerAddress = -1; -static int ett_nbap_TransportLayerAddress_nsap = -1; -static int ett_nbap_ib_sg_data = -1; +static int ett_nbap; +static int ett_nbap_TransportLayerAddress; +static int ett_nbap_TransportLayerAddress_nsap; +static int ett_nbap_ib_sg_data; #include "packet-nbap-ett.c" -static expert_field ei_nbap_no_find_port_info = EI_INIT; -static expert_field ei_nbap_no_set_comm_context_id = EI_INIT; -static expert_field ei_nbap_hsdsch_entity_not_specified = EI_INIT; +static expert_field ei_nbap_no_find_port_info; +static expert_field ei_nbap_no_set_comm_context_id; +static expert_field ei_nbap_hsdsch_entity_not_specified; extern int proto_fp; diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index 996a891aff..314cb7789f 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -64,127 +64,127 @@ static dissector_handle_t lte_rrc_ue_radio_paging_info_nb_handle; static dissector_handle_t lte_rrc_ue_radio_access_cap_info_nb_handle; static dissector_handle_t nrppa_handle; -static int proto_json = -1; +static int proto_json; #include "packet-ngap-val.h" /* Initialize the protocol and registered fields */ -static int proto_ngap = -1; -static int hf_ngap_transportLayerAddressIPv4 = -1; -static int hf_ngap_transportLayerAddressIPv6 = -1; -static int hf_ngap_SerialNumber_gs = -1; -static int hf_ngap_SerialNumber_msg_code = -1; -static int hf_ngap_SerialNumber_upd_nb = -1; -static int hf_ngap_WarningType_value = -1; -static int hf_ngap_WarningType_emergency_user_alert = -1; -static int hf_ngap_WarningType_popup = -1; -static int hf_ngap_WarningMessageContents_nb_pages = -1; -static int hf_ngap_WarningMessageContents_decoded_page = -1; -static int hf_ngap_NGRANTraceID_TraceID = -1; -static int hf_ngap_NGRANTraceID_TraceRecordingSessionReference = -1; -static int hf_ngap_InterfacesToTrace_NG_C = -1; -static int hf_ngap_InterfacesToTrace_Xn_C = -1; -static int hf_ngap_InterfacesToTrace_Uu = -1; -static int hf_ngap_InterfacesToTrace_F1_C = -1; -static int hf_ngap_InterfacesToTrace_E1 = -1; -static int hf_ngap_InterfacesToTrace_reserved = -1; -static int hf_ngap_RATRestrictionInformation_e_UTRA = -1; -static int hf_ngap_RATRestrictionInformation_nR = -1; -static int hf_ngap_RATRestrictionInformation_nR_unlicensed = -1; -static int hf_ngap_RATRestrictionInformation_reserved = -1; -static int hf_ngap_primaryRATRestriction_e_UTRA = -1; -static int hf_ngap_primaryRATRestriction_nR = -1; -static int hf_ngap_primaryRATRestriction_nR_unlicensed = -1; -static int hf_ngap_primaryRATRestriction_nR_LEO = -1; -static int hf_ngap_primaryRATRestriction_nR_MEO = -1; -static int hf_ngap_primaryRATRestriction_nR_GEO = -1; -static int hf_ngap_primaryRATRestriction_nR_OTHERSAT = -1; -static int hf_ngap_primaryRATRestriction_reserved = -1; -static int hf_ngap_secondaryRATRestriction_e_UTRA = -1; -static int hf_ngap_secondaryRATRestriction_nR = -1; -static int hf_ngap_secondaryRATRestriction_e_UTRA_unlicensed = -1; -static int hf_ngap_secondaryRATRestriction_nR_unlicensed = -1; -static int hf_ngap_secondaryRATRestriction_reserved = -1; -static int hf_ngap_NrencryptionAlgorithms_nea1 = -1; -static int hf_ngap_NrencryptionAlgorithms_nea2 = -1; -static int hf_ngap_NrencryptionAlgorithms_nea3 = -1; -static int hf_ngap_NrencryptionAlgorithms_reserved = -1; -static int hf_ngap_NrintegrityProtectionAlgorithms_nia1 = -1; -static int hf_ngap_NrintegrityProtectionAlgorithms_nia2 = -1; -static int hf_ngap_NrintegrityProtectionAlgorithms_nia3 = -1; -static int hf_ngap_NrintegrityProtectionAlgorithms_reserved = -1; -static int hf_ngap_EUTRAencryptionAlgorithms_eea1 = -1; -static int hf_ngap_EUTRAencryptionAlgorithms_eea2 = -1; -static int hf_ngap_EUTRAencryptionAlgorithms_eea3 = -1; -static int hf_ngap_EUTRAencryptionAlgorithms_reserved = -1; -static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia1 = -1; -static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia2 = -1; -static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia3 = -1; -static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia7 = -1; -static int hf_ngap_EUTRAintegrityProtectionAlgorithms_reserved = -1; -static int hf_ngap_MeasurementsToActivate_M1 = -1; -static int hf_ngap_MeasurementsToActivate_M2 = -1; -static int hf_ngap_MeasurementsToActivate_M4 = -1; -static int hf_ngap_MeasurementsToActivate_M5 = -1; -static int hf_ngap_MeasurementsToActivate_M6 = -1; -static int hf_ngap_MeasurementsToActivate_M7 = -1; -static int hf_ngap_MeasurementsToActivate_M1_from_event = -1; -static int hf_ngap_MeasurementsToActivate_reserved = -1; -static int hf_ngap_MDT_Location_Information_GNSS = -1; -static int hf_ngap_MDT_Location_Information_reserved = -1; -static int hf_ngap_GlobalCable_ID_str = -1; -static int hf_ngap_UpdateFeedback_CN_PDB_DL = -1; -static int hf_ngap_UpdateFeedback_CN_PDB_UL = -1; -static int hf_ngap_UpdateFeedback_reserved = -1; +static int proto_ngap; +static int hf_ngap_transportLayerAddressIPv4; +static int hf_ngap_transportLayerAddressIPv6; +static int hf_ngap_SerialNumber_gs; +static int hf_ngap_SerialNumber_msg_code; +static int hf_ngap_SerialNumber_upd_nb; +static int hf_ngap_WarningType_value; +static int hf_ngap_WarningType_emergency_user_alert; +static int hf_ngap_WarningType_popup; +static int hf_ngap_WarningMessageContents_nb_pages; +static int hf_ngap_WarningMessageContents_decoded_page; +static int hf_ngap_NGRANTraceID_TraceID; +static int hf_ngap_NGRANTraceID_TraceRecordingSessionReference; +static int hf_ngap_InterfacesToTrace_NG_C; +static int hf_ngap_InterfacesToTrace_Xn_C; +static int hf_ngap_InterfacesToTrace_Uu; +static int hf_ngap_InterfacesToTrace_F1_C; +static int hf_ngap_InterfacesToTrace_E1; +static int hf_ngap_InterfacesToTrace_reserved; +static int hf_ngap_RATRestrictionInformation_e_UTRA; +static int hf_ngap_RATRestrictionInformation_nR; +static int hf_ngap_RATRestrictionInformation_nR_unlicensed; +static int hf_ngap_RATRestrictionInformation_reserved; +static int hf_ngap_primaryRATRestriction_e_UTRA; +static int hf_ngap_primaryRATRestriction_nR; +static int hf_ngap_primaryRATRestriction_nR_unlicensed; +static int hf_ngap_primaryRATRestriction_nR_LEO; +static int hf_ngap_primaryRATRestriction_nR_MEO; +static int hf_ngap_primaryRATRestriction_nR_GEO; +static int hf_ngap_primaryRATRestriction_nR_OTHERSAT; +static int hf_ngap_primaryRATRestriction_reserved; +static int hf_ngap_secondaryRATRestriction_e_UTRA; +static int hf_ngap_secondaryRATRestriction_nR; +static int hf_ngap_secondaryRATRestriction_e_UTRA_unlicensed; +static int hf_ngap_secondaryRATRestriction_nR_unlicensed; +static int hf_ngap_secondaryRATRestriction_reserved; +static int hf_ngap_NrencryptionAlgorithms_nea1; +static int hf_ngap_NrencryptionAlgorithms_nea2; +static int hf_ngap_NrencryptionAlgorithms_nea3; +static int hf_ngap_NrencryptionAlgorithms_reserved; +static int hf_ngap_NrintegrityProtectionAlgorithms_nia1; +static int hf_ngap_NrintegrityProtectionAlgorithms_nia2; +static int hf_ngap_NrintegrityProtectionAlgorithms_nia3; +static int hf_ngap_NrintegrityProtectionAlgorithms_reserved; +static int hf_ngap_EUTRAencryptionAlgorithms_eea1; +static int hf_ngap_EUTRAencryptionAlgorithms_eea2; +static int hf_ngap_EUTRAencryptionAlgorithms_eea3; +static int hf_ngap_EUTRAencryptionAlgorithms_reserved; +static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia1; +static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia2; +static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia3; +static int hf_ngap_EUTRAintegrityProtectionAlgorithms_eia7; +static int hf_ngap_EUTRAintegrityProtectionAlgorithms_reserved; +static int hf_ngap_MeasurementsToActivate_M1; +static int hf_ngap_MeasurementsToActivate_M2; +static int hf_ngap_MeasurementsToActivate_M4; +static int hf_ngap_MeasurementsToActivate_M5; +static int hf_ngap_MeasurementsToActivate_M6; +static int hf_ngap_MeasurementsToActivate_M7; +static int hf_ngap_MeasurementsToActivate_M1_from_event; +static int hf_ngap_MeasurementsToActivate_reserved; +static int hf_ngap_MDT_Location_Information_GNSS; +static int hf_ngap_MDT_Location_Information_reserved; +static int hf_ngap_GlobalCable_ID_str; +static int hf_ngap_UpdateFeedback_CN_PDB_DL; +static int hf_ngap_UpdateFeedback_CN_PDB_UL; +static int hf_ngap_UpdateFeedback_reserved; #include "packet-ngap-hf.c" /* Initialize the subtree pointers */ -static gint ett_ngap = -1; -static gint ett_ngap_TransportLayerAddress = -1; -static gint ett_ngap_DataCodingScheme = -1; -static gint ett_ngap_SerialNumber = -1; -static gint ett_ngap_WarningType = -1; -static gint ett_ngap_WarningMessageContents = -1; -static gint ett_ngap_PLMNIdentity = -1; -static gint ett_ngap_NGAP_Message = -1; -static gint ett_ngap_NGRANTraceID = -1; -static gint ett_ngap_InterfacesToTrace = -1; -static gint ett_ngap_SourceToTarget_TransparentContainer = -1; -static gint ett_ngap_TargetToSource_TransparentContainer = -1; -static gint ett_ngap_RRCContainer = -1; -static gint ett_ngap_RATRestrictionInformation = -1; -static gint ett_ngap_primaryRATRestriction = -1; -static gint ett_ngap_secondaryRATRestriction = -1; -static gint ett_ngap_NrencryptionAlgorithms = -1; -static gint ett_ngap_NrintegrityProtectionAlgorithms = -1; -static gint ett_ngap_EUTRAencryptionAlgorithms = -1; -static gint ett_ngap_EUTRAintegrityProtectionAlgorithms = -1; -static gint ett_ngap_UERadioCapabilityForPagingOfNR = -1; -static gint ett_ngap_UERadioCapabilityForPagingOfEUTRA = -1; -static gint ett_ngap_UERadioCapability = -1; -static gint ett_ngap_LastVisitedEUTRANCellInformation = -1; -static gint ett_ngap_LastVisitedUTRANCellInformation = -1; -static gint ett_ngap_LastVisitedGERANCellInformation = -1; -static gint ett_ngap_NASSecurityParametersFromNGRAN = -1; -static gint ett_ngap_NASC = -1; -static gint ett_ngap_NAS_PDU = -1; -static gint ett_ngap_EN_DCSONConfigurationTransfer = -1; -static gint ett_ngap_BurstArrivalTime = -1; -static gint ett_ngap_CoverageEnhancementLevel = -1; -static gint ett_ngap_MDTModeEutra = -1; -static gint ett_ngap_MeasurementsToActivate = -1; -static gint ett_ngap_MDT_Location_Information = -1; -static gint ett_ngap_NRMobilityHistoryReport = -1; -static gint ett_ngap_LTEUERLFReportContainer = -1; -static gint ett_ngap_NRUERLFReportContainer = -1; -static gint ett_ngap_TargettoSource_Failure_TransparentContainer = -1; -static gint ett_ngap_UERadioCapabilityForPagingOfNB_IoT = -1; -static gint ett_ngap_GlobalCable_ID = -1; -static gint ett_ngap_UpdateFeedback = -1; -static gint ett_ngap_successfulHOReportContainer = -1; +static gint ett_ngap; +static gint ett_ngap_TransportLayerAddress; +static gint ett_ngap_DataCodingScheme; +static gint ett_ngap_SerialNumber; +static gint ett_ngap_WarningType; +static gint ett_ngap_WarningMessageContents; +static gint ett_ngap_PLMNIdentity; +static gint ett_ngap_NGAP_Message; +static gint ett_ngap_NGRANTraceID; +static gint ett_ngap_InterfacesToTrace; +static gint ett_ngap_SourceToTarget_TransparentContainer; +static gint ett_ngap_TargetToSource_TransparentContainer; +static gint ett_ngap_RRCContainer; +static gint ett_ngap_RATRestrictionInformation; +static gint ett_ngap_primaryRATRestriction; +static gint ett_ngap_secondaryRATRestriction; +static gint ett_ngap_NrencryptionAlgorithms; +static gint ett_ngap_NrintegrityProtectionAlgorithms; +static gint ett_ngap_EUTRAencryptionAlgorithms; +static gint ett_ngap_EUTRAintegrityProtectionAlgorithms; +static gint ett_ngap_UERadioCapabilityForPagingOfNR; +static gint ett_ngap_UERadioCapabilityForPagingOfEUTRA; +static gint ett_ngap_UERadioCapability; +static gint ett_ngap_LastVisitedEUTRANCellInformation; +static gint ett_ngap_LastVisitedUTRANCellInformation; +static gint ett_ngap_LastVisitedGERANCellInformation; +static gint ett_ngap_NASSecurityParametersFromNGRAN; +static gint ett_ngap_NASC; +static gint ett_ngap_NAS_PDU; +static gint ett_ngap_EN_DCSONConfigurationTransfer; +static gint ett_ngap_BurstArrivalTime; +static gint ett_ngap_CoverageEnhancementLevel; +static gint ett_ngap_MDTModeEutra; +static gint ett_ngap_MeasurementsToActivate; +static gint ett_ngap_MDT_Location_Information; +static gint ett_ngap_NRMobilityHistoryReport; +static gint ett_ngap_LTEUERLFReportContainer; +static gint ett_ngap_NRUERLFReportContainer; +static gint ett_ngap_TargettoSource_Failure_TransparentContainer; +static gint ett_ngap_UERadioCapabilityForPagingOfNB_IoT; +static gint ett_ngap_GlobalCable_ID; +static gint ett_ngap_UpdateFeedback; +static gint ett_ngap_successfulHOReportContainer; #include "packet-ngap-ett.c" -static expert_field ei_ngap_number_pages_le15 = EI_INIT; +static expert_field ei_ngap_number_pages_le15; enum{ INITIATING_MESSAGE, diff --git a/epan/dissectors/asn1/nist-csor/packet-nist-csor-template.c b/epan/dissectors/asn1/nist-csor/packet-nist-csor-template.c index d084b4257a..970e80b2aa 100644 --- a/epan/dissectors/asn1/nist-csor/packet-nist-csor-template.c +++ b/epan/dissectors/asn1/nist-csor/packet-nist-csor-template.c @@ -26,7 +26,7 @@ void proto_register_nist_csor(void); void proto_reg_handoff_nist_csor(void); /* Initialize the protocol and registered fields */ -static int proto_nist_csor = -1; +static int proto_nist_csor; #include "packet-nist-csor-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c b/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c index 5e0b9934e5..bb9d2eb752 100644 --- a/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c +++ b/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c @@ -26,7 +26,7 @@ void proto_register_novell_pkis (void); void proto_reg_handoff_novell_pkis(void); -static int proto_novell_pkis = -1; +static int proto_novell_pkis; void proto_reg_handoff_novell_pkis(void) { @@ -43,7 +43,7 @@ void proto_register_novell_pkis (void) }; /* execute protocol initialization only once */ - if (proto_novell_pkis != -1) return; + if (proto_novell_pkis > 0) return; proto_novell_pkis = proto_register_protocol("Novell PKIS ASN.1 type", "novell_pkis", "novell_pkis"); proto_register_field_array (proto_novell_pkis, hf, array_length (hf)); diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c index 2c8258ab01..e42c658b4d 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c @@ -67,101 +67,101 @@ extern int proto_pdcp_nr; #include "packet-nr-rrc-val.h" /* Initialize the protocol and registered fields */ -static int proto_nr_rrc = -1; +static int proto_nr_rrc; #include "packet-nr-rrc-hf.c" -static int hf_nr_rrc_serialNumber_gs = -1; -static int hf_nr_rrc_serialNumber_msg_code = -1; -static int hf_nr_rrc_serialNumber_upd_nb = -1; -static int hf_nr_rrc_warningType_value = -1; -static int hf_nr_rrc_warningType_emergency_user_alert = -1; -static int hf_nr_rrc_warningType_popup = -1; -static int hf_nr_rrc_warningMessageSegment_nb_pages = -1; -static int hf_nr_rrc_warningMessageSegment_decoded_page = -1; -static int hf_nr_rrc_sib7_fragments = -1; -static int hf_nr_rrc_sib7_fragment = -1; -static int hf_nr_rrc_sib7_fragment_overlap = -1; -static int hf_nr_rrc_sib7_fragment_overlap_conflict = -1; -static int hf_nr_rrc_sib7_fragment_multiple_tails = -1; -static int hf_nr_rrc_sib7_fragment_too_long_fragment = -1; -static int hf_nr_rrc_sib7_fragment_error = -1; -static int hf_nr_rrc_sib7_fragment_count = -1; -static int hf_nr_rrc_sib7_reassembled_in = -1; -static int hf_nr_rrc_sib7_reassembled_length = -1; -static int hf_nr_rrc_sib7_reassembled_data = -1; -static int hf_nr_rrc_sib8_fragments = -1; -static int hf_nr_rrc_sib8_fragment = -1; -static int hf_nr_rrc_sib8_fragment_overlap = -1; -static int hf_nr_rrc_sib8_fragment_overlap_conflict = -1; -static int hf_nr_rrc_sib8_fragment_multiple_tails = -1; -static int hf_nr_rrc_sib8_fragment_too_long_fragment = -1; -static int hf_nr_rrc_sib8_fragment_error = -1; -static int hf_nr_rrc_sib8_fragment_count = -1; -static int hf_nr_rrc_sib8_reassembled_in = -1; -static int hf_nr_rrc_sib8_reassembled_length = -1; -static int hf_nr_rrc_sib8_reassembled_data = -1; -static int hf_nr_rrc_utc_time = -1; -static int hf_nr_rrc_local_time = -1; -static int hf_nr_rrc_absolute_time = -1; +static int hf_nr_rrc_serialNumber_gs; +static int hf_nr_rrc_serialNumber_msg_code; +static int hf_nr_rrc_serialNumber_upd_nb; +static int hf_nr_rrc_warningType_value; +static int hf_nr_rrc_warningType_emergency_user_alert; +static int hf_nr_rrc_warningType_popup; +static int hf_nr_rrc_warningMessageSegment_nb_pages; +static int hf_nr_rrc_warningMessageSegment_decoded_page; +static int hf_nr_rrc_sib7_fragments; +static int hf_nr_rrc_sib7_fragment; +static int hf_nr_rrc_sib7_fragment_overlap; +static int hf_nr_rrc_sib7_fragment_overlap_conflict; +static int hf_nr_rrc_sib7_fragment_multiple_tails; +static int hf_nr_rrc_sib7_fragment_too_long_fragment; +static int hf_nr_rrc_sib7_fragment_error; +static int hf_nr_rrc_sib7_fragment_count; +static int hf_nr_rrc_sib7_reassembled_in; +static int hf_nr_rrc_sib7_reassembled_length; +static int hf_nr_rrc_sib7_reassembled_data; +static int hf_nr_rrc_sib8_fragments; +static int hf_nr_rrc_sib8_fragment; +static int hf_nr_rrc_sib8_fragment_overlap; +static int hf_nr_rrc_sib8_fragment_overlap_conflict; +static int hf_nr_rrc_sib8_fragment_multiple_tails; +static int hf_nr_rrc_sib8_fragment_too_long_fragment; +static int hf_nr_rrc_sib8_fragment_error; +static int hf_nr_rrc_sib8_fragment_count; +static int hf_nr_rrc_sib8_reassembled_in; +static int hf_nr_rrc_sib8_reassembled_length; +static int hf_nr_rrc_sib8_reassembled_data; +static int hf_nr_rrc_utc_time; +static int hf_nr_rrc_local_time; +static int hf_nr_rrc_absolute_time; /* Initialize the subtree pointers */ -static gint ett_nr_rrc = -1; +static gint ett_nr_rrc; #include "packet-nr-rrc-ett.c" -static gint ett_nr_rrc_DedicatedNAS_Message = -1; -static gint ett_nr_rrc_targetRAT_MessageContainer = -1; -static gint ett_nr_rrc_nas_Container = -1; -static gint ett_nr_rrc_serialNumber = -1; -static gint ett_nr_rrc_warningType = -1; -static gint ett_nr_rrc_dataCodingScheme = -1; -static gint ett_nr_rrc_sib7_fragment = -1; -static gint ett_nr_rrc_sib7_fragments = -1; -static gint ett_nr_rrc_sib8_fragment = -1; -static gint ett_nr_rrc_sib8_fragments = -1; -static gint ett_nr_rrc_warningMessageSegment = -1; -static gint ett_nr_rrc_timeInfo = -1; -static gint ett_nr_rrc_capabilityRequestFilter = -1; -static gint ett_nr_rrc_sourceSCG_EUTRA_Config = -1; -static gint ett_nr_rrc_scg_CellGroupConfigEUTRA = -1; -static gint ett_nr_rrc_candidateCellInfoListSN_EUTRA = -1; -static gint ett_nr_rrc_candidateCellInfoListMN_EUTRA = -1; -static gint ett_nr_rrc_sourceConfigSCG_EUTRA = -1; -static gint ett_nr_rrc_eutra_SCG = -1; -static gint ett_nr_rrc_nr_SCG_Response = -1; -static gint ett_nr_rrc_eutra_SCG_Response = -1; -static gint ett_nr_rrc_measResultSCG_FailureMRDC = -1; -static gint ett_nr_rrc_ul_DCCH_MessageNR = -1; -static gint ett_nr_rrc_ul_DCCH_MessageEUTRA = -1; -static gint ett_rr_rrc_nas_SecurityParamFromNR = -1; -static gint ett_nr_rrc_sidelinkUEInformationNR = -1; -static gint ett_nr_rrc_sidelinkUEInformationEUTRA = -1; -static gint ett_nr_rrc_ueAssistanceInformationEUTRA = -1; -static gint ett_nr_rrc_dl_DCCH_MessageNR = -1; -static gint ett_nr_rrc_dl_DCCH_MessageEUTRA = -1; -static gint ett_nr_rrc_sl_ConfigDedicatedEUTRA = -1; -static gint ett_nr_rrc_sl_CapabilityInformationSidelink = -1; -static gint ett_nr_rrc_measResult_RLF_Report_EUTRA = -1; -static gint ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690 = -1; -static gint ett_nr_rrc_locationTimestamp_r16 = -1; -static gint ett_nr_rrc_locationCoordinate_r16 = -1; -static gint ett_nr_rrc_locationError_r16 = -1; -static gint ett_nr_rrc_locationSource_r16 = -1; -static gint ett_nr_rrc_velocityEstimate_r16 = -1; -static gint ett_nr_rrc_sensor_MeasurementInformation_r16 = -1; -static gint ett_nr_rrc_sensor_MotionInformation_r16 = -1; -static gint ett_nr_rrc_bandParametersSidelinkEUTRA1_r16 = -1; -static gint ett_nr_rrc_bandParametersSidelinkEUTRA2_r16 = -1; -static gint ett_nr_rrc_sl_ParametersEUTRA1_r16 = -1; -static gint ett_nr_rrc_sl_ParametersEUTRA2_r16 = -1; -static gint ett_nr_rrc_sl_ParametersEUTRA3_r16 = -1; -static gint ett_nr_rrc_absTimeInfo = -1; -static gint ett_nr_rrc_assistanceDataSIB_Element_r16 = -1; -static gint ett_nr_sl_V2X_ConfigCommon_r16 = -1; -static gint ett_nr_tdd_Config_r16 = -1; -static gint ett_nr_coarseLocationInfo_r17 = -1; -static gint ett_nr_sl_MeasResultsCandRelay_r17 = -1; -static gint ett_nr_sl_MeasResultServingRelay_r17 = -1; -static gint ett_nr_ReferenceLocation_r17 = -1; - -static expert_field ei_nr_rrc_number_pages_le15 = EI_INIT; +static gint ett_nr_rrc_DedicatedNAS_Message; +static gint ett_nr_rrc_targetRAT_MessageContainer; +static gint ett_nr_rrc_nas_Container; +static gint ett_nr_rrc_serialNumber; +static gint ett_nr_rrc_warningType; +static gint ett_nr_rrc_dataCodingScheme; +static gint ett_nr_rrc_sib7_fragment; +static gint ett_nr_rrc_sib7_fragments; +static gint ett_nr_rrc_sib8_fragment; +static gint ett_nr_rrc_sib8_fragments; +static gint ett_nr_rrc_warningMessageSegment; +static gint ett_nr_rrc_timeInfo; +static gint ett_nr_rrc_capabilityRequestFilter; +static gint ett_nr_rrc_sourceSCG_EUTRA_Config; +static gint ett_nr_rrc_scg_CellGroupConfigEUTRA; +static gint ett_nr_rrc_candidateCellInfoListSN_EUTRA; +static gint ett_nr_rrc_candidateCellInfoListMN_EUTRA; +static gint ett_nr_rrc_sourceConfigSCG_EUTRA; +static gint ett_nr_rrc_eutra_SCG; +static gint ett_nr_rrc_nr_SCG_Response; +static gint ett_nr_rrc_eutra_SCG_Response; +static gint ett_nr_rrc_measResultSCG_FailureMRDC; +static gint ett_nr_rrc_ul_DCCH_MessageNR; +static gint ett_nr_rrc_ul_DCCH_MessageEUTRA; +static gint ett_rr_rrc_nas_SecurityParamFromNR; +static gint ett_nr_rrc_sidelinkUEInformationNR; +static gint ett_nr_rrc_sidelinkUEInformationEUTRA; +static gint ett_nr_rrc_ueAssistanceInformationEUTRA; +static gint ett_nr_rrc_dl_DCCH_MessageNR; +static gint ett_nr_rrc_dl_DCCH_MessageEUTRA; +static gint ett_nr_rrc_sl_ConfigDedicatedEUTRA; +static gint ett_nr_rrc_sl_CapabilityInformationSidelink; +static gint ett_nr_rrc_measResult_RLF_Report_EUTRA; +static gint ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690; +static gint ett_nr_rrc_locationTimestamp_r16; +static gint ett_nr_rrc_locationCoordinate_r16; +static gint ett_nr_rrc_locationError_r16; +static gint ett_nr_rrc_locationSource_r16; +static gint ett_nr_rrc_velocityEstimate_r16; +static gint ett_nr_rrc_sensor_MeasurementInformation_r16; +static gint ett_nr_rrc_sensor_MotionInformation_r16; +static gint ett_nr_rrc_bandParametersSidelinkEUTRA1_r16; +static gint ett_nr_rrc_bandParametersSidelinkEUTRA2_r16; +static gint ett_nr_rrc_sl_ParametersEUTRA1_r16; +static gint ett_nr_rrc_sl_ParametersEUTRA2_r16; +static gint ett_nr_rrc_sl_ParametersEUTRA3_r16; +static gint ett_nr_rrc_absTimeInfo; +static gint ett_nr_rrc_assistanceDataSIB_Element_r16; +static gint ett_nr_sl_V2X_ConfigCommon_r16; +static gint ett_nr_tdd_Config_r16; +static gint ett_nr_coarseLocationInfo_r17; +static gint ett_nr_sl_MeasResultsCandRelay_r17; +static gint ett_nr_sl_MeasResultServingRelay_r17; +static gint ett_nr_ReferenceLocation_r17; + +static expert_field ei_nr_rrc_number_pages_le15; /* Forward declarations */ static int dissect_UECapabilityInformationSidelink_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); diff --git a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c index 44087784ec..d338a9afdc 100644 --- a/epan/dissectors/asn1/nrppa/packet-nrppa-template.c +++ b/epan/dissectors/asn1/nrppa/packet-nrppa-template.c @@ -28,12 +28,12 @@ void proto_register_nrppa(void); void proto_reg_handoff_nrppa(void); /* Initialize the protocol and registered fields */ -static int proto_nrppa = -1; +static int proto_nrppa; #include "packet-nrppa-hf.c" /* Initialize the subtree pointers */ -static gint ett_nrppa = -1; +static gint ett_nrppa; #include "packet-nrppa-ett.c" /* Global variables */ diff --git a/epan/dissectors/asn1/ns_cert_exts/packet-ns_cert_exts-template.c b/epan/dissectors/asn1/ns_cert_exts/packet-ns_cert_exts-template.c index 14013c83d7..1af7f2d603 100644 --- a/epan/dissectors/asn1/ns_cert_exts/packet-ns_cert_exts-template.c +++ b/epan/dissectors/asn1/ns_cert_exts/packet-ns_cert_exts-template.c @@ -23,7 +23,7 @@ void proto_register_ns_cert_exts(void); void proto_reg_handoff_ns_cert_exts(void); /* Initialize the protocol and registered fields */ -static int proto_ns_cert_exts = -1; +static int proto_ns_cert_exts; #include "packet-ns_cert_exts-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/ocsp/packet-ocsp-template.c b/epan/dissectors/asn1/ocsp/packet-ocsp-template.c index 412ee9579b..f24da98918 100644 --- a/epan/dissectors/asn1/ocsp/packet-ocsp-template.c +++ b/epan/dissectors/asn1/ocsp/packet-ocsp-template.c @@ -34,11 +34,11 @@ static dissector_handle_t ocsp_response_handle; /* Initialize the protocol and registered fields */ int proto_ocsp = -1; -static int hf_ocsp_responseType_id = -1; +static int hf_ocsp_responseType_id; #include "packet-ocsp-hf.c" /* Initialize the subtree pointers */ -static gint ett_ocsp = -1; +static gint ett_ocsp; #include "packet-ocsp-ett.c" #include "packet-ocsp-fn.c" diff --git a/epan/dissectors/asn1/p1/packet-p1-template.c b/epan/dissectors/asn1/p1/packet-p1-template.c index ff27555fec..5033ef6f3f 100644 --- a/epan/dissectors/asn1/p1/packet-p1-template.c +++ b/epan/dissectors/asn1/p1/packet-p1-template.c @@ -36,33 +36,33 @@ #define PFNAME "p1" /* Initialize the protocol and registered fields */ -static int proto_p1 = -1; -static int proto_p3 = -1; +static int proto_p1; +static int proto_p3; -static int hf_p1_MTS_APDU_PDU = -1; -static int hf_p1_MTABindArgument_PDU = -1; -static int hf_p1_MTABindResult_PDU = -1; -static int hf_p1_MTABindError_PDU = -1; +static int hf_p1_MTS_APDU_PDU; +static int hf_p1_MTABindArgument_PDU; +static int hf_p1_MTABindResult_PDU; +static int hf_p1_MTABindError_PDU; #include "packet-p1-hf.c" /* Initialize the subtree pointers */ -static gint ett_p1 = -1; -static gint ett_p3 = -1; -static gint ett_p1_content_unknown = -1; -static gint ett_p1_bilateral_information = -1; -static gint ett_p1_additional_information = -1; -static gint ett_p1_unknown_standard_extension = -1; -static gint ett_p1_unknown_extension_attribute_type = -1; -static gint ett_p1_unknown_tokendata_type = -1; +static gint ett_p1; +static gint ett_p3; +static gint ett_p1_content_unknown; +static gint ett_p1_bilateral_information; +static gint ett_p1_additional_information; +static gint ett_p1_unknown_standard_extension; +static gint ett_p1_unknown_extension_attribute_type; +static gint ett_p1_unknown_tokendata_type; #include "packet-p1-ett.c" -static expert_field ei_p1_unknown_extension_attribute_type = EI_INIT; -static expert_field ei_p1_unknown_standard_extension = EI_INIT; -static expert_field ei_p1_unknown_built_in_content_type = EI_INIT; -static expert_field ei_p1_unknown_tokendata_type = EI_INIT; -static expert_field ei_p1_unsupported_pdu = EI_INIT; -static expert_field ei_p1_zero_pdu = EI_INIT; +static expert_field ei_p1_unknown_extension_attribute_type; +static expert_field ei_p1_unknown_standard_extension; +static expert_field ei_p1_unknown_built_in_content_type; +static expert_field ei_p1_unknown_tokendata_type; +static expert_field ei_p1_unsupported_pdu; +static expert_field ei_p1_zero_pdu; /* Dissector tables */ static dissector_table_t p1_extension_dissector_table; diff --git a/epan/dissectors/asn1/p22/packet-p22-template.c b/epan/dissectors/asn1/p22/packet-p22-template.c index f0cf69afbd..af886f7186 100644 --- a/epan/dissectors/asn1/p22/packet-p22-template.c +++ b/epan/dissectors/asn1/p22/packet-p22-template.c @@ -32,7 +32,7 @@ #define PFNAME "p22" /* Initialize the protocol and registered fields */ -static int proto_p22 = -1; +static int proto_p22; static const value_string charsetreg_vals [] = { { 1, "C0: (ISO/IEC 6429)"}, @@ -68,7 +68,7 @@ static const value_string charsetreg_vals [] = { #include "packet-p22-hf.c" /* Initialize the subtree pointers */ -static gint ett_p22 = -1; +static gint ett_p22; #include "packet-p22-ett.c" #include "packet-p22-fn.c" diff --git a/epan/dissectors/asn1/p7/packet-p7-template.c b/epan/dissectors/asn1/p7/packet-p7-template.c index 4df623bac0..8f703e364d 100644 --- a/epan/dissectors/asn1/p7/packet-p7-template.c +++ b/epan/dissectors/asn1/p7/packet-p7-template.c @@ -35,14 +35,14 @@ void proto_reg_handoff_p7(void); static int seqno = 0; /* Initialize the protocol and registered fields */ -static int proto_p7 = -1; +static int proto_p7; #include "packet-p7-val.h" #include "packet-p7-hf.c" /* Initialize the subtree pointers */ -static gint ett_p7 = -1; +static gint ett_p7; #include "packet-p7-ett.c" #include "packet-p7-table.c" /* operation and error codes */ diff --git a/epan/dissectors/asn1/p772/packet-p772-template.c b/epan/dissectors/asn1/p772/packet-p772-template.c index 4b20d84e15..93b7c2e235 100644 --- a/epan/dissectors/asn1/p772/packet-p772-template.c +++ b/epan/dissectors/asn1/p772/packet-p772-template.c @@ -31,14 +31,14 @@ void proto_reg_handoff_p772(void); /* Initialize the protocol and registered fields */ -static int proto_p772 = -1; +static int proto_p772; #include "packet-p772-val.h" #include "packet-p772-hf.c" /* Initialize the subtree pointers */ -static gint ett_p772 = -1; +static gint ett_p772; #include "packet-p772-ett.c" #include "packet-p772-fn.c" diff --git a/epan/dissectors/asn1/pcap/packet-pcap-template.c b/epan/dissectors/asn1/pcap/packet-pcap-template.c index 535423eafc..779924c552 100644 --- a/epan/dissectors/asn1/pcap/packet-pcap-template.c +++ b/epan/dissectors/asn1/pcap/packet-pcap-template.c @@ -45,12 +45,12 @@ void proto_reg_handoff_pcap(void); static dissector_handle_t pcap_handle = NULL; /* Initialize the protocol and registered fields */ -static int proto_pcap = -1; +static int proto_pcap; #include "packet-pcap-hf.c" /* Initialize the subtree pointers */ -static int ett_pcap = -1; +static int ett_pcap; #include "packet-pcap-ett.c" diff --git a/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c b/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c index 4254adb2e3..712944015e 100644 --- a/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c +++ b/epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c @@ -27,7 +27,7 @@ void proto_register_pkcs1(void); void proto_reg_handoff_pkcs1(void); /* Initialize the protocol and registered fields */ -static int proto_pkcs1 = -1; +static int proto_pkcs1; #include "packet-pkcs1-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/pkcs10/packet-pkcs10-template.c b/epan/dissectors/asn1/pkcs10/packet-pkcs10-template.c index eef9654c74..6b6b3c3a49 100644 --- a/epan/dissectors/asn1/pkcs10/packet-pkcs10-template.c +++ b/epan/dissectors/asn1/pkcs10/packet-pkcs10-template.c @@ -43,7 +43,7 @@ void proto_register_pkcs10(void); static dissector_handle_t csr_handle; /* Initialize the protocol and registered fields */ -static int proto_pkcs10 = -1; +static int proto_pkcs10; #include "packet-pkcs10-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c b/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c index faec6b15c2..8202b09cbc 100644 --- a/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c +++ b/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c @@ -41,13 +41,13 @@ void proto_register_pkcs12(void); void proto_reg_handoff_pkcs12(void); /* Initialize the protocol and registered fields */ -static int proto_pkcs12 = -1; +static int proto_pkcs12; -static int hf_pkcs12_X509Certificate_PDU = -1; -static int hf_pkcs12_AuthenticatedSafe_PDU = -1; /* AuthenticatedSafe */ -static gint ett_decrypted_pbe = -1; +static int hf_pkcs12_X509Certificate_PDU; +static int hf_pkcs12_AuthenticatedSafe_PDU; /* AuthenticatedSafe */ +static gint ett_decrypted_pbe; -static expert_field ei_pkcs12_octet_string_expected = EI_INIT; +static expert_field ei_pkcs12_octet_string_expected; static const char *object_identifier_id = NULL; diff --git a/epan/dissectors/asn1/pkinit/packet-pkinit-template.c b/epan/dissectors/asn1/pkinit/packet-pkinit-template.c index ec582729f6..74584f6153 100644 --- a/epan/dissectors/asn1/pkinit/packet-pkinit-template.c +++ b/epan/dissectors/asn1/pkinit/packet-pkinit-template.c @@ -28,7 +28,7 @@ void proto_register_pkinit(void); void proto_reg_handoff_pkinit(void); /* Initialize the protocol and registered fields */ -static int proto_pkinit = -1; +static int proto_pkinit; #include "packet-pkinit-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c b/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c index 4de46292b0..c60e08b630 100644 --- a/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c +++ b/epan/dissectors/asn1/pkix1explicit/packet-pkix1explicit-template.c @@ -34,12 +34,12 @@ void proto_register_pkix1explicit(void); void proto_reg_handoff_pkix1explicit(void); /* Initialize the protocol and registered fields */ -static int proto_pkix1explicit = -1; -static int hf_pkix1explicit_object_identifier_id = -1; -static int hf_pkix1explicit_addressFamily_afn = -1; -static int hf_pkix1explicit_addressFamily_safi = -1; +static int proto_pkix1explicit; +static int hf_pkix1explicit_object_identifier_id; +static int hf_pkix1explicit_addressFamily_afn; +static int hf_pkix1explicit_addressFamily_safi; -static int ett_pkix1explicit_addressFamily = -1; +static int ett_pkix1explicit_addressFamily; #include "packet-pkix1explicit-hf.c" diff --git a/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c b/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c index f6aed24674..a65dba5843 100644 --- a/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c +++ b/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c @@ -26,7 +26,7 @@ void proto_register_pkix1implicit(void); void proto_reg_handoff_pkix1implicit(void); /* Initialize the protocol and registered fields */ -static int proto_pkix1implicit = -1; +static int proto_pkix1implicit; #include "packet-pkix1implicit-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/pkixac/packet-pkixac-template.c b/epan/dissectors/asn1/pkixac/packet-pkixac-template.c index e66153fa32..f111574674 100644 --- a/epan/dissectors/asn1/pkixac/packet-pkixac-template.c +++ b/epan/dissectors/asn1/pkixac/packet-pkixac-template.c @@ -30,11 +30,11 @@ void proto_register_pkixac(void); void proto_reg_handoff_pkixac(void); /* Initialize the protocol and registered fields */ -static int proto_pkixac = -1; +static int proto_pkixac; #include "packet-pkixac-hf.c" /* Initialize the subtree pointers */ -static gint ett_pkixac = -1; +static gint ett_pkixac; #include "packet-pkixac-ett.c" static const char *object_identifier_id; diff --git a/epan/dissectors/asn1/pkixproxy/packet-pkixproxy-template.c b/epan/dissectors/asn1/pkixproxy/packet-pkixproxy-template.c index 99fb419b45..ba3b927957 100644 --- a/epan/dissectors/asn1/pkixproxy/packet-pkixproxy-template.c +++ b/epan/dissectors/asn1/pkixproxy/packet-pkixproxy-template.c @@ -26,7 +26,7 @@ void proto_register_pkixproxy(void); void proto_reg_handoff_pkixproxy(void); /* Initialize the protocol and registered fields */ -static int proto_pkixproxy = -1; +static int proto_pkixproxy; #include "packet-pkixproxy-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/pkixqualified/packet-pkixqualified-template.c b/epan/dissectors/asn1/pkixqualified/packet-pkixqualified-template.c index 2d4ebc3f96..c16acb701c 100644 --- a/epan/dissectors/asn1/pkixqualified/packet-pkixqualified-template.c +++ b/epan/dissectors/asn1/pkixqualified/packet-pkixqualified-template.c @@ -29,7 +29,7 @@ void proto_reg_handoff_pkixqualified(void); /* Initialize the protocol and registered fields */ -static int proto_pkixqualified = -1; +static int proto_pkixqualified; #include "packet-pkixqualified-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c b/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c index 319e91d906..bf5bb98047 100644 --- a/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c @@ -31,11 +31,11 @@ static dissector_handle_t timestamp_reply_handle; static dissector_handle_t timestamp_query_handle; /* Initialize the protocol and registered fields */ -static int proto_pkixtsp = -1; +static int proto_pkixtsp; #include "packet-pkixtsp-hf.c" /* Initialize the subtree pointers */ -static gint ett_pkixtsp = -1; +static gint ett_pkixtsp; #include "packet-pkixtsp-ett.c" diff --git a/epan/dissectors/asn1/pres/packet-pres-template.c b/epan/dissectors/asn1/pres/packet-pres-template.c index 1b3c3fc569..6fa6ff85a9 100644 --- a/epan/dissectors/asn1/pres/packet-pres-template.c +++ b/epan/dissectors/asn1/pres/packet-pres-template.c @@ -39,10 +39,10 @@ void proto_register_pres(void); void proto_reg_handoff_pres(void); /* Initialize the protocol and registered fields */ -static int proto_pres = -1; +static int proto_pres; /* Initialize the connectionles protocol */ -static int proto_clpres = -1; +static int proto_clpres; /* pointers for acse dissector */ proto_tree *global_tree = NULL; @@ -67,22 +67,22 @@ typedef struct _pres_user_t { static pres_user_t *pres_users; static guint num_pres_users; -static int hf_pres_CP_type = -1; -static int hf_pres_CPA_PPDU = -1; -static int hf_pres_Abort_type = -1; -static int hf_pres_CPR_PPDU = -1; -static int hf_pres_Typed_data_type = -1; +static int hf_pres_CP_type; +static int hf_pres_CPA_PPDU; +static int hf_pres_Abort_type; +static int hf_pres_CPR_PPDU; +static int hf_pres_Typed_data_type; #include "packet-pres-hf.c" /* Initialize the subtree pointers */ -static gint ett_pres = -1; +static gint ett_pres; #include "packet-pres-ett.c" -static expert_field ei_pres_dissector_not_available = EI_INIT; -static expert_field ei_pres_wrong_spdu_type = EI_INIT; -static expert_field ei_pres_invalid_offset = EI_INIT; +static expert_field ei_pres_dissector_not_available; +static expert_field ei_pres_wrong_spdu_type; +static expert_field ei_pres_invalid_offset; UAT_DEC_CB_DEF(pres_users, ctx_id, pres_user_t) UAT_CSTRING_CB_DEF(pres_users, oid, pres_user_t) diff --git a/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c b/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c index e8074eea95..fb148cbeea 100644 --- a/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c +++ b/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c @@ -26,13 +26,13 @@ void proto_register_q932_ros(void); void proto_reg_handoff_q932_ros(void); /* Initialize the protocol and registered fields */ -static int proto_q932_ros = -1; +static int proto_q932_ros; #include "packet-q932-ros-hf.c" /* Initialize the subtree pointers */ #include "packet-q932-ros-ett.c" -static expert_field ei_ros_undecoded = EI_INIT; +static expert_field ei_ros_undecoded; /* Preferences */ diff --git a/epan/dissectors/asn1/q932/packet-q932-template.c b/epan/dissectors/asn1/q932/packet-q932-template.c index cecbfabb93..e34c5f1512 100644 --- a/epan/dissectors/asn1/q932/packet-q932-template.c +++ b/epan/dissectors/asn1/q932/packet-q932-template.c @@ -27,23 +27,23 @@ void proto_register_q932(void); /* Initialize the protocol and registered fields */ -static int proto_q932 = -1; -static int hf_q932_ie_type = -1; -static int hf_q932_ie_len = -1; -static int hf_q932_ie_data = -1; -static int hf_q932_pp = -1; -static int hf_q932_nd = -1; +static int proto_q932; +static int hf_q932_ie_type; +static int hf_q932_ie_len; +static int hf_q932_ie_data; +static int hf_q932_pp; +static int hf_q932_nd; #include "packet-q932-hf.c" /* Initialize the subtree pointers */ -static gint ett_q932 = -1; -static gint ett_q932_ie = -1; +static gint ett_q932; +static gint ett_q932_ie; #include "packet-q932-ett.c" -static expert_field ei_q932_dse_not_supported = EI_INIT; -static expert_field ei_q932_acse_not_supported = EI_INIT; -static expert_field ei_q932_unknown_component = EI_INIT; -static expert_field ei_q932_asn1_encoded = EI_INIT; +static expert_field ei_q932_dse_not_supported; +static expert_field ei_q932_acse_not_supported; +static expert_field ei_q932_unknown_component; +static expert_field ei_q932_asn1_encoded; /* Preferences */ diff --git a/epan/dissectors/asn1/qsig/packet-qsig-template.c b/epan/dissectors/asn1/qsig/packet-qsig-template.c index b7d3fb4a4d..54deedf269 100644 --- a/epan/dissectors/asn1/qsig/packet-qsig-template.c +++ b/epan/dissectors/asn1/qsig/packet-qsig-template.c @@ -273,17 +273,17 @@ static const value_string qsig_str_error[] = { }; /* Initialize the protocol and registered fields */ -static int proto_qsig = -1; -static int hf_qsig_operation = -1; -static int hf_qsig_service = -1; -static int hf_qsig_error = -1; -static int hf_qsig_ie_type = -1; -static int hf_qsig_ie_type_cs4 = -1; -static int hf_qsig_ie_type_cs5 = -1; -static int hf_qsig_ie_len = -1; -static int hf_qsig_ie_data = -1; -static int hf_qsig_tc = -1; -static int hf_qsig_pc = -1; +static int proto_qsig; +static int hf_qsig_operation; +static int hf_qsig_service; +static int hf_qsig_error; +static int hf_qsig_ie_type; +static int hf_qsig_ie_type_cs4; +static int hf_qsig_ie_type_cs5; +static int hf_qsig_ie_len; +static int hf_qsig_ie_data; +static int hf_qsig_tc; +static int hf_qsig_pc; #include "packet-qsig-hf.c" static int *hf_qsig_ie_type_arr[] = { @@ -298,15 +298,15 @@ static int *hf_qsig_ie_type_arr[] = { }; /* Initialize the subtree pointers */ -static gint ett_qsig = -1; -static gint ett_qsig_ie = -1; -static gint ett_qsig_unknown_extension = -1; +static gint ett_qsig; +static gint ett_qsig_ie; +static gint ett_qsig_unknown_extension; #include "packet-qsig-ett.c" -static gint ett_cnq_PSS1InformationElement = -1; +static gint ett_cnq_PSS1InformationElement; -/* static expert_field ei_qsig_unsupported_arg_type = EI_INIT; */ -static expert_field ei_qsig_unsupported_result_type = EI_INIT; -static expert_field ei_qsig_unsupported_error_type = EI_INIT; +/* static expert_field ei_qsig_unsupported_arg_type; */ +static expert_field ei_qsig_unsupported_result_type; +static expert_field ei_qsig_unsupported_error_type; /* Preferences */ diff --git a/epan/dissectors/asn1/ranap/packet-ranap-template.c b/epan/dissectors/asn1/ranap/packet-ranap-template.c index ce8f0e1459..87bd1c32a0 100644 --- a/epan/dissectors/asn1/ranap/packet-ranap-template.c +++ b/epan/dissectors/asn1/ranap/packet-ranap-template.c @@ -51,7 +51,7 @@ void proto_register_ranap(void); void proto_reg_handoff_ranap(void); /* Initialize the protocol and registered fields */ -static int proto_ranap = -1; +static int proto_ranap; /* initialise sub-dissector handles */ static dissector_handle_t rrc_s_to_trnc_handle = NULL; @@ -59,16 +59,16 @@ static dissector_handle_t rrc_t_to_srnc_handle = NULL; static dissector_handle_t rrc_ho_to_utran_cmd = NULL; static dissector_handle_t bssgp_handle = NULL; -static int hf_ranap_transportLayerAddress_ipv4 = -1; -static int hf_ranap_transportLayerAddress_ipv6 = -1; -static int hf_ranap_transportLayerAddress_nsap = -1; +static int hf_ranap_transportLayerAddress_ipv4; +static int hf_ranap_transportLayerAddress_ipv6; +static int hf_ranap_transportLayerAddress_nsap; #include "packet-ranap-hf.c" /* Initialize the subtree pointers */ -static int ett_ranap = -1; -static int ett_ranap_transportLayerAddress = -1; -static int ett_ranap_transportLayerAddress_nsap = -1; +static int ett_ranap; +static int ett_ranap_transportLayerAddress; +static int ett_ranap_transportLayerAddress_nsap; #include "packet-ranap-ett.c" diff --git a/epan/dissectors/asn1/rnsap/packet-rnsap-template.c b/epan/dissectors/asn1/rnsap/packet-rnsap-template.c index fc08e17b4b..6fffe9acef 100644 --- a/epan/dissectors/asn1/rnsap/packet-rnsap-template.c +++ b/epan/dissectors/asn1/rnsap/packet-rnsap-template.c @@ -53,17 +53,17 @@ static dissector_handle_t rrc_dl_ccch_handle = NULL; static dissector_handle_t rrc_ul_ccch_handle = NULL; /* Initialize the protocol and registered fields */ -static int proto_rnsap = -1; +static int proto_rnsap; -static int hf_rnsap_transportLayerAddress_ipv4 = -1; -static int hf_rnsap_transportLayerAddress_ipv6 = -1; -static int hf_rnsap_transportLayerAddress_nsap = -1; +static int hf_rnsap_transportLayerAddress_ipv4; +static int hf_rnsap_transportLayerAddress_ipv6; +static int hf_rnsap_transportLayerAddress_nsap; #include "packet-rnsap-hf.c" /* Initialize the subtree pointers */ -static int ett_rnsap = -1; -static int ett_rnsap_transportLayerAddress = -1; -static int ett_rnsap_transportLayerAddress_nsap = -1; +static int ett_rnsap; +static int ett_rnsap_transportLayerAddress; +static int ett_rnsap_transportLayerAddress_nsap; #include "packet-rnsap-ett.c" diff --git a/epan/dissectors/asn1/ros/packet-ros-template.c b/epan/dissectors/asn1/ros/packet-ros-template.c index e7519cdac3..69bf44b991 100644 --- a/epan/dissectors/asn1/ros/packet-ros-template.c +++ b/epan/dissectors/asn1/ros/packet-ros-template.c @@ -28,7 +28,7 @@ void proto_register_ros(void); void proto_reg_handoff_ros(void); /* Initialize the protocol and registered fields */ -static int proto_ros = -1; +static int proto_ros; static proto_tree *top_tree=NULL; static guint32 opcode; @@ -49,28 +49,28 @@ typedef struct ros_call_response { guint invokeId; } ros_call_response_t; -static int hf_ros_response_in = -1; -static int hf_ros_response_to = -1; -static int hf_ros_time = -1; +static int hf_ros_response_in; +static int hf_ros_response_to; +static int hf_ros_time; #include "packet-ros-hf.c" /* Initialize the subtree pointers */ -static gint ett_ros = -1; -static gint ett_ros_unknown = -1; -static gint ett_ros_invoke_argument = -1; -static gint ett_ros_return_result = -1; -static gint ett_ros_bind_invoke = -1; -static gint ett_ros_bind_result = -1; -static gint ett_ros_bind_error = -1; -static gint ett_ros_unbind_invoke = -1; -static gint ett_ros_unbind_result = -1; -static gint ett_ros_unbind_error = -1; +static gint ett_ros; +static gint ett_ros_unknown; +static gint ett_ros_invoke_argument; +static gint ett_ros_return_result; +static gint ett_ros_bind_invoke; +static gint ett_ros_bind_result; +static gint ett_ros_bind_error; +static gint ett_ros_unbind_invoke; +static gint ett_ros_unbind_result; +static gint ett_ros_unbind_error; #include "packet-ros-ett.c" -static expert_field ei_ros_dissector_oid_not_implemented = EI_INIT; -static expert_field ei_ros_unknown_ros_pdu = EI_INIT; +static expert_field ei_ros_dissector_oid_not_implemented; +static expert_field ei_ros_unknown_ros_pdu; static dissector_table_t ros_oid_dissector_table=NULL; diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c index 9df0bb600d..a5c72db08b 100644 --- a/epan/dissectors/asn1/rrc/packet-rrc-template.c +++ b/epan/dissectors/asn1/rrc/packet-rrc-template.c @@ -320,31 +320,31 @@ static int hf_urnti_current; #include "packet-rrc-hf.c" /* Initialize the subtree pointers */ -static int ett_rrc = -1; +static int ett_rrc; #include "packet-rrc-ett.c" -static gint ett_rrc_eutraFeatureGroupIndicators = -1; -static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; -static gint ett_rrc_ims_info = -1; -static gint ett_rrc_cellIdentity = -1; -static gint ett_rrc_sib_data_var = -1; +static gint ett_rrc_eutraFeatureGroupIndicators; +static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo; +static gint ett_rrc_ims_info; +static gint ett_rrc_cellIdentity; +static gint ett_rrc_sib_data_var; -static expert_field ei_rrc_no_hrnti = EI_INIT; +static expert_field ei_rrc_no_hrnti; /* Global variables */ static proto_tree *top_tree; -static int hf_rrc_eutra_feat_group_ind_1 = -1; -static int hf_rrc_eutra_feat_group_ind_2 = -1; -static int hf_rrc_eutra_feat_group_ind_3 = -1; -static int hf_rrc_eutra_feat_group_ind_4 = -1; -static int hf_rrc_ims_info_atgw_trans_det_cont_type = -1; -static int hf_rrc_ims_info_atgw_udp_port = -1; -static int hf_rrc_ims_info_atgw_ipv4 = -1; -static int hf_rrc_ims_info_atgw_ipv6 = -1; -static int hf_rrc_cellIdentity_rnc_id = -1; -static int hf_rrc_cellIdentity_c_id = -1; +static int hf_rrc_eutra_feat_group_ind_1; +static int hf_rrc_eutra_feat_group_ind_2; +static int hf_rrc_eutra_feat_group_ind_3; +static int hf_rrc_eutra_feat_group_ind_4; +static int hf_rrc_ims_info_atgw_trans_det_cont_type; +static int hf_rrc_ims_info_atgw_udp_port; +static int hf_rrc_ims_info_atgw_ipv4; +static int hf_rrc_ims_info_atgw_ipv6; +static int hf_rrc_cellIdentity_rnc_id; +static int hf_rrc_cellIdentity_c_id; static const true_false_string rrc_eutra_feat_group_ind_1_val = { "UTRA CELL_PCH to EUTRA RRC_IDLE cell reselection - Supported", diff --git a/epan/dissectors/asn1/rrlp/packet-rrlp-template.c b/epan/dissectors/asn1/rrlp/packet-rrlp-template.c index 622542f002..ae669405fa 100644 --- a/epan/dissectors/asn1/rrlp/packet-rrlp-template.c +++ b/epan/dissectors/asn1/rrlp/packet-rrlp-template.c @@ -36,13 +36,13 @@ void proto_register_rrlp(void); void proto_reg_handoff_rrlp(void); /* Initialize the protocol and registered fields */ -static int proto_rrlp = -1; +static int proto_rrlp; #include "packet-rrlp-hf.c" /* Initialize the subtree pointers */ -static gint ett_rrlp = -1; +static gint ett_rrlp; #include "packet-rrlp-ett.c" /* Include constants */ diff --git a/epan/dissectors/asn1/rtse/packet-rtse-template.c b/epan/dissectors/asn1/rtse/packet-rtse-template.c index 63fc3758e7..3ac04ceefd 100644 --- a/epan/dissectors/asn1/rtse/packet-rtse-template.c +++ b/epan/dissectors/asn1/rtse/packet-rtse-template.c @@ -34,7 +34,7 @@ void proto_register_rtse(void); void proto_reg_handoff_rtse(void); /* Initialize the protocol and registered fields */ -static int proto_rtse = -1; +static int proto_rtse; static gboolean open_request=FALSE; static guint32 app_proto=0; @@ -47,33 +47,33 @@ static gboolean rtse_reassemble = TRUE; #include "packet-rtse-hf.c" /* Initialize the subtree pointers */ -static gint ett_rtse = -1; +static gint ett_rtse; #include "packet-rtse-ett.c" -static expert_field ei_rtse_dissector_oid_not_implemented = EI_INIT; -static expert_field ei_rtse_unknown_rtse_pdu = EI_INIT; -static expert_field ei_rtse_abstract_syntax = EI_INIT; +static expert_field ei_rtse_dissector_oid_not_implemented; +static expert_field ei_rtse_unknown_rtse_pdu; +static expert_field ei_rtse_abstract_syntax; static dissector_table_t rtse_oid_dissector_table=NULL; static dissector_handle_t rtse_handle = NULL; -static gint ett_rtse_unknown = -1; +static gint ett_rtse_unknown; static reassembly_table rtse_reassembly_table; -static int hf_rtse_segment_data = -1; -static int hf_rtse_fragments = -1; -static int hf_rtse_fragment = -1; -static int hf_rtse_fragment_overlap = -1; -static int hf_rtse_fragment_overlap_conflicts = -1; -static int hf_rtse_fragment_multiple_tails = -1; -static int hf_rtse_fragment_too_long_fragment = -1; -static int hf_rtse_fragment_error = -1; -static int hf_rtse_fragment_count = -1; -static int hf_rtse_reassembled_in = -1; -static int hf_rtse_reassembled_length = -1; - -static gint ett_rtse_fragment = -1; -static gint ett_rtse_fragments = -1; +static int hf_rtse_segment_data; +static int hf_rtse_fragments; +static int hf_rtse_fragment; +static int hf_rtse_fragment_overlap; +static int hf_rtse_fragment_overlap_conflicts; +static int hf_rtse_fragment_multiple_tails; +static int hf_rtse_fragment_too_long_fragment; +static int hf_rtse_fragment_error; +static int hf_rtse_fragment_count; +static int hf_rtse_reassembled_in; +static int hf_rtse_reassembled_length; + +static gint ett_rtse_fragment; +static gint ett_rtse_fragments; static const fragment_items rtse_frag_items = { /* Fragment subtrees */ diff --git a/epan/dissectors/asn1/rua/packet-rua-template.c b/epan/dissectors/asn1/rua/packet-rua-template.c index cd4ba1127b..896d6e52b8 100644 --- a/epan/dissectors/asn1/rua/packet-rua-template.c +++ b/epan/dissectors/asn1/rua/packet-rua-template.c @@ -36,12 +36,12 @@ void proto_register_rua(void); #include "packet-rua-val.h" /* Initialize the protocol and registered fields */ -static int proto_rua = -1; +static int proto_rua; #include "packet-rua-hf.c" /* Initialize the subtree pointers */ -static int ett_rua = -1; +static int ett_rua; /* initialise sub-dissector handles */ static dissector_handle_t ranap_handle = NULL; diff --git a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c index a5e2e8788d..e01a5b7112 100644 --- a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c +++ b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c @@ -66,111 +66,111 @@ static dissector_handle_t nr_rrc_ue_radio_paging_info_handle; #include "packet-s1ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_s1ap = -1; - -static int hf_s1ap_transportLayerAddressIPv4 = -1; -static int hf_s1ap_transportLayerAddressIPv6 = -1; -static int hf_s1ap_E_UTRAN_Trace_ID_TraceID = -1; -static int hf_s1ap_E_UTRAN_Trace_ID_TraceRecordingSessionReference = -1; -static int hf_s1ap_interfacesToTrace_S1_MME = -1; -static int hf_s1ap_interfacesToTrace_X2 = -1; -static int hf_s1ap_interfacesToTrace_Uu = -1; -static int hf_s1ap_interfacesToTrace_F1_C = -1; -static int hf_s1ap_interfacesToTrace_E1 = -1; -static int hf_s1ap_interfacesToTrace_Reserved = -1; -static int hf_s1ap_encryptionAlgorithms_EEA1 = -1; -static int hf_s1ap_encryptionAlgorithms_EEA2 = -1; -static int hf_s1ap_encryptionAlgorithms_EEA3 = -1; -static int hf_s1ap_encryptionAlgorithms_Reserved = -1; -static int hf_s1ap_integrityProtectionAlgorithms_EIA1 = -1; -static int hf_s1ap_integrityProtectionAlgorithms_EIA2 = -1; -static int hf_s1ap_integrityProtectionAlgorithms_EIA3 = -1; -static int hf_s1ap_integrityProtectionAlgorithms_EIA7 = -1; -static int hf_s1ap_integrityProtectionAlgorithms_Reserved = -1; -static int hf_s1ap_SerialNumber_gs = -1; -static int hf_s1ap_SerialNumber_msg_code = -1; -static int hf_s1ap_SerialNumber_upd_nb = -1; -static int hf_s1ap_WarningType_value = -1; -static int hf_s1ap_WarningType_emergency_user_alert = -1; -static int hf_s1ap_WarningType_popup = -1; -static int hf_s1ap_WarningMessageContents_nb_pages = -1; -static int hf_s1ap_WarningMessageContents_decoded_page = -1; -static int hf_s1ap_measurementsToActivate_M1 = -1; -static int hf_s1ap_measurementsToActivate_M2 = -1; -static int hf_s1ap_measurementsToActivate_M3 = -1; -static int hf_s1ap_measurementsToActivate_M4 = -1; -static int hf_s1ap_measurementsToActivate_M5 = -1; -static int hf_s1ap_measurementsToActivate_LoggingM1FromEventTriggered = -1; -static int hf_s1ap_measurementsToActivate_M6 = -1; -static int hf_s1ap_measurementsToActivate_M7 = -1; -static int hf_s1ap_MDT_Location_Info_GNSS = -1; -static int hf_s1ap_MDT_Location_Info_E_CID = -1; -static int hf_s1ap_MDT_Location_Info_Reserved = -1; -static int hf_s1ap_NRencryptionAlgorithms_NEA1 = -1; -static int hf_s1ap_NRencryptionAlgorithms_NEA2 = -1; -static int hf_s1ap_NRencryptionAlgorithms_NEA3 = -1; -static int hf_s1ap_NRencryptionAlgorithms_Reserved = -1; -static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA1 = -1; -static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA2 = -1; -static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA3 = -1; -static int hf_s1ap_NRintegrityProtectionAlgorithms_Reserved = -1; -static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service = -1; -static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service = -1; -static int hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved = -1; -static int hf_s1ap_rAT_RestrictionInformation_LEO = -1; -static int hf_s1ap_rAT_RestrictionInformation_MEO = -1; -static int hf_s1ap_rAT_RestrictionInformation_GEO = -1; -static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT = -1; -static int hf_s1ap_rAT_RestrictionInformation_Reserved = -1; +static int proto_s1ap; + +static int hf_s1ap_transportLayerAddressIPv4; +static int hf_s1ap_transportLayerAddressIPv6; +static int hf_s1ap_E_UTRAN_Trace_ID_TraceID; +static int hf_s1ap_E_UTRAN_Trace_ID_TraceRecordingSessionReference; +static int hf_s1ap_interfacesToTrace_S1_MME; +static int hf_s1ap_interfacesToTrace_X2; +static int hf_s1ap_interfacesToTrace_Uu; +static int hf_s1ap_interfacesToTrace_F1_C; +static int hf_s1ap_interfacesToTrace_E1; +static int hf_s1ap_interfacesToTrace_Reserved; +static int hf_s1ap_encryptionAlgorithms_EEA1; +static int hf_s1ap_encryptionAlgorithms_EEA2; +static int hf_s1ap_encryptionAlgorithms_EEA3; +static int hf_s1ap_encryptionAlgorithms_Reserved; +static int hf_s1ap_integrityProtectionAlgorithms_EIA1; +static int hf_s1ap_integrityProtectionAlgorithms_EIA2; +static int hf_s1ap_integrityProtectionAlgorithms_EIA3; +static int hf_s1ap_integrityProtectionAlgorithms_EIA7; +static int hf_s1ap_integrityProtectionAlgorithms_Reserved; +static int hf_s1ap_SerialNumber_gs; +static int hf_s1ap_SerialNumber_msg_code; +static int hf_s1ap_SerialNumber_upd_nb; +static int hf_s1ap_WarningType_value; +static int hf_s1ap_WarningType_emergency_user_alert; +static int hf_s1ap_WarningType_popup; +static int hf_s1ap_WarningMessageContents_nb_pages; +static int hf_s1ap_WarningMessageContents_decoded_page; +static int hf_s1ap_measurementsToActivate_M1; +static int hf_s1ap_measurementsToActivate_M2; +static int hf_s1ap_measurementsToActivate_M3; +static int hf_s1ap_measurementsToActivate_M4; +static int hf_s1ap_measurementsToActivate_M5; +static int hf_s1ap_measurementsToActivate_LoggingM1FromEventTriggered; +static int hf_s1ap_measurementsToActivate_M6; +static int hf_s1ap_measurementsToActivate_M7; +static int hf_s1ap_MDT_Location_Info_GNSS; +static int hf_s1ap_MDT_Location_Info_E_CID; +static int hf_s1ap_MDT_Location_Info_Reserved; +static int hf_s1ap_NRencryptionAlgorithms_NEA1; +static int hf_s1ap_NRencryptionAlgorithms_NEA2; +static int hf_s1ap_NRencryptionAlgorithms_NEA3; +static int hf_s1ap_NRencryptionAlgorithms_Reserved; +static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA1; +static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA2; +static int hf_s1ap_NRintegrityProtectionAlgorithms_NIA3; +static int hf_s1ap_NRintegrityProtectionAlgorithms_Reserved; +static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service; +static int hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service; +static int hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved; +static int hf_s1ap_rAT_RestrictionInformation_LEO; +static int hf_s1ap_rAT_RestrictionInformation_MEO; +static int hf_s1ap_rAT_RestrictionInformation_GEO; +static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT; +static int hf_s1ap_rAT_RestrictionInformation_Reserved; #include "packet-s1ap-hf.c" /* Initialize the subtree pointers */ -static int ett_s1ap = -1; -static int ett_s1ap_TransportLayerAddress = -1; -static int ett_s1ap_ToTargetTransparentContainer = -1; -static int ett_s1ap_ToSourceTransparentContainer = -1; -static int ett_s1ap_RRCContainer = -1; -static int ett_s1ap_UERadioCapability = -1; -static int ett_s1ap_RIMInformation = -1; -static int ett_s1ap_Cdma2000PDU = -1; -static int ett_s1ap_Cdma2000SectorID = -1; -static int ett_s1ap_UERadioPagingInformation = -1; -static int ett_s1ap_UE_HistoryInformationFromTheUE = -1; -static int ett_s1ap_CELevel = -1; -static int ett_s1ap_UE_RLF_Report_Container = -1; -static int ett_s1ap_UE_RLF_Report_Container_for_extended_bands = -1; -static int ett_s1ap_S1_Message = -1; -static int ett_s1ap_E_UTRAN_Trace_ID = -1; -static int ett_s1ap_InterfacesToTrace = -1; -static int ett_s1ap_EncryptionAlgorithms = -1; -static int ett_s1ap_IntegrityProtectionAlgorithms = -1; -static int ett_s1ap_LastVisitedNGRANCellInformation = -1; -static int ett_s1ap_LastVisitedUTRANCellInformation = -1; -static int ett_s1ap_SerialNumber = -1; -static int ett_s1ap_WarningType = -1; -static int ett_s1ap_DataCodingScheme = -1; -static int ett_s1ap_WarningMessageContents = -1; -static int ett_s1ap_MSClassmark = -1; -static int ett_s1ap_MeasurementsToActivate = -1; -static int ett_s1ap_MDT_Location_Info = -1; -static int ett_s1ap_IMSI = -1; -static int ett_s1ap_NASSecurityParameters = -1; -static int ett_s1ap_NRencryptionAlgorithms = -1; -static int ett_s1ap_NRintegrityProtectionAlgorithms = -1; -static int ett_s1ap_UE_Application_Layer_Measurement_Capability = -1; -static int ett_s1ap_sMTC = -1; -static int ett_s1ap_threshRS_Index_r15 = -1; -static int ett_s1ap_sSBToMeasure = -1; -static int ett_s1ap_sSRSSIMeasurement = -1; -static int ett_s1ap_quantityConfigNR_R15 = -1; -static int ett_s1ap_excludedCellsToAddModList = -1; -static int ett_s1ap_NB_IoT_RLF_Report_Container = -1; -static int ett_s1ap_MDT_ConfigurationNR = -1; -static int ett_s1ap_IntersystemSONConfigurationTransfer = -1; -static int ett_s1ap_rAT_RestrictionInformation = -1; +static int ett_s1ap; +static int ett_s1ap_TransportLayerAddress; +static int ett_s1ap_ToTargetTransparentContainer; +static int ett_s1ap_ToSourceTransparentContainer; +static int ett_s1ap_RRCContainer; +static int ett_s1ap_UERadioCapability; +static int ett_s1ap_RIMInformation; +static int ett_s1ap_Cdma2000PDU; +static int ett_s1ap_Cdma2000SectorID; +static int ett_s1ap_UERadioPagingInformation; +static int ett_s1ap_UE_HistoryInformationFromTheUE; +static int ett_s1ap_CELevel; +static int ett_s1ap_UE_RLF_Report_Container; +static int ett_s1ap_UE_RLF_Report_Container_for_extended_bands; +static int ett_s1ap_S1_Message; +static int ett_s1ap_E_UTRAN_Trace_ID; +static int ett_s1ap_InterfacesToTrace; +static int ett_s1ap_EncryptionAlgorithms; +static int ett_s1ap_IntegrityProtectionAlgorithms; +static int ett_s1ap_LastVisitedNGRANCellInformation; +static int ett_s1ap_LastVisitedUTRANCellInformation; +static int ett_s1ap_SerialNumber; +static int ett_s1ap_WarningType; +static int ett_s1ap_DataCodingScheme; +static int ett_s1ap_WarningMessageContents; +static int ett_s1ap_MSClassmark; +static int ett_s1ap_MeasurementsToActivate; +static int ett_s1ap_MDT_Location_Info; +static int ett_s1ap_IMSI; +static int ett_s1ap_NASSecurityParameters; +static int ett_s1ap_NRencryptionAlgorithms; +static int ett_s1ap_NRintegrityProtectionAlgorithms; +static int ett_s1ap_UE_Application_Layer_Measurement_Capability; +static int ett_s1ap_sMTC; +static int ett_s1ap_threshRS_Index_r15; +static int ett_s1ap_sSBToMeasure; +static int ett_s1ap_sSRSSIMeasurement; +static int ett_s1ap_quantityConfigNR_R15; +static int ett_s1ap_excludedCellsToAddModList; +static int ett_s1ap_NB_IoT_RLF_Report_Container; +static int ett_s1ap_MDT_ConfigurationNR; +static int ett_s1ap_IntersystemSONConfigurationTransfer; +static int ett_s1ap_rAT_RestrictionInformation; #include "packet-s1ap-ett.c" -static expert_field ei_s1ap_number_pages_le15 = EI_INIT; +static expert_field ei_s1ap_number_pages_le15; enum{ INITIATING_MESSAGE, diff --git a/epan/dissectors/asn1/sabp/packet-sabp-template.c b/epan/dissectors/asn1/sabp/packet-sabp-template.c index 494f96c72e..2ba18a36e3 100644 --- a/epan/dissectors/asn1/sabp/packet-sabp-template.c +++ b/epan/dissectors/asn1/sabp/packet-sabp-template.c @@ -35,23 +35,23 @@ void proto_register_sabp(void); void proto_reg_handoff_sabp(void); /* Initialize the protocol and registered fields */ -static int proto_sabp = -1; +static int proto_sabp; -static int hf_sabp_no_of_pages = -1; -static int hf_sabp_cb_inf_len = -1; -static int hf_sabp_cb_msg_inf_page = -1; -static int hf_sabp_cbs_page_content = -1; +static int hf_sabp_no_of_pages; +static int hf_sabp_cb_inf_len; +static int hf_sabp_cb_msg_inf_page; +static int hf_sabp_cbs_page_content; #include "packet-sabp-hf.c" /* Initialize the subtree pointers */ -static int ett_sabp = -1; -static int ett_sabp_e212 = -1; -static int ett_sabp_cbs_data_coding = -1; -static int ett_sabp_bcast_msg = -1; -static int ett_sabp_cbs_serial_number = -1; -static int ett_sabp_cbs_new_serial_number = -1; -static int ett_sabp_cbs_page = -1; -static int ett_sabp_cbs_page_content = -1; +static int ett_sabp; +static int ett_sabp_e212; +static int ett_sabp_cbs_data_coding; +static int ett_sabp_bcast_msg; +static int ett_sabp_cbs_serial_number; +static int ett_sabp_cbs_new_serial_number; +static int ett_sabp_cbs_page; +static int ett_sabp_cbs_page_content; #include "packet-sabp-ett.c" diff --git a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c index 3b714f3d55..0bf0c836d7 100644 --- a/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c +++ b/epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c @@ -42,24 +42,24 @@ static dissector_handle_t sbc_ap_handle=NULL; #include "packet-sbc-ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_sbc_ap = -1; - -static int hf_sbc_ap_Serial_Number_gs = -1; -static int hf_sbc_ap_Serial_Number_msg_code = -1; -static int hf_sbc_ap_Serial_Number_upd_nb = -1; -static int hf_sbc_ap_Warning_Type_value = -1; -static int hf_sbc_ap_Warning_Type_emergency_user_alert = -1; -static int hf_sbc_ap_Warning_Type_popup = -1; -static int hf_sbc_ap_Warning_Message_Contents_nb_pages = -1; -static int hf_sbc_ap_Warning_Message_Contents_decoded_page = -1; +static int proto_sbc_ap; + +static int hf_sbc_ap_Serial_Number_gs; +static int hf_sbc_ap_Serial_Number_msg_code; +static int hf_sbc_ap_Serial_Number_upd_nb; +static int hf_sbc_ap_Warning_Type_value; +static int hf_sbc_ap_Warning_Type_emergency_user_alert; +static int hf_sbc_ap_Warning_Type_popup; +static int hf_sbc_ap_Warning_Message_Contents_nb_pages; +static int hf_sbc_ap_Warning_Message_Contents_decoded_page; #include "packet-sbc-ap-hf.c" /* Initialize the subtree pointers */ -static int ett_sbc_ap = -1; -static int ett_sbc_ap_Serial_Number = -1; -static int ett_sbc_ap_Warning_Type = -1; -static int ett_sbc_ap_Data_Coding_Scheme = -1; -static int ett_sbc_ap_Warning_Message_Contents = -1; +static int ett_sbc_ap; +static int ett_sbc_ap_Serial_Number; +static int ett_sbc_ap_Warning_Type; +static int ett_sbc_ap_Data_Coding_Scheme; +static int ett_sbc_ap_Warning_Message_Contents; #include "packet-sbc-ap-ett.c" diff --git a/epan/dissectors/asn1/smrse/packet-smrse-template.c b/epan/dissectors/asn1/smrse/packet-smrse-template.c index d8695f8017..040040150d 100644 --- a/epan/dissectors/asn1/smrse/packet-smrse-template.c +++ b/epan/dissectors/asn1/smrse/packet-smrse-template.c @@ -29,15 +29,15 @@ void proto_reg_handoff_smrse(void); static dissector_handle_t smrse_handle; /* Initialize the protocol and registered fields */ -static int proto_smrse = -1; -static int hf_smrse_reserved = -1; -static int hf_smrse_tag = -1; -static int hf_smrse_length = -1; -static int hf_smrse_Octet_Format = -1; +static int proto_smrse; +static int hf_smrse_reserved; +static int hf_smrse_tag; +static int hf_smrse_length; +static int hf_smrse_Octet_Format; #include "packet-smrse-hf.c" /* Initialize the subtree pointers */ -static gint ett_smrse = -1; +static gint ett_smrse; #include "packet-smrse-ett.c" diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index 702ed8211a..56cae798e4 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -70,8 +70,8 @@ /* Initialize the protocol and registered fields */ static int snmp_tap = -1; -static int proto_snmp = -1; -static int proto_smux = -1; +static int proto_snmp; +static int proto_smux; static gboolean display_oid = TRUE; static gboolean snmp_var_in_tree = TRUE; @@ -188,103 +188,103 @@ static dissector_handle_t smux_handle; static next_tvb_list_t *var_list; -static int hf_snmp_response_in = -1; -static int hf_snmp_response_to = -1; -static int hf_snmp_time = -1; - -static int hf_snmp_v3_flags_auth = -1; -static int hf_snmp_v3_flags_crypt = -1; -static int hf_snmp_v3_flags_report = -1; - -static int hf_snmp_engineid_conform = -1; -static int hf_snmp_engineid_enterprise = -1; -static int hf_snmp_engineid_format = -1; -static int hf_snmp_engineid_ipv4 = -1; -static int hf_snmp_engineid_ipv6 = -1; -static int hf_snmp_engineid_cisco_type = -1; -static int hf_snmp_engineid_mac = -1; -static int hf_snmp_engineid_text = -1; -static int hf_snmp_engineid_time = -1; -static int hf_snmp_engineid_data = -1; -static int hf_snmp_decryptedPDU = -1; -static int hf_snmp_msgAuthentication = -1; - -static int hf_snmp_noSuchObject = -1; -static int hf_snmp_noSuchInstance = -1; -static int hf_snmp_endOfMibView = -1; -static int hf_snmp_unSpecified = -1; - -static int hf_snmp_integer32_value = -1; -static int hf_snmp_octetstring_value = -1; -static int hf_snmp_oid_value = -1; -static int hf_snmp_null_value = -1; -static int hf_snmp_ipv4_value = -1; -static int hf_snmp_ipv6_value = -1; -static int hf_snmp_anyaddress_value = -1; -static int hf_snmp_unsigned32_value = -1; -static int hf_snmp_unknown_value = -1; -static int hf_snmp_opaque_value = -1; -static int hf_snmp_nsap_value = -1; -static int hf_snmp_counter_value = -1; -static int hf_snmp_timeticks_value = -1; -static int hf_snmp_big_counter_value = -1; -static int hf_snmp_gauge32_value = -1; - -static int hf_snmp_objectname = -1; -static int hf_snmp_scalar_instance_index = -1; - -static int hf_snmp_var_bind_str = -1; -static int hf_snmp_agentid_trailer = -1; +static int hf_snmp_response_in; +static int hf_snmp_response_to; +static int hf_snmp_time; + +static int hf_snmp_v3_flags_auth; +static int hf_snmp_v3_flags_crypt; +static int hf_snmp_v3_flags_report; + +static int hf_snmp_engineid_conform; +static int hf_snmp_engineid_enterprise; +static int hf_snmp_engineid_format; +static int hf_snmp_engineid_ipv4; +static int hf_snmp_engineid_ipv6; +static int hf_snmp_engineid_cisco_type; +static int hf_snmp_engineid_mac; +static int hf_snmp_engineid_text; +static int hf_snmp_engineid_time; +static int hf_snmp_engineid_data; +static int hf_snmp_decryptedPDU; +static int hf_snmp_msgAuthentication; + +static int hf_snmp_noSuchObject; +static int hf_snmp_noSuchInstance; +static int hf_snmp_endOfMibView; +static int hf_snmp_unSpecified; + +static int hf_snmp_integer32_value; +static int hf_snmp_octetstring_value; +static int hf_snmp_oid_value; +static int hf_snmp_null_value; +static int hf_snmp_ipv4_value; +static int hf_snmp_ipv6_value; +static int hf_snmp_anyaddress_value; +static int hf_snmp_unsigned32_value; +static int hf_snmp_unknown_value; +static int hf_snmp_opaque_value; +static int hf_snmp_nsap_value; +static int hf_snmp_counter_value; +static int hf_snmp_timeticks_value; +static int hf_snmp_big_counter_value; +static int hf_snmp_gauge32_value; + +static int hf_snmp_objectname; +static int hf_snmp_scalar_instance_index; + +static int hf_snmp_var_bind_str; +static int hf_snmp_agentid_trailer; #include "packet-snmp-hf.c" /* Initialize the subtree pointers */ -static gint ett_smux = -1; -static gint ett_snmp = -1; -static gint ett_engineid = -1; -static gint ett_msgFlags = -1; -static gint ett_encryptedPDU = -1; -static gint ett_decrypted = -1; -static gint ett_authParameters = -1; -static gint ett_internet = -1; -static gint ett_varbind = -1; -static gint ett_name = -1; -static gint ett_value = -1; -static gint ett_decoding_error = -1; +static gint ett_smux; +static gint ett_snmp; +static gint ett_engineid; +static gint ett_msgFlags; +static gint ett_encryptedPDU; +static gint ett_decrypted; +static gint ett_authParameters; +static gint ett_internet; +static gint ett_varbind; +static gint ett_name; +static gint ett_value; +static gint ett_decoding_error; #include "packet-snmp-ett.c" -static expert_field ei_snmp_failed_decrypted_data_pdu = EI_INIT; -static expert_field ei_snmp_decrypted_data_bad_formatted = EI_INIT; -static expert_field ei_snmp_verify_authentication_error = EI_INIT; -static expert_field ei_snmp_authentication_ok = EI_INIT; -static expert_field ei_snmp_authentication_error = EI_INIT; -static expert_field ei_snmp_varbind_not_uni_class_seq = EI_INIT; -static expert_field ei_snmp_varbind_has_indicator = EI_INIT; -static expert_field ei_snmp_objectname_not_oid = EI_INIT; -static expert_field ei_snmp_objectname_has_indicator = EI_INIT; -static expert_field ei_snmp_value_not_primitive_encoding = EI_INIT; -static expert_field ei_snmp_invalid_oid = EI_INIT; -static expert_field ei_snmp_varbind_wrong_tag = EI_INIT; -static expert_field ei_snmp_varbind_response = EI_INIT; -static expert_field ei_snmp_no_instance_subid = EI_INIT; -static expert_field ei_snmp_wrong_num_of_subids = EI_INIT; -static expert_field ei_snmp_index_suboid_too_short = EI_INIT; -static expert_field ei_snmp_unimplemented_instance_index = EI_INIT; -static expert_field ei_snmp_index_suboid_len0 = EI_INIT; -static expert_field ei_snmp_index_suboid_too_long = EI_INIT; -static expert_field ei_snmp_index_string_too_long = EI_INIT; -static expert_field ei_snmp_column_parent_not_row = EI_INIT; -static expert_field ei_snmp_uint_too_large = EI_INIT; -static expert_field ei_snmp_int_too_large = EI_INIT; -static expert_field ei_snmp_integral_value0 = EI_INIT; -static expert_field ei_snmp_missing_mib = EI_INIT; -static expert_field ei_snmp_varbind_wrong_length_value = EI_INIT; -static expert_field ei_snmp_varbind_wrong_class_tag = EI_INIT; -static expert_field ei_snmp_rfc1910_non_conformant = EI_INIT; -static expert_field ei_snmp_rfc3411_non_conformant = EI_INIT; -static expert_field ei_snmp_version_unknown = EI_INIT; -static expert_field ei_snmp_trap_pdu_obsolete = EI_INIT; +static expert_field ei_snmp_failed_decrypted_data_pdu; +static expert_field ei_snmp_decrypted_data_bad_formatted; +static expert_field ei_snmp_verify_authentication_error; +static expert_field ei_snmp_authentication_ok; +static expert_field ei_snmp_authentication_error; +static expert_field ei_snmp_varbind_not_uni_class_seq; +static expert_field ei_snmp_varbind_has_indicator; +static expert_field ei_snmp_objectname_not_oid; +static expert_field ei_snmp_objectname_has_indicator; +static expert_field ei_snmp_value_not_primitive_encoding; +static expert_field ei_snmp_invalid_oid; +static expert_field ei_snmp_varbind_wrong_tag; +static expert_field ei_snmp_varbind_response; +static expert_field ei_snmp_no_instance_subid; +static expert_field ei_snmp_wrong_num_of_subids; +static expert_field ei_snmp_index_suboid_too_short; +static expert_field ei_snmp_unimplemented_instance_index; +static expert_field ei_snmp_index_suboid_len0; +static expert_field ei_snmp_index_suboid_too_long; +static expert_field ei_snmp_index_string_too_long; +static expert_field ei_snmp_column_parent_not_row; +static expert_field ei_snmp_uint_too_large; +static expert_field ei_snmp_int_too_large; +static expert_field ei_snmp_integral_value0; +static expert_field ei_snmp_missing_mib; +static expert_field ei_snmp_varbind_wrong_length_value; +static expert_field ei_snmp_varbind_wrong_class_tag; +static expert_field ei_snmp_rfc1910_non_conformant; +static expert_field ei_snmp_rfc3411_non_conformant; +static expert_field ei_snmp_version_unknown; +static expert_field ei_snmp_trap_pdu_obsolete; static const true_false_string auth_flags = { "OK", diff --git a/epan/dissectors/asn1/spnego/packet-spnego-template.c b/epan/dissectors/asn1/spnego/packet-spnego-template.c index 25fcfa0843..597e410854 100644 --- a/epan/dissectors/asn1/spnego/packet-spnego-template.c +++ b/epan/dissectors/asn1/spnego/packet-spnego-template.c @@ -39,27 +39,27 @@ void proto_reg_handoff_spnego(void); static dissector_handle_t spnego_wrap_handle; /* Initialize the protocol and registered fields */ -static int proto_spnego = -1; -static int proto_spnego_krb5 = -1; +static int proto_spnego; +static int proto_spnego_krb5; -static int hf_spnego_wraptoken = -1; +static int hf_spnego_wraptoken; static int hf_spnego_krb5_oid; -static int hf_spnego_krb5 = -1; -static int hf_spnego_krb5_tok_id = -1; -static int hf_spnego_krb5_sgn_alg = -1; -static int hf_spnego_krb5_seal_alg = -1; -static int hf_spnego_krb5_snd_seq = -1; -static int hf_spnego_krb5_sgn_cksum = -1; -static int hf_spnego_krb5_confounder = -1; -static int hf_spnego_krb5_filler = -1; -static int hf_spnego_krb5_cfx_flags = -1; -static int hf_spnego_krb5_cfx_flags_01 = -1; -static int hf_spnego_krb5_cfx_flags_02 = -1; -static int hf_spnego_krb5_cfx_flags_04 = -1; -static int hf_spnego_krb5_cfx_ec = -1; -static int hf_spnego_krb5_cfx_rrc = -1; -static int hf_spnego_krb5_cfx_seq = -1; +static int hf_spnego_krb5; +static int hf_spnego_krb5_tok_id; +static int hf_spnego_krb5_sgn_alg; +static int hf_spnego_krb5_seal_alg; +static int hf_spnego_krb5_snd_seq; +static int hf_spnego_krb5_sgn_cksum; +static int hf_spnego_krb5_confounder; +static int hf_spnego_krb5_filler; +static int hf_spnego_krb5_cfx_flags; +static int hf_spnego_krb5_cfx_flags_01; +static int hf_spnego_krb5_cfx_flags_02; +static int hf_spnego_krb5_cfx_flags_04; +static int hf_spnego_krb5_cfx_ec; +static int hf_spnego_krb5_cfx_rrc; +static int hf_spnego_krb5_cfx_seq; #include "packet-spnego-hf.c" @@ -70,15 +70,15 @@ gboolean saw_mechanism = FALSE; /* Initialize the subtree pointers */ -static gint ett_spnego = -1; -static gint ett_spnego_wraptoken = -1; -static gint ett_spnego_krb5 = -1; -static gint ett_spnego_krb5_cfx_flags = -1; +static gint ett_spnego; +static gint ett_spnego_wraptoken; +static gint ett_spnego_krb5; +static gint ett_spnego_krb5_cfx_flags; #include "packet-spnego-ett.c" -static expert_field ei_spnego_decrypted_keytype = EI_INIT; -static expert_field ei_spnego_unknown_header = EI_INIT; +static expert_field ei_spnego_decrypted_keytype; +static expert_field ei_spnego_unknown_header; static dissector_handle_t spnego_handle; static dissector_handle_t spnego_krb5_handle; diff --git a/epan/dissectors/asn1/sv/packet-sv-template.c b/epan/dissectors/asn1/sv/packet-sv-template.c index 66c1dd24cb..ad360ffbc7 100644 --- a/epan/dissectors/asn1/sv/packet-sv-template.c +++ b/epan/dissectors/asn1/sv/packet-sv-template.c @@ -66,45 +66,45 @@ static int sv_tap = -1; static sv_frame_data sv_data; /* Initialize the protocol and registered fields */ -static int proto_sv = -1; -static int hf_sv_appid = -1; -static int hf_sv_length = -1; -static int hf_sv_reserve1 = -1; -static int hf_sv_reserve1_s_bit = -1; -static int hf_sv_reserve2 = -1; -static int hf_sv_phmeas_instmag_i = -1; -static int hf_sv_phsmeas_q = -1; -static int hf_sv_phsmeas_q_validity = -1; -static int hf_sv_phsmeas_q_overflow = -1; -static int hf_sv_phsmeas_q_outofrange = -1; -static int hf_sv_phsmeas_q_badreference = -1; -static int hf_sv_phsmeas_q_oscillatory = -1; -static int hf_sv_phsmeas_q_failure = -1; -static int hf_sv_phsmeas_q_olddata = -1; -static int hf_sv_phsmeas_q_inconsistent = -1; -static int hf_sv_phsmeas_q_inaccurate = -1; -static int hf_sv_phsmeas_q_source = -1; -static int hf_sv_phsmeas_q_test = -1; -static int hf_sv_phsmeas_q_operatorblocked = -1; -static int hf_sv_phsmeas_q_derived = -1; -static int hf_sv_gmidentity = -1; -static int hf_sv_gmidentity_manuf = -1; +static int proto_sv; +static int hf_sv_appid; +static int hf_sv_length; +static int hf_sv_reserve1; +static int hf_sv_reserve1_s_bit; +static int hf_sv_reserve2; +static int hf_sv_phmeas_instmag_i; +static int hf_sv_phsmeas_q; +static int hf_sv_phsmeas_q_validity; +static int hf_sv_phsmeas_q_overflow; +static int hf_sv_phsmeas_q_outofrange; +static int hf_sv_phsmeas_q_badreference; +static int hf_sv_phsmeas_q_oscillatory; +static int hf_sv_phsmeas_q_failure; +static int hf_sv_phsmeas_q_olddata; +static int hf_sv_phsmeas_q_inconsistent; +static int hf_sv_phsmeas_q_inaccurate; +static int hf_sv_phsmeas_q_source; +static int hf_sv_phsmeas_q_test; +static int hf_sv_phsmeas_q_operatorblocked; +static int hf_sv_phsmeas_q_derived; +static int hf_sv_gmidentity; +static int hf_sv_gmidentity_manuf; #include "packet-sv-hf.c" /* Initialize the subtree pointers */ -static int ett_sv = -1; -static int ett_phsmeas = -1; -static int ett_phsmeas_q = -1; -static int ett_gmidentity = -1; -static int ett_reserve1 = -1; +static int ett_sv; +static int ett_phsmeas; +static int ett_phsmeas_q; +static int ett_gmidentity; +static int ett_reserve1; #include "packet-sv-ett.c" -static expert_field ei_sv_mal_utctime = EI_INIT; -static expert_field ei_sv_zero_pdu = EI_INIT; -static expert_field ei_sv_mal_gmidentity = EI_INIT; +static expert_field ei_sv_mal_utctime; +static expert_field ei_sv_zero_pdu; +static expert_field ei_sv_mal_gmidentity; static gboolean sv_decode_data_as_phsmeas = FALSE; diff --git a/epan/dissectors/asn1/sv/sv.cnf b/epan/dissectors/asn1/sv/sv.cnf index 7da1f370bb..3e53f035b6 100644 --- a/epan/dissectors/asn1/sv/sv.cnf +++ b/epan/dissectors/asn1/sv/sv.cnf @@ -34,7 +34,7 @@ SampledValues { proto_tree_add_expert_format(tree, actx->pinfo, &ei_sv_mal_utctime, tvb, offset, len, "BER Error: malformed UTCTime encoding, length must be 8 bytes"); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, "????"); } @@ -50,7 +50,7 @@ SampledValues ptime = abs_time_to_str(actx->pinfo->pool, &ts, ABSOLUTE_TIME_UTC, TRUE); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, ptime); } @@ -92,7 +92,7 @@ UtcTime TYPE = FT_STRING DISPLAY = BASE_NONE { proto_tree_add_expert_format(tree, actx->pinfo, &ei_sv_mal_gmidentity, tvb, offset, len, "BER Error: malformed gmIdentity encoding, length must be 8 bytes"); - if(hf_index >= 0) + if(hf_index > 0) { proto_tree_add_string(tree, hf_index, tvb, offset, len, "????"); } diff --git a/epan/dissectors/asn1/t124/packet-t124-template.c b/epan/dissectors/asn1/t124/packet-t124-template.c index fa29e3a80d..5376ac4f0b 100644 --- a/epan/dissectors/asn1/t124/packet-t124-template.c +++ b/epan/dissectors/asn1/t124/packet-t124-template.c @@ -34,18 +34,18 @@ void proto_register_t124(void); void proto_reg_handoff_t124(void); /* Initialize the protocol and registered fields */ -static int proto_t124 = -1; +static int proto_t124; static proto_tree *top_tree = NULL; #include "packet-t124-hf.c" /* Initialize the subtree pointers */ -static int ett_t124 = -1; -static int ett_t124_connectGCCPDU = -1; +static int ett_t124; +static int ett_t124_connectGCCPDU; -static int hf_t124_ConnectData = -1; -static int hf_t124_connectGCCPDU = -1; -static int hf_t124_DomainMCSPDU_PDU = -1; +static int hf_t124_ConnectData; +static int hf_t124_connectGCCPDU; +static int hf_t124_DomainMCSPDU_PDU; static guint32 channelId = -1; diff --git a/epan/dissectors/asn1/t125/packet-t125-template.c b/epan/dissectors/asn1/t125/packet-t125-template.c index 8a7e99cb0a..0a028a9edf 100644 --- a/epan/dissectors/asn1/t125/packet-t125-template.c +++ b/epan/dissectors/asn1/t125/packet-t125-template.c @@ -39,12 +39,12 @@ void proto_register_t125(void); void proto_reg_handoff_t125(void); /* Initialize the protocol and registered fields */ -static int proto_t125 = -1; +static int proto_t125; static proto_tree *top_tree = NULL; #include "packet-t125-hf.c" /* Initialize the subtree pointers */ -static int ett_t125 = -1; +static int ett_t125; #include "packet-t125-ett.c" diff --git a/epan/dissectors/asn1/t38/packet-t38-template.c b/epan/dissectors/asn1/t38/packet-t38-template.c index 642c5c7a5e..6a5a82e971 100644 --- a/epan/dissectors/asn1/t38/packet-t38-template.c +++ b/epan/dissectors/asn1/t38/packet-t38-template.c @@ -99,35 +99,35 @@ static guint32 Data_value; static guint32 T30ind_value; static guint32 Data_Field_item_num; -static int proto_t38 = -1; -static int proto_acdr = -1; +static int proto_t38; +static int proto_acdr; #include "packet-t38-hf.c" /* T38 setup fields */ -static int hf_t38_setup = -1; -static int hf_t38_setup_frame = -1; -static int hf_t38_setup_method = -1; +static int hf_t38_setup; +static int hf_t38_setup_frame; +static int hf_t38_setup_method; /* T38 Data reassemble fields */ -static int hf_t38_fragments = -1; -static int hf_t38_fragment = -1; -static int hf_t38_fragment_overlap = -1; -static int hf_t38_fragment_overlap_conflicts = -1; -static int hf_t38_fragment_multiple_tails = -1; -static int hf_t38_fragment_too_long_fragment = -1; -static int hf_t38_fragment_error = -1; -static int hf_t38_fragment_count = -1; -static int hf_t38_reassembled_in = -1; -static int hf_t38_reassembled_length = -1; - -static gint ett_t38 = -1; +static int hf_t38_fragments; +static int hf_t38_fragment; +static int hf_t38_fragment_overlap; +static int hf_t38_fragment_overlap_conflicts; +static int hf_t38_fragment_multiple_tails; +static int hf_t38_fragment_too_long_fragment; +static int hf_t38_fragment_error; +static int hf_t38_fragment_count; +static int hf_t38_reassembled_in; +static int hf_t38_reassembled_length; + +static gint ett_t38; #include "packet-t38-ett.c" -static gint ett_t38_setup = -1; +static gint ett_t38_setup; -static gint ett_data_fragment = -1; -static gint ett_data_fragments = -1; +static gint ett_data_fragment; +static gint ett_data_fragments; -static expert_field ei_t38_malformed = EI_INIT; +static expert_field ei_t38_malformed; static gboolean primary_part = TRUE; static guint32 seq_number = 0; diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.c b/epan/dissectors/asn1/tcap/packet-tcap-template.c index 65efb15b12..e78367e9a9 100644 --- a/epan/dissectors/asn1/tcap/packet-tcap-template.c +++ b/epan/dissectors/asn1/tcap/packet-tcap-template.c @@ -32,12 +32,12 @@ #define PFNAME "tcap" /* Initialize the protocol and registered fields */ -static int proto_tcap = -1; -static int hf_tcap_tag = -1; -static int hf_tcap_length = -1; -static int hf_tcap_data = -1; -static int hf_tcap_tid = -1; -static int hf_tcap_constructor_eoc=-1; +static int proto_tcap; +static int hf_tcap_tag; +static int hf_tcap_length; +static int hf_tcap_data; +static int hf_tcap_tid; +static int hf_tcap_constructor_eoc; int hf_tcapsrt_SessionId=-1; int hf_tcapsrt_Duplicate=-1; @@ -48,11 +48,11 @@ int hf_tcapsrt_SessionTime=-1; #include "packet-tcap-hf.c" /* Initialize the subtree pointers */ -static gint ett_tcap = -1; -static gint ett_param = -1; +static gint ett_tcap; +static gint ett_param; -static gint ett_otid = -1; -static gint ett_dtid = -1; +static gint ett_otid; +static gint ett_dtid; gint ett_tcap_stat = -1; static struct tcapsrt_info_t * gp_tcapsrt_info; diff --git a/epan/dissectors/asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c b/epan/dissectors/asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c index ab8bc3d261..2f7a235366 100644 --- a/epan/dissectors/asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c +++ b/epan/dissectors/asn1/tcg-cp-oids/packet-tcg-cp-oids-template.c @@ -26,9 +26,9 @@ void proto_register_tcg_cp_oids(void); void proto_reg_handoff_tcg_cp_oids(void); /* Initialize the protocol and registered fields */ -static int proto_tcg_cp_oids = -1; +static int proto_tcg_cp_oids; #include "packet-tcg-cp-oids-hf.c" -static int hf_tcg_cp_oids_UTF8String_PDU = -1; +static int hf_tcg_cp_oids_UTF8String_PDU; /* Initialize the subtree pointers */ #include "packet-tcg-cp-oids-ett.c" diff --git a/epan/dissectors/asn1/tetra/packet-tetra-template.c b/epan/dissectors/asn1/tetra/packet-tetra-template.c index d3be10213e..00a94846dc 100644 --- a/epan/dissectors/asn1/tetra/packet-tetra-template.c +++ b/epan/dissectors/asn1/tetra/packet-tetra-template.c @@ -32,7 +32,7 @@ void proto_register_tetra(void); void proto_reg_handoff_tetra(void); /* Wireshark ID of the tetra protocol */ -static int proto_tetra = -1; +static int proto_tetra; static dissector_handle_t tetra_handle; @@ -46,36 +46,36 @@ static gboolean include_carrier_number = TRUE; * proto_register_field_array() in proto_register_tetra() */ /** Kts attempt at defining the protocol */ -static gint hf_tetra = -1; -static gint hf_tetra_header = -1; -static gint hf_tetra_channels = -1; -static gint hf_tetra_channel1 = -1; -static gint hf_tetra_channel2 = -1; -static gint hf_tetra_channel3 = -1; -static gint hf_tetra_txreg = -1; -static gint hf_tetra_timer = -1; -static gint hf_tetra_pdu = -1; -static gint hf_tetra_rvstr = -1; -static gint hf_tetra_carriernumber = -1; -static gint hf_tetra_rxchannel1 = -1; -static gint hf_tetra_rxchannel2 = -1; -static gint hf_tetra_rxchannel3 = -1; -static gint hf_tetra_crc = -1; -static gint hf_tetra_len0 = -1; +static gint hf_tetra; +static gint hf_tetra_header; +static gint hf_tetra_channels; +static gint hf_tetra_channel1; +static gint hf_tetra_channel2; +static gint hf_tetra_channel3; +static gint hf_tetra_txreg; +static gint hf_tetra_timer; +static gint hf_tetra_pdu; +static gint hf_tetra_rvstr; +static gint hf_tetra_carriernumber; +static gint hf_tetra_rxchannel1; +static gint hf_tetra_rxchannel2; +static gint hf_tetra_rxchannel3; +static gint hf_tetra_crc; +static gint hf_tetra_len0; #include "packet-tetra-hf.c" /* Initialize the subtree pointers */ /* These are the ids of the subtrees that we may be creating */ -static gint ett_tetra = -1; -static gint ett_tetra_header = -1; -static gint ett_tetra_length = -1; -static gint ett_tetra_txreg = -1; -static gint ett_tetra_text = -1; +static gint ett_tetra; +static gint ett_tetra_header; +static gint ett_tetra_length; +static gint ett_tetra_txreg; +static gint ett_tetra_text; #include "packet-tetra-ett.c" -static expert_field ei_tetra_channels_incorrect = EI_INIT; +static expert_field ei_tetra_channels_incorrect; #include "packet-tetra-fn.c" diff --git a/epan/dissectors/asn1/ulp/packet-ulp-template.c b/epan/dissectors/asn1/ulp/packet-ulp-template.c index f231deb681..bae4941971 100644 --- a/epan/dissectors/asn1/ulp/packet-ulp-template.c +++ b/epan/dissectors/asn1/ulp/packet-ulp-template.c @@ -44,7 +44,7 @@ static dissector_handle_t lpp_handle; #define ULP_PORT 7275 /* Initialize the protocol and registered fields */ -static int proto_ulp = -1; +static int proto_ulp; #define ULP_HEADER_SIZE 2 @@ -52,19 +52,19 @@ static int proto_ulp = -1; static gboolean ulp_desegment = TRUE; #include "packet-ulp-hf.c" -static int hf_ulp_mobile_directory_number = -1; -static int hf_ulp_ganssTimeModels_bit0 = -1; -static int hf_ulp_ganssTimeModels_bit1 = -1; -static int hf_ulp_ganssTimeModels_bit2 = -1; -static int hf_ulp_ganssTimeModels_bit3 = -1; -static int hf_ulp_ganssTimeModels_bit4 = -1; -static int hf_ulp_ganssTimeModels_spare = -1; +static int hf_ulp_mobile_directory_number; +static int hf_ulp_ganssTimeModels_bit0; +static int hf_ulp_ganssTimeModels_bit1; +static int hf_ulp_ganssTimeModels_bit2; +static int hf_ulp_ganssTimeModels_bit3; +static int hf_ulp_ganssTimeModels_bit4; +static int hf_ulp_ganssTimeModels_spare; /* Initialize the subtree pointers */ -static gint ett_ulp = -1; -static gint ett_ulp_setid = -1; -static gint ett_ulp_thirdPartyId = -1; -static gint ett_ulp_ganssTimeModels = -1; +static gint ett_ulp; +static gint ett_ulp_setid; +static gint ett_ulp_thirdPartyId; +static gint ett_ulp_ganssTimeModels; #include "packet-ulp-ett.c" static dissector_handle_t ulp_tcp_handle; diff --git a/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c b/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c index 39a0c220ab..bb343d6f73 100644 --- a/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c +++ b/epan/dissectors/asn1/wlancertextn/packet-wlancertextn-template.c @@ -29,7 +29,7 @@ void proto_register_wlancertextn(void); void proto_reg_handoff_wlancertextn(void); /* Initialize the protocol and registered fields */ -static int proto_wlancertextn = -1; +static int proto_wlancertextn; #include "packet-wlancertextn-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c index fc95c909ad..1b7678eba8 100644 --- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c +++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c @@ -53,138 +53,138 @@ void proto_register_x2ap(void); #include "packet-x2ap-val.h" /* Initialize the protocol and registered fields */ -static int proto_x2ap = -1; -static int hf_x2ap_transportLayerAddressIPv4 = -1; -static int hf_x2ap_transportLayerAddressIPv6 = -1; -static int hf_x2ap_ReportCharacteristics_PRBPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_TNLLoadIndPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_HWLoadIndPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ABSStatusPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_RSRPMeasurementReportPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_CSIReportPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_Reserved = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_PRBPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_TNLLoadIndPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_HWLoadIndPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_ABSStatusPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_RSRPMeasurementReportPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_CSIReportPeriodic = -1; -static int hf_x2ap_measurementFailedReportCharacteristics_Reserved = -1; -static int hf_x2ap_eUTRANTraceID_TraceID = -1; -static int hf_x2ap_eUTRANTraceID_TraceRecordingSessionReference = -1; -static int hf_x2ap_interfacesToTrace_S1_MME = -1; -static int hf_x2ap_interfacesToTrace_X2 = -1; -static int hf_x2ap_interfacesToTrace_Uu = -1; -static int hf_x2ap_interfacesToTrace_F1_C = -1; -static int hf_x2ap_interfacesToTrace_E1 = -1; -static int hf_x2ap_interfacesToTrace_Reserved = -1; -static int hf_x2ap_traceCollectionEntityIPAddress_IPv4 = -1; -static int hf_x2ap_traceCollectionEntityIPAddress_IPv6 = -1; -static int hf_x2ap_encryptionAlgorithms_EEA1 = -1; -static int hf_x2ap_encryptionAlgorithms_EEA2 = -1; -static int hf_x2ap_encryptionAlgorithms_EEA3 = -1; -static int hf_x2ap_encryptionAlgorithms_Reserved = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA1 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA2 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA3 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_EIA7 = -1; -static int hf_x2ap_integrityProtectionAlgorithms_Reserved = -1; -static int hf_x2ap_measurementsToActivate_M1 = -1; -static int hf_x2ap_measurementsToActivate_M2 = -1; -static int hf_x2ap_measurementsToActivate_M3 = -1; -static int hf_x2ap_measurementsToActivate_M4 = -1; -static int hf_x2ap_measurementsToActivate_M5 = -1; -static int hf_x2ap_measurementsToActivate_LoggingM1FromEventTriggered = -1; -static int hf_x2ap_measurementsToActivate_M6 = -1; -static int hf_x2ap_measurementsToActivate_M7 = -1; -static int hf_x2ap_MDT_Location_Info_GNSS = -1; -static int hf_x2ap_MDT_Location_Info_E_CID = -1; -static int hf_x2ap_MDT_Location_Info_Reserved = -1; -static int hf_x2ap_MDT_transmissionModes_tm1 = -1; -static int hf_x2ap_MDT_transmissionModes_tm2 = -1; -static int hf_x2ap_MDT_transmissionModes_tm3 = -1; -static int hf_x2ap_MDT_transmissionModes_tm4 = -1; -static int hf_x2ap_MDT_transmissionModes_tm6 = -1; -static int hf_x2ap_MDT_transmissionModes_tm8 = -1; -static int hf_x2ap_MDT_transmissionModes_tm9 = -1; -static int hf_x2ap_MDT_transmissionModes_tm10 = -1; -static int hf_x2ap_NRencryptionAlgorithms_NEA1 = -1; -static int hf_x2ap_NRencryptionAlgorithms_NEA2 = -1; -static int hf_x2ap_NRencryptionAlgorithms_NEA3 = -1; -static int hf_x2ap_NRencryptionAlgorithms_Reserved = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA1 = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA2 = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA3 = -1; -static int hf_x2ap_NRintegrityProtectionAlgorithms_Reserved = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_Reserved = -1; -static int hf_x2ap_Registration_Request_ENDC_PDU = -1; -static int hf_x2ap_ReportingPeriodicity_ENDC_PDU = -1; -static int hf_x2ap_ReportCharacteristics_ENDC_PDU = -1; -static int hf_x2ap_rAT_RestrictionInformation_LEO = -1; -static int hf_x2ap_rAT_RestrictionInformation_MEO = -1; -static int hf_x2ap_rAT_RestrictionInformation_GEO = -1; -static int hf_x2ap_rAT_RestrictionInformation_OTHERSAT = -1; -static int hf_x2ap_rAT_RestrictionInformation_Reserved = -1; +static int proto_x2ap; +static int hf_x2ap_transportLayerAddressIPv4; +static int hf_x2ap_transportLayerAddressIPv6; +static int hf_x2ap_ReportCharacteristics_PRBPeriodic; +static int hf_x2ap_ReportCharacteristics_TNLLoadIndPeriodic; +static int hf_x2ap_ReportCharacteristics_HWLoadIndPeriodic; +static int hf_x2ap_ReportCharacteristics_CompositeAvailableCapacityPeriodic; +static int hf_x2ap_ReportCharacteristics_ABSStatusPeriodic; +static int hf_x2ap_ReportCharacteristics_RSRPMeasurementReportPeriodic; +static int hf_x2ap_ReportCharacteristics_CSIReportPeriodic; +static int hf_x2ap_ReportCharacteristics_Reserved; +static int hf_x2ap_measurementFailedReportCharacteristics_PRBPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_TNLLoadIndPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_HWLoadIndPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_CompositeAvailableCapacityPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_ABSStatusPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_RSRPMeasurementReportPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_CSIReportPeriodic; +static int hf_x2ap_measurementFailedReportCharacteristics_Reserved; +static int hf_x2ap_eUTRANTraceID_TraceID; +static int hf_x2ap_eUTRANTraceID_TraceRecordingSessionReference; +static int hf_x2ap_interfacesToTrace_S1_MME; +static int hf_x2ap_interfacesToTrace_X2; +static int hf_x2ap_interfacesToTrace_Uu; +static int hf_x2ap_interfacesToTrace_F1_C; +static int hf_x2ap_interfacesToTrace_E1; +static int hf_x2ap_interfacesToTrace_Reserved; +static int hf_x2ap_traceCollectionEntityIPAddress_IPv4; +static int hf_x2ap_traceCollectionEntityIPAddress_IPv6; +static int hf_x2ap_encryptionAlgorithms_EEA1; +static int hf_x2ap_encryptionAlgorithms_EEA2; +static int hf_x2ap_encryptionAlgorithms_EEA3; +static int hf_x2ap_encryptionAlgorithms_Reserved; +static int hf_x2ap_integrityProtectionAlgorithms_EIA1; +static int hf_x2ap_integrityProtectionAlgorithms_EIA2; +static int hf_x2ap_integrityProtectionAlgorithms_EIA3; +static int hf_x2ap_integrityProtectionAlgorithms_EIA7; +static int hf_x2ap_integrityProtectionAlgorithms_Reserved; +static int hf_x2ap_measurementsToActivate_M1; +static int hf_x2ap_measurementsToActivate_M2; +static int hf_x2ap_measurementsToActivate_M3; +static int hf_x2ap_measurementsToActivate_M4; +static int hf_x2ap_measurementsToActivate_M5; +static int hf_x2ap_measurementsToActivate_LoggingM1FromEventTriggered; +static int hf_x2ap_measurementsToActivate_M6; +static int hf_x2ap_measurementsToActivate_M7; +static int hf_x2ap_MDT_Location_Info_GNSS; +static int hf_x2ap_MDT_Location_Info_E_CID; +static int hf_x2ap_MDT_Location_Info_Reserved; +static int hf_x2ap_MDT_transmissionModes_tm1; +static int hf_x2ap_MDT_transmissionModes_tm2; +static int hf_x2ap_MDT_transmissionModes_tm3; +static int hf_x2ap_MDT_transmissionModes_tm4; +static int hf_x2ap_MDT_transmissionModes_tm6; +static int hf_x2ap_MDT_transmissionModes_tm8; +static int hf_x2ap_MDT_transmissionModes_tm9; +static int hf_x2ap_MDT_transmissionModes_tm10; +static int hf_x2ap_NRencryptionAlgorithms_NEA1; +static int hf_x2ap_NRencryptionAlgorithms_NEA2; +static int hf_x2ap_NRencryptionAlgorithms_NEA3; +static int hf_x2ap_NRencryptionAlgorithms_Reserved; +static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA1; +static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA2; +static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA3; +static int hf_x2ap_NRintegrityProtectionAlgorithms_Reserved; +static int hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic; +static int hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic; +static int hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic; +static int hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs; +static int hf_x2ap_ReportCharacteristics_ENDC_Reserved; +static int hf_x2ap_Registration_Request_ENDC_PDU; +static int hf_x2ap_ReportingPeriodicity_ENDC_PDU; +static int hf_x2ap_ReportCharacteristics_ENDC_PDU; +static int hf_x2ap_rAT_RestrictionInformation_LEO; +static int hf_x2ap_rAT_RestrictionInformation_MEO; +static int hf_x2ap_rAT_RestrictionInformation_GEO; +static int hf_x2ap_rAT_RestrictionInformation_OTHERSAT; +static int hf_x2ap_rAT_RestrictionInformation_Reserved; #include "packet-x2ap-hf.c" /* Initialize the subtree pointers */ -static int ett_x2ap = -1; -static int ett_x2ap_TransportLayerAddress = -1; -static int ett_x2ap_PLMN_Identity = -1; -static int ett_x2ap_TargeteNBtoSource_eNBTransparentContainer = -1; -static int ett_x2ap_RRC_Context = -1; -static int ett_x2ap_UE_HistoryInformationFromTheUE = -1; -static int ett_x2ap_ReportCharacteristics = -1; -static int ett_x2ap_measurementFailedReportCharacteristics = -1; -static int ett_x2ap_UE_RLF_Report_Container = -1; -static int ett_x2ap_UE_RLF_Report_Container_for_extended_bands = -1; -static int ett_x2ap_MeNBtoSeNBContainer = -1; -static int ett_x2ap_SeNBtoMeNBContainer = -1; -static int ett_x2ap_EUTRANTraceID = -1; -static int ett_x2ap_InterfacesToTrace = -1; -static int ett_x2ap_TraceCollectionEntityIPAddress = -1; -static int ett_x2ap_EncryptionAlgorithms = -1; -static int ett_x2ap_IntegrityProtectionAlgorithms = -1; -static int ett_x2ap_MeasurementsToActivate = -1; -static int ett_x2ap_MDT_Location_Info = -1; -static int ett_x2ap_transmissionModes = -1; -static int ett_x2ap_X2AP_Message = -1; -static int ett_x2ap_MeNBtoSgNBContainer = -1; -static int ett_x2ap_SgNBtoMeNBContainer = -1; -static int ett_x2ap_RRCContainer = -1; -static int ett_x2ap_NRencryptionAlgorithms = -1; -static int ett_x2ap_NRintegrityProtectionAlgorithms = -1; -static int ett_x2ap_measurementTimingConfiguration = -1; -static int ett_x2ap_LastVisitedNGRANCellInformation = -1; -static int ett_x2ap_LastVisitedUTRANCellInformation = -1; -static int ett_x2ap_EndcSONConfigurationTransfer = -1; -static int ett_x2ap_EPCHandoverRestrictionListContainer = -1; -static int ett_x2ap_NBIoT_RLF_Report_Container = -1; -static int ett_x2ap_anchorCarrier_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_EDT_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_Format2_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig = -1; -static int ett_x2ap_non_anchorCarrier_NPRACHConfig = -1; -static int ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig = -1; -static int ett_x2ap_anchorCarrier_NPRACHConfigTDD = -1; -static int ett_x2ap_non_anchorCarrier_NPRACHConfigTDD = -1; -static int ett_x2ap_Non_anchorCarrierFrequency = -1; -static int ett_x2ap_ReportCharacteristics_ENDC = -1; -static int ett_x2ap_TargetCellInNGRAN = -1; -static int ett_x2ap_TDDULDLConfigurationCommonNR = -1; -static int ett_x2ap_MDT_ConfigurationNR = -1; -static int ett_x2ap_NRCellPRACHConfig = -1; -static int ett_x2ap_IntendedTDD_DL_ULConfiguration_NR = -1; -static int ett_x2ap_UERadioCapability = -1; -static int ett_x2ap_LastVisitedPSCell_Item = -1; -static int ett_x2ap_NRRACHReportContainer = -1; -static int ett_x2ap_rAT_RestrictionInformation = -1; +static int ett_x2ap; +static int ett_x2ap_TransportLayerAddress; +static int ett_x2ap_PLMN_Identity; +static int ett_x2ap_TargeteNBtoSource_eNBTransparentContainer; +static int ett_x2ap_RRC_Context; +static int ett_x2ap_UE_HistoryInformationFromTheUE; +static int ett_x2ap_ReportCharacteristics; +static int ett_x2ap_measurementFailedReportCharacteristics; +static int ett_x2ap_UE_RLF_Report_Container; +static int ett_x2ap_UE_RLF_Report_Container_for_extended_bands; +static int ett_x2ap_MeNBtoSeNBContainer; +static int ett_x2ap_SeNBtoMeNBContainer; +static int ett_x2ap_EUTRANTraceID; +static int ett_x2ap_InterfacesToTrace; +static int ett_x2ap_TraceCollectionEntityIPAddress; +static int ett_x2ap_EncryptionAlgorithms; +static int ett_x2ap_IntegrityProtectionAlgorithms; +static int ett_x2ap_MeasurementsToActivate; +static int ett_x2ap_MDT_Location_Info; +static int ett_x2ap_transmissionModes; +static int ett_x2ap_X2AP_Message; +static int ett_x2ap_MeNBtoSgNBContainer; +static int ett_x2ap_SgNBtoMeNBContainer; +static int ett_x2ap_RRCContainer; +static int ett_x2ap_NRencryptionAlgorithms; +static int ett_x2ap_NRintegrityProtectionAlgorithms; +static int ett_x2ap_measurementTimingConfiguration; +static int ett_x2ap_LastVisitedNGRANCellInformation; +static int ett_x2ap_LastVisitedUTRANCellInformation; +static int ett_x2ap_EndcSONConfigurationTransfer; +static int ett_x2ap_EPCHandoverRestrictionListContainer; +static int ett_x2ap_NBIoT_RLF_Report_Container; +static int ett_x2ap_anchorCarrier_NPRACHConfig; +static int ett_x2ap_anchorCarrier_EDT_NPRACHConfig; +static int ett_x2ap_anchorCarrier_Format2_NPRACHConfig; +static int ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig; +static int ett_x2ap_non_anchorCarrier_NPRACHConfig; +static int ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig; +static int ett_x2ap_anchorCarrier_NPRACHConfigTDD; +static int ett_x2ap_non_anchorCarrier_NPRACHConfigTDD; +static int ett_x2ap_Non_anchorCarrierFrequency; +static int ett_x2ap_ReportCharacteristics_ENDC; +static int ett_x2ap_TargetCellInNGRAN; +static int ett_x2ap_TDDULDLConfigurationCommonNR; +static int ett_x2ap_MDT_ConfigurationNR; +static int ett_x2ap_NRCellPRACHConfig; +static int ett_x2ap_IntendedTDD_DL_ULConfiguration_NR; +static int ett_x2ap_UERadioCapability; +static int ett_x2ap_LastVisitedPSCell_Item; +static int ett_x2ap_NRRACHReportContainer; +static int ett_x2ap_rAT_RestrictionInformation; #include "packet-x2ap-ett.c" /* Forward declarations */ diff --git a/epan/dissectors/asn1/x509af/packet-x509af-template.c b/epan/dissectors/asn1/x509af/packet-x509af-template.c index 314007f21b..d1c60dd22d 100644 --- a/epan/dissectors/asn1/x509af/packet-x509af-template.c +++ b/epan/dissectors/asn1/x509af/packet-x509af-template.c @@ -37,13 +37,13 @@ void proto_reg_handoff_x509af(void); static dissector_handle_t pkix_crl_handle; /* Initialize the protocol and registered fields */ -static int proto_x509af = -1; -static int hf_x509af_algorithm_id = -1; -static int hf_x509af_extension_id = -1; +static int proto_x509af; +static int hf_x509af_algorithm_id; +static int hf_x509af_extension_id; #include "packet-x509af-hf.c" /* Initialize the subtree pointers */ -static gint ett_pkix_crl = -1; +static gint ett_pkix_crl; #include "packet-x509af-ett.c" static const char *algorithm_id = NULL; static void diff --git a/epan/dissectors/asn1/x509af/x509af.cnf b/epan/dissectors/asn1/x509af/x509af.cnf index 3061ed2c6e..b1e97fb570 100644 --- a/epan/dissectors/asn1/x509af/x509af.cnf +++ b/epan/dissectors/asn1/x509af/x509af.cnf @@ -152,7 +152,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate /* the 2-digit year can only be in the range 1950..2049 https://tools.ietf.org/html/rfc5280#section-4.1.2.5.1 */ offset = dissect_ber_UTCTime(implicit_tag, actx, tree, tvb, offset, hf_index, &outstr, &tvblen); - if (hf_index >= 0 && outstr) { + if (hf_index > 0 && outstr) { newstr = wmem_strconcat(actx->pinfo->pool, outstr[0] < '5' ? "20": "19", outstr, NULL); proto_tree_add_string(tree, hf_index, tvb, offset - tvblen, tvblen, newstr); } diff --git a/epan/dissectors/asn1/x509ce/packet-x509ce-template.c b/epan/dissectors/asn1/x509ce/packet-x509ce-template.c index 1817c4286d..459cd99e72 100644 --- a/epan/dissectors/asn1/x509ce/packet-x509ce-template.c +++ b/epan/dissectors/asn1/x509ce/packet-x509ce-template.c @@ -30,12 +30,12 @@ void proto_register_x509ce(void); void proto_reg_handoff_x509ce(void); /* Initialize the protocol and registered fields */ -static int proto_x509ce = -1; -static int hf_x509ce_id_ce_invalidityDate = -1; -static int hf_x509ce_id_ce_baseUpdateTime = -1; -static int hf_x509ce_object_identifier_id = -1; -static int hf_x509ce_IPAddress_ipv4 = -1; -static int hf_x509ce_IPAddress_ipv6 = -1; +static int proto_x509ce; +static int hf_x509ce_id_ce_invalidityDate; +static int hf_x509ce_id_ce_baseUpdateTime; +static int hf_x509ce_object_identifier_id; +static int hf_x509ce_IPAddress_ipv4; +static int hf_x509ce_IPAddress_ipv6; #include "packet-x509ce-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/x509if/packet-x509if-template.c b/epan/dissectors/asn1/x509if/packet-x509if-template.c index d75f177c0d..a7afacd796 100644 --- a/epan/dissectors/asn1/x509if/packet-x509if-template.c +++ b/epan/dissectors/asn1/x509if/packet-x509if-template.c @@ -30,9 +30,9 @@ void proto_register_x509if(void); void proto_reg_handoff_x509if(void); /* Initialize the protocol and registered fields */ -static int proto_x509if = -1; -static int hf_x509if_object_identifier_id = -1; -static int hf_x509if_any_string = -1; +static int proto_x509if; +static int hf_x509if_object_identifier_id; +static int hf_x509if_any_string; #include "packet-x509if-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/x509sat/packet-x509sat-template.c b/epan/dissectors/asn1/x509sat/packet-x509sat-template.c index c5a82c53a1..ec5d40f785 100644 --- a/epan/dissectors/asn1/x509sat/packet-x509sat-template.c +++ b/epan/dissectors/asn1/x509sat/packet-x509sat-template.c @@ -29,7 +29,7 @@ void proto_register_x509sat(void); void proto_reg_handoff_x509sat(void); /* Initialize the protocol and registered fields */ -static int proto_x509sat = -1; +static int proto_x509sat; #include "packet-x509sat-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/asn1/x509sat/x509sat.cnf b/epan/dissectors/asn1/x509sat/x509sat.cnf index e139e09290..02f0391e30 100644 --- a/epan/dissectors/asn1/x509sat/x509sat.cnf +++ b/epan/dissectors/asn1/x509sat/x509sat.cnf @@ -380,7 +380,7 @@ XDayOf/fifth fifth_dayof /* the 2-digit year can only be in the range 1950..2049 https://tools.ietf.org/html/rfc5280#section-4.1.2.5.1 */ offset = dissect_ber_UTCTime(implicit_tag, actx, tree, tvb, offset, hf_index, &outstr, &tvblen); - if (hf_index >= 0 && outstr) { + if (hf_index > 0 && outstr) { newstr = wmem_strconcat(actx->pinfo->pool, outstr[0] < '5' ? "20": "19", outstr, NULL); proto_tree_add_string(tree, hf_index, tvb, offset - tvblen, tvblen, newstr); } diff --git a/epan/dissectors/asn1/xnap/packet-xnap-template.c b/epan/dissectors/asn1/xnap/packet-xnap-template.c index 892503e6ab..4319810138 100644 --- a/epan/dissectors/asn1/xnap/packet-xnap-template.c +++ b/epan/dissectors/asn1/xnap/packet-xnap-template.c @@ -48,92 +48,92 @@ #include "packet-xnap-val.h" /* Initialize the protocol and registered fields */ -static int proto_xnap = -1; -static int hf_xnap_transportLayerAddressIPv4 = -1; -static int hf_xnap_transportLayerAddressIPv6 = -1; -static int hf_xnap_NG_RANTraceID_TraceID = -1; -static int hf_xnap_NG_RANTraceID_TraceRecordingSessionReference = -1; -static int hf_xnap_primaryRATRestriction_e_UTRA = -1; -static int hf_xnap_primaryRATRestriction_nR = -1; -static int hf_xnap_primaryRATRestriction_nR_unlicensed = -1; -static int hf_xnap_primaryRATRestriction_nR_LEO = -1; -static int hf_xnap_primaryRATRestriction_nR_MEO = -1; -static int hf_xnap_primaryRATRestriction_nR_GEO = -1; -static int hf_xnap_primaryRATRestriction_nR_OTHERSAT = -1; -static int hf_xnap_primaryRATRestriction_reserved = -1; -static int hf_xnap_secondaryRATRestriction_e_UTRA = -1; -static int hf_xnap_secondaryRATRestriction_nR = -1; -static int hf_xnap_secondaryRATRestriction_e_UTRA_unlicensed = -1; -static int hf_xnap_secondaryRATRestriction_nR_unlicensed = -1; -static int hf_xnap_secondaryRATRestriction_reserved = -1; -static int hf_xnap_MDT_Location_Info_GNSS = -1; -static int hf_xnap_MDT_Location_Info_reserved = -1; -static int hf_xnap_MeasurementsToActivate_M1 = -1; -static int hf_xnap_MeasurementsToActivate_M2 = -1; -static int hf_xnap_MeasurementsToActivate_M3 = -1; -static int hf_xnap_MeasurementsToActivate_M4 = -1; -static int hf_xnap_MeasurementsToActivate_M5 = -1; -static int hf_xnap_MeasurementsToActivate_LoggingM1FromEventTriggered = -1; -static int hf_xnap_MeasurementsToActivate_M6 = -1; -static int hf_xnap_MeasurementsToActivate_M7 = -1; -static int hf_xnap_ReportCharacteristics_PRBPeriodic = -1; -static int hf_xnap_ReportCharacteristics_TNLCapacityIndPeriodic = -1; -static int hf_xnap_ReportCharacteristics_CompositeAvailableCapacityPeriodic = -1; -static int hf_xnap_ReportCharacteristics_NumberOfActiveUEs = -1; -static int hf_xnap_ReportCharacteristics_Reserved = -1; +static int proto_xnap; +static int hf_xnap_transportLayerAddressIPv4; +static int hf_xnap_transportLayerAddressIPv6; +static int hf_xnap_NG_RANTraceID_TraceID; +static int hf_xnap_NG_RANTraceID_TraceRecordingSessionReference; +static int hf_xnap_primaryRATRestriction_e_UTRA; +static int hf_xnap_primaryRATRestriction_nR; +static int hf_xnap_primaryRATRestriction_nR_unlicensed; +static int hf_xnap_primaryRATRestriction_nR_LEO; +static int hf_xnap_primaryRATRestriction_nR_MEO; +static int hf_xnap_primaryRATRestriction_nR_GEO; +static int hf_xnap_primaryRATRestriction_nR_OTHERSAT; +static int hf_xnap_primaryRATRestriction_reserved; +static int hf_xnap_secondaryRATRestriction_e_UTRA; +static int hf_xnap_secondaryRATRestriction_nR; +static int hf_xnap_secondaryRATRestriction_e_UTRA_unlicensed; +static int hf_xnap_secondaryRATRestriction_nR_unlicensed; +static int hf_xnap_secondaryRATRestriction_reserved; +static int hf_xnap_MDT_Location_Info_GNSS; +static int hf_xnap_MDT_Location_Info_reserved; +static int hf_xnap_MeasurementsToActivate_M1; +static int hf_xnap_MeasurementsToActivate_M2; +static int hf_xnap_MeasurementsToActivate_M3; +static int hf_xnap_MeasurementsToActivate_M4; +static int hf_xnap_MeasurementsToActivate_M5; +static int hf_xnap_MeasurementsToActivate_LoggingM1FromEventTriggered; +static int hf_xnap_MeasurementsToActivate_M6; +static int hf_xnap_MeasurementsToActivate_M7; +static int hf_xnap_ReportCharacteristics_PRBPeriodic; +static int hf_xnap_ReportCharacteristics_TNLCapacityIndPeriodic; +static int hf_xnap_ReportCharacteristics_CompositeAvailableCapacityPeriodic; +static int hf_xnap_ReportCharacteristics_NumberOfActiveUEs; +static int hf_xnap_ReportCharacteristics_Reserved; #include "packet-xnap-hf.c" /* Initialize the subtree pointers */ -static gint ett_xnap = -1; -static gint ett_xnap_RRC_Context = -1; -static gint ett_nxap_container = -1; -static gint ett_xnap_PLMN_Identity = -1; -static gint ett_xnap_measurementTimingConfiguration = -1; -static gint ett_xnap_TransportLayerAddress = -1; -static gint ett_xnap_NG_RANTraceID = -1; -static gint ett_xnap_LastVisitedEUTRANCellInformation = -1; -static gint ett_xnap_LastVisitedNGRANCellInformation = -1; -static gint ett_xnap_LastVisitedUTRANCellInformation = -1; -static gint ett_xnap_LastVisitedGERANCellInformation = -1; -static gint ett_xnap_UERadioCapabilityForPagingOfNR = -1; -static gint ett_xnap_UERadioCapabilityForPagingOfEUTRA = -1; -static gint ett_xnap_FiveGCMobilityRestrictionListContainer = -1; -static gint ett_xnap_primaryRATRestriction = -1; -static gint ett_xnap_secondaryRATRestriction = -1; -static gint ett_xnap_ImmediateMDT_EUTRA = -1; -static gint ett_xnap_MDT_Location_Info = -1; -static gint ett_xnap_MeasurementsToActivate = -1; -static gint ett_xnap_NRMobilityHistoryReport = -1; -static gint ett_xnap_RACHReportContainer = -1; -static gint ett_xnap_TargetCellinEUTRAN = -1; -static gint ett_xnap_TDDULDLConfigurationCommonNR = -1; -static gint ett_xnap_UERLFReportContainerLTE = -1; -static gint ett_xnap_UERLFReportContainerNR = -1; -static gint ett_xnap_burstArrivalTime = -1; -static gint ett_xnap_ReportCharacteristics = -1; -static gint ett_xnap_NRCellPRACHConfig = -1; -static gint ett_xnap_anchorCarrier_NPRACHConfig = -1; -static gint ett_xnap_anchorCarrier_EDT_NPRACHConfig = -1; -static gint ett_xnap_anchorCarrier_Format2_NPRACHConfig = -1; -static gint ett_xnap_anchorCarrier_Format2_EDT_NPRACHConfig = -1; -static gint ett_xnap_non_anchorCarrier_NPRACHConfig = -1; -static gint ett_xnap_non_anchorCarrier_Format2_NPRACHConfig = -1; -static gint ett_xnap_anchorCarrier_NPRACHConfigTDD = -1; -static gint ett_xnap_non_anchorCarrier_NPRACHConfigTDD = -1; -static gint ett_xnap_non_anchorCarrierFrequency = -1; -static gint ett_xnap_cSI_RS_Configuration = -1; -static gint ett_xnap_sR_Configuration = -1; -static gint ett_xnap_pDCCH_ConfigSIB1 = -1; -static gint ett_xnap_sCS_Common = -1; -static gint ett_xnap_LastVisitedPSCellInformation = -1; -static gint ett_xnap_MeasObjectContainer = -1; -static gint ett_xnap_RACH_Config_Common = -1; -static gint ett_xnap_RACH_Config_Common_IAB = -1; -static gint ett_xnap_ReportConfigContainer = -1; -static gint ett_xnap_RLC_Bearer_Configuration = -1; -static gint ett_xnap_SuccessfulHOReportContainer = -1; -static gint ett_xnap_UERLFReportContainerLTEExtendBand = -1; -static gint ett_xnap_MDTMode_EUTRA = -1; +static gint ett_xnap; +static gint ett_xnap_RRC_Context; +static gint ett_nxap_container; +static gint ett_xnap_PLMN_Identity; +static gint ett_xnap_measurementTimingConfiguration; +static gint ett_xnap_TransportLayerAddress; +static gint ett_xnap_NG_RANTraceID; +static gint ett_xnap_LastVisitedEUTRANCellInformation; +static gint ett_xnap_LastVisitedNGRANCellInformation; +static gint ett_xnap_LastVisitedUTRANCellInformation; +static gint ett_xnap_LastVisitedGERANCellInformation; +static gint ett_xnap_UERadioCapabilityForPagingOfNR; +static gint ett_xnap_UERadioCapabilityForPagingOfEUTRA; +static gint ett_xnap_FiveGCMobilityRestrictionListContainer; +static gint ett_xnap_primaryRATRestriction; +static gint ett_xnap_secondaryRATRestriction; +static gint ett_xnap_ImmediateMDT_EUTRA; +static gint ett_xnap_MDT_Location_Info; +static gint ett_xnap_MeasurementsToActivate; +static gint ett_xnap_NRMobilityHistoryReport; +static gint ett_xnap_RACHReportContainer; +static gint ett_xnap_TargetCellinEUTRAN; +static gint ett_xnap_TDDULDLConfigurationCommonNR; +static gint ett_xnap_UERLFReportContainerLTE; +static gint ett_xnap_UERLFReportContainerNR; +static gint ett_xnap_burstArrivalTime; +static gint ett_xnap_ReportCharacteristics; +static gint ett_xnap_NRCellPRACHConfig; +static gint ett_xnap_anchorCarrier_NPRACHConfig; +static gint ett_xnap_anchorCarrier_EDT_NPRACHConfig; +static gint ett_xnap_anchorCarrier_Format2_NPRACHConfig; +static gint ett_xnap_anchorCarrier_Format2_EDT_NPRACHConfig; +static gint ett_xnap_non_anchorCarrier_NPRACHConfig; +static gint ett_xnap_non_anchorCarrier_Format2_NPRACHConfig; +static gint ett_xnap_anchorCarrier_NPRACHConfigTDD; +static gint ett_xnap_non_anchorCarrier_NPRACHConfigTDD; +static gint ett_xnap_non_anchorCarrierFrequency; +static gint ett_xnap_cSI_RS_Configuration; +static gint ett_xnap_sR_Configuration; +static gint ett_xnap_pDCCH_ConfigSIB1; +static gint ett_xnap_sCS_Common; +static gint ett_xnap_LastVisitedPSCellInformation; +static gint ett_xnap_MeasObjectContainer; +static gint ett_xnap_RACH_Config_Common; +static gint ett_xnap_RACH_Config_Common_IAB; +static gint ett_xnap_ReportConfigContainer; +static gint ett_xnap_RLC_Bearer_Configuration; +static gint ett_xnap_SuccessfulHOReportContainer; +static gint ett_xnap_UERLFReportContainerLTEExtendBand; +static gint ett_xnap_MDTMode_EUTRA; #include "packet-xnap-ett.c" enum { diff --git a/epan/dissectors/asn1/z3950/packet-z3950-template.c b/epan/dissectors/asn1/z3950/packet-z3950-template.c index 6da17f2c1e..cf490a5b23 100644 --- a/epan/dissectors/asn1/z3950/packet-z3950-template.c +++ b/epan/dissectors/asn1/z3950/packet-z3950-template.c @@ -105,7 +105,7 @@ void proto_reg_handoff_z3950(void); void proto_register_z3950(void); /* Initialize the protocol and registered fields */ -static int proto_z3950 = -1; +static int proto_z3950; static int global_z3950_port = Z3950_PORT; static gboolean z3950_desegment = TRUE; @@ -653,11 +653,11 @@ static const value_string z3950_bib1_diagconditions[] = { #include "packet-z3950-hf.c" -static int hf_z3950_referenceId_printable = -1; -static int hf_z3950_general_printable = -1; +static int hf_z3950_referenceId_printable; +static int hf_z3950_general_printable; /* Initialize the subtree pointers */ -static int ett_z3950 = -1; +static int ett_z3950; #include "packet-z3950-ett.c" @@ -666,52 +666,52 @@ static int ett_z3950 = -1; static int dissect_marc_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * data _U_); /* MARC fields */ -static int hf_marc_record = -1; -static int hf_marc_record_terminator = -1; -static int hf_marc_leader = -1; -static int hf_marc_leader_length = -1; -static int hf_marc_leader_status = -1; -static int hf_marc_leader_type = -1; -static int hf_marc_leader_biblevel = -1; -static int hf_marc_leader_control = -1; -static int hf_marc_leader_encoding = -1; -static int hf_marc_leader_indicator_count = -1; -static int hf_marc_leader_subfield_count = -1; -static int hf_marc_leader_data_offset = -1; -static int hf_marc_leader_encoding_level = -1; -static int hf_marc_leader_descriptive_cataloging = -1; -static int hf_marc_leader_multipart_level = -1; -static int hf_marc_leader_length_of_field_length = -1; -static int hf_marc_leader_starting_character_position_length = -1; -static int hf_marc_leader_implementation_defined_length = -1; -static int hf_marc_directory = -1; -static int hf_marc_directory_entry = -1; -static int hf_marc_directory_entry_tag = -1; -static int hf_marc_directory_entry_length = -1; -static int hf_marc_directory_entry_starting_position = -1; -static int hf_marc_directory_terminator = -1; -static int hf_marc_fields = -1; -static int hf_marc_field = -1; -static int hf_marc_field_control = -1; -static int hf_marc_field_terminator = -1; -static int hf_marc_field_indicator1 = -1; -static int hf_marc_field_indicator2 = -1; -static int hf_marc_field_subfield_indicator = -1; -static int hf_marc_field_subfield_tag = -1; -static int hf_marc_field_subfield = -1; +static int hf_marc_record; +static int hf_marc_record_terminator; +static int hf_marc_leader; +static int hf_marc_leader_length; +static int hf_marc_leader_status; +static int hf_marc_leader_type; +static int hf_marc_leader_biblevel; +static int hf_marc_leader_control; +static int hf_marc_leader_encoding; +static int hf_marc_leader_indicator_count; +static int hf_marc_leader_subfield_count; +static int hf_marc_leader_data_offset; +static int hf_marc_leader_encoding_level; +static int hf_marc_leader_descriptive_cataloging; +static int hf_marc_leader_multipart_level; +static int hf_marc_leader_length_of_field_length; +static int hf_marc_leader_starting_character_position_length; +static int hf_marc_leader_implementation_defined_length; +static int hf_marc_directory; +static int hf_marc_directory_entry; +static int hf_marc_directory_entry_tag; +static int hf_marc_directory_entry_length; +static int hf_marc_directory_entry_starting_position; +static int hf_marc_directory_terminator; +static int hf_marc_fields; +static int hf_marc_field; +static int hf_marc_field_control; +static int hf_marc_field_terminator; +static int hf_marc_field_indicator1; +static int hf_marc_field_indicator2; +static int hf_marc_field_subfield_indicator; +static int hf_marc_field_subfield_tag; +static int hf_marc_field_subfield; /* MARC subtree pointers */ -static int ett_marc_record = -1; -static int ett_marc_leader = -1; -static int ett_marc_directory = -1; -static int ett_marc_directory_entry = -1; -static int ett_marc_fields = -1; -static int ett_marc_field = -1; +static int ett_marc_record; +static int ett_marc_leader; +static int ett_marc_directory; +static int ett_marc_directory_entry; +static int ett_marc_fields; +static int ett_marc_field; /* MARC expert fields */ -static expert_field ei_marc_invalid_length = EI_INIT; -static expert_field ei_marc_invalid_value = EI_INIT; -static expert_field ei_marc_invalid_record_length = EI_INIT; +static expert_field ei_marc_invalid_length; +static expert_field ei_marc_invalid_value; +static expert_field ei_marc_invalid_record_length; /* MARC value strings */ |