pass cluster master state to plugin_control functions

[l2tpns.git] / throttlectl.c

diff --git a/throttlectl.c b/throttlectl.c
index cf6508e..9e0ca34 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.3 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;


@@ -16,8 +16,6 @@ char *plugin_control_help[] = {
        0
 };
 
        0
 };
 

-static int iam_master = 0;
-

 int plugin_init(struct pluginfuncs *funcs)
 {
        if (!funcs)
 int plugin_init(struct pluginfuncs *funcs)
 {
        if (!funcs)


@@ -27,12 +25,6 @@ int plugin_init(struct pluginfuncs *funcs)
        return 1;
 }
 
        return 1;
 }
 

-int plugin_become_master(void)
-{
-       iam_master = 1;
-       return PLUGIN_RET_OK;
-}
-

 int plugin_control(struct param_control *data)
 {
        sessionidt session;
 int plugin_control(struct param_control *data)
 {
        sessionidt session;


@@ -49,14 +41,10 @@ int plugin_control(struct param_control *data)
            && strcmp(data->argv[0], "unthrottle"))
                return PLUGIN_RET_OK; // not for us
 
            && strcmp(data->argv[0], "unthrottle"))
                return PLUGIN_RET_OK; // not for us
 

-       flag = data->argv[0][0] != 'g';
+       if (!data->iam_master)
+               return PLUGIN_RET_NOTMASTER;

 
 

-       if (!iam_master)
-       {
-               data->response = NSCTL_RES_ERR;
-               data->additional = "must be run on the cluster master";
-               return PLUGIN_RET_STOP;
-       }
+       flag = data->argv[0][0] != 'g';

 
        if (flag)
        {
 
        if (flag)
        {


@@ -110,11 +98,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 +130,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;