[netfilter-cvslog] r4423 - in trunk/nfsim: . kernelenv kernelenv/include

laforge at netfilter.org laforge at netfilter.org
Wed Nov 2 14:52:06 CET 2005 

Author: laforge at netfilter.org
Date: 2005-11-02 14:52:04 +0100 (Wed, 02 Nov 2005)
New Revision: 4423

Modified:
   trunk/nfsim/.links
   trunk/nfsim/configure
   trunk/nfsim/kernelenv/include/kernelenv.h
   trunk/nfsim/kernelenv/include/proc_stuff.h
   trunk/nfsim/kernelenv/kernelenv.c
Log:
add (partial) support for post 2.6.14 kernels


Modified: trunk/nfsim/.links
===================================================================
--- trunk/nfsim/.links	2005-11-02 09:48:31 UTC (rev 4422)
+++ trunk/nfsim/.links	2005-11-02 13:52:04 UTC (rev 4423)
@@ -45,6 +45,7 @@
 ./linux/compiler.h
 ./linux/jhash.h
 ./linux/cpumask.h
+./linux/net.h
 ./asm/uaccess.h
 ./asm/semaphore.h
 ./asm/system.h

Modified: trunk/nfsim/configure
===================================================================
--- trunk/nfsim/configure	2005-11-02 09:48:31 UTC (rev 4422)
+++ trunk/nfsim/configure	2005-11-02 13:52:04 UTC (rev 4423)
@@ -93,6 +93,21 @@
     echo "netfilter/core/$TYPE.c: $KERNELDIR/net/$TYPE/netfilter.c" >> Makefile.import
     echo '	@sed -f netfilter.c.sed $< > $@ && chmod a-w $@' >> Makefile.import
     echo "import: netfilter/core/$TYPE.c" >> Makefile.import
+    if [ -f $KERNELDIR/net/netfilter/x_tables.c ]; then
+        # >= Linux 2.6.15 with x_tables
+	for i in x_tables.c; do
+	    echo "netfilter/core/$i: $KERNELDIR/net/netfilter/$i" >> Makefile.import
+	    echo '	@cp $< $@ && chmod a-w $@' >> Makefile.import
+	    echo "import: netfilter/core/$i" >> Makefile.import
+	done
+	files=$(cd $KERNELDIR/net/netfilter/; \
+		find . -name 'xt_*.[ch]' ! -name '*.mod.c' | grep -vE '/(SCCS|RCS)/')
+	for f in $files; do
+	    echo "netfilter/$f":"$KERNELDIR/net/netfilter/$f" >> Makefile.import
+	    echo '	@cp $< $@ && chmod a-w $@' >> Makefile.import
+	    echo "import: netfilter/$f" >> Makefile.import
+	done
+    fi
 fi
 
 files=$(cd $KERNELDIR/net/$TYPE/netfilter/; \
@@ -132,6 +147,18 @@
         echo "import: netfilter/include/linux/netfilter/$f" >> Makefile.import
     done
 fi
+if [ -d $KERNELDIR/include/net/netfilter ]; then
+    # present in Linux 2.6.15+
+    files=$(cd $KERNELDIR/include/net/netfilter; \
+	find . -name '*.[ch]' | grep -vE '/(SCCS|RCS)/')
+    for f in $files; do
+        mkdir -p $(dirname netfilter/include/net/netfilter/$f)
+        echo "netfilter/include/net/netfilter/$f":"$KERNELDIR/include/net/netfilter/$f" >> Makefile.import
+        echo '	@cp $^ $@ && chmod a-w $@' >> Makefile.import
+        echo "import: netfilter/include/net/netfilter/$f" >> Makefile.import
+    done
+fi
+
 echo "netfilter/include/linux/netfilter_$TYPE.h":"$KERNELDIR/include/linux/netfilter_$TYPE.h" >> Makefile.import
 echo '	@cp $^ $@ && chmod a-w $@' >> Makefile.import
 echo "import: netfilter/include/linux/netfilter_$TYPE.h" >> Makefile.import

Modified: trunk/nfsim/kernelenv/include/kernelenv.h
===================================================================
--- trunk/nfsim/kernelenv/include/kernelenv.h	2005-11-02 09:48:31 UTC (rev 4422)
+++ trunk/nfsim/kernelenv/include/kernelenv.h	2005-11-02 13:52:04 UTC (rev 4423)
@@ -444,10 +444,17 @@
 
 #define AF_INET		2	/* Internet IP Protocol 	*/
 #define PF_INET 	AF_INET
+#define	AF_INET6	10
+#define PF_INET6	AF_INET6
 
-#define NPROTO 3
+#define AF_MAX		32	/* For now.. */
+#define PF_MAX		AF_MAX
 
+/* net.h */
 
+#define NPROTO 32
+
+
 /* stat.h */
 #define S_IFMT  00170000
 #define S_IFSOCK 0140000
@@ -1109,6 +1116,11 @@
 
 void sema_init(struct semaphore *sem, int val);
 
+static inline void init_MUTEX(struct semaphore *sem)
+{
+	sema_init(sem, 1);
+}
+
 /* sched.h */
 
 #define capable(x) 1
@@ -1347,4 +1359,9 @@
 u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval);
 u32 jhash_2words(u32 a, u32 b, u32 initval);
 u32 jhash_1word(u32 a, u32 initval);
