diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-06-03 00:52:08 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-06-03 00:52:08 +0000 |
| commit | 8d05670e5342af6570cf9002d69eb45d0762821e (patch) | |
| tree | 5211e9d22b3619cae505acc4d551458a38929e2c /epan/dissectors/packet-batadv.c | |
| parent | e1a9e4e84f72368a970b8bd9d5ebb7ccf5b4d2d8 (diff) | |
Add back a few 'if (check_col()...' removed by me in a previous commit.
Possibly it's better to use an 'if (checkcol()' if the enclosed call to
'col_...' has "complex" arguments.
svn path=/trunk/; revision=33064
Diffstat (limited to 'epan/dissectors/packet-batadv.c')
| -rw-r--r-- | epan/dissectors/packet-batadv.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index d626c40a88..a02985cb24 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -874,10 +874,11 @@ static void dissect_batadv_icmp_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree icmp_packeth->seqno = tvb_get_ntohs(tvb, 17); /* Set info column */ - col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", - val_to_str(icmp_packeth->msg_type, icmp_packettypenames, "Unknown (0x%02x)"), - icmp_packeth->seqno); - + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", + val_to_str(icmp_packeth->msg_type, icmp_packettypenames, "Unknown (0x%02x)"), + icmp_packeth->seqno); + } /* Set tree info */ if (tree) { proto_item *ti; @@ -961,10 +962,11 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree icmp_packeth->uid = tvb_get_guint8(tvb, 17); /* Set info column */ - col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", - val_to_str(icmp_packeth->msg_type, icmp_packettypenames, "Unknown (0x%02x)"), - icmp_packeth->seqno); - + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", + val_to_str(icmp_packeth->msg_type, icmp_packettypenames, "Unknown (0x%02x)"), + icmp_packeth->seqno); + } /* Set tree info */ if (tree) { proto_item *ti; @@ -1165,10 +1167,11 @@ static void dissect_batadv_vis_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, 6, sender_orig_addr); /* Set info column */ - col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", - val_to_str(vis_packeth->vis_type, vis_packettypenames, "Unknown (0x%02x)"), - vis_packeth->seqno); - + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", + val_to_str(vis_packeth->vis_type, vis_packettypenames, "Unknown (0x%02x)"), + vis_packeth->seqno); + } /* Set tree info */ if (tree) { proto_item *ti; |