merge

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 84b79f6..dfa88f8 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 

-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.32 2004/10/28 03:31:39 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.36 2004/10/30 07:17:41 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -101,13 +101,14 @@ struct config_descriptt config_values[] = {
        CONFIG("save_state", save_state, BOOL),
        CONFIG("primary_radius", radiusserver[0], IP),
        CONFIG("secondary_radius", radiusserver[1], IP),
        CONFIG("save_state", save_state, BOOL),
        CONFIG("primary_radius", radiusserver[0], IP),
        CONFIG("secondary_radius", radiusserver[1], IP),

-       CONFIG("primary_radius_port",radiusport[0], SHORT),
-       CONFIG("secondary_radius_port",radiusport[1], SHORT),
+       CONFIG("primary_radius_port", radiusport[0], SHORT),
+       CONFIG("secondary_radius_port", radiusport[1], SHORT),

        CONFIG("radius_accounting", radius_accounting, BOOL),
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("bind_address", bind_address, IP),
        CONFIG("send_garp", send_garp, BOOL),
        CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
        CONFIG("radius_accounting", radius_accounting, BOOL),
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("bind_address", bind_address, IP),
        CONFIG("send_garp", send_garp, BOOL),
        CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),

+       CONFIG("throttle_buckets", num_tbfs, INT),

        CONFIG("accounting_dir", accounting_dir, STRING),
        CONFIG("setuid", target_uid, INT),
        CONFIG("dump_speed", dump_speed, BOOL),
        CONFIG("accounting_dir", accounting_dir, STRING),
        CONFIG("setuid", target_uid, INT),
        CONFIG("dump_speed", dump_speed, BOOL),


@@ -2220,8 +2221,8 @@ int still_busy(void)
                return 1;
        }
 
                return 1;
        }
 

-       // We stop waiting for radius after BUSY_WAIT_TIMEOUT 1/10th seconds
-       if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIMEOUT)
+       // We stop waiting for radius after BUSY_WAIT_TIME 1/10th seconds
+       if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIME)

        {
                log(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
                return 0;
        {
                log(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
                return 0;


@@ -2464,7 +2465,6 @@ void mainloop(void)
 void initdata(int optdebug, char *optconfig)
 {
        int i;
 void initdata(int optdebug, char *optconfig)
 {
        int i;

-       char *p;

 
        if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
        {
 
        if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
        {


@@ -2478,8 +2478,11 @@ void initdata(int optdebug, char *optconfig)
        }
        memset(config, 0, sizeof(struct configt));
        time(&config->start_time);
        }
        memset(config, 0, sizeof(struct configt));
        time(&config->start_time);

-       config->debug = optdebug;

        strncpy(config->config_file, optconfig, strlen(optconfig));
        strncpy(config->config_file, optconfig, strlen(optconfig));

+       config->debug = optdebug;
+       config->num_tbfs = MAXTBFS;
+       config->rl_rate = 28; // 28kbps
+

        if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
        {
                log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
        if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
        {
                log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));


@@ -2961,9 +2964,9 @@ int main(int argc, char *argv[])
        initplugins();
        initdata(optdebug, optconfig);
 
        initplugins();
        initdata(optdebug, optconfig);
 

-       init_tbf();

        init_cli(hostname);
        read_config_file();
        init_cli(hostname);
        read_config_file();

+       init_tbf(config->num_tbfs);

 
        log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
        log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
 
        log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
        log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");