- Don't use LOG() macro in initdata() until the config struct has been
[l2tpns.git] / l2tpns.c
index 7bc0d75..9999696 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.87 2005/03/10 06:16:05 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.92 2005/05/05 02:39:54 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -55,24 +55,23 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.87 2005/03/10 06:16:05 bodea Exp
 #endif /* BGP */
 
 // Globals
-configt *config = NULL;                // all configuration
-int tunfd = -1;                        // tun interface file handle. (network device)
-int udpfd = -1;                        // UDP file handle
-int controlfd = -1;            // Control signal handle
-int clifd = -1;                        // Socket listening for CLI connections.
-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
-int ifr6fd = -1;               // File descriptor for IPv6 routing, etc
-static int rand_fd = -1;       // Random data source
-time_t basetime = 0;           // base clock
-char hostname[1000] = "";      // us.
-static int tunidx;             // ifr_ifindex of tun device
-static uint32_t sessionid = 0; // session id for radius accounting
-static int syslog_log = 0;     // are we logging to syslog
-static FILE *log_stream = NULL;        // file handle for direct logging (i.e. direct into file, not via syslog).
-extern int cluster_sockfd;     // Intra-cluster communications socket.
-uint32_t last_id = 0;          // Last used PPP SID. Can I kill this?? -- mo
+configt *config = NULL;                        // all configuration
+int tunfd = -1;                                // tun interface file handle. (network device)
+int udpfd = -1;                                // UDP file handle
+int controlfd = -1;                    // Control signal handle
+int clifd = -1;                                // Socket listening for CLI connections.
+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
+int ifr6fd = -1;                       // File descriptor for IPv6 routing, etc
+static int rand_fd = -1;               // Random data source
+time_t basetime = 0;                   // base clock
+char hostname[1000] = "";              // us.
+static int tunidx;                     // ifr_ifindex of tun device
+static int syslog_log = 0;             // are we logging to syslog
+static FILE *log_stream = stderr;      // file handle for direct logging (i.e. direct into file, not via syslog).
+extern int cluster_sockfd;             // Intra-cluster communications socket.
+uint32_t last_id = 0;                  // Unique ID for radius accounting
 
 struct cli_session_actions *cli_session_actions = NULL;        // Pending session changes requested by CLI
 struct cli_tunnel_actions *cli_tunnel_actions = NULL;  // Pending tunnel changes required by CLI
@@ -1433,7 +1432,7 @@ static void filter_session(sessionidt s, int filter_in, int filter_out)
 }
 
 // start tidy shutdown of session
