fix late night typos

diff --git a/garden.c b/garden.c
index ca41d14..fc9dc8f 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.14 2004-11-17 15:08:19 bodea Exp $";
+char const *cvs_id = "$Id: garden.c,v 1.15 2004-11-18 05:44:36 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,15 +76,15 @@ 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 from garden",
+       "  garden USER|SID                             Put user into the walled garden",
+       "  ungarden USER|SID                           Release user from garden",

        0
 };
 
 int plugin_control(struct param_control *data)
 {
        0
 };
 
 int plugin_control(struct param_control *data)
 {

-       sessionidt s;
-       sessiont *sess = 0;
+       sessionidt session;
+       sessiont *s = 0;

        int flag;
        char *end;
 
        int flag;
        char *end;
 


@@ -111,7 +111,12 @@ int plugin_control(struct param_control *data)
        }
 
        if (!(session = strtol(data->argv[1], &end, 10)) || *end)
        }
 
        if (!(session = strtol(data->argv[1], &end, 10)) || *end)

-               session = p->get_session_by_username(data->argv[1]);
+       {
+               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);


@@ -131,7 +136,7 @@ int plugin_control(struct param_control *data)
        }
 
        garden_session(s, flag);
        }
 
        garden_session(s, flag);

-       p->sesssion_changed(session);
+       p->session_changed(session);

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

diff --git a/snoopctl.c b/snoopctl.c
index 3d7e120..fb39f5f 100644 (file)
--- a/snoopctl.c
+++ b/snoopctl.c
@@ -5,7 +5,7 @@
 
 /* snoop control */
 
 
 /* snoop control */
 

-char const *cvs_id = "$Id: snoopctl.c,v 1.1 2004-11-17 15:08:19 bodea Exp $";
+char const *cvs_id = "$Id: snoopctl.c,v 1.2 2004-11-18 05:44:36 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;


@@ -129,7 +129,7 @@ int plugin_control(struct param_control *data)
                s->snoop_port = 0;
        }
 
                s->snoop_port = 0;
        }
 

-       p->sesssion_changed(session);
+       p->session_changed(session);

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

diff --git a/throttlectl.c b/throttlectl.c
index cf6508e..f9c3d1d 100644 (file)
--- a/throttlectl.c
+++ b/throttlectl.c
@@ -5,7 +5,7 @@
 
 /* throttle control */
 
 
 /* throttle control */
 

-char const *cvs_id = "$Id: throttlectl.c,v 1.1 2004-11-17 15:08:19 bodea Exp $";
+char const *cvs_id = "$Id: throttlectl.c,v 1.2 2004-11-18 05:44:36 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;


@@ -110,11 +110,11 @@ int plugin_control(struct param_control *data)
                                int len = strlen(data->argv[i]);
                                if (!strncmp(data->argv[i], "in", len))
                                {
                                int len = strlen(data->argv[i]);
                                if (!strncmp(data->argv[i], "in", len))
                                {

-                                       rate_in = atoi(argv[i+1]);
+                                       rate_in = atoi(data->argv[i+1]);

                                }
                                else if (!strncmp(data->argv[i], "out", len))
                                {
                                }
                                else if (!strncmp(data->argv[i], "out", len))
                                {

-                                       rate_out = atoi(argv[i+1]);
+                                       rate_out = atoi(data->argv[i+1]);

                                }
                                else
                                {
                                }
                                else
                                {


@@ -142,7 +142,7 @@ int plugin_control(struct param_control *data)
        }
 
        p->throttle(session, rate_in, rate_out);
        }
 
        p->throttle(session, rate_in, rate_out);

-       p->sesssion_changed(session);
+       p->session_changed(session);

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