Fix logging parameter errors

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 7e591ce..b988c7f 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -417,7 +417,7 @@ sessionidt sessionbyuser(char *username)
 #ifdef STAT_CALLS
        STAT(call_sessionbyuser);
 #endif
 #ifdef STAT_CALLS
        STAT(call_sessionbyuser);
 #endif

-       for (s = 1; s < MAXSESSION && (session[s].servicenet || strncmp(session[s].user, username, 128)); s++);
+       for (s = 1; s < MAXSESSION && (session[s].walled_garden || strncmp(session[s].user, username, 128)); s++);

        if (s < MAXSESSION)
                return s;
        return 0;
        if (s < MAXSESSION)
                return s;
        return 0;


@@ -770,7 +770,7 @@ void controladd(controlt * c, tunnelidt t, sessionidt s)
 void sessionshutdown(sessionidt s, char *reason)
 {
        int dead = session[s].die;
 void sessionshutdown(sessionidt s, char *reason)
 {
        int dead = session[s].die;

-       int servicenet = session[s].servicenet;
+       int walled_garden = session[s].walled_garden;

 
 #ifdef STAT_CALLS
        STAT(call_sessionshutdown);
 
 #ifdef STAT_CALLS
        STAT(call_sessionshutdown);


@@ -789,7 +789,7 @@ void sessionshutdown(sessionidt s, char *reason)
        }
 
        // RADIUS Stop message
        }
 
        // RADIUS Stop message

-       if (session[s].opened && !servicenet && !dead) {
+       if (session[s].opened && !walled_garden && !dead) {

                u8 r = session[s].radius;
                if (!r)
                {
                u8 r = session[s].radius;
                if (!r)
                {


@@ -1970,7 +1970,7 @@ int assign_ip_address(sessionidt s)
                if (!ip_address_pool[i].address || ip_address_pool[i].assigned)
                        continue;
 
                if (!ip_address_pool[i].address || ip_address_pool[i].assigned)
                        continue;
 

-               if (!session[s].servicenet && ip_address_pool[i].user[0] && !strcmp(u, ip_address_pool[i].user))
+               if (!session[s].walled_garden && ip_address_pool[i].user[0] && !strcmp(u, ip_address_pool[i].user))

                {
                        best = i;
                        reuse = 1;
                {
                        best = i;
                        reuse = 1;


@@ -1995,7 +1995,7 @@ int assign_ip_address(sessionidt s)
        session[s].ip_pool_index = best;
        ip_address_pool[best].assigned = 1;
        ip_address_pool[best].last = time_now;
        session[s].ip_pool_index = best;
        ip_address_pool[best].assigned = 1;
        ip_address_pool[best].last = time_now;

-       if (session[s].servicenet)
+       if (session[s].walled_garden)

                /* Don't track addresses of users in walled garden (note: this
                   means that their address isn't "sticky" even if they get
                   un-gardened). */
                /* Don't track addresses of users in walled garden (note: this
                   means that their address isn't "sticky" even if they get
                   un-gardened). */


@@ -2145,7 +2145,7 @@ void dump_acct_info()
 
     for (i = 0; i < MAXSESSION; i++)
     {
 
     for (i = 0; i < MAXSESSION; i++)
     {

-       if (!session[i].opened || !session[i].cin || !session[i].cout || !*session[i].user || session[i].servicenet)
+       if (!session[i].opened || !session[i].cin || !session[i].cout || !*session[i].user || session[i].walled_garden)

                continue;
        if (!f)
        {
                continue;
        if (!f)
        {


@@ -2199,8 +2199,9 @@ int main(int argc, char *argv[])
        }
 
        time(&basetime);             // start clock
        }
 
        time(&basetime);             // start clock

-       // scan args
+       initdata();

 
 

+       // scan args

        while ((o = getopt(argc, argv, "vc:h:a:")) >= 0)
        {
                switch (o)
        while ((o = getopt(argc, argv, "vc:h:a:")) >= 0)
        {
                switch (o)


@@ -2237,10 +2238,10 @@ int main(int argc, char *argv[])
 
        initiptables();
        initplugins();
 
        initiptables();
        initplugins();

-       initdata();

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

-       log(0, 0, 0, 0, "$Id: l2tpns.c,v 1.2 2004-03-05 00:09:03 fred_nerk Exp $\n(c) Copyright 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
+       log(1, 0, 0, 0, "L2TPNS Version 1.1.0 - http://l2tpns.sourceforge.net/\n");
+       log(1, 0, 0, 0, "Licensed under the GPL\n");

 
        /* Start up the cluster first, so that we don't have two machines with
         * the same IP at once.
 
        /* Start up the cluster first, so that we don't have two machines with
         * the same IP at once.


@@ -2700,7 +2701,7 @@ int sessionsetup(tunnelidt t, sessionidt s, u8 routes)
        {
                if (i == s) continue;
                if (ip == session[i].ip) sessionkill(i, "Duplicate IP address");
        {
                if (i == s) continue;
                if (ip == session[i].ip) sessionkill(i, "Duplicate IP address");

-               if (!session[s].servicenet && !session[i].servicenet && strcasecmp(user, session[i].user) == 0)
+               if (!session[s].walled_garden && !session[i].walled_garden && strcasecmp(user, session[i].user) == 0)

                        sessionkill(i, "Duplicate session for user");
        }
 
                        sessionkill(i, "Duplicate session for user");
        }