diff options
Diffstat (limited to 'epan')
24 files changed, 176 insertions, 64 deletions
diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 6a718b0acc..90a610c447 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -124,20 +124,20 @@ static const value_string modetypenames[] = { * proto_register_field_array() in proto_register_ismacryp() */ /** Kts attempt at defining the protocol */ -static gint hf_ismacryp = -1; +/* static gint hf_ismacryp = -1; */ static gint hf_ismacryp_header = -1; static gint hf_ismacryp_au_headers_length = -1; -static gint hf_ismacryp_header_length = -1; +/* static gint hf_ismacryp_header_length = -1; */ static gint hf_ismacryp_header_byte = -1; -static gint hf_ismacryp_version = -1; -static gint hf_ismacryp_length = -1; +/* static gint hf_ismacryp_version = -1; */ +/* static gint hf_ismacryp_length = -1; */ /* static gint hf_ismacryp_message_type = -1; */ -static gint hf_ismacryp_message_length = -1; +/* static gint hf_ismacryp_message_length = -1; */ static gint hf_ismacryp_message = -1; -static gint hf_ismacryp_parameter = -1; +/* static gint hf_ismacryp_parameter = -1; */ /* static gint hf_ismacryp_parameter_type = -1; */ -static gint hf_ismacryp_parameter_length = -1; -static gint hf_ismacryp_parameter_value = -1; +/* static gint hf_ismacryp_parameter_length = -1; */ +/* static gint hf_ismacryp_parameter_value = -1; */ static gint hf_ismacryp_iv = -1; static gint hf_ismacryp_delta_iv = -1; static gint hf_ismacryp_key_indicator = -1; @@ -708,21 +708,27 @@ void proto_register_ismacryp (void) * {&(field id), {name, abbrev, type, display, strings, bitmask, blurb, HFILL}}. */ static hf_register_info hf[] = { +/** { &hf_ismacryp, { "Data", "ismacryp.data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +**/ +/** { &hf_ismacryp_length, - { "Total Length", "ismacryp.len", FT_UINT16, BASE_DEC, NULL, 0x0, /* length 2 bytes, print as decimal value */ + { "Total Length", "ismacryp.len", FT_UINT16, BASE_DEC, NULL, 0x0, /-* length 2 bytes, print as decimal value *-/ NULL, HFILL }}, +**/ { &hf_ismacryp_header, { "AU Header", "ismacryp.header", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +/** { &hf_ismacryp_header_length, { "Header Length", "ismacryp.header.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +**/ { &hf_ismacryp_au_headers_length, { "AU Headers Length", "ismacryp.au_headers.length", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -732,25 +738,33 @@ void proto_register_ismacryp (void) { "Header Byte", "ismacryp.header.byte", FT_NONE, BASE_NONE, NULL, 0x0, /* 1 byte */ NULL, HFILL }}, +/** { &hf_ismacryp_version, - { "Version", "ismacryp.version", FT_UINT8, BASE_HEX, NULL, 0x0, /* version 1 byte */ + { "Version", "ismacryp.version", FT_UINT8, BASE_HEX, NULL, 0x0, /-* version 1 byte *-/ NULL, HFILL }}, +**/ { &hf_ismacryp_message, { "Message", "ismacryp.message", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +/** { &hf_ismacryp_message_length, - { "Message Length", "ismacryp.message.len", FT_UINT16, BASE_DEC, NULL, 0x0, /* length 2 bytes, print as decimal value */ + { "Message Length", "ismacryp.message.len", FT_UINT16, BASE_DEC, NULL, 0x0, /-* length 2 bytes, print as decimal value *-/ NULL, HFILL }}, +**/ +/** { &hf_ismacryp_parameter, { "Parameter", "ismacryp.parameter", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +**/ +/** { &hf_ismacryp_parameter_length, - { "Parameter Length", "ismacryp.parameter.len", FT_UINT16, BASE_DEC, NULL, 0x0, /* length 2 bytes, print as decimal value */ + { "Parameter Length", "ismacryp.parameter.len", FT_UINT16, BASE_DEC, NULL, 0x0, /-* length 2 bytes, print as decimal value *-/ NULL, HFILL }}, +**/ { &hf_ismacryp_iv, { "IV", "ismacryp.iv", FT_BYTES, BASE_NONE, NULL, 0x0, /* variable length */ @@ -764,9 +778,11 @@ void proto_register_ismacryp (void) { "Key Indicator", "ismacryp.key_indicator", FT_BYTES, BASE_NONE, NULL, 0x0, /* variable length */ NULL, HFILL }}, +/** { &hf_ismacryp_parameter_value, { "Parameter Value", "ismacryp.parameter.value", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +**/ { &hf_ismacryp_au_size, { "AU size", "ismacryp.au.size", FT_UINT64, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 2e169767f2..a03115aba0 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -537,13 +537,13 @@ proto_register_ismp(void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { -#if 0 +/** { &hf_ismp, { "ISMP", "ismp", FT_PROTOCOL, BASE_NONE, NULL, 0x0, "Inter Switch Message Protocol", HFILL } }, -#endif +**/ { &hf_ismp_version, { "Version", "ismp.version", FT_UINT16, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index f58e6d5975..f90f0906f6 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -87,8 +87,8 @@ static int hf_iuup_errorevt_cause_val = -1; static int hf_iuup_time_align = -1; static int hf_iuup_spare_bytes = -1; static int hf_iuup_spare_03 = -1; -static int hf_iuup_spare_0f = -1; -static int hf_iuup_spare_c0 = -1; +/* static int hf_iuup_spare_0f = -1; */ +/* static int hf_iuup_spare_c0 = -1; */ static int hf_iuup_spare_e0 = -1; static int hf_iuup_spare_ff = -1; @@ -905,8 +905,12 @@ void proto_register_iuup(void) { { &hf_iuup_data_pdu_type, { "RFCI Data Pdu Type", "iuup.data_pdu_type", FT_UINT8, BASE_HEX, VALS(iuup_payload_pdu_type),0xF0,NULL,HFILL}}, { &hf_iuup_spare_03, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0x03,NULL,HFILL}}, +/** { &hf_iuup_spare_0f, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0x0f,NULL,HFILL}}, +**/ +/** { &hf_iuup_spare_c0, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xc0,NULL,HFILL}}, +**/ { &hf_iuup_spare_e0, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xe0,NULL,HFILL}}, { &hf_iuup_spare_ff, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xff,NULL,HFILL}}, { &hf_iuup_spare_bytes, { "Spare", "iuup.spare_bytes", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 03c8b7d139..47ddecfe6e 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -355,7 +355,7 @@ static const value_string juniper_ifle_vals[] = { static int proto_juniper = -1; -static int hf_juniper_magic = -1; +/* static int hf_juniper_magic = -1; */ static int hf_juniper_direction = -1; static int hf_juniper_l2hdr_presence = -1; static int hf_juniper_ext_total_len = -1; @@ -1362,9 +1362,11 @@ void proto_register_juniper(void) { static hf_register_info hf[] = { +/** { &hf_juniper_magic, { "Magic Number", "juniper.magic-number", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL }}, +**/ { &hf_juniper_direction, { "Direction", "juniper.direction", FT_UINT8, BASE_HEX, VALS(juniper_direction_vals), 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 8ddb9d61f0..b7785ffc5d 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -132,7 +132,7 @@ static int hf_jxta_element_type = -1; static int hf_jxta_element_encoding = -1; static int hf_jxta_element_content_len = -1; static int hf_jxta_element_content_len64 = -1; -static int hf_jxta_element_content = -1; +/* static int hf_jxta_element_content = -1; */ /** * JXTA Protocol subtree handles @@ -2267,10 +2267,12 @@ void proto_register_jxta(void) {"Element Content Length", "jxta.message.element.content.length", FT_UINT64, BASE_DEC, NULL, 0x0, "JXTA Message Element Content Length", HFILL} }, +/** {&hf_jxta_element_content, {"Element Content", "jxta.message.element.content", FT_BYTES, BASE_NONE, NULL, 0x0, "JXTA Message Element Content", HFILL} }, +**/ }; proto_jxta = proto_register_protocol("JXTA P2P", "JXTA", "jxta"); diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index e326c8ebe8..8ae20cef46 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -54,8 +54,8 @@ void proto_reg_handoff_ldp(void); static int proto_ldp = -1; /* Delete the following if you do not use it, or add to it if you need */ -static int hf_ldp_req = -1; -static int hf_ldp_rsp = -1; +/* static int hf_ldp_req = -1; */ +/* static int hf_ldp_rsp = -1; */ static int hf_ldp_version = -1; static int hf_ldp_pdu_len = -1; static int hf_ldp_lsr = -1; @@ -215,7 +215,7 @@ static int hf_ldp_tlv_set_prio = -1; static int hf_ldp_tlv_hold_prio = -1; static int hf_ldp_tlv_route_pinning = -1; static int hf_ldp_tlv_resource_class = -1; -static int hf_ldp_tlv_diffserv = -1; +/* static int hf_ldp_tlv_diffserv = -1; */ static int hf_ldp_tlv_diffserv_type = -1; static int hf_ldp_tlv_diffserv_mapnb = -1; static int hf_ldp_tlv_diffserv_map = -1; @@ -3063,14 +3063,18 @@ void proto_register_ldp(void) { static hf_register_info hf[] = { +/** { &hf_ldp_req, - /* Change the following to the type you need */ + /-* Change the following to the type you need *-/ { "Request", "ldp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +**/ +/** { &hf_ldp_rsp, { "Response", "ldp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +**/ { &hf_ldp_version, { "Version", "ldp.hdr.version", FT_UINT16, BASE_DEC, @@ -3705,9 +3709,11 @@ proto_register_ldp(void) { "Resource Class", "ldp.msg.tlv.resource_class", FT_UINT32, BASE_HEX, NULL, 0, "Resource Class (Color)", HFILL}}, +/** { &hf_ldp_tlv_diffserv, { "Diff-Serv TLV", "ldp.msg.tlv.diffserv", FT_NONE, BASE_NONE, NULL, 0, "Diffserv TLV", HFILL}}, +**/ { &hf_ldp_tlv_diffserv_type, { "LSP Type", "ldp.msg.tlv.diffserv.type", FT_UINT8, BASE_DEC, diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 89ab2f5d04..46039e5272 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -109,7 +109,7 @@ static int hf_linx_nack_seqno = -1; /* RLNH */ static int hf_linx_rlnh_msg_type32 = -1; static int hf_linx_rlnh_msg_type8 = -1; -static int hf_linx_rlnh_linkaddr = -1; +/* static int hf_linx_rlnh_linkaddr = -1; */ static int hf_linx_rlnh_src_linkaddr = -1; static int hf_linx_rlnh_version = -1; static int hf_linx_rlnh_status = -1; @@ -119,7 +119,7 @@ static int hf_linx_rlnh_feat_neg_str = -1; static int hf_linx_rlnh_msg_reserved = -1; /* TCP CM */ -static int hf_linx_tcp_reserved = -1; +/* static int hf_linx_tcp_reserved = -1; */ static int hf_linx_tcp_oob = -1; static int hf_linx_tcp_version = -1; static int hf_linx_tcp_type = -1; @@ -128,7 +128,7 @@ static int hf_linx_tcp_dst = -1; static int hf_linx_tcp_size = -1; static int hf_linx_tcp_rlnh_msg_type32 = -1; static int hf_linx_tcp_rlnh_msg_type8 = -1; -static int hf_linx_tcp_rlnh_linkaddr = -1; +/* static int hf_linx_tcp_rlnh_linkaddr = -1; */ static int hf_linx_tcp_rlnh_src_linkaddr = -1; static int hf_linx_tcp_rlnh_version = -1; static int hf_linx_tcp_rlnh_status = -1; @@ -773,9 +773,11 @@ proto_register_linx(void) { &hf_linx_rlnh_msg_reserved, /* in RLNH */ { "RLNH msg reserved", "linx.rlnh_msg_reserved", FT_UINT32, BASE_DEC, NULL, 0xffffff00, "RLNH message reserved", HFILL }, }, - { &hf_linx_rlnh_linkaddr, /* in RLNH */ +/** + { &hf_linx_rlnh_linkaddr, /-* in RLNH *-/ { "RLNH linkaddr", "linx.rlnh_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH linkaddress", HFILL }, }, +**/ { &hf_linx_rlnh_src_linkaddr, /* in RLNH */ { "RLNH src linkaddr", "linx.rlnh_src_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH source linkaddress", HFILL }, }, @@ -977,9 +979,11 @@ dissect_linx_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_register_linx_tcp(void) { static hf_register_info hf[] = { +/** { &hf_linx_tcp_reserved, { "Reserved", "linxtcp.reserved", FT_UINT32, BASE_DEC, NULL, 0x00007FFF, "TCP CM reserved", HFILL }, }, +**/ { &hf_linx_tcp_oob, { "Out-of-band", "linxtcp.oob", FT_UINT32, BASE_DEC, NULL, 0x00008000, "TCP CM oob", HFILL }, }, @@ -1009,9 +1013,11 @@ proto_register_linx_tcp(void) { &hf_linx_tcp_rlnh_msg_reserved, { "RLNH msg reserved", "linxtcp.rlnh_msg_reserved", FT_UINT32, BASE_DEC, NULL, 0xffffff00, "RLNH message reserved", HFILL }, }, +/** { &hf_linx_tcp_rlnh_linkaddr, { "RLNH linkaddr", "linxtcp.rlnh_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH linkaddress", HFILL }, }, +**/ { &hf_linx_tcp_rlnh_src_linkaddr, { "RLNH src linkaddr", "linxtcp.rlnh_src_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH source linkaddress", HFILL }, }, diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index c707c48f6a..6907477352 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -166,7 +166,7 @@ static gint hf_lon_app = -1; static gint hf_lon_nm = -1; static gint hf_lon_nd = -1; static gint hf_lon_ff = -1; -static gint hf_lon_checksum = -1; +/* static gint hf_lon_checksum = -1; */ static gint proto_lon = -1; @@ -678,11 +678,13 @@ proto_register_lon(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, +/** {&hf_lon_checksum, {"Checksum", "lon.chksum", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } } +**/ }; static gint *ett[] = diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index f19795db82..88628d66d5 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -65,7 +65,7 @@ static int hf_ltp_data_offset = -1; static int hf_ltp_data_length = -1; static int hf_ltp_data_chkp = -1; static int hf_ltp_data_rpt = -1; -static int hf_ltp_data_clidata = -1; +/* static int hf_ltp_data_clidata = -1; */ /* LTP Report Segment variable */ static int hf_ltp_rpt_sno = -1; @@ -836,10 +836,12 @@ proto_register_ltp(void) {"Report serial number","ltp.data.rpt", FT_UINT64,BASE_DEC,NULL, 0x0, NULL, HFILL} }, +/** {&hf_ltp_data_clidata, {"Client service data","ltp.data.data", FT_BYTES,BASE_NONE,NULL, 0x0, NULL, HFILL} }, +**/ {&hf_ltp_rpt_sno, {"Report serial number","ltp.rpt.sno", FT_UINT64,BASE_DEC,NULL, 0x0, NULL, HFILL} diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index a4eee2d461..dc367d4285 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -56,7 +56,7 @@ static gint hf_lwapp_fragment_id = -1; static gint hf_lwapp_length = -1; static gint hf_lwapp_rssi = -1; static gint hf_lwapp_snr = -1; -static gint hf_lwapp_control = -1; +/* static gint hf_lwapp_control = -1; */ static gint hf_lwapp_control_mac = -1; static gint hf_lwapp_control_type = -1; static gint hf_lwapp_control_seq_no = -1; @@ -496,9 +496,11 @@ proto_register_lwapp(void) { &hf_lwapp_snr, { "SNR","lwapp.snr", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, +/** { &hf_lwapp_control, { "Control Data (not dissected yet)","lwapp.control", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +**/ { &hf_lwapp_control_mac, { "AP Identity", "lwapp.apid", FT_ETHER, BASE_NONE, NULL, 0x0, "Access Point Identity", HFILL }}, diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index ae67ba9956..aeb0eefb90 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -134,7 +134,7 @@ static int hf_realnamelen = -1; static int hf_realname = -1; -static int hf_a_record = -1; +/* static int hf_a_record = -1; */ static int hf_a_rec_len = -1; static int hf_srv_prio = -1; static int hf_srv_weight = -1; @@ -1107,9 +1107,11 @@ proto_register_lwres(void) { "Real doname name", "lwres.realname", FT_STRING, BASE_NONE, NULL, 0x0, "lwres realname", HFILL }}, +/** { &hf_a_record, { "IPv4 Address", "lwres.arecord", FT_UINT32, BASE_DEC, NULL, 0x0, "lwres arecord", HFILL }}, +**/ { &hf_a_rec_len, { "Length", "lwres.areclen", FT_UINT16, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 4603c7a029..e4f539fef0 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -238,7 +238,7 @@ static int hf_parameter_tag = -1; static int hf_parameter_length = -1; static int hf_parameter_value = -1; static int hf_parameter_padding = -1; -static int hf_parameter_trailer = -1; +/* static int hf_parameter_trailer = -1; */ static int hf_network_appearance = -1; static int hf_info_string = -1; static int hf_routing_context = -1; @@ -1985,7 +1985,9 @@ proto_register_m3ua(void) { &hf_parameter_length, { "Parameter length", "m3ua.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_parameter_value, { "Parameter value", "m3ua.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_parameter_padding, { "Padding", "m3ua.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +/** { &hf_parameter_trailer, { "Trailer", "m3ua.paramter_trailer", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, +**/ { &hf_network_appearance, { "Network appearance", "m3ua.network_appearance", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_info_string, { "Info string", "m3ua.info_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_routing_context, { "Routing context", "m3ua.routing_context", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index f286f59ab9..f23a260057 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -74,7 +74,7 @@ static int hf_megaco_version = -1; static int hf_megaco_transaction = -1; static int hf_megaco_transid = -1; static int hf_megaco_Context = -1; -static int hf_megaco_command_line = -1; +/* static int hf_megaco_command_line = -1; */ static int hf_megaco_command = -1; static int hf_megaco_termid = -1; @@ -83,20 +83,20 @@ static int hf_megaco_termid = -1; /* Define headers in subtree for megaco */ static int hf_megaco_modem_descriptor = -1; static int hf_megaco_multiplex_descriptor = -1; -static int hf_megaco_media_descriptor = -1; -static int hf_megaco_events_descriptor = -1; -static int hf_megaco_signal_descriptor = -1; +/* static int hf_megaco_media_descriptor = -1; */ +/* static int hf_megaco_events_descriptor = -1; */ +/* static int hf_megaco_signal_descriptor = -1; */ static int hf_megaco_audit_descriptor = -1; -static int hf_megaco_servicechange_descriptor = -1; +/* static int hf_megaco_servicechange_descriptor = -1; */ static int hf_megaco_digitmap_descriptor = -1; static int hf_megaco_statistics_descriptor = -1; -static int hf_megaco_observedevents_descriptor = -1; +/* static int hf_megaco_observedevents_descriptor = -1; */ static int hf_megaco_topology_descriptor = -1; static int hf_megaco_error_descriptor = -1; -static int hf_megaco_TerminationState_descriptor= -1; -static int hf_megaco_Remote_descriptor = -1; -static int hf_megaco_Local_descriptor = -1; -static int hf_megaco_LocalControl_descriptor = -1; +/* static int hf_megaco_TerminationState_descriptor= -1; */ +/* static int hf_megaco_Remote_descriptor = -1; */ +/* static int hf_megaco_Local_descriptor = -1; */ +/* static int hf_megaco_LocalControl_descriptor = -1; */ static int hf_megaco_packages_descriptor = -1; static int hf_megaco_error_Frame = -1; static int hf_megaco_Service_State = -1; @@ -112,7 +112,7 @@ static int hf_megaco_streamid = -1; static int hf_megaco_requestid = -1; static int hf_megaco_pkgdname = -1; static int hf_megaco_mId = -1; -static int hf_megaco_h245 = -1; +/* static int hf_megaco_h245 = -1; */ static int hf_megaco_h223Capability = -1; static int hf_megaco_audititem = -1; @@ -3375,9 +3375,11 @@ proto_register_megaco(void) { &hf_megaco_audit_descriptor, { "Audit Descriptor", "megaco.audit", FT_NONE, BASE_NONE, NULL, 0x0, "Audit Descriptor of the megaco Command", HFILL }}, +/** { &hf_megaco_command_line, { "Command line", "megaco.command_line", FT_STRING, BASE_NONE, NULL, 0x0, "Commands of this message", HFILL }}, +**/ { &hf_megaco_command, { "Command", "megaco.command", FT_STRING, BASE_NONE, NULL, 0x0, "Command of this message", HFILL }}, @@ -3396,18 +3398,26 @@ proto_register_megaco(void) { &hf_megaco_Event_Buffer_Control, { "Event Buffer Control", "megaco.eventbuffercontrol", FT_STRING, BASE_NONE, NULL, 0x0, "Event Buffer Control in Termination State Descriptor", HFILL }}, +/** { &hf_megaco_events_descriptor, { "Events Descriptor", "megaco.events", FT_STRING, BASE_NONE, NULL, 0x0, "Events Descriptor of the megaco Command", HFILL }}, +**/ +/** { &hf_megaco_Local_descriptor, { "Local Descriptor", "megaco.localdescriptor", FT_STRING, BASE_NONE, NULL, 0x0, "Local Descriptor in Media Descriptor", HFILL }}, +**/ +/** { &hf_megaco_LocalControl_descriptor, { "Local Control Descriptor", "megaco.localcontroldescriptor", FT_STRING, BASE_NONE, NULL, 0x0, "Local Control Descriptor in Media Descriptor", HFILL }}, +**/ +/** { &hf_megaco_media_descriptor, { "Media Descriptor", "megaco.media", FT_STRING, BASE_NONE, NULL, 0x0, "Media Descriptor of the megaco Command", HFILL }}, +**/ { &hf_megaco_modem_descriptor, { "Modem Descriptor", "megaco.modem", FT_STRING, BASE_NONE, NULL, 0x0, "Modem Descriptor of the megaco Command", HFILL }}, @@ -3417,18 +3427,22 @@ proto_register_megaco(void) { &hf_megaco_multiplex_descriptor, { "Multiplex Descriptor", "megaco.multiplex", FT_STRING, BASE_NONE, NULL, 0x0, "Multiplex Descriptor of the megaco Command", HFILL }}, +/** { &hf_megaco_observedevents_descriptor, { "Observed Events Descriptor", "megaco.observedevents", FT_STRING, BASE_NONE, NULL, 0x0, "Observed Events Descriptor of the megaco Command", HFILL }}, +**/ { &hf_megaco_packages_descriptor, { "Packages Descriptor", "megaco.packagesdescriptor", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_megaco_pkgdname, { "pkgdName", "megaco.pkgdname", FT_STRING, BASE_NONE, NULL, 0x0, "PackageName SLASH ItemID", HFILL }}, +/** { &hf_megaco_Remote_descriptor, { "Remote Descriptor", "megaco.remotedescriptor", FT_STRING, BASE_NONE, NULL, 0x0, "Remote Descriptor in Media Descriptor", HFILL }}, +**/ { &hf_megaco_reserve_group, { "Reserve Group", "megaco.reservegroup", FT_STRING, BASE_NONE, NULL, 0x0, "Reserve Group on or off", HFILL }}, @@ -3450,15 +3464,19 @@ proto_register_megaco(void) { &hf_megaco_requestid, { "RequestID", "megaco.requestid", FT_STRING, BASE_NONE, NULL, 0x0, "RequestID in Events or Observedevents Descriptor", HFILL }}, +/** { &hf_megaco_servicechange_descriptor, { "Service Change Descriptor", "megaco.servicechange", FT_STRING, BASE_NONE, NULL, 0x0, "Service Change Descriptor of the megaco Command", HFILL }}, +**/ { &hf_megaco_Service_State, { "Service State", "megaco.servicestates", FT_STRING, BASE_NONE, NULL, 0x0, "Service States in Termination State Descriptor", HFILL }}, +/** { &hf_megaco_signal_descriptor, { "Signal Descriptor", "megaco.signal", FT_STRING, BASE_NONE, NULL, 0x0, "Signal Descriptor of the megaco Command", HFILL }}, +**/ { &hf_megaco_statistics_descriptor, { "Statistics Descriptor", "megaco.statistics", FT_STRING, BASE_NONE, NULL, 0x0, "Statistics Descriptor of the megaco Command", HFILL }}, @@ -3468,9 +3486,11 @@ proto_register_megaco(void) { &hf_megaco_termid, { "Termination ID", "megaco.termid", FT_STRING, BASE_NONE, NULL, 0x0, "Termination ID of this Command", HFILL }}, +/** { &hf_megaco_TerminationState_descriptor, { "Termination State Descriptor", "megaco.terminationstate", FT_STRING, BASE_NONE, NULL, 0x0, "Termination State Descriptor in Media Descriptor", HFILL }}, +**/ { &hf_megaco_topology_descriptor, { "Topology Descriptor", "megaco.topology", FT_STRING, BASE_NONE, NULL, 0x0, "Topology Descriptor of the megaco Command", HFILL }}, @@ -3486,9 +3506,11 @@ proto_register_megaco(void) { &hf_megaco_version, { "Version", "megaco.version", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +/** { &hf_megaco_h245, { "h245", "megaco.h245", FT_STRING, BASE_NONE, NULL, 0x0, "Embedded H.245 message", HFILL }}, +**/ { &hf_megaco_h223Capability, { "h223Capability", "megaco.h245.h223Capability", FT_NONE, BASE_NONE, NULL, 0, "megaco.h245.H223Capability", HFILL }}, diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index da5743d0c3..43e97bde11 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -65,10 +65,10 @@ static int hf_mip_rext_tstamp = -1; static int hf_mip_rev_reserved = -1; static int hf_mip_rev_a = -1; static int hf_mip_rev_i = -1; -static int hf_mip_rev_reserved2 = -1; +/* static int hf_mip_rev_reserved2 = -1; */ static int hf_mip_ack_reserved = -1; static int hf_mip_ack_i = -1; -static int hf_mip_ack_reserved2 = -1; +/* static int hf_mip_ack_reserved2 = -1; */ static int hf_mip_hda = -1; static int hf_mip_fda = -1; static int hf_mip_revid = -1; @@ -1050,10 +1050,12 @@ void proto_register_mip(void) FT_BOOLEAN, 16, NULL, 16384, "Inform Mobile Node", HFILL } }, +/** { &hf_mip_rev_reserved2, { "Reserved", "mip.rev.reserved2", FT_UINT16, BASE_HEX, NULL, 0x3fff, NULL, HFILL}}, +**/ { &hf_mip_hda, { "Home Domain Address", "mip.rev.hda", FT_IPv4, BASE_NONE, NULL, 0, @@ -1079,10 +1081,12 @@ void proto_register_mip(void) FT_BOOLEAN, 16, NULL, 32768, "Inform Mobile Node", HFILL } }, +/** { &hf_mip_ack_reserved2, { "Reserved", "mip.ack.reserved2", FT_UINT16, BASE_HEX, NULL, 0x7fff, NULL, HFILL}}, +**/ { &hf_mip_dhaext_stype, { "DynHA Ext SubType", "mip.ext.dynha.subtype", FT_UINT8, BASE_DEC, VALS(mip_dhaext_stypes), 0, diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 8117c60e56..1e0f683e30 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -932,7 +932,7 @@ static int hf_mip6_hot_token = -1; static int hf_mip6_cot_nindex = -1; static int hf_mip6_cot_cookie = -1; -static int hf_mip6_cot_token = -1; +/* static int hf_mip6_cot_token = -1; */ static int hf_mip6_bu_seqnr = -1; static int hf_mip6_bu_a_flag = -1; @@ -3657,11 +3657,13 @@ proto_register_mip6(void) FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL } }, +/** { &hf_mip6_cot_token, { "Care-of Keygen Token", "mip6.cot.token", FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL } }, +**/ { &hf_mip6_bu_seqnr, { "Sequence number", "mip6.bu.seqnr", diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 6fedc966b6..5f846922fd 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -222,7 +222,7 @@ static int hf_mmse_sender_visibility = -1; static int hf_mmse_status = -1; static int hf_mmse_subject = -1; static int hf_mmse_to = -1; -static int hf_mmse_content_type = -1; +/* static int hf_mmse_content_type = -1; */ static int hf_mmse_ffheader = -1; /* MMSE 1.1 */ static int hf_mmse_read_report = -1; @@ -1521,6 +1521,7 @@ proto_register_mmse(void) HFILL } }, +/** { &hf_mmse_content_type, { "Data", "mmse.content_type", FT_NONE, BASE_NONE, NULL, 0x00, @@ -1528,6 +1529,7 @@ proto_register_mmse(void) HFILL } }, +**/ { &hf_mmse_ffheader, { "Free format (not encoded) header", "mmse.ffheader", FT_STRING, BASE_NONE, NULL, 0x00, diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 99ee79259c..473c8a1fb2 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -71,7 +71,7 @@ static int hf_mp2t_afc = -1; static int hf_mp2t_cc = -1; static int hf_mp2t_cc_drop = -1; -static int hf_mp2t_analysis_flags = -1; +/* static int hf_mp2t_analysis_flags = -1; */ static int hf_mp2t_analysis_skips = -1; static int hf_mp2t_analysis_drops = -1; @@ -157,7 +157,7 @@ static int hf_mp2t_af_e_m_2 = -1; static int hf_mp2t_af_e_dnau_14_0 = -1; static int hf_mp2t_af_e_m_3 = -1; -static int hf_mp2t_payload = -1; +/* static int hf_mp2t_payload = -1; */ static int hf_mp2t_stuff_bytes = -1; @@ -1338,11 +1338,13 @@ proto_register_mp2t(void) "Continuity Counter Drops", "mp2t.cc.drop", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } } , +/** { &hf_mp2t_analysis_flags, { "MPEG2-TS Analysis Flags", "mp2t.analysis.flags", FT_NONE, BASE_NONE, NULL, 0x0, "This frame has some of the MPEG2 analysis flags set", HFILL } } , +**/ { &hf_mp2t_analysis_skips, { "TS Continuity Counter Skips", "mp2t.analysis.skips", FT_UINT8, BASE_DEC, NULL, 0x0, @@ -1485,10 +1487,12 @@ proto_register_mp2t(void) "Marker Bit", "mp2t.af.e.m_3", FT_UINT16, BASE_DEC, NULL, 0x0001, NULL, HFILL } } , +/** { &hf_mp2t_payload, { "Payload", "mp2t.payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } } , +**/ { &hf_mp2t_stuff_bytes, { "Stuffing", "mp2t.stuff_bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index fb380d49bf..bdf91d8dab 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -139,10 +139,10 @@ static int hf_mpls_echo_sub_tlv_multipath_length = -1; static int hf_mpls_echo_sub_tlv_multipath_value = -1; static int hf_mpls_echo_sub_tlv_resv = -1; static int hf_mpls_echo_sub_tlv_multipath_info = -1; -static int hf_mpls_echo_tlv_ddstlv_map_mp_label = -1; +/* static int hf_mpls_echo_tlv_ddstlv_map_mp_label = -1; */ static int hf_mpls_echo_tlv_ddstlv_map_mp_proto = -1; -static int hf_mpls_echo_tlv_ddstlv_map_mp_exp = -1; -static int hf_mpls_echo_tlv_ddstlv_map_mp_bos = -1; +/* static int hf_mpls_echo_tlv_ddstlv_map_mp_exp = -1; */ +/* static int hf_mpls_echo_tlv_ddstlv_map_mp_bos = -1; */ static int hf_mpls_echo_sub_tlv_multipath_ip = -1; static int hf_mpls_echo_sub_tlv_mp_ip_low = -1; static int hf_mpls_echo_sub_tlv_mp_ip_high = -1; @@ -190,9 +190,9 @@ static int hf_mpls_echo_lspping_tlv_src_addr_nid=-1; static int hf_mpls_echo_lspping_tlv_pw_serv_identifier = -1; static int hf_mpls_echo_lspping_tlv_pw_src_ac_id = -1; static int hf_mpls_echo_lspping_tlv_pw_dst_ac_id = -1; -static int hf_mpls_echo_lspping_tlv_pw_agi_type = -1; -static int hf_mpls_echo_lspping_tlv_pw_agi_len = -1; -static int hf_mpls_echo_lspping_tlv_pw_agi_val = -1; +/* static int hf_mpls_echo_lspping_tlv_pw_agi_type = -1; */ +/* static int hf_mpls_echo_lspping_tlv_pw_agi_len = -1; */ +/* static int hf_mpls_echo_lspping_tlv_pw_agi_val = -1; */ static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_p2mp_id = -1; static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz1 = -1; static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_tunnel_id = -1; @@ -207,7 +207,7 @@ static int hf_mpls_echo_tlv_echo_jitter = -1; static int hf_mpls_echo_tlv_responder_indent_type = -1; static int hf_mpls_echo_tlv_responder_indent_len = -1; static int hf_mpls_echo_tlv_responder_indent_ipv4 = -1; -static int hf_mpls_echo_tlv_responder_indent_ipv6 = -1; +/* static int hf_mpls_echo_tlv_responder_indent_ipv6 = -1; */ static int hf_mpls_echo_tlv_bfd = -1; static gint ett_mpls_echo = -1; @@ -2209,18 +2209,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} }, +/** { &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} }, +**/ +/** { &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} }, +**/ +/** { &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} }, +**/ { &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} @@ -2303,23 +2309,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} }, +/** { &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} }, +**/ { &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} }, +/** { &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} }, +**/ +/** { &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} }, +**/ { &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} @@ -2426,10 +2438,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} }, +/** { &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} }, +**/ { &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-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c index 30f0281277..7f4fbabe04 100644 --- a/epan/dissectors/packet-mpls-y1711.c +++ b/epan/dissectors/packet-mpls-y1711.c @@ -49,7 +49,7 @@ static gint proto_mpls_y1711 = -1; static int hf_mpls_y1711_function_type = -1; -static int hf_mpls_y1711_ttsi = -1; +/* static int hf_mpls_y1711_ttsi = -1; */ static int hf_mpls_y1711_frequency = -1; static int hf_mpls_y1711_defect_type = -1; static int hf_mpls_y1711_defect_location = -1; @@ -360,6 +360,7 @@ proto_register_mpls_y1711(void) 0x0, "Function Type codepoint", HFILL } }, +/** { &hf_mpls_y1711_ttsi, { @@ -368,6 +369,7 @@ proto_register_mpls_y1711(void) FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, +**/ { &hf_mpls_y1711_frequency, { diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index a2f72178b4..fd6291fcea 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -124,7 +124,7 @@ static int hf_mq_id_unknown5 = -1; static int hf_mq_id_ccsid = -1; static int hf_mq_id_queuemanager = -1; static int hf_mq_id_heartbeatinterval = -1; -static int hf_mq_id_unknown6 = -1; +/* static int hf_mq_id_unknown6 = -1; */ static int hf_mq_id_icf_msgseq = -1; static int hf_mq_id_icf_convcap = -1; static int hf_mq_id_icf_splitmsg = -1; @@ -2634,8 +2634,10 @@ proto_register_mq(void) { &hf_mq_id_heartbeatinterval, { "Heartbeat interval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL }}, +/** { &hf_mq_id_unknown6, { "Unknown6", "mq.id.unknown6", FT_UINT16, BASE_HEX, NULL, 0x0, "ID unknown6", HFILL }}, +**/ { &hf_mq_id_ief_ccsid, { "Invalid CCSID", "mq.id.ief.ccsid", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF_CCSID, "ID invalid CCSID", HFILL }}, diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 2dc6828ebb..0350f6b1db 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -47,7 +47,7 @@ static gint proto_msmms = -1; /* Command fields */ static gint hf_msmms_command = -1; static gint hf_msmms_command_common_header = -1; -static gint hf_msmms_command_version = -1; +/* static gint hf_msmms_command_version = -1; */ static gint hf_msmms_command_signature = -1; static gint hf_msmms_command_length = -1; static gint hf_msmms_command_protocol_type = -1; @@ -1211,6 +1211,7 @@ void proto_register_msmms(void) } }, +/** { &hf_msmms_command_version, { @@ -1223,6 +1224,7 @@ void proto_register_msmms(void) NULL, HFILL } }, +**/ { &hf_msmms_command_signature, { diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 79dc165b5c..c7651631ef 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -68,7 +68,7 @@ static int hf_msproxy_clntport = -1; static int hf_msproxy_dstaddr = -1; -static int hf_msproxy_srcport = -1; +/* static int hf_msproxy_srcport = -1; */ static int hf_msproxy_dstport = -1; static int hf_msproxy_serverport = -1; static int hf_msproxy_serveraddr = -1; @@ -1162,11 +1162,13 @@ proto_register_msproxy( void){ } }, +/** { &hf_msproxy_srcport, { "Source Port", "msproxy.srcport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, +**/ { &hf_msproxy_dstport, { "Destination Port", "msproxy.dstport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index c3a7c4a07c..8a2d8cbd92 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -420,9 +420,9 @@ static int hf_mtp3mg_dlc_ansi_slc = -1; static int hf_mtp3mg_dlc_ansi_link = -1; static int hf_mtp3mg_dlc_itu_link = -1; static int hf_mtp3mg_upu_ansi_apc = -1; -static int hf_mtp3mg_upu_apc_member = -1; -static int hf_mtp3mg_upu_apc_cluster = -1; -static int hf_mtp3mg_upu_apc_network = -1; +/* static int hf_mtp3mg_upu_apc_member = -1; */ +/* static int hf_mtp3mg_upu_apc_cluster = -1; */ +/* static int hf_mtp3mg_upu_apc_network = -1; */ static int hf_mtp3mg_upu_itu_apc = -1; static int hf_mtp3mg_upu_chinese_apc = -1; static int hf_mtp3mg_upu_japan_apc = -1; @@ -1425,18 +1425,24 @@ proto_register_mtp3mg(void) { "Affected Point Code", "mtp3mg.ansi_apc", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, +/** { &hf_mtp3mg_upu_apc_member, { "Affected Point Code member", "mtp3mg.apc.member", FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK, NULL, HFILL }}, +**/ +/** { &hf_mtp3mg_upu_apc_cluster, { "Affected Point Code cluster", "mtp3mg.apc.cluster", FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK, NULL, HFILL }}, +**/ +/** { &hf_mtp3mg_upu_apc_network, { "Affected Point Code network", "mtp3mg.apc.network", FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK, NULL, HFILL }}, +**/ { &hf_mtp3mg_upu_itu_apc, { "Affected Point Code", "mtp3mg.apc", FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK, diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index 7dc4e5df06..392a61ab16 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -151,7 +151,7 @@ static int hf_mux27010_extended_header_flag_ended_III = -1; static int hf_mux27010_dlciaddressflag = -1; static int hf_mux27010_eaaddressflag = -1; static int hf_mux27010_craddressflag = -1; -static int hf_mux27010_addressdirection = -1; +/* static int hf_mux27010_addressdirection = -1; */ /*Control*/ static int hf_mux27010_controlframetype = -1; static int hf_mux27010_controlframetypens = -1; @@ -173,7 +173,7 @@ static int hf_mux27010_controlchannelvalue = -1; static int hf_mux27010_controlchanneldetailedvalue = -1; static int hf_mux27010_controlchanneldetailedvaluetestcommandversion = -1; static int hf_mux27010_controlchanneldetailedvaluemscdlci = -1; -static int hf_mux27010_controlchanneldetailedvaluemscv24 = -1; +/* static int hf_mux27010_controlchanneldetailedvaluemscv24 = -1; */ static int hf_mux27010_controlchanneldetailedvaluemscv24fc = -1; static int hf_mux27010_controlchanneldetailedvaluemscv24rtc = -1; static int hf_mux27010_controlchanneldetailedvaluemscv24rtr = -1; @@ -1275,9 +1275,11 @@ proto_register_mux27010 (void) { "C/R Address Flag", "mux27010.address.craddress", FT_BOOLEAN, 8, NULL, MUX27010_CR_ADDRESS_FLAG, NULL, HFILL }}, +/** { &hf_mux27010_addressdirection, { "Direction", "mux27010.address.direction", FT_UINT8, BASE_HEX, NULL, MUX27010_CR_ADDRESS_FLAG, NULL, HFILL }}, +**/ /*Control frame*/ @@ -1380,9 +1382,11 @@ proto_register_mux27010 (void) { "DLCI number (decimal)", "mux27010.controlchannel.value.detailedvaluemscdlci", FT_UINT8, BASE_DEC, NULL, MUX27010_VALUE_CONTROLCHANNEL_MSC_DCLI, NULL, HFILL }}, +/** { &hf_mux27010_controlchanneldetailedvaluemscv24, { "V.24 Signal", "mux27010.controlchannel.value.detailedvaluemscv24", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +**/ { &hf_mux27010_controlchanneldetailedvaluemscv24fc, { "FC", "mux27010.controlchannel.value.detailedvaluemscv24.fc", |