merge cluster fixes from release_2_0 branch

[l2tpns.git] / garden.c

diff --git a/garden.c b/garden.c
index 9369013..b552ff2 100644 (file)
--- a/garden.c
+++ b/garden.c
@@ -9,7 +9,7 @@
 
 /* walled garden */
 
-char const *cvs_id = "$Id: garden.c,v 1.17 2004-11-29 02:17:17 bodea Exp $";
+char const *cvs_id = "$Id: garden.c,v 1.22 2005-05-07 08:17:25 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
@@ -23,7 +23,7 @@ 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=256000 >/dev/null",        // lots of entries
+       "sysctl -w net.ipv4.ip_conntrack_max=512000 >/dev/null",        // lots of entries
        NULL,
 };
 
@@ -40,7 +40,11 @@ char *down_commands[] = {
        NULL,
 };
 
-int garden_session(sessiont *s, int flag);
+#define F_UNGARDEN     0
+#define F_GARDEN       1
+#define F_CLEANUP      2
+
+int garden_session(sessiont *s, int flag, char *newuser);
 
 int plugin_post_auth(struct param_post_auth *data)
 {
@@ -59,7 +63,7 @@ int plugin_new_session(struct param_new_session *data)
                return PLUGIN_RET_OK;   // Slaves don't do walled garden processing.
 
        if (data->s->walled_garden)
-               garden_session(data->s, 1);
+               garden_session(data->s, F_GARDEN, 0);
 
        return PLUGIN_RET_OK;
 }
@@ -70,14 +74,14 @@ int plugin_kill_session(struct param_new_session *data)
                return PLUGIN_RET_OK;   // Slaves don't do walled garden processing.
 
        if (data->s->walled_garden)
-               garden_session(data->s, 0);
+               garden_session(data->s, F_CLEANUP, 0);
 
        return PLUGIN_RET_OK;
 }
 
 char *plugin_control_help[] = {
        "  garden USER|SID                             Put user into the walled garden",
-       "  ungarden SID                                Release session from garden",
+       "  ungarden SID [USER]                         Release session from garden",
        0
 };
 
@@ -97,12 +101,15 @@ int plugin_control(struct param_control *data)
        if (!iam_master)
                return PLUGIN_RET_NOTMASTER;
 
-       flag = data->argv[0][0] != 'u';
+       flag = data->argv[0][0] == 'g' ? F_GARDEN : F_UNGARDEN;
 
-       if (data->argc != 2)
+       if (data->argc < 2 || data->argc > 3 || (data->argc > 2 && flag == F_GARDEN))
        {
                data->response = NSCTL_RES_ERR;
-               data->additional = "one argument required: username or session id";
+               data->additional = flag == F_GARDEN
+                   ? "requires username or session id"
+                   : "requires session id and optional username";
+
                return PLUGIN_RET_STOP;
        }
 
@@ -131,7 +138,7 @@ int plugin_control(struct param_control *data)
                return PLUGIN_RET_STOP;
        }
 
-       garden_session(s, flag);
+       garden_session(s, flag, data->argc > 2 ? data->argv[2] : 0);
        p->session_changed(session);
 
        data->response = NSCTL_RES_OK;
@@ -158,15 +165,12 @@ int plugin_become_master(void)
 int plugin_new_session_master(sessiont *s)
 {      
        if (s->walled_garden)
-       {
-               s->walled_garden = 0;
-               garden_session(s, 1);
-       }
+               garden_session(s, F_GARDEN, 0);
 
        return PLUGIN_RET_OK;
 }
 
-int garden_session(sessiont *s, int flag)
+int garden_session(sessiont *s, int flag, char *newuser)
 {
        char cmd[2048];
        sessionidt sess;
@@ -175,7 +179,7 @@ int garden_session(sessiont *s, int flag)
        if (!s->opened) return 0;
 
        sess = p->get_id_by_session(s);
-       if (flag == 1)
+       if (flag == F_GARDEN)
        {
                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));
@@ -190,6 +194,12 @@ int garden_session(sessiont *s, int flag)
 
                // Normal User
                p->log(2, sess, s->tunnel, "Un-Garden user %s (%s)\n", s->user, p->fmtaddr(htonl(s->ip), 0));
+               if (newuser)
+               {
+                       snprintf(s->user, MAXUSER, "%s", newuser);
+                       p->log(2, sess, s->tunnel, "  Setting username to %s\n", s->user);
+               }
+
                // 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)) {
@@ -209,13 +219,14 @@ int garden_session(sessiont *s, int flag)
 
                s->walled_garden = 0;
 
-               if (!s->die) {
+               if (flag != F_CLEANUP)
+               {
                        /* OK, we're up! */
-                       u16 r = p->radiusnew(p->get_id_by_session(s));
-                       p->radiussend(r, RADIUSSTART);
+                       uint16_t r = p->radiusnew(p->get_id_by_session(s));
+                       if (r) p->radiussend(r, RADIUSSTART);
                }
        }
-       s->walled_garden = flag;
+
        return 1;
 }