diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-17 20:32:06 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-17 20:32:06 +0000 |
| commit | 3e8cd90eb194c6f6cd5185b9eccf69ded6091577 (patch) | |
| tree | f56d1a25d8e9bb28b16493a371af5d5920db3ac1 | |
| parent | 534cfd4e12166a6ee093e1510247c5db66b23e49 (diff) | |
From Stephen Fisher:
the attached patch removes the
redundant "Cisco Discovery Protocol" from the info column:
Before:
Cisco Discovery Protocol Device ID: myswitch.domain.com Port ID: GigabitEthernet3/17
After:
Device ID: myswitch.domain.com Port ID: GigabitEthernet3/17
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18941 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-cdp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 6f1e220fb8..4ccd7d335a 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -151,7 +151,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CDP"); if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Cisco Discovery Protocol"); + col_clear(pinfo->cinfo, COL_INFO); if (tree){ ti = proto_tree_add_item(tree, proto_cdp, tvb, offset, -1, FALSE); @@ -198,7 +198,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, - " Device ID: %s", + "Device ID: %s ", tvb_format_stringzpad(tvb, offset + 4, length - 4)); @@ -232,7 +232,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, - " Port ID: %s", + "Port ID: %s ", tvb_format_stringzpad(tvb, offset + 4, length - 4)); |