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

1 files changed, 4 insertions, 32 deletions

diff --git a/packet-isis-snp.h b/packet-isis-snp.h
index 15b7a92e44..e83a6c215d 100644
--- a/packet-isis-snp.h
+++ b/packet-isis-snp.h
@@ -1,7 +1,7 @@
 /* packet-isis-snp.h
  * Defines and such for CSNP, PSNP, and their payloads
  *
- * $Id: packet-isis-snp.h,v 1.1 1999/12/15 04:34:19 guy Exp $
+ * $Id: packet-isis-snp.h,v 1.2 2000/06/19 08:33:50 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -63,40 +63,12 @@
 #define ISIS_CLV_L2_PSNP_AUTHENTICATION		133
 
 /*
- * Declare L1/L2 CSNP header
- */
-typedef struct {
-	guint8	isis_csnp_pdu_length[2];	/* pdu length including hdr */
-	guint8	isis_csnp_source_id[7];		/* source sysid */
-	isis_lsp_id_t isis_csnp_start_lsp_id;		/* start LSP id */
-	isis_lsp_id_t isis_csnp_end_lsp_id;		/* end LSP id */
-} isis_csnp_t;
-
-/*
- * Declare L1/L2 PSNP header
- */
-typedef struct {
-	guint8	isis_psnp_pdu_length[2];	/* pdu length including hdr */
-	guint8	isis_psnp_source_id[7];		/* source sysid */
-} isis_psnp_t;
-
-/*
- * Declare SNP payload element
- */
-typedef struct {
-	guint8	isis_snp_remaining_lifetime[2];	/* lifetime of LSP */
-	isis_lsp_id_t isis_snp_lsp_id;		/* target LSP id */
-	guint8	isis_snp_sequence_number[4];	/* sequence number of LSP */
-	guint8	isis_snp_checksum[2];		/* checksum of LSP */
-} isis_snp_t;
-
-/*
  * Published API functions.  NOTE, this are "local" API functions and
  * are only valid from with isis decodes.
  */
-extern void isis_dissect_isis_csnp(int type, int header_length,
-        const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
-extern void isis_dissect_isis_psnp(int type, int header_length,
+extern void isis_dissect_isis_csnp(int type, int header_length, int id_length,
+	const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
+extern void isis_dissect_isis_psnp(int type, int header_length, int id_length,
         const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
 
 #endif /* _PACKET_ISIS_CSNP_H */