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, 59 insertions, 0 deletions

diff --git a/ip_opts.h b/ip_opts.h
new file mode 100644
index 0000000000..68fa85342c
--- /dev/null
+++ b/ip_opts.h
@@ -0,0 +1,59 @@
+/* ip_opts.h
+ * Definitions of structures and routines for dissection of options that
+ * work like IPv4 or IPv6 options
+ *
+ * $Id: ip_opts.h,v 1.1 2003/07/11 09:30:48 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * 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 __IP_OPTS_H__
+#define __IP_OPTS_H__
+
+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 options that work like IPv4 options, where the
+   length field in the option, if present, includes the type and
+   length bytes. */
+extern void dissect_ip_tcp_options(tvbuff_t *, int, guint,
+    const ip_tcp_opt *, int, int, packet_info *, proto_tree *);
+
+/* Routine to dissect options that work like IPv6 options, where the
+   length field in the option, if present, includes only the data, not
+   the type and length bytes. */
+extern void dissect_ipv6_options(tvbuff_t *, int, guint,
+    const ip_tcp_opt *, int, int, packet_info *, proto_tree *);
+
+#endif