-void sessionshutdown(sessionidt s, char *reason, int result, int code)
+void sessionshutdown(sessionidt s, char *reason, int result, int error)
 {
        int walled_garden = session[s].walled_garden;
 
@@ -1453,7 +1452,7 @@ void sessionshutdown(sessionidt s, char *reason, int result, int code)
                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 
-       if (!walled_garden && !session[s].die)
+       if (session[s].ip && !walled_garden && !session[s].die)
        {
                // RADIUS Stop message
                uint16_t r = session[s].radius;
@@ -1556,7 +1555,7 @@ void sendipcp(tunnelidt t, sessionidt s)
        if (radius[r].try > 10)
        {
                radiusclear(r, s);      // Clear radius session.
-               sessionshutdown(s, "No reply on IPCP", 3, 0);
+               sessionshutdown(s, "No reply to IPCP.", 3, 0);
                return;
        }
 
@@ -2319,7 +2318,6 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                                }
 
                                                c = controlnew(11); // sending ICRP
-                                               session[s].id = sessionid++;
                                                session[s].opened = time_now;
                                                session[s].tunnel = t;
                                                session[s].far = asession;
@@ -2351,7 +2349,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        break;
                                case 14:      // CDN
                                        controlnull(t); // ack
-                                       sessionshutdown(s, "Closed (Received CDN)", 0, 0);
+                                       sessionshutdown(s, "Closed (Received CDN).", 0, 0);
                                        break;
                                case 0xFFFF:
                                        LOG(1, s, t, "Missing message type\n");
@@ -2638,13 +2636,13 @@ static int regular_cleanups(void)
                // Drop sessions who have not responded within IDLE_TIMEOUT seconds
                if (session[s].last_packet && (time_now - session[s].last_packet >= IDLE_TIMEOUT))
                {
-                       sessionshutdown(s, "No response to LCP ECHO requests", 3, 0);
+                       sessionshutdown(s, "No response to LCP ECHO requests.", 3, 0);
                        STAT(session_timeout);
                        if (++count >= MAX_ACTIONS) break;
                        continue;
                }
 
-               // No data in IDLE_TIMEOUT seconds, send LCP ECHO
+               // No data in ECHO_TIMEOUT seconds, send LCP ECHO
                if (session[s].user[0] && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
                {
                        uint8_t b[MAXCONTROL] = {0};
@@ -2672,7 +2670,7 @@ static int regular_cleanups(void)
                        if (a & CLI_SESS_KILL)
                        {
                                LOG(2, s, session[s].tunnel, "Dropping session by CLI\n");
-                               sessionshutdown(s, "Requested by administrator", 3, 0);
+                               sessionshutdown(s, "Requested by administrator.", 3, 0);
                                a = 0; // dead, no need to check for other actions
                        }
 
@@ -3143,16 +3141,12 @@ static void initdata(int optdebug, char *optconfig)
 {
        int i;
 
-       if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
-       {
-               LOG(0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
-               exit(1);
-       }
        if (!(config = shared_malloc(sizeof(configt))))
        {
-               LOG(0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
+               fprintf(stderr, "Error doing malloc for configuration: %s\n", strerror(errno));
                exit(1);
        }
+
        memset(config, 0, sizeof(configt));
        time(&config->start_time);
        strncpy(config->config_file, optconfig, strlen(optconfig));
@@ -3161,6 +3155,20 @@ static void initdata(int optdebug, char *optconfig)
        config->rl_rate = 28; // 28kbps
        strcpy(config->random_device, RANDOMDEVICE);
 
+#ifdef RINGBUFFER
+       if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
+       {
+               LOG(0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
+               exit(1);
+       }
+       memset(ringbuffer, 0, sizeof(struct Tringbuffer));
+#endif
+
+       if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
+       {
+               LOG(0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
+               exit(1);
+       }
        if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
        {
                LOG(0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
@@ -3197,15 +3205,6 @@ static void initdata(int optdebug, char *optconfig)
        }
        memset(ip_filters, 0, sizeof(ip_filtert) * MAXFILTER);
 
-#ifdef RINGBUFFER
-       if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
-       {
-               LOG(0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
-               exit(1);
-       }
-       memset(ringbuffer, 0, sizeof(struct Tringbuffer));
-#endif
-
        if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
        {
                LOG(0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
@@ -3773,9 +3772,11 @@ int main(int argc, char *argv[])
 
 static void sighup_handler(int sig)
 {
-       if (log_stream && log_stream != stderr)
+       if (log_stream)
        {
-               fclose(log_stream);
+               if (log_stream != stderr)
+                       fclose(log_stream);
+
                log_stream = NULL;
        }
 
@@ -3897,7 +3898,9 @@ static void update_config()
        syslog_log = 0;
        if (log_stream)
        {
-               fclose(log_stream);
+               if (log_stream != stderr)
+                       fclose(log_stream);
+
                log_stream = NULL;
        }
 
@@ -4115,7 +4118,7 @@ int sessionsetup(tunnelidt t, sessionidt s)
                if (!session[s].ip)
                {
                        LOG(0, s, t, "   No IP allocated.  The IP address pool is FULL!\n");
-                       sessionshutdown(s, "No IP addresses available", 2, 7);
+                       sessionshutdown(s, "No IP addresses available.", 2, 7);
                        return 0;
                }
                LOG(3, s, t, "   No IP allocated.  Assigned %s from pool\n",