From Frank Singleton: when GIOP sub-dissectors register themselves, have

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

diff --git a/packet-ip.h b/packet-ip.h
index 5911bccdfa815ac7c0954293cf80652d782562ef..3436f95e179ff90ee474a6802a58f1d2215ea753 100644 (file)
--- a/packet-ip.h
+++ b/packet-ip.h
@@ -1,10 +1,10 @@
 /* packet-ip.h
  * Definitions for IP packet disassembly structures and routines
  *
- * $Id: packet-ip.h,v 1.10 2000/01/20 21:34:15 guy Exp $
+ * $Id: packet-ip.h,v 1.19 2001/04/23 17:51:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  * 
@@ -27,37 +27,7 @@
 #ifndef __PACKET_IP_H__
 #define __PACKET_IP_H__
 
-#define IP_PROTO_IP            0               /* dummy for IP */
-#define IP_PROTO_HOPOPTS       0               /* IP6 hop-by-hop options */
-#define IP_PROTO_ICMP          1               /* control message protocol */
-#define IP_PROTO_IGMP          2               /* group mgmt protocol */
-#define IP_PROTO_GGP           3               /* gateway^2 (deprecated) */
-#define IP_PROTO_IPIP          4               /* IP inside IP */
-#define IP_PROTO_IPV4          4               /* IP header */
-#define IP_PROTO_TCP           6               /* tcp */
-#define IP_PROTO_EGP           8               /* exterior gateway protocol */
-#define IP_PROTO_PUP           12              /* pup */
-#define IP_PROTO_UDP           17              /* user datagram protocol */
-#define IP_PROTO_IDP           22              /* xns idp */
-#define IP_PROTO_TP            29              /* tp-4 w/ class negotiation */
-#define IP_PROTO_IPV6          41              /* IP6 header */
-#define IP_PROTO_ROUTING       43              /* IP6 routing header */
-#define IP_PROTO_FRAGMENT      44              /* IP6 fragmentation header */
-#define IP_PROTO_RSVP           46              /* Resource ReSerVation protocol */
-#define IP_PROTO_GRE           47              /* GRE */
-#define IP_PROTO_ESP           50              /* ESP */
-#define IP_PROTO_AH            51              /* AH */
-#define IP_PROTO_ICMPV6                58              /* ICMP6 */
-#define IP_PROTO_NONE          59              /* IP6 no next header */
-#define IP_PROTO_DSTOPTS       60              /* IP6 no next header */
-#define IP_PROTO_EON           80              /* ISO cnlp */
-#define IP_PROTO_VINES         83              /* Vines over raw IP */
-#define IP_PROTO_EIGRP         88
-#define IP_PROTO_OSPF          89
-#define IP_PROTO_ENCAP         98              /* encapsulation header */
-#define IP_PROTO_PIM           103             /* Protocol Independent Mcast */
-#define IP_PROTO_IPCOMP                108             /* IP payload compression */
-#define IP_PROTO_VRRP          112             /* Virtual Router Redundancy Protocol */
+void capture_ip(const u_char *, int, packet_counts *);
 
 typedef enum {
   NO_LENGTH,           /* option has no data, hence no length */
@@ -72,12 +42,16 @@ typedef struct ip_tcp_opt {
   int   *subtree_index;        /* pointer to subtree index for option */
   opt_len_type len_type; /* type of option length field */
   int  optlen;         /* value length should be (minimum if VARIABLE) */
-  void (*dissect)(const struct ip_tcp_opt *, const u_char *, int, guint, proto_tree *);
+  void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *, int, guint,
+                  frame_data *, proto_tree *);
                        /* routine to dissect option */
 } ip_tcp_opt;
 
 /* Routine to dissect IP or TCP options. */
-void       dissect_ip_tcp_options(const u_char *, int, guint,
-    const ip_tcp_opt *, int, int, proto_tree *);
+void       dissect_ip_tcp_options(tvbuff_t *, int, guint,
+    const ip_tcp_opt *, int, int, frame_data *, proto_tree *);
+
+/* Dissector table for "ip.proto"; used by IPv6 as well as IPv4 */
+extern dissector_table_t ip_dissector_table;
 
 #endif