Add a routine "dissect_ipv6_options()" that works like

"dissect_ip_tcp_options()" but for options that are like IPv6 options
(i.e., the length byte has a value that doesn't include the option code
or length byte).

Add an "ip_opts.h" header to declare it, and move the declaration of
stuff used by it and "dissect_ip_tcp_options()", and the declaration of
"dissect_ip_tcp_options()", to that header.

Use "dissect_ipv6_options()" for Mobile IPv6 options.

Get rid of the unused "mip6_opt_types[]" array in "packet-mip6.h".

svn path=/trunk/; revision=8015

1 files changed, 1 insertions, 23 deletions

diff --git a/packet-ip.h b/packet-ip.h
index c192724ce5..9170983d9b 100644
--- a/packet-ip.h
+++ b/packet-ip.h
@@ -1,7 +1,7 @@
 /* packet-ip.h
  * Definitions for IP packet disassembly structures and routines
  *
- * $Id: packet-ip.h,v 1.27 2003/04/29 17:24:35 guy Exp $
+ * $Id: packet-ip.h,v 1.28 2003/07/11 09:30:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,28 +42,6 @@ typedef struct _e_ip
 
 void capture_ip(const guchar *, int, int, packet_counts *);
 
-typedef enum {
-  NO_LENGTH,		/* option has no data, hence no length */
-  FIXED_LENGTH,		/* option always has the same length */
-  VARIABLE_LENGTH	/* option is variable-length - optlen is minimum */
-} opt_len_type;
-
-/* Member of table of IP or TCP options. */
-typedef struct ip_tcp_opt {
-  int   optcode;	/* code for option */
-  char  *name;		/* name of option */
-  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 *, tvbuff_t *, int, guint,
-  		   packet_info *, proto_tree *);
-			/* routine to dissect option */
-} ip_tcp_opt;
-
-/* Routine to dissect IP or TCP options. */
-void       dissect_ip_tcp_options(tvbuff_t *, int, guint,
-    const ip_tcp_opt *, int, int, packet_info *, proto_tree *);
-
 /* Export the DSCP value-string table for other protocols */
 extern const value_string dscp_vals[];