[netfilter-cvslog] r3257 - trunk/patch-o-matic-ng/pptp-conntrack-nat
/C=DE/ST=Berlin/L=Berlin/O=Netfilter
/C=DE/ST=Berlin/L=Berlin/O=Netfilter
Fri Oct 22 17:45:58 CEST 2004
Author: /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge at netfilter.org
Date: 2004-10-22 17:45:57 +0200 (Fri, 22 Oct 2004)
New Revision: 3257
Modified:
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch
Log:
adjust hunks to accomodate recently-added sctp conntrack
Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch 2004-10-22 15:38:12 UTC (rev 3256)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch 2004-10-22 15:45:57 UTC (rev 3257)
@@ -1,6 +1,6 @@
-diff -Naur linux-2.6.8.1/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-2.6.8.1-1mdk/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
---- linux-2.6.8.1/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-08-14 12:55:48.000000000 +0200
-+++ linux-2.6.8.1-1mdk/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-08-16 13:54:12.000000000 +0200
+diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linux-2.6.9-connmark-clusterip-hashlimit/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-2.6.9-connmark-clusterip-hashlimit-pptp/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- linux-2.6.9-connmark-clusterip-hashlimit/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-10-18 23:54:40.000000000 +0200
++++ linux-2.6.9-connmark-clusterip-hashlimit-pptp/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-10-22 17:35:11.135192085 +0200
@@ -14,7 +14,7 @@
union ip_conntrack_manip_proto
{
@@ -10,17 +10,17 @@
struct {
u_int16_t port;
-@@ -25,6 +25,9 @@
+@@ -28,6 +28,9 @@
struct {
- u_int16_t id;
- } icmp;
+ u_int16_t port;
+ } sctp;
+ struct {
+ u_int32_t key;
+ } gre;
};
/* The manipulable part of the tuple. */
-@@ -44,7 +47,7 @@
+@@ -47,7 +50,7 @@
u_int32_t ip;
union {
/* Add other protocols here. */
@@ -29,17 +29,17 @@
struct {
u_int16_t port;
-@@ -55,6 +58,9 @@
+@@ -61,6 +64,9 @@
struct {
- u_int8_t type, code;
- } icmp;
+ u_int16_t port;
+ } sctp;
+ struct {
+ u_int32_t key;
+ } gre;
} u;
/* The protocol. */
-@@ -80,10 +88,16 @@
+@@ -86,10 +92,16 @@
#ifdef __KERNEL__
#define DUMP_TUPLE(tp) \
More information about the netfilter-cvslog
mailing list