diff options
33 files changed, 272 insertions, 114 deletions
diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 0740c98c06..a3c0ce198a 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -107,24 +107,24 @@ static int hf_ams_adsadddnresponse = -1; static int hf_ams_adsdeldnrequest = -1; static int hf_ams_adsdeldnresponse = -1; static int hf_ams_adsdnrequest = -1; -static int hf_ams_adsdnresponse = -1; -static int hf_ams_adsnoteattrib = -1; -static int hf_ams_adsnoteblocks = -1; -static int hf_ams_adsversion = -1; +/* static int hf_ams_adsdnresponse = -1; */ +/* static int hf_ams_adsnoteattrib = -1; */ +/* static int hf_ams_adsnoteblocks = -1; */ +/* static int hf_ams_adsversion = -1; */ static int hf_ams_adsdevicename = -1; static int hf_ams_adsversionversion = -1; static int hf_ams_adsversionrevision = -1; static int hf_ams_adsversionbuild = -1; static int hf_ams_adsnoteblocksstamps = -1; -static int hf_ams_adsnoteblocksstamp = -1; -static int hf_ams_adstimestamp = -1; -static int hf_ams_adssamplecnt = -1; -static int hf_ams_adsnoteblockssample = -1; +/* static int hf_ams_adsnoteblocksstamp = -1; */ +/* static int hf_ams_adstimestamp = -1; */ +/* static int hf_ams_adssamplecnt = -1; */ +/* static int hf_ams_adsnoteblockssample = -1; */ static int hf_ams_adstransmode = -1; static int hf_ams_adsmaxdelay = -1; static int hf_ams_adscycletime = -1; -static int hf_ams_adscmpmax = -1; -static int hf_ams_adscmpmin = -1; +/* static int hf_ams_adscmpmax = -1; */ +/* static int hf_ams_adscmpmin = -1; */ static const value_string TransMode[] = { @@ -1098,6 +1098,7 @@ void proto_register_ams(void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ams_adsdnresponse, { "ADS Device Notification Response", "ams.ads_dn_res", FT_NONE, BASE_NONE, NULL, 0x0, @@ -1118,6 +1119,7 @@ void proto_register_ams(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ams_adsdevicename, { "Device Name","ams.ads_devicename", FT_STRING, BASE_NONE, NULL, 0x0, @@ -1143,6 +1145,7 @@ void proto_register_ams(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ams_adsnoteblocksstamp, { "Notification Stamp", "ams.ads_noteblocksstamp", FT_NONE, BASE_NONE, NULL, 0x0, @@ -1163,6 +1166,7 @@ void proto_register_ams(void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ams_adstransmode, { "Trans Mode", "ams.ads_transmode", FT_UINT32, BASE_DEC, VALS(TransMode), 0x0, @@ -1178,6 +1182,7 @@ void proto_register_ams(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ams_adscmpmax, { "Cmp Mad", "ams.ads_cmpmax", FT_NONE, BASE_NONE, NULL, 0x0, @@ -1188,6 +1193,7 @@ void proto_register_ams(void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } } +#endif }; static gint *ett[] = diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 3ab266c3f4..46c8995bf5 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -114,7 +114,7 @@ static int hf_ecat_mailbox_coe_sdoccsds_toggle = -1; static int hf_ecat_mailbox_coe_sdoccsus = -1; static int hf_ecat_mailbox_coe_sdoccsus_toggle = -1; static int hf_ecat_mailbox_coe_sdoccsiu = -1; -static int hf_ecat_mailbox_coe_sdoccsiu_complete = -1; +/* static int hf_ecat_mailbox_coe_sdoccsiu_complete = -1; */ static int hf_ecat_mailbox_coe_sdoidx = -1; static int hf_ecat_mailbox_coe_sdosub = -1; static int hf_ecat_mailbox_coe_sdodata = -1; @@ -122,7 +122,7 @@ static int hf_ecat_mailbox_coe_sdodata1 = -1; static int hf_ecat_mailbox_coe_sdodata2 = -1; static int hf_ecat_mailbox_coe_sdoldata = -1; static int hf_ecat_mailbox_coe_sdolength = -1; -static int hf_ecat_mailbox_coe_sdoerror = -1; +/* static int hf_ecat_mailbox_coe_sdoerror = -1; */ static int hf_ecat_mailbox_coe_sdores = -1; static int hf_ecat_mailbox_coe_sdoscsds = -1; static int hf_ecat_mailbox_coe_sdoscsds_toggle = -1; @@ -1673,11 +1673,13 @@ void proto_register_ecat_mailbox(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ecat_mailbox_coe_sdoccsiu_complete, { "Toggle Bit", "ecat_mailbox.coe.sdoccsiu_complete", FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x00000010, NULL, HFILL } }, +#endif { &hf_ecat_mailbox_coe_sdoccsus, { "Upload Segment", "ecat_mailbox.coe.sdoccsus", FT_UINT8, BASE_HEX, NULL, 0x0, @@ -1724,11 +1726,13 @@ void proto_register_ecat_mailbox(void) FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ecat_mailbox_coe_sdoerror, { "SDO Error", "ecat_mailbox.coe.sdoerror", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ecat_mailbox_coe_sdores, { "SDO Res", "ecat_mailbox.coe.sdores", FT_UINT8, BASE_DEC, NULL, 0x0, diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 60dacf25e7..68908e8c78 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -63,7 +63,7 @@ static int hf_ecat_sub_ado[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; static int hf_ecat_sub_adp[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; static int hf_ecat_sub_lad[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -static int hf_ecat_header = -1; +/* static int hf_ecat_header = -1; */ static int hf_ecat_data = -1; static int hf_ecat_cnt = -1; static int hf_ecat_cmd = -1; @@ -71,7 +71,7 @@ static int hf_ecat_idx = -1; static int hf_ecat_adp = -1; static int hf_ecat_ado = -1; static int hf_ecat_lad = -1; -static int hf_ecat_len = -1; +/* static int hf_ecat_len = -1; */ static int hf_ecat_int = -1; static int hf_ecat_syncman = -1; static int hf_ecat_syncman_start = -1; @@ -876,10 +876,12 @@ void proto_register_ecat(void) { "EtherCAT Frame", "ecat.sub", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ecat_header, { "eader", "ecat.header", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ecat_sub_data[0], { "Data", "ecat.sub1.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -1232,11 +1234,13 @@ void proto_register_ecat(void) FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ecat_len, { "Length", "ecat.len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ecat_int, { "Interrupt", "ecat.int", FT_UINT16, BASE_HEX, NULL, 0x0, diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index 5793c065d8..2b93188082 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -39,7 +39,7 @@ int proto_ioraw = -1; static int ett_ioraw = -1; -static int hf_ioraw_summary = -1; +/* static int hf_ioraw_summary = -1; */ static int hf_ioraw_header = -1; static int hf_ioraw_data = -1; @@ -84,11 +84,13 @@ void proto_register_ioraw(void) { static hf_register_info hf[] = { +#if 0 { &hf_ioraw_summary, { "Summary of the IoRaw Packet", "ioraw.summary", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ioraw_header, { "Header", "ioraw.header", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index 1ecaca676c..706315d461 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -42,7 +42,7 @@ static int ett_nv_header = -1; static int ett_nv_var = -1; static int ett_nv_varheader = -1; -static int hf_nv_summary = -1; +/* static int hf_nv_summary = -1; */ static int hf_nv_header = -1; static int hf_nv_publisher = -1; static int hf_nv_count = -1; @@ -165,11 +165,13 @@ void proto_register_nv(void) { static hf_register_info hf[] = { +#if 0 { &hf_nv_summary, { "Summary of the Nv Packet", "tc_nv.summary", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_nv_header, { "Header", "tc_nv.header", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index f0921671e6..a894181d16 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -129,9 +129,9 @@ static dissector_handle_t data_handle; static int proto_ircomm = -1; static int hf_ircomm_param = -1; -static int hf_param_pi = -1; -static int hf_param_pl = -1; -static int hf_param_pv = -1; +/* static int hf_param_pi = -1; */ +/* static int hf_param_pl = -1; */ +/* static int hf_param_pv = -1; */ static int hf_control = -1; static int hf_control_len = -1; @@ -377,6 +377,7 @@ void proto_register_ircomm(void) { "IrCOMM Parameter", "ircomm.parameter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_param_pi, { "Parameter Identifier", "ircomm.pi", FT_UINT8, BASE_HEX, NULL, 0, @@ -389,6 +390,7 @@ void proto_register_ircomm(void) { "Parameter Value", "ircomm.pv", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_control, { "Control Channel", "ircomm.control", FT_NONE, BASE_NONE, NULL, 0, diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index 8813ec73b5..359ea32635 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -54,7 +54,7 @@ static dissector_handle_t irda_handle; static int proto_sir = -1; static int ett_sir = -1; static int hf_sir_bof = -1; -static int hf_sir_ce = -1; +/* static int hf_sir_ce = -1; */ static int hf_sir_eof = -1; static int hf_sir_fcs = -1; static int hf_sir_fcs_bad = -1; @@ -198,10 +198,12 @@ proto_register_irsir(void) { "Beginning of frame", "sir.bof", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_sir_ce, { "Command escape", "sir.ce", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, +#endif { &hf_sir_eof, { "End of frame", "sir.eof", FT_UINT8, BASE_HEX, NULL, 0, diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index c723e3c84f..bdf1cdb697 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -137,7 +137,7 @@ static gint hf_m2m_tlv_count = -1; static gint hf_m2m_type = -1; static gint hf_m2m_len = -1; static gint hf_m2m_len_size = -1; -static gint hf_m2m_value_bytes = -1; +/* static gint hf_m2m_value_bytes = -1; */ static gint hf_wimax_invalid_tlv = -1; static gint hf_m2m_value_protocol_vers_uint8 = -1; static gint hf_m2m_value_burst_num_uint8 = -1; @@ -631,6 +631,7 @@ void proto_register_m2m(void) NULL, HFILL } }, +#if 0 { &hf_m2m_value_bytes, { @@ -639,6 +640,7 @@ void proto_register_m2m(void) NULL, HFILL } }, +#endif { &hf_m2m_value_protocol_vers_uint8, { diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c index 5d22fa78b4..4307698c04 100644 --- a/plugins/opcua/opcua_transport_layer.c +++ b/plugins/opcua/opcua_transport_layer.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License ** as published by the Free Software Foundation; either version 2 ** of the License, or (at your option) any later version. -** +** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Transport Layer Decoder. @@ -36,7 +36,7 @@ static int hf_opcua_transport_chunk = -1; static int hf_opcua_transport_size = -1; static int hf_opcua_transport_ver = -1; static int hf_opcua_transport_scid = -1; -static int hf_opcua_transport_lifetime = -1; +/* static int hf_opcua_transport_lifetime = -1; */ static int hf_opcua_transport_rbs = -1; static int hf_opcua_transport_sbs = -1; static int hf_opcua_transport_mms = -1; @@ -75,9 +75,11 @@ void registerTransportLayerTypes(int proto) { &hf_opcua_transport_scid, { "SecureChannelId", "transport.scid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_opcua_transport_lifetime, { "Lifetime", "transport.lifetime", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_opcua_transport_rbs, { "ReceiveBufferSize", "transport.rbs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -203,7 +205,7 @@ int parseOpenSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) proto_tree *encobj_tree; proto_tree *nodeid_tree; int ServiceId = 0; - + proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, ENC_ASCII|ENC_NA); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, ENC_ASCII|ENC_NA); *pOffset+=1; proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; @@ -213,7 +215,7 @@ int parseOpenSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) parseByteString(tree, tvb, pOffset, hf_opcua_transport_rcthumb); proto_tree_add_item(tree, hf_opcua_transport_seq, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; proto_tree_add_item(tree, hf_opcua_transport_rqid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; - + /* add encodeable object subtree */ ti = proto_tree_add_text(tree, tvb, 0, -1, "Message : Encodeable Object"); encobj_tree = proto_item_add_subtree(ti, ett_opcua_extensionobject); diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 0497ec56b5..521fa2d2c7 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -101,7 +101,7 @@ static int hf_pn_io_cminitiator_activitytimeoutfactor = -1; static int hf_pn_io_cminitiator_udprtport = -1; static int hf_pn_io_station_name_length = -1; static int hf_pn_io_cminitiator_station_name = -1; -static int hf_pn_io_responder_station_name = -1; +/* static int hf_pn_io_responder_station_name = -1; */ static int hf_pn_io_arproperties_StartupMode = -1; static int hf_pn_io_parameter_server_station_name = -1; @@ -115,8 +115,8 @@ static int hf_pn_io_iocr_type = -1; static int hf_pn_io_iocr_reference = -1; static int hf_pn_io_iocr_SubframeOffset = -1; static int hf_pn_io_iocr_SubframeData =-1; -static int hf_pn_io_iocr_txports_port = -1; -static int hf_pn_io_iocr_txports_redundantport = -1; +/* static int hf_pn_io_iocr_txports_port = -1; */ +/* static int hf_pn_io_iocr_txports_redundantport = -1; */ static int hf_pn_io_sr_properties_Reserved_1 = -1; static int hf_pn_io_sr_properties_Reserved_2 = -1; static int hf_pn_io_RedundancyDataHoldFactor = -1; @@ -239,7 +239,7 @@ static int hf_pn_io_control_block_properties = -1; static int hf_pn_io_control_block_properties_applready = -1; static int hf_pn_io_control_block_properties_applready0 = -1; -static int hf_pn_io_AlarmSequenceNumber = -1; +/* static int hf_pn_io_AlarmSequenceNumber = -1; */ static int hf_pn_io_control_command_reserved = -1; static int hf_pn_io_SubmoduleListEntries = -1; static int hf_pn_io_error_code = -1; @@ -459,23 +459,23 @@ static int hf_pn_io_green_period_begin_tx = -1; static int hf_pn_io_red_orange_period_begin_rx = -1; static int hf_pn_io_orange_period_begin_rx = -1; static int hf_pn_io_green_period_begin_rx = -1; -static int hf_pn_io_tx_phase_assignment = -1; +/* static int hf_pn_io_tx_phase_assignment = -1; */ static int hf_pn_ir_tx_phase_assignment = -1; static int hf_pn_ir_rx_phase_assignment = -1; static int hf_pn_io_tx_phase_assignment_begin_value = -1; static int hf_pn_io_tx_phase_assignment_orange_begin = -1; static int hf_pn_io_tx_phase_assignment_end_reserved = -1; static int hf_pn_io_tx_phase_assignment_reserved = -1; -static int hf_pn_io_rx_phase_assignment = -1; +/* static int hf_pn_io_rx_phase_assignment = -1; */ static int hf_pn_io_slot = -1; static int hf_pn_io_subslot = -1; static int hf_pn_io_number_of_slots = -1; static int hf_pn_io_number_of_subslots = -1; -static int hf_pn_io_maintenance_required_drop_budget = -1; -static int hf_pn_io_maintenance_demanded_drop_budget = -1; -static int hf_pn_io_error_drop_budget = -1; +/* static int hf_pn_io_maintenance_required_drop_budget = -1; */ +/* static int hf_pn_io_maintenance_demanded_drop_budget = -1; */ +/* static int hf_pn_io_error_drop_budget = -1; */ static int hf_pn_io_maintenance_required_power_budget = -1; static int hf_pn_io_maintenance_demanded_power_budget = -1; @@ -617,7 +617,7 @@ static int hf_pn_io_profidrive_param_format = -1; static int hf_pn_io_profidrive_param_no_of_values = -1; static int hf_pn_io_profidrive_param_value = -1; -static int hf_pn_io_packedframe_SFCRC = -1; +/* static int hf_pn_io_packedframe_SFCRC = -1; */ static gint ett_pn_io = -1; static gint ett_pn_io_block = -1; static gint ett_pn_io_block_header = -1; @@ -9675,11 +9675,13 @@ proto_register_pn_io (void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_pn_io_responder_station_name, { "CMResponderrStationName", "pn_io.cmresponder_station_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_pn_io_parameter_server_station_name, { "ParameterServerStationName", "pn_io.parameter_server_station_name", FT_STRING, BASE_NONE, NULL, 0x0, @@ -9717,16 +9719,20 @@ proto_register_pn_io (void) FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_pn_io_iocr_txports_port, { "IOCRTxPorts.Port", "pn_io.iocr_txports_port", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif +#if 0 { &hf_pn_io_iocr_txports_redundantport, { "IOCRTxPorts.RedundantPort", "pn_io.iocr_txports_redundantport", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_pn_io_iocr_SubframeOffset, { "SubframeOffset", "pn_io.subframe_offset", @@ -10254,11 +10260,13 @@ proto_register_pn_io (void) FT_UINT16, BASE_HEX, VALS(pn_io_control_properties_application_ready_vals), 0x0001, NULL, HFILL } }, +#if 0 { &hf_pn_io_AlarmSequenceNumber, { "AlarmSequenceNumber", "pn_io.AlarmSequenceNumber", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_pn_io_SubmoduleListEntries, { "NumberOfEntries", "pn_io.SubmoduleListEntries", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -11300,11 +11308,13 @@ proto_register_pn_io (void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_pn_io_tx_phase_assignment, { "TXPhaseAssignment", "pn_io.tx_phase_assignment", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_pn_ir_tx_phase_assignment, { "TXPhaseAssignment", "pn_io.tx_phase_assignment_sub", FT_NONE, BASE_NONE, NULL, 0x0, @@ -11335,11 +11345,13 @@ proto_register_pn_io (void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_pn_io_rx_phase_assignment, { "RXPhaseAssignment", "pn_io.rx_phase_assignment", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_pn_io_slot, { "Slot", "pn_io.slot", @@ -11362,21 +11374,27 @@ proto_register_pn_io (void) NULL, HFILL } }, +#if 0 { &hf_pn_io_maintenance_required_drop_budget, { "MaintenanceRequiredDropBudget", "pn_io.maintenance_required_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif +#if 0 { &hf_pn_io_maintenance_demanded_drop_budget, { "MaintenanceDemandedDropBudget", "pn_io.maintenance_demanded_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif +#if 0 { &hf_pn_io_error_drop_budget, { "ErrorDropBudget", "pn_io.error_drop_budget", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_pn_io_maintenance_required_power_budget, { "MaintenanceRequiredPowerBudget", "pn_io.maintenance_required_power_budget", @@ -11992,11 +12010,13 @@ proto_register_pn_io (void) FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_pn_io_packedframe_SFCRC, { "SFCRC16", "pn_io.packedframe.sfcrc", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } } +#endif }; static gint *ett[] = { diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 8ac54ff43f..4fec79260d 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -78,7 +78,7 @@ static int hf_cba_disconnectme_in = -1; static int hf_cba_data_first_in = -1; static int hf_cba_data_last_in = -1; -static int hf_cba_acco_server_pICBAAccoCallback = -1; +/* static int hf_cba_acco_server_pICBAAccoCallback = -1; */ static int hf_cba_acco_server_first_connect = -1; @@ -91,7 +91,7 @@ static int hf_cba_acco_serversrt_cr_flags = -1; static int hf_cba_acco_serversrt_cr_flags_timestamped = -1; static int hf_cba_acco_serversrt_cr_flags_reconfigure = -1; static int hf_cba_acco_serversrt_record_length = -1; -static int hf_cba_acco_serversrt_action = -1; +/* static int hf_cba_acco_serversrt_action = -1; */ static int hf_cba_acco_serversrt_last_connect = -1; static int hf_cba_getprovconnout = -1; @@ -4726,11 +4726,13 @@ proto_register_dcom_cba_acco (void) }; static hf_register_info hf_cba_acco_server[] = { +#if 0 { &hf_cba_acco_server_pICBAAccoCallback, { "pICBAAccoCallback", "cba.acco.server_pICBAAccoCallback", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_cba_acco_server_first_connect, { "FirstConnect", "cba.acco.server_first_connect", FT_UINT8, BASE_HEX, NULL, 0x0, @@ -4786,11 +4788,13 @@ proto_register_dcom_cba_acco (void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_cba_acco_serversrt_action, { "Action", "cba.acco.serversrt_action", FT_UINT32, BASE_DEC, VALS(cba_acco_serversrt_action_vals), 0x0, NULL, HFILL } }, +#endif { &hf_cba_acco_serversrt_last_connect, { "LastConnect", "cba.acco.serversrt_last_connect", FT_UINT8, BASE_DEC, VALS(cba_acco_serversrt_last_connect_vals), 0x0, diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index 557b02be7a..1b240b82dc 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -53,7 +53,7 @@ static int hf_pn_dcp_block = -1; static int hf_pn_dcp_block_error = -1; static int hf_pn_dcp_option = -1; -static int hf_pn_dcp_suboption = -1; +/* static int hf_pn_dcp_suboption = -1; */ static int hf_pn_dcp_block_info = -1; static int hf_pn_dcp_block_qualifier = -1; @@ -1038,10 +1038,12 @@ proto_register_pn_dcp (void) FT_UINT8, BASE_DEC, VALS(pn_dcp_option), 0x0, NULL, HFILL }}, +#if 0 { &hf_pn_dcp_suboption, { "Suboption", "pn_dcp.suboption", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_pn_dcp_block_error, { "BlockError", "pn_dcp.block_error", diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index bf61f412a5..fc936b2a88 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -71,7 +71,7 @@ static int hf_pn_rt_sf_crc16_ok = -1; static int hf_pn_rt_sf_crc16_null = -1; static int hf_pn_rt_sf = -1; static int hf_pn_rt_sf_position = -1; -static int hf_pn_rt_sf_position_control = -1; +/* static int hf_pn_rt_sf_position_control = -1; */ static int hf_pn_rt_sf_data_length = -1; static int hf_pn_rt_sf_cycle_counter = -1; @@ -898,10 +898,12 @@ proto_register_pn_rt(void) FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL }}, +#if 0 { &hf_pn_rt_sf_position_control, { "Control", "pn_rt.sf.position_control", FT_UINT8, BASE_DEC, VALS(pn_rt_position_control), 0x80, NULL, HFILL }}, +#endif { &hf_pn_rt_sf_data_length, { "DataLength", "pn_rt.sf.data_length", diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 59895b37f9..f255c877ff 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -112,7 +112,7 @@ static const true_false_string basic_bit_yn={ static int hf_basic_switch_cmd=-1; static int hf_basic_phone_cmd=-1; static int hf_broadcast_switch_cmd=-1; -static int hf_broadcast_phone_cmd=-1; +/* static int hf_broadcast_phone_cmd=-1; */ static int hf_audio_switch_cmd=-1; static int hf_audio_phone_cmd=-1; static int hf_display_switch_cmd=-1; @@ -2781,10 +2781,12 @@ proto_register_unistim(void){ {"Broadcast Cmd (switch)","unistim.broadcast.switch",FT_UINT8, BASE_HEX,VALS(broadcast_switch_msgs),0x0,NULL,HFILL} }, +#if 0 { &hf_broadcast_phone_cmd , {"Broadcast Cmd (phone)","unistim.broadcast.phone",FT_UINT8, BASE_HEX,VALS(broadcast_phone_msgs),0x0,NULL,HFILL} }, +#endif { &hf_audio_switch_cmd , {"Audio Cmd (switch)","unistim.audio.switch",FT_UINT8, BASE_HEX,VALS(audio_switch_msgs),0x0,NULL,HFILL} diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index 7164d4e0e8..ba1dbc71e1 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -72,7 +72,7 @@ static const value_string vals_resolution_parameter[] = /* fix fields */ static gint hf_aas_beam_message_type = -1; -static gint hf_aas_beam_unknown_type = -1; +/* static gint hf_aas_beam_unknown_type = -1; */ static gint hf_aas_beam_select_index = -1; static gint hf_aas_beam_select_reserved = -1; #ifdef OFDM @@ -330,6 +330,7 @@ void proto_register_mac_mgmt_msg_aas_beam(void) } }, #endif +#if 0 { &hf_aas_beam_unknown_type, { @@ -337,6 +338,7 @@ void proto_register_mac_mgmt_msg_aas_beam(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } } +#endif }; /* Setup protocol subtree array */ diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/wimax/msg_aas_fbck.c index 29c74dc425..827333b992 100644 --- a/plugins/wimax/msg_aas_fbck.c +++ b/plugins/wimax/msg_aas_fbck.c @@ -76,7 +76,7 @@ static const value_string vals_resolutions_1[] = /* fix fields */ static int hf_aas_fbck_message_type = -1; -static int hf_aas_fbck_unknown_type = -1; +/* static int hf_aas_fbck_unknown_type = -1; */ static int hf_aas_fbck_frame_number = -1; static int hf_aas_fbck_number_of_frames = -1; static int hf_aas_fbck_req_data_type = -1; @@ -280,6 +280,7 @@ void proto_register_mac_mgmt_msg_aas_fbck(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_aas_fbck_unknown_type, { @@ -287,6 +288,7 @@ void proto_register_mac_mgmt_msg_aas_fbck(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_aas_fbck_req_data_type, { diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c index 77cf7a07d0..d466f0d47a 100644 --- a/plugins/wimax/msg_clk_cmp.c +++ b/plugins/wimax/msg_clk_cmp.c @@ -44,7 +44,7 @@ static gint hf_clk_cmp_clock_count = -1; static gint hf_clk_cmp_clock_id = -1; static gint hf_clk_cmp_seq_number = -1; static gint hf_clk_cmp_comparison_value = -1; -static gint hf_clk_cmp_invalid_tlv = -1; +/* static gint hf_clk_cmp_invalid_tlv = -1; */ /* Decode CLK_CMP messages. */ @@ -127,6 +127,7 @@ void proto_register_mac_mgmt_msg_clk_cmp(void) FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_clk_cmp_invalid_tlv, { @@ -134,6 +135,7 @@ void proto_register_mac_mgmt_msg_clk_cmp(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#endif { &hf_clk_cmp_seq_number, { diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index 75e183b583..8a3390b2c3 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -76,8 +76,8 @@ static gint hf_dcd_h_arq_ack_delay = -1; static gint hf_dcd_mac_version = -1; static gint hf_dcd_restart_count = -1; -static gint hf_dl_burst_reserved = -1; -static gint hf_dl_burst_diuc = -1; +/* static gint hf_dl_burst_reserved = -1; */ +/* static gint hf_dl_burst_diuc = -1; */ static gint hf_dcd_burst_freq = -1; static gint hf_dcd_burst_fec = -1; static gint hf_dcd_burst_diuc_exit_threshold = -1; @@ -117,7 +117,7 @@ static gint hf_dcd_tlv_t_52_time_to_trigger_duration = -1; static gint hf_dcd_tlv_t_60_noise_interference = -1; static gint hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types = -1; -static gint hf_dcd_tlv_t_541_type_function_action = -1; +/* static gint hf_dcd_tlv_t_541_type_function_action = -1; */ static gint hf_dcd_tlv_t_541_type = -1; static gint hf_dcd_tlv_t_541_function = -1; static gint hf_dcd_tlv_t_541_action = -1; @@ -855,6 +855,7 @@ void proto_register_mac_mgmt_msg_dcd(void) FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_dl_burst_diuc, { @@ -862,6 +863,7 @@ void proto_register_mac_mgmt_msg_dcd(void) FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL } }, +#endif { &hf_dcd_burst_diuc_entry_threshold, { @@ -890,6 +892,7 @@ void proto_register_mac_mgmt_msg_dcd(void) FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_dl_burst_reserved, { @@ -897,6 +900,7 @@ void proto_register_mac_mgmt_msg_dcd(void) FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL } }, +#endif { &hf_dcd_burst_tcs, { @@ -1270,6 +1274,7 @@ void proto_register_mac_mgmt_msg_dcd(void) FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_dcd_tlv_t_541_type_function_action, { @@ -1277,6 +1282,7 @@ void proto_register_mac_mgmt_msg_dcd(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_dcd_tlv_t_541_action, { diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index ba51129b0c..169cc2f58f 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -246,11 +246,11 @@ static gint hf_dlmap_phy_fdur = -1; static gint hf_dlmap_phy_fdur_ms = -1; static gint hf_dlmap_phy_fdur_per_sec = -1; static gint hf_dlmap_phy_fnum = -1; -static gint hf_dlmap_fch_expected = -1; +/* static gint hf_dlmap_fch_expected = -1; */ static gint hf_dlmap_dcd = -1; static gint hf_dlmap_bsid = -1; static gint hf_dlmap_ofdma_sym = -1; -static gint hf_dlmap_ie = -1; +/* static gint hf_dlmap_ie = -1; */ static gint hf_dlmap_ie_diuc = -1; static gint hf_dlmap_ie_ncid = -1; static gint hf_dlmap_ie_cid = -1; @@ -267,14 +267,14 @@ static gint hf_dlmap_ie_numsym2 = -1; static gint hf_dlmap_ie_numsub2 = -1; static gint hf_dlmap_ie_rep2 = -1; -static gint hf_dlmap_xie_diuc = -1; -static gint hf_dlmap_xie_len = -1; +/* static gint hf_dlmap_xie_diuc = -1; */ +/* static gint hf_dlmap_xie_len = -1; */ static gint hf_dlmapc_compr = -1; static gint hf_dlmapc_ulmap = -1; static gint hf_dlmapc_rsv = -1; static gint hf_dlmapc_len = -1; -static gint hf_dlmapc_sync = -1; +/* static gint hf_dlmapc_sync = -1; */ static gint hf_dlmapc_opid = -1; static gint hf_dlmapc_secid = -1; static gint hf_dlmapc_count = -1; @@ -2476,6 +2476,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_dlmap_fch_expected, { @@ -2490,6 +2491,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_dlmap_ie_boosting, { @@ -2673,6 +2675,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_dlmapc_sync, { @@ -2680,6 +2683,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_dlmapc_ulmap, { @@ -2687,6 +2691,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) FT_UINT16, BASE_DEC, NULL, 0x1000, NULL, HFILL } }, +#if 0 { &hf_dlmap_xie_diuc, { @@ -2701,6 +2706,7 @@ void proto_register_mac_mgmt_msg_dlmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_109x_cmi, { diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index 66a2348af5..be62a67ac6 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -61,7 +61,7 @@ static gint *ett[] = /* DREG fields */ static gint hf_dreg_cmd_message_type = -1; static gint hf_dreg_req_message_type = -1; -static gint hf_ack_type_reserved = -1; +/* static gint hf_ack_type_reserved = -1; */ static gint hf_dreg_cmd_action = -1; static gint hf_dreg_cmd_action_cor2 = -1; static gint hf_dreg_cmd_reserved = -1; @@ -354,6 +354,7 @@ void proto_register_mac_mgmt_msg_dreg_req(void) FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_ack_type_reserved, { @@ -361,10 +362,12 @@ void proto_register_mac_mgmt_msg_dreg_req(void) FT_UINT8, BASE_DEC, NULL, 0x03, NULL, HFILL } } +#endif }; proto_mac_mgmt_msg_dreg_req_decoder = proto_register_protocol ( - "WiMax DREG-REQ/CMD Messages", /* name */ + "WiMax DREG-REQ/CMD Messages", + /* name */ "WiMax DREG-REQ/CMD (dreg)", /* short name */ "wmx.dreg" /* abbrev */ ); diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c index 5ca89668d3..f2b827bcaf 100644 --- a/plugins/wimax/msg_fpc.c +++ b/plugins/wimax/msg_fpc.c @@ -48,7 +48,7 @@ static gint hf_fpc_number_of_stations = -1; static gint hf_fpc_basic_cid = -1; static gint hf_fpc_power_adjust = -1; static gint hf_fpc_power_measurement_frame = -1; -static gint hf_fpc_invalid_tlv = -1; +/* static gint hf_fpc_invalid_tlv = -1; */ /* Decode FPC messages. */ @@ -132,6 +132,7 @@ void proto_register_mac_mgmt_msg_fpc(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_fpc_invalid_tlv, { @@ -139,6 +140,7 @@ void proto_register_mac_mgmt_msg_fpc(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#endif { &hf_fpc_number_of_stations, { diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 147ceba5b4..e663dbddce 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -46,7 +46,7 @@ static gint ett_mac_mgmt_msg_prc_lt_ctrl_decoder = -1; static gint hf_prc_lt_ctrl_message_type = -1; static gint hf_prc_lt_ctrl_precoding = -1; static gint hf_prc_lt_ctrl_precoding_delay = -1; -static gint hf_prc_lt_ctrl_invalid_tlv = -1; +/* static gint hf_prc_lt_ctrl_invalid_tlv = -1; */ static const value_string vals_turn_on[] = { {0, "Turn off"}, @@ -107,6 +107,7 @@ void proto_register_mac_mgmt_msg_prc_lt_ctrl(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_prc_lt_ctrl_invalid_tlv, { @@ -114,6 +115,7 @@ void proto_register_mac_mgmt_msg_prc_lt_ctrl(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#endif { &hf_prc_lt_ctrl_precoding, { diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index fb79c765a9..9b10742d86 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -58,7 +58,7 @@ static gint ett_reg_rsp_message_tree = -1; static gint hf_reg_rsp_message_type = -1; static gint hf_reg_rsp_status = -1; static gint hf_tlv_type = -1; -static gint hf_tlv_value = -1; +/* static gint hf_tlv_value = -1; */ static gint hf_reg_rsp_secondary_mgmt_cid = -1; static gint hf_reg_invalid_tlv = -1; static gint hf_reg_rsp_new_cid_after_ho = -1; @@ -301,7 +301,7 @@ void proto_register_mac_mgmt_msg_reg_rsp(void) { &hf_reg_invalid_tlv, { - "Invalid TLV", "wmx.reg_rsp.invalid_tlv", + "Invalid TLV", "wmx.reg_rsp.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, @@ -315,7 +315,7 @@ void proto_register_mac_mgmt_msg_reg_rsp(void) { &hf_reg_rsp_status, { - "Response", "wmx.reg_rsp.response", + "Response", "wmx.reg_rsp.response", FT_UINT8, BASE_HEX, VALS(vals_reg_rsp_status), 0x0, NULL, HFILL } }, @@ -350,17 +350,19 @@ void proto_register_mac_mgmt_msg_reg_rsp(void) { &hf_tlv_type, { - "Unknown TLV Type", "wmx.reg_rsp.unknown_tlv_type", + "Unknown TLV Type", "wmx.reg_rsp.unknown_tlv_type", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_tlv_value, { - "Value", "wmx.reg_rsp.tlv_value", + "Value", "wmx.reg_rsp.tlv_value", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } } +#endif }; /* Setup protocol subtree array */ diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index 94a903b008..dcf7af3dab 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -52,7 +52,7 @@ static gint ett_rng_rsp_message_tree = -1; /* RNG-RSP fields */ static gint hf_rng_rsp_message_type = -1; static gint hf_rng_req_reserved = -1; -static gint hf_rng_rsp_ul_channel_id = -1; +/* static gint hf_rng_rsp_ul_channel_id = -1; */ static gint hf_rng_rsp_timing_adjust = -1; static gint hf_rng_rsp_power_level_adjust = -1; static gint hf_rng_rsp_offset_freq_adjust = -1; @@ -107,7 +107,7 @@ static gint hf_rng_rsp_subchannel_reference = -1; static gint hf_rng_rsp_ranging_code_index = -1; static gint hf_rng_rsp_frame_number2 = -1; static gint hf_tlv_type = -1; -static gint hf_tlv_value = -1; +/* static gint hf_tlv_value = -1; */ static gint hf_rng_invalid_tlv = -1; /* STRING RESOURCES */ @@ -935,6 +935,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) FT_FLOAT, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_rng_rsp_ul_channel_id, { @@ -942,6 +943,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_rng_rsp_ul_chan_id_override, { @@ -956,6 +958,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_tlv_value, { @@ -963,6 +966,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } } +#endif }; /* Setup protocol subtree array */ diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index 02f7b1eb79..e11653eb45 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -94,7 +94,7 @@ static gint hf_sbc_ss_demodulator_cc_with_optional_interleaver = -1; static gint hf_sbc_ss_demodulator_harq_chase = -1; static gint hf_sbc_ss_demodulator_harq_ctc_ir = -1; static gint hf_sbc_ss_demodulator_reserved = -1; -static gint hf_sbc_ss_demodulator_reserved1 = -1; +/* static gint hf_sbc_ss_demodulator_reserved1 = -1; */ static gint hf_sbc_ss_demodulator_64qam_2 = -1; static gint hf_sbc_ss_demodulator_btc_2 = -1; static gint hf_sbc_ss_demodulator_ctc_2 = -1; @@ -156,7 +156,7 @@ static gint hf_sbc_ofdma_ss_uplink_power_control_support = -1; static gint hf_sbc_ofdma_ss_uplink_power_control_support_open_loop = -1; static gint hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble = -1; static gint hf_sbc_ofdma_ss_uplink_power_control_support_rsvd = -1; -static gint hf_sbc_ofdm_ss_minimum_num_of_frames = -1; +/* static gint hf_sbc_ofdm_ss_minimum_num_of_frames = -1; */ static gint hf_sbc_tlv_t_27_extension_capability = -1; static gint hf_sbc_tlv_t_27_extension_capability_bit0 = -1; static gint hf_sbc_tlv_t_27_extension_capability_reserved = -1; @@ -2901,6 +2901,7 @@ void proto_register_mac_mgmt_msg_sbc(void) FT_UINT16, BASE_HEX, NULL, 0x800, NULL, HFILL } }, +#if 0 { /* if the number of DL H-ARQ channels > 7 but tlv length = 1 */ &hf_sbc_ss_demodulator_reserved1, { @@ -2908,6 +2909,7 @@ void proto_register_mac_mgmt_msg_sbc(void) FT_UINT16, BASE_HEX, NULL, 0xFFFF, NULL, HFILL } }, +#endif { &hf_sbc_ss_demodulator_stc, { @@ -2979,6 +2981,7 @@ void proto_register_mac_mgmt_msg_sbc(void) FT_UINT8, BASE_HEX, NULL, 0xE0, NULL, HFILL } }, +#if 0 { &hf_sbc_ofdm_ss_minimum_num_of_frames, { @@ -2986,6 +2989,7 @@ void proto_register_mac_mgmt_msg_sbc(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_sbc_ss_mimo_uplink_support_rsvd, { diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index 2a1c840220..cb3915cb89 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -53,10 +53,10 @@ static gint hf_ucd_res_timeout = -1; static gint hf_ucd_bw_req_size = -1; static gint hf_ucd_ranging_req_size = -1; static gint hf_ucd_freq = -1; -static gint hf_ucd_subchan_params_num_chan = -1; +/* static gint hf_ucd_subchan_params_num_chan = -1; */ static gint hf_ucd_ul_allocated_subchannles_bitmap = -1; -static gint hf_ucd_subchan_params_num_sym = -1; -static gint hf_ucd_subchan_codes = -1; +/* static gint hf_ucd_subchan_params_num_sym = -1; */ +/* static gint hf_ucd_subchan_codes = -1; */ static gint hf_ucd_ul_burst_reserved = -1; static gint hf_ucd_ul_burst_uiuc = -1; @@ -91,7 +91,7 @@ static gint hf_ucd_tlv_t_192_min_level_power_offset_adjustment = -1; static gint hf_ucd_tlv_t_193_max_level_power_offset_adjustment = -1; static gint hf_ucd_tlv_t_194_handover_ranging_codes = -1; static gint hf_ucd_tlv_t_195_initial_ranging_interval = -1; -static gint hf_ucd_tlv_t_196_tx_power_report = -1; +/* static gint hf_ucd_tlv_t_196_tx_power_report = -1; */ static gint hf_ucd_tlv_t_196_tx_power_report_threshold = -1; static gint hf_ucd_tlv_t_196_tx_power_report_interval = -1; static gint hf_ucd_tlv_t_196_tx_power_report_a_p_avg = -1; @@ -114,7 +114,7 @@ static gint hf_ucd_tlv_t_152_bandwidth_request_codes = -1; static gint hf_ucd_tlv_t_155_start_of_ranging_codes_group = -1; static gint hf_ucd_tlv_t_156_permutation_base = -1; -static gint hf_ucd_unknown_type = -1; +/* static gint hf_ucd_unknown_type = -1; */ static gint hf_ucd_invalid_tlv = -1; static const value_string vals_dcd_burst_tcs[] = @@ -1040,6 +1040,7 @@ void proto_register_mac_mgmt_msg_ucd(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#if 0 { &hf_ucd_subchan_codes, { @@ -1068,6 +1069,7 @@ void proto_register_mac_mgmt_msg_ucd(void) FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL } }, +#endif { &hf_ucd_tlv_t_196_tx_power_report_a_p_avg, { @@ -1110,6 +1112,7 @@ void proto_register_mac_mgmt_msg_ucd(void) FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL } }, +#if 0 { &hf_ucd_unknown_type, { @@ -1117,6 +1120,7 @@ void proto_register_mac_mgmt_msg_ucd(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#endif { &hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types, { diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index cc8091f6b3..26e8189fba 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -204,9 +204,9 @@ static gint hf_ulmap_reserved = -1; static gint hf_ulmap_ucd_count = -1; static gint hf_ulmap_alloc_start_time = -1; static gint hf_ulmap_ofdma_sym = -1; -static gint hf_ulmap_fch_expected = -1; +/* static gint hf_ulmap_fch_expected = -1; */ -static gint hf_ulmap_ie = -1; +/* static gint hf_ulmap_ie = -1; */ static gint hf_ulmap_ie_cid = -1; static gint hf_ulmap_ie_uiuc = -1; @@ -228,12 +228,12 @@ static gint hf_ulmap_uiuc14_sym = -1; static gint hf_ulmap_uiuc14_sub = -1; static gint hf_ulmap_uiuc14_bwr = -1; -static gint hf_ulmap_uiuc11_ext = -1; -static gint hf_ulmap_uiuc11_len = -1; -static gint hf_ulmap_uiuc11_data = -1; -static gint hf_ulmap_uiuc15_ext = -1; -static gint hf_ulmap_uiuc15_len = -1; -static gint hf_ulmap_uiuc15_data = -1; +/* static gint hf_ulmap_uiuc11_ext = -1; */ +/* static gint hf_ulmap_uiuc11_len = -1; */ +/* static gint hf_ulmap_uiuc11_data = -1; */ +/* static gint hf_ulmap_uiuc15_ext = -1; */ +/* static gint hf_ulmap_uiuc15_len = -1; */ +/* static gint hf_ulmap_uiuc15_data = -1; */ static gint hf_ulmap_uiuc0_symofs = -1; static gint hf_ulmap_uiuc0_subofs = -1; @@ -1652,12 +1652,12 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, const guint8 *bufptr, gint offset, g proto_tree_add_uint(tree, hf_ulmap_ie_uiuc, tvb, NIBHI(nibble, 1), uiuc); nibble += 1; - /* +#if 0 proto_tree_add_uint(tree, hf_ulmap_uiuc11_ext, tvb, NIBHI(nibble, 1), ext2_uiuc); nibble += 1; proto_tree_add_uint(tree, hf_ulmap_uiuc11_len, tvb, NIBHI(nibble, 2), len); nibble += 2; - */ +#endif len = 3 + BYTE_TO_NIB(len); /* length in nibbles */ @@ -1801,12 +1801,12 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, const guint8 *bufptr, gint offset, g proto_tree_add_uint(tree, hf_ulmap_ie_uiuc, tvb, NIBHI(nibble,1), uiuc); nibble += 1; - /* +#if 0 ti = proto_tree_add_uint(tree, hf_ulmap_uiuc11_ext, tvb, NIBHI(nibble,1), ext_uiuc); nibble += 1; proto_tree_add_uint(tree, hf_ulmap_uiuc11_len, tvb, NIBHI(nibble,1), len); nibble += 1; - */ +#endif len = 2 + BYTE_TO_NIB(len); /* length in nibbles */ @@ -2075,6 +2075,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_ulmap_fch_expected, { @@ -2082,6 +2083,8 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif +#if 0 { &hf_ulmap_ie, { @@ -2089,6 +2092,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ulmap_ie_cid, { @@ -2166,6 +2170,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT32, BASE_DEC, NULL, 0xff000000, NULL, HFILL } }, +#if 0 { &hf_ulmap_uiuc11_data, { @@ -2187,6 +2192,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_ulmap_uiuc12_dri, { @@ -2348,6 +2354,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT16, BASE_DEC, NULL, 0x03c0, NULL, HFILL } }, +#if 0 { &hf_ulmap_uiuc15_data, { @@ -2369,6 +2376,7 @@ void proto_register_mac_mgmt_msg_ulmap(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } } +#endif }; /* Setup protocol subtree array */ diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c index dce4e2839e..e7a905f41e 100644 --- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c @@ -206,7 +206,7 @@ static gint hf_cdlmap_allocation_mode_1 = -1; static gint hf_cdlmap_allocation_mode_rsvd_1 = -1; static gint hf_cdlmap_num_subchannels_1 = -1; -static gint hf_cdlmap_reserved_type = -1; +/* static gint hf_cdlmap_reserved_type = -1; */ static gint hf_cdlmap_reserved_type_1 = -1; /* display indexies */ @@ -1716,10 +1716,12 @@ void proto_register_wimax_compact_dlmap_ie(void) &hf_cdlmap_num_subchannels_1, {"Number Of Subchannels", "wmx.compact_dlmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x0FF0, NULL, HFILL} }, +#if 0 { &hf_cdlmap_reserved_type, {"DL-MAP Reserved Type", "wmx.compact_dlmap.reserved_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, NULL, HFILL} }, +#endif { &hf_cdlmap_reserved_type_1, {"DL-MAP Reserved Type", "wmx.compact_dlmap.reserved_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, NULL, HFILL} diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c index 19db382bf6..bd8e0bfbef 100644 --- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c @@ -173,8 +173,8 @@ static gint hf_culmap_uiuc_ranging_method_1 = -1; static gint hf_culmap_uiuc_reserved_1 = -1; static gint hf_culmap_uiuc_repetition_coding_indication = -1; static gint hf_culmap_uiuc_repetition_coding_indication_1 = -1; -static gint hf_culmap_uiuc_reserved1 = -1; -static gint hf_culmap_uiuc_reserved11_1 = -1; +/* static gint hf_culmap_uiuc_reserved1 = -1; */ +/* static gint hf_culmap_uiuc_reserved11_1 = -1; */ static gint hf_culmap_uiuc_subchannel_offset = -1; static gint hf_culmap_uiuc_subchannel_offset_1 = -1; static gint hf_culmap_uiuc_num_of_ofdma_symbols = -1; @@ -197,7 +197,7 @@ static gint hf_culmap_allocation_mode_1 = -1; static gint hf_culmap_allocation_mode_rsvd_1 = -1; static gint hf_culmap_num_subchannels_1 = -1; -static gint hf_culmap_reserved_type = -1; +/* static gint hf_culmap_reserved_type = -1; */ static gint hf_culmap_reserved_type_1 = -1; /* display indexies */ @@ -264,10 +264,10 @@ static gint hf_culmap_extension_type_1 = -1; static gint hf_culmap_extension_subtype_1 = -1; static gint hf_culmap_extension_length_1 = -1; -static gint hf_culmap_extension_time_diversity_mbs = -1; +/* static gint hf_culmap_extension_time_diversity_mbs = -1; */ static gint hf_culmap_extension_harq_mode = -1; static gint hf_culmap_extension_unknown_sub_type = -1; -static gint hf_culmap_extension_time_diversity_mbs_1 = -1; +/* static gint hf_culmap_extension_time_diversity_mbs_1 = -1; */ static gint hf_culmap_extension_harq_mode_1 = -1; static gint hf_culmap_extension_unknown_sub_type_1 = -1; @@ -1666,14 +1666,18 @@ void proto_register_wimax_compact_ulmap_ie(void) &hf_culmap_uiuc_repetition_coding_indication_1, {"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK_1, NULL, HFILL} }, +#if 0 { &hf_culmap_uiuc_reserved1, {"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x30, NULL, HFILL} }, +#endif +#if 0 { &hf_culmap_uiuc_reserved11_1, {"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL} }, +#endif { &hf_culmap_uiuc_subchannel_offset, @@ -1715,10 +1719,12 @@ void proto_register_wimax_compact_ulmap_ie(void) &hf_culmap_cqi_region_change_indication_1, {"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, NULL, HFILL} }, +#if 0 { &hf_culmap_reserved_type, {"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, NULL, HFILL} }, +#endif { &hf_culmap_reserved_type_1, {"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, NULL, HFILL} @@ -1849,14 +1855,18 @@ void proto_register_wimax_compact_ulmap_ie(void) &hf_culmap_extension_length_1, {"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, NULL, HFILL} }, +#if 0 { &hf_culmap_extension_time_diversity_mbs, {"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif +#if 0 { &hf_culmap_extension_time_diversity_mbs_1, {"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif { &hf_culmap_extension_harq_mode_1, {"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, NULL, HFILL} diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c index c46a075af8..6adb3a9322 100644 --- a/plugins/wimax/wimax_ffb_decoder.c +++ b/plugins/wimax/wimax_ffb_decoder.c @@ -38,7 +38,7 @@ extern gint proto_wimax; static gint proto_wimax_ffb_decoder = -1; static gint ett_wimax_ffb_decoder = -1; -static gint hf_ffb_burst = -1; +/* static gint hf_ffb_burst = -1; */ static gint hf_ffb_num_of_ffbs = -1; static gint hf_ffb_type = -1; static gint hf_ffb_subchannel = -1; @@ -85,10 +85,12 @@ void proto_register_wimax_ffb(void) /* FFB display */ static hf_register_info hf[] = { +#if 0 { &hf_ffb_burst, {"Fast Feedback Burst", "wmx.ffb.burst", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif { &hf_ffb_num_of_ffbs, {"Number Of Fast Feedback", "wmx.ffb.num_of_ffbs", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c index 09403206a5..4c61816fe6 100644 --- a/plugins/wimax/wimax_hack_decoder.c +++ b/plugins/wimax/wimax_hack_decoder.c @@ -52,7 +52,7 @@ static const value_string vals_values[] = {0, NULL} }; -static gint hf_hack_burst = -1; +/* static gint hf_hack_burst = -1; */ static gint hf_hack_num_of_hacks = -1; static gint hf_hack_half_slot_flag = -1; static gint hf_hack_subchannel = -1; @@ -98,10 +98,12 @@ void proto_register_wimax_hack(void) /* HARQ ACK display */ static hf_register_info hf[] = { +#if 0 { &hf_hack_burst, {"HARQ ACK Burst", "wmx.hack.burst", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif { &hf_hack_num_of_hacks, {"Number Of HARQ ACKs/NACKs", "wmx.hack.num_of_hacks", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index d2231577c6..14270f91b8 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -436,7 +436,7 @@ static gint hf_sfe_harq_channel_mapping_index = -1; static gint hf_sfe_fsn_size = -1; static gint hf_sfe_unsolicited_grant_interval = -1; static gint hf_sfe_unsolicited_polling_interval = -1; -static gint hf_sfe_harq_channel_mapping = -1; +/* static gint hf_sfe_harq_channel_mapping = -1; */ static gint hf_sfe_global_service_class_name = -1; static gint hf_sfe_reserved_36 = -1; static gint hf_sfe_reserved_34 = -1; @@ -458,7 +458,7 @@ static gint hf_sfe_arq_block_size_cor2 = -1; static gint hf_sfe_arq_min_block_size = -1; static gint hf_sfe_arq_max_block_size = -1; -static gint hf_sfe_cid_alloc_for_active_bs = -1; +/* static gint hf_sfe_cid_alloc_for_active_bs = -1; */ static gint hf_sfe_cid_alloc_for_active_bs_cid = -1; static gint hf_sfe_pdu_sn_ext_subheader_reorder = -1; static gint hf_sfe_mbs_contents_ids = -1; @@ -669,11 +669,11 @@ static gint hf_pkm_config_settings_rekey_wait_timeout = -1; static gint hf_pkm_config_settings_tek_grace_time = -1; static gint hf_pkm_config_settings_authorize_reject_wait_timeout = -1; -static gint hf_pkm_attr_pak_ak_seq_number = -1; +/* static gint hf_pkm_attr_pak_ak_seq_number = -1; */ static gint hf_pkm_attr_associated_gkek_seq_number = -1; -static gint hf_pkm_attr_gkek_params = -1; +/* static gint hf_pkm_attr_gkek_params = -1; */ -static gint hf_common_tlv_unknown_type = -1; +/* static gint hf_common_tlv_unknown_type = -1; */ static gint hf_common_tlv_mac_version = -1; static gint hf_common_tlv_vendor_id = -1; static gint hf_common_tlv_vendor_specific_type = -1; @@ -921,10 +921,12 @@ void proto_register_wimax_utility_decoders(void) &hf_sfe_fsn_size, {"FSN Size", "wmx.sfe.fsn_size", FT_UINT8, BASE_DEC, VALS(vals_fsn_size), 0x0, NULL, HFILL} }, +#if 0 { /* 39 CID allocation for Active BSs */ &hf_sfe_cid_alloc_for_active_bs, {"CID Allocation For Active BSs", "wmx.sfe.cid_alloc_for_active_bs", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif { /* 39.1 */ &hf_sfe_cid_alloc_for_active_bs_cid, {"CID", "wmx.sfe.cid_alloc_for_active_bs_cid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} @@ -957,10 +959,12 @@ void proto_register_wimax_utility_decoders(void) &hf_sfe_authorization_token, {"Authorization Token", "wmx.sfe.authorization_token", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#if 0 { /* 46 HARQ Channel Mapping */ &hf_sfe_harq_channel_mapping, {"HARQ Channel Mapping", "wmx.sfe.harq_channel_mapping", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif { /* 46.1 HARQ Channel Index*/ &hf_sfe_harq_channel_mapping_index, {"HARQ Channel Index", "wmx.sfe.harq_channel_mapping.index", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} @@ -1537,7 +1541,7 @@ void proto_register_wimax_utility_decoders(void) &hf_pkm_attr_pre_pak, {"Pre-PAK", "wmx.pkm_msg.pkm_attr.pre_pak", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, -#if 1 /* no definition */ +#if 0 /* no definition */ { /* 11.9.?? - type 36 */ &hf_pkm_attr_pak_ak_seq_number, {"PAK/AK Sequence Number", "wmx.pkm_msg.pkm_attr.pak_ak_seq_number", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} @@ -1609,11 +1613,13 @@ void proto_register_wimax_utility_decoders(void) &hf_pkm_attr_frame_number, {"Frame Number", "wmx.pkm_msg.pkm_attr.frame_number", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL} }, -#if 1 /* no definitions */ +#if 1 /* no definitions [??] */ { /* 11.9.?? - type 46 */ &hf_pkm_attr_associated_gkek_seq_number, {"Associated GKEK Sequence Number", "wmx.pkm_msg.pkm_attr.associated_gkek_seq_number",FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif +#if 0 { /* 11.9.?? - type 47 */ &hf_pkm_attr_gkek_params, {"GKEK Parameters", "wmx.pkm_msg.pkm_attr.gkek_params",FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} @@ -1656,16 +1662,19 @@ void proto_register_wimax_utility_decoders(void) &hf_common_tlv_vendor_specific_value, { "Vendor Specific Value", "wmx.common_tlv.vendor_specific_value", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#if 0 { &hf_common_tlv_unknown_type, {"Unknown Common TLV Type", "wmx.common_tlv.unknown_type", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} } +#endif }; if(proto_wimax_utility_decoders == -1) { proto_wimax_utility_decoders = proto_register_protocol ( - "WiMax Sub-TLV Messages", /* name */ + "WiMax Sub-TLV Messages", + /* name */ "WiMax Sub-TLV (sub)", /* short name */ "wmx.sub" /* abbrev */ ); diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index c3f6604a59..e8e26e3579 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -57,32 +57,32 @@ static int hf_wimaxasncp_version = -1; static int hf_wimaxasncp_flags = -1; static int hf_wimaxasncp_function_type = -1; static int hf_wimaxasncp_op_id = -1; -static int hf_wimaxasncp_message_type = -1; -static int hf_wimaxasncp_qos_msg = -1; -static int hf_wimaxasncp_ho_control_msg = -1; -static int hf_wimaxasncp_data_path_control_msg = -1; -static int hf_wimaxasncp_context_delivery_msg = -1; -static int hf_wimaxasncp_r3_mobility_msg = -1; -static int hf_wimaxasncp_paging_msg = -1; -static int hf_wimaxasncp_rrm_msg = -1; -static int hf_wimaxasncp_authentication_msg = -1; -static int hf_wimaxasncp_ms_state_msg = -1; -static int hf_wimaxasncp_reauthentication_msg = -1; -static int hf_wimaxasncp_session_msg = -1; +/* static int hf_wimaxasncp_message_type = -1; */ +/* static int hf_wimaxasncp_qos_msg = -1; */ +/* static int hf_wimaxasncp_ho_control_msg = -1; */ +/* static int hf_wimaxasncp_data_path_control_msg = -1; */ +/* static int hf_wimaxasncp_context_delivery_msg = -1; */ +/* static int hf_wimaxasncp_r3_mobility_msg = -1; */ +/* static int hf_wimaxasncp_paging_msg = -1; */ +/* static int hf_wimaxasncp_rrm_msg = -1; */ +/* static int hf_wimaxasncp_authentication_msg = -1; */ +/* static int hf_wimaxasncp_ms_state_msg = -1; */ +/* static int hf_wimaxasncp_reauthentication_msg = -1; */ +/* static int hf_wimaxasncp_session_msg = -1; */ static int hf_wimaxasncp_length = -1; static int hf_wimaxasncp_msid = -1; static int hf_wimaxasncp_reserved1 = -1; static int hf_wimaxasncp_transaction_id = -1; static int hf_wimaxasncp_reserved2 = -1; -static int hf_wimaxasncp_tlv = -1; +/* static int hf_wimaxasncp_tlv = -1; */ static int hf_wimaxasncp_tlv_type = -1; static int hf_wimaxasncp_tlv_length = -1; static int hf_wimaxasncp_tlv_value_bytes = -1; static int hf_wimaxasncp_tlv_value_bitflags8 = -1; static int hf_wimaxasncp_tlv_value_bitflags16 = -1; static int hf_wimaxasncp_tlv_value_bitflags32 = -1; -static int hf_wimaxasncp_tlv_value_protocol = -1; -static int hf_wimaxasncp_tlv_value_vendor_id = -1; +/* static int hf_wimaxasncp_tlv_value_protocol = -1; */ +/* static int hf_wimaxasncp_tlv_value_vendor_id = -1; */ /* Preferences */ static gboolean show_transaction_id_d_bit = FALSE; @@ -2880,6 +2880,7 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#if 0 { &hf_wimaxasncp_message_type, { @@ -2893,6 +2894,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_qos_msg, { @@ -2906,6 +2909,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_ho_control_msg, { @@ -2919,6 +2924,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_data_path_control_msg, { @@ -2932,6 +2939,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_context_delivery_msg, { @@ -2945,6 +2954,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_r3_mobility_msg, { @@ -2958,6 +2969,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_paging_msg, { @@ -2971,6 +2984,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_rrm_msg, { @@ -2984,6 +2999,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_authentication_msg, { @@ -2997,6 +3014,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_ms_state_msg, { @@ -3010,6 +3029,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_reauthentication_msg, { @@ -3023,6 +3044,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_session_msg, { @@ -3036,6 +3059,7 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif { &hf_wimaxasncp_length, { @@ -3101,6 +3125,7 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#if 0 { &hf_wimaxasncp_tlv, { @@ -3114,6 +3139,7 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif { &hf_wimaxasncp_tlv_type, { @@ -3192,6 +3218,7 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#if 0 { &hf_wimaxasncp_tlv_value_protocol, { @@ -3205,6 +3232,8 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } }, +#endif +#if 0 { &hf_wimaxasncp_tlv_value_vendor_id, { @@ -3218,6 +3247,7 @@ register_wimaxasncp_fields(const char* unused _U_) HFILL } } +#endif }; /* ------------------------------------------------------------------------ |