diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-06 02:10:22 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-06 02:10:22 +0000 |
| commit | 57fc88262393d07a899b594dfbff0fd6ad6aadee (patch) | |
| tree | dd4c3d1e3bea7a688643c19c239823bbd0f77e1a /epan/dissectors/packet-dhcpv6.c | |
| parent | 311c8d346d22bb1b0f581e397bce85d520eebf97 (diff) | |
| download | wireshark-57fc88262393d07a899b594dfbff0fd6ad6aadee.tar.gz | |
Simplify the "bad length" expert info into a single filterable item with formatting determining the particulars because the filter names just didn't make much sense to separate.
svn path=/trunk/; revision=49801
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 4a8009f950..cd6f0e3e2a 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -206,7 +206,6 @@ static expert_field ei_dhcpv6_no_suboption_len = EI_INIT; static expert_field ei_dhcpv6_invalid_byte = EI_INIT; static expert_field ei_dhcpv6_invalid_time_value = EI_INIT; static expert_field ei_dhcpv6_invalid_type = EI_INIT; -static expert_field ei_dhcpv6_bad_length3_6 = EI_INIT; static expert_field ei_dhcpv6_malformed_dns = EI_INIT; @@ -987,7 +986,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i } else if (tlv_len == 6) { proto_item_append_text(ti, "\"%s\"", tvb_format_stringzpad(tvb, sub_off, tlv_len)); } else { - expert_add_info_format_text(pinfo, ti, &ei_dhcpv6_bad_length3_6, "Suboption %d: suboption length isn't 3 or 6", type); + expert_add_info_format_text(pinfo, ti, &ei_dhcpv6_bogus_length, "Suboption %d: suboption length isn't 3 or 6", type); } break; @@ -2253,7 +2252,6 @@ proto_register_dhcpv6(void) { &ei_dhcpv6_invalid_byte, { "dhcpv6.invalid_byte", PI_PROTOCOL, PI_WARN, "Invalid at byte", EXPFILL }}, { &ei_dhcpv6_invalid_time_value, { "dhcpv6.invalid_time_value", PI_PROTOCOL, PI_WARN, "Invalid time value", EXPFILL }}, { &ei_dhcpv6_invalid_type, { "dhcpv6.invalid_type", PI_PROTOCOL, PI_WARN, "Invalid type", EXPFILL }}, - { &ei_dhcpv6_bad_length3_6, { "dhcpv6.bad_length3or6", PI_MALFORMED, PI_ERROR, "suboption length isn't 3 or 6", EXPFILL }}, { &ei_dhcpv6_malformed_dns, { "dhcpv6.malformed_dns", PI_PROTOCOL, PI_WARN, "Malformed DNS name record (MS Vista client?)", EXPFILL }}, }; |