diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-14 15:43:03 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-14 22:43:25 +0000 |
| commit | 16b26b8e5fa066bfde0939ca2a66af00af44285e (patch) | |
| tree | 44a81524cfc7da675d01172af06b979870bbcc0d /epan/dissectors/packet-isis-lsp.c | |
| parent | d3ad27390c47089d1bab973b9760eb80ae9de92f (diff) | |
Put the system ID in the top-level items for neighbors.
Add a tvb_print_system_id() routine, and use that in various ISIS
dissectors, while we're at it.
Change-Id: I31b6b9ea8faf2b4849f974ec7ed27fbdd14b91ef
Reviewed-on: https://code.wireshark.org/review/1145
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-isis-lsp.c')
| -rw-r--r-- | epan/dissectors/packet-isis-lsp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index b26c775c5c..c16186efae 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -1691,6 +1691,7 @@ dissect_lsp_eis_neighbors_clv_inner(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_tree_add_item(ntree, hf_isis_lsp_eis_neighbors_error_metric_ie, tvb, offset+3, 1, ENC_NA); proto_tree_add_item(ntree, is_eis ? hf_isis_lsp_eis_neighbors_es_neighbor_id : hf_isis_lsp_eis_neighbors_is_neighbor_id, tvb, offset+4, id_length, ENC_NA); + proto_item_append_text(ti, ": %s", tvb_print_system_id(tvb, offset+4, id_length)); } offset += tlen; length -= tlen; @@ -1981,6 +1982,7 @@ dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tre ntree = proto_item_add_subtree (ti, ett_isis_lsp_part_of_clv_ext_is_reachability ); proto_tree_add_item(ntree, hf_isis_lsp_ext_is_reachability_is_neighbor_id, tvb, offset, 7, ENC_NA); + proto_item_append_text(ti, ": %s", tvb_print_system_id(tvb, offset, 7)); proto_tree_add_item(ntree, hf_isis_lsp_ext_is_reachability_metric, tvb, offset+7, 3, ENC_BIG_ENDIAN); @@ -2601,7 +2603,7 @@ dissect_isis_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset offset_checksum = offset; proto_tree_add_item(lsp_tree, hf_isis_lsp_lsp_id, tvb, offset, id_length + 2, ENC_NA); - system_id = print_system_id( tvb_get_ptr(tvb, offset, id_length+2), id_length+2); + system_id = tvb_print_system_id( tvb, offset, id_length+2 ); col_append_fstr(pinfo->cinfo, COL_INFO, ", LSP-ID: %s", system_id); offset += (id_length + 2); |