diff options
Diffstat (limited to 'epan/dissectors/packet-isis.c')
| -rw-r--r-- | epan/dissectors/packet-isis.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index a13c428067..c476c50e4a 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -124,21 +124,17 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) isis_version = tvb_get_guint8(tvb, 2); if (isis_version != ISIS_REQUIRED_VERSION){ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ISIS version (%u vs %u)", isis_version, ISIS_REQUIRED_VERSION ); - } isis_dissect_unknown(tvb, tree, 0, "Unknown ISIS version (%d vs %d)", isis_version, ISIS_REQUIRED_VERSION); return; } - if (tree) { - ti = proto_tree_add_item(tree, proto_isis, tvb, 0, -1, ENC_NA); - isis_tree = proto_item_add_subtree(ti, ett_isis); - } + ti = proto_tree_add_item(tree, proto_isis, tvb, 0, -1, ENC_NA); + isis_tree = proto_item_add_subtree(ti, ett_isis); if (tree) { proto_tree_add_item(isis_tree, hf_isis_irpd, tvb, offset, 1, @@ -168,19 +164,17 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) isis_type_reserved = tvb_get_guint8(tvb, offset); isis_type = isis_type_reserved & ISIS_TYPE_MASK; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str ( isis_type, isis_vals, "Unknown (0x%x)" ) ); - } - if (tree) { - proto_tree_add_uint_format(isis_tree, hf_isis_type, tvb, + + proto_tree_add_uint_format(isis_tree, hf_isis_type, tvb, offset, 1, isis_type, "PDU Type : %s (R:%s%s%s)", val_to_str(isis_type, isis_vals, "Unknown (0x%x)"), (isis_type_reserved & ISIS_R8_MASK) ? "1" : "0", (isis_type_reserved & ISIS_R7_MASK) ? "1" : "0", (isis_type_reserved & ISIS_R6_MASK) ? "1" : "0"); - } + offset += 1; if (tree) { |