diff options
author | Richard van der Hoff <richardv@mxtelecom.com> | 2008-01-10 16:35:54 +0000 |
---|---|---|
committer | Richard van der Hoff <richardv@mxtelecom.com> | 2008-01-10 16:35:54 +0000 |
commit | 1350d63c1e4f7533c644971e8374044e2dbd2038 (patch) | |
tree | a2131aeae4df9377ebae350aeb41535eb35cf9e8 /epan | |
parent | 0e339e83ed326b9ce844d44f9942f06d2b8d3e44 (diff) |
From Chris Maynard (bug 1852):
These packet-g*.c files all have display filter issues:
1) packet-gryphon.c: PROTOABBREV is "gryphon", but display filter fields are
prefixed with only "gryph".
2) packet-gmrp.c: PROTOABBREV is "gmrp", but display filter fields are prefixed
with "garp".
3) packet-gssapi.c: PROTOABBREV is "gss-api", but display filter fields are
prefixed with "gssapi".
4) packet-gvrp.c: PROTOABBREV is "gvrp", but display filter fields are prefixed
with "garp", most of which conflict with packet-gmrp.c's display filter fields.
svn path=/trunk/; revision=24058
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-gmrp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-gssapi.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-gvrp.c | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 91478ef070..458d10aef6 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -345,32 +345,32 @@ proto_register_gmrp(void) { static hf_register_info hf[] = { { &hf_gmrp_proto_id, - { "Protocol ID", "garp.protocol_id", + { "Protocol ID", "gmrp.protocol_id", FT_UINT16, BASE_HEX, NULL, 0x0, "" , HFILL } }, { &hf_gmrp_attribute_type, - { "Type", "garp.attribute_type", + { "Type", "gmrp.attribute_type", FT_UINT8, BASE_HEX, VALS(attribute_type_vals), 0x0, "" , HFILL } }, { &hf_gmrp_attribute_length, - { "Length", "garp.attribute_length", + { "Length", "gmrp.attribute_length", FT_UINT8, BASE_DEC, NULL, 0x0, "" , HFILL } }, { &hf_gmrp_attribute_event, - { "Event", "garp.attribute_event", + { "Event", "gmrp.attribute_event", FT_UINT8, BASE_DEC, VALS(event_vals), 0x0, "" , HFILL } }, { &hf_gmrp_attribute_value_group_membership, - { "Value", "garp.attribute_value_group_membership", + { "Value", "gmrp.attribute_value_group_membership", FT_ETHER, BASE_HEX, NULL, 0x0, "" , HFILL } }, { &hf_gmrp_attribute_value_service_requirement, - { "Value", "garp.attribute_value_service_requirement", + { "Value", "gmrp.attribute_value_service_requirement", FT_UINT8, BASE_HEX, NULL, 0x0, "" , HFILL } } diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 8f2d3ad477..894dfeb682 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -492,31 +492,31 @@ proto_register_gssapi(void) { static hf_register_info hf[] = { { &hf_gssapi_oid, - { "OID", "gssapi.OID", FT_STRING, BASE_NONE, + { "OID", "gss-api.OID", FT_STRING, BASE_NONE, NULL, 0, "This is a GSS-API Object Identifier", HFILL }}, { &hf_gssapi_segment, - { "GSSAPI Segment", "gssapi.segment", FT_FRAMENUM, BASE_NONE, + { "GSSAPI Segment", "gss-api.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "GSSAPI Segment", HFILL }}, { &hf_gssapi_segments, - { "GSSAPI Segments", "gssapi.segment.segments", FT_NONE, BASE_NONE, + { "GSSAPI Segments", "gss-api.segment.segments", FT_NONE, BASE_NONE, NULL, 0x0, "GSSAPI Segments", HFILL }}, { &hf_gssapi_segment_overlap, - { "Fragment overlap", "gssapi.segment.overlap", FT_BOOLEAN, BASE_NONE, + { "Fragment overlap", "gss-api.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Fragment overlaps with other fragments", HFILL }}, { &hf_gssapi_segment_overlap_conflict, - { "Conflicting data in fragment overlap", "gssapi.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, + { "Conflicting data in fragment overlap", "gss-api.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping fragments contained conflicting data", HFILL }}, { &hf_gssapi_segment_multiple_tails, - { "Multiple tail fragments found", "gssapi.segment.multipletails", FT_BOOLEAN, BASE_NONE, + { "Multiple tail fragments found", "gss-api.segment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Several tails were found when defragmenting the packet", HFILL }}, { &hf_gssapi_segment_too_long_fragment, - { "Fragment too long", "gssapi.segment.toolongfragment", FT_BOOLEAN, BASE_NONE, + { "Fragment too long", "gss-api.segment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Fragment contained data past end of packet", HFILL }}, { &hf_gssapi_segment_error, - { "Defragmentation error", "gssapi.segment.error", FT_FRAMENUM, BASE_NONE, + { "Defragmentation error", "gss-api.segment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "Defragmentation error due to illegal fragments", HFILL }}, { &hf_gssapi_reassembled_in, - { "Reassembled In", "gssapi.reassembled_in", FT_FRAMENUM, BASE_DEC, + { "Reassembled In", "gss-api.reassembled_in", FT_FRAMENUM, BASE_DEC, NULL, 0x0, "The frame where this pdu is reassembled", HFILL }}, }; diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index 989f5f3f78..3608c7b5d6 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.c @@ -301,27 +301,27 @@ proto_register_gvrp(void) { static hf_register_info hf[] = { { &hf_gvrp_proto_id, - { "Protocol ID", "garp.protocol_id", + { "Protocol ID", "gvrp.protocol_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_gvrp_attribute_type, - { "Type", "garp.attribute_type", + { "Type", "gvrp.attribute_type", FT_UINT8, BASE_HEX, VALS(attribute_type_vals), 0x0, "", HFILL } }, { &hf_gvrp_attribute_length, - { "Length", "garp.attribute_length", + { "Length", "gvrp.attribute_length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_gvrp_attribute_event, - { "Event", "garp.attribute_event", + { "Event", "gvrp.attribute_event", FT_UINT8, BASE_DEC, VALS(event_vals), 0x0, "", HFILL } }, { &hf_gvrp_attribute_value, - { "Value", "garp.attribute_value", + { "Value", "gvrp.attribute_value", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } } |