merge

[l2tpns.git] / autosnoop.c

diff --git a/autosnoop.c b/autosnoop.c
index 1c27190..7ab4321 100644 (file)
--- a/autosnoop.c
+++ b/autosnoop.c
@@ -8,21 +8,27 @@
 #include "control.h"
 
 int __plugin_api_version = 1;
-struct pluginfuncs p;
+struct pluginfuncs *p;
 
 int plugin_radius_response(struct param_radius_response *data)
 {
        if (strcmp(data->key, "intercept") == 0)
        {
-               if (strcmp(data->value, "yes") == 0)
+               char *x;
+               data->s->snoop_ip = 0;
+               data->s->snoop_port = 0;
+               if ((x = strchr(data->value, ':')))
                {
-                       p.log(3, 0, 0, 0, "         Intercepting user\n");
-                       data->s->snoop = 1;
+                       *x++ = 0;
+                       if (*data->value) data->s->snoop_ip = inet_addr(data->value);
+                       if (data->s->snoop_ip == INADDR_NONE) data->s->snoop_ip = 0;
+                       if (*x) data->s->snoop_port = atoi(x);
+                       p->log(3, 0, 0, 0, "         Intercepting user to %s:%d\n",
+                               p->inet_toa(data->s->snoop_ip), data->s->snoop_port);
                }
-               else if (strcmp(data->value, "no") == 0)
+               else
                {
-                       p.log(3, 0, 0, 0, "         Not intercepting user\n");
-                       data->s->snoop = 0;
+                       p->log(3, 0, 0, 0, "         Not Intercepting user (reply string should be snoop=ip:port)\n");
                }
        }
        return PLUGIN_RET_OK;
@@ -30,10 +36,7 @@ int plugin_radius_response(struct param_radius_response *data)
 
 int plugin_init(struct pluginfuncs *funcs)
 {
-       if (!funcs) return 0;
-       memcpy(&p, funcs, sizeof(p));
-
-       return 1;
+       return ((p = funcs)) ? 1 : 0;
 }
 
 void plugin_done()