aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-12-26 21:37:21 +0000
committerGuy Harris <guy@alum.mit.edu>2001-12-26 21:37:21 +0000
commit319892c60840c7f6758d7cbe4f781de7288d2337 (patch)
treeaff52d092022b7a44fc41d20e4f99fdf1acddf66
parentdfa2f0eb06b119871a69947c48e5cb3e0fb7e5f9 (diff)
From Hannes Gredler:
System IDs in IS neighbor CLVs in Hello PDUs are assumed to be MAC addresses, so use "get_ether_name()" on them to try to resolve them to host names. Properly label IS type values of ISIS_LSP_TYPE_LEVEL_2 as being "Level 1 and Level 2 IS". svn path=/trunk/; revision=4451
-rw-r--r--packet-isis-hello.c5
-rw-r--r--packet-isis-lsp.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/packet-isis-hello.c b/packet-isis-hello.c
index 061ff9db27..0aff4520a1 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.23 2001/12/20 07:33:21 guy Exp $
+ * $Id: packet-isis-hello.c,v 1.24 2001/12/26 21:37:21 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -39,6 +39,7 @@
#include "packet-isis.h"
#include "packet-isis-clv.h"
#include "packet-isis-hello.h"
+#include "epan/resolv.h"
/* hello packets */
static int hf_isis_hello_circuit_reserved = -1;
@@ -548,7 +549,7 @@ dissect_hello_is_neighbors_clv(tvbuff_t *tvb, packet_info *pinfo,
*/
if ( tree ) {
proto_tree_add_text ( tree, tvb, offset, 6,
- "IS Neighbor: %s", print_system_id( tvb_get_ptr(tvb, offset, 6), 6 ) );
+ "IS Neighbor: %s", get_ether_name( tvb_get_ptr(tvb, offset, 6)) );
}
offset += 6;
length -= 6;
diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c
index f17b7c8058..b0ec31e622 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.22 2001/12/20 07:33:21 guy Exp $
+ * $Id: packet-isis-lsp.c,v 1.23 2001/12/26 21:37:21 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -90,7 +90,7 @@ static const value_string isis_lsp_istype_vals[] = {
{ ISIS_LSP_TYPE_UNUSED0, "Unused 0x0 (invalid)"},
{ ISIS_LSP_TYPE_LEVEL_1, "Level 1 IS"},
{ ISIS_LSP_TYPE_UNUSED2, "Unused 0x2 (invalid)"},
- { ISIS_LSP_TYPE_LEVEL_2, "Level 2 IS"},
+ { ISIS_LSP_TYPE_LEVEL_2, "Level 1 and Level 2 IS"},
{ 0, NULL } };
/*