diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 02:50:46 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 02:50:46 +0000 |
| commit | dfa2156e301539929a12dda54752c778c3ee7a39 (patch) | |
| tree | 8257c41ad55ad71cd0fe15d0464fb82ba2c0f509 /epan/dissectors/packet-tapa.c | |
| parent | e9a5b16a09484d0b3ba5401ef23402c022b82de6 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49923
Diffstat (limited to 'epan/dissectors/packet-tapa.c')
| -rw-r--r-- | epan/dissectors/packet-tapa.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index eaafa8a723..34d95b051d 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -153,8 +153,7 @@ dissect_tapa_discover_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_ proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_switchip, tvb, offset, 4, ENC_BIG_ENDIAN); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Switch: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Switch: %s", tvb_ip_to_str(tvb, offset)); offset += 4; @@ -193,11 +192,10 @@ dissect_tapa_discover_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tapa_di DISSECTOR_ASSERT(item_length > 0); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s: %s", + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s: %s", item_type_text, item_text); - item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length, + item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length, "Type %d = %s, length %d, value %s", item_type, item_type_text, item_length, item_text); @@ -247,11 +245,10 @@ dissect_tapa_discover_unknown_new_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_t else item_text = "BINARY-DATA"; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", T=%d L=%d", + col_append_fstr(pinfo->cinfo, COL_INFO, ", T=%d L=%d", item_type, item_length); - item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length, + item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length, "Type %d, length %d, value %s", item_type, item_length, item_text); @@ -297,8 +294,7 @@ dissect_tapa_discover(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) DISSECTOR_ASSERT(remaining > 4); col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "Discover - %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Discover - %s", val_to_str(packet_type, tapa_discover_type_vals, "Unknown (%d)")); if (tree) { @@ -356,8 +352,7 @@ dissect_tapa_tunnel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) remaining = tvb_reported_length(tvb); col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "Tunnel - V=%d, T=%s", version >> 4, + col_add_fstr(pinfo->cinfo, COL_INFO, "Tunnel - V=%d, T=%s", version >> 4, val_to_str(type, tapa_tunnel_type_vals, "Unknown (%d)")); if (tree) { |