diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-21 03:14:49 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-21 03:14:49 +0000 |
commit | 381664535b9ee6d260e95bd9cc95d2c5236da269 (patch) | |
tree | 44601f2b36a24467be271aad8478d6af5c26233c | |
parent | 46ef82837fdfadc8ffaba61e48302a3f0b79b6a0 (diff) |
As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 :
Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.
svn path=/trunk/; revision=34165
-rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-capwap.c | 40 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-netlogon.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-ipv6.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-isakmp.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-mac-lte.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-nfs.c | 38 | ||||
-rw-r--r-- | epan/dissectors/packet-omron-fins.c | 114 | ||||
-rw-r--r-- | epan/dissectors/packet-pnrp.c | 206 | ||||
-rw-r--r-- | epan/dissectors/packet-radiotap.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-sasp.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-smb2.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-sna.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sqloracle.c | 42 | ||||
-rw-r--r-- | epan/dissectors/packet-tn3270.c | 20 | ||||
-rw-r--r-- | epan/dissectors/packet-vmlab.c | 40 | ||||
-rw-r--r-- | plugins/docsis/packet-bintrngreq.c | 10 |
18 files changed, 304 insertions, 304 deletions
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index 579dbea303..7010903008 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -356,7 +356,7 @@ void proto_register_lte_rrc(void) { { &hf_lte_rrc_eutra_cap_feat_group_ind_13, { "Indicator 13", "lte-rrc.eutra_cap_feat_group_ind_13", FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_13_val), 0, - "EUTRA Feature Group Indicator ", HFILL }}, + "EUTRA Feature Group Indicator", HFILL }}, { &hf_lte_rrc_eutra_cap_feat_group_ind_14, { "Indicator 14", "lte-rrc.eutra_cap_feat_group_ind_14", FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_14_val), 0, diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 5d1fa80104..c5fbe4ccc0 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -136,15 +136,15 @@ static int hf_capwap_msg_element_type_ac_information_value = -1; static int hf_capwap_msg_element_type_ac_information_hardware_version = -1; static int hf_capwap_msg_element_type_ac_information_software_version = -1; -static int hf_capwap_msg_element_type_ac_name = -1; +static int hf_capwap_msg_element_type_ac_name = -1; static int hf_capwap_msg_element_type_ac_name_with_priority = -1; -static int hf_capwap_msg_element_type_ac_ipv4_list = -1; -static int hf_capwap_msg_element_type_ac_ipv6_list = -1; +static int hf_capwap_msg_element_type_ac_ipv4_list = -1; +static int hf_capwap_msg_element_type_ac_ipv6_list = -1; -static int hf_capwap_msg_element_type_capwap_control_ipv4 = -1; -static int hf_capwap_msg_element_type_capwap_control_ipv6 = -1; -static int hf_capwap_msg_element_type_capwap_control_wtp_count = -1; +static int hf_capwap_msg_element_type_capwap_control_ipv4 = -1; +static int hf_capwap_msg_element_type_capwap_control_ipv6 = -1; +static int hf_capwap_msg_element_type_capwap_control_wtp_count = -1; static int hf_capwap_msg_element_type_capwap_timers_discovery = -1; static int hf_capwap_msg_element_type_capwap_timers_echo_request = -1; @@ -473,7 +473,7 @@ static const value_string message_element_type_vals[] = { { TYPE_ADD_STATION, "Add Station" }, { TYPE_RESERVED_9, "Reserved" }, { TYPE_CAPWAP_CONTROL_IPV4_ADDRESS, "CAPWAP Control IPv4 Address" }, - { TYPE_CAPWAP_CONTROL_IPV6_ADDRESS, "CAPWAP Control IPv6 Address" }, + { TYPE_CAPWAP_CONTROL_IPV6_ADDRESS, "CAPWAP Control IPv6 Address" }, { TYPE_CAPWAP_TIMERS, "CAPWAP Timers" }, { TYPE_DATA_TRANSFER_DATA, "Data Transfer Data" }, { TYPE_DATA_TRANSFER_MODE, "Data Transfer Mode" }, @@ -1060,7 +1060,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ } else { - /*in Draft 8, there is only one "encryption_capabilities*/ + /*in Draft 8, there is only one "encryption_capabilities*/ proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_wtp_descriptor_encrypt_capabilities, tvb, offset+6, 2, FALSE); offset_end = offset + optlen -4; offset += 6 + 2; @@ -1131,7 +1131,7 @@ dissect_capwap_message_element_type(tvbuff_t *tvb, proto_tree *msg_element_type_ /* No Default Action */ break; } - + return 2+2+optlen; } @@ -1270,7 +1270,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs /* 4 Bytes Alignment ? */ align = 4-((offset+plen)%4); if (align != 4) - { + { proto_tree_add_item(capwap_header_tree, hf_capwap_header_padding, tvb, offset+plen, align, FALSE); plen += align; } @@ -1298,7 +1298,7 @@ dissect_capwap_header(tvbuff_t *tvb, proto_tree *capwap_control_tree, guint offs /* 4 Bytes Alignment ? */ align = 4-((offset+plen)%4); if (align != 4) - { + { proto_tree_add_item(capwap_header_tree, hf_capwap_header_padding, tvb, offset+plen, align, FALSE); plen += align; } @@ -1396,7 +1396,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* CAPWAP Control Header */ offset = dissect_capwap_control_header(next_tvb, capwap_control_tree, 0, pinfo); - /* CAPWAP Message Element */ + /* CAPWAP Message Element */ offset += dissect_capwap_message_element(next_tvb, capwap_control_tree, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " (Reassembled, Fragment ID: %u)", fragment_id); } @@ -1406,7 +1406,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* CAPWAP Control Header */ offset += dissect_capwap_control_header(tvb, capwap_control_tree, offset, pinfo); - /* CAPWAP Message Element */ + /* CAPWAP Message Element */ offset += dissect_capwap_message_element(tvb, capwap_control_tree, offset); } } @@ -1514,7 +1514,7 @@ proto_register_capwap_control(void) static hf_register_info hf[] = { /* Preamble */ { &hf_capwap_preamble, - { "Preamble", "capwap.preamble", + { "Preamble", "capwap.preamble", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_capwap_preamble_version, @@ -1531,7 +1531,7 @@ proto_register_capwap_control(void) NULL, HFILL }}, /* CAPWAP Header */ { &hf_capwap_header, - { "Header", "capwap.header", + { "Header", "capwap.header", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_capwap_header_hlen, @@ -1555,9 +1555,9 @@ proto_register_capwap_control(void) FT_BOOLEAN, 9, TFS(&flag_type_t), 0x100, NULL, HFILL }}, { &hf_capwap_header_flags_f, - { "Fragment", "capwap.header.flags.f", + { "Fragment", "capwap.header.flags.f", FT_BOOLEAN, 9, TFS(&flag_type_f), 0x80, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_capwap_header_flags_l, { "Last Fragment", "capwap.header.flags.l", FT_BOOLEAN, 9, TFS(&flag_type_l), 0x40, @@ -1651,7 +1651,7 @@ proto_register_capwap_control(void) /* CAPWAP Control Header Message */ { &hf_capwap_control_header, - { "Control Header", "capwap.control.header", + { "Control Header", "capwap.control.header", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_capwap_control_header_msg_type, @@ -1816,7 +1816,7 @@ proto_register_capwap_control(void) FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_capwap_msg_element_type_decryption_error_report_period_radio_id, - { "Decryption Error Report Period Radio ID ", "capwap.control.message_element.decryption_error_report_period.radio_id", + { "Decryption Error Report Period Radio ID", "capwap.control.message_element.decryption_error_report_period.radio_id", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_capwap_msg_element_type_decryption_error_report_period_interval, @@ -1972,7 +1972,7 @@ proto_register_capwap_control(void) { &hf_capwap_msg_element_type_wtp_descriptor_value, { "Descriptor Value", "capwap.control.message_element.wtp_descriptor.value", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_capwap_msg_element_type_wtp_descriptor_hardware_version, { "WTP Hardware Version", "capwap.control.message_element.wtp_descriptor.hardware_version", FT_STRING, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index f33c5606de..ee4136a456 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -103,10 +103,10 @@ static void printnbyte(const guint8* tab _U_,int nb _U_,const char* txt _U_,cons static GHashTable *netlogon_auths=NULL; static GHashTable *schannel_auths; -/* Added next two lines for decoding NetrLogonControl2 +/* Added next two lines for decoding NetrLogonControl2 Control_data_information Level. Frank Schorr */ -static gint hf_netlogon_TrustedDomainName_string = -1; -static gint hf_netlogon_UserName_string = -1; +static gint hf_netlogon_TrustedDomainName_string = -1; +static gint hf_netlogon_UserName_string = -1; static gint DomainInfo_sid = -1; static gint DnsDomainInfo_sid = -1; static gint DnsDomainInfo_domain_guid = -1; @@ -4904,14 +4904,14 @@ netlogon_dissect_CONTROL_DATA_INFORMATION(tvbuff_t *tvb, int offset, ALIGN_TO_4_BYTES; switch(level){ case 5: - offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, + offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, /* Changed for decoding NetrLogonControl2 Control_data_information Level. Frank Schorr */ tree, drep, NDR_POINTER_UNIQUE, "Trusted Domain Name", hf_netlogon_TrustedDomainName_string, 0); break; case 6: offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, - /* Changed for decoding NetrLogonControl2 Control_data_information Level. Frank Schorr */ + /* Changed for decoding NetrLogonControl2 Control_data_information Level. Frank Schorr */ tree, drep, NDR_POINTER_UNIQUE, "Trusted Domain Name", hf_netlogon_TrustedDomainName_string, 0); break; @@ -9086,7 +9086,7 @@ proto_register_dcerpc_netlogon(void) NULL, HFILL }}, { &hf_netlogon_trust_flags_dc_firsthop, - { " DC at the end of the first hop of cross forest", "netlogon.extra.flags.dc_firsthop", + { "DC at the end of the first hop of cross forest", "netlogon.extra.flags.dc_firsthop", FT_BOOLEAN, 32, TFS(&tfs_set_notset), RQ_DC_XFOREST, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index dd74cc4108..88bbb22098 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1631,7 +1631,7 @@ again: plen -= advance; goto again; - case IP_PROTO_FRAGMENT: + case IP_PROTO_FRAGMENT: advance = dissect_frag6(tvb, offset, pinfo, ipv6_tree, &offlg, &ident); nxt = tvb_get_guint8(tvb, offset); @@ -1654,7 +1654,7 @@ again: offlg = 0; frag = FALSE; tvb = next_tvb; - goto again; + goto again; } } if (!(offlg & IP6F_OFF_MASK)) /*...or in the first fragment */ @@ -1700,7 +1700,7 @@ again: * is an unknown IPv6 option */ if (!dissector_get_port_handle(ip_dissector_table, nxt)) { - advance = dissect_unknown_option(tvb, offset, ipv6_tree); + advance = dissect_unknown_option(tvb, offset, ipv6_tree); nxt = tvb_get_guint8(tvb, offset); poffset = offset; offset += advance; @@ -2210,7 +2210,7 @@ proto_register_ipv6(void) #ifdef TEST_FINALHDR { &hf_ipv6_final, { "Final next header", "ipv6.final", - FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, #endif { &hf_ipv6_traffic_class_dscp, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 54dbf109bf..62a18b9893 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -4889,7 +4889,7 @@ proto_register_isakmp(void) FT_UINT16, BASE_DEC, NULL, 0x0, "ISAKMP ID Port", HFILL }}, { &hf_isakmp_id_data, - { "Identification Data: ", "isakmp.id.data", + { "Identification Data:", "isakmp.id.data", FT_NONE, BASE_NONE, NULL, 0x0, "ISAKMP ID Data", HFILL }}, { &hf_isakmp_id_data_ipv4_addr, @@ -5330,7 +5330,7 @@ proto_register_isakmp(void) FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_isakmp_tf_attr_cmpr_algorithm, - { "Compress Private Algorithm ", "isakmp.tf.attr.cmpr_algorithm", + { "Compress Private Algorithm", "isakmp.tf.attr.cmpr_algorithm", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_isakmp_tf_attr_ecn_tunnel, @@ -5544,7 +5544,7 @@ proto_register_isakmp(void) { &hf_isakmp_cfg_attr_internal_ip4_address, { "INTERNAL IP4 ADDRESS", "isakmp.cfg.attr.internal_ip4_address", FT_IPv4, BASE_NONE, NULL, 0x00, - " An IPv4 address on the internal network", HFILL }}, + "An IPv4 address on the internal network", HFILL }}, { &hf_isakmp_cfg_attr_internal_ip4_netmask, { "INTERNAL IP4 NETMASK", "isakmp.cfg.attr.internal_ip4_netmask", FT_IPv4, BASE_NONE, NULL, 0x00, @@ -5572,7 +5572,7 @@ proto_register_isakmp(void) { &hf_isakmp_cfg_attr_internal_ip6_address, { "INTERNAL IP6 ADDRESS", "isakmp.cfg.attr.internal_ip6_address", FT_IPv4, BASE_NONE, NULL, 0x00, - " An IPv6 address on the internal network", HFILL }}, + "An IPv6 address on the internal network", HFILL }}, { &hf_isakmp_cfg_attr_internal_ip6_netmask, { "INTERNAL IP4 NETMASK", "isakmp.cfg.attr.internal_ip6_netmask", FT_IPv6, BASE_NONE, NULL, 0x00, diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index baa85ada6b..f863b68267 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -23589,7 +23589,7 @@ void proto_register_lte_rrc(void) { { &hf_lte_rrc_eutra_cap_feat_group_ind_13, { "Indicator 13", "lte-rrc.eutra_cap_feat_group_ind_13", FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_13_val), 0, - "EUTRA Feature Group Indicator ", HFILL }}, + "EUTRA Feature Group Indicator", HFILL }}, { &hf_lte_rrc_eutra_cap_feat_group_ind_14, { "Indicator 14", "lte-rrc.eutra_cap_feat_group_ind_14", FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_14_val), 0, diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index ee9cb10df0..c3bc8614a7 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -13,7 +13,7 @@ * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * - + * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -847,7 +847,7 @@ static gboolean dissect_mac_lte_heur(tvbuff_t *tvb, packet_info *pinfo, } /* Do this again on re-dissection to re-discover offset of actual PDU */ - + /* Needs to be at least as long as: - the signature string - fixed header bytes @@ -874,7 +874,7 @@ static gboolean dissect_mac_lte_heur(tvbuff_t *tvb, packet_info *pinfo, else { p_mac_lte_info->detailed_phy_info.dl_info.present = FALSE; } - + p_mac_lte_info->rntiType = tvb_get_guint8(tvb, offset++); /* Read optional fields */ @@ -984,7 +984,7 @@ static void show_extra_phy_parameters(packet_info *pinfo, tvbuff_t *tvb, proto_t tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.modulation_type); PROTO_ITEM_SET_GENERATED(ti); - + ti = proto_tree_add_uint(phy_tree, hf_mac_lte_context_phy_ul_tbs_index, tvb, 0, 0, p_mac_lte_info->detailed_phy_info.ul_info.tbs_index); @@ -1087,7 +1087,7 @@ static void show_extra_phy_parameters(packet_info *pinfo, tvbuff_t *tvb, proto_t col_set_writable(pinfo->cinfo, FALSE); } } - } + } } @@ -3173,7 +3173,7 @@ mac_lte_init_protocol(void) } -static void* lcid_drb_mapping_copy_cb(void* dest, const void* orig, unsigned len _U_) +static void* lcid_drb_mapping_copy_cb(void* dest, const void* orig, unsigned len _U_) { const lcid_drb_mapping_t *o = orig; lcid_drb_mapping_t *d = dest; @@ -3375,7 +3375,7 @@ void proto_register_mac_lte(void) /* Out-of-band events */ { &hf_mac_lte_oob_send_preamble, - { "PRACH: ", + { "PRACH:", "mac-lte.preamble-sent", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } @@ -3874,7 +3874,7 @@ void proto_register_mac_lte(void) prefs_register_obsolete_preference(mac_lte_module, "decode_rar_ul_grant"); prefs_register_obsolete_preference(mac_lte_module, "show_rlc_info_column"); prefs_register_obsolete_preference(mac_lte_module, "attempt_to_detect_dl_harq_resend"); - + prefs_register_uint_preference(mac_lte_module, "retx_count_warn", "Number of Re-Transmits before expert warning triggered", "Number of Re-Transmits before expert warning triggered", diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 21e00614da..1cbc0f6768 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -11924,73 +11924,73 @@ proto_register_nfs(void) "Access rights for the types requested", HFILL } }, { &hf_nfs_access_supp_read, - { " 0x01 READ", "nfs.access_supp_read", + { "0x01 READ", "nfs.access_supp_read", FT_BOOLEAN, 8, TFS(&tfs_access_supp), NFS_ACCESS_MASK_READ, NULL, HFILL } }, { &hf_nfs_access_supp_lookup, - { " 0x02 LOOKUP", "nfs.access_supp_lookup", + { "0x02 LOOKUP", "nfs.access_supp_lookup", FT_BOOLEAN, 8, TFS(&tfs_access_supp), NFS_ACCESS_MASK_LOOKUP, NULL, HFILL } }, { &hf_nfs_access_supp_modify, - { " 0x04 MODIFY", "nfs.access_supp_modify", + { "0x04 MODIFY", "nfs.access_supp_modify", FT_BOOLEAN, 8, TFS(&tfs_access_supp), NFS_ACCESS_MASK_MODIFY, NULL, HFILL } }, { &hf_nfs_access_supp_extend, - { " 0x08 EXTEND", "nfs.access_supp_extend", + { "0x08 EXTEND", "nfs.access_supp_extend", FT_BOOLEAN, 8, TFS(&tfs_access_supp), NFS_ACCESS_MASK_EXTEND, NULL, HFILL } }, { &hf_nfs_access_supp_delete, - { " 0x10 DELETE", "nfs.access_supp_delete", + { "0x10 DELETE", "nfs.access_supp_delete", FT_BOOLEAN, 8, TFS(&tfs_access_supp), NFS_ACCESS_MASK_DELETE, NULL, HFILL } }, { &hf_nfs_access_supp_execute, - { " 0x20 EXECUTE", "nfs.access_supp_execute", + { "0x20 EXECUTE", "nfs.access_supp_execute", FT_BOOLEAN, 8, TFS(&tfs_access_supp), NFS_ACCESS_MASK_EXECUTE, NULL, HFILL } }, { &hf_nfs_access_read, - { " 0x01 READ", "nfs.access_read", + { "0x01 READ", "nfs.access_read", FT_BOOLEAN, 8, TFS(&tfs_access_rights), NFS_ACCESS_MASK_READ, NULL, HFILL } }, { &hf_nfs_access_lookup, - { " 0x02 LOOKUP", "nfs.access_lookup", + { "0x02 LOOKUP", "nfs.access_lookup", FT_BOOLEAN, 8, TFS(&tfs_access_rights), NFS_ACCESS_MASK_LOOKUP, NULL, HFILL } }, { &hf_nfs_access_modify, - { " 0x04 MODIFY", "nfs.access_modify", + { "0x04 MODIFY", "nfs.access_modify", FT_BOOLEAN, 8, TFS(&tfs_access_rights), NFS_ACCESS_MASK_MODIFY, NULL, HFILL } }, { &hf_nfs_access_extend, - { " 0x08 EXTEND", "nfs.access_extend", + { "0x08 EXTEND", "nfs.access_extend", FT_BOOLEAN, 8, TFS(&tfs_access_rights), NFS_ACCESS_MASK_EXTEND, NULL, HFILL } }, { &hf_nfs_access_delete, - { " 0x10 DELETE", "nfs.access_delete", + { "0x10 DELETE", "nfs.access_delete", FT_BOOLEAN, 8, TFS(&tfs_access_rights), NFS_ACCESS_MASK_DELETE, NULL, HFILL } }, { &hf_nfs_access_execute, - { " 0x20 EXECUTE", "nfs.access_execute", + { "0x20 EXECUTE", "nfs.access_execute", FT_BOOLEAN, 8, TFS(&tfs_access_rights), NFS_ACCESS_MASK_EXECUTE, NULL, HFILL } @@ -12008,28 +12008,28 @@ proto_register_nfs(void) "eia_flags", "nfs.exch_id_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_nfs_exchid_flags_moved_refer, { - "EXCHGID4_FLAG_SUPP_MOVED_REFER ", "nfs.exchange_id.flags.moved_refer", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_SUPP_MOVED_REFER", "nfs.exchange_id.flags.moved_refer", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_SUPP_MOVED_REFER, NULL, HFILL}}, { &hf_nfs_exchid_flags_moved_migr, { - "EXCHGID4_FLAG_SUPP_MOVED_MIGR ", "nfs.exchange_id.flags.moved_migr", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_SUPP_MOVED_MIGR", "nfs.exchange_id.flags.moved_migr", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_SUPP_MOVED_MIGR, NULL, HFILL}}, { &hf_nfs_exchid_flags_bind_princ, { - "EXCHGID4_FLAG_BIND_PRINC_STATEID ", "nfs.exchange_id.flags.bind_princ", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_BIND_PRINC_STATEID", "nfs.exchange_id.flags.bind_princ", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_BIND_PRINC_STATEID, NULL, HFILL}}, { &hf_nfs_exchid_flags_non_pnfs, { - "EXCHGID4_FLAG_USE_NON_PNFS ", "nfs.exchange_id.flags.non_pnfs", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_USE_NON_PNFS", "nfs.exchange_id.flags.non_pnfs", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_USE_NON_PNFS, NULL, HFILL}}, { &hf_nfs_exchid_flags_pnfs_mds, { - "EXCHGID4_FLAG_USE_PNFS_MDS ", "nfs.exchange_id.flags.pnfs_mds", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_USE_PNFS_MDS", "nfs.exchange_id.flags.pnfs_mds", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_USE_PNFS_MDS, NULL, HFILL}}, { &hf_nfs_exchid_flags_pnfs_ds, { - "EXCHGID4_FLAG_USE_PNFS_DS ", "nfs.exchange_id.flags.pnfs_ds", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_USE_PNFS_DS", "nfs.exchange_id.flags.pnfs_ds", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_USE_PNFS_DS, NULL, HFILL}}, { &hf_nfs_exchid_flags_upd_conf_rec_a, { "EXCHGID4_FLAG_UPD_CONFIRMED_REC_A", "nfs.exchange_id.flags.confirmed_rec_a", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_UPD_CONFIRMED_REC_A, NULL, HFILL}}, { &hf_nfs_exchid_flags_confirmed_r, { - "EXCHGID4_FLAG_CONFIRMED_R ", "nfs.exchange_id.flags.confirmed_r", FT_BOOLEAN, 32, + "EXCHGID4_FLAG_CONFIRMED_R", "nfs.exchange_id.flags.confirmed_r", FT_BOOLEAN, 32, TFS(&tfs_set_notset), EXCHGID4_FLAG_CONFIRMED_R, NULL, HFILL}}, { &hf_nfs_prot_info4_hash_alg, { "Prot Info hash algorithm", "nfs.prot_info4_hash_alg", FT_UINT32, BASE_HEX, diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index 51b1d40333..e69793f518 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -81,7 +81,7 @@ static int hf_omron_icf_rb1 = -1; /* Reserved should be 0 */ static int hf_omron_icf_rb2 = -1; /* Reserved should be 0 */ static int hf_omron_icf_rb3 = -1; /* Reserved should be 0 */ static int hf_omron_icf_rb4 = -1; /* Reserved should be 0 */ -static int hf_omron_icf_rsb = -1; /* Response setting (0: response required; 1: response not required) */ +static int hf_omron_icf_rsb = -1; /* Response setting (0: response required; 1: response not required) */ static int hf_omron_rsv = -1; static int hf_omron_gct = -1; @@ -505,7 +505,7 @@ static const value_string icf_rsb_vals[] = { static const range_string omron_dna_range[] = { { INT_DNA_MIN1, INT_DNA_MAX1, "Local network" }, { INT_DNA_MIN2, INT_DNA_MAX2, "Remote network" }, - { 0, 0, NULL } }; + { 0, 0, NULL } }; static const range_string omron_da1_range[] = { { INT_DA1_MIN1, INT_DA1_MAX1, "SYSMAC NET / LINK" }, @@ -1027,7 +1027,7 @@ const int *cyclic_non_fatal_8_fields[] = { &hf_omron_cyclic_62, NULL }; - + static const true_false_string boolean_data_type_protected = { "Protected", "Not Protected" @@ -1113,7 +1113,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } /* get the command code: we need it later */ - command_code = tvb_get_ntohs(tvb,10); + command_code = tvb_get_ntohs(tvb,10); /* Set the protocol column */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "OMRON"); @@ -1135,7 +1135,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { is_command = TRUE; if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Command : %s", cmd_str); + col_add_fstr(pinfo->cinfo, COL_INFO, "Command : %s", cmd_str); } } @@ -1156,7 +1156,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Byte 3 GCT */ offset = offset + 1; proto_tree_add_item(omron_header_tree, hf_omron_gct, tvb, offset, 1, FALSE); - + /* Byte 4 DNA */ offset = offset + 1; proto_tree_add_item(omron_header_tree, hf_omron_dna, tvb, offset, 1, FALSE); @@ -1276,7 +1276,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining == 6) { - proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, + proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, offset, 1, FALSE); proto_tree_add_item(command_tree, hf_omron_address, tvb, (offset+1), 2, FALSE); @@ -1295,7 +1295,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(reported_length_remaining > 2) { - proto_tree_add_item(command_tree, hf_omron_response_data, tvb, + proto_tree_add_item(command_tree, hf_omron_response_data, tvb, (offset+2), -1, FALSE); } offset = offset + reported_length_remaining; @@ -1376,7 +1376,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reported_length_remaining = reported_length_remaining - 4; } } - + if(is_response) { if(reported_length_remaining >= 3) @@ -1477,7 +1477,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: memory_code_len = 0; } /* switch */ - + offset = offset + 1; reported_length_remaining = reported_length_remaining - 1; @@ -1531,16 +1531,16 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0x0201: { - + if(is_command) { if(reported_length_remaining == 6) { - proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, offset, 2, FALSE); + proto_tree_add_item(command_tree, hf_omron_parameter_area_code, tvb, offset, 2, FALSE); proto_tree_add_item(command_tree, hf_omron_beginning_word, tvb, (offset+2), 2, FALSE); proto_tree_add_item(command_tree, hf_omron_num_words, tvb, (offset+4), 2, FALSE); offset = offset + 6; - } + } } if(is_response) @@ -1693,7 +1693,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_protect_code, tvb, (offset+2), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_begin_word, tvb, (offset+3),4,FALSE); proto_tree_add_item(command_tree, hf_omron_last_word, tvb, (offset+7),4,FALSE); - proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,FALSE); + proto_tree_add_item(command_tree, hf_omron_password, tvb, (offset+11),4,FALSE); offset = offset + 15; } } @@ -1721,7 +1721,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 8; } } - + if(is_response) { if(reported_length_remaining >= 10) @@ -1860,7 +1860,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* add area data sub tree */ ti = proto_tree_add_text(command_tree, tvb, (offset+82), 12, "Area Data"); area_data_tree = proto_item_add_subtree(ti, ett_area_data); - proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, FALSE); + proto_tree_add_item(area_data_tree, hf_omron_program_area_size, tvb, (offset+82), 2, FALSE); proto_tree_add_item(area_data_tree, hf_omron_iom_size, tvb, (offset+84), 1, FALSE); proto_tree_add_item(area_data_tree, hf_omron_num_dm_words, tvb, (offset+85), 2, FALSE); proto_tree_add_item(area_data_tree, hf_omron_timer_counter_size, tvb, (offset+87), 1, FALSE); @@ -1899,7 +1899,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_1, tvb, (offset+66), 1, FALSE); proto_tree_add_item(io_data_tree, hf_omron_io_data_num_sysmac_2, tvb, (offset+67), 1, FALSE); /* PC status */ - proto_tree_add_bitmask(command_tree, tvb, (offset+68), hf_omron_pc_status, + proto_tree_add_bitmask(command_tree, tvb, (offset+68), hf_omron_pc_status, ett_pc_status_fields, pc_status_fields, FALSE); offset = offset + 69; } @@ -1961,7 +1961,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if(reported_length_remaining >= 1) { - proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, FALSE); + proto_tree_add_item(command_tree, hf_omron_unit_address, tvb, offset, 1, FALSE); if (reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_num_units, tvb, (offset+1), 1, FALSE); @@ -2074,7 +2074,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) netw_nodes_non_fatal_err_sts = proto_tree_add_text(command_tree, tvb, offset, 8, "Network Nodes Non-Fatal Error Status"); - netw_nodes_non_fatal_err_sts_tree = + netw_nodes_non_fatal_err_sts_tree = proto_item_add_subtree(netw_nodes_non_fatal_err_sts, ett_omron_netw_nodes_non_fatal_err_sts); proto_tree_add_bitmask(netw_nodes_non_fatal_err_sts_tree, tvb, (offset+0), hf_omron_cyclic_label_1, @@ -2399,7 +2399,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); proto_tree_add_item(command_tree, hf_omron_num_receptions, tvb, (offset+2), 2, FALSE); - offset = offset + 4; + offset = offset + 4; } } } @@ -2486,7 +2486,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 2; } } - + if(is_response) { if(reported_length_remaining == 2) @@ -2502,7 +2502,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_network_address, tvb, (offset+4), 1, FALSE); offset = offset + 5; } - + } } break; @@ -2662,7 +2662,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) omron_byte = tvb_get_guint8(tvb, (offset+14)); proto_tree_add_uint_format(omron_disk_data_tree, hf_omron_date_year, tvb, (offset+14), 1, omron_byte, "Year: %d", ((omron_byte>>1)+1980)); - + proto_tree_add_item(omron_disk_data_tree, hf_omron_date_month, tvb, (offset+14), 4, FALSE); proto_tree_add_item(omron_disk_data_tree, hf_omron_date_day, tvb, (offset+14), 4, FALSE); proto_tree_add_item(omron_disk_data_tree, hf_omron_date_hour, tvb, (offset+14), 4, FALSE); @@ -2723,13 +2723,13 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 20; } } - + if(is_response) { if(reported_length_remaining >= 12) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); - proto_tree_add_item(command_tree, hf_omron_file_capacity, tvb, (offset+2), 4, FALSE); + proto_tree_add_item(command_tree, hf_omron_file_capacity, tvb, (offset+2), 4, FALSE); proto_tree_add_item(command_tree, hf_omron_file_position, tvb, (offset+6), 4, FALSE); proto_tree_add_item(command_tree, hf_omron_data_length, tvb, (offset+10), 2, FALSE); @@ -2764,7 +2764,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(is_response) { - if(reported_length_remaining == 2) + if(reported_length_remaining == 2) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); offset = offset + 2; @@ -2834,7 +2834,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(command_tree, hf_omron_disk_no, tvb, offset, 2, FALSE); proto_tree_add_item(command_tree, hf_omron_volume_parameter_code, tvb, (offset+2), 2, FALSE); - + if(reported_length_remaining == 16) { proto_tree_add_item(command_tree, hf_omron_volume_label, tvb, (offset+4), 12, FALSE); @@ -2868,7 +2868,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 28; } } - + if(is_response) { if(reported_length_remaining == 2) @@ -2970,7 +2970,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 22; } } - + if(is_response) { if(reported_length_remaining == 4) @@ -3115,7 +3115,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(command_tree, hf_omron_set_reset_specification, tvb, offset, 2, FALSE); proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_bit_flag, tvb, (offset+3), 3, FALSE); - + offset = offset + 6; reported_length_remaining = reported_length_remaining - 6; } @@ -3165,7 +3165,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(is_response) { if(reported_length_remaining >= 8) - { + { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); proto_tree_add_item(command_tree, hf_omron_command_memory_area_code, tvb, (offset+2), 1, FALSE); proto_tree_add_item(command_tree, hf_omron_transfer_beginning_address, tvb, (offset+3), 3, FALSE); @@ -3185,9 +3185,9 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, FALSE); offset = offset + reported_length_remaining; - } + } } - + if(is_response) { if(reported_length_remaining == 2) @@ -3220,7 +3220,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(is_response) { - if((reported_length_remaining > 2) && (reported_length_remaining <= (2+8))) + if((reported_length_remaining > 2) && (reported_length_remaining <= (2+8))) { proto_tree_add_item(command_tree, hf_omron_response_code, tvb, offset, 2, FALSE); proto_tree_add_item(command_tree, hf_omron_name_data, tvb, offset, -1, FALSE); @@ -3243,7 +3243,7 @@ dissect_omron_fins(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } /* if(tree) */ - + return tvb_length(tvb); } @@ -3321,7 +3321,7 @@ proto_register_omron_fins(void) { "Response code", "omron.response.code", FT_UINT16, BASE_HEX, VALS(response_codes), 0x0, NULL, HFILL }}, { &hf_omron_command_data, - { "Command Data", "omron.command.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Command Data", "omron.command.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_omron_address, { "Beginning address", "omron.memory.address", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3346,24 +3346,24 @@ proto_register_omron_fins(void) { &hf_omron_program_number, { "Program number", "omron.program_number", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - - { &hf_omron_protect_code, + + { &hf_omron_protect_code, { "Protect code", "omron.protect_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - - { &hf_omron_begin_word, + + { &hf_omron_begin_word, { "Beginning word", "omron.word.begin", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - - { &hf_omron_last_word, - { "Last word", "omron.word.last", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_omron_password, + { &hf_omron_last_word, + { "Last word", "omron.word.last", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + + { &hf_omron_password, { "Password", "omron.password", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_omron_clear_code, { "Clear Code", "omron.clearcode", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_omron_mode_code, - { "Mode Code", "omron.mode_code", FT_UINT8, BASE_HEX, VALS(mode_codes), 0x0, NULL, HFILL }}, + { "Mode Code", "omron.mode_code", FT_UINT8, BASE_HEX, VALS(mode_codes), 0x0, NULL, HFILL }}, { &hf_omron_monitor_label, { "Mode Code (Default Monitor)", "omron.mode_code_default_monitor", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -3397,7 +3397,7 @@ proto_register_omron_fins(void) { &hf_omron_memory_card_size, { "Memory card size", "omron.area_data.memory_card.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_omron_cpu_bus_unit_0, + { &hf_omron_cpu_bus_unit_0, { "CPU Bus Unit No. 0", "omron.cpubus_unit.no0", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_omron_cpu_bus_unit_1, { "CPU Bus Unit No. 1", "omron.cpubus_unit.no1", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -3430,7 +3430,7 @@ proto_register_omron_fins(void) { &hf_omron_cpu_bus_unit_15, { "CPU Bus Unit No. 15", "omron.cpubus_unit.no15", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_omron_cpu_bus_reserved, - { "CPU Bus Unit Reserved ", "omron.cpubus_unit.reserved", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { "CPU Bus Unit Reserved", "omron.cpubus_unit.reserved", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_omron_io_data_num_sysmac_1, { "No. of SYSMAC BUS/2 Masters mounted", "omron.remote_io_date.sysmac_1", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_omron_io_data_num_sysmac_2, @@ -3449,7 +3449,7 @@ proto_register_omron_fins(void) { "Rack Number", "omron.pcp_status.rack_num", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL}}, { &hf_omron_unit_address, { "Unit address", "omron.unit_address", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - { &hf_omron_num_units, + { &hf_omron_num_units, { "No. of Units", "omron.unit_nums", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, { &hf_omron_model_number, { "Model Number", "omron.model_number", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -3557,8 +3557,8 @@ proto_register_omron_fins(void) { "Reserved", "omron.message.rv_6", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0002, NULL, HFILL }}, { &hf_omron_message_rv_7, { "Reserved", "omron.message.rv_7", FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0001, NULL, HFILL }}, - { &hf_omron_fals, - { "FALS / FALS no.", "omron.fals", FT_UINT16, BASE_HEX, NULL, 0x3FFF, NULL, HFILL}}, + { &hf_omron_fals, + { "FALS / FALS no.", "omron.fals", FT_UINT16, BASE_HEX, NULL, 0x3FFF, NULL, HFILL}}, { &hf_omron_error_message, { "Error message", "omron.error_message", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_omron_parameter, @@ -3699,7 +3699,7 @@ proto_register_omron_fins(void) { "CIO Area first word", "omron.block_record.cio_area", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_omron_block_record_kind_of_dm, { "Kind of DM", "omron.block_record.kind_of_dm", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_omron_block_record_dm_area_first_word, + { &hf_omron_block_record_dm_area_first_word, { "DM Area first word", "omron.block_record.dm_area_first_word", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_omron_block_record_no_of_total_words, { "No. of total words", "omron.block_record.no_of_total_words", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -3730,17 +3730,17 @@ proto_register_omron_fins(void) { &hf_omron_status_1_node_0, { "Node 0", "omron.status.node.10", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x01, NULL, HFILL }}, { &hf_omron_status_1_node_1, - { "Node 1", "omron.status.node.11", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x02, NULL, HFILL }}, + { "Node 1", "omron.status.node.11", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x02, NULL, HFILL }}, { &hf_omron_status_1_node_2, - { "Node 2", "omron.status.node.12", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x04, NULL, HFILL }}, + { "Node 2", "omron.status.node.12", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x04, NULL, HFILL }}, { &hf_omron_status_1_node_3, - { "Node 3", "omron.status.node.13", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x08, NULL, HFILL }}, + { "Node 3", "omron.status.node.13", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x08, NULL, HFILL }}, { &hf_omron_status_1_node_4, - { "Node 4", "omron.status.node.14", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x10, NULL, HFILL }}, + { "Node 4", "omron.status.node.14", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x10, NULL, HFILL }}, { &hf_omron_status_1_node_5, - { "Node 5", "omron.status.node.15", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x20, NULL, HFILL }}, + { "Node 5", "omron.status.node.15", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x20, NULL, HFILL }}, { &hf_omron_status_1_node_6, - { "Node 6", "omron.status.node.16", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x40, NULL, HFILL }}, + { "Node 6", "omron.status.node.16", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x40, NULL, HFILL }}, { &hf_omron_status_1_node_7, { "Node 7", "omron.status.node.17", FT_BOOLEAN, 8, TFS(&boolean_status_block_stop_run), 0x80, NULL, HFILL }}, { &hf_omron_status_2_node_0, diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 920b3465ad..ff97456d31 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -1,5 +1,5 @@ /* packet-pnrp.h - * Routines for Peer Name Resolution Protocol (PNRP) dissection + * Routines for Peer Name Resolution Protocol (PNRP) dissection * * Copyright 2010, Jan Gerbecks <jan.gerbecks@stud.uni-due.de> * @@ -27,7 +27,7 @@ /* The official Dokumentation for the Peer Name Resolution Protocol can be found at http://msdn.microsoft.com/en-us/library/cc239047(PROT.13).aspx - This dissector is based on Revision 6.1.2 + This dissector is based on Revision 6.1.2 */ #ifdef HAVE_CONFIG_H @@ -117,7 +117,7 @@ static void dissect_payload_structure(tvbuff_t *tvb, gint offset, gint length, p static void dissect_publicKey_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree); static void dissect_signature_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree); -/* Define global variables +/* Define global variables ----------------------------*/ static int proto_pnrp = -1; @@ -343,7 +343,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 field_type; guint16 data_length; - + /*---------------------------------------- * Validate if it is really a PNRP Packet *----------------------------------------*/ @@ -353,13 +353,13 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* new style dissector. */ /* ToDo: confirm */ data_length = tvb_reported_length(tvb); - + /* Shortest Message is ACK -> 12 Bytes for Header plus 8 Bytes for Data */ if (data_length < 12+8 ) { return 0; } - + /* Check some values from the packet header */ /* First 2 bytes must be 0x0010 */ if (tvb_get_ntohs(tvb,0) != PNRP_HEADER ) @@ -375,34 +375,34 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } - + /* Assign Values to Variables */ /* Use to track data */ offset= 0; padding_bytes = 0; /* Get the message Information beforehand */ message_type = tvb_get_guint8(tvb,7); - - + + /* Simply Display the Protcol Name in the INFO column */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "pnrp"); - /* Clear out stuff in the info column */ + col_set_str(pinfo->cinfo, COL_PROTOCOL, "pnrp"); + /* Clear out stuff in the info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "PNRP %s Message ", val_to_str(message_type, messageType, "Unknown (0x%02x)")); - - + + /* If tree is NULL we are asked for summary, otherwise for details */ if(tree){ /* we are beeing asked for details */ proto_item *ti = NULL; proto_tree *pnrp_tree = NULL; - + proto_item *pnrp_header_item = NULL; proto_tree *pnrp_header_tree = NULL; - + proto_item *pnrp_message_tree = NULL; proto_item *pnrp_message_item = NULL; - - + + /* Lets add a subtree to our dissection to display the info */ ti = proto_tree_add_item(tree, proto_pnrp, tvb, 0, -1, FALSE); proto_item_append_text(ti, ", Message Type %s", @@ -416,7 +416,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pnrp_header_tree = proto_item_add_subtree(ti, ett_pnrp); pnrp_header_item = proto_tree_add_item(pnrp_tree, hf_pnrp_header, tvb, offset,12,FALSE); pnrp_header_tree = proto_item_add_subtree(pnrp_header_item, ett_pnrp); - + /* Add Field ID should be 0c0010 */ proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_fieldID,tvb,offset,2,FALSE); offset += 2; @@ -438,19 +438,19 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Add Message ID */ proto_tree_add_item(pnrp_header_tree,hf_pnrp_header_messageID,tvb,offset,4,FALSE); offset += 4; - - + + /*------------------------------- *--Add all Message Fields *------------------------------*/ - + /* The following part has dynamic length depending on message type */ while (tvb_reported_length_remaining(tvb, offset) > 0) { /* Determine the Field Type */ field_type = tvb_get_ntohs(tvb,offset ); /* Determine length of this message */ data_length = tvb_get_ntohs(tvb,offset + 2); - + /* Length must be at least 4, because field_type and data_length are part of data_length information */ if (data_length < 4) { if (tree) { @@ -467,8 +467,8 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (field_type) { /* First Field in ACK Message */ case PNRP_HEADER_ACKED: - if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + if (tree) { + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Message ACK ID: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -478,26 +478,26 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset += data_length; break; - + /* A validate pnrp id follows as found in FLOOD */ case VALIDATE_PNRP_ID: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Validate PNRP ID: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); /* We can have a large number of pnrp IDs here */ dissect_pnrp_ids(tvb,offset+4,data_length-4,pnrp_message_tree); - + } offset += data_length; break; - + /* The Flags have different meaning, depending on the message */ case FLAGS_FIELD: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Flags Field: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -509,7 +509,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += data_length+2; break; - + case ACK: /* Reserved 0 - 14 bits */ proto_tree_add_bits_item(pnrp_message_tree, hf_pnrp_message_ack_flags_reserved, tvb, (offset + 4)*8, 15, FALSE); @@ -530,22 +530,22 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += data_length+2; } break; - + default: proto_tree_add_text(pnrp_message_tree, tvb, offset + 4, data_length -4, "Flags"); offset += data_length; break; } - + } - + break; - + /* Flood controls found in FLOOD Message */ case FLOOD_CONTROLS: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Flood Control: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -559,14 +559,14 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Padding 1 */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 7, 1, "Padding: %d",tvb_get_guint8(tvb,offset+7)); } - + offset += data_length+1; break; - + /* Solicit Controls found in SOLICIT Message */ case SOLICIT_CONTROLS: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Solicit Controls: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -580,7 +580,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Lookup controls found in LOOKUP Message */ case LOOKUP_CONTROLS: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Lookup Control: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -595,42 +595,42 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_lookupControls_reasonCode, tvb, offset + 9, 1, FALSE); /* Reserved */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 10, 2, "Reserved : %d",tvb_get_ntohs(tvb,offset+10)); - + } - + offset += data_length; break; /* Target PNRP ID found in Lookup Message */ case TARGET_PNRP_ID: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Target PNRP ID: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); dissect_pnrp_ids(tvb, offset+4, data_length-4, pnrp_message_tree); } - + offset += data_length; break; /* Extended Payload found in AUTHORITY Message */ case EXTENDED_PAYLOAD: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Extended Payload: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); /* TODO: Do actual parsing */ } - + offset += data_length; break; /* Pnrp id Array as found in REQUEST & ADVERTISE Message */ case PNRP_ID_ARRAY: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "PNRP ID Array: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -641,20 +641,20 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_idarray_Entrylength, tvb, offset + 10, 2, FALSE); dissect_pnrp_ids(tvb,offset+12,data_length-12,pnrp_message_tree); } - + offset += data_length; break; /* Cert Chain follows as found in AUTHORITY */ case CERT_CHAIN: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "CERT Chain: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_certChain, tvb, offset + 4, data_length-4, FALSE); } - + /* There might be padding, so fill up to the next byte */ padding_bytes = 0; while (data_length%4 != 0 &&tvb_reported_length_remaining(tvb, offset+data_length)>0) { @@ -670,7 +670,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* classifier: A classifier string follows as found in AUTHORITY */ case CLASSIFIER: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Classifier: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -686,7 +686,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* The actual classifier String */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 12, tvb_get_ntohs(tvb,offset+6)-8, "Classifier: %s",tvb_get_ephemeral_faked_unicode(tvb, offset + 12, (tvb_get_ntohs(tvb,offset+6)-8)/2, FALSE)); } - + /* There might be padding, so fill up to the next byte */ padding_bytes = 0; while (data_length%4 != 0 &&tvb_reported_length_remaining(tvb, offset+data_length)>0) { @@ -702,36 +702,36 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* A hashed nonce follows as found in ADVERTISE & SOLICIT */ case HASHED_NONCE: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Hashed Nonce: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_hashednonce, tvb, offset + 4, data_length-4, FALSE); - + } - + offset += data_length; break; - + /* A nonce follows as found in REQUEST & INQUIRE */ case NONCE: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Nonce: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_nonce, tvb, offset + 4, data_length-4, FALSE); } - + offset += data_length; break; - + /* split controls as found in AUTHORITY */ case SPLIT_CONTROLS: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Split controls: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -740,24 +740,24 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_splitControls_authorityBuffer, tvb, offset + 4, 2, FALSE); /* Byte offset */ proto_tree_add_text(pnrp_message_tree, tvb, offset + 6, 2, "Offset : %d",tvb_get_ntohs(tvb,offset+6)); - + } - + /* There could be data offset */ offset += data_length+tvb_get_ntohs(tvb,offset+6); break; - + /* routing entry: A route entry follows as found in ADVERTISE, INQUIRE, LOOKUP & AUTHORITY */ case ROUTING_ENTRY: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Routing Entry: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); dissect_route_entry(tvb,offset+4, tvb_get_ntohs(tvb,offset+2)-4, pnrp_message_tree); } - + /* There might be padding, so fill up to the next byte */ padding_bytes = 0; while (data_length%4 != 0 &&tvb_reported_length_remaining(tvb, offset+data_length)>0) { @@ -770,28 +770,28 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset += data_length; break; - + /* validate cpa: an encoded CPA structure follows as found in AUTHORITY */ case VALIDATE_CPA: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Validate CPA: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_length, tvb, offset + 2, 2, FALSE); /* Do the actual parsing in own method */ dissect_encodedCPA_structure(tvb, offset+4, data_length-4, pnrp_message_tree); - + } - + offset += data_length; break; - - + + /* IPV6 Endpoint: an ipv6 endpoint array structure follows as found in LOOKUP */ case IPV6_ENDPOINT_ARRAY: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "IPv6 Endpoint Array: "); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); proto_tree_add_item(pnrp_message_tree, hf_pnrp_message_type, tvb, offset , 2, FALSE); @@ -807,13 +807,13 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Flagged Path */ dissect_ipv6_endpoint_structure(tvb, offset+12, tvb_get_ntohs(tvb,offset+6)-8,pnrp_message_tree); } - + offset += data_length; break; - + default: if (tree) { - pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, + pnrp_message_item = proto_tree_add_text(pnrp_tree, tvb, offset, data_length, "Type: %s, length: %u", val_to_str(field_type, fieldID, "Unknown (0x%04x)"), data_length); pnrp_message_tree = proto_item_add_subtree(pnrp_message_item, ett_pnrp_message); @@ -833,7 +833,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } return offset; - + } /*--------------------------------------------------------------* @@ -847,13 +847,13 @@ static void dissect_pnrp_ids(tvbuff_t *tvb, gint offset, gint length, proto_tree length -= 32; offset += 32; } - + } static void dissect_route_entry(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree) { gint tmp_offset; - /* Check if we don't run out of data */ + /* Check if we don't run out of data */ if (0 <= tvb_reported_length_remaining(tvb, offset+length)) { tmp_offset = 0; /* First, we have a 32 Bit long PNRP ID */ @@ -881,7 +881,7 @@ static void dissect_route_entry(tvbuff_t *tvb, gint offset, gint length, proto_t static void dissect_ipv6_endpoint_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree) { - /* Check if we don't run out of data */ + /* Check if we don't run out of data */ while (0 <= tvb_reported_length_remaining(tvb, offset+18) && 18 <=length) { /* Port Number */ proto_tree_add_text(tree, tvb, offset, 2, "Port Number : %d",tvb_get_ntohs(tvb, offset)); @@ -903,7 +903,7 @@ static void dissect_ipv6_address(tvbuff_t *tvb, gint offset, gint length, proto_ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length, proto_tree *tree) { - /* Check if we don't run out of data */ + /* Check if we don't run out of data */ if (0 <= tvb_reported_length_remaining(tvb, offset+length)) { guint8 flagsField; /* Add a new subtree */ @@ -911,7 +911,7 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length proto_item *pnrp_encodedCPA_item = NULL; pnrp_encodedCPA_item = proto_tree_add_item(tree, hf_pnrp_encodedCPA, tvb, offset,length,FALSE); pnrp_encodedCPA_tree = proto_item_add_subtree(pnrp_encodedCPA_item, ett_pnrp_message_encodedCPA); - + /* Length information */ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_length, tvb, offset, 2, FALSE); /* CPA Minor Version */ @@ -931,10 +931,10 @@ static void dissect_encodedCPA_structure(tvbuff_t *tvb, gint offset, gint length proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_notAfter, tvb, offset+8, 8, FALSE); /* Service Location */ proto_tree_add_item(pnrp_encodedCPA_tree, hf_pnrp_encodedCPA_serviceLocation, tvb, offset+16, 16, FALSE); - + /* now, the structure is variable, so add bytes to offset */ offset +=32; - + /* Check if R Flag is set */ if ((flagsField & FLAGS_ENCODED_CPA_R)==0x00) { /* Nonce follows */ @@ -994,7 +994,7 @@ static void dissect_payload_structure(tvbuff_t *tvb, gint offset, gint length, p if (0<length ) { pnrp_payload_item = proto_tree_add_text(tree, tvb, offset, length, "Payload Structure"); pnrp_payload_tree = proto_item_add_subtree(pnrp_payload_item, ett_pnrp_message_payloadStructure); - + /* Dissect the Payload Structure */ /* Payload Type */ proto_tree_add_text(pnrp_payload_tree, tvb, offset,4, "Payload Type : %d",tvb_get_letohl(tvb,offset)); @@ -1081,7 +1081,7 @@ static void dissect_signature_structure(tvbuff_t *tvb, gint offset, gint length, void proto_register_pnrp(void) { /* A header field is something you can search/filter on. - * + * * We create a structure to register our fields. It consists of an * array of hf_register_info structures, each of which are of the format * {&(field id), {name, abbrev, type, display, strings, bitmask, blurb, HFILL}}. @@ -1210,7 +1210,7 @@ void proto_register_pnrp(void) { "Length", "pnrp.encodedCPA.lenght", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_encodedCPA_majorVersion, - { "CPA Major Version ", "pnrp.encodedCPA.vMajor", FT_UINT8, BASE_DEC, NULL, 0x0, + { "CPA Major Version", "pnrp.encodedCPA.vMajor", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_encodedCPA_minorVersion, { "CPA Minor Version", "pnrp.encodedCPA.vMinor", FT_UINT8, BASE_DEC, NULL, 0x0, @@ -1220,22 +1220,22 @@ void proto_register_pnrp(void) { "Flags", "pnrp.encodedCPA.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_reserved, - { "Reserved ", "pnrp.encodedCPA.flags.reserved", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_RESERVED, + { "Reserved", "pnrp.encodedCPA.flags.reserved", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_RESERVED, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_Xbit, - { "CPA has E(X)tended Payload ", "pnrp.encodedCPA.flags.xbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_X, + { "CPA has E(X)tended Payload", "pnrp.encodedCPA.flags.xbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_X, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_Fbit, - { "CPA contains (F)riendly Name ", "pnrp.encodedCPA.flags.fbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_F, + { "CPA contains (F)riendly Name", "pnrp.encodedCPA.flags.fbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_F, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_Cbit, - { "CPA contains (C)lassifier Hash ", "pnrp.encodedCPA.flags.cbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_C, + { "CPA contains (C)lassifier Hash", "pnrp.encodedCPA.flags.cbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_C, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_Abit, - { "CPA contains Binary (A)uthority field ", "pnrp.encodedCPA.flags.abit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_A, + { "CPA contains Binary (A)uthority field", "pnrp.encodedCPA.flags.abit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_A, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_Ubit, - { "Friendly Name in (U)TF-8 ", "pnrp.encodedCPA.flags.ubit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_U, + { "Friendly Name in (U)TF-8", "pnrp.encodedCPA.flags.ubit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_U, NULL, HFILL }}, { &hf_pnrp_encodedCPA_flags_Rbit, { "This is a (r)evoke CPA", "pnrp.encodedCPA.flags.rbit", FT_UINT8, BASE_HEX, NULL, FLAGS_ENCODED_CPA_R, @@ -1261,13 +1261,13 @@ void proto_register_pnrp(void) { "Flags", "pnrp.lookupControls.flags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_message_lookupControls_flags_reserved, - { "Reserved ", "pnrp.lookupControls.flags.reserved", FT_UINT16, BASE_HEX, NULL, FLAGS_LOOKUPCONTROLS_RESERVED, + { "Reserved", "pnrp.lookupControls.flags.reserved", FT_UINT16, BASE_HEX, NULL, FLAGS_LOOKUPCONTROLS_RESERVED, NULL, HFILL }}, { &hf_pnrp_message_lookupControls_flags_Abit, - { "A bit: ", "pnrp.lookupControls.flags.Abit", FT_UINT16, BASE_HEX, NULL, FLAGS_LOOKUPCONTROLS_A, + { "A bit:", "pnrp.lookupControls.flags.Abit", FT_UINT16, BASE_HEX, NULL, FLAGS_LOOKUPCONTROLS_A, "Sender is willing to accept returned nodes that are not closer to the target ID than the Validate PNRP ID", HFILL }}, { &hf_pnrp_message_lookupControls_flags_0bit, - { "0 bit - reserved: ", "pnrp.lookupControls.flags.0bit", FT_UINT16, BASE_HEX, NULL, FLAGS_LOOKUPCONTROLS_0, + { "0 bit - reserved:", "pnrp.lookupControls.flags.0bit", FT_UINT16, BASE_HEX, NULL, FLAGS_LOOKUPCONTROLS_0, NULL, HFILL }}, { &hf_pnrp_message_lookupControls_precision, { "Precision", "pnrp.lookupControls.precision", FT_UINT16, BASE_HEX, NULL, 0x0, @@ -1287,9 +1287,9 @@ void proto_register_pnrp(void) "An ASN.1-encoded 1024-bit RSA public key", HFILL }}, /* Signature Structure */ { &hf_pnrp_signature_signatureData, - { "Signature ", "pnrp.signature.data", FT_BYTES,BASE_NONE, NULL, 0x0, + { "Signature", "pnrp.signature.data", FT_BYTES,BASE_NONE, NULL, 0x0, "Signature created when signing the CPA", HFILL }}, - + /* Route Entry */ { &hf_pnrp_message_routeEntry_portNumber, { "Port Number", "pnrp.segment.routeEntry.portNumber", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -1310,24 +1310,24 @@ void proto_register_pnrp(void) { "Number of Entries", "pnrp.segment.idArray.NumEnries", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_message_idArray_Length, - { "Length of Array ", "pnrp.segment.idArray.Length", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Length of Array", "pnrp.segment.idArray.Length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_message_ElementFieldType, - { "Type of Array Entry ", "pnrp.segment.ElementFieldType", FT_UINT16, BASE_HEX, VALS(fieldID), 0x0, + { "Type of Array Entry", "pnrp.segment.ElementFieldType", FT_UINT16, BASE_HEX, VALS(fieldID), 0x0, NULL, HFILL }}, { &hf_pnrp_message_idarray_Entrylength, - { "Length of each Array Entry ", "pnrp.segment.idArray.Entrylength", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Length of each Array Entry", "pnrp.segment.idArray.Entrylength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_pnrp_message_certChain, - { "Certificate Chain ", "pnrp.segment.certChain", FT_BYTES,BASE_NONE, NULL, 0x0, + { "Certificate Chain", "pnrp.segment.certChain", FT_BYTES,BASE_NONE, NULL, 0x0, "A Certificate Chain, containing the public key used to sign the CPA and its Certificate Chain", HFILL }}, { &hf_pnrp_message_solicitType, - { "Solicit Type ", "pnrp.segment.solicitType", FT_UINT8, BASE_DEC, VALS(solicitType), 0x0, + { "Solicit Type", "pnrp.segment.solicitType", FT_UINT8, BASE_DEC, VALS(solicitType), 0x0, NULL, HFILL }}, { &hf_pnrp_message_ipv6, { "IPv6 Address","pnrp.segment.ipv6Address",FT_IPv6, BASE_NONE, NULL, 0x0,"IPv6 Address",HFILL}} }; - + /* Protocol subtree array */ static gint *ett[] = { &ett_pnrp, @@ -1343,7 +1343,7 @@ void proto_register_pnrp(void) }; /* Register the Dissector with Wireshark */ proto_pnrp = proto_register_protocol(PROTONAME,PROTOSHORTNAME,PROTOABBREV); - + proto_register_field_array(proto_pnrp,hf,array_length(hf)); proto_register_subtree_array (ett, array_length(ett)); } diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c index 09e6d576cb..263ec97821 100644 --- a/epan/dissectors/packet-radiotap.c +++ b/epan/dissectors/packet-radiotap.c @@ -721,7 +721,7 @@ proto_register_radiotap(void) #if 0 { &hf_radiotap_xchannel_maxpower, { "Max transmit power", "radiotap.xchannel.maxpower", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, #endif { &hf_radiotap_fhss_hopset, { "FHSS Hop Set", "radiotap.fhss.hopset", @@ -835,7 +835,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct _radiotap_info *radiotap_info; static struct _radiotap_info rtp_info_arr[1]; - + radiotap_info = &rtp_info_arr[0]; col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN"); @@ -845,7 +845,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) version = tvb_get_guint8(tvb, offset); length = tvb_get_letohs(tvb, offset+2); present = tvb_get_letohl(tvb, offset+4); - + radiotap_info->radiotap_length = length; col_add_fstr(pinfo->cinfo, COL_INFO, "Radiotap Capture v%u, Length %u", @@ -1354,7 +1354,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector((rflags & IEEE80211_RADIOTAP_F_DATAPAD) ? ieee80211_datapad_handle : ieee80211_handle, next_tvb, pinfo, tree); - + tap_queue_packet(radiotap_tap, pinfo, radiotap_info); } diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 813e7ea246..f528aea8b3 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -390,11 +390,11 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hti = proto_tree_add_uint_format(sasp_tree,hf_sasp_type,tvb,offset,2,hdr_type, "Type: %s", (hdr_type==SASP_HDR_TYPE) ? "SASP" : "[Invalid]"); if (hdr_type != SASP_HDR_TYPE) { - expert_add_info_format(pinfo, hti, PI_MALFORMED, PI_ERROR, + expert_add_info_format(pinfo, hti, PI_MALFORMED, PI_ERROR, "Invalid SASP Header Type [0x%04x]", hdr_type); /* XXX: The folowing should actually happen automatically ? */ col_set_str(pinfo->cinfo, COL_INFO, "[Malformed: Invalid SASP Header Type]"); - return; + return; } offset+=2; length = tvb_get_guint8(tvb, offset); @@ -508,7 +508,7 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Unknown SASP Message Type */ col_add_fstr(pinfo->cinfo, COL_INFO, "[Malformed: Unknown Message Type [0x%04x]", msg_type); - expert_add_info_format(pinfo, mti, PI_MALFORMED, PI_WARN, + expert_add_info_format(pinfo, mti, PI_MALFORMED, PI_WARN, "Unknown SASP Message Type: 0x%4x", msg_type); return; } @@ -1318,7 +1318,7 @@ void proto_register_sasp(void) { &hf_sasp_memdatacomp_type, { "Message Type", "sasp.msg.type", FT_UINT16, BASE_HEX, VALS(msg_table), 0x0, - "SASP Mem Data Comp ", HFILL } }, + "SASP Mem Data Comp", HFILL } }, { &hf_sasp_memdatacomp_sz, { "Mem Data Comp-Size", "sasp.memdatacomp.size", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -1376,13 +1376,13 @@ void proto_register_sasp(void) { &hf_sasp_setlbstate_rep, { "Set Lbstate Rep", "sasp.msg.type", FT_UINT32, BASE_HEX, NULL, 0x0, - "SASP Set Lbstate Rep", HFILL } }, + "SASP Set Lbstate Rep", HFILL } }, { &hf_sasp_setlbstate_rep_sz, { "Set Lbstate Rep-Size", "sasp.setlbstate-rep.size", FT_UINT16, BASE_DEC, NULL, 0x0, - "SASP Set Lbstate Rep Size", HFILL } }, + "SASP Set Lbstate Rep Size", HFILL } }, - { &hf_sasp_setlbstate_rep_rcode, + { &hf_sasp_setlbstate_rep_rcode, { "Set Lbstate Rep-Return Code", "sasp.setlbstate-rep.retcode", FT_UINT8, BASE_HEX, VALS(set_lb_state_reply_response_code), 0x0, "SASP Set Lbstate Rep Return Code", HFILL } }, @@ -1410,7 +1410,7 @@ void proto_register_sasp(void) "SASP Grp Data Comp Grp Name Len",HFILL } }, { &hf_sasp_grpdatacomp_grp_name, - { "Grp Data Comp-Grp Name ","sasp.grpdatacomp.grpname", FT_STRING, BASE_NONE, NULL, 0x0, + { "Grp Data Comp-Grp Name","sasp.grpdatacomp.grpname", FT_STRING, BASE_NONE, NULL, 0x0, "SASP Grp Data Comp Grp Name", HFILL } }, /*grp mem data comp */ @@ -1421,7 +1421,7 @@ void proto_register_sasp(void) { &hf_sasp_grp_memdatacomp_sz, - { "Grp Mem Data Comp-Size","sasp.grp-memdatacomp.size", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Grp Mem Data Comp-Size","sasp.grp-memdatacomp.size", FT_UINT16, BASE_DEC, NULL, 0x0, "SASP Grp Mem Data Comp Size", HFILL } }, { &hf_sasp_grp_memdatacomp_cnt, @@ -1491,7 +1491,7 @@ void proto_register_sasp(void) { &hf_sasp_memstatedatacomp_state, { "Mem State-State", "sasp.memstate.state", FT_UINT8, BASE_HEX, NULL, 0x0, - "SASP Mem State Data Comp State ", HFILL } }, + "SASP Mem State Data Comp State", HFILL } }, { &hf_sasp_memstatedatacomp_quiesce_flag, { "Mem State-Quiesce Flag", "sasp.flags.quiesce", FT_BOOLEAN, 8, NULL, SASP_QUIESCE_FLAG, @@ -1510,7 +1510,7 @@ void proto_register_sasp(void) { &hf_sasp_weight_entry_data_comp_state, { "Wt Entry Data Comp-state", "sasp.wtentry.state", FT_UINT8, BASE_HEX, NULL, 0x0, - "SASP Wt Entry Data Comp State ", HFILL } }, + "SASP Wt Entry Data Comp State", HFILL } }, { &hf_wtstate_flag, { "Flags","sasp.flags.wtstate", FT_UINT8, BASE_HEX, NULL, 0x0, @@ -1605,12 +1605,12 @@ void proto_register_sasp(void) } /* Handing off to TCP */ -void -proto_reg_handoff_sasp(void) +void +proto_reg_handoff_sasp(void) { dissector_handle_t sasp_handle; sasp_handle = create_dissector_handle(dissect_sasp, proto_sasp); - dissector_add("tcp.port", SASP_GLOBAL_PORT, sasp_handle); + dissector_add("tcp.port", SASP_GLOBAL_PORT, sasp_handle); } diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index d0e2461a56..b5ae012044 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4167,7 +4167,7 @@ dissect_smb2_QFid_buffer_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr if (tree) { item = proto_tree_get_parent(tree); } - + if (item) { if (tvb_length(tvb) == 0) { proto_item_append_text(item, ": NO DATA"); @@ -4220,7 +4220,7 @@ dissect_smb2_DHnQ_buffer_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static void dissect_smb2_DHnQ_buffer_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, smb2_info_t *si _U_) { - proto_tree_add_item(tree, hf_smb2_dhnq_buffer_reserved, tvb, 0, 8, TRUE); + proto_tree_add_item(tree, hf_smb2_dhnq_buffer_reserved, tvb, 0, 8, TRUE); } static void @@ -4258,7 +4258,7 @@ dissect_smb2_MxAc_buffer_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr dissect_nt_64bit_time(tvb, tree, offset, hf_smb2_mxac_timestamp); - return; + return; } static void @@ -4317,7 +4317,7 @@ struct create_context_data_tag_dissectors create_context_dissectors_array[] = { { "QFid", { dissect_smb2_QFid_buffer_request, dissect_smb2_QFid_buffer_response } } }; -static struct create_context_data_dissectors* +static struct create_context_data_dissectors* get_create_context_data_dissectors(const char *tag) { size_t i; @@ -4374,7 +4374,7 @@ dissect_smb2_create_extra_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa dissectors = get_create_context_data_dissectors(tag); if (dissectors) dissector = (si->flags & SMB2_FLAGS_RESPONSE) ? dissectors->response : dissectors->request; - + dissect_smb2_olb_buffer(pinfo, sub_tree, tvb, &data_olb, si, dissector); if(chain_offset){ @@ -6408,7 +6408,7 @@ proto_register_smb2(void) { &hf_smb2_dhnq_buffer_reserved, { "Reserved", "smb2.hf_smb2_dhnq_buffer_reserved", FT_UINT64, BASE_HEX, - NULL, 0, "", HFILL}}, + NULL, 0, NULL, HFILL}}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 3df50e9d72..81cb72f07f 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -3241,7 +3241,7 @@ proto_register_sna(void) /* { &hf_sna_ru, { "Request/Response Unit", "sna.ru", FT_NONE, BASE_NONE, - NULL, 0x0, "", HFILL }},*/ + NULL, 0x0, NULL, HFILL }},*/ { &hf_sna_gds, { "GDS Variable", "sna.gds", FT_NONE, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c index c3cbc456e5..aa747c2900 100644 --- a/epan/dissectors/packet-sqloracle.c +++ b/epan/dissectors/packet-sqloracle.c @@ -681,71 +681,71 @@ proto_register_sqloracle(void) { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, "", HFILL } + { "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, - "", HFILL }}, + NULL, HFILL }}, */ { &hf_sqloracle_stmt, { "SQL statement", "sqloracle.stmt", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index bbe87b2651..b87e034773 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5420,7 +5420,7 @@ proto_register_tn3270(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_extended_ps_color, - { " Color planes", "tn3270.extended_ps_color", + { "Color planes", "tn3270.extended_ps_color", FT_UINT8, BASE_HEX, VALS(vals_color_identifications), 0x0, NULL, HFILL }}, { &hf_tn3270_extended_ps_stsubs, @@ -5805,7 +5805,7 @@ proto_register_tn3270(void) /* 6.9 - Query Reply (Alphanumeric Partitions) */ { &hf_tn3270_ap_na, - { " Max number of alphanumeric partitions", "tn3270.ap_na", + { "Max number of alphanumeric partitions", "tn3270.ap_na", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ap_m, @@ -6107,7 +6107,7 @@ proto_register_tn3270(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ddm_ddmss, - { " DDM subset identifier", "tn3270.ddm_ddmss", + { "DDM subset identifier", "tn3270.ddm_ddmss", FT_UINT8, BASE_HEX, VALS(vals_ddm), 0x0, NULL, HFILL }}, /* END - 6.19 - Query Reply (Distributed Data Management) */ @@ -6237,11 +6237,11 @@ proto_register_tn3270(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ippd_dpbs, - { " Default printer buffer size (in character cells)", "tn3270.ippd_dpbs", + { "Default printer buffer size (in character cells)", "tn3270.ippd_dpbs", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ippd_apbs, - { " Default printer buffer size (in character cells)", "tn3270.ippd_apbs", + { "Default printer buffer size (in character cells)", "tn3270.ippd_apbs", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ipccd_wcd, @@ -6425,7 +6425,7 @@ proto_register_tn3270(void) /* 6.50 - Query Reply (Transparency) */ { &hf_tn3270_t_np, - { " Number of pairs", "tn3270.t_np", + { "Number of pairs", "tn3270.t_np", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_t_vi, @@ -6504,19 +6504,19 @@ proto_register_tn3270(void) FT_UINT16, BASE_DEC, NULL, 0x0, "Character buffer size (bytes)", HFILL }}, { &hf_tn3270_ua_xmin, - { " Minimum number of X units in variable cell", "tn3270.ua_xmin", + { "Minimum number of X units in variable cell", "tn3270.ua_xmin", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ua_ymin, - { " Minimum number of Y units in variable cell", "tn3270.ua_ymin", + { "Minimum number of Y units in variable cell", "tn3270.ua_ymin", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ua_xmax, - { " Maximum number of X units in variable cell", "tn3270.ua_xmax", + { "Maximum number of X units in variable cell", "tn3270.ua_xmax", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_tn3270_ua_ymax, - { " Maximum number of Y units in variable cell", "tn3270.ua_ymax", + { "Maximum number of Y units in variable cell", "tn3270.ua_ymax", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, /* End - 6.51 Query Reply Usable Area */ diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c index 3915c1595b..7b89ead826 100644 --- a/epan/dissectors/packet-vmlab.c +++ b/epan/dissectors/packet-vmlab.c @@ -25,17 +25,17 @@ /* History * - * Apr 4, 2010 - David Aggeler + * Apr 4, 2010 - David Aggeler * * - Initial version based on packet-vlan.c * - * VMware Lab Manager is using this encapsulation directly as Ethernet Frames - * or inside VLANs. The Ethernet type was originally registered to Akimbi, but VMware - * acquired this company in 2006. No public information found, so the decoding here + * VMware Lab Manager is using this encapsulation directly as Ethernet Frames + * or inside VLANs. The Ethernet type was originally registered to Akimbi, but VMware + * acquired this company in 2006. No public information found, so the decoding here * is an educated guess. Since one of the features of Lab Manager is to separate * VMs with equal host name, IP and MAC Address, I expect the upper layer dissectors - * (namely ARP, ICMP, IP, TCP) to create false alerts, since identical configurations - * may communicate at the same time. The main goal of this dissector is to be able + * (namely ARP, ICMP, IP, TCP) to create false alerts, since identical configurations + * may communicate at the same time. The main goal of this dissector is to be able * to troubleshoot connectivity, preferably pings. It's also a little to understand * as to how host spanning fenced configurations actually talk. * @@ -77,7 +77,7 @@ dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree* volatile vmlab_tree; proto_item* ti; - + guint32 offset=0; const guint8* src_addr; @@ -93,7 +93,7 @@ dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_vmlab, tvb, 0, 24, FALSE); vmlab_tree = proto_item_add_subtree(ti, ett_vmlab); - + /* Flags*/ attributes = tvb_get_guint8(tvb, offset); proto_tree_add_item(vmlab_tree, hf_vmlab_flags_part1, tvb, offset, 1, FALSE); @@ -103,7 +103,7 @@ dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_append_text(ti, ", Fragment"); } offset += 1; - + /* Portgroup*/ portgroup = tvb_get_guint8(tvb, offset); proto_tree_add_uint(vmlab_tree, hf_vmlab_portgroup, tvb, offset, 1, portgroup); @@ -128,9 +128,9 @@ dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_ether(vmlab_tree, hf_vmlab_eth_src, tvb, offset, 6, src_addr); offset += 6; - proto_item_append_text(ti, ", Src: %s (%s), Dst: %s (%s)", + proto_item_append_text(ti, ", Src: %s (%s), Dst: %s (%s)", get_ether_name(src_addr), ether_to_str(src_addr), get_ether_name(dst_addr), ether_to_str(dst_addr)); - + /* Encapsulated Ethertype is also part of the block*/ encap_proto = tvb_get_ntohs(tvb, offset); offset += 2; @@ -145,24 +145,24 @@ proto_register_vmlab(void) { static hf_register_info hf[] = { - { &hf_vmlab_flags_part1, { "Unknown ", "vmlab.unknown1", + { &hf_vmlab_flags_part1, { "Unknown", "vmlab.unknown1", FT_UINT8, BASE_HEX, NULL, 0xF8, NULL, HFILL }}, - { &hf_vmlab_flags_fragment, { "More Fragments", "vmlab.fragment", + { &hf_vmlab_flags_fragment, { "More Fragments", "vmlab.fragment", FT_UINT8, BASE_NONE, VALS(fragment_vals), 0x04, NULL, HFILL }}, - { &hf_vmlab_flags_part2, { "Unknown ", "vmlab.unknown2", + { &hf_vmlab_flags_part2, { "Unknown", "vmlab.unknown2", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL }}, - { &hf_vmlab_portgroup, { "Portgroup ", "vmlab.pgrp", + { &hf_vmlab_portgroup, { "Portgroup", "vmlab.pgrp", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_vmlab_eth_src, { "Source ", "vmlab.src", + { &hf_vmlab_eth_src, { "Source", "vmlab.src", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_vmlab_eth_dst, { "Destination ", "vmlab.dst", + { &hf_vmlab_eth_dst, { "Destination", "vmlab.dst", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_vmlab_eth_addr, { "Address ", "vmlab.addr", + { &hf_vmlab_eth_addr, { "Address", "vmlab.addr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_vmlab_etype, { "Encapsulated Type", "vmlab.subtype", + { &hf_vmlab_etype, { "Encapsulated Type", "vmlab.subtype", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, NULL, HFILL }}, - { &hf_vmlab_trailer, { "Trailer", "vmlab.trailer", + { &hf_vmlab_trailer, { "Trailer", "vmlab.trailer", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }} }; static gint *ett[] = { diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c index 531c3f8ed7..d00b5a2641 100644 --- a/plugins/docsis/packet-bintrngreq.c +++ b/plugins/docsis/packet-bintrngreq.c @@ -84,10 +84,10 @@ dissect_bintrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* Register the protocol with Wireshark */ -/* - * this format is required because a script is used to build the C function +/* + * this format is required because a script is used to build the C function * that calls all the protocol registration. - */ + */ void proto_register_docsis_bintrngreq (void) { @@ -119,12 +119,12 @@ proto_register_docsis_bintrngreq (void) "MAC Domain Downstream Service Group Identifier", HFILL} }, {&hf_docsis_bintrngreq_down_chid, - {"DS Chan ID ", "docsis_bintrngreq.downchid", + {"DS Chan ID", "docsis_bintrngreq.downchid", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL} }, {&hf_docsis_bintrngreq_up_chid, - {"US Chan ID ", "docsis_bintrngreq.upchid", + {"US Chan ID", "docsis_bintrngreq.upchid", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL} }, |