diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-29 18:52:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-29 18:52:54 +0000 |
| commit | 79195136aaa365702c69a0ca1ab0cbe553a6bf44 (patch) | |
| tree | 17812cffbc32d0f4b6a1a20fc5fc47efa1628f98 /packet-isis-lsp.c | |
| parent | ab3cf9bc61e0d023a3425fbb26eb7af5cd541a3c (diff) | |
| download | wireshark-79195136aaa365702c69a0ca1ab0cbe553a6bf44.tar.gz wireshark-79195136aaa365702c69a0ca1ab0cbe553a6bf44.tar.bz2 wireshark-79195136aaa365702c69a0ca1ab0cbe553a6bf44.zip | |
From Hannes Gredler: make the IS-IS dissector more verbose in the INFO
field - specifically for
IIHs the System-ID of the Hello;
LSPs the LSP-ID, Sequence #, Lifetime;
CSNPs the LAN-ID, Start LSP-ID, End LSP-ID.
and change the display of some IDs.
Clean up white space.
svn path=/trunk/; revision=6128
Diffstat (limited to 'packet-isis-lsp.c')
| -rw-r--r-- | packet-isis-lsp.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c index 5336de2d9d..34e54cbb5c 100644 --- a/packet-isis-lsp.c +++ b/packet-isis-lsp.c @@ -1,7 +1,7 @@ /* packet-isis-lsp.c * Routines for decoding isis lsp packets and their CLVs * - * $Id: packet-isis-lsp.c,v 1.34 2002/08/28 21:00:18 jmayer Exp $ + * $Id: packet-isis-lsp.c,v 1.35 2002/08/29 18:52:51 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -1524,7 +1524,7 @@ isis_lsp_decode_lsp_id(tvbuff_t *tvb, proto_tree *tree, int offset, * void, but we will add to proto tree if !NULL. */ void -isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, +isis_dissect_isis_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int lsp_type, int header_length, int id_length) { proto_item *ti; @@ -1554,7 +1554,11 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, if (tree) { isis_lsp_decode_lsp_id(tvb, lsp_tree, offset, - "LSP ID", id_length); + "LSP-ID", id_length); + } + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, ", LSP-ID: %s", + print_system_id( tvb_get_ptr(tvb, offset, id_length+2), id_length+2 ) ); } offset += id_length + 2; @@ -1563,6 +1567,11 @@ isis_dissect_isis_lsp(tvbuff_t *tvb, proto_tree *tree, int offset, offset, 4, tvb_get_ntohl(tvb, offset)); } + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, ", Sequence: 0x%08x, Lifetime: %5us", + tvb_get_ntohl(tvb, offset), + tvb_get_ntohs(tvb, offset - (id_length+2+2))); + } offset += 4; if (tree) { |