diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-13 06:07:53 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-13 06:07:53 +0000 |
| commit | e7c5d04c07bc5f65552e3727dd17d6967c83ed1f (patch) | |
| tree | f09510a491eb135b864938c47c37601dbd3a285a /packet-isis.c | |
| parent | 6889d7d85da069472ab2fdcac35ab83df72e7bd9 (diff) | |
Get the NLPID value for ISIS from "nlpid.h", and report the NLPID value
in ISIS packets with "nlpid_vals".
Report the NLPID value in CLNP packets with "nlpid_vals" as well.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1462 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-isis.c')
| -rw-r--r-- | packet-isis.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packet-isis.c b/packet-isis.c index c6b515214d..9a0feee18e 100644 --- a/packet-isis.c +++ b/packet-isis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly, core * bits. * - * $Id: packet-isis.c,v 1.1 1999/12/15 04:34:19 guy Exp $ + * $Id: packet-isis.c,v 1.2 2000/01/13 06:07:52 guy Exp $ * Stuart Stanley <stuarts@mxmail.net> * * Ethereal - Network traffic analyzer @@ -39,6 +39,7 @@ #include <string.h> #include <glib.h> #include "packet.h" +#include "nlpid.h" #include "packet-isis.h" #include "packet-isis-lsp.h" #include "packet-isis-hello.h" @@ -58,10 +59,6 @@ static int hf_isis_user_eco = -1; static gint ett_isis = -1; -static const value_string irpd_vals[] = { - { ISIS_IRPD, "correct(0x83)" }, - { 0, NULL} }; - static const value_string isis_vals[] = { { ISIS_TYPE_L1_HELLO, "L1 HELLO"}, { ISIS_TYPE_L2_HELLO, "L2 HELLO"}, @@ -202,9 +199,7 @@ dissect_isis(const u_char *pd, int offset, frame_data *fd, ti = proto_tree_add_item(tree, proto_isis, offset, fd->cap_len - offset, NULL ); isis_tree = proto_item_add_subtree(ti, ett_isis); - proto_tree_add_item_format(isis_tree, hf_isis_irpd, offset, 1, - ihdr->isis_irpd, - "Intradomain Routing Protocol Discrimintator: 0x%02x", + proto_tree_add_item(isis_tree, hf_isis_irpd, offset, 1, ihdr->isis_irpd ); proto_tree_add_item(isis_tree, hf_isis_header_length, offset + 1, 1, ihdr->isis_header_length ); @@ -309,7 +304,7 @@ proto_register_isis(void) { static hf_register_info hf[] = { { &hf_isis_irpd, { "Intradomain Routing Protocol Discriminator", "isis.irpd", - FT_UINT8, BASE_DEC, VALS(irpd_vals), 0xff, "" }}, + FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "" }}, { &hf_isis_header_length, { "HDR Length", "isis.hdr_len", FT_UINT8, BASE_DEC, |