Version 1.2.0

[l2tpns.git] / throttle.c

diff --git a/throttle.c b/throttle.c
index c642d3c..7244cfa 100644 (file)
--- a/throttle.c
+++ b/throttle.c
@@ -1,5 +1,5 @@
 // L2TPNS Throttle Stuff
-// $Id: throttle.c,v 1.1 2003/12/16 07:07:39 fred_nerk Exp $
+// $Id: throttle.c,v 1.3 2004/05/24 04:29:21 fred_nerk Exp $
 
 #include <stdio.h>
 #include <sys/file.h>
@@ -16,22 +16,16 @@
 #include "l2tpns.h"
 #include "util.h"
 
-extern char *radiussecret;
 extern radiust *radius;
 extern sessiont *session;
-extern ipt radiusserver[MAXRADSERVER]; // radius servers
 extern u32 sessionid;
-extern u8 radiusfree;
-extern int radfd;
-extern u8 numradiusservers;
-extern char debug;
-extern unsigned long rl_rate;
 extern tbft *filter_buckets;
+extern struct configt *config;
 
 // Throttle or Unthrottle a session
 int throttle_session(sessionidt s, int throttle)
 {
-       if (!rl_rate) return 0;
+       if (!config->rl_rate) return 0;
 
        if (!*session[s].user)
                return 0; // User not logged in
@@ -40,12 +34,22 @@ int throttle_session(sessionidt s, int throttle)
        {
                // Throttle them
                char cmd[2048] = {0};
-               log(2, 0, s, session[s].tunnel, "Throttling session %d for user %s\n", s, session[s].user);
                if (!session[s].tbf) session[s].tbf = rl_get_tbf();
-               snprintf(cmd, 2048, "iptables -t mangle -A throttle -d %s -j MARK --set-mark %d", inet_toa(ntohl(session[s].ip)),
+               if (!session[s].tbf)
+               {
+                       log(1, 0, s, session[s].tunnel, "Error creating a filtering bucket for user %s\n", session[s].user);
+                       return 0;
+               }
+               log(2, 0, s, session[s].tunnel, "Throttling session %d for user %s (bucket %s)\n", s, session[s].user, filter_buckets[session[s].tbf].handle);
+               snprintf(cmd, 2048, "iptables -t mangle -A throttle -d %s -j MARK --set-mark %d",
+                               inet_toa(ntohl(session[s].ip)),
                                session[s].tbf);
                log(4, 0, s, session[s].tunnel, "Running %s\n", cmd);
-               system(cmd);
+               if (WEXITSTATUS(system(cmd)) != 0)
+               {
+                       log(2, 0, s, session[s].tunnel, "iptables returned an error. Session is not throttled\n");
+                       return 0;
+               }
        }
        else
        {
@@ -68,6 +72,6 @@ int throttle_session(sessionidt s, int throttle)
                }
        }
        session[s].throttle = throttle;
-       return 0;
+       return session[s].throttle;
 }