diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-08-17 20:32:06 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-08-17 20:32:06 +0000 |
| commit | a870534df931949d36cc771dbf427c4d4cd0b237 (patch) | |
| tree | f56d1a25d8e9bb28b16493a371af5d5920db3ac1 /epan/dissectors/packet-cdp.c | |
| parent | d221d6f2fc4d778e4b250aba4c39a5156cc521a2 (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
svn path=/trunk/; revision=18941
Diffstat (limited to 'epan/dissectors/packet-cdp.c')
| -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)); |