SOURCES (LINUX_2_6): pom-ng-connlimit-20060329.patch, pom-ng-expir...

baggins baggins at pld-linux.org
Wed Apr 12 18:33:51 CEST 2006


Author: baggins                      Date: Wed Apr 12 16:33:51 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fixed match() prototype

---- Files affected:
SOURCES:
   pom-ng-connlimit-20060329.patch (1.1.2.1 -> 1.1.2.2) , pom-ng-expire-20060329.patch (1.1.2.1 -> 1.1.2.2) , pom-ng-fuzzy-20060329.patch (1.1.2.2 -> 1.1.2.3) , pom-ng-ipv4options-20060329.patch (1.1.2.1 -> 1.1.2.2) , pom-ng-nth-20060329.patch (1.1.2.2 -> 1.1.2.3) , pom-ng-osf-20060329.patch (1.1.2.1 -> 1.1.2.2) , pom-ng-psd-20060329.patch (1.1.2.1 -> 1.1.2.2) , pom-ng-quota-20060329.patch (1.1.2.1 -> 1.1.2.2) , pom-ng-random-20060329.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/pom-ng-connlimit-20060329.patch
diff -u SOURCES/pom-ng-connlimit-20060329.patch:1.1.2.1 SOURCES/pom-ng-connlimit-20060329.patch:1.1.2.2
--- SOURCES/pom-ng-connlimit-20060329.patch:1.1.2.1	Wed Mar 29 11:15:12 2006
+++ SOURCES/pom-ng-connlimit-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -47,7 +47,7 @@
 diff -Nur --exclude '*.orig' linux-2.6.16.org/net/ipv4/netfilter/ipt_connlimit.c linux-2.6.16/net/ipv4/netfilter/ipt_connlimit.c
 --- linux-2.6.16.org/net/ipv4/netfilter/ipt_connlimit.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16/net/ipv4/netfilter/ipt_connlimit.c	2006-03-29 09:19:51.000000000 +0200
-@@ -0,0 +1,228 @@
+@@ -0,0 +1,229 @@
 +/*
 + * netfilter module to limit the number of parallel tcp
 + * connections per IP address.
@@ -181,6 +181,7 @@
 +      const struct net_device *out,
 +      const void *matchinfo,
 +      int offset,
++      unsigned int protoff,
 +      int *hotdrop)
 +{
 +	const struct ipt_connlimit_info *info = matchinfo;

================================================================
Index: SOURCES/pom-ng-expire-20060329.patch
diff -u SOURCES/pom-ng-expire-20060329.patch:1.1.2.1 SOURCES/pom-ng-expire-20060329.patch:1.1.2.2
--- SOURCES/pom-ng-expire-20060329.patch:1.1.2.1	Wed Mar 29 11:15:12 2006
+++ SOURCES/pom-ng-expire-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -158,7 +158,7 @@
 +
 +static int ipt_exp_match(const struct sk_buff *,
 +		const struct net_device *, const struct net_device *,
-+		const void *, int, int *);
++		const void *, int, unsigned int, int *);
 +static int ipt_exp_checkentry(const char *, const struct ipt_ip *,
 +		void *, unsigned int, unsigned int);
 +static int ipt_exp_add_table(const char *);
@@ -262,7 +262,7 @@
 +static int
 +ipt_exp_match(const struct sk_buff *skb,
 +		const struct net_device *in, const struct net_device *out,
-+		const void *matchinfo, int offset, int *hotdrop)
++		const void *matchinfo, int offset, unsigned int protoff, int *hotdrop)
 +{
 +	const struct ipt_exp_info *info = matchinfo;
 +

================================================================
Index: SOURCES/pom-ng-fuzzy-20060329.patch
diff -u SOURCES/pom-ng-fuzzy-20060329.patch:1.1.2.2 SOURCES/pom-ng-fuzzy-20060329.patch:1.1.2.3
--- SOURCES/pom-ng-fuzzy-20060329.patch:1.1.2.2	Wed Mar 29 15:05:24 2006
+++ SOURCES/pom-ng-fuzzy-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -85,7 +85,7 @@
 diff -Nur --exclude '*.orig' linux-2.6.16.org/net/ipv4/netfilter/ipt_fuzzy.c linux-2.6.16/net/ipv4/netfilter/ipt_fuzzy.c
 --- linux-2.6.16.org/net/ipv4/netfilter/ipt_fuzzy.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16/net/ipv4/netfilter/ipt_fuzzy.c	2006-03-29 09:28:25.000000000 +0200
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,186 @@
 +/*
 + *  This module implements a simple TSK FLC 
 + * (Takagi-Sugeno-Kang Fuzzy Logic Controller) that aims
@@ -155,6 +155,7 @@
 +	       const struct net_device *out,
 +	       const void *matchinfo,
 +	       int offset,
++	       unsigned int protoff,
 +	       int *hotdrop)
 +{
 +	/* From userspace */

