diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 17:49:53 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 17:49:53 +0000 |
| commit | de68fd6eea9996ca8572220f379e376acd0181e2 (patch) | |
| tree | c874b6fd18d5b571366c0e3017b58e1fb73f3266 /epan/dissectors/packet-ndp.c | |
| parent | 14b65f91a44b89ef460df391717b2a6ac317980d (diff) | |
Removed check_col() and the occasional tree.
svn path=/trunk/; revision=49938
Diffstat (limited to 'epan/dissectors/packet-ndp.c')
| -rw-r--r-- | epan/dissectors/packet-ndp.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index f62b341d5b..752eddb042 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -276,25 +276,22 @@ dissect_ndp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - hello_type = ""; - if (pinfo->dl_dst.type == AT_ETHER) { - const guint8 *dstmac = (const guint8 *)pinfo->dl_dst.data; + hello_type = ""; + if (pinfo->dl_dst.type == AT_ETHER) { + const guint8 *dstmac = (const guint8 *)pinfo->dl_dst.data; - switch (dstmac[5]) { + switch (dstmac[5]) { - case 0: - hello_type = "Segment "; - break; + case 0: + hello_type = "Segment "; + break; - case 1: - hello_type = "FlatNet "; - break; - } + case 1: + hello_type = "FlatNet "; + break; } - col_add_fstr(pinfo->cinfo, COL_INFO, "%sHello", - hello_type); } + col_add_fstr(pinfo->cinfo, COL_INFO, "%sHello", hello_type); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_ndp, tvb, 0, 11, |