diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
| commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-rtnet.c | |
| parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-rtnet.c')
| -rw-r--r-- | epan/dissectors/packet-rtnet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 49f2bc5929..b28f0809fa 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -1216,13 +1216,13 @@ proto_register_rtcfg(void) { { &hf_rtcfg_client_ip_address, { "Client IP Address", "rtcfg.client_ip_address", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "RTcfg Client IP Address", HFILL }}, { &hf_rtcfg_server_ip_address, { "Server IP Address", "rtcfg.server_ip_address", - FT_IPv4, BASE_DEC, NULL, 0x0, + FT_IPv4, BASE_NONE, NULL, 0x0, "RTcfg Server IP Address", HFILL }}, { &hf_rtcfg_burst_rate, @@ -1240,7 +1240,7 @@ proto_register_rtcfg(void) { { &hf_rtcfg_config_data, { "Config Data", "rtcfg.config_data", - FT_BYTES, BASE_DEC, NULL, 0x00, + FT_BYTES, BASE_NONE, NULL, 0x00, "RTcfg Config Data", HFILL }}, { &hf_rtcfg_padding, @@ -1265,13 +1265,13 @@ proto_register_rtcfg(void) { { "Client Ready", "rtcfg.client_flags.ready", FT_UINT8, BASE_DEC, NULL, 0x02, - "Client Ready", HFILL }}, + NULL, HFILL }}, { &hf_rtcfg_client_flags_res, { "Reserved", "rtcfg.client_flags.res", FT_UINT8, BASE_HEX, NULL, 0xfc, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_rtcfg_server_flags, { "Flags", @@ -1283,19 +1283,19 @@ proto_register_rtcfg(void) { { "Reserved", "rtcfg.server_flags.res0", FT_UINT8, BASE_HEX, NULL, 0x01, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_rtcfg_server_flags_ready, { "Server Ready", "rtcfg.server_flags.ready", FT_UINT8, BASE_DEC, NULL, 0x02, - "Server Ready", HFILL }}, + NULL, HFILL }}, { &hf_rtcfg_server_flags_res2, { "Reserved", "rtcfg.server_flags.res2", FT_UINT8, BASE_HEX, NULL, 0xfc, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_rtcfg_active_stations, { "Active Stations", |