aboutsummaryrefslogtreecommitdiffstats
path: root/packet-isis-clv.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-06-19 08:33:50 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-06-19 08:33:50 +0000
commit9c1e894d57f3b46a9018efdc722f46c5ac4222a6 (patch)
tree23ca178d800579c582a5f7e201496f6913affdbe /packet-isis-clv.c
parentd4594920345b810c81390821ba8454f8a60e3016 (diff)
Make the "isis_hello.source_id" an FT_BYTES field rather than an
FT_ETHER field; the ISIS spec doesn't say it's necessarily a 6-byte Ethernet address (and, if it's FT_BYTES, you can test it in a filter much the same way you test an Ethernet address). Make "isis_hello.lan_id" an FT_BYTES field rather than an FT_STRING field - it's an array of bytes, not a character string. Don't require that "system ID" fields be 6 octets; use the size value from the ISIS PDU header. (This means that PDUs containing "system ID" fields can't be described as C structures; dissect them by stepping the offset instead.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2080 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-isis-clv.c')
-rw-r--r--packet-isis-clv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/packet-isis-clv.c b/packet-isis-clv.c
index 7de64f88b6..a7b4b50161 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.5 2000/05/31 05:07:12 guy Exp $
+ * $Id: packet-isis-clv.c,v 1.6 2000/06/19 08:33:47 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@@ -288,7 +288,7 @@ isis_dissect_nlpid_clv(const u_char *pd, int offset,
* void, but we will add to proto tree if !NULL.
*/
void
-isis_dissect_clvs(const isis_clv_handle_t *opts, int len,
+isis_dissect_clvs(const isis_clv_handle_t *opts, int len, int id_length,
const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
gint unknown_tree_id ) {
guint8 code;
@@ -326,7 +326,8 @@ isis_dissect_clvs(const isis_clv_handle_t *opts, int len,
} else {
clv_tree = NULL;
}
- opts[q].dissect(pd, offset, length, fd, clv_tree );
+ opts[q].dissect(pd, offset, length, id_length, fd,
+ clv_tree );
} else {
if (tree) {
snprintf ( sbuf, sizeof(sbuf),