unused

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 2b31b81..5c84a4f 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
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.29 2004/09/23 03:59:09 fred_nerk Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.33 2004/10/28 03:58:38 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -57,7 +57,7 @@ int snoopfd = -1;             // UDP file handle for sending out intercept data
 int *radfds = NULL;            // RADIUS requests file handles
 int ifrfd = -1;                        // File descriptor for routing, etc
 time_t basetime = 0;           // base clock
-char *hostname = NULL;         // us.
+char hostname[1000] = "";      // us.
 int tunidx;                    // ifr_ifindex of tun device
 u32 sessionid = 0;             // session id for radius accounting
 int syslog_log = 0;            // are we logging to syslog
@@ -95,7 +95,6 @@ struct config_descriptt config_values[] = {
        CONFIG("debug", debug, INT),
        CONFIG("log_file", log_filename, STRING),
        CONFIG("pid_file", pid_file, STRING),
-       CONFIG("hostname", hostname, STRING),
        CONFIG("l2tp_secret", l2tpsecret, STRING),
        CONFIG("primary_dns", default_dns1, IP),
        CONFIG("secondary_dns", default_dns2, IP),
@@ -2180,6 +2179,7 @@ int regular_cleanups(void)
                        if (++count >= MAX_ACTIONS) break;
                }
        }
+
        if (*config->accounting_dir && next_acct <= TIME)
        {
                // Dump accounting data
@@ -2360,14 +2360,17 @@ void mainloop(void)
                        for (i = 0; i < config->num_radfds; i++)
                                if (FD_ISSET(radfds[i], &r))
                                        processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
+
                        if (FD_ISSET(cluster_sockfd, &r))
                        {
                                int size;
                                size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
                                processcluster(buf, size, addr.sin_addr.s_addr);
                        }
+
                        if (FD_ISSET(controlfd, &r))
                                processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
+
                        if (FD_ISSET(clifd, &r))
                        {
                                struct sockaddr_in addr;
@@ -2458,10 +2461,9 @@ void mainloop(void)
 }
 
 // Init data structures
-void initdata(void)
+void initdata(int optdebug, char *optconfig)
 {
        int i;
-       char *p;
 
        if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
        {
@@ -2475,7 +2477,8 @@ void initdata(void)
        }
        memset(config, 0, sizeof(struct configt));
        time(&config->start_time);
-       strncpy(config->config_file, CONFIGFILE, sizeof(config->config_file) - 1);
+       config->debug = optdebug;
+       strncpy(config->config_file, optconfig, strlen(optconfig));
        if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
        {
                log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
@@ -2546,10 +2549,13 @@ void initdata(void)
        for (i = 1; i < MAXTUNNEL- 1; i++)
                tunnel[i].state = TUNNELUNDEF;  // mark it as not filled in.
 
-       // Grab my hostname unless it's been specified
-       gethostname(config->hostname, sizeof(config->hostname));
-       if ((p = strchr(config->hostname, '.'))) *p = 0;
-       hostname = config->hostname;
+       if (!*hostname)
+       {
+               char *p;
+               // Grab my hostname unless it's been specified
+               gethostname(hostname, sizeof(hostname));
+               if ((p = strchr(hostname, '.'))) *p = 0;
+       }
 
        _statistics->start_time = _statistics->last_reset = time(NULL);
 
@@ -2906,13 +2912,14 @@ int main(int argc, char *argv[])
 {
        int o;
        int optdebug = 0;
+       char *optconfig = CONFIGFILE;
 
        _program_name = strdup(argv[0]);
 
        time(&basetime);             // start clock
 
        // scan args
-       while ((o = getopt(argc, argv, "vc:h:a:")) >= 0)
+       while ((o = getopt(argc, argv, "dvc:h:")) >= 0)
        {
                switch (o)
                {
@@ -2924,10 +2931,12 @@ int main(int argc, char *argv[])
                        case 'v':
                                optdebug++;
                                break;
+                       case 'c':
+                               optconfig = optarg;
+                               break;
                        case 'h':
                                snprintf(hostname, sizeof(hostname), "%s", optarg);
                                break;
-                       case '?':
                        default:
                                printf("Args are:\n"
                                       "\t-d\tDetach from terminal\n"
@@ -2949,12 +2958,10 @@ int main(int argc, char *argv[])
 
        initiptables();
        initplugins();
-       initdata();
-
-       config->debug = optdebug;
+       initdata(optdebug, optconfig);
 
        init_tbf();
-       init_cli();
+       init_cli(hostname);
        read_config_file();
 
        log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
@@ -3526,7 +3533,6 @@ int sessionsetup(tunnelidt t, sessionidt s)
 
        CSTAT(call_sessionsetup);
 
-
        log(3, session[s].ip, s, t, "Doing session setup for session\n");
 
        if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
@@ -3536,7 +3542,11 @@ int sessionsetup(tunnelidt t, sessionidt s)
                        log(3, 0, s, t, "   No IP allocated. Assigned %s from pool\n",
                                        inet_toa(htonl(session[s].ip)));
                else
+               {
                        log(0, 0, s, t, "   No IP allocated. The IP address pool is FULL!\n");
+                       sessionshutdown(s, "No IP addresses available");
+                       return 0;
+               }
        }