[bugzilla-daemon@xxxxxxxxxxxxx]

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4244





--- Comment #1 from Anders Broman <anders.broman@xxxxxxxxxxxx>  2009-11-16 23:14:16 PDT ---
Hi,
The patch fails
patching file epan/dissectors/packet-cdp.c
Hunk #2 FAILED at 309.
Hunk #3 FAILED at 343.
Hunk #4 FAILED at 425.
Hunk #5 FAILED at 1276.
Please regenerate against trunk.
Use
proto_tree_add_item(tlv_tree, hf_cdp_deviceid, tvb, offset + 4, length - 4,
FALSE); 
instead

I don't have a trace to test with but isn't the same line output twice?
:
          tlvi = proto_tree_add_text(cdp_tree, tvb, offset,
                                     length, "Device ID: %s",
                                     tvb_format_stringzpad(tvb, offset + 4,
length - 4));
:
          proto_tree_add_text(tlv_tree, tvb, offset + 4,
                              length - 4, "Device ID: %s",
                              tvb_format_stringzpad(tvb, offset + 4, length -
4));


-- 
Configure bugmail: https://bugs.wireshark.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.