[netfilter-cvslog] r3254 - in
trunk/patch-o-matic-ng/pptp-conntrack-nat: .
linux/net/ipv4/netfilter linux-2.6/include/linux/netfilter_ipv4
linux-2.6/net/ipv4/netfilter
/C=DE/ST=Berlin/L=Berlin/O=Netfilter
/C=DE/ST=Berlin/L=Berlin/O=Netfilter
Fri Oct 22 17:34:33 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:34:29 +0200 (Fri, 22 Oct 2004)
New Revision: 3254
Added:
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_4
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_5
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_7
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Kconfig.ladd
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_3
Removed:
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd
Modified:
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch
trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
Log:
move Kconfig, Makefile and ip_conntrack.h bits out of the .patch into ladd
Deleted: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd 2004-10-22 14:59:05 UTC (rev 3253)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd 2004-10-22 15:34:29 UTC (rev 3254)
@@ -1,28 +0,0 @@
-config IP_NF_CT_PROTO_GRE
- tristate ' GRE protocol support'
- depends on IP_NF_CONNTRACK
- help
- This module adds generic support for connection tracking and NAT of the
- GRE protocol (RFC1701, RFC2784). Please note that this will only work
- with GRE connections using the key field of the GRE header.
-
- You will need GRE support to enable PPTP support.
-
- If you want to compile it as a module, say `M' here and read
- Documentation/modules.txt. If unsire, say `N'.
-
-config IP_NF_PPTP
- tristate 'PPTP protocol support'
- depends on IP_NF_CT_PROTO_GRE
- help
- This module adds support for PPTP (Point to Point Tunnelling Protocol,
- RFC2637) conncection tracking and NAT.
-
- If you are running PPTP sessions over a stateful firewall or NAT box,
- you may want to enable this feature.
-
- Please note that not all PPTP modes of operation are supported yet.
- For more info, read top of the file net/ipv4/netfilter/ip_conntrack_pptp.c
-
- If you want to compile it as a module, say M here and read
- Documentation/modules.txt. If unsure, say `N'.
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_4 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_4)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_5 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_5)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_6)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_7 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_7)
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8 (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_8)
Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 2004-10-22 14:59:05 UTC (rev 3253)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 2004-10-22 15:34:29 UTC (rev 3254)
@@ -51,20 +51,19 @@
#define IP_CONNTR_PPTP PPTP_CONTROL_PORT
union pptp_ctrl_union {
- void *rawreq;
- struct PptpStartSessionRequest *sreq;
- struct PptpStartSessionReply *srep;
- struct PptpStopSessionReqest *streq;
- struct PptpStopSessionReply *strep;
- struct PptpOutCallRequest *ocreq;
- struct PptpOutCallReply *ocack;
- struct PptpInCallRequest *icreq;
- struct PptpInCallReply *icack;
- struct PptpInCallConnected *iccon;
- struct PptpClearCallRequest *clrreq;
- struct PptpCallDisconnectNotify *disc;
- struct PptpWanErrorNotify *wanerr;
- struct PptpSetLinkInfo *setlink;
+ struct PptpStartSessionRequest sreq;
+ struct PptpStartSessionReply srep;
+ struct PptpStopSessionReqest streq;
+ struct PptpStopSessionReply strep;
+ struct PptpOutCallRequest ocreq;
+ struct PptpOutCallReply ocack;
+ struct PptpInCallRequest icreq;
+ struct PptpInCallReply icack;
+ struct PptpInCallConnected iccon;
+ struct PptpClearCallRequest clrreq;
+ struct PptpCallDisconnectNotify disc;
+ struct PptpWanErrorNotify wanerr;
+ struct PptpSetLinkInfo setlink;
};
Copied: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Kconfig.ladd (from rev 3243, trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd)
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux/net/ipv4/netfilter/Kconfig.ladd 2004-10-20 15:27:16 UTC (rev 3243)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Kconfig.ladd 2004-10-22 15:34:29 UTC (rev 3254)
@@ -0,0 +1,40 @@
+config IP_NF_CT_PROTO_GRE
+ tristate ' GRE protocol support'
+ depends on IP_NF_CONNTRACK
+ help
+ This module adds generic support for connection tracking and NAT of the
+ GRE protocol (RFC1701, RFC2784). Please note that this will only work
+ with GRE connections using the key field of the GRE header.
+
+ You will need GRE support to enable PPTP support.
+
+ If you want to compile it as a module, say `M' here and read
+ Documentation/modules.txt. If unsire, say `N'.
+
+config IP_NF_PPTP
+ tristate 'PPTP protocol support'
+ depends on IP_NF_CT_PROTO_GRE
+ help
+ This module adds support for PPTP (Point to Point Tunnelling Protocol,
+ RFC2637) conncection tracking and NAT.
+
+ If you are running PPTP sessions over a stateful firewall or NAT box,
+ you may want to enable this feature.
+
+ Please note that not all PPTP modes of operation are supported yet.
+ For more info, read top of the file net/ipv4/netfilter/ip_conntrack_pptp.c
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+config IP_NF_NAT_PPTP
+ tristate
+ depends on IP_NF_NAT!=n && IP_NF_PPTP!=n
+ default IP_NF_NAT if IP_NF_PPTP=y
+ default m if IP_NF_PPTP=m
+
+config IP_NF_NAT_PROTO_GRE
+ tristate
+ depends on IP_NF_NAT!=n && IP_NF_CT_PROTO_GRE!=n
+ default IP_NF_NAT if IP_NF_CT_PROTO_GRE=y
+ default m if IP_NF_CT_PROTO_GRE=m
Added: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd 2004-10-22 14:59:05 UTC (rev 3253)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd 2004-10-22 15:34:29 UTC (rev 3254)
@@ -0,0 +1,6 @@
+# SCTP protocol connection tracking
+obj-$(CONFIG_IP_NF_CT_PROTO_GRE) += ip_conntrack_proto_gre.o
+
+# NAT protocol helpers
+obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o
+
Added: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2 2004-10-22 14:59:05 UTC (rev 3253)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_2 2004-10-22 15:34:29 UTC (rev 3254)
@@ -0,0 +1,2 @@
+# connection tracking helpers
+obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack_pptp.o
Added: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_3
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_3 2004-10-22 14:59:05 UTC (rev 3253)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6/net/ipv4/netfilter/Makefile.ladd_3 2004-10-22 15:34:29 UTC (rev 3254)
@@ -0,0 +1,2 @@
+# NAT helpers
+obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o
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 14:59:05 UTC (rev 3253)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch 2004-10-22 15:34:29 UTC (rev 3254)
@@ -61,61 +61,6 @@
#define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
-diff -Naur linux-2.6.8.1/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.6.8.1-1mdk/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.6.8.1/include/linux/netfilter_ipv4/ip_conntrack.h 2004-08-14 12:56:22.000000000 +0200
-+++ linux-2.6.8.1-1mdk/include/linux/netfilter_ipv4/ip_conntrack.h 2004-08-16 13:54:12.000000000 +0200
-@@ -51,19 +51,23 @@
-
- #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
- #include <linux/netfilter_ipv4/ip_conntrack_icmp.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h>
-
- /* per conntrack: protocol private data */
- union ip_conntrack_proto {
- /* insert conntrack proto private data here */
-+ struct ip_ct_gre gre;
- struct ip_ct_tcp tcp;
- struct ip_ct_icmp icmp;
- };
-
- union ip_conntrack_expect_proto {
- /* insert expect proto private data here */
-+ struct ip_ct_gre_expect gre;
- };
-
- /* Add protocol helper include file here */
-+#include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
- #include <linux/netfilter_ipv4/ip_conntrack_amanda.h>
- #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
- #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
-@@ -71,6 +76,7 @@
- /* per expectation: application helper private data */
- union ip_conntrack_expect_help {
- /* insert conntrack helper private data (expect) here */
-+ struct ip_ct_pptp_expect exp_pptp_info;
- struct ip_ct_amanda_expect exp_amanda_info;
- struct ip_ct_ftp_expect exp_ftp_info;
- struct ip_ct_irc_expect exp_irc_info;
-@@ -85,16 +92,19 @@
- /* per conntrack: application helper private data */
- union ip_conntrack_help {
- /* insert conntrack helper private data (master) here */
-+ struct ip_ct_pptp_master ct_pptp_info;
- struct ip_ct_ftp_master ct_ftp_info;
- struct ip_ct_irc_master ct_irc_info;
- };
-
- #ifdef CONFIG_IP_NF_NAT_NEEDED
- #include <linux/netfilter_ipv4/ip_nat.h>
-+#include <linux/netfilter_ipv4/ip_nat_pptp.h>
-
- /* per conntrack: nat application helper private data */
- union ip_conntrack_nat_help {
- /* insert nat helper private data here */
-+ struct ip_nat_pptp nat_pptp_info;
- };
- #endif
-
diff -Naur linux-2.6.8.1/net/ipv4/netfilter/ip_nat_core.c linux-2.6.8.1-1mdk/net/ipv4/netfilter/ip_nat_core.c
--- linux-2.6.8.1/net/ipv4/netfilter/ip_nat_core.c 2004-08-14 12:54:50.000000000 +0200
+++ linux-2.6.8.1-1mdk/net/ipv4/netfilter/ip_nat_core.c 2004-08-16 13:54:12.000000000 +0200
@@ -191,46 +136,4 @@
&& LIST_FIND(&ip_conntrack_expect_list, expect_clash,
struct ip_conntrack_expect *, newtuple, &expect->mask)) {
/* Force NAT to find an unused tuple */
-diff -Naur linux-2.6.8.1/net/ipv4/netfilter/Kconfig linux-2.6.8.1-1mdk/net/ipv4/netfilter/Kconfig
---- linux-2.6.8.1/net/ipv4/netfilter/Kconfig 2004-08-14 12:56:00.000000000 +0200
-+++ linux-2.6.8.1-1mdk/net/ipv4/netfilter/Kconfig 2004-08-16 13:54:12.000000000 +0200
-@@ -628,5 +632,13 @@
- If you want to compile it as a module, say M here and read
- Documentation/modules.txt. If unsure, say `N'.
-
-+config IP_NF_CT_PROTO_GRE
-+ tristate ' GRE protocol support'
-+ depends on IP_NF_CONNTRACK
-+config IP_NF_PPTP
-+ tristate 'PPTP protocol support'
-+ depends on IP_NF_CT_PROTO_GRE
-+ help
-+
- endmenu
-
-diff -Naur linux-2.6.8.1/net/ipv4/netfilter/Makefile linux-2.6.8.1-1mdk/net/ipv4/netfilter/Makefile
---- linux-2.6.8.1/net/ipv4/netfilter/Makefile 2004-08-14 12:54:51.000000000 +0200
-+++ linux-2.6.8.1-1mdk/net/ipv4/netfilter/Makefile 2004-08-16 13:54:12.000000000 +0200
-@@ -19,13 +19,21 @@
- # connection tracking
- obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
-
-+# connection tracking protocol helpers
-+obj-$(CONFIG_IP_NF_CT_PROTO_GRE) += ip_conntrack_proto_gre.o
-+
-+# NAT protocol helpers
-+obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o
-+
- # connection tracking helpers
-+obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack_pptp.o
- obj-$(CONFIG_IP_NF_AMANDA) += ip_conntrack_amanda.o
- obj-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp.o
- obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
- obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o
-
- # NAT helpers
-+obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o
- obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o
- obj-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_tftp.o
- obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o
More information about the netfilter-cvslog
mailing list