diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-08-22 18:00:40 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-08-22 18:00:40 +0000 |
| commit | 7111f8301309f49ba6185f76ff157023247cf74c (patch) | |
| tree | 1322668050388cdf8e826dd49ed0ccb8d14a0a7f | |
| parent | 4d5ab5490b65d8b0e1b00f980d8feed6536b38dc (diff) | |
| download | wireshark-7111f8301309f49ba6185f76ff157023247cf74c.tar.gz wireshark-7111f8301309f49ba6185f76ff157023247cf74c.tar.bz2 wireshark-7111f8301309f49ba6185f76ff157023247cf74c.zip | |
Fixes from Hannes Gredler.
svn path=/trunk/; revision=3864
| -rw-r--r-- | packet-isis-clv.c | 4 | ||||
| -rw-r--r-- | packet-isis-hello.c | 14 | ||||
| -rw-r--r-- | packet-isis-lsp.h | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/packet-isis-clv.c b/packet-isis-clv.c index dad016cff0..cf64063a88 100644 --- a/packet-isis-clv.c +++ b/packet-isis-clv.c @@ -1,7 +1,7 @@ /* packet-isis-clv.c * Common CLV decode routines. * - * $Id: packet-isis-clv.c,v 1.14 2001/07/02 00:19:34 guy Exp $ + * $Id: packet-isis-clv.c,v 1.15 2001/08/22 18:00:40 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -262,7 +262,7 @@ isis_dissect_mt_clv(tvbuff_t *tvb, packet_info *pinfo, strcpy(mt_desc,"Reserved for IETF Consensus"); } proto_tree_add_text ( tree, tvb, offset, 2 , - "%s Topology (0x%x)%s%s", + "%s Topology (0x%03x)%s%s", mt_desc, mt_block&0xfff, (mt_block&0x8000) ? "" : ", no sub-TLVs present", diff --git a/packet-isis-hello.c b/packet-isis-hello.c index fab34ccfd2..98068ae7b9 100644 --- a/packet-isis-hello.c +++ b/packet-isis-hello.c @@ -1,7 +1,7 @@ /* packet-isis-hello.c * Routines for decoding isis hello packets and their CLVs * - * $Id: packet-isis-hello.c,v 1.20 2001/07/02 01:41:25 guy Exp $ + * $Id: packet-isis-hello.c,v 1.21 2001/08/22 18:00:40 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -490,25 +490,25 @@ dissect_hello_ptp_adj_clv(tvbuff_t *tvb, proto_tree_add_text ( tree, tvb, offset, 1, "Adjacency State: %s", adj_state ); proto_tree_add_text ( tree, tvb, offset+1, 4, - "Extended Local Circuit ID: %u", tvb_get_ntohl(tvb, offset+1) ); + "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); break; case 11: proto_tree_add_text ( tree, tvb, offset, 1, "Adjacency State: %s", adj_state ); proto_tree_add_text ( tree, tvb, offset+1, 4, - "Extended Local Circuit ID: %u", tvb_get_ntohl(tvb, offset+1) ); + "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); proto_tree_add_text ( tree, tvb, offset+5, 6, - "Neighbor System ID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) ); + "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) ); break; case 15: proto_tree_add_text ( tree, tvb, offset, 1, "Adjacency State: %s", adj_state ); proto_tree_add_text ( tree, tvb, offset+1, 4, - "Extended Local Circuit ID: %u", tvb_get_ntohl(tvb, offset+1) ); + "Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+1) ); proto_tree_add_text ( tree, tvb, offset+5, 6, - "Neighbor System ID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) ); + "Neighbor SystemID: %s", print_system_id( tvb_get_ptr(tvb, offset+5, 6), 6 ) ); proto_tree_add_text ( tree, tvb, offset+11, 4, - "Neighbor Extended Local Circuit ID: %u", tvb_get_ntohl(tvb, offset+11) ); + "Neighbor Extended Local circuit ID: 0x%08x", tvb_get_ntohl(tvb, offset+11) ); break; default: isis_dissect_unknown(tvb, pinfo, tree, offset, diff --git a/packet-isis-lsp.h b/packet-isis-lsp.h index cb858ac379..6011ee8f4b 100644 --- a/packet-isis-lsp.h +++ b/packet-isis-lsp.h @@ -1,7 +1,7 @@ /* packet-isis-lsp.h * Defines and such for LSP and their CLV decodes * - * $Id: packet-isis-lsp.h,v 1.9 2001/07/02 00:19:34 guy Exp $ + * $Id: packet-isis-lsp.h,v 1.10 2001/08/22 18:00:40 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -48,10 +48,10 @@ #define ISIS_LSP_TYPE_UNUSED2 2 #define ISIS_LSP_TYPE_LEVEL_2 3 -#define ISIS_LSP_CLV_METRIC_SUPPORTED(x) ((x)&0xf0) -#define ISIS_LSP_CLV_METRIC_IE(x) ((x)&0x20) +#define ISIS_LSP_CLV_METRIC_SUPPORTED(x) ((x)&0x80) +#define ISIS_LSP_CLV_METRIC_IE(x) ((x)&0x40) #define ISIS_LSP_CLV_METRIC_RESERVED(x) ((x)&0x40) -#define ISIS_LSP_CLV_METRIC_UPDOWN(x) ((x)&0x40) +#define ISIS_LSP_CLV_METRIC_UPDOWN(x) ((x)&0x80) #define ISIS_LSP_CLV_METRIC_VALUE(x) ((x)&0x3f) /* |