Update .last_packet in cluster_handle_bytes only when there have

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 10ab3a5..fdaba0c 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.89 2005/04/01 06:39:00 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.91 2005/04/27 13:53:15 bodea Exp $";

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


@@ -68,11 +68,10 @@ 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
 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.
 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
+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
 
 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


@@ -1556,7 +1555,7 @@ void sendipcp(tunnelidt t, sessionidt s)
        if (radius[r].try > 10)
        {
                radiusclear(r, s);      // Clear radius session.
        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;
        }
 
                return;
        }
 


@@ -2319,7 +2318,6 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                                }
 
                                                c = controlnew(11); // sending ICRP
                                                }
 
                                                c = controlnew(11); // sending ICRP

-                                               session[s].id = sessionid++;

                                                session[s].opened = time_now;
                                                session[s].tunnel = t;
                                                session[s].far = asession;
                                                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
                                        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");
                                        break;
                                case 0xFFFF:
                                        LOG(1, s, t, "Missing message type\n");


@@ -2638,7 +2636,7 @@ 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))
                {
                // 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;
                        STAT(session_timeout);
                        if (++count >= MAX_ACTIONS) break;
                        continue;


@@ -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");
                        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
                        }
 
                                a = 0; // dead, no need to check for other actions
                        }
 


@@ -4115,7 +4113,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");
                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",
                        return 0;
                }
                LOG(3, s, t, "   No IP allocated.  Assigned %s from pool\n",