X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/7d7afb67c88904839a7b331152b8c3f2cf784adf..6d5c3ecb4d12ca63e4f9f809255691b3b2cda6e1:/garden.c

diff --git a/garden.c b/garden.c
index 19b29ac..62f49a2 100644
--- a/garden.c
+++ b/garden.c
@@ -9,9 +9,9 @@
 
 /* walled garden */
 
-char const *cvs_id = "$Id: garden.c,v 1.10 2004-11-05 02:39:35 bodea Exp $";
+char const *cvs_id = "$Id: garden.c,v 1.16 2004-11-18 06:41:03 bodea Exp $";
 
-int __plugin_api_version = 1;
+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!
@@ -47,7 +47,7 @@ int plugin_post_auth(struct param_post_auth *data)
 	// Ignore if user authentication was successful
 	if (data->auth_allowed) return PLUGIN_RET_OK;
 
-	p->_log(3, 0, 0, 0, "Walled Garden allowing login\n");
+	p->log(3, 0, 0, 0, "Walled Garden allowing login\n");
 	data->auth_allowed = 1;
 	data->s->walled_garden = 1;
 	return PLUGIN_RET_OK;
@@ -75,46 +75,68 @@ 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 SID                                Release session from garden",
+	0
+};
+
 int plugin_control(struct param_control *data)
 {
-	sessiont *s;
 	sessionidt session;
+	sessiont *s = 0;
+	int flag;
+	char *end;
 
-	if (!iam_master)	// All garden processing happens on the master.
+	if (data->argc < 1)
 		return PLUGIN_RET_OK;
 
-	if (data->type != PKT_GARDEN && data->type != PKT_UNGARDEN)
-		return PLUGIN_RET_OK;
+	if (strcmp(data->argv[0], "garden") && strcmp(data->argv[0], "ungarden"))
+		return PLUGIN_RET_OK; // not for us
 
-	if (!data->data && data->data_length)
-		return PLUGIN_RET_OK;
+	if (!iam_master)
+		return PLUGIN_RET_NOTMASTER;
 
-	session = atoi((char*)(data->data));
-	if (!session)
-		return PLUGIN_RET_OK;
+	flag = data->argv[0][0] != 'u';
 
-	data->send_response = 1;
-	s = p->get_session_by_id(session);
-	if (!s || !s->ip)
+	if (data->argc != 2)
 	{
-		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;
+	    	data->response = NSCTL_RES_ERR;
+		data->additional = "one argument required: username or session id";
+		return PLUGIN_RET_STOP;
+	}
 
-		p->_log(3, 0, 0, 0, "Unknown session %d\n", session);
+	if (!(session = strtol(data->argv[1], &end, 10)) || *end)
+	{
+		if (flag)
+			session = p->get_session_by_username(data->argv[1]);
+		else
+			session = 0; // can't ungarden by username
+	}
+
+	if (session)
+		s = p->get_session_by_id(session);
+
+	if (!s || !s->ip)
+	{
+		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);
+	p->session_changed(session);
+
+	data->response = NSCTL_RES_OK;
+	data->additional = 0;
+
 	return PLUGIN_RET_STOP;
 }
 
@@ -125,7 +147,7 @@ int plugin_become_master(void)
 
 	for (i = 0; up_commands[i] && *up_commands[i]; i++)
 	{
-		p->_log(3, 0, 0, 0, "Running %s\n", up_commands[i]);
+		p->log(3, 0, 0, 0, "Running %s\n", up_commands[i]);
 		system(up_commands[i]);
 	}
 
@@ -133,10 +155,13 @@ int plugin_become_master(void)
 }
 
 // Called for each active session after becoming master
-int plugin_new_session_master(sessiont * s)
+int plugin_new_session_master(sessiont *s)
 {	
 	if (s->walled_garden)
+	{
+		s->walled_garden = 0;
 		garden_session(s, 1);
+	}
 
 	return PLUGIN_RET_OK;
 }
@@ -150,9 +175,9 @@ 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)));
+		p->log(2, 0, 0, s->tunnel, "Garden user %s (%s)\n", s->user, 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);
+		p->log(3, 0, 0, s->tunnel, "%s\n", cmd);
 		system(cmd);
 		s->walled_garden = 1;
 	}
@@ -162,7 +187,7 @@ int garden_session(sessiont *s, int flag)
 		int count = 40;
 
 		// Normal User
-		p->_log(2, 0, 0, s->tunnel, "Un-Garden user %s (%s)\n", s->user, p->inet_toa(htonl(s->ip)));
+		p->log(2, 0, 0, s->tunnel, "Un-Garden user %s (%s)\n", s->user, p->inet_toa(htonl(s->ip)));
 		// Kick off any duplicate usernames
 		// but make sure not to kick off ourself
 		if (s->ip && !s->die && (other = p->get_session_by_username(s->user)) && s != p->get_session_by_id(other)) {
@@ -173,7 +198,7 @@ int garden_session(sessiont *s, int flag)
 		s->pin = s->pout = 0;
 
 		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);
+		p->log(3, 0, 0, s->tunnel, "%s\n", cmd);
 		while (--count)
 		{
 			int status = system(cmd);
@@ -217,7 +242,7 @@ int plugin_init(struct pluginfuncs *funcs)
 		int i;
 		for (i = 0; down_commands[i] && *down_commands[i]; i++)
 		{
-			p->_log(3, 0, 0, 0, "Running %s\n", down_commands[i]);
+			p->log(3, 0, 0, 0, "Running %s\n", down_commands[i]);
 			system(down_commands[i]);
 		}
 	}
@@ -234,7 +259,7 @@ void plugin_done()
 
 	for (i = 0; down_commands[i] && *down_commands[i]; i++)
 	{
-		p->_log(3, 0, 0, 0, "Running %s\n", down_commands[i]);
+		p->log(3, 0, 0, 0, "Running %s\n", down_commands[i]);
 		system(down_commands[i]);
 	}
 }