diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-08-06 22:22:17 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-08-08 13:19:23 +0000 |
| commit | 143cdf12d39246003fb272a4001c2698b1f5362d (patch) | |
| tree | 78cf9998f47b800211eb37dc63f6b497303481ab /epan/dissectors/packet-isis-clv.c | |
| parent | 6fd6955a2412b5c5cbcb0472d620df29bd1e49a8 (diff) | |
ISIS: Add type and length to CLV
Change-Id: If6dc8e3a9328571ccdb106b0aabc617889c434c7
Reviewed-on: https://code.wireshark.org/review/3465
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-isis-clv.c')
| -rw-r--r-- | epan/dissectors/packet-isis-clv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index c26550ef17..27875d9574 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.c @@ -512,7 +512,7 @@ isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset, int length) void isis_dissect_clvs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset, const isis_clv_handle_t *opts, expert_field* expert_short_len, int len, int id_length, - int unknown_tree_id _U_) + int unknown_tree_id _U_, int tree_type, int tree_length) { guint8 code; guint8 length; @@ -545,8 +545,11 @@ isis_dissect_clvs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offse if ( opts[q].dissect ) { /* adjust by 2 for code/len octets */ clv_tree = proto_tree_add_subtree_format(tree, tvb, offset - 2, - length + 2, *opts[q].tree_id, NULL, "%s (%u)", - opts[q].tree_text, length ); + length + 2, *opts[q].tree_id, NULL, "%s (t=%u, l=%u)", + opts[q].tree_text, opts[q].optcode, length); + + proto_tree_add_item(clv_tree, tree_type, tvb, offset - 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(clv_tree, tree_length, tvb, offset - 1, 1, ENC_BIG_ENDIAN); opts[q].dissect(tvb, pinfo, clv_tree, offset, id_length, length); } else { |