Merge branch 'master' into samesversion

[l2tpns.git] / garden.c

diff --git a/garden.c b/garden.c
index e445d41..63135ea 100644 (file)
--- a/garden.c
+++ b/garden.c
@@ -3,14 +3,15 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
+
 #include "l2tpns.h"
 #include "plugin.h"
 #include "control.h"
 
 /* walled garden */
 
-char const *cvs_id = "$Id: garden.c,v 1.24 2005/10/11 09:04:53 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *f = 0;
 
@@ -23,7 +24,8 @@ char *up_commands[] = {
     "iptables -t nat -N garden_users >/dev/null 2>&1",         // Empty chain, users added/removed by garden_session
     "iptables -t nat -F garden_users",
     "iptables -t nat -A PREROUTING -j garden_users",           // DNAT any users on the garden_users chain
-    "sysctl -w net.ipv4.ip_conntrack_max=512000 >/dev/null",   // lots of entries
+    "sysctl -w net.ipv4.netfilter.ip_conntrack_max=512000"     // lots of entries
+            " net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=18000 >/dev/null", // 5hrs
     NULL,
 };