Moved some ipv6 definitions from packet-ipv6.h to epan/ipv6-utils.h.

Fixed some typos.

svn path=/trunk/; revision=3230

8 files changed, 74 insertions, 15 deletions

diff --git a/epan/Makefile.am b/epan/Makefile.am
index ce8d060071..27bb141e96 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -2,7 +2,7 @@
 # Automake file for the EPAN library
 # (Ethereal Protocol ANalyzer Library)
 #
-# $Id: Makefile.am,v 1.24 2001/04/01 06:11:25 hagbard Exp $
+# $Id: Makefile.am,v 1.25 2001/04/01 07:06:23 hagbard Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -54,6 +54,7 @@ libethereal_a_SOURCES = \
 	gdebug.h		\
 	ipv4.c			\
 	ipv4.h			\
+	ipv6-utils.h		\
 	osi-utils.c		\
 	osi-utils.h		\
 	packet.c		\
diff --git a/epan/ipv6-utils.h b/epan/ipv6-utils.h
new file mode 100644
index 0000000000..e894dac1ac
--- /dev/null
+++ b/epan/ipv6-utils.h
@@ -0,0 +1,60 @@
+/* ipv6-utils.h
+ * Definitions for IPv6 packet disassembly 
+ *
+ * $Id: ipv6-utils.h,v 1.1 2001/04/01 07:06:23 hagbard Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ *
+ * Copyright 1998 Gerald Combs
+ *
+ * MobileIPv6 support added by Tomislav Borosa <tomislav.borosa@siemens.hr>
+ * 
+ * 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 __IPV6_UTILS_H__
+#define __IPV6_UTILS_H__
+
+struct e_in6_addr {
+	union {
+		guint32  u6_addr32[4];
+		guint16  u6_addr16[8];
+		guint8   u6_addr8[16];
+	} u6_addr;			/* 128 bit IP6 address */
+};
+
+#ifdef s6_addr32
+#undef s6_addr32
+#endif
+
+#ifdef s6_addr16
+#undef s6_addr16
+#endif
+
+#ifdef s6_addr8
+#undef s6_addr8
+#endif
+
+#ifdef s6_addr
+#undef s6_addr
+#endif
+
+#define s6_addr32 u6_addr.u6_addr32
+#define s6_addr16 u6_addr.u6_addr16
+#define s6_addr8  u6_addr.u6_addr8
+#define s6_addr   u6_addr.u6_addr8
+
+#endif /* __IPV6_UTILS_H__ */
diff --git a/epan/osi-utils.h b/epan/osi-utils.h
index e322b54d21..909c5d5afb 100644
--- a/epan/osi-utils.h
+++ b/epan/osi-utils.h
@@ -1,6 +1,6 @@
-/* packet-osi.h
+/* osi-utils.h
  *
- * $Id: osi-utils.h,v 1.1 2001/04/01 05:48:15 hagbard Exp $
+ * $Id: osi-utils.h,v 1.2 2001/04/01 07:06:23 hagbard Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
diff --git a/epan/packet.c b/epan/packet.c
index 644f04898a..97449f1fb0 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
 /* packet.c
  * Routines for packet disassembly
  *
- * $Id: packet.c,v 1.29 2001/04/01 05:48:15 hagbard Exp $
+ * $Id: packet.c,v 1.30 2001/04/01 07:06:23 hagbard Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -73,9 +73,8 @@
 
 #include "atalk-utils.h"
 #include "packet-frame.h"
-#include "packet-ipv6.h"
+#include "ipv6-utils.h"
 #include "sna-utils.h"
-#include "packet-vines.h"
 #include "osi-utils.h"
 #include "to_str.h"
 
diff --git a/epan/proto.c b/epan/proto.c
index 83420560c3..4a14b2ebaa 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
 /* proto.c
  * Routines for protocol tree
  *
- * $Id: proto.c,v 1.16 2001/03/26 17:58:33 jfoster Exp $
+ * $Id: proto.c,v 1.17 2001/04/01 07:06:24 hagbard Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -44,7 +44,7 @@
 #include "resolv.h"
 #include "register.h"
 #include "plugins.h"
-#include "packet-ipv6.h"
+#include "ipv6-utils.h"
 #include "proto.h"
 
 #define cVALS(x) (const value_string*)(x)
diff --git a/epan/resolv.c b/epan/resolv.c
index 6879169d7c..a6778ada99 100644
--- a/epan/resolv.c
+++ b/epan/resolv.c
@@ -1,7 +1,7 @@
 /* resolv.c
  * Routines for network object lookup
  *
- * $Id: resolv.c,v 1.6 2001/03/31 22:53:09 hagbard Exp $
+ * $Id: resolv.c,v 1.7 2001/04/01 07:06:24 hagbard Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
@@ -78,8 +78,7 @@
 #endif
 
 #include "packet.h"
-#include "packet-ipv6.h"
-#include "packet-ipx.h"
+#include "ipv6-utils.h"
 #include "resolv.h"
 #include "filesystem.h"
 
diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index 80f4b7597d..a66acb7152 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -1,8 +1,8 @@
-/* packet-sna.c
+/* sna-utils.c
  * Routines for SNA
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: sna-utils.c,v 1.1 2001/03/22 16:24:16 gram Exp $
+ * $Id: sna-utils.c,v 1.2 2001/04/01 07:06:24 hagbard Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
diff --git a/epan/sna-utils.h b/epan/sna-utils.h
index 163446b039..0c50a22ae7 100644
--- a/epan/sna-utils.h
+++ b/epan/sna-utils.h
@@ -1,7 +1,7 @@
-/* packet-sna.h
+/* sna-utils.h
  * Definitions for SNA dissection.
  *
- * $Id: sna-utils.h,v 1.1 2001/03/22 16:24:16 gram Exp $
+ * $Id: sna-utils.h,v 1.2 2001/04/01 07:06:24 hagbard Exp $
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License