X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/284e4dd54692c4c246e58bb4c0aeff4432f872fa..87f85beba5bcd8e732609535896e7e909f3fd081:/garden.c

diff --git a/garden.c b/garden.c
index b0abf21..92320a7 100644
--- a/garden.c
+++ b/garden.c
@@ -7,9 +7,11 @@
 #include "plugin.h"
 #include "control.h"
 
-char const *cvs_id = "$Id: garden.c,v 1.9 2004-11-03 13:23:58 bodea Exp $";
+/* walled garden */
 
-int __plugin_api_version = 1;
+char const *cvs_id = "$Id: garden.c,v 1.12 2004-11-09 08:05:02 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!
@@ -45,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;
@@ -100,7 +102,7 @@ int plugin_control(struct param_control *data)
 		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);
+		p->log(3, 0, 0, 0, "Unknown session %d\n", session);
 		return PLUGIN_RET_STOP;
 	}
 	*(short *)(data->response + 2) = ntohs(PKT_RESP_OK);
@@ -123,7 +125,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]);
 	}
 
@@ -148,9 +150,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;
 	}
@@ -160,7 +162,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)) {
@@ -171,7 +173,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);
@@ -215,7 +217,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]);
 		}
 	}
@@ -232,7 +234,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]);
 	}
 }