Frame numbers are unsigned.

[obnox/wireshark/wip.git] / packet-isis.h

diff --git a/packet-isis.h b/packet-isis.h
index f40bf9e445ee4ea3e9f24f31be43216df2e769c3..2ae8db4980d8e2ca5fe9bea4a79ac4c56555fdc6 100644 (file)
--- a/packet-isis.h
+++ b/packet-isis.h
@@ -1,40 +1,31 @@
 /* packet-isis.h
  * Defines and such for core isis protcol decode.
  *
- * $Id: packet-isis.h,v 1.1 1999/12/15 04:34:19 guy Exp $
+ * $Id: packet-isis.h,v 1.9 2002/08/28 21:00:18 jmayer Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  */
 
 #ifndef _PACKET_ISIS_H
 #define _PACKET_ISIS_H
 
-/* 
- * the IntraDomain Routing Protocol Descriminator is an achitectueral constant
- * set to 0x83 for all packets.
- */
-#define ISIS_IRPD      0x83
-
 /*
  * The version we support is 1
  */
@@ -43,48 +34,27 @@
 /*
  * ISIS type field values
  */
-#define ISIS_TYPE_L1_HELLO             15
-#define ISIS_TYPE_L2_HELLO             16
-#define ISIS_TYPE_PTP_HELLO            17
-#define ISIS_TYPE_L1_LSP               18
-#define ISIS_TYPE_L2_LSP               20
-#define ISIS_TYPE_L1_CSNP              24
-#define ISIS_TYPE_L2_CSNP              25
-#define ISIS_TYPE_L1_PSNP              26
-#define ISIS_TYPE_L2_PSNP              27
-
-/*
- * The common first 8 octets of the ISIS protocol header.
- */
-typedef struct {
-       guint8  isis_irpd;              /* Intradomain Routing Protocol Descriminator.  Must be 0x83 */
-       guint8  isis_header_length;     /* header length in octets */
-       guint8  isis_version;           /* isis version, must be 0x01 */
-       guint8  isis_reserved;          /* res byte, must be 0 */
-       guint8  isis_type_reserved;     /* packet type & reserved */
-#define ISIS_TYPE_MASK         0x1f
-#define ISIS_R8_MASK   0x80
-#define ISIS_R7_MASK   0x40
-#define ISIS_R6_MASK   0x20
-       guint8  isis_version2;          /* another version(?!), must be 0x01 */
-
-       guint8  isis_eco;               /* ECO, must be 0 */
-       guint8  isis_user_eco;          /* user ECO, must be 0 */
-} isis_hdr_t;
-
-#define isis_type isis_type_reserved&ISIS_TYPE_MASK
-#define isis_r8 isis_type_reserved&ISIS_R8_MASK
-#define isis_r7 isis_type_reserved&ISIS_R7_MASK
-#define isis_r6 isis_type_reserved&ISIS_R6_MASK
+#define ISIS_TYPE_L1_HELLO  15
+#define ISIS_TYPE_L2_HELLO  16
+#define ISIS_TYPE_PTP_HELLO 17
+#define ISIS_TYPE_L1_LSP    18
+#define ISIS_TYPE_L2_LSP    20
+#define ISIS_TYPE_L1_CSNP   24
+#define ISIS_TYPE_L2_CSNP   25
+#define ISIS_TYPE_L1_PSNP   26
+#define ISIS_TYPE_L2_PSNP   27
+
+#define ISIS_TYPE_MASK             0x1f
+#define ISIS_R8_MASK       0x80
+#define ISIS_R7_MASK       0x40
+#define ISIS_R6_MASK       0x20
 
 /*
  * published API functions
  */
-extern char *isis_address_to_string ( const u_char *pd, int offset, int len );
-extern void dissect_isis(const u_char *pd, int offset, frame_data *fd, 
-               proto_tree *tree);
-extern void proto_register_isis(void);
-extern void isis_dissect_unknown(int offset,guint length,proto_tree *tree,frame_data *fd,
-                char *fmat, ...);
+
+extern char *isis_address_to_string(tvbuff_t *tvb, int offset, int len);
+extern void isis_dissect_unknown(tvbuff_t *tvb, proto_tree *tree, int offset,
+       char *fmat, ...);
 
 #endif /* _PACKET_ISIS_H */