Fix service_name management and add pppoe_only_equal_svc_name parameter

[l2tpns.git] / sessionctl.c

diff --git a/sessionctl.c b/sessionctl.c
index 0aae1c9..805b794 100644 (file)
--- a/sessionctl.c
+++ b/sessionctl.c
@@ -5,10 +5,8 @@
 
 /* session control */
 
-char const *cvs_id = "$Id: sessionctl.c,v 1.3 2005-06-28 14:48:28 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
-static struct pluginfuncs *p = 0;
+static struct pluginfuncs *f = 0;
 
 char *plugin_control_help[] = {
     "  drop USER|SID [REASON]                      Shutdown user session",
@@ -40,10 +38,10 @@ int plugin_control(struct param_control *data)
     }
 
     if (!(session = strtol(data->argv[1], &end, 10)) || *end)
-       session = p->get_session_by_username(data->argv[1]);
+       session = f->get_session_by_username(data->argv[1]);
 
     if (session)
-       s = p->get_session_by_id(session);
+       s = f->get_session_by_id(session);
 
     if (!s || !s->ip)
     {
@@ -58,9 +56,9 @@ int plugin_control(struct param_control *data)
        reason = "Requested by administrator.";
 
     if (data->argv[0][0] == 'd')
-       p->sessionshutdown(session, reason, 3, 0);
+       f->sessionshutdown(session, reason, CDN_ADMIN_DISC, TERM_ADMIN_RESET);
     else
-       p->sessionkill(session, reason);
+       f->sessionkill(session, reason);
 
     data->response = NSCTL_RES_OK;
     data->additional = 0;
@@ -70,5 +68,5 @@ int plugin_control(struct param_control *data)
 
 int plugin_init(struct pluginfuncs *funcs)
 {
-       return ((p = funcs)) ? 1 : 0;
+    return ((f = funcs)) ? 1 : 0;
 }