oops

[l2tpns.git] / garden.c

diff --git a/garden.c b/garden.c
index 2396ffd..e6843bc 100644 (file)
--- a/garden.c
+++ b/garden.c
@@ -9,7 +9,7 @@
 
 /* walled garden */
 
-char const *cvs_id = "$Id: garden.c,v 1.13 2004/11/17 08:23:34 bodea Exp $";
+char const *cvs_id = "$Id: garden.c,v 1.17 2004/11/29 02:17:17 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
@@ -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, p->get_id_by_session(data->s), data->s->tunnel, "Walled Garden allowing login\n");
        data->auth_allowed = 1;
        data->s->walled_garden = 1;
        return PLUGIN_RET_OK;
@@ -76,8 +76,8 @@ int plugin_kill_session(struct param_new_session *data)
 }
 
 char *plugin_control_help[] = {
-       "  garden USER|SID       Put user into the walled garden",
-       "  ungarden USER|SID     Release user",
+       "  garden USER|SID                             Put user into the walled garden",
+       "  ungarden SID                                Release session from garden",
        0
 };
 
@@ -88,17 +88,16 @@ int plugin_control(struct param_control *data)
        int flag;
        char *end;
 
-       if (data->argc < 1 || (strcmp(data->argv[0], "garden") && strcmp(data->argv[0], "ungarden")))
+       if (data->argc < 1)
+               return PLUGIN_RET_OK;
+
+       if (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)
+               return PLUGIN_RET_NOTMASTER;
 
-       if (!iam_master)        // All garden processing happens on the master.
-       {
-               data->response = NSCTL_RES_ERR;
-               data->additional = "must be run on the cluster master";
-               return PLUGIN_RET_STOP;
-       }
+       flag = data->argv[0][0] != 'u';
 
        if (data->argc != 2)
        {
@@ -107,8 +106,13 @@ int plugin_control(struct param_control *data)
                return PLUGIN_RET_STOP;
        }
 
-       if (!(session = strtol(data->argv[0], &end, 10)) || *end)
-               session = p->get_session_by_username(data->argv[0]);
+       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);
@@ -128,6 +132,8 @@ int plugin_control(struct param_control *data)
        }
 
        garden_session(s, flag);
+       p->session_changed(session);
+
        data->response = NSCTL_RES_OK;
        data->additional = 0;
 
@@ -141,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, "Running %s\n", up_commands[i]);
                system(up_commands[i]);
        }
 
@@ -149,7 +155,7 @@ 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)
        {
@@ -163,15 +169,17 @@ int plugin_new_session_master(sessiont * s)
 int garden_session(sessiont *s, int flag)
 {
        char cmd[2048];
+       sessionidt sess;
 
        if (!s) return 0;
        if (!s->opened) return 0;
 
+       sess = p->get_id_by_session(s);
        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, 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(2, sess, s->tunnel, "Garden user %s (%s)\n", s->user, p->fmtaddr(htonl(s->ip), 0));
+               snprintf(cmd, sizeof(cmd), "iptables -t nat -A garden_users -s %s -j garden", p->fmtaddr(htonl(s->ip), 0));
+               p->log(3, sess, s->tunnel, "%s\n", cmd);
                system(cmd);
                s->walled_garden = 1;
        }
@@ -181,7 +189,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, sess, s->tunnel, "Un-Garden user %s (%s)\n", s->user, p->fmtaddr(htonl(s->ip), 0));
                // 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)) {
@@ -191,8 +199,8 @@ int garden_session(sessiont *s, int flag)
                s->cin = s->cout = 0;
                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);
+               snprintf(cmd, sizeof(cmd), "iptables -t nat -D garden_users -s %s -j garden", p->fmtaddr(htonl(s->ip), 0));
+               p->log(3, sess, s->tunnel, "%s\n", cmd);
                while (--count)
                {
                        int status = system(cmd);
@@ -236,7 +244,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, "Running %s\n", down_commands[i]);
                        system(down_commands[i]);
                }
        }
@@ -253,7 +261,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, "Running %s\n", down_commands[i]);
                system(down_commands[i]);
        }
 }