================================================================
Index: SOURCES/pom-ng-ipv4options-20060329.patch
diff -u SOURCES/pom-ng-ipv4options-20060329.patch:1.1.2.1 SOURCES/pom-ng-ipv4options-20060329.patch:1.1.2.2
--- SOURCES/pom-ng-ipv4options-20060329.patch:1.1.2.1	Wed Mar 29 11:15:12 2006
+++ SOURCES/pom-ng-ipv4options-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -59,7 +59,7 @@
 diff -Nur --exclude '*.orig' linux-2.6.16.org/net/ipv4/netfilter/ipt_ipv4options.c linux-2.6.16/net/ipv4/netfilter/ipt_ipv4options.c
 --- linux-2.6.16.org/net/ipv4/netfilter/ipt_ipv4options.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16/net/ipv4/netfilter/ipt_ipv4options.c	2006-03-29 09:34:12.000000000 +0200
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,173 @@
 +/*
 +  This is a module which is used to match ipv4 options.
 +  This file is distributed under the terms of the GNU General Public
@@ -89,6 +89,7 @@
 +      const struct net_device *out,
 +      const void *matchinfo,
 +      int offset,
++      unsigned int protoff,
 +      int *hotdrop)
 +{
 +	const struct ipt_ipv4options_info *info = matchinfo;   /* match info for rule */

================================================================
Index: SOURCES/pom-ng-nth-20060329.patch
diff -u SOURCES/pom-ng-nth-20060329.patch:1.1.2.2 SOURCES/pom-ng-nth-20060329.patch:1.1.2.3
--- SOURCES/pom-ng-nth-20060329.patch:1.1.2.2	Wed Mar 29 14:59:15 2006
+++ SOURCES/pom-ng-nth-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -95,7 +95,7 @@
 diff -Nur --exclude '*.orig' linux-2.6.16.org/net/ipv4/netfilter/ipt_nth.c linux-2.6.16/net/ipv4/netfilter/ipt_nth.c
 --- linux-2.6.16.org/net/ipv4/netfilter/ipt_nth.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16/net/ipv4/netfilter/ipt_nth.c	2006-03-29 09:38:31.000000000 +0200
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,167 @@
 +/*
 +  This is a module which is used for match support for every Nth packet
 +  This file is distributed under the terms of the GNU General Public
@@ -139,6 +139,7 @@
 +	      const struct net_device *out,
 +	      const void *matchinfo,
 +	      int offset,
++	      unsigned int protoff,
 +	      int *hotdrop)
 +{
 +	/* Parameters from userspace */

================================================================
Index: SOURCES/pom-ng-osf-20060329.patch
diff -u SOURCES/pom-ng-osf-20060329.patch:1.1.2.1 SOURCES/pom-ng-osf-20060329.patch:1.1.2.2
--- SOURCES/pom-ng-osf-20060329.patch:1.1.2.1	Wed Mar 29 11:15:12 2006
+++ SOURCES/pom-ng-osf-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -277,7 +277,7 @@
 +static spinlock_t ipt_osf_netlink_lock = SPIN_LOCK_UNLOCKED;
 +static struct list_head	finger_list;	
 +static int match(const struct sk_buff *, const struct net_device *, const struct net_device *,
-+		      const void *, int, 
++		      const void *, int, unsigned int,
 +		      int *);
 +static int checkentry(const char *, const struct ipt_ip *, void *,
 +		           unsigned int, unsigned int);
