X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c239d4b22829335fda98b66ce045a3f624436eeb..5e01d2924d4eec8915e93a2cae01217ae25ab4dc:/garden.c

diff --git a/garden.c b/garden.c
index 7477089..ba228cd 100644
--- a/garden.c
+++ b/garden.c
@@ -7,18 +7,23 @@
 #include "plugin.h"
 #include "control.h"
 
-int __plugin_api_version = 1;
+/* walled garden */
+
+char const *cvs_id = "$Id: garden.c,v 1.13 2004-11-17 08:23:34 bodea Exp $";
+
+int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
 
 static int iam_master = 0;	// We're all slaves! Slaves I tell you!
 
 char *up_commands[] = {
-	"iptables -t nat -N garden >/dev/null 2>&1",	// Create a chain that all gardened users will go through
+	"iptables -t nat -N garden >/dev/null 2>&1",			// Create a chain that all gardened users will go through
 	"iptables -t nat -F garden",
-	". " PLUGINCONF "/build-garden",		// Populate with site-specific DNAT rules
-	"iptables -t nat -N garden_users >/dev/null 2>&1",// Empty chain, users added/removed by garden_session
+	". " PLUGINCONF "/build-garden",				// Populate with site-specific DNAT rules
+	"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
+	"iptables -t nat -A PREROUTING -j garden_users",		// DNAT any users on the garden_users chain
+	"sysctl -w net.ipv4.ip_conntrack_max=256000 >/dev/null",	// lots of entries
 	NULL,
 };
 
@@ -28,7 +33,10 @@ char *down_commands[] = {
 	"iptables -t nat -X garden_users",
 	"iptables -t nat -F garden",
 	"iptables -t nat -X garden",
-	"rmmod iptable_nat ip_conntrack",
+	"rmmod iptable_nat",	// Should also remove ip_conntrack, but
+				// doing so can take hours...  literally.
+				// If a master is re-started as a slave,
+				// either rmmod manually, or reboot.
 	NULL,
 };
 
@@ -67,46 +75,62 @@ int plugin_kill_session(struct param_new_session *data)
 	return PLUGIN_RET_OK;
 }
 
+char *plugin_control_help[] = {
+	"  garden USER|SID       Put user into the walled garden",
+	"  ungarden USER|SID     Release user",
+	0
+};
+
 int plugin_control(struct param_control *data)
 {
-	sessiont *s;
 	sessionidt session;
+	sessiont *s = 0;
+	int flag;
+	char *end;
+
+	if (data->argc < 1 || (strcmp(data->argv[0], "garden") && strcmp(data->argv[0], "ungarden")))
+		return PLUGIN_RET_OK; // not for us
+
+	flag = data->argv[0][0] == 'g';
 
 	if (!iam_master)	// All garden processing happens on the master.
-		return PLUGIN_RET_OK;
+	{
+	    	data->response = NSCTL_RES_ERR;
+		data->additional = "must be run on the cluster master";
+		return PLUGIN_RET_STOP;
+	}
 
-	if (data->type != PKT_GARDEN && data->type != PKT_UNGARDEN)
-		return PLUGIN_RET_OK;
+	if (data->argc != 2)
+	{
+	    	data->response = NSCTL_RES_ERR;
+		data->additional = "one argument required: username or session id";
+		return PLUGIN_RET_STOP;
+	}
 
-	if (!data->data && data->data_length)
-		return PLUGIN_RET_OK;
+	if (!(session = strtol(data->argv[0], &end, 10)) || *end)
+		session = p->get_session_by_username(data->argv[0]);
 
-	session = atoi((char*)(data->data));
-	if (!session)
-		return PLUGIN_RET_OK;
+	if (session)
+		s = p->get_session_by_id(session);
 
-	data->send_response = 1;
-	s = p->get_session_by_id(session);
 	if (!s || !s->ip)
 	{
-		char *errormsg = "Session not connected";
-		*(short *)(data->response + 2) = ntohs(PKT_RESP_ERROR);
-		sprintf((data->response + data->response_length), "%s", errormsg);
-		data->response_length += strlen(errormsg) + 1;
-
-		p->log(3, 0, 0, 0, "Unknown session %d\n", session);
+		data->response = NSCTL_RES_ERR;
+		data->additional = "session not found";
 		return PLUGIN_RET_STOP;
 	}
-	*(short *)(data->response + 2) = ntohs(PKT_RESP_OK);
 
-	if (!(garden_session(s, (data->type == PKT_GARDEN))))
+	if (s->walled_garden == flag)
 	{
-		char *errormsg = "User not connected";
-		*(short *)(data->response + 2) = ntohs(PKT_RESP_ERROR);
-		sprintf((data->response + data->response_length), "%s", errormsg);
-		data->response_length += strlen(errormsg) + 1;
+		data->response = NSCTL_RES_ERR;
+		data->additional = flag ? "already in walled garden" : "not in walled garden";
+		return PLUGIN_RET_STOP;
 	}
 
+	garden_session(s, flag);
+	data->response = NSCTL_RES_OK;
+	data->additional = 0;
+
 	return PLUGIN_RET_STOP;
 }
 
@@ -128,7 +152,10 @@ int plugin_become_master(void)
 int plugin_new_session_master(sessiont * s)
 {	
 	if (s->walled_garden)
+	{
+		s->walled_garden = 0;
 		garden_session(s, 1);
+	}
 
 	return PLUGIN_RET_OK;
 }
@@ -143,7 +170,7 @@ int garden_session(sessiont *s, int flag)
 	if (flag == 1)
 	{
 		p->log(2, 0, 0, s->tunnel, "Garden user %s (%s)\n", s->user, p->inet_toa(htonl(s->ip)));
-		snprintf(cmd, 2048, "iptables -t nat -A garden_users -s %s -j garden", p->inet_toa(htonl(s->ip)));
+		snprintf(cmd, sizeof(cmd), "iptables -t nat -A garden_users -s %s -j garden", p->inet_toa(htonl(s->ip)));
 		p->log(3, 0, 0, s->tunnel, "%s\n", cmd);
 		system(cmd);
 		s->walled_garden = 1;
@@ -164,7 +191,7 @@ int garden_session(sessiont *s, int flag)
 		s->cin = s->cout = 0;
 		s->pin = s->pout = 0;
 
-		snprintf(cmd, 2048, "iptables -t nat -D garden_users -s %s -j garden", p->inet_toa(htonl(s->ip)));
+		snprintf(cmd, sizeof(cmd), "iptables -t nat -D garden_users -s %s -j garden", p->inet_toa(htonl(s->ip)));
 		p->log(3, 0, 0, s->tunnel, "%s\n", cmd);
 		while (--count)
 		{