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-gnutella.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-gnutella.c')
| -rw-r--r-- | epan/dissectors/packet-gnutella.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 5dc7976132..992fd8a6c0 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -602,11 +602,11 @@ void proto_register_gnutella(void) { { &hf_gnutella_stream, { "Gnutella Upload / Download Stream", "gnutella.stream", FT_NONE, BASE_NONE, NULL, 0, - "Gnutella Upload / Download Stream", HFILL } + NULL, HFILL } }, { &hf_gnutella_header_id, { "ID", "gnutella.header.id", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "Gnutella Descriptor ID", HFILL } }, { &hf_gnutella_header_payload, @@ -636,7 +636,7 @@ void proto_register_gnutella(void) { }, { &hf_gnutella_pong_ip, { "IP", "gnutella.pong.ip", - FT_IPv4, BASE_DEC, NULL, 0, + FT_IPv4, BASE_NONE, NULL, 0, "Gnutella Pong IP Address", HFILL } }, { &hf_gnutella_pong_files, @@ -681,7 +681,7 @@ void proto_register_gnutella(void) { }, { &hf_gnutella_queryhit_hit_extra, { "Extra", "gnutella.queryhit.hit.extra", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "Gnutella Query Extra", HFILL } }, { &hf_gnutella_queryhit_count, @@ -696,7 +696,7 @@ void proto_register_gnutella(void) { }, { &hf_gnutella_queryhit_ip, { "IP", "gnutella.queryhit.ip", - FT_IPv4, BASE_DEC, NULL, 0, + FT_IPv4, BASE_NONE, NULL, 0, "Gnutella QueryHit IP Address", HFILL } }, { &hf_gnutella_queryhit_speed, @@ -706,22 +706,22 @@ void proto_register_gnutella(void) { }, { &hf_gnutella_queryhit_extra, { "Extra", "gnutella.queryhit.extra", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "Gnutella QueryHit Extra", HFILL } }, { &hf_gnutella_queryhit_servent_id, { "Servent ID", "gnutella.queryhit.servent_id", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "Gnutella QueryHit Servent ID", HFILL } }, { &hf_gnutella_push_servent_id, { "Servent ID", "gnutella.push.servent_id", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "Gnutella Push Servent ID", HFILL } }, { &hf_gnutella_push_ip, { "IP", "gnutella.push.ip", - FT_IPv4, BASE_DEC, NULL, 0, + FT_IPv4, BASE_NONE, NULL, 0, "Gnutella Push IP Address", HFILL } }, { &hf_gnutella_push_index, |