@@ -392,7 +392,7 @@
 +
 +static int
 +match(const struct sk_buff *skb, const struct net_device *in, const struct net_device *out,
-+      const void *matchinfo, int offset,
++      const void *matchinfo, int offset, unsigned int protoff,
 +      int *hotdrop)
 +{
 +	struct ipt_osf_info *info = (struct ipt_osf_info *)matchinfo;

================================================================
Index: SOURCES/pom-ng-psd-20060329.patch
diff -u SOURCES/pom-ng-psd-20060329.patch:1.1.2.1 SOURCES/pom-ng-psd-20060329.patch:1.1.2.2
--- SOURCES/pom-ng-psd-20060329.patch:1.1.2.1	Wed Mar 29 11:15:12 2006
+++ SOURCES/pom-ng-psd-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -75,7 +75,7 @@
 diff -Nur --exclude '*.orig' linux-2.6.16.org/net/ipv4/netfilter/ipt_psd.c linux-2.6.16/net/ipv4/netfilter/ipt_psd.c
 --- linux-2.6.16.org/net/ipv4/netfilter/ipt_psd.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16/net/ipv4/netfilter/ipt_psd.c	2006-03-29 09:42:46.000000000 +0200
-@@ -0,0 +1,358 @@
+@@ -0,0 +1,359 @@
 +/*
 +  This is a module which is used for PSD (portscan detection)
 +  Derived from scanlogd v2.1 written by Solar Designer <solar at false.com>
@@ -177,6 +177,7 @@
 +	      const struct net_device *out,
 +	      const void *matchinfo,
 +	      int offset,
++	      unsigned int protoff,
 +	      int *hotdrop)
 +{
 +	struct iphdr *ip_hdr;

================================================================
Index: SOURCES/pom-ng-quota-20060329.patch
diff -u SOURCES/pom-ng-quota-20060329.patch:1.1.2.1 SOURCES/pom-ng-quota-20060329.patch:1.1.2.2
--- SOURCES/pom-ng-quota-20060329.patch:1.1.2.1	Wed Mar 29 11:15:12 2006
+++ SOURCES/pom-ng-quota-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -73,7 +73,7 @@
 +      const struct net_device *in,
 +      const struct net_device *out,
 +      const void *matchinfo,
-+      int offset, int *hotdrop)
++      int offset, unsigned int protoff, int *hotdrop)
 +{
 +        struct ipt_quota_info *q = 
 +		((struct ipt_quota_info *) matchinfo)->master;

================================================================
Index: SOURCES/pom-ng-random-20060329.patch
diff -u SOURCES/pom-ng-random-20060329.patch:1.1.2.2 SOURCES/pom-ng-random-20060329.patch:1.1.2.3
--- SOURCES/pom-ng-random-20060329.patch:1.1.2.2	Wed Mar 29 15:09:38 2006
+++ SOURCES/pom-ng-random-20060329.patch	Wed Apr 12 18:33:45 2006
@@ -66,7 +66,7 @@
 diff -Nur --exclude '"*.orig"' linux-2.6.16.org/net/ipv4/netfilter/ipt_random.c linux-2.6.16/net/ipv4/netfilter/ipt_random.c
 --- linux-2.6.16.org/net/ipv4/netfilter/ipt_random.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16/net/ipv4/netfilter/ipt_random.c	2006-03-29 09:47:19.000000000 +0200
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,93 @@
 +/*
 +  This is a module which is used for a "random" match support.
 +  This file is distributed under the terms of the GNU General Public
@@ -93,6 +93,7 @@
 +	       const struct net_device *out,
 +	       const void *matchinfo,
 +	       int offset,
++	       unsigned int protoff,
 +	       int *hotdrop)
 +{
 +	/* Parameters from userspace */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pom-ng-connlimit-20060329.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-expire-20060329.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-fuzzy-20060329.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-ipv4options-20060329.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-nth-20060329.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-osf-20060329.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-psd-20060329.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-quota-20060329.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/pom-ng-random-20060329.patch?r1=1.1.2.2&r2=1.1.2.3&f=u



More information about the pld-cvs-commit mailing list