diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-01-31 17:55:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-01-31 17:55:31 +0000 |
| commit | c439b805e20dd9dba744b3f7216c970c3591592e (patch) | |
| tree | 290b43c090c6a125c690e472152e5f89f2538647 /epan | |
| parent | 8ee3809edcc3a78004db5e3fad9808e1aded4838 (diff) | |
Comment out unused hf[] entries & etc.
(found by checkhf)
svn path=/trunk/; revision=47389
Diffstat (limited to 'epan')
94 files changed, 1574 insertions, 1125 deletions
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 617371c0cf..e930f2cc45 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -138,7 +138,7 @@ static int hf_a11_fqi_entry_flag_flow_state = -1; static int hf_a11_fqi_flowcount = -1; static int hf_a11_fqi_flowid = -1; static int hf_a11_fqi_entrylen = -1; -static int hf_a11_fqi_flowstate = -1; +/* static int hf_a11_fqi_flowstate = -1; */ static int hf_a11_fqi_requested_qoslen = -1; static int hf_a11_fqi_flow_priority = -1; static int hf_a11_fqi_num_qos_attribute_set = -1; @@ -156,7 +156,7 @@ static int hf_a11_rqi_flowid = -1; static int hf_a11_rqi_entrylen = -1; static int hf_a11_rqi_entry_flag = -1; static int hf_a11_rqi_entry_flag_flow_state = -1; -static int hf_a11_rqi_flowstate = -1; +/* static int hf_a11_rqi_flowstate = -1; */ static int hf_a11_rqi_requested_qoslen = -1; static int hf_a11_rqi_flow_priority = -1; static int hf_a11_rqi_num_qos_attribute_set = -1; @@ -165,9 +165,9 @@ static int hf_a11_rqi_qos_attribute_setid = -1; static int hf_a11_rqi_qos_granted_attribute_setid = -1; static int hf_a11_rqi_verbose = -1; static int hf_a11_rqi_flow_profileid = -1; -static int hf_a11_rqi_requested_qos = -1; +/* static int hf_a11_rqi_requested_qos = -1; */ static int hf_a11_rqi_granted_qoslen = -1; -static int hf_a11_rqi_granted_qos = -1; +/* static int hf_a11_rqi_granted_qos = -1; */ /* QoS Update Information */ static int hf_a11_fqui_flowcount = -1; @@ -177,7 +177,7 @@ static int hf_a11_fqui_updated_qos = -1; static int hf_a11_rqui_updated_qoslen = -1; static int hf_a11_rqui_updated_qos = -1; static int hf_a11_subsciber_profile = -1; -static int hf_a11_subsciber_profile_len = -1; +/* static int hf_a11_subsciber_profile_len = -1; */ /* Initialize the subtree pointers */ static gint ett_a11 = -1; @@ -2050,11 +2050,13 @@ proto_register_a11(void) FT_UINT8, BASE_DEC, NULL, 0, "Forward Entry Length", HFILL } }, +#if 0 { &hf_a11_fqi_flowstate, { "Forward Flow State", "a11.ext.fqi.flowstate", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } }, +#endif { &hf_a11_fqi_requested_qoslen, { "Requested QoS Length", "a11.ext.fqi.reqqoslen", FT_UINT8, BASE_DEC, NULL, 0, @@ -2165,31 +2167,37 @@ proto_register_a11(void) FT_BOOLEAN, 8, TFS(&tfs_active_inactive), 0x01, NULL, HFILL } }, +#if 0 { &hf_a11_rqi_flowstate, { "Flow State", "a11.ext.rqi.flowstate", FT_UINT8, BASE_HEX, NULL, 0, "Reverse Flow State", HFILL } }, +#endif { &hf_a11_rqi_requested_qoslen, { "Requested QoS Length", "a11.ext.rqi.reqqoslen", FT_UINT8, BASE_DEC, NULL, 0, "Reverse Requested QoS Length", HFILL } }, +#if 0 { &hf_a11_rqi_requested_qos, { "Requested QoS", "a11.ext.rqi.reqqos", FT_BYTES, BASE_NONE, NULL, 0, "Reverse Requested QoS", HFILL } }, +#endif { &hf_a11_rqi_granted_qoslen, { "Granted QoS Length", "a11.ext.rqi.graqoslen", FT_UINT8, BASE_DEC, NULL, 0, "Reverse Granted QoS Length", HFILL } }, +#if 0 { &hf_a11_rqi_granted_qos, { "Granted QoS", "a11.ext.rqi.graqos", FT_BYTES, BASE_NONE, NULL, 0, "Reverse Granted QoS", HFILL } }, +#endif { &hf_a11_fqui_flowcount, { "Forward QoS Update Flow Count", "a11.ext.fqui.flowcount", FT_UINT8, BASE_DEC, NULL, 0, @@ -2220,11 +2228,13 @@ proto_register_a11(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#if 0 { &hf_a11_subsciber_profile_len, { "Subscriber QoS Profile Length", "a11.ext.sqp.profilelen", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#endif { &hf_a11_subsciber_profile, { "Subscriber QoS Profile", "a11.ext.sqp.profile", FT_BYTES, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 41740596a0..e57168608d 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -227,13 +227,13 @@ static gint ett_acn_dmx_pdu = -1; static int hf_acn_association = -1; static int hf_acn_channel_number = -1; static int hf_acn_cid = -1; -static int hf_acn_client_protocol_id = -1; +/* static int hf_acn_client_protocol_id = -1; */ static int hf_acn_data = -1; static int hf_acn_data8 = -1; static int hf_acn_data16 = -1; static int hf_acn_data24 = -1; static int hf_acn_data32 = -1; -static int hf_acn_dmp_adt = -1; /* address and data type*/ +/* static int hf_acn_dmp_adt = -1; */ /* address and data type*/ static int hf_acn_dmp_adt_a = -1; static int hf_acn_dmp_adt_v = -1; static int hf_acn_dmp_adt_r = -1; @@ -275,7 +275,7 @@ static int hf_acn_reliable_sequence_number = -1; /* static int hf_acn_sdt_pdu = -1; */ static int hf_acn_sdt_vector = -1; static int hf_acn_dmx_vector = -1; -static int hf_acn_session_count = -1; +/* static int hf_acn_session_count = -1; */ static int hf_acn_total_sequence_number = -1; static int hf_acn_dmx_source_name = -1; static int hf_acn_dmx_priority = -1; @@ -2794,11 +2794,13 @@ proto_register_acn(void) NULL, HFILL } }, /* Client Protocol ID */ +#if 0 { &hf_acn_client_protocol_id, { "Client Protocol ID", "acn.client_protocol_id", FT_UINT32, BASE_DEC, VALS(acn_protocol_id_vals), 0x0, NULL, HFILL } }, +#endif /* DMP data */ { &hf_acn_data, { "Data", "acn.dmp_data", @@ -2827,11 +2829,13 @@ proto_register_acn(void) }, /* DMP Address type*/ +#if 0 { &hf_acn_dmp_adt, { "Address and Data Type", "acn.dmp_adt", FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_acn_dmp_adt_a, { "Size", "acn.dmp_adt_a", FT_UINT8, BASE_DEC, VALS(acn_dmp_adt_a_vals), 0x03, @@ -3150,11 +3154,13 @@ proto_register_acn(void) }, /* Session Count */ +#if 0 { &hf_acn_session_count, { "Session Count", "acn.session_count", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL } }, +#endif /* Total Sequence Number */ { &hf_acn_total_sequence_number, { "Total Sequence Number", "acn.total_sequence_number", diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index f1f937bd35..4a7b80dc8c 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -373,7 +373,7 @@ static int hf_afs_prot_maxgid = -1; static int hf_afs_backup_errcode = -1; -static int hf_afs_ubik_errcode = -1; +/* static int hf_afs_ubik_errcode = -1; */ static int hf_afs_ubik_version_epoch = -1; static int hf_afs_ubik_version_counter = -1; static int hf_afs_ubik_votestart = -1; @@ -384,8 +384,8 @@ static int hf_afs_ubik_file = -1; static int hf_afs_ubik_pos = -1; static int hf_afs_ubik_length = -1; static int hf_afs_ubik_locktype = -1; -static int hf_afs_ubik_voteend = -1; -static int hf_afs_ubik_votetype = -1; +/* static int hf_afs_ubik_voteend = -1; */ +/* static int hf_afs_ubik_votetype = -1; */ static int hf_afs_ubik_now = -1; static int hf_afs_ubik_lastyestime = -1; @@ -3537,8 +3537,10 @@ proto_register_afs(void) FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, /* UBIK Fields */ +#if 0 { &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode", FT_UINT32, BASE_DEC|BASE_EXT_STRING, &afs_errors_ext, 0, NULL, HFILL }}, +#endif { &hf_afs_ubik_state, { "State", "afs.ubik.state", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch", @@ -3547,8 +3549,10 @@ proto_register_afs(void) FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, +#if 0 { &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, 0, 0, NULL, HFILL }}, +#endif { &hf_afs_ubik_file, { "File", "afs.ubik.file", FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_pos, { "Position", "afs.ubik.position", @@ -3557,8 +3561,10 @@ proto_register_afs(void) FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype", FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, NULL, HFILL }}, +#if 0 { &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype", FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }}, +#endif { &hf_afs_ubik_site, { "Site", "afs.ubik.site", FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }}, { &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface", diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index 65ff1cc8f1..49f351be94 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -43,7 +43,7 @@ static int proto_agentx = -1; static int hf_version = -1; static int hf_type = -1; -static int hf_flags = -1; +/* static int hf_flags = -1; */ static int hf_flags_register = -1; static int hf_flags_newindex = -1; static int hf_flags_anyindex = -1; @@ -982,9 +982,11 @@ proto_register_agentx(void) { "Type", "agentx.type", FT_UINT8, BASE_DEC | BASE_EXT_STRING, &type_values_ext, 0x0, "header type", HFILL }}, +#if 0 { &hf_flags, { "Flags", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0, "header type", HFILL }}, +#endif { &hf_flags_register, { "Register", "agentx.flags.register", FT_BOOLEAN, 8, TFS(&tfs_agentx_register), diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c index c089418aa6..66aa3ebd3c 100644 --- a/epan/dissectors/packet-aim-bos.c +++ b/epan/dissectors/packet-aim-bos.c @@ -60,26 +60,26 @@ static const aim_tlv aim_privacy_tlvs[] = { /* Initialize the protocol and registered fields */ static int proto_aim_bos = -1; -static int hf_aim_bos_data = -1; +/* static int hf_aim_bos_data = -1; */ static int hf_aim_bos_class = -1; /* Initialize the subtree pointers */ static gint ett_aim_bos = -1; -static int dissect_aim_bos_set_group_perm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *bos_tree) +static int dissect_aim_bos_set_group_perm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *bos_tree) { int offset = 0; guint32 userclass = tvb_get_ntohl(tvb, offset); - proto_item *ti = proto_tree_add_uint(bos_tree, hf_aim_bos_class, tvb, offset, 4, userclass); + proto_item *ti = proto_tree_add_uint(bos_tree, hf_aim_bos_class, tvb, offset, 4, userclass); return dissect_aim_userclass(tvb, offset, 4, ti, userclass); } -static int dissect_aim_bos_rights(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bos_tree) +static int dissect_aim_bos_rights(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bos_tree) { return dissect_aim_tlv_sequence(tvb, pinfo, 0, bos_tree, aim_privacy_tlvs); } -static int dissect_aim_bos_buddyname(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bos_tree) +static int dissect_aim_bos_buddyname(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bos_tree) { int offset = 0; while(tvb_reported_length_remaining(tvb, offset) > 0) { @@ -95,9 +95,11 @@ proto_register_aim_bos(void) /* Setup list of header fields */ static hf_register_info hf[] = { +#if 0 { &hf_aim_bos_data, { "Data", "aim_bos.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_aim_bos_class, { "User class", "aim_bos.userclass", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 5caf2e129a..79cf4dc60a 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -287,7 +287,7 @@ static int hf_aim_rendezvous_extended_data_message_flags_multi = -1; static int hf_aim_rendezvous_extended_data_message_status_code = -1; static int hf_aim_rendezvous_extended_data_message_priority_code = -1; static int hf_aim_rendezvous_extended_data_message_text_length = -1; -static int hf_aim_rendezvous_extended_data_message_text = -1; +/* static int hf_aim_rendezvous_extended_data_message_text = -1; */ /* Initialize the subtree pointers */ static gint ett_aim_messaging = -1; @@ -735,9 +735,11 @@ proto_register_aim_messaging(void) { &hf_aim_rendezvous_extended_data_message_text_length, { "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, +#if 0 { &hf_aim_rendezvous_extended_data_message_text, { "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }, } +#endif }; /* Setup protocol subtree array */ diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c index 2d0d988e37..02ad40bce1 100644 --- a/epan/dissectors/packet-aim-ssi.c +++ b/epan/dissectors/packet-aim-ssi.c @@ -74,7 +74,7 @@ static int hf_aim_fnac_subtype_ssi_gid = -1; static int hf_aim_fnac_subtype_ssi_bid = -1; static int hf_aim_fnac_subtype_ssi_type = -1; static int hf_aim_fnac_subtype_ssi_tlvlen = -1; -static int hf_aim_fnac_subtype_ssi_data = -1; +/* static int hf_aim_fnac_subtype_ssi_data = -1; */ static int hf_aim_fnac_subtype_ssi_reason_str_len = -1; static int hf_aim_fnac_subtype_ssi_reason_str = -1; static int hf_aim_fnac_subtype_ssi_grant_auth_unkn = -1; @@ -356,9 +356,11 @@ proto_register_aim_ssi(void) { &hf_aim_fnac_subtype_ssi_tlvlen, { "SSI TLV Len", "aim_ssi.fnac.tlvlen", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_aim_fnac_subtype_ssi_data, { "SSI Buddy Data", "aim_ssi.fnac.data", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_aim_fnac_subtype_ssi_buddyname_len8, { "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len8", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index d21a18eac0..0a9037a99b 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -386,15 +386,15 @@ static int hf_aim_channel = -1; static int hf_aim_seqno = -1; static int hf_aim_data = -1; static int hf_aim_data_len = -1; -static int hf_aim_signon_challenge_len = -1; -static int hf_aim_signon_challenge = -1; +/* static int hf_aim_signon_challenge_len = -1; */ +/* static int hf_aim_signon_challenge = -1; */ static int hf_aim_fnac_family = -1; static int hf_aim_fnac_subtype = -1; static int hf_aim_fnac_flags = -1; static int hf_aim_fnac_flag_next_is_related = -1; static int hf_aim_fnac_flag_contains_version = -1; static int hf_aim_fnac_id = -1; -static int hf_aim_infotype = -1; +/* static int hf_aim_infotype = -1; */ static int hf_aim_buddyname_len = -1; static int hf_aim_buddyname = -1; static int hf_aim_userinfo_warninglevel = -1; @@ -1527,12 +1527,14 @@ proto_register_aim(void) { &hf_aim_data, { "Data", "aim.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_aim_signon_challenge_len, { "Signon challenge length", "aim.signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_aim_signon_challenge, { "Signon challenge", "aim.signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_aim_fnac_family, { "FNAC Family ID", "aim.fnac.family", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, @@ -1545,9 +1547,11 @@ proto_register_aim(void) { &hf_aim_fnac_id, { "FNAC ID", "aim.fnac.id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_aim_infotype, { "Infotype", "aim.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_aim_buddyname_len, { "Buddyname len", "aim.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 5aa10ba0c9..05c72285ac 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -940,7 +940,7 @@ static int hf_amqp_0_10_struct_delivery_properties_resume_ttl = -1; static int hf_amqp_0_10_struct_fragment_properties_first = -1; static int hf_amqp_0_10_struct_fragment_properties_last = -1; static int hf_amqp_0_10_struct_fragment_properties_size = -1; -static int hf_amqp_0_10_struct_message_properties = -1; +/* static int hf_amqp_0_10_struct_message_properties = -1; */ static int hf_amqp_0_10_struct_message_properties_content_len = -1; static int hf_amqp_0_10_struct_message_properties_message_id = -1; static int hf_amqp_0_10_struct_message_properties_correlation = -1; @@ -1069,7 +1069,7 @@ static int hf_amqp_0_10_method_file_reject_delivery_tag = -1; static int hf_amqp_0_10_method_file_reject_requeue = -1; static int hf_amqp_0_10_method_stream_qos_prefetch_size = -1; static int hf_amqp_0_10_method_stream_qos_prefetch_count = -1; -static int hf_amqp_0_10_method_stream_qos_consume_rate = -1; +/* static int hf_amqp_0_10_method_stream_qos_consume_rate = -1; */ static int hf_amqp_0_10_method_stream_qos_global = -1; static int hf_amqp_0_10_method_stream_consumer_tag = -1; static int hf_amqp_0_10_method_stream_consume_no_local = -1; @@ -8873,10 +8873,12 @@ proto_register_amqp(void) "Fragment-size", "amqp.message.fragment-properties.fragment-size", FT_UINT64, BASE_DEC, NULL, 0x0, "Size of the message fragment", HFILL}}, +#if 0 {&hf_amqp_0_10_struct_message_properties, { "message.message-properties", "amqp.message.message-properties", FT_NONE, BASE_NONE, NULL, 0x0, "Message properties struct", HFILL}}, +#endif {&hf_amqp_0_10_struct_message_properties_content_len, { "Content-length", "amqp.message.message-properties.content-length", FT_UINT64, BASE_DEC, NULL, 0x0, @@ -9397,10 +9399,12 @@ proto_register_amqp(void) "Prefetch-count", "amqp.stream.qos.prefetch-count", FT_UINT16, BASE_DEC, NULL, 0x0, "Pre-fetch window size in messages", HFILL}}, +#if 0 {&hf_amqp_0_10_method_stream_qos_consume_rate, { "Prefetch-size", "amqp.stream.qos.consume_rate", FT_UINT32, BASE_DEC, NULL, 0x0, "Desired transfer rate in octets/second", HFILL}}, +#endif {&hf_amqp_0_10_method_stream_qos_global, { "Global", "amqp.stream.qos.global", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 0ad6d88773..251a1ae5a5 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -658,7 +658,7 @@ const ext_value_string_t *ansi_a_elem_1_strings = NULL; static int ansi_a_tap = -1; -static int hf_ansi_a_none = -1; +/* static int hf_ansi_a_none = -1; */ static int hf_ansi_a_bsmap_msgtype = -1; static int hf_ansi_a_dtap_msgtype = -1; static int hf_ansi_a_length = -1; @@ -11945,11 +11945,13 @@ proto_register_ansi_a(void) FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, +#if 0 { &hf_ansi_a_none, { "Sub tree", "ansi_a_bsmap.none", FT_NONE, BASE_NONE, 0, 0, NULL, HFILL } }, +#endif { &hf_ansi_a_esn, { "ESN", "ansi_a_bsmap.esn", FT_UINT32, BASE_HEX, 0, 0x0, diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 544f6dfd8a..b3f90a1e3b 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -108,7 +108,7 @@ typedef struct v6_ext { /* Initialize the protocol and registered fields */ static int proto_aodv = -1; static int hf_aodv_type = -1; -static int hf_aodv_flags = -1; +/* static int hf_aodv_flags = -1; */ static int hf_aodv_prefix_sz = -1; static int hf_aodv_hopcount = -1; static int hf_aodv_rreq_id = -1; @@ -122,7 +122,7 @@ static int hf_aodv_lifetime = -1; static int hf_aodv_destcount = -1; static int hf_aodv_unreach_dest_ip = -1; static int hf_aodv_unreach_dest_ipv6 = -1; -static int hf_aodv_unreach_dest_seqno = -1; +/* static int hf_aodv_unreach_dest_seqno = -1; */ static int hf_aodv_flags_rreq_join = -1; static int hf_aodv_flags_rreq_repair = -1; static int hf_aodv_flags_rreq_gratuitous = -1; @@ -131,8 +131,8 @@ static int hf_aodv_flags_rreq_unknown = -1; static int hf_aodv_flags_rrep_repair = -1; static int hf_aodv_flags_rrep_ack = -1; static int hf_aodv_flags_rerr_nodelete = -1; -static int hf_aodv_ext_type = -1; -static int hf_aodv_ext_length = -1; +/* static int hf_aodv_ext_type = -1; */ +/* static int hf_aodv_ext_length = -1; */ static int hf_aodv_ext_interval = -1; static int hf_aodv_ext_timestamp = -1; @@ -829,11 +829,13 @@ proto_register_aodv(void) FT_UINT8, BASE_DEC, VALS(type_vals), 0x0, "AODV packet type", HFILL } }, +#if 0 { &hf_aodv_flags, { "Flags", "aodv.flags", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_aodv_flags_rreq_join, { "RREQ Join", "aodv.flags.rreq_join", FT_BOOLEAN, 8, TFS(&tfs_set_notset), RREQ_JOIN, @@ -939,6 +941,7 @@ proto_register_aodv(void) FT_IPv6, BASE_NONE, NULL, 0x0, "Unreachable Destination IPv6 Address", HFILL} }, +#if 0 { &hf_aodv_unreach_dest_seqno, { "Unreachable Destination Sequence Number", "aodv.unreach_dest_seqno", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -954,6 +957,7 @@ proto_register_aodv(void) FT_UINT8, BASE_DEC, NULL, 0x0, "Extension Data Length", HFILL} }, +#endif { &hf_aodv_ext_interval, { "Hello Interval", "aodv.hello_interval", FT_UINT32, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 8d9c51ab53..f6234451ad 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -148,7 +148,7 @@ static int hf_zip_network = -1; static int hf_zip_network_start = -1; static int hf_zip_network_end = -1; -static int hf_zip_flags = -1; +/* static int hf_zip_flags = -1; */ static int hf_zip_flags_zone_invalid = -1; static int hf_zip_flags_use_broadcast = -1; @@ -2279,9 +2279,11 @@ proto_register_atalk(void) { "Network end", "zip.network_end", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_zip_flags, { "Flags", "zip.flags", FT_BOOLEAN, 8, NULL, 0xC0, NULL, HFILL }}, +#endif { &hf_zip_last_flag, { "Last Flag", "zip.last_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 9b8d73c4de..98a801af8b 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -49,9 +49,9 @@ static int proto_beep = -1; static int hf_beep_req = -1; static int hf_beep_req_chan = -1; -static int hf_beep_rsp_chan = -1; +/* static int hf_beep_rsp_chan = -1; */ static int hf_beep_seq_chan = -1; -static int hf_beep_rsp = -1; +/* static int hf_beep_rsp = -1; */ static int hf_beep_seq = -1; static int hf_beep_end = -1; static int hf_beep_proto_viol = -1; @@ -62,8 +62,10 @@ static int hf_beep_ansno = -1; static int hf_beep_seqno = -1; static int hf_beep_size = -1; static int hf_beep_channel = -1; +#if 0 static int hf_beep_positive = -1; static int hf_beep_negative = -1; +#endif static int hf_beep_ackno = -1; static int hf_beep_window = -1; @@ -993,11 +995,15 @@ proto_register_beep(void) { &hf_beep_req_chan, { "Request Channel Number", "beep.req.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_beep_rsp, { "Response", "beep.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif +#if 0 { &hf_beep_rsp_chan, { "Response Channel Number", "beep.rsp.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_beep_seq, { "Sequence", "beep.seq", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -1029,11 +1035,13 @@ proto_register_beep(void) { &hf_beep_channel, { "Channel", "beep.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_beep_negative, { "Negative", "beep.status.negative", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_beep_positive, { "Positive", "beep.status.positive", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_beep_ackno, { "Ackno", "beep.seq.ackno", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 2c6fa7b605..d90aa02bb3 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -130,7 +130,7 @@ static gint proto_bfd = -1; static gint hf_bfd_version = -1; static gint hf_bfd_diag = -1; static gint hf_bfd_sta = -1; -static gint hf_bfd_flags = -1; +/* static gint hf_bfd_flags = -1; */ static gint hf_bfd_flags_h = -1; static gint hf_bfd_flags_p = -1; static gint hf_bfd_flags_f = -1; @@ -163,7 +163,7 @@ static gint hf_mep_type = -1; static gint hf_mep_len = -1; static gint hf_mep_global_id = -1; static gint hf_mep_node_id = -1; -static gint hf_mep_interface_no = -1; +/* static gint hf_mep_interface_no = -1; */ static gint hf_mep_tunnel_no = -1; static gint hf_mep_lsp_no = -1; static gint hf_mep_ac_id = -1; @@ -701,11 +701,13 @@ proto_register_bfd(void) FT_UINT8, BASE_HEX, VALS(bfd_control_sta_values), 0xc0, "The BFD state as seen by the transmitting system", HFILL } }, +#if 0 { &hf_bfd_flags, { "Message Flags", "bfd.flags", FT_UINT8, BASE_HEX, NULL, 0xf0, NULL, HFILL } }, +#endif { &hf_bfd_flags_h, { "I hear you", "bfd.flags.h", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x80, @@ -838,11 +840,13 @@ proto_register_bfd(void) FT_IPv4, BASE_NONE, NULL , 0x0, "MPLS-TP Node Identifier", HFILL } }, +#if 0 { &hf_mep_interface_no, { "Interface Number", "bfd.mep.interface.no", FT_UINT32, BASE_DEC, NULL , 0x0, "MPLS-TP Interface Number", HFILL } }, +#endif { &hf_mep_tunnel_no, { "Tunnel Number", "bfd.mep.tunnel.no", FT_UINT16, BASE_DEC, NULL , 0x0, diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index ffc7d8c4f6..ab2f6b122c 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -129,7 +129,7 @@ static const struct amp_message amp_messages[] = { static dissector_handle_t dissector_handle; static int proto_bittorrent = -1; -static gint hf_bittorrent_field_length = -1; +/* static gint hf_bittorrent_field_length = -1; */ static gint hf_bittorrent_prot_name_len = -1; static gint hf_bittorrent_prot_name = -1; static gint hf_bittorrent_reserved = -1; @@ -848,9 +848,11 @@ void proto_register_bittorrent(void) { static hf_register_info hf[] = { +#if 0 { &hf_bittorrent_field_length, { "Field Length", "bittorrent.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_bittorrent_prot_name_len, { "Protocol Name Length", "bittorrent.protocol.name.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index 64db874651..bb2368fc24 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -42,8 +42,8 @@ static int proto_bmc = -1; static int hf_bmc_message_type = -1; static int hf_bmc_message_id = -1; static int hf_bmc_serial_number = -1; -static int hf_bmc_data_coding_scheme = -1; -static int hf_bmc_cb_data = -1; +/* static int hf_bmc_data_coding_scheme = -1; */ +/* static int hf_bmc_cb_data = -1; */ static int hf_bmc_offset_to_begin_ctch_bs_index = -1; static int hf_bmc_length_of_cbs_schedule_period = -1; static int hf_bmc_new_message_bitmap = -1; @@ -270,6 +270,7 @@ proto_register_bmc(void) FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } }, +#if 0 { &hf_bmc_data_coding_scheme, { "Data Coding Scheme", "bmc.data_coding_scheme", FT_UINT8, BASE_HEX, NULL, 0, @@ -280,6 +281,7 @@ proto_register_bmc(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +#endif { &hf_bmc_offset_to_begin_ctch_bs_index, { "Offset to Begin CTCH Block Set Index", "bmc.offset_to_begin_ctch_bs_index", FT_UINT8, BASE_DEC, NULL, 0, diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index ed8c7a0992..62a2a1c2ab 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -282,7 +282,7 @@ static int hf_bssap_extension = -1; static int hf_bssap_type_of_number = -1; static int hf_bssap_numbering_plan_id = -1; static int hf_bssap_sgsn_number = -1; -static int hf_bssap_vlr_number = -1; +/* static int hf_bssap_vlr_number = -1; */ static int hf_bssap_call_priority = -1; static int hf_bssap_gprs_loc_upd_type_ie = -1; static int hf_bssap_Gs_cause_ie = -1; @@ -2262,10 +2262,12 @@ proto_register_bssap(void) FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_bssap_vlr_number, { "VLR number", "bssap.vlr_number", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_bssap_cell_global_id_ie, { "Cell global identity IE", "bssap.cell_global_id_ie", diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index b589412f52..1f84e26f10 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -48,8 +48,8 @@ static int hf_btamp_controller_id = -1; static int hf_btamp_controller_type = -1; static int hf_btamp_controller_status = -1; static int hf_btamp_status = -1; -static int hf_btamp_create_status = -1; -static int hf_btamp_disc_status = -1; +/* static int hf_btamp_create_status = -1; */ +/* static int hf_btamp_disc_status = -1; */ static int hf_btamp_total_bw = -1; static int hf_btamp_max_guaran_bw = -1; static int hf_btamp_min_latency = -1; @@ -580,6 +580,7 @@ proto_register_btamp(void) FT_UINT8, BASE_DEC, VALS(status_vals), 0x0, NULL, HFILL } }, +#if 0 { &hf_btamp_create_status, { "Status", "btamp.create_status", FT_UINT8, BASE_DEC, VALS(create_status_vals), 0x0, @@ -590,6 +591,7 @@ proto_register_btamp(void) FT_UINT8, BASE_DEC, VALS(disc_status_vals), 0x0, NULL, HFILL } }, +#endif { &hf_btamp_pal_caps_mask, { "PAL Capabilities Mask", "btamp.pal_caps_mask", FT_NONE, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 16511c572c..249aec2285 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -66,7 +66,7 @@ static int hf_btbnep_network_type_end = -1; static int hf_btbnep_multicast_address_start = -1; static int hf_btbnep_multicast_address_end = -1; -static int hf_btbnep_data = -1; +/* static int hf_btbnep_data = -1; */ static gint ett_btbnep = -1; static gint ett_addr = -1; @@ -507,11 +507,13 @@ proto_register_btbnep(void) "Specifies if this is an individual (unicast) or group (broadcast/multicast) address", HFILL } }, +#if 0 { &hf_btbnep_data, { "Data", "btbnep.data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif }; static gint *ett[] = { diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 80bda75759..a8b402a7bc 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -44,7 +44,7 @@ static int hf_bthci_acl_chandle = -1; static int hf_bthci_acl_pb_flag = -1; static int hf_bthci_acl_bc_flag = -1; static int hf_bthci_acl_length = -1; -static int hf_bthci_acl_data = -1; +/* static int hf_bthci_acl_data = -1; */ static int hf_bthci_acl_continuation_to = -1; static int hf_bthci_acl_reassembled_in = -1; @@ -381,11 +381,13 @@ proto_register_bthci_acl(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_bthci_acl_data, { "Data", "bthci_acl.data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_bthci_acl_continuation_to, { "This is a continuation to the PDU in frame", "bthci_acl.continuation_to", FT_FRAMENUM, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index daa23b0b5a..ebf0d00ac6 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -333,7 +333,7 @@ static int hf_cast_bandwidth = -1; static int hf_cast_protocolDependentData = -1; static int hf_cast_DSCPValue = -1; static int hf_cast_serviceNum = -1; -static int hf_cast_precedenceValue = -1; +/* static int hf_cast_precedenceValue = -1; */ static int hf_cast_maxStreams = -1; static int hf_cast_millisecondPacketSize = -1; static int hf_cast_echoCancelType = -1; @@ -1383,11 +1383,13 @@ proto_register_cast(void) NULL, HFILL } }, +#if 0 { &hf_cast_precedenceValue, { "Precedence", "cast.precedenceValue", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_cast_maxStreams, { "MaxStreams", "cast.maxStreams", diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index 0a56ec22f1..2efe5f1c55 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -68,14 +68,14 @@ static int hf_ccsds_vid = -1; static int hf_ccsds_dcc = -1; /* core specific ccsds secondary header */ -static int hf_ccsds_spare1 = -1; +/* static int hf_ccsds_spare1 = -1; */ static int hf_ccsds_packet_type = -1; -static int hf_ccsds_spare2 = -1; +/* static int hf_ccsds_spare2 = -1; */ static int hf_ccsds_element_id = -1; static int hf_ccsds_cmd_data_packet = -1; static int hf_ccsds_format_version_id = -1; static int hf_ccsds_extended_format_id = -1; -static int hf_ccsds_spare3 = -1; +/* static int hf_ccsds_spare3 = -1; */ static int hf_ccsds_frame_id = -1; /* ccsds checkword (checksum) */ @@ -587,21 +587,25 @@ proto_register_ccsds(void) /* core specific ccsds secondary header flags */ +#if 0 { &hf_ccsds_spare1, { "Spare Bit 1", "ccsds.spare1", FT_UINT8, BASE_DEC, NULL, 0x10, "unused spare bit 1", HFILL } }, +#endif { &hf_ccsds_packet_type, { "Packet Type", "ccsds.packet_type", FT_UINT8, BASE_DEC, VALS(ccsds_secondary_header_packet_type), 0x0f, NULL, HFILL } }, +#if 0 { &hf_ccsds_spare2, { "Spare Bit 2", "ccsds.spare2", FT_UINT16, BASE_DEC, NULL, 0x8000, NULL, HFILL } }, +#endif { &hf_ccsds_element_id, { "Element ID", "ccsds.element_id", FT_UINT16, BASE_DEC, VALS(ccsds_secondary_header_element_id), 0x7800, @@ -622,11 +626,13 @@ proto_register_ccsds(void) FT_UINT16, BASE_DEC, VALS(ccsds_secondary_header_format_id), 0x003f, NULL, HFILL } }, +#if 0 { &hf_ccsds_spare3, { "Spare Bits 3", "ccsds.spare3", FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, +#endif { &hf_ccsds_frame_id, { "Frame ID", "ccsds.frame_id", FT_UINT8, BASE_DEC, NULL, 0xff, diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 0ddfa413fb..65e029812a 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -51,7 +51,7 @@ static int proto_slarp = -1; static int hf_slarp_ptype = -1; static int hf_slarp_address = -1; static int hf_slarp_mysequence = -1; -static int hf_slarp_yoursequence = -1; +/* static int hf_slarp_yoursequence = -1; */ static gint ett_slarp = -1; @@ -338,9 +338,11 @@ proto_register_slarp(void) { &hf_slarp_mysequence, { "Outgoing sequence number", "slarp.mysequence", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_slarp_yoursequence, { "Returned sequence number", "slarp.yoursequence", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif }; static gint *ett[] = { &ett_slarp, diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 30cf7aeb83..abf9024a07 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -926,9 +926,9 @@ static int hf_cigi3_3_ig_control_ig_mode = -1; static int hf_cigi3_3_ig_control_timestamp_valid = -1; static int hf_cigi3_3_ig_control_extrapolation_enable = -1; static int hf_cigi3_3_ig_control_minor_version = -1; -static int hf_cigi3_3_ig_control_host_frame_number = -1; -static int hf_cigi3_3_ig_control_timestamp = -1; -static int hf_cigi3_3_ig_control_last_ig_frame_number = -1; +/* static int hf_cigi3_3_ig_control_host_frame_number = -1; */ +/* static int hf_cigi3_3_ig_control_timestamp = -1; */ +/* static int hf_cigi3_3_ig_control_last_ig_frame_number = -1; */ static const value_string cigi3_3_ig_control_ig_mode_vals[] = { {0, "Reset/Standby"}, @@ -1007,7 +1007,7 @@ static const value_string cigi3_entity_control_animation_state_vals[] = { }; /* CIGI3_3 Entity Control */ -static int hf_cigi3_3_entity_control = -1; +/* static int hf_cigi3_3_entity_control = -1; */ static int hf_cigi3_3_entity_control_entity_id = -1; static int hf_cigi3_3_entity_control_entity_state = -1; static int hf_cigi3_3_entity_control_attach_state = -1; @@ -1069,7 +1069,7 @@ static const value_string cigi3_component_control_component_class_vals[] = { }; /* CIGI3_3 Component Control */ -static int hf_cigi3_3_component_control = -1; +/* static int hf_cigi3_3_component_control = -1; */ static int hf_cigi3_3_component_control_component_id = -1; static int hf_cigi3_3_component_control_instance_id = -1; static int hf_cigi3_3_component_control_component_class = -1; @@ -1130,7 +1130,7 @@ static const value_string cigi3_short_component_control_component_class_vals[] = }; /* CIGI3_3 Short Component Control */ -static int hf_cigi3_3_short_component_control = -1; +/* static int hf_cigi3_3_short_component_control = -1; */ static int hf_cigi3_3_short_component_control_component_id = -1; static int hf_cigi3_3_short_component_control_instance_id = -1; static int hf_cigi3_3_short_component_control_component_class = -1; @@ -1867,7 +1867,7 @@ static const true_false_string cigi3_3_symbol_surface_definition_billboard_tfs = /* CIGI3_3 Symbol Text Definition */ #define CIGI3_PACKET_SIZE_SYMBOL_TEXT_DEFINITION 56 -static int hf_cigi3_3_symbol_text_definition = -1; +/* static int hf_cigi3_3_symbol_text_definition = -1; */ static int hf_cigi3_3_symbol_text_definition_symbol_id = -1; static int hf_cigi3_3_symbol_text_definition_orientation = -1; static int hf_cigi3_3_symbol_text_definition_alignment = -1; @@ -1919,7 +1919,7 @@ static const value_string cigi3_3_symbol_text_definition_font_ident_vals[] = { /* CIGI3_3 Symbol Circle Definition */ #define CIGI3_PACKET_SIZE_SYMBOL_CIRCLE_DEFINITION 56 -static int hf_cigi3_3_symbol_circle_definition = -1; +/* static int hf_cigi3_3_symbol_circle_definition = -1; */ static int hf_cigi3_3_symbol_circle_definition_symbol_id = -1; static int hf_cigi3_3_symbol_circle_definition_drawing_style = -1; static int hf_cigi3_3_symbol_circle_definition_stipple_pattern = -1; @@ -1939,7 +1939,7 @@ static const true_false_string cigi3_3_symbol_circle_definition_drawing_style_tf /* CIGI3_3 Symbol Line Definition */ #define CIGI3_PACKET_SIZE_SYMBOL_LINE_DEFINITION 56 -static int hf_cigi3_3_symbol_line_definition = -1; +/* static int hf_cigi3_3_symbol_line_definition = -1; */ static int hf_cigi3_3_symbol_line_definition_symbol_id = -1; static int hf_cigi3_3_symbol_line_definition_primitive_type = -1; static int hf_cigi3_3_symbol_line_definition_stipple_pattern = -1; @@ -1961,7 +1961,7 @@ static const value_string cigi3_3_symbol_line_definition_primitive_type_vals[] = /* CIGI3_3 Symbol Clone */ #define CIGI3_PACKET_SIZE_SYMBOL_CLONE_DEFINITION 8 -static int hf_cigi3_3_symbol_clone = -1; +/* static int hf_cigi3_3_symbol_clone = -1; */ static int hf_cigi3_3_symbol_clone_symbol_id = -1; static int hf_cigi3_3_symbol_clone_source_type = -1; static int hf_cigi3_3_symbol_clone_source_id = -1; @@ -1973,7 +1973,7 @@ static const true_false_string cigi3_3_symbol_clone_source_type_tfs = { /* CIGI3_3 Symbol Control */ #define CIGI3_PACKET_SIZE_SYMBOL_CONTROL_DEFINITION 40 -static int hf_cigi3_3_symbol_control = -1; +/* static int hf_cigi3_3_symbol_control = -1; */ static int hf_cigi3_3_symbol_control_symbol_id = -1; static int hf_cigi3_3_symbol_control_symbol_state = -1; static int hf_cigi3_3_symbol_control_attach_state = -1; @@ -2018,7 +2018,7 @@ static const true_false_string cigi3_3_symbol_control_inherit_color_tfs = { /* CIGI3_3 Short Symbol Control */ #define CIGI3_PACKET_SIZE_SHORT_SYMBOL_CONTROL_DEFINITION 32 -static int hf_cigi3_3_short_symbol_control = -1; +/* static int hf_cigi3_3_short_symbol_control = -1; */ static int hf_cigi3_3_short_symbol_control_symbol_id = -1; static int hf_cigi3_3_short_symbol_control_inherit_color = -1; static int hf_cigi3_3_short_symbol_control_flash_control = -1; @@ -6611,6 +6611,7 @@ proto_register_cigi(void) FT_UINT8, BASE_DEC, NULL, 0xF0, "Indicates the minor version of the CIGI interface", HFILL } }, +#if 0 { &hf_cigi3_3_ig_control_host_frame_number, { "Host Frame Number", "cigi.ig_control.host_frame_number", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -6626,6 +6627,7 @@ proto_register_cigi(void) FT_UINT32, BASE_DEC, NULL, 0x0, "Contains the value of the IG Frame Number parameter in the last Start of Frame packet received from the IG", HFILL } }, +#endif /* CIGI2 Entity Control */ { &hf_cigi2_entity_control, @@ -6807,11 +6809,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Entity Control */ +#if 0 { &hf_cigi3_3_entity_control, { "Entity Control", "cigi.entity_control", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Entity Control Packet", HFILL } }, +#endif { &hf_cigi3_3_entity_control_entity_id, { "Entity ID", "cigi.entity_control.entity_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -7030,11 +7034,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Component Control */ +#if 0 { &hf_cigi3_3_component_control, { "Component Control", "cigi.component_control", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Component Control Packet", HFILL } }, +#endif { &hf_cigi3_3_component_control_component_id, { "Component ID", "cigi.component_control.component_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -7124,11 +7130,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Short Component Control */ +#if 0 { &hf_cigi3_3_short_component_control, { "Short Component Control", "cigi.short_component_control", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Short Component Control Packet", HFILL } }, +#endif { &hf_cigi3_3_short_component_control_component_id, { "Component ID", "cigi.short_component_control.component_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -9792,11 +9800,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Symbol Text Definition */ +#if 0 { &hf_cigi3_3_symbol_text_definition, { "Symbol Text Definition", "cigi.symbol_text_def", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Symbol Text Definition Packet", HFILL } }, +#endif { &hf_cigi3_3_symbol_text_definition_symbol_id, { "Symbol ID", "cigi.symbol_text_def.symbol_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -9829,11 +9839,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Symbol Circle Definition */ +#if 0 { &hf_cigi3_3_symbol_circle_definition, { "Symbol Circle Definition", "cigi.symbol_circle_def", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Symbol Circle Definition Packet", HFILL } }, +#endif { &hf_cigi3_3_symbol_circle_definition_symbol_id, { "Symbol ID", "cigi.symbol_circle_def.symbol_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -10131,11 +10143,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Symbol Line Definition */ +#if 0 { &hf_cigi3_3_symbol_line_definition, { "Symbol Line Definition", "cigi.symbol_line_def", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Symbol Line Definition Packet", HFILL } }, +#endif { &hf_cigi3_3_symbol_line_definition_symbol_id, { "Symbol ID", "cigi.symbol_line_def.symbol_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -10453,11 +10467,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Symbol Clone */ +#if 0 { &hf_cigi3_3_symbol_clone, { "Symbol Surface Definition", "cigi.symbol_clone", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Symbol Clone Packet", HFILL } }, +#endif { &hf_cigi3_3_symbol_clone_symbol_id, { "Symbol ID", "cigi.symbol_clone.symbol_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -10475,11 +10491,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Symbol Control */ +#if 0 { &hf_cigi3_3_symbol_control, { "Symbol Control", "cigi.symbol_control", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Symbol Control Packet", HFILL } }, +#endif { &hf_cigi3_3_symbol_control_symbol_id, { "Symbol ID", "cigi.symbol_control.symbol_id", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -10577,11 +10595,13 @@ proto_register_cigi(void) }, /* CIGI3_3 Short Symbol Control */ +#if 0 { &hf_cigi3_3_short_symbol_control, { "Short Symbol Control", "cigi.short_symbol_control", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Short Symbol Control Packet", HFILL } }, +#endif { &hf_cigi3_3_short_symbol_control_symbol_id, { "Symbol ID", "cigi.short_symbol_control.symbol_id", FT_UINT16, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 2ca50adeae..8f95142812 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -216,11 +216,11 @@ static int hf_cip_cco_iomap_attribute = -1; static int hf_cip_cco_safety = -1; static int hf_cip_cco_change_type = -1; -static int hf_cip_vendor = -1; -static int hf_cip_devtype = -1; +/* static int hf_cip_vendor = -1; */ +/* static int hf_cip_devtype = -1; */ static int hf_cip_path_segment = -1; static int hf_cip_path_segment_type = -1; -static int hf_cip_port_segment = -1; +/* static int hf_cip_port_segment = -1; */ static int hf_cip_port_ex_link_addr = -1; static int hf_cip_port = -1; static int hf_cip_link_address_size = -1; @@ -243,7 +243,7 @@ static int hf_cip_attribute32 = -1; static int hf_cip_conpoint8 = -1; static int hf_cip_conpoint16 = -1; static int hf_cip_conpoint32 = -1; -static int hf_cip_ekey = -1; +/* static int hf_cip_ekey = -1; */ static int hf_cip_ekey_format = -1; static int hf_cip_ekey_vendor = -1; static int hf_cip_ekey_devtype = -1; @@ -299,7 +299,7 @@ static int hf_cip_class_rev = -1; static int hf_cip_class_max_inst32 = -1; static int hf_cip_class_num_inst32 = -1; static int hf_cip_reserved8 = -1; -static int hf_cip_reserved16 = -1; +/* static int hf_cip_reserved16 = -1; */ static int hf_cip_reserved24 = -1; static int hf_cip_pad8 = -1; @@ -437,7 +437,7 @@ static int hf_time_sync_port_phys_addr_info_num_ports = -1; static int hf_time_sync_port_phys_addr_info_port_num = -1; static int hf_time_sync_port_phys_addr_info_phys_proto = -1; static int hf_time_sync_port_phys_addr_info_addr_size = -1; -static int hf_time_sync_port_phys_addr_info_phys_addr = -1; +/* static int hf_time_sync_port_phys_addr_info_phys_addr = -1; */ static int hf_time_sync_port_proto_addr_info_num_ports = -1; static int hf_time_sync_port_proto_addr_info_port_num = -1; static int hf_time_sync_port_proto_addr_info_network_proto = -1; @@ -6290,7 +6290,9 @@ proto_register_cip(void) { &hf_cip_path_segment, { "Path Segment", "cip.path_segment", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_path_segment_type, { "Path Segment Type", "cip.path_segment.type", FT_UINT8, BASE_DEC, VALS(cip_path_seg_vals), CI_SEGMENT_TYPE_MASK, NULL, HFILL }}, +#if 0 { &hf_cip_port_segment, { "Port Segment", "cip.port_segment", FT_UINT8, BASE_HEX, NULL, CI_SEGMENT_TYPE_MASK, NULL, HFILL }}, +#endif { &hf_cip_port_ex_link_addr, { "Extended Link Address", "cip.ex_linkaddress", FT_BOOLEAN, 8, TFS(&tfs_true_false), CI_PORT_SEG_EX_LINK_ADDRESS, NULL, HFILL }}, { &hf_cip_port, { "Port", "cip.port", FT_UINT8, BASE_DEC, NULL, CI_PORT_SEG_PORT_ID_MASK, "Port Identifier", HFILL }}, { &hf_cip_link_address_byte, { "Link Address", "cip.linkaddress", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -6313,7 +6315,9 @@ proto_register_cip(void) { &hf_cip_conpoint8, { "Connection Point", "cip.connpoint", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_conpoint16, { "Connection Point", "cip.connpoint", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_conpoint32, { "Connection Point", "cip.connpoint", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_cip_ekey, { "Electronic Key Segment", "cip.ekey", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, +#endif { &hf_cip_ekey_format, { "Key Format", "cip.ekey.format", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_ekey_vendor, { "Vendor ID", "cip.ekey.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }}, { &hf_cip_ekey_devtype, { "Device Type", "cip.ekey.devtype", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &cip_devtype_vals_ext, 0, NULL, HFILL }}, @@ -6366,13 +6370,19 @@ proto_register_cip(void) { &hf_cip_seg_safety_init_rollover, { "Initial Rollover Value", "cip.safety_segment.init_rollover", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_data, { "Safety Data", "cip.safety_segment.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_cip_vendor, { "Vendor ID", "cip.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }}, +#endif +#if 0 { &hf_cip_devtype, { "Device Type", "cip.devtype", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &cip_devtype_vals_ext, 0, NULL, HFILL }}, +#endif { &hf_cip_class_rev, { "Class Revision", "cip.class.rev", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_class_max_inst32, { "Max Instance", "cip.class.max_inst", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_class_num_inst32, { "Number of Instances", "cip.class.num_inst", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_reserved8, { "Reserved", "cip.reserved", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_cip_reserved16, { "Reserved", "cip.reserved", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, +#endif { &hf_cip_reserved24, { "Reserved", "cip.reserved", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_pad8, { "Pad Byte", "cip.pad", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -6514,7 +6524,9 @@ proto_register_cip(void) { &hf_time_sync_port_phys_addr_info_port_num, { "Port Number", "cip.time_sync.port_phys_addr_info.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_time_sync_port_phys_addr_info_phys_proto, { "Physical Protocol", "cip.time_sync.port_profile_id_info.phys_proto", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_time_sync_port_phys_addr_info_addr_size, { "Size of Address", "cip.time_sync.port_phys_addr_info.addr_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_time_sync_port_phys_addr_info_phys_addr, { "Port Physical Address", "cip.time_sync.port_profile_id_info.phys_addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_time_sync_port_proto_addr_info_num_ports, { "Number of Ports", "cip.time_sync.port_proto_addr_info.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_time_sync_port_proto_addr_info_port_num, { "Port Number", "cip.time_sync.port_proto_addr_info.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_time_sync_port_proto_addr_info_network_proto, { "Network Protocol", "cip.time_sync.port_proto_addr_info.network_proto", FT_UINT16, BASE_DEC, VALS(cip_time_sync_network_protocol_vals), 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index db89ca7989..cfbc0b3759 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.c @@ -59,7 +59,7 @@ static int hf_componentstatusreport_location = -1; static int hf_componentstatusreport_status = -1; static int hf_componentstatusreport_workload = -1; static int hf_componentstatusreport_associations = -1; -static int hf_componentstatusreport_associationarray = -1; +/* static int hf_componentstatusreport_associationarray = -1; */ static int hf_componentassociation_receiverid = -1; static int hf_componentassociation_duration = -1; static int hf_componentassociation_flags = -1; @@ -266,7 +266,9 @@ proto_register_componentstatusprotocol(void) { &hf_componentstatusreport_status, { "Status", "componentstatusprotocol.componentstatusreport_status", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_componentstatusreport_workload, { "Workload", "componentstatusprotocol.componentstatusreport_workload", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_componentstatusreport_associations, { "Associations", "componentstatusprotocol.componentstatusreport_associations", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_componentstatusreport_associationarray, { "AssociationArray", "componentstatusprotocol.componentstatusreport_AssociationArray", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_componentassociation_receiverid, { "ReceiverID", "componentstatusprotocol.componentassociation_receiverid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_componentassociation_duration, { "Duration", "componentstatusprotocol.componentassociation_duration", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_componentassociation_flags, { "Flags", "componentstatusprotocol.componentassociation_flags", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 0d41b09444..893c9d1a29 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -555,7 +555,7 @@ static gint hf_cops_obj_c_num = -1; static gint hf_cops_obj_c_type = -1; static gint hf_cops_obj_s_num = -1; -static gint hf_cops_obj_s_type = -1; +/* static gint hf_cops_obj_s_type = -1; */ static gint hf_cops_r_type_flags = -1; static gint hf_cops_m_type_flags = -1; @@ -657,7 +657,7 @@ static gint hf_cops_pc_token_bucket_rate = -1; static gint hf_cops_pc_token_bucket_size = -1; static gint hf_cops_pc_transaction_id = -1; static gint hf_cops_pc_bcid_ts = -1; -static gint hf_cops_pc_bcid = -1; +/* static gint hf_cops_pc_bcid = -1; */ static gint hf_cops_pc_bcid_ev = -1; static gint hf_cops_pc_dfcdc_ip = -1; static gint hf_cops_pc_dfccc_ip = -1; @@ -1668,11 +1668,13 @@ void proto_register_cops(void) FT_UINT8, BASE_DEC, VALS(cops_s_num_vals), 0x0, "S-Num in COPS-PR Object Header", HFILL } }, +#if 0 { &hf_cops_obj_s_type, { "S-Type", "cops.s_type", FT_UINT8, BASE_DEC, NULL, 0x0, "S-Type in COPS-PR Object Header", HFILL } }, +#endif { &hf_cops_r_type_flags, { "R-Type", "cops.context.r_type", @@ -2066,11 +2068,13 @@ void proto_register_cops(void) FT_FLOAT, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_cops_pc_bcid, { "Billing Correlation ID", "cops.pc_bcid", FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_cops_pc_bcid_ts, { "BDID Timestamp", "cops.pc_bcid_ts", FT_UINT32, BASE_HEX, NULL, 0x00, diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 5939054ed3..7383a2e4bd 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -169,7 +169,7 @@ static int hf_dccp_data3 = -1; static int hf_dccp_options = -1; static int hf_dccp_option_type = -1; static int hf_dccp_feature_number = -1; -static int hf_dccp_ndp_count = -1; +/* static int hf_dccp_ndp_count = -1; */ static int hf_dccp_timestamp = -1; static int hf_dccp_timestamp_echo = -1; static int hf_dccp_elapsed_time = -1; @@ -1318,6 +1318,7 @@ proto_register_dccp(void) NULL, HFILL } }, +#if 0 { &hf_dccp_ndp_count, { @@ -1326,6 +1327,7 @@ proto_register_dccp(void) NULL, HFILL } }, +#endif { &hf_dccp_timestamp, { diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c index 79edc510a8..9c6d0ce198 100644 --- a/epan/dissectors/packet-dcerpc-dtsprovider.c +++ b/epan/dissectors/packet-dcerpc-dtsprovider.c @@ -35,7 +35,7 @@ static int proto_dtsprovider = -1; static int hf_dtsprovider_opnum = -1; -static int hf_dtsprovider_status = -1; +/* static int hf_dtsprovider_status = -1; */ static gint ett_dtsprovider = -1; @@ -58,9 +58,11 @@ proto_register_dtsprovider (void) { &hf_dtsprovider_opnum, { "Operation", "dtsprovider.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_dtsprovider_status, { "Status", "dtsprovider.status", FT_UINT32, BASE_DEC|BASE_EXT_STRING, &dce_error_vals_ext, 0x0, "Return code, status of executed command", HFILL }} +#endif }; static gint *ett[] = { diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index d76cfcff99..663cc035b8 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -47,7 +47,7 @@ static int hf_epm_max_ents = -1; static int hf_epm_num_ents = -1; static int hf_epm_uuid = -1; static int hf_epm_tower_length = -1; -static int hf_epm_tower_data = -1; +/* static int hf_epm_tower_data = -1; */ static int hf_epm_max_towers = -1; static int hf_epm_num_towers = -1; static int hf_epm_rc = -1; @@ -728,8 +728,10 @@ proto_register_epm (void) { "NetBIOS Name", "epm.proto.netbios_name", FT_STRING, BASE_NONE, NULL, 0x0, "NetBIOS name where this service can be found", HFILL }}, { &hf_epm_tower_length, { "Length", "epm.tower.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of tower data", HFILL }}, +#if 0 { &hf_epm_tower_data, { "Tower", "epm.tower", FT_BYTES, BASE_NONE, NULL, 0x0, "Tower data", HFILL }}, +#endif { &hf_epm_max_towers, { "Max Towers", "epm.max_towers", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum number of towers to return", HFILL }}, { &hf_epm_num_towers, diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index 581d4bc5dd..f6d18ea3ce 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -54,8 +54,10 @@ static e_uuid_t uuid_fldb = }; static guint16 ver_fldb = 4; +#if 0 static int hf_fldb_getentrybyname_rqst_var1 = -1; static int hf_fldb_getentrybyname_rqst_key_size = -1; +#endif static int hf_fldb_releaselock_rqst_fsid_high = -1; static int hf_fldb_releaselock_rqst_fsid_low = -1; static int hf_fldb_releaselock_rqst_voltype = -1; @@ -64,12 +66,15 @@ static int hf_fldb_setlock_rqst_fsid_high = -1; static int hf_fldb_setlock_rqst_fsid_low = -1; static int hf_fldb_setlock_rqst_voltype = -1; static int hf_fldb_setlock_rqst_voloper = -1; +#if 0 static int hf_fldb_setlock_resp_st = -1; static int hf_fldb_setlock_resp_st2 = -1; +#endif static int hf_fldb_listentry_rqst_previous_index = -1; static int hf_fldb_listentry_rqst_var1 = -1; static int hf_fldb_listentry_resp_count = -1; static int hf_fldb_listentry_resp_next_index = -1; +#if 0 static int hf_fldb_listentry_resp_key_t = -1; static int hf_fldb_listentry_resp_key_size = -1; static int hf_fldb_listentry_resp_key_t2 = -1; @@ -77,21 +82,27 @@ static int hf_fldb_listentry_resp_key_size2 = -1; static int hf_fldb_listentry_resp_voltype = -1; static int hf_fldb_createentry_rqst_key_t = -1; static int hf_fldb_createentry_rqst_key_size = -1; +#endif static int hf_fldb_deleteentry_rqst_fsid_high = -1; static int hf_fldb_deleteentry_rqst_fsid_low = -1; static int hf_fldb_deleteentry_rqst_voltype = -1; static int hf_fldb_deleteentry_rqst_voloper = -1; +#if 0 static int hf_fldb_getentrybyid_rqst_fsid_high = -1; static int hf_fldb_getentrybyid_rqst_fsid_low = -1; static int hf_fldb_getentrybyid_rqst_voltype = -1; static int hf_fldb_getentrybyid_rqst_voloper = -1; +#endif static int hf_fldb_replaceentry_rqst_fsid_high = -1; static int hf_fldb_replaceentry_rqst_fsid_low = -1; static int hf_fldb_replaceentry_rqst_voltype = -1; +#if 0 static int hf_fldb_replaceentry_rqst_key_size = -1; static int hf_fldb_replaceentry_rqst_key_t = -1; static int hf_fldb_replaceentry_resp_st = -1; static int hf_fldb_replaceentry_resp_st2 = -1; +#endif +#if 0 static int hf_fldb_getentrybyname_resp_volumetype = -1; static int hf_fldb_getentrybyname_resp_numservers = -1; static int hf_fldb_getentrybyname_resp_sitecookies = -1; @@ -118,6 +129,7 @@ static int hf_fldb_getentrybyname_resp_key_t = -1; static int hf_fldb_getentrybyname_resp_key_size = -1; static int hf_fldb_getentrybyname_resp_test = -1; static int hf_dcerpc_error_status = -1; +#endif static int hf_fldb_vldbentry_volumename = -1; static int hf_fldb_vldbentry_volumetype = -1; static int hf_fldb_vldbentry_nservers = -1; @@ -161,13 +173,13 @@ static int hf_fldb_flagsp = -1; static int hf_fldb_nextstartp = -1; static int hf_fldb_afsNameString_t_principalName_string = -1; static int hf_fldb_afsNameString_t_principalName_size = -1; -static int hf_fldb_afsNameString_t_principalName_size2 = -1; +/* static int hf_fldb_afsNameString_t_principalName_size2 = -1; */ static int hf_fldb_namestring = -1; static int hf_error_st = -1; static int hf_fldb_creationquota = -1; static int hf_fldb_creationuses = -1; static int hf_fldb_deletedflag = -1; -static int hf_fldb_namestring_size = -1; +/* static int hf_fldb_namestring_size = -1; */ static int hf_fldb_numwanted = -1; static int hf_fldb_spare2 = -1; static int hf_fldb_spare3 = -1; @@ -1710,12 +1722,14 @@ proto_register_fldb (void) {&hf_fldb_setlock_rqst_voloper, {"voloper", "fldb.setlock_rqst_voloper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_fldb_setlock_resp_st, {"Error", "fldb.setlock_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, {&hf_fldb_setlock_resp_st2, {"Error", "fldb.setlock_resp_st2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_fldb_listentry_rqst_previous_index, {"Previous Index", "fldb.listentry_rqst_previous_index", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -1728,6 +1742,7 @@ proto_register_fldb (void) {&hf_fldb_listentry_resp_next_index, {"Next Index", "fldb.listentry_resp_next_index", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_fldb_listentry_resp_key_size, {"Key Size", "fldb.listentry_resp_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -1749,6 +1764,7 @@ proto_register_fldb (void) {&hf_fldb_createentry_rqst_key_size, {"Volume Size", "fldb.createentry_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_fldb_deleteentry_rqst_fsid_high, {"FSID deleteentry Hi", "fldb.deleteentry_rqst_fsid_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -1761,6 +1777,7 @@ proto_register_fldb (void) {&hf_fldb_deleteentry_rqst_voloper, {"voloper", "fldb.deleteentry_rqst_voloper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_fldb_getentrybyid_rqst_fsid_high, {"FSID deleteentry Hi", "fldb.getentrybyid_rqst_fsid_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -1773,6 +1790,7 @@ proto_register_fldb (void) {&hf_fldb_getentrybyid_rqst_voloper, {"voloper", "fldb.getentrybyid_rqst_voloper", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_fldb_replaceentry_rqst_fsid_high, {"FSID replaceentry Hi", "fldb.replaceentry_rqst_fsid_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -1782,6 +1800,7 @@ proto_register_fldb (void) {&hf_fldb_replaceentry_rqst_voltype, {"voltype", "fldb.replaceentry_rqst_voltype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_fldb_replaceentry_rqst_key_t, {"Key", "fldb.replaceentry_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1893,6 +1912,7 @@ proto_register_fldb (void) {&hf_fldb_getentrybyname_resp_test, {"fldb_getentrybyname_resp_test", "fldb.getentrybyname_resp_test", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_fldb_releaselock_rqst_fsid_high, {"FSID releaselock Hi", "fldb.releaselock_rqst_fsid_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -2017,18 +2037,22 @@ proto_register_fldb (void) {&hf_fldb_afsNameString_t_principalName_size, {"Principal Name Size", "fldb.principalName_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_fldb_afsNameString_t_principalName_size2, {"Principal Name Size2", "fldb.principalName_size2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_fldb_afsNameString_t_principalName_string, {"Principal Name", "fldb.NameString_principal", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, {&hf_fldb_namestring, {"Name string", "fldb.NameString_principal", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_dcerpc_error_status, {"Error Status", "fldb.NameString_principal", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_error_st, {"Error Status 2", "fldb.error_st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -2041,6 +2065,7 @@ proto_register_fldb (void) {&hf_fldb_deletedflag, {"deletedflag", "fldb.deletedflag", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_fldb_getentrybyname_rqst_key_size, {"getentrybyname", "fldb.getentrybyname_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -2050,6 +2075,7 @@ proto_register_fldb (void) {&hf_fldb_namestring_size, {"namestring size", "fldb.namestring_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_fldb_numwanted, {"number wanted", "fldb.numwanted", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index 0c84778c3a..29fc924334 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.c @@ -53,7 +53,7 @@ static int hf_krb5rpc_sendto_kdc_resp_len = -1; static int hf_krb5rpc_sendto_kdc_resp_max = -1; static int hf_krb5rpc_sendto_kdc_resp_spare1 = -1; static int hf_krb5rpc_sendto_kdc_resp_keysize = -1; -static int hf_krb5rpc_sendto_kdc_resp_st = -1; +/* static int hf_krb5rpc_sendto_kdc_resp_st = -1; */ static int hf_krb5rpc_krb5 = -1; static gint ett_krb5rpc_krb5 = -1; @@ -176,9 +176,11 @@ proto_register_krb5rpc (void) {"Response key size", "krb5rpc.sendto_kdc_resp_keysize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 {&hf_krb5rpc_sendto_kdc_resp_st, {"Response st", "krb5rpc.sendto_kdc_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif {&hf_krb5rpc_krb5, {"krb5", "krb5rpc.krb5", FT_BYTES, BASE_NONE, NULL, 0x0, "krb5 blob", HFILL}}, diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 7b394309a7..6edf0ea6a6 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -138,15 +138,15 @@ static int hf_netlogon_sensitive_data = -1; static int hf_netlogon_security_information = -1; static int hf_netlogon_dummy = -1; static int hf_netlogon_neg_flags = -1; -static int hf_netlogon_neg_flags_80000000 = -1; +/* static int hf_netlogon_neg_flags_80000000 = -1; */ static int hf_netlogon_neg_flags_40000000 = -1; static int hf_netlogon_neg_flags_20000000 = -1; -static int hf_netlogon_neg_flags_10000000 = -1; -static int hf_netlogon_neg_flags_8000000 = -1; -static int hf_netlogon_neg_flags_4000000 = -1; -static int hf_netlogon_neg_flags_2000000 = -1; +/* static int hf_netlogon_neg_flags_10000000 = -1; */ +/* static int hf_netlogon_neg_flags_8000000 = -1; */ +/* static int hf_netlogon_neg_flags_4000000 = -1; */ +/* static int hf_netlogon_neg_flags_2000000 = -1; */ static int hf_netlogon_neg_flags_1000000 = -1; -static int hf_netlogon_neg_flags_800000 = -1; +/* static int hf_netlogon_neg_flags_800000 = -1; */ static int hf_netlogon_neg_flags_400000 = -1; static int hf_netlogon_neg_flags_200000 = -1; static int hf_netlogon_neg_flags_100000 = -1; @@ -176,10 +176,10 @@ static int hf_netlogon_pagedpoollimit = -1; static int hf_netlogon_pagefilelimit = -1; static int hf_netlogon_timelimit = -1; static int hf_netlogon_nonpagedpoollimit = -1; -static int hf_netlogon_pac_size = -1; -static int hf_netlogon_pac_data = -1; -static int hf_netlogon_auth_size = -1; -static int hf_netlogon_auth_data = -1; +/* static int hf_netlogon_pac_size = -1; */ +/* static int hf_netlogon_pac_data = -1; */ +/* static int hf_netlogon_auth_size = -1; */ +/* static int hf_netlogon_auth_data = -1; */ static int hf_netlogon_cipher_len = -1; static int hf_netlogon_cipher_maxlen = -1; static int hf_netlogon_cipher_current_data = -1; @@ -196,8 +196,8 @@ static int hf_netlogon_tc_connection_status = -1; static int hf_netlogon_restart_state = -1; static int hf_netlogon_attrs = -1; static int hf_netlogon_lsapolicy_len = -1; -static int hf_netlogon_lsapolicy_referentid = -1; -static int hf_netlogon_lsapolicy_pointer = -1; +/* static int hf_netlogon_lsapolicy_referentid = -1; */ +/* static int hf_netlogon_lsapolicy_pointer = -1; */ static int hf_netlogon_count = -1; static int hf_netlogon_entries = -1; static int hf_netlogon_minpasswdlen = -1; @@ -250,7 +250,7 @@ static int hf_netlogon_pwd_age = -1; static int hf_netlogon_pwd_last_set_time = -1; static int hf_netlogon_pwd_can_change_time = -1; static int hf_netlogon_pwd_must_change_time = -1; -static int hf_netlogon_nt_chal_resp = -1; +/* static int hf_netlogon_nt_chal_resp = -1; */ static int hf_netlogon_lm_chal_resp = -1; static int hf_netlogon_credential = -1; static int hf_netlogon_acct_name = -1; @@ -271,7 +271,7 @@ static int hf_netlogon_user_rid = -1; static int hf_netlogon_alias_rid = -1; static int hf_netlogon_group_rid = -1; static int hf_netlogon_logon_srv = -1; -static int hf_netlogon_principal = -1; +/* static int hf_netlogon_principal = -1; */ static int hf_netlogon_logon_dom = -1; static int hf_netlogon_resourcegroupcount = -1; static int hf_netlogon_downlevel_domain_name = -1; @@ -407,7 +407,7 @@ static int hf_netlogon_dc_flags_ndnc_flag = -1; static int hf_netlogon_dc_flags_dns_controller_flag = -1; static int hf_netlogon_dc_flags_dns_domain_flag = -1; static int hf_netlogon_dc_flags_dns_forest_flag = -1; -static int hf_netlogon_dnsdomaininfo = -1; +/* static int hf_netlogon_dnsdomaininfo = -1; */ static int hf_netlogon_s4u2proxytarget = -1; static int hf_netlogon_transitedlistsize = -1; static int hf_netlogon_transited_service = -1; @@ -6645,31 +6645,34 @@ static int netlogon_dissect_neg_options(tvbuff_t *tvb,proto_tree *tree,guint32 f tvb, offset, 4,flags); negotiate_flags_tree = proto_item_add_subtree (tf,ett_authenticate_flags); - /*proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_80000000, - tvb, offset, 4, flags);*/ +#if 0 + proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_80000000, + tvb, offset, 4, flags); +#endif proto_tree_add_boolean (negotiate_flags_tree, hf_netlogon_neg_flags_40000000, tvb, offset, 4, flags); proto_tree_add_boolean (negotiate_flags_tree, hf_netlogon_neg_flags_20000000, tvb, offset, 4, flags); - /* - proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_10000000, - tvb, offset, 4, flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_8000000, - tvb, offset, 4, flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_4000000, - tvb, offset, 4, flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_2000000, - tvb, offset, 4, flags); - proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_800000, - tvb, offset, 4, flags);*/ +#if 0 + proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_10000000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_8000000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_4000000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_2000000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_800000, + tvb, offset, 4, flags); +#endif proto_tree_add_boolean (negotiate_flags_tree, hf_netlogon_neg_flags_1000000, tvb, offset, 4, flags); @@ -8228,17 +8231,21 @@ proto_register_dcerpc_netlogon(void) "Attributes", "netlogon.attrs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_netlogon_lsapolicy_referentid, { "Referent ID", "netlogon.lsapolicy.referentID", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_netlogon_lsapolicy_len, { "Length", "netlogon.lsapolicy.length", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of the policy buffer", HFILL }}, +#if 0 { &hf_netlogon_lsapolicy_pointer, { "Pointer", "netlogon.lsapolicy.pointer", FT_BYTES, BASE_NONE, NULL, 0x0, "Pointer to LSA POLICY", HFILL }}, +#endif { &hf_netlogon_unknown_string, { "Unknown string", "netlogon.unknown_string", FT_STRING, BASE_NONE, @@ -8412,9 +8419,11 @@ proto_register_dcerpc_netlogon(void) { "Length", "netlogon.sensitive_data_len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of sensitive data", HFILL }}, +#if 0 { &hf_netlogon_nt_chal_resp, { "NT Chal resp", "netlogon.nt_chal_resp", FT_BYTES, BASE_NONE, NULL, 0, "Challenge response for NT authentication", HFILL }}, +#endif { &hf_netlogon_lm_chal_resp, { "LM Chal resp", "netlogon.lm_chal_resp", FT_BYTES, BASE_NONE, @@ -8428,17 +8437,21 @@ proto_register_dcerpc_netlogon(void) { "Cipher Max Len", "netlogon.cipher_maxlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_netlogon_pac_data, { "Pac Data", "netlogon.pac.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_netlogon_sensitive_data, { "Data", "netlogon.sensitive_data", FT_BYTES, BASE_NONE, NULL, 0, "Sensitive Data", HFILL }}, +#if 0 { &hf_netlogon_auth_data, { "Auth Data", "netlogon.auth.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_netlogon_cipher_current_data, { "Cipher Current Data", "netlogon.cipher_current_data", FT_BYTES, BASE_NONE, @@ -8492,9 +8505,11 @@ proto_register_dcerpc_netlogon(void) { "Server", "netlogon.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_netlogon_principal, { "Principal", "netlogon.principal", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_netlogon_logon_dom, { "Domain", "netlogon.domain", FT_STRING, BASE_NONE, @@ -8748,13 +8763,17 @@ proto_register_dcerpc_netlogon(void) { "Max Log Size", "netlogon.max_log_size", FT_UINT32, BASE_DEC, NULL, 0x0, "Max Size of log", HFILL }}, +#if 0 { &hf_netlogon_pac_size, { "Pac Size", "netlogon.pac.size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of PacData in bytes", HFILL }}, +#endif +#if 0 { &hf_netlogon_auth_size, { "Auth Size", "netlogon.auth.size", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of AuthData in bytes", HFILL }}, +#endif { &hf_netlogon_num_deltas, { "Num Deltas", "netlogon.num_deltas", FT_UINT32, BASE_DEC, @@ -8796,8 +8815,10 @@ proto_register_dcerpc_netlogon(void) { "Negotiation options", "netlogon.neg_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "Negotiation Flags", HFILL }}, +#if 0 { &hf_netlogon_neg_flags_80000000, { "Not used 80000000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_80000000, "Not used", HFILL }}, +#endif { &hf_netlogon_neg_flags_40000000, { "Authenticated RPC supported", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_40000000, NULL, HFILL }}, @@ -8805,23 +8826,33 @@ proto_register_dcerpc_netlogon(void) { &hf_netlogon_neg_flags_20000000, { "Authenticated RPC via lsass supported", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_20000000, "rpc via lsass", HFILL }}, +#if 0 { &hf_netlogon_neg_flags_10000000, { "Not used 10000000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_10000000, "Not used", HFILL }}, +#endif +#if 0 { &hf_netlogon_neg_flags_8000000, { "Not used 8000000", "ntlmssp.neg_flags.na800000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_8000000, "Not used", HFILL }}, +#endif +#if 0 { &hf_netlogon_neg_flags_4000000, { "Not used 4000000", "ntlmssp.neg_flags.na400000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_4000000, "Not used", HFILL }}, +#endif +#if 0 { &hf_netlogon_neg_flags_2000000, { "Not used 2000000", "ntlmssp.neg_flags.na200000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2000000, "Not used", HFILL }}, +#endif { &hf_netlogon_neg_flags_1000000, { "AES supported", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "AES", HFILL }}, +#if 0 { &hf_netlogon_neg_flags_800000, { "Not used 800000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_800000, "Not used", HFILL }}, +#endif { &hf_netlogon_neg_flags_400000, { "AES & SHA2 supported", "ntlmssp.neg_flags.na400000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_USEAES, "AES&SHA2", HFILL }}, @@ -9427,9 +9458,11 @@ proto_register_dcerpc_netlogon(void) FT_BOOLEAN, 32, TFS(&user_account_control_account_disabled), 0x00000001, "The user account control account_disabled flag", HFILL }}, +#if 0 { &hf_netlogon_dnsdomaininfo, { "DnsDomainInfo", "netlogon.dnsdomaininfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif { &DnsDomainInfo_sid, { "Sid", "lsarpc.lsa_DnsDomainInfo.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 9a5f87d325..cae13841f8 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -39,7 +39,7 @@ static int hf_rpriv_opnum = -1; static int hf_rpriv_get_eptgt_rqst_authn_svc = -1; static int hf_rpriv_get_eptgt_rqst_authz_svc = -1; static int hf_rpriv_get_eptgt_rqst_var1 = -1; -static int hf_rpriv_get_eptgt_rqst_key_size = -1; +/* static int hf_rpriv_get_eptgt_rqst_key_size = -1; */ static int hf_rpriv_get_eptgt_rqst_key_size2 = -1; static int hf_rpriv_get_eptgt_rqst_key_t = -1; static int hf_rpriv_get_eptgt_rqst_key_t2 = -1; @@ -115,8 +115,10 @@ proto_register_rpriv (void) { "Authn_Svc", "rpriv.get_eptgt_rqst_authn_svc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_rpriv_get_eptgt_rqst_authz_svc, { "Authz_Svc", "rpriv.get_eptgt_rqst_authz_svc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_rpriv_get_eptgt_rqst_key_size, { "Key_Size", "rpriv.get_eptgt_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_rpriv_get_eptgt_rqst_var1, { "Var1", "rpriv.get_eptgt_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_rpriv_get_eptgt_rqst_key_size2, diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 005d40d849..45590219e4 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.c @@ -62,8 +62,8 @@ static int hf_svcctl_service_type_win32_share_process = -1; static int hf_svcctl_service_type_interactive_process = -1; static int hf_svcctl_service_state = -1; static int hf_svcctl_buffer = -1; -static int hf_svcctl_bytes_needed = -1; -static int hf_svcctl_services_returned = -1; +/* static int hf_svcctl_bytes_needed = -1; */ +/* static int hf_svcctl_services_returned = -1; */ static int hf_svcctl_resume = -1; static int hf_svcctl_service_name = -1; static int hf_svcctl_display_name = -1; @@ -959,12 +959,14 @@ proto_register_dcerpc_svcctl(void) { &hf_svcctl_buffer, { "Buffer", "svcctl.buffer", FT_UINT32, BASE_DEC, NULL, 0x0, "SVCCTL buffer", HFILL }}, +#if 0 { &hf_svcctl_bytes_needed, { "Bytes Needed", "svcctl.bytes_needed", FT_UINT32, BASE_DEC, NULL, 0x0, "SVCCTL bytes needed", HFILL }}, { &hf_svcctl_services_returned, { "Services Returned", "svcctl.services_returned", FT_UINT32, BASE_DEC, NULL, 0x0, "SVCCTL services returned", HFILL }}, +#endif { &hf_svcctl_service_name, { "Service Name", "svcctl.servicename", FT_STRING, BASE_NONE, NULL, 0x0, "SVCCTL name of service", HFILL }}, diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c index e943eb5384..97aaad6a56 100644 --- a/epan/dissectors/packet-dcerpc-trksvr.c +++ b/epan/dissectors/packet-dcerpc-trksvr.c @@ -36,7 +36,7 @@ static int proto_dcerpc_trksvr = -1; static int hf_trksvr_opnum = -1; -static int hf_trksvr_rc = -1; +/* static int hf_trksvr_rc = -1; */ static gint ett_dcerpc_trksvr = -1; @@ -68,9 +68,11 @@ static hf_register_info hf[] = { { &hf_trksvr_opnum, { "Operation", "trksvr.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_trksvr_rc, { "Return code", "trksvr.rc", FT_UINT32, BASE_HEX, VALS(NT_errors), 0x0, "TRKSVR return code", HFILL }}, +#endif }; static gint *ett[] = { diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 5d14d2001a..a7db813cd7 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -41,7 +41,7 @@ static int hf_remunk_opnum = -1; static int hf_remunk_refs = -1; static int hf_remunk_iids = -1; -static int hf_remunk_flags = -1; +/* static int hf_remunk_flags = -1; */ static int hf_remunk_qiresult = -1; static gint ett_remunk_reminterfaceref = -1; @@ -328,8 +328,10 @@ proto_register_remunk (void) { "IIDs", "remunk.iids", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remunk_qiresult, { "QIResult", "remunk.qiresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_remunk_flags, { "Flags", "remunk.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_remunk_public_refs, { "PublicRefs", "remunk.public_refs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_remunk_reminterfaceref, diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c index a514768dd3..22f2d5c9df 100644 --- a/epan/dissectors/packet-dcom-sysact.c +++ b/epan/dissectors/packet-dcom-sysact.c @@ -37,7 +37,7 @@ static int proto_ISystemActivator = -1; static gint ett_isystemactivator = -1; static int hf_opnum = -1; static int hf_sysact_actproperties = -1; -static int hf_sysact_unknown = -1; +/* static int hf_sysact_unknown = -1; */ static gint ett_actproperties = -1; static int hf_sysact_totalsize = -1; @@ -50,9 +50,9 @@ static int hf_sysact_customhdrsize = -1; static int hf_sysact_dstctx = -1; static int hf_sysact_actpropnumber = -1; static int hf_sysact_actpropclsinfoid = -1; -static int hf_sysact_actpropclsids = -1; +/* static int hf_sysact_actpropclsids = -1; */ static int hf_sysact_actpropclsid = -1; -static int hf_sysact_actpropsizes = -1; +/* static int hf_sysact_actpropsizes = -1; */ static int hf_sysact_actpropsize = -1; @@ -67,8 +67,8 @@ static int hf_sysact_spsysprop_partition = -1; static int hf_sysact_spsysprop_procrqstflgs = -1; static int hf_sysact_spsysprop_origclsctx = -1; static int hf_sysact_spsysprop_flags = -1; -static int hf_sysact_spsysprop_procid = -1; -static int hf_sysact_spsysprop_hwnd = -1; +/* static int hf_sysact_spsysprop_procid = -1; */ +/* static int hf_sysact_spsysprop_hwnd = -1; */ static gint ett_dcom_instantianinfo = -1; static int hf_sysact_instninfo_clsid = -1; @@ -1148,8 +1148,10 @@ proto_register_ISystemActivator (void) { "Operation", "isystemactivator.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_sysact_actproperties, { "IActProperties", "isystemactivator.actproperties", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_sysact_unknown, { "IUnknown", "isystemactivator.unknown", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif }; static hf_register_info hf_actproperties[] = { @@ -1166,12 +1168,16 @@ proto_register_ISystemActivator (void) { "NumActivationPropertyStructs", "isystemactivator.customhdr.actpropnumber", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_sysact_actpropclsinfoid, { "ClassInfoClsid", "isystemactivator.customhdr.clsinfoid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_sysact_actpropclsids, { "PropertyGuids", "isystemactivator.customhdr.clsids", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_sysact_actpropclsid, { "PropertyStructGuid", "isystemactivator.customhdr.clsid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_sysact_actpropsizes, { "PropertyDataSizes", "isystemactivator.customhdr.datasizes", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_sysact_actpropsize, { "PropertyDataSize", "isystemactivator.customhdr.datasize", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -1194,10 +1200,14 @@ proto_register_ISystemActivator (void) { "OriginalClassContext", "isystemactivator.properties.spcl.origclsctx", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_sysact_spsysprop_flags, { "Flags", "isystemactivator.properties.spcl.flags", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_sysact_spsysprop_procid, { "ProcessID", "isystemactivator.properties.spcl.procid", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, +#endif +#if 0 { &hf_sysact_spsysprop_hwnd, { "hWnd", "isystemactivator.properties.spcl.hwnd", FT_UINT64, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, +#endif /*InstantiationInfo*/ { &hf_sysact_instninfo_clsid, diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index d41d041023..66104daa67 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -102,8 +102,8 @@ gboolean dcom_prefs_display_unmarshalling_details = FALSE; static gint ett_dcom_this = -1; -static int hf_dcom_this_version_major = -1; -static int hf_dcom_this_version_minor = -1; +/* static int hf_dcom_this_version_major = -1; */ +/* static int hf_dcom_this_version_minor = -1; */ static int hf_dcom_this_flags = -1; static int hf_dcom_this_res = -1; static int hf_dcom_this_cid = -1; @@ -132,7 +132,7 @@ static gint ett_dcom_lpwstr = -1; static int hf_dcom_max_count = -1; static int hf_dcom_offset = -1; static int hf_dcom_byte_length = -1; -static int hf_dcom_actual_count = -1; +/* static int hf_dcom_actual_count = -1; */ static gint ett_dcom_objref = -1; static int hf_dcom_objref = -1; @@ -199,7 +199,7 @@ static int hf_dcom_sa_features_dispatch = -1; static int hf_dcom_sa_features_variant = -1; static gint ett_dcom_variant = -1; -static int hf_dcom_variant = -1; +/* static int hf_dcom_variant = -1; */ static int hf_dcom_variant_type = -1; static int hf_dcom_variant_size = -1; static int hf_dcom_variant_rpc_res = -1; @@ -2199,10 +2199,14 @@ void proto_register_dcom (void) { static hf_register_info hf_dcom_this_array[] = { +#if 0 { &hf_dcom_this_version_major, { "VersionMajor", "dcom.this.version_major", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif +#if 0 { &hf_dcom_this_version_minor, { "VersionMinor", "dcom.this.version_minor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_dcom_this_flags, { "Flags", "dcom.this.flags", FT_UINT32, BASE_HEX, VALS(dcom_thisthat_flag_vals), 0x0, NULL, HFILL }}, { &hf_dcom_this_res, @@ -2242,14 +2246,18 @@ proto_register_dcom (void) { "Offset", "dcom.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_dcom_byte_length, { "ByteLength", "dcom.byte_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_dcom_actual_count, { "ActualCount", "dcom.actual_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_dcom_tobedone, { "To Be Done", "dcom.tobedone", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dcom_nospec, { "No Specification Available", "dcom.nospec", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_dcom_variant, { "Variant", "dcom.variant", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_dcom_variant_type, { "VarType", "dcom.variant_type", FT_UINT16, BASE_HEX, VALS(dcom_variant_type_vals), 0x0, NULL, HFILL }}, { &hf_dcom_variant_type32, diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index f88c96eb40..a0c998c550 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -58,7 +58,7 @@ static int hf_edcp_min = -1; static int hf_edcp_pt = -1; static int hf_edcp_crc = -1; static int hf_edcp_crc_ok = -1; -static int hf_edcp_pft_pt = -1; +/* static int hf_edcp_pft_pt = -1; */ static int hf_edcp_pseq = -1; static int hf_edcp_findex = -1; static int hf_edcp_fcount = -1; @@ -71,14 +71,14 @@ static int hf_edcp_source = -1; static int hf_edcp_dest = -1; static int hf_edcp_hcrc = -1; static int hf_edcp_hcrc_ok = -1; -static int hf_edcp_c_max = -1; -static int hf_edcp_rx_min = -1; -static int hf_edcp_rs_corrected = -1; +/* static int hf_edcp_c_max = -1; */ +/* static int hf_edcp_rx_min = -1; */ +/* static int hf_edcp_rs_corrected = -1; */ static int hf_edcp_rs_ok = -1; static int hf_edcp_pft_payload = -1; static int hf_tpl_tlv = -1; -static int hf_tpl_ptr = -1; +/* static int hf_tpl_ptr = -1; */ static int hf_edcp_fragments = -1; static int hf_edcp_fragment = -1; @@ -731,11 +731,13 @@ proto_register_dcp_etsi (void) }; static hf_register_info hf_pft[] = { +#if 0 {&hf_edcp_pft_pt, {"Sub-protocol", "dcp-pft.pt", FT_UINT8, BASE_DEC, NULL, 0, "Always AF", HFILL} }, +#endif {&hf_edcp_pseq, {"Sequence No", "dcp-pft.seq", FT_UINT16, BASE_DEC, NULL, 0, @@ -828,6 +830,7 @@ proto_register_dcp_etsi (void) {&hf_edcp_reassembled_length, {"Reassembled DCP (ETSI) length", "dcp-pft.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL}}, +#if 0 {&hf_edcp_c_max, {"C max", "dcp-pft.cmax", FT_UINT16, BASE_DEC, NULL, 0, @@ -843,6 +846,7 @@ proto_register_dcp_etsi (void) FT_INT16, BASE_DEC, NULL, 0, "Number of symbols corrected by RS decode or -1 for failure", HFILL} }, +#endif {&hf_edcp_rs_ok, {"RS decode OK", "dcp-pft.rs_ok", FT_BOOLEAN, BASE_NONE, NULL, 0x0, @@ -861,11 +865,13 @@ proto_register_dcp_etsi (void) FT_BYTES, BASE_NONE, NULL, 0, "Tag Packet", HFILL} }, +#if 0 {&hf_tpl_ptr, {"Type", "dcp-tpl.ptr", FT_STRING, BASE_NONE, NULL, 0, "Protocol Type & Revision", HFILL} } +#endif }; /* Setup protocol subtree array */ diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index abcec26b6d..d503ac321d 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -42,18 +42,18 @@ #include "packet-ntp.h" /* Initialize the protocol and registered fields */ -static int proto_diameter_3gpp = -1; - -static int hf_diameter_3gpp_visited_nw_id = -1; -static int hf_diameter_3gpp_msisdn = -1; -static int hf_diameter_3gpp_path = -1; -static int hf_diameter_3gpp_contact = -1; -static int hf_diameter_3gpp_user_data = -1; -static int hf_diameter_3gpp_ipaddr = -1; -static int hf_diameter_3gpp_mbms_required_qos_prio = -1; -static int hf_diameter_3gpp_tmgi = -1; -static int hf_diameter_3gpp_service_ind = -1; -static int hf_diameter_mbms_service_id = -1; +static int proto_diameter_3gpp = -1; + +static int hf_diameter_3gpp_visited_nw_id = -1; +static int hf_diameter_3gpp_msisdn = -1; +static int hf_diameter_3gpp_path = -1; +static int hf_diameter_3gpp_contact = -1; +/* static int hf_diameter_3gpp_user_data = -1; */ +static int hf_diameter_3gpp_ipaddr = -1; +static int hf_diameter_3gpp_mbms_required_qos_prio = -1; +static int hf_diameter_3gpp_tmgi = -1; +static int hf_diameter_3gpp_service_ind = -1; +static int hf_diameter_mbms_service_id = -1; static int hf_diameter_address_digits = -1; static int hf_diameter_3gpp_spare_bits = -1; static int hf_diameter_3gpp_feature_list_flags = -1; @@ -86,7 +86,7 @@ static int hf_diameter_3gpp_dsr_flags_bit11 = -1; static int hf_diameter_3gpp_dsr_flags_bit12 = -1; static int hf_diameter_3gpp_dsr_flags_bit13 = -1; static int hf_diameter_3gpp_dsr_flags_bit14 = -1; -static int hf_diameter_3gpp_dsr_flags_bit15 = -1; +/* static int hf_diameter_3gpp_dsr_flags_bit15 = -1; */ static int hf_diameter_3gpp_dsa_flags = -1; static int hf_diameter_3gpp_dsa_flags_bit0 = -1; static int hf_diameter_3gpp_ida_flags = -1; @@ -114,7 +114,7 @@ static int hf_diameter_3gpp_udp_port = -1; static gint diameter_3gpp_path_ett = -1; static gint diameter_3gpp_msisdn_ett = -1; static gint diameter_3gpp_feature_list_ett = -1; -static gint diameter_3gpp_tmgi_ett = -1; +static gint diameter_3gpp_tmgi_ett = -1; static gint diameter_3gpp_ulr_flags_ett = -1; static gint diameter_3gpp_ula_flags_ett = -1; static gint diameter_3gpp_dsr_flags_ett = -1; @@ -132,13 +132,13 @@ static dissector_handle_t xml_handle; static int dissect_diameter_3gpp_ipv6addr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - int offset = 0; + int offset = 0; - proto_tree_add_item(tree, hf_diameter_3gpp_ipv6addr, tvb, offset, 16, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_diameter_3gpp_ipv6addr, tvb, offset, 16, ENC_BIG_ENDIAN); - offset += 16; + offset += 16; - return offset; + return offset; } @@ -152,19 +152,19 @@ dissect_diameter_3gpp_ipv6addr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static int dissect_diameter_3gpp_visited_nw_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - int offset = 0, i; - int length = tvb_length(tvb); + proto_item* item; + int offset = 0, i; + int length = tvb_length(tvb); - for(i = 0; i < length; i++) - if(!g_ascii_isprint(tvb_get_guint8(tvb, i))) - return length; + for(i = 0; i < length; i++) + if(!g_ascii_isprint(tvb_get_guint8(tvb, i))) + return length; - item = proto_tree_add_item(tree, hf_diameter_3gpp_visited_nw_id, tvb, offset, length, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + item = proto_tree_add_item(tree, hf_diameter_3gpp_visited_nw_id, tvb, offset, length, ENC_ASCII|ENC_NA); + PROTO_ITEM_SET_GENERATED(item); - return length; + return length; } /* AVP Code: 630 Feature-List * imscxdx.xml @@ -174,13 +174,13 @@ dissect_diameter_3gpp_visited_nw_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto static int dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; guint32 bit_offset; - item = proto_tree_add_item(tree, hf_diameter_3gpp_feature_list_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_feature_list_ett); + item = proto_tree_add_item(tree, hf_diameter_3gpp_feature_list_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_feature_list_ett); bit_offset = 0; proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 29, ENC_BIG_ENDIAN); @@ -193,7 +193,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ bit_offset++; offset = bit_offset>>3; - return offset; + return offset; } @@ -207,26 +207,26 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ static int dissect_diameter_3gpp_path(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0, comma_offset; - int end_offset = tvb_length(tvb) - 1; + proto_item* item; + proto_tree *sub_tree; + int offset = 0, comma_offset; + int end_offset = tvb_length(tvb) - 1; - item = proto_tree_add_text(tree, tvb, offset, -1,"Paths"); - sub_tree = proto_item_add_subtree(item,diameter_3gpp_path_ett); + item = proto_tree_add_text(tree, tvb, offset, -1,"Paths"); + sub_tree = proto_item_add_subtree(item,diameter_3gpp_path_ett); - while (offset < end_offset){ - comma_offset = tvb_find_guint8(tvb, offset, -1, ','); - if(comma_offset == -1){ - proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA); - return end_offset; - } - proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA); - offset = comma_offset+1; - } + while (offset < end_offset){ + comma_offset = tvb_find_guint8(tvb, offset, -1, ','); + if(comma_offset == -1){ + proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA); + return end_offset; + } + proto_tree_add_item(sub_tree, hf_diameter_3gpp_path, tvb, offset, comma_offset, ENC_ASCII|ENC_NA); + offset = comma_offset+1; + } - return tvb_length(tvb); + return tvb_length(tvb); } /* AVP Code: 641 Contact @@ -239,63 +239,63 @@ dissect_diameter_3gpp_path(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr static int dissect_diameter_3gpp_contact(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - int offset = 0; + proto_item* item; + int offset = 0; - item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + item = proto_tree_add_item(tree, hf_diameter_3gpp_contact, tvb, offset, -1, ENC_ASCII|ENC_NA); + PROTO_ITEM_SET_GENERATED(item); - return tvb_length(tvb); + return tvb_length(tvb); } /* AVP Code: 701 MSISDN */ static int dissect_diameter_3gpp_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - const char *digit_str; - int length = tvb_length(tvb); + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + const char *digit_str; + int length = tvb_length(tvb); - item = proto_tree_add_item(tree, hf_diameter_3gpp_msisdn, tvb, offset, length, ENC_NA); - sub_tree = proto_item_add_subtree(item,diameter_3gpp_msisdn_ett); + item = proto_tree_add_item(tree, hf_diameter_3gpp_msisdn, tvb, offset, length, ENC_NA); + sub_tree = proto_item_add_subtree(item,diameter_3gpp_msisdn_ett); - dissect_e164_cc(tvb, sub_tree, offset, TRUE); + dissect_e164_cc(tvb, sub_tree, offset, TRUE); - digit_str = unpack_digits(tvb, 1); - proto_tree_add_string(sub_tree, hf_diameter_address_digits, tvb, 1, -1, digit_str); + digit_str = unpack_digits(tvb, 1); + proto_tree_add_string(sub_tree, hf_diameter_address_digits, tvb, 1, -1, digit_str); - return tvb_length(tvb); + return tvb_length(tvb); } -/* AVP Code: 702 User-Data +/* AVP Code: 702 User-Data * TGPPSh.xml * The AVP codes from 709 to799 are reserved for TS 29.329 */ -/* AVP Code: 606 User-Data +/* AVP Code: 606 User-Data * imscxdx.xml * IMS Cx Dx AVPS 3GPP TS 29.229 */ static int dissect_diameter_3gpp_user_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - guint8 word[6]; - int length = tvb_length(tvb); + guint8 word[6]; + int length = tvb_length(tvb); - /* If there is less than 38 characters this is not XML - * <?xml version="1.0" encoding="UTF-8"?> - */ - if(length < 38) - return length; + /* If there is less than 38 characters this is not XML + * <?xml version="1.0" encoding="UTF-8"?> + */ + if(length < 38) + return length; - tvb_get_nstringz0(tvb, 0, sizeof(word),word); - if (g_ascii_strncasecmp(word, "<?xml", 5) == 0){ - call_dissector(xml_handle, tvb, pinfo, tree); - } + tvb_get_nstringz0(tvb, 0, sizeof(word),word); + if (g_ascii_strncasecmp(word, "<?xml", 5) == 0){ + call_dissector(xml_handle, tvb, pinfo, tree); + } - return length; + return length; } @@ -305,41 +305,41 @@ dissect_diameter_3gpp_user_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_service_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - int offset = 0, i; - int length = tvb_length(tvb); + proto_item* item; + int offset = 0, i; + int length = tvb_length(tvb); - for(i = 0; i < length; i++) - if(!g_ascii_isprint(tvb_get_guint8(tvb, i))) - return length; + for(i = 0; i < length; i++) + if(!g_ascii_isprint(tvb_get_guint8(tvb, i))) + return length; - item = proto_tree_add_item(tree, hf_diameter_3gpp_service_ind, tvb, offset, length, ENC_ASCII|ENC_NA); - PROTO_ITEM_SET_GENERATED(item); + item = proto_tree_add_item(tree, hf_diameter_3gpp_service_ind, tvb, offset, length, ENC_ASCII|ENC_NA); + PROTO_ITEM_SET_GENERATED(item); - return length; + return length; } /* AVP Code: 900 TMGI */ static int dissect_diameter_3gpp_tmgi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; - item = proto_tree_add_item(tree, hf_diameter_3gpp_tmgi, tvb, offset, 6, ENC_NA); - sub_tree = proto_item_add_subtree(item,diameter_3gpp_tmgi_ett); + item = proto_tree_add_item(tree, hf_diameter_3gpp_tmgi, tvb, offset, 6, ENC_NA); + sub_tree = proto_item_add_subtree(item,diameter_3gpp_tmgi_ett); - /* MBMS Service ID consisting of three octets. MBMS Service ID consists of a 6-digit - * fixed-length hexadecimal number between 000000 and FFFFFF. - * MBMS Service ID uniquely identifies an MBMS bearer service within a PLMN. - */ + /* MBMS Service ID consisting of three octets. MBMS Service ID consists of a 6-digit + * fixed-length hexadecimal number between 000000 and FFFFFF. + * MBMS Service ID uniquely identifies an MBMS bearer service within a PLMN. + */ - proto_tree_add_item(sub_tree, hf_diameter_mbms_service_id, tvb, offset, 3, ENC_BIG_ENDIAN); - offset = offset+3; - offset = dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, offset, TRUE); + proto_tree_add_item(sub_tree, hf_diameter_mbms_service_id, tvb, offset, 3, ENC_BIG_ENDIAN); + offset = offset+3; + offset = dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, offset, TRUE); - return offset; + return offset; } @@ -349,12 +349,12 @@ dissect_diameter_3gpp_tmgi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr static int dissect_diameter_3gpp_ipaddr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - int offset = 0; + int offset = 0; - proto_tree_add_item(tree, hf_diameter_3gpp_ipaddr, tvb, offset, 4, ENC_BIG_ENDIAN); - offset += 4; + proto_tree_add_item(tree, hf_diameter_3gpp_ipaddr, tvb, offset, 4, ENC_BIG_ENDIAN); + offset += 4; - return offset; + return offset; } @@ -362,24 +362,24 @@ dissect_diameter_3gpp_ipaddr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * static int dissect_diameter_3gpp_mbms_required_qos(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - int offset = 0; - guint length; - - /* Octet - * 1 Allocation/Retention Priority as specified in 3GPP TS 23.107. - * This octet encodes each priority level defined in 3GPP TS 23.107 - * as the binary value of the priority level. It specifies the relative - * importance of the actual MBMS bearer service compared to other MBMS - * and non-MBMS bearer services for allocation and retention of the - * MBMS bearer service. - * 2-N QoS Profile as specified by the Quality-of-Service information element, - * from octet 3 onwards, in 3GPP TS 24.008 - */ - proto_tree_add_item(tree, hf_diameter_3gpp_mbms_required_qos_prio, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; - length = tvb_length(tvb) - 1; - de_sm_qos(tvb, tree, pinfo, offset,length, NULL, 0); - return offset+length; + int offset = 0; + guint length; + + /* Octet + * 1 Allocation/Retention Priority as specified in 3GPP TS 23.107. + * This octet encodes each priority level defined in 3GPP TS 23.107 + * as the binary value of the priority level. It specifies the relative + * importance of the actual MBMS bearer service compared to other MBMS + * and non-MBMS bearer services for allocation and retention of the + * MBMS bearer service. + * 2-N QoS Profile as specified by the Quality-of-Service information element, + * from octet 3 onwards, in 3GPP TS 24.008 + */ + proto_tree_add_item(tree, hf_diameter_3gpp_mbms_required_qos_prio, tvb, offset, 1, ENC_BIG_ENDIAN); + offset++; + length = tvb_length(tvb) - 1; + de_sm_qos(tvb, tree, pinfo, offset,length, NULL, 0); + return offset+length; } @@ -388,13 +388,13 @@ dissect_diameter_3gpp_mbms_required_qos(tvbuff_t *tvb, packet_info *pinfo, proto static int dissect_diameter_3gpp_udp_port(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - int offset = 0; + int offset = 0; - proto_tree_add_item(tree, hf_diameter_3gpp_udp_port, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_diameter_3gpp_udp_port, tvb, offset, 1, ENC_BIG_ENDIAN); - offset += 1; + offset += 1; - return offset; + return offset; } /* AVP Code: 929 MBMS-Data-Transfer-Start */ @@ -402,47 +402,47 @@ dissect_diameter_3gpp_udp_port(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static int dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - int offset = 0; - const gchar *time_str; + int offset = 0; + const gchar *time_str; - time_str = tvb_ntp_fmt_ts(tvb, offset); - proto_tree_add_string(tree, hf_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, tvb, offset, 8, time_str); - offset+=8; + time_str = tvb_ntp_fmt_ts(tvb, offset); + proto_tree_add_string(tree, hf_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, tvb, offset, 8, time_str); + offset+=8; - return offset; + return offset; } /* AVP Code: 1405 ULR-Flags */ static int dissect_diameter_3gpp_ulr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; - - item = proto_tree_add_item(tree, hf_diameter_3gpp_ulr_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_ulr_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 25, ENC_BIG_ENDIAN); - bit_offset+=25; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit6, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit5, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - - offset = bit_offset>>3; - return offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; + + item = proto_tree_add_item(tree, hf_diameter_3gpp_ulr_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_ulr_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 25, ENC_BIG_ENDIAN); + bit_offset+=25; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit6, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit5, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ulr_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + + offset = bit_offset>>3; + return offset; } @@ -450,21 +450,21 @@ dissect_diameter_3gpp_ulr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_ula_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; - item = proto_tree_add_item(tree, hf_diameter_3gpp_ula_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_ula_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 31, ENC_BIG_ENDIAN); - bit_offset+=31; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ula_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; + item = proto_tree_add_item(tree, hf_diameter_3gpp_ula_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_ula_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 31, ENC_BIG_ENDIAN); + bit_offset+=31; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ula_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; - offset = bit_offset>>3; - return offset; + offset = bit_offset>>3; + return offset; } @@ -472,51 +472,51 @@ dissect_diameter_3gpp_ula_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_dsr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; - - item = proto_tree_add_item(tree, hf_diameter_3gpp_dsr_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_dsr_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 16, ENC_BIG_ENDIAN); - bit_offset+=16; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit14, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit14, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit13, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit12, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit11, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit10, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit9, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit8, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit7, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit6, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit5, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - - offset = bit_offset>>3; - return offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; + + item = proto_tree_add_item(tree, hf_diameter_3gpp_dsr_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_dsr_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 16, ENC_BIG_ENDIAN); + bit_offset+=16; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit14, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit14, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit13, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit12, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit11, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit10, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit9, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit8, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit7, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit6, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit5, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsr_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + + offset = bit_offset>>3; + return offset; } @@ -524,21 +524,21 @@ dissect_diameter_3gpp_dsr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_dsa_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; - item = proto_tree_add_item(tree, hf_diameter_3gpp_dsa_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_dsa_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 31, ENC_BIG_ENDIAN); - bit_offset+=31; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsa_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; + item = proto_tree_add_item(tree, hf_diameter_3gpp_dsa_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_dsa_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 31, ENC_BIG_ENDIAN); + bit_offset+=31; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_dsa_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; - offset = bit_offset>>3; - return offset; + offset = bit_offset>>3; + return offset; } @@ -546,21 +546,21 @@ dissect_diameter_3gpp_dsa_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_ida_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; - item = proto_tree_add_item(tree, hf_diameter_3gpp_ida_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_ida_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 31, ENC_BIG_ENDIAN); - bit_offset+=31; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ida_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; + item = proto_tree_add_item(tree, hf_diameter_3gpp_ida_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_ida_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 31, ENC_BIG_ENDIAN); + bit_offset+=31; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_ida_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; - offset = bit_offset>>3; - return offset; + offset = bit_offset>>3; + return offset; } @@ -568,23 +568,23 @@ dissect_diameter_3gpp_ida_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_pua_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; - item = proto_tree_add_item(tree, hf_diameter_3gpp_pua_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_pua_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 30, ENC_BIG_ENDIAN); - bit_offset+=30; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_pua_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_pua_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; + item = proto_tree_add_item(tree, hf_diameter_3gpp_pua_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_pua_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 30, ENC_BIG_ENDIAN); + bit_offset+=30; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_pua_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_pua_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; - offset = bit_offset>>3; - return offset; + offset = bit_offset>>3; + return offset; } @@ -593,33 +593,33 @@ dissect_diameter_3gpp_pua_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_nor_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; - - item = proto_tree_add_item(tree, hf_diameter_3gpp_nor_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_nor_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 25, ENC_BIG_ENDIAN); - bit_offset+=25; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit6, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit5, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - - offset = bit_offset>>3; - return offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; + + item = proto_tree_add_item(tree, hf_diameter_3gpp_nor_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_nor_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 25, ENC_BIG_ENDIAN); + bit_offset+=25; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit6, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit5, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_nor_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + + offset = bit_offset>>3; + return offset; } @@ -627,29 +627,29 @@ dissect_diameter_3gpp_nor_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_idr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - proto_item* item; - proto_tree *sub_tree; - int offset = 0; - guint32 bit_offset; - - item = proto_tree_add_item(tree, hf_diameter_3gpp_idr_flags, tvb, offset, 4, ENC_BIG_ENDIAN); - sub_tree = proto_item_add_subtree(item, diameter_3gpp_idr_flags_ett); - bit_offset = 0; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 27, ENC_BIG_ENDIAN); - bit_offset+=27; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); - bit_offset++; - - offset = bit_offset>>3; - return offset; + proto_item* item; + proto_tree *sub_tree; + int offset = 0; + guint32 bit_offset; + + item = proto_tree_add_item(tree, hf_diameter_3gpp_idr_flags, tvb, offset, 4, ENC_BIG_ENDIAN); + sub_tree = proto_item_add_subtree(item, diameter_3gpp_idr_flags_ett); + bit_offset = 0; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_spare_bits, tvb, bit_offset, 27, ENC_BIG_ENDIAN); + bit_offset+=27; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit4, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit3, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit2, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit1, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + proto_tree_add_bits_item(sub_tree, hf_diameter_3gpp_idr_flags_bit0, tvb, bit_offset, 1, ENC_BIG_ENDIAN); + bit_offset++; + + offset = bit_offset>>3; + return offset; } @@ -657,94 +657,94 @@ void proto_reg_handoff_diameter_3gpp(void) { - /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */ - /* Registered by packet-gtp.c */ + /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */ + /* Registered by packet-gtp.c */ - /* AVP Code: 15 3GPP-SGSN-IPv6-Address */ - dissector_add_uint("diameter.3gpp", 15, new_create_dissector_handle(dissect_diameter_3gpp_ipv6addr, proto_diameter_3gpp)); + /* AVP Code: 15 3GPP-SGSN-IPv6-Address */ + dissector_add_uint("diameter.3gpp", 15, new_create_dissector_handle(dissect_diameter_3gpp_ipv6addr, proto_diameter_3gpp)); - /* AVP Code: 22 3GPP-User-Location-Info - * Registered by packet-gtpv2.c - */ + /* AVP Code: 22 3GPP-User-Location-Info + * Registered by packet-gtpv2.c + */ - /* AVP Code: 600 Visited-Network-Identifier */ - dissector_add_uint("diameter.3gpp", 600, new_create_dissector_handle(dissect_diameter_3gpp_visited_nw_id, proto_diameter_3gpp)); + /* AVP Code: 600 Visited-Network-Identifier */ + dissector_add_uint("diameter.3gpp", 600, new_create_dissector_handle(dissect_diameter_3gpp_visited_nw_id, proto_diameter_3gpp)); - /* AVP Code: 606 User-Data */ - dissector_add_uint("diameter.3gpp", 606, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); + /* AVP Code: 606 User-Data */ + dissector_add_uint("diameter.3gpp", 606, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); - /* AVP Code: 630 Feature-List */ - dissector_add_uint("diameter.3gpp", 630, new_create_dissector_handle(dissect_diameter_3gpp_feature_list, proto_diameter_3gpp)); + /* AVP Code: 630 Feature-List */ + dissector_add_uint("diameter.3gpp", 630, new_create_dissector_handle(dissect_diameter_3gpp_feature_list, proto_diameter_3gpp)); - /* AVP Code: 640 Path */ - dissector_add_uint("diameter.3gpp", 640, new_create_dissector_handle(dissect_diameter_3gpp_path, proto_diameter_3gpp)); + /* AVP Code: 640 Path */ + dissector_add_uint("diameter.3gpp", 640, new_create_dissector_handle(dissect_diameter_3gpp_path, proto_diameter_3gpp)); - /* AVP Code: 641 Contact */ - dissector_add_uint("diameter.3gpp", 641, new_create_dissector_handle(dissect_diameter_3gpp_contact, proto_diameter_3gpp)); + /* AVP Code: 641 Contact */ + dissector_add_uint("diameter.3gpp", 641, new_create_dissector_handle(dissect_diameter_3gpp_contact, proto_diameter_3gpp)); - /* AVP Code: 701 MSISDN */ - dissector_add_uint("diameter.3gpp", 701, new_create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp)); + /* AVP Code: 701 MSISDN */ + dissector_add_uint("diameter.3gpp", 701, new_create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp)); - /* AVP Code: 702 User-Data */ - dissector_add_uint("diameter.3gpp", 702, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); + /* AVP Code: 702 User-Data */ + dissector_add_uint("diameter.3gpp", 702, new_create_dissector_handle(dissect_diameter_3gpp_user_data, proto_diameter_3gpp)); - /* AVP Code: 704 Service-Indication */ - dissector_add_uint("diameter.3gpp", 704, new_create_dissector_handle(dissect_diameter_3gpp_service_ind, proto_diameter_3gpp)); + /* AVP Code: 704 Service-Indication */ + dissector_add_uint("diameter.3gpp", 704, new_create_dissector_handle(dissect_diameter_3gpp_service_ind, proto_diameter_3gpp)); - /* AVP Code: 900 TMGI */ - dissector_add_uint("diameter.3gpp", 900, new_create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp)); + /* AVP Code: 900 TMGI */ + dissector_add_uint("diameter.3gpp", 900, new_create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp)); - /* AVP Code: 904 MBMS-Session-Duration Registered by packet-gtp.c */ - /* AVP Code: 903 MBMS-Service-Area Registered by packet-gtp.c */ + /* AVP Code: 904 MBMS-Session-Duration Registered by packet-gtp.c */ + /* AVP Code: 903 MBMS-Service-Area Registered by packet-gtp.c */ - /* AVP Code: 911 MBMS-Time-To-Data-Transfer Registered by packet-gtp.c */ - /* Registered by packet-gtp.c */ + /* AVP Code: 911 MBMS-Time-To-Data-Transfer Registered by packet-gtp.c */ + /* Registered by packet-gtp.c */ - /* AVP Code: 913 MBMS-Required-QoS */ - dissector_add_uint("diameter.3gpp", 913, new_create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp)); + /* AVP Code: 913 MBMS-Required-QoS */ + dissector_add_uint("diameter.3gpp", 913, new_create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp)); - /* AVP Code: 917 MBMS-GGSN-IPv6-Address */ - dissector_add_uint("diameter.3gpp", 917, new_create_dissector_handle(dissect_diameter_3gpp_ipv6addr, proto_diameter_3gpp)); + /* AVP Code: 917 MBMS-GGSN-IPv6-Address */ + dissector_add_uint("diameter.3gpp", 917, new_create_dissector_handle(dissect_diameter_3gpp_ipv6addr, proto_diameter_3gpp)); - /* AVP Code: 918 MBMS-BMSC-SSM-IP-Address */ - dissector_add_uint("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp)); + /* AVP Code: 918 MBMS-BMSC-SSM-IP-Address */ + dissector_add_uint("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp)); - /* AVP Code: 926 MBMS-BMSC-SSM-UDP-Port */ - /* AVP Code: 927 MBMS-GW-UDP-Port */ - dissector_add_uint("diameter.3gpp", 926, new_create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); - dissector_add_uint("diameter.3gpp", 927, new_create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); + /* AVP Code: 926 MBMS-BMSC-SSM-UDP-Port */ + /* AVP Code: 927 MBMS-GW-UDP-Port */ + dissector_add_uint("diameter.3gpp", 926, new_create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); + dissector_add_uint("diameter.3gpp", 927, new_create_dissector_handle(dissect_diameter_3gpp_udp_port, proto_diameter_3gpp)); - /* AVP Code: 929 MBMS-Data-Transfer-Start */ - dissector_add_uint("diameter.3gpp", 929, new_create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); + /* AVP Code: 929 MBMS-Data-Transfer-Start */ + dissector_add_uint("diameter.3gpp", 929, new_create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); - /* AVP Code: 930 MBMS-Data-Transfer-Stop */ - dissector_add_uint("diameter.3gpp", 930, new_create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); + /* AVP Code: 930 MBMS-Data-Transfer-Stop */ + dissector_add_uint("diameter.3gpp", 930, new_create_dissector_handle(dissect_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, proto_diameter_3gpp)); - /* AVP Code: 1405 ULR-Flags */ - dissector_add_uint("diameter.3gpp", 1405, new_create_dissector_handle(dissect_diameter_3gpp_ulr_flags, proto_diameter_3gpp)); + /* AVP Code: 1405 ULR-Flags */ + dissector_add_uint("diameter.3gpp", 1405, new_create_dissector_handle(dissect_diameter_3gpp_ulr_flags, proto_diameter_3gpp)); - /* AVP Code: 1406 ULA-Flags */ - dissector_add_uint("diameter.3gpp", 1406, new_create_dissector_handle(dissect_diameter_3gpp_ula_flags, proto_diameter_3gpp)); + /* AVP Code: 1406 ULA-Flags */ + dissector_add_uint("diameter.3gpp", 1406, new_create_dissector_handle(dissect_diameter_3gpp_ula_flags, proto_diameter_3gpp)); - /* AVP Code: 1421 DSR-Flags */ - dissector_add_uint("diameter.3gpp", 1421, new_create_dissector_handle(dissect_diameter_3gpp_dsr_flags, proto_diameter_3gpp)); + /* AVP Code: 1421 DSR-Flags */ + dissector_add_uint("diameter.3gpp", 1421, new_create_dissector_handle(dissect_diameter_3gpp_dsr_flags, proto_diameter_3gpp)); - /* AVP Code: 1422 DSA-Flags */ - dissector_add_uint("diameter.3gpp", 1422, new_create_dissector_handle(dissect_diameter_3gpp_dsa_flags, proto_diameter_3gpp)); + /* AVP Code: 1422 DSA-Flags */ + dissector_add_uint("diameter.3gpp", 1422, new_create_dissector_handle(dissect_diameter_3gpp_dsa_flags, proto_diameter_3gpp)); - /* AVP Code: 1441 IDA-Flags */ - dissector_add_uint("diameter.3gpp", 1441, new_create_dissector_handle(dissect_diameter_3gpp_ida_flags, proto_diameter_3gpp)); + /* AVP Code: 1441 IDA-Flags */ + dissector_add_uint("diameter.3gpp", 1441, new_create_dissector_handle(dissect_diameter_3gpp_ida_flags, proto_diameter_3gpp)); - /* AVP Code: 1442 PUA-Flags */ - dissector_add_uint("diameter.3gpp", 1442, new_create_dissector_handle(dissect_diameter_3gpp_pua_flags, proto_diameter_3gpp)); + /* AVP Code: 1442 PUA-Flags */ + dissector_add_uint("diameter.3gpp", 1442, new_create_dissector_handle(dissect_diameter_3gpp_pua_flags, proto_diameter_3gpp)); - /* AVP Code: 1443 NOR-Flags */ - dissector_add_uint("diameter.3gpp", 1443, new_create_dissector_handle(dissect_diameter_3gpp_nor_flags, proto_diameter_3gpp)); + /* AVP Code: 1443 NOR-Flags */ + dissector_add_uint("diameter.3gpp", 1443, new_create_dissector_handle(dissect_diameter_3gpp_nor_flags, proto_diameter_3gpp)); - /* AVP Code: 1490 IDR-Flags */ - dissector_add_uint("diameter.3gpp", 1490, new_create_dissector_handle(dissect_diameter_3gpp_idr_flags, proto_diameter_3gpp)); + /* AVP Code: 1490 IDR-Flags */ + dissector_add_uint("diameter.3gpp", 1490, new_create_dissector_handle(dissect_diameter_3gpp_idr_flags, proto_diameter_3gpp)); - xml_handle = find_dissector("xml"); + xml_handle = find_dissector("xml"); } void @@ -752,362 +752,366 @@ proto_register_diameter_3gpp(void) { /* Setup list of header fields See Section 1.6.1 for details*/ - static hf_register_info hf[] = { - { &hf_diameter_3gpp_path, - { "Path", "diameter.3gpp.path", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_contact, - { "Contact", "diameter.3gpp.contact", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_visited_nw_id, - { "Visited-Network-Identifier", "diameter.3gpp.visited_nw_id", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_msisdn, - { "MSISDN", "diameter.3gpp.msisdn", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_user_data, - { "User data", "diameter.3gpp.user_data", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ipaddr, - { "IPv4 Address", "diameter.3gpp.ipaddr", - FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_mbms_required_qos_prio, - { "Allocation/Retention Priority", "diameter.3gpp.mbms_required_qos_prio", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_tmgi, - { "TMGI", "diameter.3gpp.tmgi", - FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_service_ind, - { "Service-Indication", "diameter.3gpp.service_ind", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_mbms_service_id, - { "MBMS Service ID", "diameter.3gpp.mbms_service_id", - FT_UINT24, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_address_digits, - { "Address digits", "diameter.3gpp.address_digits", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_spare_bits, - { "Spare bit(s)", "diameter.3gpp.spare_bits", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_feature_list_flags, - { "Feature-List Flags", "diameter.3gpp.feature_list_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_feature_list_flags_bit0, - { "Shared IFC Sets", "diameter.3gpp.feature_list_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_feature_list_flags_bit1, - { "Alias Indication", "diameter.3gpp.feature_list_flags_bit1", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_feature_list_flags_bit2, - { "IMS Restoration Indication", "diameter.3gpp.feature_list_flags_bit2", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags, - { "ULR Flags", "diameter.3gpp.ulr_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit0, - { "Single-Registration-Indication", "diameter.3gpp.ulr_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit1, - { "S6a/S6d-Indicator", "diameter.3gpp.ulr_flags_bit1", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit2, - { "Skip-Subscriber-Data", "diameter.3gpp.ulr_flags_bit2", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit3, - { "GPRS-Subscription-Data-Indicator", "diameter.3gpp.ulr_flags_bit3", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit4, - { "Node-Type-Indicator", "diameter.3gpp.ulr_flags_bit4", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit5, - { "Initial-Attach-Indicator", "diameter.3gpp.ulr_flags_bit5", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ulr_flags_bit6, - { "PS-LCS-Not-Supported-By-UE", "diameter.3gpp.ulr_flags_bit6", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ula_flags, - { "ULA Flags", "diameter.3gpp.ula_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ula_flags_bit0, - { "Separation Indication", "diameter.3gpp.ula_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags, - { "DSR Flags", "diameter.3gpp.dsr_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit0, - { "Regional Subscription Withdrawal", "diameter.3gpp.dsr_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit1, - { "Complete APN Configuration Profile Withdrawal", "diameter.3gpp.dsr_flags_bit1", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit2, - { "Subscribed Charging Characteristics Withdrawal", "diameter.3gpp.dsr_flags_bit2", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit3, - { "PDN subscription contexts Withdrawal", "diameter.3gpp.dsr_flags_bit3", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit4, - { "STN-SR", "diameter.3gpp.dsr_flags_bit4", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit5, - { "Complete PDP context list Withdrawal", "diameter.3gpp.dsr_flags_bit5", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit6, - { "PDP contexts Withdrawal", "diameter.3gpp.dsr_flags_bit6", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit7, - { "Roaming Restricted due to unsupported feature", "diameter.3gpp.dsr_flags_bit7", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit8, - { "Trace Data Withdrawal", "diameter.3gpp.dsr_flags_bit8", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit9, - { "CSG Deleted", "diameter.3gpp.dsr_flags_bit9", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit10, - { "APN-OI-Replacement", "diameter.3gpp.dsr_flags_bit10", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit11, - { "GMLC List Withdrawal", "diameter.3gpp.dsr_flags_bit11", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit12, - { "LCS Withdrawal", "diameter.3gpp.dsr_flags_bit12", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit13, - { "SMS Withdrawal", "diameter.3gpp.dsr_flags_bit13", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit14, - { "Subscribed VSRVCC Withdrawal", "diameter.3gpp.dsr_flags_bit14", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsr_flags_bit15, - { "Subscribed periodic RAU-TAU Timer Withdrawal", "diameter.3gpp.dsr_flags_bit15", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsa_flags, - { "DSA Flags", "diameter.3gpp.dsa_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_dsa_flags_bit0, - { "Network Node area restricted", "diameter.3gpp.dsa_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ida_flags, - { "IDA Flags", "diameter.3gpp.ida_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ida_flags_bit0, - { "Network Node area restricted", "diameter.3gpp.ida_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_pua_flags, - { "PUA Flags", "diameter.3gpp.pua_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_pua_flags_bit0, - { "Freeze M-TMSI", "diameter.3gpp.pua_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_pua_flags_bit1, - { "Freeze P-TMSI", "diameter.3gpp.pua_flags_bit1", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags, - { "NOR Flags", "diameter.3gpp.nor_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit0, - { "Single-Registration-Indication", "diameter.3gpp.nor_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit1, - { "SGSN area restricted", "diameter.3gpp.nor_flags_bit1", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit2, - { "Ready for SM", "diameter.3gpp.nor_flags_bit2", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit3, - { "UE Reachable", "diameter.3gpp.nor_flags_bit3", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit4, - { "Delete all APN and PDN GW identity pairs", "diameter.3gpp.nor_flags_bit4", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit5, - { "UE Reachable from SGSN", "diameter.3gpp.nor_flags_bit5", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_nor_flags_bit6, - { "Ready for SM from MME", "diameter.3gpp.nor_flags_bit6", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_idr_flags, - { "IDR Flags", "diameter.3gpp.idr_flags", - FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_idr_flags_bit0, - { "UE Reachability Request", "diameter.3gpp.idr_flags_bit0", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_idr_flags_bit1, - { "T-ADS Data Request", "diameter.3gpp.idr_flags_bit1", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_idr_flags_bit2, - { "EPS User State Request", "diameter.3gpp.idr_flags_bit2", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_idr_flags_bit3, - { "EPS Location Information Request", "diameter.3gpp.idr_flags_bit3", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_idr_flags_bit4, - { "Current Location Request", "diameter.3gpp.idr_flags_bit4", - FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_ipv6addr, - { "IPv6 Address", "diameter.3gpp.ipv6addr", - FT_IPv6, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, - { "Absolute Time of MBMS Data Transfer", "diameter.3gpp.mbms_abs_time_ofmbms_data_tfer", - FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL } - }, - { &hf_diameter_3gpp_udp_port , - { "UDP Port", "diameter.3gpp.udp_port", - FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, HFILL } - }, - }; - - /* Setup protocol subtree array */ - static gint *ett[] = { - &diameter_3gpp_path_ett, - &diameter_3gpp_msisdn_ett, - &diameter_3gpp_feature_list_ett, - &diameter_3gpp_tmgi_ett, - &diameter_3gpp_ulr_flags_ett, - &diameter_3gpp_ula_flags_ett, - &diameter_3gpp_dsr_flags_ett, - &diameter_3gpp_dsa_flags_ett, - &diameter_3gpp_ida_flags_ett, - &diameter_3gpp_pua_flags_ett, - &diameter_3gpp_nor_flags_ett, - &diameter_3gpp_idr_flags_ett, - }; - - /* Required function calls to register the header fields and subtrees used */ - proto_diameter_3gpp = proto_register_protocol("Diameter 3GPP","Diameter3GPP", "diameter.3gpp"); - proto_register_field_array(proto_diameter_3gpp, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); + static hf_register_info hf[] = { + { &hf_diameter_3gpp_path, + { "Path", "diameter.3gpp.path", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_contact, + { "Contact", "diameter.3gpp.contact", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_visited_nw_id, + { "Visited-Network-Identifier", "diameter.3gpp.visited_nw_id", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_msisdn, + { "MSISDN", "diameter.3gpp.msisdn", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_diameter_3gpp_user_data, + { "User data", "diameter.3gpp.user_data", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, +#endif + { &hf_diameter_3gpp_ipaddr, + { "IPv4 Address", "diameter.3gpp.ipaddr", + FT_IPv4, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_mbms_required_qos_prio, + { "Allocation/Retention Priority", "diameter.3gpp.mbms_required_qos_prio", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_tmgi, + { "TMGI", "diameter.3gpp.tmgi", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_service_ind, + { "Service-Indication", "diameter.3gpp.service_ind", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_mbms_service_id, + { "MBMS Service ID", "diameter.3gpp.mbms_service_id", + FT_UINT24, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_address_digits, + { "Address digits", "diameter.3gpp.address_digits", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_spare_bits, + { "Spare bit(s)", "diameter.3gpp.spare_bits", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_feature_list_flags, + { "Feature-List Flags", "diameter.3gpp.feature_list_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_feature_list_flags_bit0, + { "Shared IFC Sets", "diameter.3gpp.feature_list_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_feature_list_flags_bit1, + { "Alias Indication", "diameter.3gpp.feature_list_flags_bit1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_feature_list_flags_bit2, + { "IMS Restoration Indication", "diameter.3gpp.feature_list_flags_bit2", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags, + { "ULR Flags", "diameter.3gpp.ulr_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit0, + { "Single-Registration-Indication", "diameter.3gpp.ulr_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit1, + { "S6a/S6d-Indicator", "diameter.3gpp.ulr_flags_bit1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit2, + { "Skip-Subscriber-Data", "diameter.3gpp.ulr_flags_bit2", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit3, + { "GPRS-Subscription-Data-Indicator", "diameter.3gpp.ulr_flags_bit3", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit4, + { "Node-Type-Indicator", "diameter.3gpp.ulr_flags_bit4", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit5, + { "Initial-Attach-Indicator", "diameter.3gpp.ulr_flags_bit5", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ulr_flags_bit6, + { "PS-LCS-Not-Supported-By-UE", "diameter.3gpp.ulr_flags_bit6", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ula_flags, + { "ULA Flags", "diameter.3gpp.ula_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ula_flags_bit0, + { "Separation Indication", "diameter.3gpp.ula_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags, + { "DSR Flags", "diameter.3gpp.dsr_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit0, + { "Regional Subscription Withdrawal", "diameter.3gpp.dsr_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit1, + { "Complete APN Configuration Profile Withdrawal", "diameter.3gpp.dsr_flags_bit1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit2, + { "Subscribed Charging Characteristics Withdrawal", "diameter.3gpp.dsr_flags_bit2", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit3, + { "PDN subscription contexts Withdrawal", "diameter.3gpp.dsr_flags_bit3", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit4, + { "STN-SR", "diameter.3gpp.dsr_flags_bit4", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit5, + { "Complete PDP context list Withdrawal", "diameter.3gpp.dsr_flags_bit5", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit6, + { "PDP contexts Withdrawal", "diameter.3gpp.dsr_flags_bit6", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit7, + { "Roaming Restricted due to unsupported feature", "diameter.3gpp.dsr_flags_bit7", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit8, + { "Trace Data Withdrawal", "diameter.3gpp.dsr_flags_bit8", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit9, + { "CSG Deleted", "diameter.3gpp.dsr_flags_bit9", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit10, + { "APN-OI-Replacement", "diameter.3gpp.dsr_flags_bit10", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit11, + { "GMLC List Withdrawal", "diameter.3gpp.dsr_flags_bit11", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit12, + { "LCS Withdrawal", "diameter.3gpp.dsr_flags_bit12", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit13, + { "SMS Withdrawal", "diameter.3gpp.dsr_flags_bit13", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsr_flags_bit14, + { "Subscribed VSRVCC Withdrawal", "diameter.3gpp.dsr_flags_bit14", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, +#if 0 + { &hf_diameter_3gpp_dsr_flags_bit15, + { "Subscribed periodic RAU-TAU Timer Withdrawal", "diameter.3gpp.dsr_flags_bit15", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, +#endif + { &hf_diameter_3gpp_dsa_flags, + { "DSA Flags", "diameter.3gpp.dsa_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_dsa_flags_bit0, + { "Network Node area restricted", "diameter.3gpp.dsa_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ida_flags, + { "IDA Flags", "diameter.3gpp.ida_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ida_flags_bit0, + { "Network Node area restricted", "diameter.3gpp.ida_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_pua_flags, + { "PUA Flags", "diameter.3gpp.pua_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_pua_flags_bit0, + { "Freeze M-TMSI", "diameter.3gpp.pua_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_pua_flags_bit1, + { "Freeze P-TMSI", "diameter.3gpp.pua_flags_bit1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags, + { "NOR Flags", "diameter.3gpp.nor_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit0, + { "Single-Registration-Indication", "diameter.3gpp.nor_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit1, + { "SGSN area restricted", "diameter.3gpp.nor_flags_bit1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit2, + { "Ready for SM", "diameter.3gpp.nor_flags_bit2", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit3, + { "UE Reachable", "diameter.3gpp.nor_flags_bit3", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit4, + { "Delete all APN and PDN GW identity pairs", "diameter.3gpp.nor_flags_bit4", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit5, + { "UE Reachable from SGSN", "diameter.3gpp.nor_flags_bit5", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_nor_flags_bit6, + { "Ready for SM from MME", "diameter.3gpp.nor_flags_bit6", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_idr_flags, + { "IDR Flags", "diameter.3gpp.idr_flags", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_idr_flags_bit0, + { "UE Reachability Request", "diameter.3gpp.idr_flags_bit0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_idr_flags_bit1, + { "T-ADS Data Request", "diameter.3gpp.idr_flags_bit1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_idr_flags_bit2, + { "EPS User State Request", "diameter.3gpp.idr_flags_bit2", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_idr_flags_bit3, + { "EPS Location Information Request", "diameter.3gpp.idr_flags_bit3", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_idr_flags_bit4, + { "Current Location Request", "diameter.3gpp.idr_flags_bit4", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_set_notset), 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_ipv6addr, + { "IPv6 Address", "diameter.3gpp.ipv6addr", + FT_IPv6, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer, + { "Absolute Time of MBMS Data Transfer", "diameter.3gpp.mbms_abs_time_ofmbms_data_tfer", + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_diameter_3gpp_udp_port , + { "UDP Port", "diameter.3gpp.udp_port", + FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + }; + + /* Setup protocol subtree array */ + static gint *ett[] = { + &diameter_3gpp_path_ett, + &diameter_3gpp_msisdn_ett, + &diameter_3gpp_feature_list_ett, + &diameter_3gpp_tmgi_ett, + &diameter_3gpp_ulr_flags_ett, + &diameter_3gpp_ula_flags_ett, + &diameter_3gpp_dsr_flags_ett, + &diameter_3gpp_dsa_flags_ett, + &diameter_3gpp_ida_flags_ett, + &diameter_3gpp_pua_flags_ett, + &diameter_3gpp_nor_flags_ett, + &diameter_3gpp_idr_flags_ett, + }; + + /* Required function calls to register the header fields and subtrees used */ + proto_diameter_3gpp = proto_register_protocol("Diameter 3GPP","Diameter3GPP", "diameter.3gpp"); + proto_register_field_array(proto_diameter_3gpp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 4747d98317..22d59e04ab 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -127,8 +127,8 @@ static gint hf_dtls_handshake_cert_types_count = -1; static gint hf_dtls_handshake_cert_types = -1; static gint hf_dtls_handshake_cert_type = -1; static gint hf_dtls_handshake_finished = -1; -static gint hf_dtls_handshake_md5_hash = -1; -static gint hf_dtls_handshake_sha_hash = -1; +/* static gint hf_dtls_handshake_md5_hash = -1; */ +/* static gint hf_dtls_handshake_sha_hash = -1; */ static gint hf_dtls_handshake_session_id_len = -1; static gint hf_dtls_handshake_dnames_len = -1; static gint hf_dtls_handshake_dnames = -1; @@ -2540,6 +2540,7 @@ proto_register_dtls(void) FT_NONE, BASE_NONE, NULL, 0x0, "Opaque verification data", HFILL } }, +#if 0 { &hf_dtls_handshake_md5_hash, { "MD5 Hash", "dtls.handshake.md5_hash", FT_NONE, BASE_NONE, NULL, 0x0, @@ -2550,6 +2551,7 @@ proto_register_dtls(void) FT_NONE, BASE_NONE, NULL, 0x0, "Hash of messages, master_secret, etc.", HFILL } }, +#endif { &hf_dtls_handshake_session_id_len, { "Session ID Length", "dtls.handshake.session_id_length", FT_UINT8, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index d953830d3a..ea2488e5bb 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -117,9 +117,9 @@ static int hf_bundle_procflags_application_ack = -1; /* Additions for Version 5 */ static int hf_bundle_control_flags = -1; -static int hf_bundle_procflags_general = -1; -static int hf_bundle_procflags_cos = -1; -static int hf_bundle_procflags_status = -1; +/* static int hf_bundle_procflags_general = -1; */ +/* static int hf_bundle_procflags_cos = -1; */ +/* static int hf_bundle_procflags_status = -1; */ /* Primary Header COS Flag Variables */ static int hf_bundle_cosflags = -1; @@ -135,7 +135,7 @@ static int hf_bundle_srrflags_report_deletion = -1; static int hf_bundle_srrflags_report_ack = -1; /* Primary Header Length Fields*/ -static int hf_bundle_primary_header_len = -1; +/* static int hf_bundle_primary_header_len = -1; */ static int hf_bundle_dest_scheme_offset = -1; static int hf_bundle_dest_ssp_offset = -1; static int hf_bundle_source_scheme_offset = -1; @@ -195,6 +195,7 @@ static int hf_bundle_admin_forwarded = -1; static int hf_bundle_admin_delivered = -1; static int hf_bundle_admin_deleted = -1; static int hf_bundle_admin_acked = -1; +#if 0 static int hf_bundle_admin_receipt_time = -1; static int hf_bundle_admin_accept_time = -1; static int hf_bundle_admin_forward_time = -1; @@ -203,6 +204,7 @@ static int hf_bundle_admin_delete_time = -1; static int hf_bundle_admin_ack_time = -1; static int hf_bundle_admin_timestamp_copy = -1; static int hf_bundle_admin_signal_time = -1; +#endif static int hf_bundle_status_report_reason_code = -1; static int hf_bundle_custody_trf_succ_flg = -1; static int hf_bundle_custody_signal_reason = -1; @@ -2572,18 +2574,24 @@ proto_register_bundle(void) {"Bundle Processing Control Flags", "bundle.primary.proc.flag", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, +#if 0 {&hf_bundle_procflags_general, {"General Flags", "bundle.primary.proc.gen", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, +#endif +#if 0 {&hf_bundle_procflags_cos, {"Cloass of Service Flags", "bundle.primary.proc.cos", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, +#endif +#if 0 {&hf_bundle_procflags_status, {"Status Report Flags", "bundle.primary.proc.status", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, +#endif {&hf_bundle_cosflags, {"Primary Header COS Flags", "bundle.primary.cos.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} @@ -2620,10 +2628,12 @@ proto_register_bundle(void) {"Request Report of Application Ack", "bundle.primary.srr.ack", FT_BOOLEAN, 8, NULL, BUNDLE_SRRFLAGS_ACK_MASK, NULL, HFILL} }, +#if 0 {&hf_bundle_primary_header_len, {"Bundle Header Length", "bundle.primary.len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} }, +#endif {&hf_bundle_dest_scheme_offset, {"Destination Scheme Offset", "bundle.primary.destschemeoff", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} @@ -2744,6 +2754,7 @@ proto_register_bundle(void) {"Acknowledged by Application", "bundle.admin.status.ack", FT_BOOLEAN, 8, NULL, ADMIN_STATUS_FLAGS_ACKNOWLEDGED, NULL, HFILL} }, +#if 0 {&hf_bundle_admin_receipt_time, {"Time of Receipt", "bundle.admin.status.receipttime", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} @@ -2776,6 +2787,7 @@ proto_register_bundle(void) {"Time of Signal", "bundle.admin.signal.time", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} }, +#endif {&hf_block_control_flags, {"Block Processing Control Flags", "bundle.block.control.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c index d400f30fbb..c24dd73a23 100644 --- a/epan/dissectors/packet-dvb-ipdc.c +++ b/epan/dissectors/packet-dvb-ipdc.c @@ -33,7 +33,7 @@ /* Initialize the protocol and registered fields */ static int proto_ipdc = -1; -static int hf_ipdc_esg_bootstrap_xml = -1; +/* static int hf_ipdc_esg_bootstrap_xml = -1; */ /* Initialize the subtree pointers */ static gint ett_ipdc = -1; @@ -75,11 +75,13 @@ dissect_ipdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_dvb_ipdc(void) { +#if 0 static hf_register_info hf[] = { {&hf_ipdc_esg_bootstrap_xml, {"ESG Provider Discovery", "ipdc.bootstrap", FT_STRING, BASE_NONE, NULL, 0x0, "List of ESG Providers", HFILL}} }; +#endif static gint *ett[] = { &ett_ipdc, @@ -87,7 +89,9 @@ proto_register_dvb_ipdc(void) proto_ipdc = proto_register_protocol("ETSI IPDC Bootstrap", "ESG Bootstrap", "dvb_ipdc"); +#if 0 proto_register_field_array(proto_ipdc, hf, array_length(hf)); +#endif proto_register_subtree_array(ett, array_length(ett)); register_dissector("dvb_ipdc", dissect_ipdc, proto_ipdc); diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index aa03612157..d23f92a2bd 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -2258,7 +2258,7 @@ static value_string_ext mcc_mnc_codes_ext = VALUE_STRING_EXT_INIT(mcc_mnc_codes) static int proto_e212 = -1; static int hf_E212_mcc = -1; static int hf_E212_mnc = -1; -static int hf_E212_msin = -1; +/* static int hf_E212_msin = -1; */ /* * MCC/MNC dissection - little endian MNC encoding @@ -2516,10 +2516,12 @@ proto_register_e212(void) FT_UINT16, BASE_DEC, NULL, 0x0, "Mobile network code", HFILL } }, +#if 0 { &hf_E212_msin, { "Mobile Subscriber Identification Number (MSIN)", "e212.msin", FT_STRING, BASE_NONE, NULL, 0, "Mobile Subscriber Identification Number(MSIN)", HFILL }}, +#endif }; /* diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index c469592f11..4f16b6a6f1 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -50,7 +50,7 @@ static gint hf_ecp_pid = -1; static gint hf_ecp_subtype = -1; static gint hf_ecp_mode = -1; static gint hf_ecp_sequence = -1; -static gint hf_ecp_vdp_oui = -1; +/* static gint hf_ecp_vdp_oui = -1; */ static gint hf_ecp_vdp_mode = -1; static gint hf_ecp_vdp_response = -1; static gint hf_ecp_vdp_mgrid = -1; @@ -346,10 +346,12 @@ void proto_register_ecp_oui(void) { "sequence number", "ecp.seq", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, +#if 0 { &hf_ecp_vdp_oui, { "Organization Unique Code", "ecp.vdp.oui", FT_UINT24, BASE_HEX, VALS(tlv_oui_subtype_vals), 0x0, NULL, HFILL } }, +#endif { &hf_ecp_vdp_mode, { "mode", "ecp.vdp.mode", FT_UINT8, BASE_HEX, VALS(ecp_vdp_modes), 0x0, NULL, HFILL }, diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index d03507bce3..322290eec2 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -91,7 +91,7 @@ static int hf_kademlia = -1; static int hf_kademlia_search_condition = -1; static int hf_kademlia_search_condition_argument_uint32 = -1; static int hf_kademlia_search_condition_argument_uint64 = -1; -static int hf_kademlia_unparsed_data_length = -1; +/* static int hf_kademlia_unparsed_data_length = -1; */ static int hf_kademlia_peer = -1; static int hf_kademlia_peer_id = -1; static int hf_kademlia_hash = -1; @@ -3317,9 +3317,11 @@ void proto_register_edonkey(void) { { &hf_kademlia_tcp_port, { "TCP Port", "edonkey.kademlia.tcp_port", FT_UINT16, BASE_DEC, NULL, 0, "Kademlia TCP Port", HFILL } }, +#if 0 { &hf_kademlia_unparsed_data_length, { "Kademlia unparsed data length", "edonkey.kademlia.unparsed", FT_UINT16, BASE_DEC, NULL, 0, "Kademlia trailing data length", HFILL } }, +#endif { &hf_kademlia_tag_name, { "Tag Name", "edonkey.kademlia.tag.name", FT_UINT8, BASE_HEX, NULL, 0, "Kademlia Tag Name String", HFILL } }, diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c index 7abdfcf78e..74f3e05a97 100644 --- a/epan/dissectors/packet-ehdlc.c +++ b/epan/dissectors/packet-ehdlc.c @@ -41,8 +41,8 @@ static int proto_ehdlc = -1; static int hf_ehdlc_data_len = -1; static int hf_ehdlc_protocol = -1; -static int hf_ehdlc_sapi = -1; -static int hf_ehdlc_c_r = -1; +/* static int hf_ehdlc_sapi = -1; */ +/* static int hf_ehdlc_c_r = -1; */ static int hf_ehdlc_xid_payload = -1; static int hf_ehdlc_control = -1; @@ -217,6 +217,7 @@ proto_register_ehdlc(void) FT_UINT8, BASE_HEX, VALS(ehdlc_protocol_vals), 0x0, "The HDLC Sub-Protocol", HFILL } }, +#if 0 { &hf_ehdlc_sapi, { "SAPI", "ehdlc.sapi", FT_UINT8, BASE_DEC, NULL, 0x1f, @@ -227,6 +228,7 @@ proto_register_ehdlc(void) FT_UINT8, BASE_HEX, NULL, 0x20, NULL, HFILL } }, +#endif { &hf_ehdlc_xid_payload, { "XID Payload", "ehdlc.xid_payload", FT_BYTES, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 467c612413..330dd2e634 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -48,13 +48,13 @@ static int hf_ehs_ph_second = -1; static int hf_ehs_ph_tenths = -1; static int hf_ehs_ph_new_data_flag = -1; /* indicates the time has changed */ -static int hf_ehs_ph_pad1 = -1; +/* static int hf_ehs_ph_pad1 = -1; */ static int hf_ehs_ph_hold_flag = -1; /* indicates a hold condition */ static int hf_ehs_ph_sign_flag = -1; /* indicates pre-mission, i.e. countdown, time */ -static int hf_ehs_ph_pad2 = -1; -static int hf_ehs_ph_pad3 = -1; -static int hf_ehs_ph_pad4 = -1; +/* static int hf_ehs_ph_pad2 = -1; */ +/* static int hf_ehs_ph_pad3 = -1; */ +/* static int hf_ehs_ph_pad4 = -1; */ static int hf_ehs_ph_hosc_packet_size = -1; @@ -75,9 +75,9 @@ static int hf_ehs_sh_packet_sequence_error = -1; /* data status bit 1 */ /* common ehs secondary header values */ static int hf_ehs_sh_vcdu_sequence_number = -1; static int hf_ehs_sh_data_stream_id = -1; -static int hf_ehs_sh_pdss_reserved_1 = -1; -static int hf_ehs_sh_pdss_reserved_2 = -1; -static int hf_ehs_sh_pdss_reserved_3 = -1; +/* static int hf_ehs_sh_pdss_reserved_1 = -1; */ +/* static int hf_ehs_sh_pdss_reserved_2 = -1; */ +/* static int hf_ehs_sh_pdss_reserved_3 = -1; */ static int hf_ehs_sh_gse_pkt_id = -1; static int hf_ehs_sh_payload_vs_core_id = -1; static int hf_ehs_sh_apid = -1; @@ -106,7 +106,7 @@ static int hf_ehs_sh_tdm_idq = -1; static int hf_ehs_sh_tdm_cdq = -1; static int hf_ehs_sh_tdm_adq = -1; static int hf_ehs_sh_tdm_data_dq = -1; -static int hf_ehs_sh_tdm_unused = -1; +/* static int hf_ehs_sh_tdm_unused = -1; */ static int hf_ehs_sh_tdm_format_id = -1; static int hf_ehs_sh_tdm_major_frame_packet_index = -1; @@ -116,7 +116,7 @@ static int hf_ehs_sh_tdm_num_minor_frames_per_packet = -1; static int hf_ehs_sh_tdm_cntmet_present = -1; static int hf_ehs_sh_tdm_obt_present = -1; static int hf_ehs_sh_tdm_major_frame_status_present = -1; -static int hf_ehs_sh_tdm_reserved = -1; +/* static int hf_ehs_sh_tdm_reserved = -1; */ static int hf_ehs_sh_tdm_cnt_year = -1; /* numeric year as years since 1900 */ static int hf_ehs_sh_tdm_cnt_jday = -1; /* julian day of year */ @@ -135,12 +135,12 @@ static int hf_ehs_sh_tdm_obt_tenths = -1; static int hf_ehs_sh_tdm_obt_delta_time_flag = -1; static int hf_ehs_sh_tdm_obt_computed_flag = -1; static int hf_ehs_sh_tdm_obt_not_retrieved_flag = -1; -static int hf_ehs_sh_tdm_obt_reserved = -1; +/* static int hf_ehs_sh_tdm_obt_reserved = -1; */ static int hf_ehs_sh_tdm_obt_source_apid = -1; static int hf_ehs_sh_tdm_num_major_frame_status_words = -1; -static int hf_ehs_sh_tdm_mjfs_reserved = -1; +/* static int hf_ehs_sh_tdm_mjfs_reserved = -1; */ static int hf_ehs_sh_tdm_mjfs_parent_frame_error = -1; static int hf_ehs_sh_tdm_mjfs_checksum_error = -1; static int hf_ehs_sh_tdm_mjfs_fixed_value_error = -1; @@ -155,7 +155,7 @@ static int hf_ehs_sh_tdm_mnfs_bit_slip_error = -1; static int hf_ehs_sh_tdm_mnfs_sync_error = -1; /* pseudo ehs secondary header values */ -static int hf_ehs_sh_pseudo_unused = -1; +/* static int hf_ehs_sh_pseudo_unused = -1; */ static int hf_ehs_sh_pseudo_workstation_id = -1; static int hf_ehs_sh_pseudo_user_id = -1; static int hf_ehs_sh_pseudo_comp_id = -1; @@ -165,11 +165,11 @@ static int hf_ehs_dz_aoslos_indicator = -1; /* data zone values for well known protocol UDSM */ static int hf_ehs_dz_udsm_ccsds_vs_bpdu = -1; -static int hf_ehs_dz_udsm_unused1 = -1; +/* static int hf_ehs_dz_udsm_unused1 = -1; */ -static int hf_ehs_dz_udsm_unused2 = -1; +/* static int hf_ehs_dz_udsm_unused2 = -1; */ -static int hf_ehs_dz_udsm_unused3 = -1; +/* static int hf_ehs_dz_udsm_unused3 = -1; */ static int hf_ehs_dz_udsm_gse_pkt_id = -1; static int hf_ehs_dz_udsm_payload_vs_core = -1; static int hf_ehs_dz_udsm_apid = -1; @@ -186,7 +186,7 @@ static int hf_ehs_dz_udsm_stop_time_hour = -1; static int hf_ehs_dz_udsm_stop_time_minute = -1; static int hf_ehs_dz_udsm_stop_time_second = -1; -static int hf_ehs_dz_udsm_unused4 = -1; +/* static int hf_ehs_dz_udsm_unused4 = -1; */ static int hf_ehs_dz_udsm_num_pkts_xmtd = -1; @@ -1265,11 +1265,13 @@ proto_register_ehs(void) FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, +#if 0 { &hf_ehs_ph_pad1, { "Pad1", "ehs.pad1", FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL } }, +#endif { &hf_ehs_ph_hold_flag, { "Hold Flag", "ehs.hold_flag", FT_BOOLEAN, 8, NULL, 0x02, @@ -1281,6 +1283,7 @@ proto_register_ehs(void) NULL, HFILL } }, +#if 0 { &hf_ehs_ph_pad2, { "Pad2", "ehs.pad2", FT_UINT8, BASE_DEC, NULL, 0xff, @@ -1298,6 +1301,7 @@ proto_register_ehs(void) FT_UINT8, BASE_DEC, NULL, 0xff, NULL, HFILL } }, +#endif { &hf_ehs_ph_hosc_packet_size, { "HOSC Packet Size", "ehs.hosc_packet_size", @@ -1374,6 +1378,7 @@ proto_register_ehs(void) FT_UINT8, BASE_DEC, VALS(ehs_secondary_header_data_stream_id), 0x80, NULL, HFILL } }, +#if 0 { &hf_ehs_sh_pdss_reserved_1, { "Pdss Reserved 1", "ehs2.pdss_reserved_1", FT_UINT8, BASE_DEC, NULL, 0x7f, @@ -1391,6 +1396,7 @@ proto_register_ehs(void) FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, +#endif { &hf_ehs_sh_gse_pkt_id, { "GSE Packet ID (1=GSE)", "ehs2.gse_pkt_id", FT_UINT16, BASE_DEC, NULL, 0x1000, @@ -1518,11 +1524,13 @@ proto_register_ehs(void) NULL, HFILL } }, +#if 0 { &hf_ehs_sh_tdm_unused, { "Unused", "ehs2.tdm_unused", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, +#endif { &hf_ehs_sh_tdm_format_id, { "Format ID", "ehs2.tdm_format_id", @@ -1563,11 +1571,13 @@ proto_register_ehs(void) FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, +#if 0 { &hf_ehs_sh_tdm_reserved, { "Reserved", "ehs2.tdm_reserved", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL } }, +#endif { &hf_ehs_sh_tdm_cnt_year, { "CNT Years since 1900", "ehs2.tdm_cnt_year", @@ -1646,11 +1656,13 @@ proto_register_ehs(void) FT_BOOLEAN, 16, NULL, 0x2000, NULL, HFILL } }, +#if 0 { &hf_ehs_sh_tdm_obt_reserved, { "OBT Reserved", "ehs2.tdm_obt_reserved", FT_BOOLEAN, 16, NULL, 0x1800, NULL, HFILL } }, +#endif { &hf_ehs_sh_tdm_obt_source_apid, { "OBT Source APID", "ehs2.tdm_obt_source_apid", FT_UINT16, BASE_DEC, NULL, 0x07ff, @@ -1663,11 +1675,13 @@ proto_register_ehs(void) NULL, HFILL } }, +#if 0 { &hf_ehs_sh_tdm_mjfs_reserved, { "Reserved", "ehs2.tdm_mjfs_reserved", FT_UINT8, BASE_DEC, NULL, 0xf8, NULL, HFILL } }, +#endif { &hf_ehs_sh_tdm_mjfs_parent_frame_error, { "Parent Frame Error", "ehs2.tdm_mjfs_parent_frame_error", FT_BOOLEAN, 8, NULL, 0x04, @@ -1727,11 +1741,13 @@ proto_register_ehs(void) /* pseudo secondary header */ +#if 0 { &hf_ehs_sh_pseudo_unused, { "Unused", "ehs2.pseudo_unused", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, +#endif { &hf_ehs_sh_pseudo_workstation_id, { "Workstation ID", "ehs2.pseudo_workstation_id", FT_UINT16, BASE_DEC, NULL, 0xffff, @@ -1763,6 +1779,7 @@ proto_register_ehs(void) FT_UINT8, BASE_DEC, VALS(ehs_data_zone_udsm_ccsds_vs_bpdu), 0x80, NULL, HFILL } }, +#if 0 { &hf_ehs_dz_udsm_unused1, { "Unused 1", "ehs.dz.udsm_unused1", FT_UINT8, BASE_DEC, NULL, 0x7f, @@ -1780,6 +1797,7 @@ proto_register_ehs(void) FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL } }, +#endif { &hf_ehs_dz_udsm_gse_pkt_id, { "GSE Pkt ID", "ehs.dz.udsm_gse_pkt_id", FT_BOOLEAN, 16, NULL, 0x1000, @@ -1848,11 +1866,13 @@ proto_register_ehs(void) NULL, HFILL } }, +#if 0 { &hf_ehs_dz_udsm_unused4, { "Unused 4", "ehs.dz.udsm_unused4", FT_UINT16, BASE_DEC, NULL, 0xffff, NULL, HFILL } }, +#endif { &hf_ehs_dz_udsm_num_pkts_xmtd, { "Num Pkts Transmitted", "ehs.dz.udsm_num_pkts_xmtd", diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index de8e7c68f7..84f2566a36 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -257,8 +257,10 @@ static int hf_dlr_lanp1_dev_physical_address = -1; static int hf_dlr_lanp2_dev_ip_addr = -1; static int hf_dlr_lanp2_dev_physical_address = -1; static int hf_dlr_ring_protocol_participants_count = -1; +#if 0 static int hf_dlr_rppl_dev_ip_addr = -1; static int hf_dlr_rppl_dev_physical_address = -1; +#endif static int hf_dlr_asa_supervisor_ip_addr = -1; static int hf_dlr_asa_supervisor_physical_address = -1; static int hf_dlr_active_supervisor_precedence = -1; @@ -3017,6 +3019,7 @@ proto_register_enip(void) FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_dlr_rppl_dev_ip_addr, { "Device IP Address", "cip.dlr.rppl.ip_addr", FT_IPv4, BASE_NONE, NULL, 0, @@ -3026,6 +3029,7 @@ proto_register_enip(void) { "Device Physical Address", "cip.dlr.rppl.physical_address", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_dlr_asa_supervisor_ip_addr, { "Supervisor IP Address", "cip.dlr.asa.ip_addr", diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 98c563d6ab..c99fe3e912 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -517,7 +517,7 @@ static gint hf_epl_soa_svtg = -1; static gint hf_epl_soa_eplv = -1; static gint hf_epl_asnd_svid = -1; -static gint hf_epl_asnd_data = -1; +/* static gint hf_epl_asnd_data = -1; */ /*IdentResponse*/ static gint hf_epl_asnd_identresponse_en = -1; @@ -570,7 +570,7 @@ static gint hf_epl_asnd_statusresponse_pr = -1; static gint hf_epl_asnd_statusresponse_rs = -1; static gint hf_epl_asnd_statusresponse_stat_ms = -1; static gint hf_epl_asnd_statusresponse_stat_cs = -1; -static gint hf_epl_asnd_statusresponse_seb = -1; +/* static gint hf_epl_asnd_statusresponse_seb = -1; */ /*StaticErrorBitField */ static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0 = -1; @@ -583,8 +583,8 @@ static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7 = -1; static gint hf_epl_asnd_statusresponse_seb_devicespecific_err = -1; /*List of Errors/Events*/ -static gint hf_epl_asnd_statusresponse_el = -1; -static gint hf_epl_asnd_statusresponse_el_entry = -1; +/* static gint hf_epl_asnd_statusresponse_el = -1; */ +/* static gint hf_epl_asnd_statusresponse_el_entry = -1; */ static gint hf_epl_asnd_statusresponse_el_entry_type = -1; static gint hf_epl_asnd_statusresponse_el_entry_type_profile = -1; static gint hf_epl_asnd_statusresponse_el_entry_type_mode = -1; @@ -1870,11 +1870,13 @@ proto_register_epl(void) FT_UINT8, BASE_DEC, VALS(asnd_svid_vals), 0x00, NULL, HFILL } }, +#if 0 { &hf_epl_asnd_data, { "Data", "epl.asnd.data", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif /* ASnd-->IdentResponse */ { &hf_epl_asnd_identresponse_en, @@ -2120,11 +2122,13 @@ proto_register_epl(void) FT_UINT8, BASE_HEX, VALS(epl_nmt_cs_vals), 0x00, NULL, HFILL } }, +#if 0 { &hf_epl_asnd_statusresponse_seb, { "StaticErrorBitField", "epl.asnd.sres.seb", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif /*StaticErrorBitField */ { &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0, @@ -2168,16 +2172,20 @@ proto_register_epl(void) NULL, HFILL } }, +#if 0 { &hf_epl_asnd_statusresponse_el, { "ErrorCodesList", "epl.asnd.sres.el", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif +#if 0 { &hf_epl_asnd_statusresponse_el_entry, { "Entry", "epl.asnd.sres.el.entry", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif /*List of Errors/Events*/ { &hf_epl_asnd_statusresponse_el_entry_type, diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 65e90e2b48..eb6884c5f6 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -115,7 +115,7 @@ static gint ett_etch_value = -1; static int hf_etch_sig = -1; static int hf_etch_length = -1; static int hf_etch_version = -1; -static int hf_etch_typecode = -1; +/* static int hf_etch_typecode = -1; */ static int hf_etch_value = -1; static int hf_etch_bytes = -1; static int hf_etch_byte = -1; @@ -124,7 +124,7 @@ static int hf_etch_int = -1; static int hf_etch_long = -1; static int hf_etch_float = -1; static int hf_etch_double = -1; -static int hf_etch_key = -1; +/* static int hf_etch_key = -1; */ static int hf_etch_valuename = -1; static int hf_etch_keyname = -1; static int hf_etch_string = -1; @@ -825,12 +825,14 @@ void proto_register_etch(void) NULL, 0x0, NULL, HFILL} }, +#if 0 {&hf_etch_typecode, {"Etch TypeCode", "etch.typecode", FT_STRING, BASE_NONE, /* FT_INT8 */ NULL, 0x0, NULL, HFILL} }, +#endif {&hf_etch_value, {"Etch Value", "etch.value", FT_UINT64, BASE_DEC, @@ -885,12 +887,14 @@ void proto_register_etch(void) NULL, 0x0, NULL, HFILL} }, +#if 0 {&hf_etch_key, {"Etch key", "etch.key", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }, +#endif {&hf_etch_symbol, {"Etch symbol", "etch.symbol", FT_UINT32, BASE_HEX, diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index a795737ddd..1a16bf27c1 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -83,7 +83,7 @@ static int hf_fc_fctl_transfer_seq_initiative = -1; static int hf_fc_fctl_rexmitted_seq = -1; static int hf_fc_fctl_rel_offset = -1; static int hf_fc_fctl_abts_ack = -1; -static int hf_fc_fctl_abts_not_ack = -1; +/* static int hf_fc_fctl_abts_not_ack = -1; */ static int hf_fc_fctl_last_data_frame = -1; static int hf_fc_fctl_ack_0_1 = -1; static int hf_fc_seqid = -1; @@ -1448,9 +1448,11 @@ proto_register_fc(void) { &hf_fc_fctl_abts_ack, {"AA", "fc.fctl.abts_ack", FT_UINT24, BASE_HEX, VALS(abts_ack_vals), FC_FCTL_ABTS_MASK, "ABTS ACK values", HFILL}}, +#if 0 { &hf_fc_fctl_abts_not_ack, {"AnA", "fc.fctl.abts_not_ack", FT_UINT24, BASE_HEX, VALS(abts_not_ack_vals), FC_FCTL_ABTS_MASK, "ABTS not ACK vals", HFILL}}, +#endif { &hf_fc_exchange_first_frame, { "Exchange First In", "fc.exchange_first_frame", FT_FRAMENUM, BASE_NONE, NULL, 0, "The first frame of this exchange is in this frame", HFILL }}, diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 9ca3203480..89b6ceb5de 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -44,11 +44,13 @@ static int hf_fcct_options = -1; static int hf_fcct_server = -1; /* derived field */ /* Extended preamble fields */ +#if 0 static int hf_fcct_ext_said = -1; static int hf_fcct_ext_tid = -1; static int hf_fcct_ext_reqname = -1; static int hf_fcct_ext_tstamp = -1; static int hf_fcct_ext_authblk = -1; +#endif /* Initialize the subtree pointers */ static gint ett_fcct = -1; @@ -244,6 +246,7 @@ proto_register_fcct(void) { &hf_fcct_options, {"Options", "fcct.options", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#if 0 { &hf_fcct_ext_said, {"Auth SAID", "fcct.ext_said", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, @@ -259,6 +262,7 @@ proto_register_fcct(void) { &hf_fcct_ext_authblk, {"Auth Hash Blk", "fcct.ext_authblk", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, +#endif }; /* Setup protocol subtree array */ diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 14d41d5b11..e608f942ae 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -47,7 +47,7 @@ /* Initialize the protocol and registered fields */ static int proto_fcdns = -1; -static int hf_fcdns_gssubtype = -1; +/* static int hf_fcdns_gssubtype = -1; */ static int hf_fcdns_opcode = -1; static int hf_fcdns_reason = -1; static int hf_fcdns_vendor = -1; @@ -1730,9 +1730,11 @@ proto_register_fcdns (void) { static hf_register_info hf[] = { +#if 0 { &hf_fcdns_gssubtype, {"GS_Subtype", "fcdns.gssubtype", FT_UINT8, BASE_HEX, VALS (fc_dns_subtype_val), 0x0, NULL, HFILL}}, +#endif {&hf_fcdns_opcode, {"Opcode", "fcdns.opcode", FT_UINT16, BASE_HEX, VALS (fc_dns_opcode_val), 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 138521adb9..d555fc9765 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -59,10 +59,12 @@ static int hf_fcels_reloffset = -1; static int hf_fcels_edtov = -1; static int hf_fcels_npname = -1; static int hf_fcels_fnname = -1; +#if 0 static int hf_fcels_cls1param = -1; static int hf_fcels_cls2param = -1; static int hf_fcels_cls3param = -1; static int hf_fcels_cls4param = -1; +#endif static int hf_fcels_vendorvers = -1; static int hf_fcels_svcavail = -1; static int hf_fcels_clsflags = -1; @@ -2263,6 +2265,7 @@ proto_register_fcels (void) { &hf_fcels_fnname, {"Fabric/Node Name", "fcels.fnname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, +#if 0 { &hf_fcels_cls1param, {"Class 1 Svc Param", "fcels.logi.cls1param", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -2275,6 +2278,7 @@ proto_register_fcels (void) { &hf_fcels_cls4param, {"Class 4 Svc Param", "fcels.logi.cls4param", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, +#endif { &hf_fcels_vendorvers, {"Vendor Version", "fcels.logi.vendvers", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 5148b51c47..73240d8db2 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -51,7 +51,7 @@ static int hf_fcfzs_zonename = -1; static int hf_fcfzs_nummbrs = -1; static int hf_fcfzs_nummbrentries = -1; static int hf_fcfzs_mbrid = -1; -static int hf_fcfzs_mbridlen = -1; +/* static int hf_fcfzs_mbridlen = -1; */ static int hf_fcfzs_mbrtype = -1; static int hf_fcfzs_reason = -1; static int hf_fcfzs_rjtdetail = -1; @@ -855,10 +855,12 @@ proto_register_fcfzs(void) FT_UINT8, BASE_HEX, VALS(fc_fzs_zonembr_type_val), 0x0, NULL, HFILL}}, +#if 0 { &hf_fcfzs_mbridlen, {"Zone Member Identifier Length", "fcfzs.zonembr.idlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#endif { &hf_fcfzs_mbrid, {"Zone Member Identifier", "fcfzs.zone.mbrid", diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index ab1194c587..fb09cfda96 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -81,10 +81,10 @@ static int hf_fcp_rsp_flags_res_vld = -1; static int hf_fcp_request_in = -1; static int hf_fcp_response_in = -1; static int hf_fcp_time = -1; -static int hf_fcp_srr_op = -1; +/* static int hf_fcp_srr_op = -1; */ static int hf_fcp_srr_ox_id = -1; static int hf_fcp_srr_rx_id = -1; -static int hf_fcp_srr_r_ctl = -1; +/* static int hf_fcp_srr_r_ctl = -1; */ /* Initialize the subtree pointers */ static gint ett_fcp = -1; @@ -99,9 +99,9 @@ typedef struct fcp_request_data { guint32 request_frame; guint32 response_frame; nstime_t request_time; - /* XXX - keep for "backwards compatility", but not sure it really + /* XXX - keep for "backwards compatility", but not sure it really needs to be part of the persistent data */ - itl_nexus_t *itl; + itl_nexus_t *itl; } fcp_request_data_t; static dissector_table_t fcp_dissector; @@ -986,10 +986,12 @@ proto_register_fcp(void) FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "Time since the FCP_CMND frame", HFILL }}, +#if 0 { &hf_fcp_srr_op, {"Opcode", "fcp.els.op", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#endif { &hf_fcp_srr_ox_id, {"OX_ID", "fcp.els.srr.ox_id", @@ -1001,10 +1003,12 @@ proto_register_fcp(void) FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#if 0 { &hf_fcp_srr_r_ctl, {"R_CTL", "fcp.els.srr.r_ctl", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#endif }; /* Setup protocol subtree array */ diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index b7285e7417..a21ff48edc 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -73,8 +73,8 @@ static int hf_auth_rjt_code = -1; static int hf_auth_rjt_codedet = -1; static int hf_auth_responder_wwn = -1; static int hf_auth_responder_name = -1; -static int hf_auth_dhchap_groupid = -1; -static int hf_auth_dhchap_hashid = -1; +/* static int hf_auth_dhchap_groupid = -1; */ +/* static int hf_auth_dhchap_hashid = -1; */ static int hf_auth_dhchap_chal_len = -1; static int hf_auth_dhchap_val_len = -1; static int hf_auth_dhchap_rsp_len = -1; @@ -517,15 +517,19 @@ proto_register_fcsp(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, +#if 0 { &hf_auth_dhchap_hashid, { "Hash Identifier", "fcsp.dhchap.hashid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#endif +#if 0 { &hf_auth_dhchap_groupid, { "DH Group Identifier", "fcsp.dhchap.groupid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#endif { &hf_auth_dhchap_chal_len, { "Challenge Value Length", "fcsp.dhchap.challen", diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index fe8d0e0187..f286aea450 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -81,7 +81,7 @@ static int hf_swils_efp_rec_type = -1; static int hf_swils_efp_dom_id = -1; static int hf_swils_efp_switch_name = -1; static int hf_swils_efp_mcast_grpno = -1; -static int hf_swils_efp_alias_token = -1; +/* static int hf_swils_efp_alias_token = -1; */ static int hf_swils_efp_record_len = -1; static int hf_swils_efp_payload_len = -1; static int hf_swils_efp_pswitch_pri = -1; @@ -89,7 +89,7 @@ static int hf_swils_efp_pswitch_name = -1; static int hf_swils_dia_switch_name = -1; static int hf_swils_rdi_payload_len = -1; static int hf_swils_rdi_req_sname = -1; -static int hf_swils_fspfh_cmd = -1; +/* static int hf_swils_fspfh_cmd = -1; */ static int hf_swils_fspfh_rev = -1; static int hf_swils_fspfh_ar_num = -1; static int hf_swils_fspfh_auth_type = -1; @@ -2036,10 +2036,12 @@ proto_register_fcswils(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#if 0 { &hf_swils_efp_alias_token, {"Alias Token", "swils.efp.aliastok", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, +#endif { &hf_swils_efp_record_len, {"Record Len", "swils.efp.recordlen", @@ -2076,10 +2078,12 @@ proto_register_fcswils(void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, +#if 0 { &hf_swils_fspfh_cmd, {"Command:", "swils.fspf.cmd", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, +#endif { &hf_swils_fspfh_rev, {"Version", "swils.fspf.ver", diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 536797c2cb..554b75250f 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -360,8 +360,8 @@ static int hf_giop_type_id = -1; static int hf_giop_iiop_v_maj = -1; static int hf_giop_iiop_v_min = -1; static int hf_giop_endianness = -1; /* esp encapsulations */ -static int hf_giop_compressed = -1; -static int hf_giop_IOR_tag = -1; +/* static int hf_giop_compressed = -1; */ +/* static int hf_giop_IOR_tag = -1; */ static int hf_giop_IIOP_tag = -1; static int hf_giop_locale_status = -1; static int hf_giop_addressing_disposition = -1; @@ -5019,10 +5019,12 @@ proto_register_giop (void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_giop_compressed, { "ZIOP", "giop.compressed", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_giop_endianness, { "Endianness", "giop.endianness", @@ -5099,10 +5101,12 @@ proto_register_giop (void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_giop_IOR_tag, { "IOR Profile TAG", "giop.iortag", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_giop_TCKind, { "TypeCode enum", "giop.TCKind", diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index fac9a675dd..5a017abff5 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -782,7 +782,7 @@ static int hf_gsm_a_rr_eutran_qrxlevmin = -1; static int hf_gsm_a_rr_eutran_pcid = -1; static int hf_gsm_a_rr_eutran_pcid_bitmap_group = -1; static int hf_gsm_a_rr_eutran_pcid_pattern_length = -1; -static int hf_gsm_a_rr_eutran_pcid_pattern = -1; +/* static int hf_gsm_a_rr_eutran_pcid_pattern = -1; */ static int hf_gsm_a_rr_eutran_pcid_pattern_sense = -1; static int hf_gsm_a_rr_eutran_frequency_index = -1; static int hf_gsm_a_rr_psc = -1; @@ -12394,11 +12394,13 @@ proto_register_gsm_a_rr(void) FT_UINT8, BASE_DEC, VALS(gsm_a_rr_pcid_psc_pattern_length), 0x00, NULL, HFILL } }, +#if 0 { &hf_gsm_a_rr_eutran_pcid_pattern, { "PCID_Pattern", "gsm_a.rr.pcid_pattern", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_gsm_a_rr_eutran_pcid_pattern_sense, { "PCID_pattern_sense", "gsm_a.rr.pcid_pattern_sense", FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_pcid_pattern_sense), 0x00, diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c index 6ccbfe07ef..a8e97f2047 100644 --- a/epan/dissectors/packet-gsm_cbch.c +++ b/epan/dissectors/packet-gsm_cbch.c @@ -67,7 +67,7 @@ static int hf_gsm_cbch_sched_type = -1; static int hf_gsm_cbch_sched_begin_slot = -1; static int hf_gsm_cbch_sched_spare = -1; static int hf_gsm_cbch_sched_end_slot = -1; -static int hf_gsm_cbch_sched_msg_id = -1; +/* static int hf_gsm_cbch_sched_msg_id = -1; */ /* These fields are used when reassembling cbch fragments */ @@ -474,11 +474,13 @@ proto_register_gsm_cbch(void) FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL} }, +#if 0 { &hf_gsm_cbch_sched_msg_id, { "GSM CBCH Schedule Message ID", "gsm_cbch.sched_msg_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} }, +#endif /* Fragment fields */ { &hf_cbch_fragment_overlap, diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 92a2ac6797..cf311c6c87 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -87,11 +87,11 @@ static int hf_gsm_sms_ud_reassembled_length = -1; */ static int hf_gsm_sms_udh_length = -1; static int hf_gsm_sms_udh_iei = -1; -static int hf_gsm_sms_udh_multiple_messages = -1; +/* static int hf_gsm_sms_udh_multiple_messages = -1; */ static int hf_gsm_sms_udh_multiple_messages_msg_id = -1; static int hf_gsm_sms_udh_multiple_messages_msg_parts = -1; static int hf_gsm_sms_udh_multiple_messages_msg_part = -1; -static int hf_gsm_sms_udh_ports = -1; +/* static int hf_gsm_sms_udh_ports = -1; */ static int hf_gsm_sms_udh_ports_src = -1; static int hf_gsm_sms_udh_ports_dst = -1; @@ -468,6 +468,7 @@ proto_register_gsm_sms_ud(void) HFILL } }, +#if 0 { &hf_gsm_sms_udh_multiple_messages, { "Multiple messages UDH", "gsm_sms_ud.udh.mm", FT_NONE, BASE_NONE, NULL, 0x00, @@ -475,6 +476,7 @@ proto_register_gsm_sms_ud(void) HFILL } }, +#endif { &hf_gsm_sms_udh_multiple_messages_msg_id, { "Message identifier", "gsm_sms_ud.udh.mm.msg_id", FT_UINT16, BASE_DEC, NULL, 0x00, @@ -496,6 +498,7 @@ proto_register_gsm_sms_ud(void) HFILL } }, +#if 0 { &hf_gsm_sms_udh_ports, { "Port number UDH", "gsm_sms_ud.udh.ports", FT_NONE, BASE_NONE, NULL, 0x00, @@ -503,6 +506,7 @@ proto_register_gsm_sms_ud(void) HFILL } }, +#endif { &hf_gsm_sms_udh_ports_src, { "Source port", "gsm_sms_ud.udh.ports.src", FT_UINT8, BASE_DEC, NULL, 0x00, diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index a814a94817..6fbcbfce50 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -57,7 +57,7 @@ static int proto_h223 = -1; * our header fields; they are filled out when we call * proto_register_field_array() in proto_register_h223() */ -static int hf_h223_non_h223_data = -1; +/* static int hf_h223_non_h223_data = -1; */ static int hf_h223_mux_stuffing_pdu = -1; static int hf_h223_mux_pdu = -1; static int hf_h223_mux_header = -1; @@ -1406,9 +1406,11 @@ void proto_register_h223 (void) */ static hf_register_info hf[] = { +#if 0 { &hf_h223_non_h223_data, { "Non-H.223 data", "h223.non-h223", FT_NONE, BASE_NONE, NULL, 0x0, "Initial data in stream, not a PDU", HFILL }}, +#endif { &hf_h223_mux_stuffing_pdu, { "H.223 stuffing PDU", "h223.mux.stuffing", FT_NONE, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-h248_2.c b/epan/dissectors/packet-h248_2.c index 167c75d20f..afadecfb36 100644 --- a/epan/dissectors/packet-h248_2.c +++ b/epan/dissectors/packet-h248_2.c @@ -37,7 +37,7 @@ static int proto_h248_2 = -1; -static int hf_h248_2_dtone_evt = -1; +/* static int hf_h248_2_dtone_evt = -1; */ static int hf_h248_2_dtone_dtt_obs_evt = -1; static int hf_h248_2_dtone_dtt_obs_evt_val = -1; @@ -106,12 +106,12 @@ static const h248_package_t h248_pkg_ctype = { 0x0011, /* Id */ &proto_h248_2, /* hfid */ &ett_h248_2, /* ett */ - + NULL, /* value_string param_names */ NULL, /* value_string signal_names */ h248_2_ctype_events_vals, /* value_string event_names */ NULL, /* value_string stats_names */ - + NULL, /* properties */ NULL, /* signals */ h248_pkg_generic_cause_evts, /* events */ @@ -120,24 +120,26 @@ static const h248_package_t h248_pkg_ctype = { void proto_register_h248_dot2(void) { static hf_register_info hf[] = { - { &hf_h248_2_dtone_evt, - { "Discriminating Tone Type", "h248.2.dtt", - FT_BYTES, BASE_NONE, NULL, 0, +#if 0 + { &hf_h248_2_dtone_evt, + { "Discriminating Tone Type", "h248.2.dtt", + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_h248_2_dtone_dtt_obs_evt, - { "Discriminating Tone Type(dtt)", "h248.2.dtt", - FT_BYTES, BASE_NONE, NULL, 0, - NULL, HFILL } + { &hf_h248_2_dtone_dtt_obs_evt, + { "Discriminating Tone Type(dtt)", "h248.2.dtt", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }, }, - { &hf_h248_2_dtone_dtt_obs_evt_val, - { "call type", "h248.2.dtt.val", - FT_UINT32, BASE_DEC, VALS(hf_h248_2_dtone_dtt_obs_evt_val_values) , 0, +#endif + { &hf_h248_2_dtone_dtt_obs_evt_val, + { "call type", "h248.2.dtt.val", + FT_UINT32, BASE_DEC, VALS(hf_h248_2_dtone_dtt_obs_evt_val_values) , 0, NULL, HFILL } }, }; - + static gint *ett[] = { &ett_h248_2, &ett_h248_2_dtone_dtt_obs_evt, @@ -148,7 +150,7 @@ void proto_register_h248_dot2(void) { proto_register_field_array(proto_h248_2, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + h248_register_package(&h248_pkg_ctype,MERGE_PKG_HIGH); } diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 8d501c8799..4c21b67fd7 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -51,8 +51,8 @@ static int hf_h263P_tid = -1; static int hf_h263P_trun = -1; static int hf_h263P_s = -1; static int hf_h263P_extra_hdr = -1; -static int hf_h263P_PSC = -1; -static int hf_h263P_TR = -1; +/* static int hf_h263P_PSC = -1; */ +/* static int hf_h263P_TR = -1; */ /* H.263-1998 fields defining a sub tree */ @@ -352,6 +352,7 @@ proto_register_h263P(void) NULL, HFILL } }, +#if 0 { &hf_h263P_PSC, { @@ -364,6 +365,8 @@ proto_register_h263P(void) "Picture Start Code(PSC)", HFILL } }, +#endif +#if 0 { &hf_h263P_TR, { @@ -376,6 +379,7 @@ proto_register_h263P(void) "Temporal Reference, TR", HFILL } }, +#endif }; diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index ee7735bad4..e697d017be 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -116,7 +116,7 @@ static int hf_h264_par_profile_h = -1; static int hf_h264_par_profile_h10 = -1; static int hf_h264_par_profile_h4_2_2 = -1; static int hf_h264_par_profile_h4_4_4 = -1; -static int hf_h264_par_add_mode_sup = -1; +/* static int hf_h264_par_add_mode_sup = -1; */ static int hf_h264_par_AdditionalModesSupported = -1; static int hf_h264_par_add_mode_sup_rcdo = -1; static int hf_h264_par_ProfileIOP = -1; @@ -173,7 +173,7 @@ static int hf_h264_slice_type = -1; static int hf_h264_slice_id = -1; static int hf_h264_payloadsize = -1; static int hf_h264_payloadtype = -1; -static int hf_h264_frame_num = -1; +/* static int hf_h264_frame_num = -1; */ /* Initialize the subtree pointers */ static int ett_h264 = -1; @@ -2692,11 +2692,13 @@ proto_register_h264(void) FT_UINT32, BASE_DEC, VALS(h264_sei_payload_vals), 0x0, NULL, HFILL } }, +#if 0 { &hf_h264_frame_num, { "frame_num", "h264.frame_num", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_h264_par_profile, { "Profile", "h264.profile", FT_UINT8, BASE_HEX, NULL, 0x00, @@ -2733,10 +2735,12 @@ proto_register_h264(void) { "AdditionalModesSupported", "h264.AdditionalModesSupported", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, +#if 0 { &hf_h264_par_add_mode_sup, { "Additional Modes Supported", "h264.add_mode_sup", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, +#endif { &hf_h264_par_add_mode_sup_rcdo, { "Reduced Complexity Decoding Operation (RCDO) support", "h264.add_mode_sup.rcdo", FT_BOOLEAN, 8, NULL, 0x40, diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index c08fb87ab9..0539ada1f4 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -29,7 +29,7 @@ #include "packet-bluetooth-hci.h" static int proto_hci_h1 = -1; -static int hf_hci_h1_type = -1; +/* static int hf_hci_h1_type = -1; */ static int hf_hci_h1_direction = -1; static gint ett_hci_h1 = -1; @@ -131,10 +131,12 @@ void proto_register_hci_h1(void) { static hf_register_info hf[] = { +#if 0 { &hf_hci_h1_type, { "HCI Packet Type", "hci_h1.type", FT_UINT8, BASE_HEX, VALS(hci_h1_type_vals), 0x0, NULL, HFILL }}, +#endif { &hf_hci_h1_direction, { "Direction", "hci_h1.direction", diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index f1a0d537b0..c1cf0153dd 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -37,7 +37,7 @@ static int proto_hclnfsd = -1; static int hf_hclnfsd_procedure_v1 = -1; static int hf_hclnfsd_request_type = -1; static int hf_hclnfsd_device = -1; -static int hf_hclnfsd_login = -1; +/* static int hf_hclnfsd_login = -1; */ static int hf_hclnfsd_lockname = -1; static int hf_hclnfsd_unknown_data = -1; static int hf_hclnfsd_lockowner = -1; @@ -723,9 +723,11 @@ proto_register_hclnfsd(void) "Device", "hclnfsd.device", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_hclnfsd_login, { "Login Text", "hclnfsd.logintext", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +#endif { &hf_hclnfsd_lockname, { "Lockname", "hclnfsd.lockname", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index be17fc6af6..da8b3addd8 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -74,7 +74,7 @@ static int hf_hdfs_params = -1; static int hf_hdfs_paramtype = -1; static int hf_hdfs_paramval = -1; static int hf_hdfs_paramvalnum = -1; -static int hf_hdfs_rest = -1; +/* static int hf_hdfs_rest = -1; */ static int hf_hdfs_fileperm = -1; static int hf_hdfs_blockloc = -1; static int hf_hdfs_endblockloc = -1; @@ -748,12 +748,14 @@ proto_register_hdfs(void) NULL, 0x0, NULL, HFILL } }, +#if 0 { &hf_hdfs_rest, { "HDFS value", "hdfs.rest", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_hdfs_blockloc, { "HDFS block location", "hdfs.blockloc", FT_UINT64, BASE_DEC, diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 54003ff5db..de4258c2bb 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -44,7 +44,7 @@ static int hf_homeplug_mehdr = -1; static int hf_homeplug_mehdr_mev = -1; static int hf_homeplug_mehdr_metype = -1; static int hf_homeplug_melen = -1; -static int hf_homeplug_mme = -1; +/* static int hf_homeplug_mme = -1; */ /* Request Channel Estimation */ static int hf_homeplug_rce = -1; static int hf_homeplug_rce_cev = -1; @@ -165,7 +165,7 @@ static int hf_homeplug_ns_bytes40 = -1; static int hf_homeplug_ns_fails = -1; static int hf_homeplug_ns_drops = -1; /* Extended */ -static int hf_homeplug_ns_tx_bfr_state = -1; +/* static int hf_homeplug_ns_tx_bfr_state = -1; */ static int hf_homeplug_ns_buf_in_use = -1; static int hf_homeplug_ns_prio = -1; static int hf_homeplug_ns_msdu_len = -1; @@ -1412,10 +1412,12 @@ proto_register_homeplug(void) }, /* MAC Management Entry */ +#if 0 { &hf_homeplug_mme, { "MAC Management Entry Data", "homeplug.mmentry", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +#endif /* Request Channel Estimation */ { &hf_homeplug_rce, @@ -1949,10 +1951,12 @@ proto_register_homeplug(void) }, /* ... Extended */ +#if 0 { &hf_homeplug_ns_tx_bfr_state, { "Transmit Buffer State", "homeplug.ns.tx_bfr_state", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_homeplug_ns_buf_in_use, { "Buffer in use", "homeplug.ns.buf_in_use", diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index f3f63ecf6a..085bda5ee0 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -172,7 +172,7 @@ static gint hf_hsrp2_state = -1; static gint hf_hsrp2_group_state_tlv = -1; static gint hf_hsrp2_interface_state_tlv = -1; static gint hf_hsrp2_text_auth_tlv = -1; -static gint hf_hsrp2_md5_auth_tlv = -1; +/* static gint hf_hsrp2_md5_auth_tlv = -1; */ static gint hf_hsrp2_ipversion = -1; static gint hf_hsrp2_hellotime = -1; static gint hf_hsrp2_holdtime = -1; @@ -720,10 +720,12 @@ void proto_register_hsrp(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_hsrp2_md5_auth_tlv, { "MD5 Authentication TLV", "hsrp2.md5_auth_tlv", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_hsrp2_ipversion, { "IP Ver.", "hsrp2.ipversion", diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 5dda1f4d08..0a70c2b934 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -47,7 +47,7 @@ static int hf_icap_response = -1; static int hf_icap_reqmod = -1; static int hf_icap_respmod = -1; static int hf_icap_options = -1; -static int hf_icap_other = -1; +/* static int hf_icap_other = -1; */ static gint ett_icap = -1; @@ -310,10 +310,12 @@ proto_register_icap(void) { "Options", "icap.options", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if ICAP options", HFILL }}, +#if 0 { &hf_icap_other, { "Other", "icap.other", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if ICAP other", HFILL }}, +#endif }; static gint *ett[] = { &ett_icap, diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 14a9362b3e..a355684e4c 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -47,7 +47,7 @@ static int hf_icq_client_cmd = -1; static int hf_icq_server_cmd = -1; static int hf_icq_sessionid = -1; static int hf_icq_checkcode = -1; -static int hf_icq_decode = -1; +/* static int hf_icq_decode = -1; */ static int hf_icq_type = -1; static gint ett_icq = -1; @@ -1745,8 +1745,10 @@ proto_register_icq(void) {"Server command", "icq.server_cmd", FT_UINT16, BASE_DEC, VALS(serverCmdCode), 0x0, NULL, HFILL }}, { &hf_icq_checkcode, {"Checkcode", "icq.checkcode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_icq_decode, {"Decode", "icq.decode", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }} +#endif }; static gint *ett[] = { &ett_icq, diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index 2455a96cce..90703e3c49 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -33,8 +33,8 @@ static int proto_idp = -1; static int hf_idp_checksum = -1; static int hf_idp_len = -1; -static int hf_idp_src = -1; -static int hf_idp_dst = -1; +/* static int hf_idp_src = -1; */ +/* static int hf_idp_dst = -1; */ static int hf_idp_hops = -1; static int hf_idp_packet_type = -1; static int hf_idp_dnet = -1; @@ -139,13 +139,17 @@ proto_register_idp(void) { "Checksum", "idp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_idp_src, { "Source Address", "idp.src", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif +#if 0 { &hf_idp_dst, { "Destination Address", "idp.dst", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_idp_len, { "Length", "idp.len", FT_UINT16, BASE_DEC, diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 4e2df46369..5458b5b92d 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -1926,7 +1926,7 @@ static int hf_adp_chan_format_24ch = -1; /* ***************************************************************** */ /* AVDECC Enumeration and Control Protocol Data Unit (AECPDU) */ /* ***************************************************************** */ -static int hf_aecp_address_type = -1; +/* static int hf_aecp_address_type = -1; */ static int hf_aecp_association_id = -1; static int hf_aecp_as_path_count = -1; static int hf_aecp_auth_token = -1; @@ -1951,17 +1951,17 @@ static int hf_aecp_clock_source_id = -1; static int hf_aecp_command_type = -1; static int hf_aecp_configuration = -1; static int hf_aecp_connected_flag = -1; -static int hf_aecp_continued_flag = -1; -static int hf_aecp_control_admin_flag = -1; -static int hf_aecp_control_user_l1 = -1; -static int hf_aecp_control_user_l2 = -1; -static int hf_aecp_control_user_l3 = -1; -static int hf_aecp_control_user_l4 = -1; +/* static int hf_aecp_continued_flag = -1; */ +/* static int hf_aecp_control_admin_flag = -1; */ +/* static int hf_aecp_control_user_l1 = -1; */ +/* static int hf_aecp_control_user_l2 = -1; */ +/* static int hf_aecp_control_user_l3 = -1; */ +/* static int hf_aecp_control_user_l4 = -1; */ static int hf_aecp_controller_guid = -1; -static int hf_aecp_count = -1; +/* static int hf_aecp_count = -1; */ static int hf_aecp_descriptor_index = -1; static int hf_aecp_descriptor_type = -1; -static int hf_aecp_descriptors = -1; +/* static int hf_aecp_descriptors = -1; */ static int hf_aecp_dest_mac_valid_flag = -1; static int hf_aecp_entity_specific1 = -1; static int hf_aecp_entity_specific1_valid = -1; @@ -1980,13 +1980,13 @@ static int hf_aecp_entity_specific7_valid = -1; static int hf_aecp_entity_specific8 = -1; static int hf_aecp_entity_specific8_valid = -1; static int hf_aecp_flags_32 = -1; -static int hf_aecp_ipv4_address = -1; -static int hf_aecp_ipv6_address = -1; +/* static int hf_aecp_ipv4_address = -1; */ +/* static int hf_aecp_ipv6_address = -1; */ static int hf_aecp_key = -1; static int hf_aecp_key_eui = -1; static int hf_aecp_key_length = -1; -static int hf_aecp_key_number = -1; -static int hf_aecp_key_part = -1; +/* static int hf_aecp_key_number = -1; */ +/* static int hf_aecp_key_part = -1; */ static int hf_aecp_keychain_id = -1; static int hf_aecp_keychain_id_small = -1; static int hf_aecp_keychain_list_index = -1; @@ -1997,7 +1997,7 @@ static int hf_aecp_key_type = -1; static int hf_aecp_locked_guid = -1; static int hf_aecp_mac_address = -1; static int hf_aecp_map_index = -1; -static int hf_aecp_matrix_affected_item_count = -1; +/* static int hf_aecp_matrix_affected_item_count = -1; */ static int hf_aecp_matrix_column = -1; static int hf_aecp_matrix_direction = -1; static int hf_aecp_matrix_item_offset = -1; @@ -2006,9 +2006,9 @@ static int hf_aecp_matrix_region_width = -1; static int hf_aecp_matrix_rep = -1; static int hf_aecp_matrix_row = -1; static int hf_aecp_matrix_value_count = -1; -static int hf_aecp_media_format = -1; -static int hf_aecp_mem_obj_admin_flag = -1; -static int hf_aecp_mem_obj_settings_flag = -1; +/* static int hf_aecp_media_format = -1; */ +/* static int hf_aecp_mem_obj_admin_flag = -1; */ +/* static int hf_aecp_mem_obj_settings_flag = -1; */ static int hf_aecp_message_type = -1; static int hf_aecp_msrp_acc_lat_valid_flag = -1; static int hf_aecp_msrp_accumulated_latency = -1; @@ -2022,13 +2022,13 @@ static int hf_aecp_operation_type = -1; static int hf_aecp_owner_guid = -1; static int hf_aecp_percent_complete = -1; static int hf_aecp_persistent_flag = -1; -static int hf_aecp_private_key_read_flag = -1; -static int hf_aecp_private_key_write_flag = -1; -static int hf_aecp_public_key_write_flag = -1; -static int hf_aecp_query_id = -1; -static int hf_aecp_query_limit = -1; -static int hf_aecp_query_period = -1; -static int hf_aecp_query_type = -1; +/* static int hf_aecp_private_key_read_flag = -1; */ +/* static int hf_aecp_private_key_write_flag = -1; */ +/* static int hf_aecp_public_key_write_flag = -1; */ +/* static int hf_aecp_query_id = -1; */ +/* static int hf_aecp_query_limit = -1; */ +/* static int hf_aecp_query_period = -1; */ +/* static int hf_aecp_query_type = -1; */ static int hf_aecp_release_flag = -1; static int hf_aecp_sampling_rate = -1; static int hf_aecp_sequence_id = -1; @@ -2067,8 +2067,8 @@ static int hf_aecp_target_guid = -1; static int hf_aecp_token_length = -1; static int hf_aecp_u_flag = -1; static int hf_aecp_unlock_flag = -1; -static int hf_aecp_values = -1; -static int hf_aecp_values_count = -1; +/* static int hf_aecp_values = -1; */ +/* static int hf_aecp_values_count = -1; */ static int hf_aecp_video_format = -1; static int hf_aecp_status_code = -1; @@ -2076,9 +2076,9 @@ static int hf_aecp_status_code = -1; /* AVDECC Entity Model (AEM) */ /* ***************************************************************** */ static int hf_aem_am824_label = -1; -static int hf_aem_aspect_x = -1; -static int hf_aem_aspect_y = -1; -static int hf_aem_audio_channels = -1; +/* static int hf_aem_aspect_x = -1; */ +/* static int hf_aem_aspect_y = -1; */ +/* static int hf_aem_audio_channels = -1; */ static int hf_aem_avb_interface_id = -1; static int hf_aem_buffer_length = -1; static int hf_aem_b_flag = -1; @@ -2094,7 +2094,7 @@ static int hf_aem_base_audio_map = -1; static int hf_aem_base_cluster = -1; static int hf_aem_base_control = -1; static int hf_aem_base_control_block = -1; -static int hf_aem_base_destination = -1; +/* static int hf_aem_base_destination = -1; */ static int hf_aem_base_external_input_port = -1; static int hf_aem_base_external_output_port = -1; static int hf_aem_base_frequency = -1; @@ -2103,7 +2103,7 @@ static int hf_aem_base_internal_output_port = -1; static int hf_aem_base_matrix = -1; static int hf_aem_base_mixer = -1; static int hf_aem_base_signal_selector = -1; -static int hf_aem_base_source = -1; +/* static int hf_aem_base_source = -1; */ static int hf_aem_number_splitters = -1; static int hf_aem_base_splitter = -1; static int hf_aem_number_combiners = -1; @@ -2121,9 +2121,9 @@ static int hf_aem_binary_blob = -1; static int hf_aem_blob_size = -1; static int hf_aem_block_latency = -1; static int hf_aem_reset_time = -1; -static int hf_aem_bpp = -1; +/* static int hf_aem_bpp = -1; */ static int hf_aem_channel_count = -1; -static int hf_aem_channels = -1; +/* static int hf_aem_channels = -1; */ static int hf_aem_clock_source_flags = -1; static int hf_aem_clock_source_id = -1; static int hf_aem_clock_domain_id = -1; @@ -2137,31 +2137,31 @@ static int hf_aem_clock_source_location_type = -1; static int hf_aem_clock_source_name = -1; static int hf_aem_clock_source_name_string = -1; static int hf_aem_clock_source_type = -1; -static int hf_aem_cluster_name = -1; -static int hf_aem_cluster_name_string = -1; -static int hf_aem_color_format = -1; +/* static int hf_aem_cluster_name = -1; */ +/* static int hf_aem_cluster_name_string = -1; */ +/* static int hf_aem_color_format = -1; */ static int hf_aem_color_space = -1; -static int hf_aem_comp1 = -1; -static int hf_aem_comp2 = -1; -static int hf_aem_comp3 = -1; -static int hf_aem_comp4 = -1; +/* static int hf_aem_comp1 = -1; */ +/* static int hf_aem_comp2 = -1; */ +/* static int hf_aem_comp3 = -1; */ +/* static int hf_aem_comp4 = -1; */ static int hf_aem_compress_mode = -1; static int hf_aem_configuration_name = -1; static int hf_aem_configuration_name_string = -1; static int hf_aem_configurations_count = -1; static int hf_aem_control_domain = -1; static int hf_aem_control_latency = -1; -static int hf_aem_control_location_id = -1; -static int hf_aem_control_location_type = -1; +/* static int hf_aem_control_location_id = -1; */ +/* static int hf_aem_control_location_type = -1; */ static int hf_aem_control_name = -1; static int hf_aem_control_name_string = -1; static int hf_aem_control_type = -1; static int hf_aem_control_value_type = -1; static int hf_aem_count = -1; -static int hf_aem_cs_eui64 = -1; +/* static int hf_aem_cs_eui64 = -1; */ static int hf_aem_ctrl_double = -1; static int hf_aem_ctrl_float = -1; -static int hf_aem_ctrl_int16 = -1; +static int hf_aem_ctrl_int16 = -1; static int hf_aem_ctrl_int32 = -1; static int hf_aem_ctrl_int64 = -1; static int hf_aem_ctrl_int8 = -1; @@ -2172,14 +2172,14 @@ static int hf_aem_ctrl_uint8 = -1; static int hf_aem_ctrl_vals = -1; static int hf_aem_current_configuration = -1; static int hf_aem_current_sample_rate = -1; -static int hf_aem_current_signal_id = -1; -static int hf_aem_current_signal_type = -1; +/* static int hf_aem_current_signal_id = -1; */ +/* static int hf_aem_current_signal_type = -1; */ static int hf_aem_dbs = -1; -static int hf_aem_default_signal_id = -1; -static int hf_aem_default_signal_type = -1; +/* static int hf_aem_default_signal_id = -1; */ +/* static int hf_aem_default_signal_type = -1; */ static int hf_aem_descriptor_counts_count = -1; static int hf_aem_descriptor_counts_offset = -1; -static int hf_aem_div = -1; +/* static int hf_aem_div = -1; */ static int hf_aem_entity_guid = -1; static int hf_aem_entity_model_id = -1; static int hf_aem_entity_name = -1; @@ -2193,20 +2193,20 @@ static int hf_aem_flags_class_b = -1; static int hf_aem_flags_clock_sync_source = -1; static int hf_aem_flags_sync_sample_rate_conv = -1; static int hf_aem_fmt = -1; -static int hf_aem_formats_count = -1; +/* static int hf_aem_formats_count = -1; */ static int hf_aem_formats_offset = -1; -static int hf_aem_frame_rate = -1; +/* static int hf_aem_frame_rate = -1; */ static int hf_aem_frequency = -1; static int hf_aem_group_name = -1; static int hf_aem_guid = -1; -static int hf_aem_height = -1; +/* static int hf_aem_height = -1; */ static int hf_aem_iidc_format = -1; static int hf_aem_iidc_mode = -1; static int hf_aem_iidc_rate = -1; static int hf_aem_interface_name = -1; static int hf_aem_interface_name_string = -1; -static int hf_aem_interlace = -1; -static int hf_aem_internal_id = -1; +/* static int hf_aem_interlace = -1; */ +/* static int hf_aem_internal_id = -1; */ static int hf_aem_jack_flags = -1; static int hf_aem_jack_id = -1; static int hf_aem_jack_name = -1; @@ -2225,15 +2225,15 @@ static int hf_aem_mapping_stream_index = -1; static int hf_aem_mappings = -1; static int hf_aem_mappings_offset = -1; static int hf_aem_memory_object_type = -1; -static int hf_aem_mf_height = -1; -static int hf_aem_mf_width = -1; -static int hf_aem_mfd_type = -1; +/* static int hf_aem_mf_height = -1; */ +/* static int hf_aem_mf_width = -1; */ +/* static int hf_aem_mfd_type = -1; */ static int hf_aem_model_name_string = -1; -static int hf_aem_msrp_mapping_priority = -1; -static int hf_aem_msrp_mapping_traffic_class = -1; -static int hf_aem_msrp_mappings = -1; -static int hf_aem_msrp_mappings_count = -1; -static int hf_aem_msrp_mappings_offset = -1; +/* static int hf_aem_msrp_mapping_priority = -1; */ +/* static int hf_aem_msrp_mapping_traffic_class = -1; */ +/* static int hf_aem_msrp_mappings = -1; */ +/* static int hf_aem_msrp_mappings_count = -1; */ +/* static int hf_aem_msrp_mappings_offset = -1; */ static int hf_aem_avb_interface_flags = -1; static int hf_aem_avb_clock_identity = -1; static int hf_aem_avb_priority1 = -1; @@ -2243,11 +2243,11 @@ static int hf_aem_avb_clock_accuracy = -1; static int hf_aem_avb_priority2 = -1; static int hf_aem_avb_domain_number = -1; static int hf_aem_avb_log_sync_interval = -1; -static int hf_aem_avb_propagation_delay = -1; -static int hf_aem_msrp_vlan_id = -1; +/* static int hf_aem_avb_propagation_delay = -1; */ +/* static int hf_aem_msrp_vlan_id = -1; */ static int hf_aem_nb_flag = -1; static int hf_aem_number_audio_maps = -1; -static int hf_aem_number_destinations = -1; +/* static int hf_aem_number_destinations = -1; */ static int hf_aem_number_matrices = -1; static int hf_aem_number_mixers = -1; static int hf_aem_number_of_clusters = -1; @@ -2259,7 +2259,7 @@ static int hf_aem_number_of_formats = -1; static int hf_aem_number_of_internal_input_ports = -1; static int hf_aem_number_of_internal_output_ports = -1; static int hf_aem_number_of_mappings = -1; -static int hf_aem_number_of_sources = -1; +/* static int hf_aem_number_of_sources = -1; */ static int hf_aem_number_of_stream_input_ports = -1; static int hf_aem_number_of_stream_output_ports = -1; static int hf_aem_number_of_strings = -1; @@ -2267,7 +2267,7 @@ static int hf_aem_number_of_values = -1; static int hf_aem_number_signal_selectors = -1; static int hf_aem_object_name = -1; static int hf_aem_object_name_string = -1; -static int hf_aem_oui24 = -1; +/* static int hf_aem_oui24 = -1; */ static int hf_aem_path_latency = -1; static int hf_aem_port_flags = -1; static int hf_aem_pull_field = -1; @@ -2283,13 +2283,13 @@ static int hf_aem_signal_type = -1; static int hf_aem_signals_count = -1; static int hf_aem_signals_offset = -1; static int hf_aem_sources = -1; -static int hf_aem_sources_offset = -1; +/* static int hf_aem_sources_offset = -1; */ static int hf_aem_start_address = -1; -static int hf_aem_stream_channels = -1; +/* static int hf_aem_stream_channels = -1; */ static int hf_aem_stream_flags = -1; static int hf_aem_stream_format = -1; static int hf_aem_stream_formats = -1; -static int hf_aem_stream_id = -1; +/* static int hf_aem_stream_id = -1; */ static int hf_aem_stream_name = -1; static int hf_aem_stream_name_string = -1; static int hf_aem_string = -1; @@ -2300,12 +2300,12 @@ static int hf_aem_unit = -1; static int hf_aem_unit_name = -1; static int hf_aem_unit_name_string = -1; static int hf_aem_unknown_descriptor = -1; -static int hf_aem_value_offset = -1; +/* static int hf_aem_value_offset = -1; */ static int hf_aem_values_offset = -1; static int hf_aem_vendor_id = -1; static int hf_aem_vendor_name_string = -1; static int hf_aem_video_mode = -1; -static int hf_aem_width = -1; +/* static int hf_aem_width = -1; */ /****************************************************************** */ /* AVDECC Connection Management Protocol Data Unit (ACMPDU) */ @@ -2357,7 +2357,7 @@ static int ett_aem_clock_source_flags = -1; static int ett_aem_mappings = -1; static int ett_aem_ctrl_vals = -1; static int ett_aem_sources = -1; -static int ett_aem_media_format = -1; +/* static int ett_aem_media_format = -1; */ static int ett_aem_stream_format = -1; static int ett_aecp_descriptors = -1; @@ -5168,10 +5168,12 @@ proto_register_17221(void) {"Item Offset", "ieee17221.matrix_item_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aecp_matrix_affected_item_count, {"Affected Item Count", "ieee17221.matrix_affected_item_count", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif /* START_STREAMING */ @@ -5254,6 +5256,7 @@ proto_register_17221(void) {"Key Signature", "ieee17221.key_signature", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aecp_key_number, {"Key ID", "ieee17221.key_id", FT_UINT16, BASE_HEX, NULL, AECP_KEY_NUMBER_MASK, NULL, HFILL } @@ -5266,11 +5269,13 @@ proto_register_17221(void) {"Key Part", "ieee17221.key_part", FT_UINT8, BASE_DEC, NULL, AECP_KEY_PART_MASK, NULL, HFILL } }, +#endif { &hf_aecp_key_length, {"Key Length", "ieee17221.key_length", FT_UINT16, BASE_DEC, NULL, AECP_KEY_LENGTH_MASK, NULL, HFILL } }, +#if 0 { &hf_aecp_private_key_read_flag, {"Private Key Read Flag", "ieee17221.flags.private_key_read", FT_BOOLEAN, 32, NULL, AECP_PRIVATE_KEY_READ_FLAG_MASK, NULL, HFILL } @@ -5311,6 +5316,7 @@ proto_register_17221(void) {"Control User L4 flag", "ieee17221.flags.control_user_l4", FT_BOOLEAN, 32, NULL, AECP_CONTROL_USER_L4_FLAG_MASK, NULL, HFILL } }, +#endif { &hf_aecp_keychain_list_index, {"Keychain List Index", "ieee17221.keychain_list_index", @@ -5592,10 +5598,12 @@ proto_register_17221(void) /* REBOOT */ /* SET_MEDIA_FORMAT / GET_MEDIA_FORMAT */ +#if 0 { &hf_aecp_media_format, {"Media Format", "ieee17221.media_format", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aecp_video_format, {"Video Format", "ieee17221.video_format", @@ -5607,14 +5615,17 @@ proto_register_17221(void) }, /* REGISTER_STATE_NOTIFICATION */ +#if 0 { &hf_aecp_address_type, {"Address Type", "ieee17221.address_type", FT_UINT16, BASE_HEX, VALS(aecp_address_type_vals), 0x00, NULL, HFILL } }, +#endif { &hf_aecp_mac_address, { "MAC address", "ieee17221.mac_address", FT_ETHER, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aecp_ipv4_address, {"IPV4 Address", "ieee17221.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0x00, NULL, HFILL } @@ -5623,10 +5634,12 @@ proto_register_17221(void) {"IPv6 Address", "ieee17221.ipv6_address", FT_IPv6, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif /* DEREGISTER_STATE_NOTIFICATION */ /* REGISTER_QUERY_NOTIFICATION / DEREGISTER_QUERY_NOTIFICATION */ +#if 0 { &hf_aecp_query_period, {"Query Period (ms)", "ieee17221.query_period", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -5643,10 +5656,12 @@ proto_register_17221(void) {"Query ID", "ieee17221.query_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif /* IDENTIFY_NOTIFICATION */ /* STATE_CHANGE_NOTIFICATION */ +#if 0 { &hf_aecp_count, {"Count", "ieee17221.count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -5661,6 +5676,7 @@ proto_register_17221(void) {"Values Count", "ieee17221.values_count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif /* START_OPERATION */ { &hf_aecp_operation_id, @@ -5996,10 +6012,12 @@ proto_register_17221(void) {"Class B Flag", "ieee17221.flags.class_b", FT_BOOLEAN, 16, NULL, AEM_CLASS_B_FLAG_MASK, NULL, HFILL } }, +#if 0 { &hf_aem_stream_channels, {"Stream Channels", "ieee17221.stream_channels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aem_formats_offset, {"Formats Offset", "ieee17221.formats_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6099,10 +6117,12 @@ proto_register_17221(void) {"Synchronous Sample Rate Converter Flag", "ieee17221.flags.sync_sample_rate_conv", FT_BOOLEAN, 16, NULL, AEM_SYNC_SAMPLE_RATE_CONV_FLAG_MASK, NULL, HFILL } }, +#if 0 { &hf_aem_audio_channels, {"Audio Channels", "ieee17221.audio_channels", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aem_number_of_clusters, {"Number of Clusters", "ieee17221.number_of_clusters", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6121,6 +6141,7 @@ proto_register_17221(void) }, /* VIDEO_PORT_INPUT */ /* VIDEO_PORT_OUTPUT */ +#if 0 { &hf_aem_stream_id, {"Stream Descriptor ID", "ieee17221.stream_descriptor_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6129,6 +6150,7 @@ proto_register_17221(void) {"Formats Count", "ieee17221.formats_count", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif /* EXTERNAL_PORT_INPUT */ /* EXTERNAL_PORT_OUTPUT */ @@ -6140,6 +6162,7 @@ proto_register_17221(void) /* SENSOR_PORT_OUTPUT */ /* INTERNAL_PORT_INPUT */ /* INTERNAL_PORT_OUTPUT */ +#if 0 { &hf_aem_internal_id, {"Internal ID", "ieee17221.internal_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6169,6 +6192,7 @@ proto_register_17221(void) {"MSRP VLAN ID", "ieee17221.msrp_vlan_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aem_avb_interface_flags, {"Interface Flags", "ieee17221.interface_flags", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6205,10 +6229,12 @@ proto_register_17221(void) {"Log sync Interval", "ieee17221.log_sync_interval", FT_INT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aem_avb_propagation_delay, {"Propagation Delay", "ieee17221.propagation_delay", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif /* CLOCK_SOURCE */ { &hf_aem_clock_source_name, @@ -6277,6 +6303,7 @@ proto_register_17221(void) {"AM824 Label", "ieee17221.am824_label", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aem_cluster_name, {"Cluster Name", "ieee17221.cluster_name", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } @@ -6285,12 +6312,14 @@ proto_register_17221(void) {"Cluster Name String", "ieee17221.cluster_name_string", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif /* CONTROL */ { &hf_aem_control_type, {"Control Type", "ieee17221.control_type", FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aem_control_location_type, {"Control Location Type", "ieee17221.control_location_type", FT_UINT16, BASE_HEX, VALS(aem_descriptor_type_vals), 0x00, NULL, HFILL } @@ -6299,6 +6328,7 @@ proto_register_17221(void) {"Control Location ID", "ieee17221.control_location_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aem_control_value_type, {"Control Value Type", "ieee17221.control_value_type", FT_UINT16, BASE_HEX, VALS(aem_control_value_type_vals), 0x00, NULL, HFILL } @@ -6329,6 +6359,7 @@ proto_register_17221(void) }, /* SIGNAL_SELECTOR */ +#if 0 { &hf_aem_sources_offset, {"Sources Offset", "ieee17221.sources_offset", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6349,6 +6380,7 @@ proto_register_17221(void) {"Default Signal ID", "ieee17221.default_signal_id", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aem_block_latency, {"Block Latency", "ieee17221.block_latency", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6371,6 +6403,7 @@ proto_register_17221(void) }, /* MIXER */ +#if 0 { &hf_aem_number_of_sources, {"Number of Sources", "ieee17221.number_of_sources", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } @@ -6401,6 +6434,7 @@ proto_register_17221(void) {"Base Destination", "ieee17221.base_destination", FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL } }, +#endif /* LOCALE */ { &hf_aem_locale_identifier, @@ -6545,6 +6579,7 @@ proto_register_17221(void) /* Standard media formats are defined by always having the 24 most significant bits * of the EUI64 set to 0x90e0f0 */ +#if 0 { &hf_aem_oui24, {"OUI-24", "ieee17221.oui24", FT_UINT24, BASE_HEX, NULL, 0x00, NULL, HFILL } @@ -6613,6 +6648,7 @@ proto_register_17221(void) {"CS EUI64", "ieee17221.cs_eui64", FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL } }, +#endif /* BEGIN STREAM FORMAT (SF) FIELDS */ { &hf_aem_stream_format, {"Stream Format", "ieee17221.stream_format", @@ -6690,10 +6726,12 @@ proto_register_17221(void) {"Color Space", "ieee17221.color_sapce", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } }, +#if 0 { &hf_aecp_values, {"Values", "ieee17221.values", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, +#endif { &hf_aecp_status_code, {"Status", "ieee17221.status", FT_UINT8, BASE_HEX, VALS(aem_status_type_vals), AECP_STATUS_CODE_MASK, NULL, HFILL } @@ -6726,7 +6764,7 @@ proto_register_17221(void) &ett_aem_mappings, &ett_aem_ctrl_vals, &ett_aem_sources, - &ett_aem_media_format, +/* &ett_aem_media_format, */ &ett_aecp_descriptors, &ett_aecp_flags_32, &ett_aem_stream_format diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index 19d5c544fc..fc9fd3c700 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -53,7 +53,7 @@ static int hf_netmon_802_11_op_mode_sta = -1; static int hf_netmon_802_11_op_mode_ap = -1; static int hf_netmon_802_11_op_mode_sta_ext = -1; static int hf_netmon_802_11_op_mode_mon = -1; -static int hf_netmon_802_11_flags = -1; +/* static int hf_netmon_802_11_flags = -1; */ static int hf_netmon_802_11_phy_type = -1; static int hf_netmon_802_11_channel = -1; static int hf_netmon_802_11_frequency = -1; @@ -197,8 +197,10 @@ proto_register_netmon_802_11(void) BASE_HEX, NULL, OP_MODE_STA_EXT, NULL, HFILL } }, { &hf_netmon_802_11_op_mode_mon, { "Monitor mode", "netmon_802_11.op_mode.on", FT_UINT32, BASE_HEX, NULL, OP_MODE_MON, NULL, HFILL } }, +#if 0 { &hf_netmon_802_11_flags, { "Flags", "netmon_802_11.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#endif { &hf_netmon_802_11_phy_type, { "PHY type", "netmon_802_11.phy_type", FT_UINT32, BASE_DEC, VALS(phy_type), 0x0, NULL, HFILL } }, { &hf_netmon_802_11_channel, { "Channel", "netmon_802_11.channel", FT_UINT32, diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index e1f0f465d5..0d9cd30e6e 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -51,7 +51,7 @@ static int hf_radiotap_pad = -1; static int hf_radiotap_length = -1; static int hf_radiotap_present = -1; static int hf_radiotap_mactime = -1; -static int hf_radiotap_channel = -1; +/* static int hf_radiotap_channel = -1; */ static int hf_radiotap_channel_frequency = -1; static int hf_radiotap_channel_flags = -1; static int hf_radiotap_channel_flags_turbo = -1; @@ -2177,10 +2177,12 @@ void proto_register_radiotap(void) FT_UINT32, BASE_HEX, NULL, 0x0, "Frame check sequence of this frame", HFILL}}, +#if 0 {&hf_radiotap_channel, {"Channel", "radiotap.channel", FT_UINT32, BASE_DEC, NULL, 0x0, "802.11 channel number that this frame was sent/received on", HFILL}}, +#endif {&hf_radiotap_channel_frequency, {"Channel frequency", "radiotap.channel.freq", diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 562cdaf8d4..f9c178f76c 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -65,7 +65,7 @@ static int hf_ieee8021ah_c_daddr = -1; /* encapsulated customer dest addr */ static int hf_ieee8021ah_c_saddr = -1; /* encapsulated customer src addr */ static int hf_ieee8021ah_etype = -1; -static int hf_ieee8021ah_len = -1; +/* static int hf_ieee8021ah_len = -1; */ static int hf_ieee8021ah_trailer = -1; static gint ett_ieee8021ah = -1; @@ -364,9 +364,11 @@ proto_register_ieee8021ah(void) { &hf_ieee8021ah_etype, { "Type", "ieee8021ah.etype", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, NULL, HFILL }}, +#if 0 { &hf_ieee8021ah_len, { "Length", "ieee8021ah.len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_ieee8021ah_trailer, { "Trailer", "ieee8021ah.trailer", FT_BYTES, BASE_NONE, NULL, 0x0, "802.1ah Trailer", HFILL }} diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index 9151cdd7e2..b1cde11769 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -106,7 +106,7 @@ static gint hf_image_height = -1; static gint hf_local_color_map_present = -1; static gint hf_local_color_resolution = -1; static gint hf_local_color_map_ordered = -1; /* GIF89a */ -static gint hf_local_image_bpp = -1; +/* static gint hf_local_image_bpp = -1; */ static gint hf_local_color_map = -1; static gint hf_extension = -1; @@ -555,6 +555,7 @@ proto_register_gif(void) HFILL } }, +#if 0 { &hf_local_image_bpp, { "Image bits per pixel minus 1", IMG_GIF ".local.bpp", @@ -563,6 +564,7 @@ proto_register_gif(void) HFILL } }, +#endif { &hf_local_color_map, { "Local color map", IMG_GIF ".local.color_map", diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 6f9f44c7cc..891e4e7914 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -126,9 +126,9 @@ static int hf_imf_message_text = -1; static int hf_imf_display_name = -1; static int hf_imf_address = -1; -static int hf_imf_mailbox_list = -1; +/* static int hf_imf_mailbox_list = -1; */ static int hf_imf_mailbox_list_item = -1; -static int hf_imf_address_list = -1; +/* static int hf_imf_address_list = -1; */ static int hf_imf_address_list_item = -1; /* draft-zeilenga-email-seclabel-04 */ @@ -1149,15 +1149,19 @@ proto_register_imf(void) { &hf_imf_address, { "Address", "imf.address", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_imf_address_list, { "Address List", "imf.address_list", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_imf_address_list_item, { "Item", "imf.address_list.item", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_imf_mailbox_list, { "Mailbox List", "imf.mailbox_list", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_imf_mailbox_list_item, { "Item", "imf.mailbox_list.item", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 5dde254597..0f6e39c310 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -132,7 +132,7 @@ static gint hf_ipmi_se_cp05_num_evfilters = -1; static gint hf_ipmi_se_cp06_filter = -1; static gint hf_ipmi_se_cp06_data = -1; static gint hf_ipmi_se_cp07_filter = -1; -static gint hf_ipmi_se_cp07_data = -1; +/* static gint hf_ipmi_se_cp07_data = -1; */ static gint hf_ipmi_se_cp08_policies = -1; static gint hf_ipmi_se_cp09_entry = -1; static gint hf_ipmi_se_cp09_data = -1; @@ -3037,9 +3037,11 @@ ipmi_register_se(gint proto_ipmi) { &hf_ipmi_se_cp07_filter, { "Filter number (set selector)", "ipmi.cp07.filter", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }}, +#if 0 { &hf_ipmi_se_cp07_data, { "Filter data (byte 1)", "ipmi.cp07.data", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, +#endif { &hf_ipmi_se_cp08_policies, { "Number of Alert Policy Entries", "ipmi.cp08.policies", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index 4a9f53ede3..878e545e1b 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -93,8 +93,10 @@ static gint hf_ipmi_stor_25_inprogress = -1; static gint hf_ipmi_stor_25_data = -1; static gint hf_ipmi_stor_25_added_rec_id = -1; +#if 0 static gint hf_ipmi_stor_26_rsrv_id = -1; static gint hf_ipmi_stor_26_rec_id = -1; +#endif static gint hf_ipmi_stor_26_del_rec_id = -1; static gint hf_ipmi_stor_27_rsrv_id = -1; @@ -145,8 +147,10 @@ static gint hf_ipmi_stor_45_inprogress = -1; static gint hf_ipmi_stor_45_data = -1; static gint hf_ipmi_stor_45_added_rec_id = -1; +#if 0 static gint hf_ipmi_stor_46_rsrv_id = -1; static gint hf_ipmi_stor_46_rec_id = -1; +#endif static gint hf_ipmi_stor_46_del_rec_id = -1; static gint hf_ipmi_stor_47_rsrv_id = -1; @@ -882,12 +886,15 @@ ipmi_register_storage(gint proto_ipmi) { "Record ID for added record", "ipmi.st25.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_ipmi_stor_26_rsrv_id, { "Reservation ID", "ipmi.st26.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_ipmi_stor_26_rec_id, { "Record ID", "ipmi.st26.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, +#endif { &hf_ipmi_stor_26_del_rec_id, { "Deleted Record ID", "ipmi.st26.del_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -1016,12 +1023,15 @@ ipmi_register_storage(gint proto_ipmi) { "Record ID for added record", "ipmi.st45.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, +#if 0 { &hf_ipmi_stor_46_rsrv_id, { "Reservation ID", "ipmi.st46.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_ipmi_stor_46_rec_id, { "Record ID", "ipmi.st46.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, +#endif { &hf_ipmi_stor_46_del_rec_id, { "Deleted Record ID", "ipmi.st46.del_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 2be82f2fe1..2308b02d89 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -259,7 +259,7 @@ static gint hf_ipmi_trn_serial16_ndest = -1; static gint hf_ipmi_trn_serial17_dest_sel = -1; static gint hf_ipmi_trn_serial17_ack = -1; static gint hf_ipmi_trn_serial17_dest_type = -1; -static gint hf_ipmi_trn_serial17_ack_timeout = -1; +/* static gint hf_ipmi_trn_serial17_ack_timeout = -1; */ static gint hf_ipmi_trn_serial17_alert_retries = -1; static gint hf_ipmi_trn_serial17_call_retries = -1; static gint hf_ipmi_trn_serial17_alert_ack_timeout = -1; @@ -2475,9 +2475,11 @@ ipmi_register_transport(gint proto_ipmi) { &hf_ipmi_trn_serial17_dest_type, { "Destination Type", "ipmi.serial17.dest_type", FT_UINT8, BASE_HEX, serial17_dest_type_vals, 0x0f, NULL, HFILL }}, +#if 0 { &hf_ipmi_trn_serial17_ack_timeout, { "Alert Acknowledge Timeout", "ipmi.serial17.ack_timeout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +#endif { &hf_ipmi_trn_serial17_alert_retries, { "Alert retries", "ipmi.serial17.alert_retries", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL }}, diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 87071f4907..9933b6b297 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -54,7 +54,7 @@ static int hf_isis_hello_lan_id = -1; static int hf_isis_hello_local_circuit_id = -1; static int hf_isis_hello_clv_ipv4_int_addr = -1; static int hf_isis_hello_clv_ipv6_int_addr = -1; -static int hf_isis_hello_clv_ptp_adj = -1; +/* static int hf_isis_hello_clv_ptp_adj = -1; */ static int hf_isis_hello_clv_mt = -1; static int hf_isis_hello_clv_restart_flags = -1; static int hf_isis_hello_clv_restart_flags_rr = -1; @@ -579,11 +579,11 @@ dissect_hello_restart_clv(tvbuff_t *tvb, restart_flags_item = proto_tree_add_uint ( tree, hf_isis_hello_clv_restart_flags, tvb, offset, 1, restart_options); flags_tree = proto_item_add_subtree(restart_flags_item, ett_isis_hello_clv_restart_flags); - proto_tree_add_boolean (flags_tree, hf_isis_hello_clv_restart_flags_sa, + proto_tree_add_boolean (flags_tree, hf_isis_hello_clv_restart_flags_sa, tvb, offset, 1, restart_options ); - proto_tree_add_boolean (flags_tree, hf_isis_hello_clv_restart_flags_ra, + proto_tree_add_boolean (flags_tree, hf_isis_hello_clv_restart_flags_ra, tvb, offset, 1, restart_options ); - proto_tree_add_boolean (flags_tree, hf_isis_hello_clv_restart_flags_rr, + proto_tree_add_boolean (flags_tree, hf_isis_hello_clv_restart_flags_rr, tvb, offset, 1, restart_options ); /* Append an indication of which flags are set in the restart @@ -726,7 +726,7 @@ dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, * * Description: * Decode for a hello packets authenticaion clv. - * Calls into the CLV common one. + * Calls into the CLV common one. * * Input: * tvbuff_t * : tvbuffer for packet data @@ -750,7 +750,7 @@ dissect_hello_authentication_clv(tvbuff_t *tvb, * * Description: * Decode for a hello packets IP authenticaion clv. - * Calls into the CLV common one. + * Calls into the CLV common one. * * Input: * tvbuff_t * : tvbuffer for packet data @@ -798,14 +798,14 @@ dissect_hello_checksum_clv(tvbuff_t *tvb, return; } - checksum = tvb_get_ntohs(tvb, offset); + checksum = tvb_get_ntohs(tvb, offset); /* the check_and_get_checksum() function needs to know how big * the packet is. we can either pass through the pdu-len through several layers * of dissectors and wrappers or extract the PDU length field from the PDU specific header * which is offseted 17 bytes in IIHs (relative to the beginning of the IS-IS packet) */ - pdu_length = tvb_get_ntohs(tvb, 17); + pdu_length = tvb_get_ntohs(tvb, 17); /* unlike the LSP checksum verification which starts at an offset of 12 we start at offset 0*/ switch (check_and_get_checksum(tvb, 0, pdu_length, checksum, offset, &cacl_checksum)) @@ -896,7 +896,7 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, proto_tree_add_text ( tree, tvb, offset+1, 4, "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); proto_tree_add_text ( tree, tvb, offset+5, id_length, - "Neighbor SystemID: %s", + "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, id_length), id_length ) ); break; case 15: @@ -905,10 +905,10 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, proto_tree_add_text ( tree, tvb, offset+1, 4, "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); proto_tree_add_text ( tree, tvb, offset+5, id_length, - "Neighbor SystemID: %s", + "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, id_length), id_length ) ); proto_tree_add_text ( tree, tvb, offset+5+id_length, 4, - "Neighbor Extended Local circuit ID: 0x%08x", + "Neighbor Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+5+id_length) ); break; default: @@ -1034,7 +1034,7 @@ isis_dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int source_id = tvb_get_ptr(tvb, offset, id_length); proto_tree_add_bytes_format(hello_tree, hf_isis_hello_source_id, tvb, offset, id_length, source_id, - "System-ID {Sender of PDU} : %s", + "System-ID {Sender of PDU} : %s", print_system_id( source_id, id_length ) ); } if (check_col(pinfo->cinfo, COL_INFO)) { @@ -1161,9 +1161,11 @@ isis_register_hello(int proto_isis) { { "IPv6 interface address", "isis.hello.clv_ipv6_int_addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +#if 0 { &hf_isis_hello_clv_ptp_adj, { "Point-to-point Adjacency", "isis.hello.clv_ptp_adj", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#endif { &hf_isis_hello_clv_mt, { "MT-ID", "isis.hello.clv_mt", @@ -1175,27 +1177,27 @@ isis_register_hello(int proto_isis) { { &hf_isis_hello_clv_restart_flags_rr, { "Restart Request", "isis.hello.clv_restart_flags.rr", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_RR, + FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_RR, "When set, the router is beginning a graceful restart", HFILL }}, { &hf_isis_hello_clv_restart_flags_ra, { "Restart Acknowledgment", "isis.hello.clv_restart_flags.ra", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_RA, + FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_RA, "When set, the router is willing to enter helper mode", HFILL }}, { &hf_isis_hello_clv_restart_flags_sa, { "Suppress Adjacency", "isis.hello.clv_restart_flags.sa", - FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_SA, + FT_BOOLEAN, 8, TFS(&tfs_true_false), ISIS_RESTART_SA, "When set, the router is starting as opposed to restarting", HFILL }}, { &hf_isis_hello_clv_restart_remain_time, { "Remaining holding time", "isis.hello.clv_restart.remain_time", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "How long the helper router will maintain the existing adjacency", HFILL }}, { &hf_isis_hello_clv_restart_neighbor, { "Restarting Neighbor ID", "isis.hello.clv_restart.neighbor", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, "The System ID of the restarting neighbor", HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index dcd8c63e99..b58ca4c414 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -55,7 +55,7 @@ static int hf_isl_hsa = -1; static int hf_isl_vlan_id = -1; static int hf_isl_bpdu = -1; static int hf_isl_index = -1; -static int hf_isl_crc = -1; +/* static int hf_isl_crc = -1; */ static int hf_isl_src_vlan_id = -1; static int hf_isl_explorer = -1; static int hf_isl_dst_route_descriptor = -1; @@ -364,9 +364,11 @@ proto_register_isl(void) { &hf_isl_index, { "Index", "isl.index", FT_UINT16, BASE_DEC, NULL, 0x0, "Port index of packet source", HFILL }}, +#if 0 { &hf_isl_crc, { "CRC", "isl.crc", FT_UINT32, BASE_HEX, NULL, 0x0, "CRC field of encapsulated frame", HFILL }}, +#endif { &hf_isl_src_vlan_id, { "Source VLAN ID", "isl.src_vlan_id", FT_UINT16, BASE_DEC, NULL, 0xFFFE, "Source Virtual LAN ID (Color)", HFILL }}, diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index c5b85bc627..b8a97c097b 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -149,7 +149,7 @@ static int hf_ixveriwave_vw_l4id = -1; /*veriwave note: i know the below method seems clunky, but they didn't have a item_format at the time to dynamically add the appropriate decode text*/ static int hf_ixveriwave_vw_info_retryCount = -1; -static int hf_ixveriwave_vw_info_tx_bit15 = -1; +/* static int hf_ixveriwave_vw_info_tx_bit15 = -1; */ static int hf_ixveriwave_vw_info_rx_1_bit8 = -1; static int hf_ixveriwave_vw_info_rx_1_bit9 = -1; @@ -209,6 +209,7 @@ static int hf_radiotap_vw_info_rx_2_bit13 = -1; static int hf_radiotap_vw_info_rx_2_bit14 = -1; static int hf_radiotap_vw_info_rx_2_bit15 = -1; +#if 0 static int hf_radiotap_vw_errors_rx_1_bit0 = -1; static int hf_radiotap_vw_errors_rx_1_bit1 = -1; static int hf_radiotap_vw_errors_rx_1_bit2 = -1; @@ -225,6 +226,7 @@ static int hf_radiotap_vw_errors_rx_1_bit12 = -1; static int hf_radiotap_vw_errors_rx_1_bit13 = -1; static int hf_radiotap_vw_errors_rx_1_bit14 = -1; static int hf_radiotap_vw_errors_rx_1_bit15 = -1; +#endif static int hf_radiotap_vw_errors_rx_2_bit0 = -1; static int hf_radiotap_vw_errors_rx_2_bit1 = -1; @@ -1120,9 +1122,11 @@ void proto_register_ixveriwave(void) the frame was impressed on the enet tx media with one or more octets having tx_en framing signal deasserted. this is caused by software setting the drain all register bit. */ +#if 0 { &hf_ixveriwave_vw_info_tx_bit15, { "Info bit 15-frame was impressed on the ent tx media with one or more octets having tx_en framing signal deasserted.", "ixveriwave.info.bit15", FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL } }, +#endif /* rx info decodes for fpga ver VW510024 */ /*all are reserved*/ @@ -1312,6 +1316,7 @@ void proto_register_ixveriwave(void) { "Errors", "ixveriwave.errors", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +#if 0 /* rx error decodes for fpga ver VW510006 */ { &hf_radiotap_vw_errors_rx_1_bit0, { "L1 error", "ixveriwave.errors.bit0", @@ -1376,6 +1381,7 @@ void proto_register_ixveriwave(void) { &hf_radiotap_vw_errors_rx_1_bit15, { "Reserved", "ixveriwave.errors.bit15", FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL } }, +#endif /* All other enumerations are reserved.*/ /* rx error decodes for fpga ver VW510021 */ diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index bdf91d8dab..85ec2bf8b9 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -170,8 +170,10 @@ static int hf_mpls_echo_tlv_ilso_label = -1; static int hf_mpls_echo_tlv_ilso_exp = -1; static int hf_mpls_echo_tlv_ilso_bos = -1; static int hf_mpls_echo_tlv_ilso_ttl = -1; +#if 0 static int hf_mpls_echo_tlv_rto_ipv4 = -1; static int hf_mpls_echo_tlv_rto_ipv6 = -1; +#endif static int hf_mpls_echo_tlv_reply_tos = -1; static int hf_mpls_echo_tlv_reply_tos_mbz = -1; static int hf_mpls_echo_tlv_errored_type = -1; @@ -2126,6 +2128,7 @@ proto_register_mpls_echo(void) { "TTL", "mpls_echo.tlv.ilso_ipv4.ttl", FT_UINT8, BASE_DEC, NULL, 0x0, "MPLS ECHO TLV Interface and Label Stack TTL", HFILL} }, +#if 0 { &hf_mpls_echo_tlv_rto_ipv4, { "Reply-to IPv4 Address", "mpls_echo.tlv.rto.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "MPLS ECHO TLV IPv4 Reply-To Object", HFILL} @@ -2134,6 +2137,7 @@ proto_register_mpls_echo(void) { "Reply-to IPv6 Address", "mpls_echo.tlv.rto.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "MPLS ECHO TLV IPv6 Reply-To Object", HFILL} }, +#endif { &hf_mpls_echo_tlv_reply_tos, { "Reply-TOS Byte", "mpls_echo.tlv.reply.tos", FT_UINT8, BASE_DEC, NULL, 0x0, "MPLS ECHO TLV Reply-TOS Byte", HFILL} @@ -2209,24 +2213,24 @@ proto_register_mpls_echo(void) { "DST AC ID", "mpls_echo.lspping.tlv.pw.dst.ac.id", FT_UINT32, BASE_DEC, NULL, 0x0, "PW FEC DST AC ID", HFILL} }, -/** +#if 0 { &hf_mpls_echo_lspping_tlv_pw_agi_type, { "AGI TYPE", "mpls_echo.lspping.tlv.pw.agi.type", FT_UINT8, BASE_DEC, NULL, 0x0, "PW AGI TYPE", HFILL} }, -**/ -/** +#endif +#if 0 { &hf_mpls_echo_lspping_tlv_pw_agi_len, { "AGI Length", "mpls_echo.lspping.tlv.pw.agi.len", FT_UINT8, BASE_DEC, NULL, 0x0, "PW AGI LENGTH", HFILL} }, -**/ -/** +#endif +#if 0 { &hf_mpls_echo_lspping_tlv_pw_agi_val, { "AGI VALUE", "mpls_echo.lspping.tlv.pw.agi.val", FT_STRING, BASE_NONE, NULL, 0x0, "PW AGI VALUE", HFILL} }, -**/ +#endif { &hf_mpls_echo_tlv_dd_map_mtu, { "MTU", "mpls_echo.lspping.tlv.dd_map.mtu", FT_UINT16, BASE_DEC, NULL, 0x0, "MPLS ECHO TLV Detailed Downstream Map MTU", HFILL} @@ -2309,29 +2313,29 @@ proto_register_mpls_echo(void) { "Multipath Information", "mpls_echo.subtlv.dd_map.multipath_info", FT_BYTES, BASE_NONE, NULL, 0x0, "Detailed Downstream Mapping TLV Multipath Data Sub-TLV Value", HFILL} }, -/** +#if 0 { &hf_mpls_echo_tlv_ddstlv_map_mp_label, { "Downstream Label", "mpls_echo.tlv.ddstlv_map.mp_label", FT_UINT24, BASE_DEC, VALS(special_labels), 0x0, "MPLS ECHO TLV Detailed Downstream Map Downstream Label", HFILL} }, -**/ +#endif { &hf_mpls_echo_tlv_ddstlv_map_mp_proto, { "Downstream Protocol", "mpls_echo.tlv.ddstlv_map.mp_proto", FT_UINT8, BASE_DEC, VALS(mpls_echo_tlv_ds_map_mp_proto), 0x0, "MPLS ECHO TLV Detailed Downstream Map Downstream Protocol", HFILL} }, -/** +#if 0 { &hf_mpls_echo_tlv_ddstlv_map_mp_exp, { "Downstream Experimental", "mpls_echo.tlv.ddstlv_map.mp_exp", FT_UINT8, BASE_DEC, NULL, 0x0, "MPLS ECHO TLV Detailed Downstream Map Downstream Experimental", HFILL} }, -**/ -/** +#endif +#if 0 { &hf_mpls_echo_tlv_ddstlv_map_mp_bos, { "Downstream BOS", "mpls_echo.tlv.ddstlv_map.mp_bos", FT_UINT8, BASE_DEC, NULL, 0x0, "MPLS ECHO TLV Detailed Downstream Map Downstream BOS", HFILL} }, -**/ +#endif { &hf_mpls_echo_sub_tlv_multipath_ip, { "IP Address", "mpls_echo.tlv.ddstlv_map_mp.ip", FT_IPv4, BASE_NONE, NULL, 0x0, "MPLS ECHO TLV Detailed Downstream Map Multipath IP Address", HFILL} @@ -2438,12 +2442,12 @@ proto_register_mpls_echo(void) { "Target IPv4 Address", "mpls_echo.tlv.resp_id.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "P2MP Responder ID TLV IPv4 Address", HFILL} }, -/** +#if 0 { &hf_mpls_echo_tlv_responder_indent_ipv6, { "Target IPv6 Address", "mpls_echo.tlv.resp_id.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "P2MP Responder ID TLV IPv6 Address", HFILL} }, -**/ +#endif { &hf_mpls_echo_tlv_echo_jitter, { "Echo Jitter time", "mpls_echo.tlv.echo_jitter", FT_UINT32, BASE_DEC, NULL, 0x0, "MPLS ECHO Jitter time", HFILL} diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 37ae7a1d5d..d12de3d00c 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -101,7 +101,7 @@ static int hf_aux_data_desc = -1; static int hf_detail_level = -1; static int hf_recv_buf_len = -1; static int hf_send_buf_len = -1; -static int hf_continuation_from = -1; +/* static int hf_continuation_from = -1; */ static int hf_status = -1; static int hf_convert = -1; static int hf_ecount = -1; @@ -2948,9 +2948,11 @@ proto_register_pipe_lanman(void) { "Send Buffer Length", "lanman.send_buf_len", FT_UINT16, BASE_DEC, NULL, 0, "LANMAN Send Buffer Length", HFILL }}, +#if 0 { &hf_continuation_from, { "Continuation from message in frame", "lanman.continuation_from", FT_UINT32, BASE_DEC, NULL, 0, "This is a LANMAN continuation from the message in the frame in question", HFILL }}, +#endif { &hf_status, { "Status", "lanman.status", FT_UINT16, BASE_DEC, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 3639ac3af4..2a5f33cb12 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -262,6 +262,7 @@ static int hf_smb_file_attr_directory_16bit = -1; static int hf_smb_file_attr_directory_8bit = -1; static int hf_smb_file_attr_archive_16bit = -1; static int hf_smb_file_attr_archive_8bit = -1; +#if 0 static int hf_smb_file_attr_device = -1; static int hf_smb_file_attr_normal = -1; static int hf_smb_file_attr_temporary = -1; @@ -271,6 +272,7 @@ static int hf_smb_file_attr_compressed = -1; static int hf_smb_file_attr_offline = -1; static int hf_smb_file_attr_not_content_indexed = -1; static int hf_smb_file_attr_encrypted = -1; +#endif static int hf_smb_file_size = -1; static int hf_smb_search_attribute_read_only = -1; static int hf_smb_search_attribute_hidden = -1; @@ -294,7 +296,7 @@ static int hf_smb_mac_root_file_count = -1; static int hf_smb_mac_root_dir_count = -1; static int hf_smb_mac_file_count = -1; static int hf_smb_mac_dir_count = -1; -static int hf_smb_mac_support_flags = -1; +/* static int hf_smb_mac_support_flags = -1; */ static int hf_smb_mac_sup_access_ctrl = -1; static int hf_smb_mac_sup_getset_comments = -1; static int hf_smb_mac_sup_desktopdb_calls = -1; @@ -313,7 +315,7 @@ static int hf_smb_offset = -1; static int hf_smb_remaining = -1; static int hf_smb_padding = -1; static int hf_smb_file_data = -1; -static int hf_smb_raw_ea_data = -1; +/* static int hf_smb_raw_ea_data = -1; */ static int hf_smb_total_data_len = -1; static int hf_smb_data_len = -1; static int hf_smb_data_len_low = -1; @@ -564,7 +566,7 @@ static int hf_smb_number_of_links = -1; static int hf_smb_delete_pending = -1; static int hf_smb_index_number = -1; static int hf_smb_position = -1; -static int hf_smb_current_offset = -1; +/* static int hf_smb_current_offset = -1; */ static int hf_smb_t2_alignment = -1; static int hf_smb_t2_stream_name_length = -1; static int hf_smb_t2_stream_size = -1; @@ -18884,6 +18886,7 @@ proto_register_smb(void) { "Archive", "smb.file_attribute.archive", FT_BOOLEAN, 8, TFS(&tfs_file_attribute_archive), SMB_FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }}, +#if 0 { &hf_smb_file_attr_device, { "Device", "smb.file_attribute.device", FT_BOOLEAN, 16, TFS(&tfs_file_attribute_device), SMB_FILE_ATTRIBUTE_DEVICE, "Is this file a device?", HFILL }}, @@ -18919,6 +18922,7 @@ proto_register_smb(void) { &hf_smb_file_attr_encrypted, { "Encrypted", "smb.file_attribute.encrypted", FT_BOOLEAN, 16, TFS(&tfs_file_attribute_encrypted), SMB_FILE_ATTRIBUTE_ENCRYPTED, "Is this file encrypted?", HFILL }}, +#endif { &hf_smb_file_size, { "File Size", "smb.file_size", FT_UINT32, BASE_DEC, @@ -19008,9 +19012,11 @@ proto_register_smb(void) { "Root Directory Count", "smb.dir.count", FT_UINT32, BASE_DEC, NULL, 0, "Directory Count", HFILL}}, +#if 0 { &hf_smb_mac_support_flags, { "Mac Support Flags", "smb.mac.support.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL}}, +#endif { &hf_smb_mac_sup_access_ctrl, { "Mac Access Control", "smb.mac.access_control", FT_BOOLEAN, 32, @@ -19072,9 +19078,11 @@ proto_register_smb(void) { "File Data", "smb.file_data", FT_BYTES, BASE_NONE, NULL, 0, "Data read/written to the file", HFILL }}, +#if 0 { &hf_smb_raw_ea_data, { "EA Data", "smb.ea_data", FT_BYTES, BASE_NONE, NULL, 0, "Data in EA list", HFILL }}, +#endif { &hf_smb_mac_fndrinfo, { "Finder Info", "smb.mac.finderinfo", FT_BYTES, BASE_NONE, @@ -20098,9 +20106,11 @@ proto_register_smb(void) { "Position", "smb.position", FT_UINT64, BASE_DEC, NULL, 0, "File position", HFILL }}, +#if 0 { &hf_smb_current_offset, { "Current Offset", "smb.offset", FT_UINT64, BASE_DEC, NULL, 0, "Current offset in the file", HFILL }}, +#endif { &hf_smb_t2_alignment, { "Alignment", "smb.alignment", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c index 0c58b4e61c..048b5f1f02 100644 --- a/epan/dissectors/packet-sqloracle.c +++ b/epan/dissectors/packet-sqloracle.c @@ -59,8 +59,8 @@ static gint ett_sqloracle_operation = -1; static int hf_sqloracle_operation = -1; static int hf_sqloracle_func_type = -1; /* static int hf_sqloracle_stmt_length = -1; */ -static int hf_sqloracle_stmt = -1; #if 0 +static int hf_sqloracle_stmt = -1; static int hf_sqloracle_v8ttluds_tname = -1; static int hf_sqloracle_v8ttluds_sname = -1; static int hf_sqloracle_v8ttluds_columnname = -1; @@ -678,75 +678,77 @@ proto_register_sqloracle(void) { &hf_sqloracle_uacBufLength, { "user access buffer length", "sqloracle.uacBufLength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -/* { &hf_sqloracle_ttloac_header, - { "TTLOAC Header", "sqloracle.ttloac_header", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_sqloracle_ttloac_type, - { "type", "sqloracle.ttloac_type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_flag1, - { "flag1", "sqloracle.ttloac_flag1", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_prefix, - { "prefix", "sqloracle.ttloac_prefix", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_scalesize, - { "scale size", "sqloracle.ttloac_scalesize", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_dummy, - { "dummy", "sqloracle.ottloac_dummy", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_varcharlen, - { "varcharlen", "sqloracle.ttloac_varcharlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_mal, - { "mal", "sqloracle.ttloac_mal", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_ttloac_flag2, - { "flag2", "sqloracle.ttloac_flag2", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttloac_header, - { "V8TTLOAC Header", "sqloracle.v8ttloac_header", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_sqloracle_v8ttloac_oid, - { "oid", "sqloracle.v8ttloac_oid", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttloac_vsn, - { "vsn", "sqloracle.v8ttloac_vsn", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttloac_ncs, - { "ncs", "sqloracle.v8ttloac_ncs", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttloac_formuse, - { "FormUse", "sqloracle.v8ttloac_formuse", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttluds_header, - { "V8TTLUDS Header", "sqloracle.v8ttluds_header", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - - { &hf_sqloracle_v8ttluds_nullallow, - { "null allowed", "sqloracle.v8ttluds_nullallow", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttluds_scrlength, - { "screen length", "sqloracle.v8ttluds_scrlength", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttluds_columnname, - { "column name", "sqloracle.v8ttluds_columnname", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttluds_sname, - { "sName", "sqloracle.v8ttluds_snname", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_v8ttluds_tname, - { "tName", "sqloracle.v8ttluds_tname", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } - }, - { &hf_sqloracle_stmt_length, - { "SQL Statement Length", "sqloracle.stmtlength", FT_UINT8, BASE_DEC, NULL, 0x0, +#if 0 + { &hf_sqloracle_ttloac_header, + { "TTLOAC Header", "sqloracle.ttloac_header", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_sqloracle_ttloac_type, + { "type", "sqloracle.ttloac_type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_flag1, + { "flag1", "sqloracle.ttloac_flag1", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_prefix, + { "prefix", "sqloracle.ttloac_prefix", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_scalesize, + { "scale size", "sqloracle.ttloac_scalesize", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_dummy, + { "dummy", "sqloracle.ottloac_dummy", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_varcharlen, + { "varcharlen", "sqloracle.ttloac_varcharlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_mal, + { "mal", "sqloracle.ttloac_mal", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_ttloac_flag2, + { "flag2", "sqloracle.ttloac_flag2", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttloac_header, + { "V8TTLOAC Header", "sqloracle.v8ttloac_header", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_sqloracle_v8ttloac_oid, + { "oid", "sqloracle.v8ttloac_oid", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttloac_vsn, + { "vsn", "sqloracle.v8ttloac_vsn", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttloac_ncs, + { "ncs", "sqloracle.v8ttloac_ncs", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttloac_formuse, + { "FormUse", "sqloracle.v8ttloac_formuse", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttluds_header, + { "V8TTLUDS Header", "sqloracle.v8ttluds_header", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + + { &hf_sqloracle_v8ttluds_nullallow, + { "null allowed", "sqloracle.v8ttluds_nullallow", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttluds_scrlength, + { "screen length", "sqloracle.v8ttluds_scrlength", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttluds_columnname, + { "column name", "sqloracle.v8ttluds_columnname", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttluds_sname, + { "sName", "sqloracle.v8ttluds_snname", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_v8ttluds_tname, + { "tName", "sqloracle.v8ttluds_tname", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } + }, + { &hf_sqloracle_stmt_length, + { "SQL Statement Length", "sqloracle.stmtlength", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -*/ { &hf_sqloracle_stmt, - { "SQL statement", "sqloracle.stmt", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } + { &hf_sqloracle_stmt, + { "SQL statement", "sqloracle.stmt", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +#endif }; static gint *ett[] = diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index b70416cc26..a22681fafb 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -40,7 +40,7 @@ static int hf_sscop_s = -1; static int hf_sscop_ps = -1; static int hf_sscop_r = -1; static int hf_sscop_stat_s = -1; -static int hf_sscop_stat_count = -1; +/* static int hf_sscop_stat_count = -1; */ static gint ett_sscop = -1; static gint ett_stat = -1; @@ -436,7 +436,9 @@ proto_register_sscop(void) { &hf_sscop_ps, { "N(PS)", "sscop.ps", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_sscop_r, { "N(R)", "sscop.r", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_sscop_stat_s, { "N(S)", "sscop.stat.s", FT_UINT24, BASE_DEC, NULL, 0x0,NULL, HFILL }}, +#if 0 { &hf_sscop_stat_count, { "Number of NACKed pdus", "sscop.stat.count", FT_UINT32, BASE_DEC, NULL, 0x0,NULL, HFILL }} +#endif }; static gint *ett[] = { diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 2836188d1e..da8415da0d 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -166,8 +166,8 @@ static int hf_wtp_header_Inv_flag_UP = HF_EMPTY; static int hf_wtp_header_Inv_Reserved = HF_EMPTY; static int hf_wtp_header_Inv_TransactionClass = HF_EMPTY; -static int hf_wtp_header_variable_part = HF_EMPTY; -static int hf_wtp_data = HF_EMPTY; +/* static int hf_wtp_header_variable_part = HF_EMPTY; */ +/* static int hf_wtp_data = HF_EMPTY; */ static int hf_wtp_tpi_type = HF_EMPTY; static int hf_wtp_tpi_psn = HF_EMPTY; @@ -926,6 +926,7 @@ proto_register_wtp(void) NULL, HFILL } }, +#if 0 { &hf_wtp_header_variable_part, { "Header: Variable part", "wtp.header_variable_part", FT_BYTES, BASE_NONE, NULL, 0x0, @@ -938,6 +939,7 @@ proto_register_wtp(void) NULL, HFILL } }, +#endif { &hf_wtp_tpi_type, { "TPI", "wtp.tpi", FT_UINT8, BASE_HEX, VALS(vals_tpi_type), 0x00, |