From Hannes Gredler:

- unify the IS-IS CLV space
  IS-IS uses a unified CLV space across all Level and PDU Types
  there is no need to define PDU- and Level- Specific CLV
  Types;

- clean up Authentication CLV
  TLV #10 is the official supported TLV for carrying authentication
  information- todays code displays TLV #10 as non-standard which
  is wrong;
  also the notion of "Domain" "Authentication" and "Link" password
  has disappeared from contemporary routing SW;

- add IP Authentication CLV dissector
  this CLV is depreciated - however it is using different semantics
  than TLV #10 so we need a dedicated dissector;

- add Checksum CLV dissector
  add support for RFC 3358 Checksum CLVs
  majority of code re-used from the LSP checksum verification
  dissector.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9204 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 63 insertions, 17 deletions

diff --git a/packet-isis-clv.h b/packet-isis-clv.h
index 10d4c27011..ab8c31bedd 100644
--- a/packet-isis-clv.h
+++ b/packet-isis-clv.h
@@ -1,7 +1,7 @@
 /* packet-isis-clv.h
  * Declares for common clv decoding functions.
  *
- * $Id: packet-isis-clv.h,v 1.9 2002/08/28 21:00:18 jmayer Exp $
+ * $Id: packet-isis-clv.h,v 1.10 2003/12/08 20:40:32 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -27,14 +27,58 @@
 #define _PACKET_ISIS_CLV_H
 
 /*
+ * A CLV is a tuple of a type, length and a value and is normally used for
+ * encoding information in all sorts of places.
+ * IS-IS uses a uniform CLV code space that is shared across
+ * all PDU Types.
+ *
+ * list taken from rfc3359 plus some memory from veterans ;-)
+ */
+
+#define ISIS_CLV_AREA_ADDRESS        1   /* iso10589 */
+#define ISIS_CLV_IS_REACH            2   /* iso10589 */
+#define ISIS_CLV_ES_NEIGHBORS        3   /* iso10589 */
+#define ISIS_CLV_PARTITION_DIS       4   /* iso10589 */
+#define ISIS_CLV_PREFIX_NEIGHBORS    5   /* iso10589 */
+#define ISIS_CLV_IS_NEIGHBORS        6   /* iso10589 */
+#define ISIS_CLV_IS_NEIGHBORS_VARLEN 7   /* iso10589 */
+#define ISIS_CLV_PADDING             8   /* iso10589 */
+#define ISIS_CLV_LSP_ENTRIES         9   /* iso10589 */
+#define ISIS_CLV_AUTHENTICATION      10  /* iso10589, rfc3567 */
+#define ISIS_CLV_CHECKSUM            12  /* rfc3358 */
+#define ISIS_CLV_LSP_BUFFERSIZE      14  /* iso10589 rev2 */
+#define ISIS_CLV_EXTD_IS_REACH       22  /* draft-ietf-isis-traffic-05 */
+#define ISIS_CLV_IS_ALIAS_ID         24  /* draft-ietf-isis-ext-lsp-frags-02 */
+#define ISIS_CLV_INT_IP_REACH        128 /* rfc1195, rfc2966 */
+#define ISIS_CLV_PROTOCOLS_SUPPORTED 129 /* rfc1195 */
+#define ISIS_CLV_EXT_IP_REACH        130 /* rfc1195, rfc2966 */
+#define ISIS_CLV_IDRP_INFO           131 /* rfc1195 */
+#define ISIS_CLV_IP_ADDR             132 /* rfc1195 */
+#define ISIS_CLV_IP_AUTHENTICATION   133 /* rfc1195, depreciated */
+#define ISIS_CLV_TE_ROUTER_ID        134 /* draft-ietf-isis-traffic-05 */
+#define ISIS_CLV_EXTD_IP_REACH       135 /* draft-ietf-isis-traffic-05 */
+#define ISIS_CLV_HOSTNAME            137 /* rfc2763 */
+#define ISIS_CLV_SHARED_RISK_GROUP   138 /* draft-ietf-isis-gmpls-extensions */
+#define ISIS_CLV_RESTART             211 /* draft-ietf-isis-restart-01 */
+#define ISIS_CLV_MT_IS_REACH         222 /* draft-ietf-isis-wg-multi-topology-05 */
+#define ISIS_CLV_MT_SUPPORTED        229 /* draft-ietf-isis-wg-multi-topology-05 */
+#define ISIS_CLV_IP6_ADDR            232 /* draft-ietf-isis-ipv6-02 */
+#define ISIS_CLV_MT_IP_REACH         235 /* draft-ietf-isis-wg-multi-topology-05 */
+#define ISIS_CLV_IP6_REACH           236 /* draft-ietf-isis-ipv6-02 */
+#define ISIS_CLV_MT_IP6_REACH        237 /* draft-ietf-isis-wg-multi-topology-05 */
+#define ISIS_CLV_PTP_ADJ_STATE       240 /* rfc3373 */
+#define ISIS_CLV_IIH_SEQNR           241 /* draft-shen-isis-iih-sequence-00 */
+#define ISIS_CLV_VENDOR_PRIVATE      250 /* draft-ietf-isis-proprietary-tlv-00 */
+
+/*
  * Our sub-packet dismantle structure for CLV's
  */
 typedef struct {
-	int	optcode;		/* code for option */
-	char	*tree_text;		/* text for fold out */
-	gint	*tree_id;		/* id for add_item */
-	void	(*dissect)(tvbuff_t *tvb, proto_tree *tree,
-				int offset, int id_length, int length);
+        int     optcode;                /* code for option */
+        char    *tree_text;             /* text for fold out */
+        gint    *tree_id;               /* id for add_item */
+        void    (*dissect)(tvbuff_t *tvb, proto_tree *tree,
+                                int offset, int id_length, int length);
 } isis_clv_handle_t;
 
 /*
@@ -42,27 +86,29 @@ typedef struct {
  * are only valid from with isis decodes.
  */
 extern void isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
-	const isis_clv_handle_t *opts, int len,	int id_length,
-	int unknown_tree_id);
+        const isis_clv_handle_t *opts, int len, int id_length,
+        int unknown_tree_id);
 
 extern void isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length);
+        int offset, int length);
 extern void isis_dissect_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length, int tree_id);
+        int offset, int length, int tree_id);
 extern void isis_dissect_ipv6_int_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length, int tree_id);
+        int offset, int length, int tree_id);
 extern void isis_dissect_ip_int_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length, int tree_id);
+        int offset, int length, int tree_id);
 extern void isis_dissect_mt_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length, int tree_id);
+        int offset, int length, int tree_id);
 extern void isis_dissect_hostname_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length);
+        int offset, int length);
 extern void isis_dissect_authentication_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length, char *meaning);
+        int offset, int length);
+extern void isis_dissect_ip_authentication_clv(tvbuff_t *tvb, proto_tree *tree,
+        int offset, int length);
 extern void isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree,
-	int offset, int length);
+        int offset, int length);
 
 extern void isis_dissect_metric(tvbuff_t *tvb, proto_tree *tree, int offset,
-	guint8 value, char *pstr, int force_supported);
+        guint8 value, char *pstr, int force_supported);
 
 #endif /* _PACKET_ISIS_CLV_H */