+
+/* string.h */
+size_t strlcat(char *dest, const char *src, size_t count);
+size_t strlcpy(char *dest, const char *src, size_t size);
+
 #endif /* __HAVE_SIMULATOR_H */

Modified: trunk/nfsim/kernelenv/include/proc_stuff.h
===================================================================
--- trunk/nfsim/kernelenv/include/proc_stuff.h	2005-11-02 09:48:31 UTC (rev 4422)
+++ trunk/nfsim/kernelenv/include/proc_stuff.h	2005-11-02 13:52:04 UTC (rev 4423)
@@ -179,6 +179,8 @@
 	NET_DECNET=15,
 	NET_ECONET=16,
 	NET_SCTP=17, 
+	NET_LLC=18,
+	NET_NETFILTER=19,
 };
 
 
@@ -203,8 +205,46 @@
 	NET_CORE_MOD_CONG=16,
 	NET_CORE_DEV_WEIGHT=17,
 	NET_CORE_SOMAXCONN=18,
+	NET_CORE_BUDGET=19,
 };
 
+/* /proc/sys/net/netfilter */
+enum
+{
+	NET_NF_CONNTRACK_MAX=1,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
+	NET_NF_CONNTRACK_UDP_TIMEOUT=10,
+	NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
+	NET_NF_CONNTRACK_ICMP_TIMEOUT=12,
+	NET_NF_CONNTRACK_GENERIC_TIMEOUT=13,
+	NET_NF_CONNTRACK_BUCKETS=14,
+	NET_NF_CONNTRACK_LOG_INVALID=15,
+	NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16,
+	NET_NF_CONNTRACK_TCP_LOOSE=17,
+	NET_NF_CONNTRACK_TCP_BE_LIBERAL=18,
+	NET_NF_CONNTRACK_TCP_MAX_RETRANS=19,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25,
+	NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26,
+	NET_NF_CONNTRACK_COUNT=27,
+	NET_NF_CONNTRACK_ICMPV6_TIMEOUT=28,
+	NET_NF_CONNTRACK_FRAG6_TIMEOUT=29,
+	NET_NF_CONNTRACK_FRAG6_LOW_THRESH=30,
+	NET_NF_CONNTRACK_FRAG6_HIGH_THRESH=31,
+};
+
+
 /* /proc/sys/net/ipv4 */
 enum
 {

Modified: trunk/nfsim/kernelenv/kernelenv.c
===================================================================
--- trunk/nfsim/kernelenv/kernelenv.c	2005-11-02 09:48:31 UTC (rev 4422)
+++ trunk/nfsim/kernelenv/kernelenv.c	2005-11-02 13:52:04 UTC (rev 4423)
@@ -1209,6 +1209,37 @@
 	return (--(v->counter) == 0);
 }
 
+/* lib/string.c */
+#include <string.h>
+size_t strlcpy(char *dest, const char *src, size_t size)
+{
+	size_t ret = strlen(src);
+
+	if (size) {
+		size_t len = (ret >= size) ? size - 1 : ret;
+		memcpy(dest, src, len);
+		dest[len] = '\0';
+	}
+	return ret;
+}
+size_t strlcat(char *dest, const char *src, size_t count)
+{
+	size_t dsize = strlen(dest);
+	size_t len = strlen(src);
+	size_t res = dsize + len;
+
+	/* This would be a bug */
+	BUG_ON(dsize >= count);
+
+	dest += dsize;
+	count -= dsize;
+	if (len >= count)
+		len = count-1;
+	memcpy(dest, src, len);
+	dest[len] = 0;
+	return res;
+}
+
 /*** XML Argument:
     <section id="a:linear-packets">
      <title><option>--linear-packets</option></title>

More information about the netfilter-cvslog mailing list