allow - in filter names; include in "show session" output

[l2tpns.git] / garden.c

diff --git a/garden.c b/garden.c
index 2396ffd..059a001 100644 (file)
--- a/garden.c
+++ b/garden.c
@@ -9,7 +9,7 @@
 
 /* walled garden */
 
 
 /* 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.16 2004/11/18 06:41:03 bodea Exp $";

 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;


@@ -76,8 +76,8 @@ int plugin_kill_session(struct param_new_session *data)
 }
 
 char *plugin_control_help[] = {
 }
 
 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
 };
 
        0
 };
 


@@ -88,17 +88,16 @@ int plugin_control(struct param_control *data)
        int flag;
        char *end;
 
        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
 
                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)
        {
 
        if (data->argc != 2)
        {


@@ -107,8 +106,13 @@ int plugin_control(struct param_control *data)
                return PLUGIN_RET_STOP;
        }
 
                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);
 
        if (session)
                s = p->get_session_by_id(session);


@@ -128,6 +132,8 @@ int plugin_control(struct param_control *data)
        }
 
        garden_session(s, flag);
        }
 
        garden_session(s, flag);

+       p->session_changed(session);
+

        data->response = NSCTL_RES_OK;
        data->additional = 0;
 
        data->response = NSCTL_RES_OK;
        data->additional = 0;
 


@@ -149,7 +155,7 @@ int plugin_become_master(void)
 }
 
 // Called for each active session after becoming master
 }
 
 // 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)
        {
 {      
        if (s->walled_garden)
        {