[netfilter-cvslog] r6377 - in trunk/nfsim: . core/ipv4 kernelenv/include

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-01-08 20:57:49 +0100 (Sun, 08 Jan 2006)
New Revision: 6377

Modified:
   trunk/nfsim/.links
   trunk/nfsim/core/ipv4/ipv4.h
   trunk/nfsim/kernelenv/include/kernelenv.h
Log:
some more ipv6 bits


Modified: trunk/nfsim/.links
===================================================================
--- trunk/nfsim/.links	2006-01-08 18:54:03 UTC (rev 6376)
+++ trunk/nfsim/.links	2006-01-08 19:57:49 UTC (rev 6377)
@@ -81,3 +81,4 @@
 ./net/dst.h
 ./net/ipv6.h
 ./net/if_inet6.h
+./net/ip6_route.h

Modified: trunk/nfsim/core/ipv4/ipv4.h
===================================================================
--- trunk/nfsim/core/ipv4/ipv4.h	2006-01-08 18:54:03 UTC (rev 6376)
+++ trunk/nfsim/core/ipv4/ipv4.h	2006-01-08 19:57:49 UTC (rev 6377)
@@ -503,13 +503,11 @@
 			__u8			scope;
 		} ip4_u;
 
-#if 0
 		struct {
 			struct in6_addr		daddr;
 			struct in6_addr		saddr;
 			__u32			flowlabel;
 		} ip6_u;
-#endif
 		struct {
 			__u16			daddr;
 			__u16			saddr;

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2006-01-08 18:54:03 UTC (rev 6376)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2006-01-08 19:57:49 UTC (rev 6377)
@@ -535,6 +535,7 @@
 #define ETH_FRAME_LEN   1514            /* Max. octets in frame sans FCS */
 
 #define ETH_P_IP        0x0800          /* Internet Protocol packet     */
+#define ETH_P_IPV6      0x86DD          /* IPv6 */
 
 struct ethhdr 
 {
@@ -621,7 +622,18 @@
 	struct	in6_addr	daddr;
 };
 
+static inline int ipv6_addr_equal(const struct in6_addr *a1,
+				  const struct in6_addr *a2)
+{
+	return (a1->s6_addr32[0] == a2->s6_addr32[0] &&
+		a1->s6_addr32[1] == a2->s6_addr32[1] &&
+		a1->s6_addr32[2] == a2->s6_addr32[2] &&
+		a1->s6_addr32[3] == a2->s6_addr32[3]);
+}
 
+#define IP6_INC_STATS(x, args ...)
+#define LIMIT_NETDEBUG(x, args...) printk(x, ## args)
+
 /* skbuff */
 
 #define CHECKSUM_NONE 0