diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
| commit | d9503878072210dc1b03da41b9c5ecaea8cb22f7 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-tpkt.c | |
| parent | 761b3cce77c05a4c2073749490bd0d1aed1d6e5f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-tpkt.c')
| -rw-r--r-- | epan/dissectors/packet-tpkt.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 731ee01519..5d0f9eb848 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -245,8 +245,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * so don't get the length and don't try to * do reassembly. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { @@ -282,8 +281,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, saved_proto = pinfo->current_proto; pinfo->current_proto = "TPKT"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); /* * Don't add the TPKT header information if we're * reassembling segmented TPKT PDUs or if this @@ -400,8 +398,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * so don't get the length and don't try to * do reassembly. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { @@ -473,8 +470,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, saved_proto = pinfo->current_proto; pinfo->current_proto = "TPKT"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); /* * Don't add the TPKT header information if we're * reassembling segmented TPKT PDUs or if this |