include Acct-Session-Time in interim records

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 3681744..2bf86bf 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.40 2004-11-28 20:10:04 bodea Exp $
+// $Id: l2tpns.h,v 1.81 2005-07-31 10:04:10 bodea Exp $

 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__


@@ -15,16 +15,17 @@
 #include <sys/types.h>
 #include <libcli.h>
 
 #include <sys/types.h>
 #include <libcli.h>
 

-#define VERSION        "2.0.9"
+#define VERSION        "2.1.2"

 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535

-#define MAXSESSION     50000           // could be up to 65535
+#define MAXSESSION     60000           // could be up to 65535

 #define MAXTBFS                6000            // Maximum token bucket filters. Might need up to 2 * session.
 
 #define MAXTBFS                6000            // Maximum token bucket filters. Might need up to 2 * session.
 

-#define RADIUS_SHIFT   5
-#define RADIUS_MASK    ((unsigned short)(((unsigned short)~0) >> (16 - RADIUS_SHIFT)))
-#define        MAXRADIUS       ((unsigned long)(1L << RADIUS_SHIFT) * 255)
+#define RADIUS_SHIFT   6
+#define        RADIUS_FDS      (1 << RADIUS_SHIFT)
+#define RADIUS_MASK    ((1 << RADIUS_SHIFT) - 1)
+#define MAXRADIUS      (1 << (8 + RADIUS_SHIFT))

 
 #define T_UNDEF                (0xffff)        // A tunnel ID that won't ever be used. Mark session as undefined.
 #define T_FREE         (0)             // A tunnel ID that won't ever be used. Mark session as free.
 
 #define T_UNDEF                (0xffff)        // A tunnel ID that won't ever be used. Mark session as undefined.
 #define T_FREE         (0)             // A tunnel ID that won't ever be used. Mark session as free.


@@ -32,6 +33,8 @@
 #define        MAXCONTROL      1000            // max length control message we ever send...
 #define        MAXETHER        (1500+18)       // max packet we try sending to tun
 #define        MAXTEL          96              // telephone number
 #define        MAXCONTROL      1000            // max length control message we ever send...
 #define        MAXETHER        (1500+18)       // max packet we try sending to tun
 #define        MAXTEL          96              // telephone number

+#define MAXUSER                128             // username
+#define MAXPASS                128             // password

 #define MAXPLUGINS     20              // maximum number of plugins to load
 #define MAXRADSERVER   10              // max radius servers
 #define        MAXROUTE        10              // max static routes per session
 #define MAXPLUGINS     20              // maximum number of plugins to load
 #define MAXRADSERVER   10              // max radius servers
 #define        MAXROUTE        10              // max static routes per session


@@ -41,6 +44,7 @@
 #define ECHO_TIMEOUT   60              // Time between last packet sent and LCP ECHO generation
 #define IDLE_TIMEOUT   240             // Time between last packet sent and LCP ECHO generation
 #define BUSY_WAIT_TIME 3000            // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
 #define ECHO_TIMEOUT   60              // Time between last packet sent and LCP ECHO generation
 #define IDLE_TIMEOUT   240             // Time between last packet sent and LCP ECHO generation
 #define BUSY_WAIT_TIME 3000            // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown

+#define DEFAULT_MRU    1452            // maximum packet size to avoid fragmentation when LNS ethernet MTU is 1500

 
 // Constants
 #ifndef ETCDIR
 
 // Constants
 #ifndef ETCDIR


@@ -51,10 +55,6 @@
 #define LIBDIR         "/usr/lib/l2tpns"
 #endif
 
 #define LIBDIR         "/usr/lib/l2tpns"
 #endif
 

-#ifndef STATEDIR
-#define STATEDIR       "/var/lib/l2tpns"
-#endif
-

 #ifndef PLUGINDIR
 #define PLUGINDIR      LIBDIR          // Plugins
 #endif
 #ifndef PLUGINDIR
 #define PLUGINDIR      LIBDIR          // Plugins
 #endif


@@ -67,31 +67,31 @@
 #define FLASHDIR       ETCDIR
 #endif
 
 #define FLASHDIR       ETCDIR
 #endif
 

-#ifndef DATADIR
-#define DATADIR                STATEDIR
-#endif
-

 #define TUNDEVICE      "/dev/net/tun"
 #define TUNDEVICE      "/dev/net/tun"

-#define STATEFILE      DATADIR "/state.dump"           // State dump file
+#define RANDOMDEVICE   "/dev/urandom"                  // default, not as secure as /dev/random but non-blocking

 #define CONFIGFILE     FLASHDIR "/startup-config"      // Configuration file
 #define CLIUSERS       FLASHDIR "/users"               // CLI Users file
 #define IPPOOLFILE     FLASHDIR "/ip_pool"             // Address pool configuration
 #define CONFIGFILE     FLASHDIR "/startup-config"      // Configuration file
 #define CLIUSERS       FLASHDIR "/users"               // CLI Users file
 #define IPPOOLFILE     FLASHDIR "/ip_pool"             // Address pool configuration

-#define ACCT_TIME      3000            // 5 minute accounting interval
-#define        L2TPPORT        1701            // L2TP port
-#define RADPORT                1645            // old radius port...
-#define        PKTARP          0x0806          // ARP packet type
-#define        PKTIP           0x0800          // IP packet type
-#define PSEUDOMAC      0x0200          // pseudo MAC prefix (local significant MAC)
+#define ACCT_TIME      3000                            // 5 minute accounting interval
+#define ACCT_SHUT_TIME 600                             // 1 minute for counters of shutdown sessions
+#define        L2TPPORT        1701                            // L2TP port
+#define RADPORT                1645                            // old radius port...
+#define DAEPORT                3799                            // DAE port
+#define        PKTARP          0x0806                          // ARP packet type
+#define        PKTIP           0x0800                          // IPv4 packet type
+#define        PKTIPV6         0x86DD                          // IPv6 packet type

 #define        PPPPAP          0xC023
 #define        PPPCHAP         0xC223
 #define        PPPLCP          0xC021
 #define        PPPIPCP         0x8021
 #define        PPPPAP          0xC023
 #define        PPPCHAP         0xC223
 #define        PPPLCP          0xC021
 #define        PPPIPCP         0x8021

+#define        PPPIPV6CP       0x8057

 #define        PPPCCP          0x80FD
 #define PPPIP          0x0021
 #define        PPPCCP          0x80FD
 #define PPPIP          0x0021

+#define PPPIPV6                0x0057

 #define PPPMP          0x003D
 #define MIN_IP_SIZE    0x19
 #define PPPMP          0x003D
 #define MIN_IP_SIZE    0x19

-enum
-{
+
+enum {

        ConfigReq = 1,
        ConfigAck,
        ConfigNak,
        ConfigReq = 1,
        ConfigAck,
        ConfigNak,


@@ -106,22 +106,78 @@ enum
        IdentRequest
 };
 
        IdentRequest
 };
 

+enum {
+       AccessRequest = 1,
+       AccessAccept,
+       AccessReject,
+       AccountingRequest,
+       AccountingResponse,
+       AccessChallenge = 11,
+       DisconnectRequest = 40,
+       DisconnectACK,
+       DisconnectNAK,
+       CoARequest,
+       CoAACK,
+       CoANAK
+};
+
+// PPP phases
+enum {
+       Dead,
+       Establish,
+       Authenticate,
+       Network,
+       Terminate
+};
+
+// PPP states
+enum {
+       Initial,
+       Starting,
+       Closed,
+       Stopped,
+       Closing,
+       Stopping,
+       RequestSent,
+       AckReceived,
+       AckSent,
+       Opened
+};
+
+// reset state machine counters
+#define initialise_restart_count(_s, _fsm)                     \
+       sess_local[_s]._fsm.conf_sent = sess_local[_s]._fsm.nak_sent
+
+// stop timer on change to state where timer does not run
+#define change_state(_s, _fsm, _new) ({                                \
+       if (_new != session[_s].ppp._fsm)                       \
+       {                                                       \
+               switch (_new)                                   \
+               {                                               \
+               case Initial:                                   \
+               case Starting:                                  \
+               case Closed:                                    \
+               case Stopped:                                   \
+               case Opened:                                    \
+                       sess_local[_s]._fsm.restart = 0;        \
+                       initialise_restart_count(_s, _fsm);     \
+               }                                               \
+               session[_s].ppp._fsm = _new;                    \
+               cluster_send_session(_s);                       \
+       }                                                       \
+})
+

 // Types
 // Types

-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned char u8;
-typedef u32 ipt;
-typedef u16 portt;
-typedef u16 sessionidt;
-typedef u16 tunnelidt;
-typedef u32 clockt;
-typedef u8 hasht[16];
+typedef uint16_t sessionidt;
+typedef uint16_t tunnelidt;
+typedef uint32_t clockt;
+typedef uint8_t hasht[16];

 
 // CLI actions
 struct cli_session_actions {
        char action;
 
 // CLI actions
 struct cli_session_actions {
        char action;

-       ipt snoop_ip;
-       u16 snoop_port;
+       in_addr_t snoop_ip;
+       uint16_t snoop_port;

        int throttle_in;
        int throttle_out;
        int filter_in;
        int throttle_in;
        int throttle_out;
        int filter_in;


@@ -142,22 +198,19 @@ struct cli_tunnel_actions {
 
 #define CLI_TUN_KILL           0x01
 
 
 #define CLI_TUN_KILL           0x01
 

-// dump header: update number if internal format changes
-#define DUMP_MAGIC "L2TPNS#" VERSION "#"
-

 // structures
 typedef struct                 // route
 {
 // structures
 typedef struct                 // route
 {

-       ipt ip;
-       ipt mask;
+       in_addr_t ip;
+       in_addr_t mask;

 }
 routet;
 
 }
 routet;
 

-typedef struct controls         // control message
+typedef struct controls                // control message

 {
 {

-       struct controls *next;  // next in queue
-       u16 length;             // length
-       u8 buf[MAXCONTROL];
+       struct controls *next;  // next in queue
+       uint16_t length;        // length
+       uint8_t buf[MAXCONTROL];

 }
 controlt;
 
 }
 controlt;
 


@@ -166,58 +219,87 @@ typedef struct
        sessionidt next;                // next session in linked list
        sessionidt far;                 // far end session ID
        tunnelidt tunnel;               // near end tunnel ID
        sessionidt next;                // next session in linked list
        sessionidt far;                 // far end session ID
        tunnelidt tunnel;               // near end tunnel ID

-       ipt ip;                         // IP of session set by RADIUS response (host byte order).
+       uint8_t l2tp_flags;             // various bit flags from the ICCN on the l2tp tunnel.
+       struct {
+               uint8_t phase;          // PPP phase
+               uint8_t lcp:4;          //   LCP    state
+               uint8_t ipcp:4;         //   IPCP   state
+               uint8_t ipv6cp:4;       //   IPV6CP state
+               uint8_t ccp:4;          //   CCP    state
+               uint8_t pad;            // unused
+       } ppp;
+       in_addr_t ip;                   // IP of session set by RADIUS response (host byte order).

        int ip_pool_index;              // index to IP pool
        int ip_pool_index;              // index to IP pool

-       unsigned long unique_id;        // unique session id
-       u16 nr;                         // next receive
-       u16 ns;                         // next send
-       u32 magic;                      // ppp magic number
-       u32 cin, cout;                  // byte counts
-       u32 pin, pout;                  // packet counts
-       u32 total_cin;                  // This counter is never reset while a session is open
-       u32 total_cout;                 // This counter is never reset while a session is open
-       u32 id;                         // session id
-       u16 throttle_in;                // upstream throttle rate (kbps)
-       u16 throttle_out;               // downstream throttle rate
+       uint32_t unique_id;             // unique session id
+       uint16_t nr;                    // next receive
+       uint16_t ns;                    // next send
+       uint32_t magic;                 // ppp magic number
+       uint32_t pin, pout;             // packet counts
+       uint32_t cin, cout;             // byte counts
+       uint32_t cin_wrap, cout_wrap;   // byte counter wrap count (RADIUS accounting giagawords)
+       uint32_t cin_delta, cout_delta; // byte count changes (for dump_session())
+       uint16_t throttle_in;           // upstream throttle rate (kbps)
+       uint16_t throttle_out;          // downstream throttle rate
+       uint8_t filter_in;              // input filter index (to ip_filters[N-1]; 0 if none)
+       uint8_t filter_out;             // output filter index
+       uint16_t mru;                   // maximum receive unit

        clockt opened;                  // when started
        clockt die;                     // being closed, when to finally free
        time_t last_packet;             // Last packet from the user (used for idle timeouts)
        clockt opened;                  // when started
        clockt die;                     // being closed, when to finally free
        time_t last_packet;             // Last packet from the user (used for idle timeouts)

-       ipt dns1, dns2;                 // DNS servers
+       in_addr_t dns1, dns2;           // DNS servers

        routet route[MAXROUTE];         // static routes
        routet route[MAXROUTE];         // static routes

-       u16 radius;                     // which radius session is being used (0 for not waiting on authentication)
-       u16 mru;                        // maximum receive unit
-       u16 tbf_in;                     // filter bucket for throttling in from the user.
-       u16 tbf_out;                    // filter bucket for throttling out to the user.
-       u8 l2tp_flags;                  // various bit flags from the ICCN on the l2tp tunnel.
-       u8 reserved_old_snoop;          // No longer used - remove at some time
-       u8 walled_garden;               // is this session gardened?
-       u8 flags1;                      // additional flags (currently unused);
-       char random_vector[MAXTEL];
+       uint16_t tbf_in;                // filter bucket for throttling in from the user.
+       uint16_t tbf_out;               // filter bucket for throttling out to the user.

        int random_vector_length;
        int random_vector_length;

-       char user[129];                 // user (needed in seesion for radius stop messages) (can we reduce this? --mo)
+       uint8_t random_vector[MAXTEL];
+       char user[MAXUSER];             // user (needed in seesion for radius stop messages)

        char called[MAXTEL];            // called number
        char calling[MAXTEL];           // calling number
        char called[MAXTEL];            // called number
        char calling[MAXTEL];           // calling number

-       u32 tx_connect_speed;
-       u32 rx_connect_speed;
-       u32 flags;                      // Various session flags.
-       ipt snoop_ip;                   // Interception destination IP
-       u16 snoop_port;                 // Interception destination port
-       u16 sid;                        // near end session id.
-       u8 filter_in;                   // input filter index (to ip_filters[N-1]; 0 if none)
-       u8 filter_out;                  // output filter index
-       char reserved[18];              // Space to expand structure without changing HB_VERSION
+       uint32_t tx_connect_speed;
+       uint32_t rx_connect_speed;
+       in_addr_t snoop_ip;             // Interception destination IP
+       uint16_t snoop_port;            // Interception destination port
+       uint8_t walled_garden;          // is this session gardened?
+       uint8_t ipv6prefixlen;          // IPv6 route prefix length
+       struct in6_addr ipv6route;      // Static IPv6 route
+       char reserved[11];              // Space to expand structure without changing HB_VERSION

 }
 sessiont;
 
 }
 sessiont;
 

-#define SF_IPCP_ACKED  1       // Has this session seen an IPCP Ack?
-#define SF_LCP_ACKED   2       // LCP negotiated
-#define SF_CCP_ACKED   4       // CCP negotiated
+#define AUTHPAP                1       // allow PAP
+#define AUTHCHAP       2       // allow CHAP

 
 typedef struct
 {
 
 typedef struct
 {

-       u32     cin;
-       u32     cout;
-} sessioncountt;
+       // packet counters
+       uint32_t pin;
+       uint32_t pout;
+
+       // byte counters
+       uint32_t cin;
+       uint32_t cout;
+
+       // PPP restart timer/counters
+       struct {
+               time_t restart;
+               int conf_sent;
+               int nak_sent;
+       } lcp, ipcp, ipv6cp, ccp;
+
+       // authentication to use
+       int lcp_authtype;
+
+       // DoS prevention
+       clockt last_packet_out;
+       uint32_t packets_out;
+       uint32_t packets_dropped;
+
+       // RADIUS session in use
+       uint16_t radius;
+
+       // interim RADIUS
+       time_t last_interim;
+} sessionlocalt;

 
 #define        SESSIONPFC      1       // PFC negotiated flags
 #define        SESSIONACFC     2       // ACFC negotiated flags
 
 #define        SESSIONPFC      1       // PFC negotiated flags
 #define        SESSIONACFC     2       // ACFC negotiated flags


@@ -226,11 +308,11 @@ typedef struct
 typedef struct
 {
        tunnelidt far;          // far end tunnel ID
 typedef struct
 {
        tunnelidt far;          // far end tunnel ID

-       ipt ip;                 // Ip for far end
-       portt port;             // port for far end
-       u16 window;             // Rx window
-       u16 nr;                 // next receive
-       u16 ns;                 // next send
+       in_addr_t ip;           // Ip for far end
+       uint16_t port;          // port for far end
+       uint16_t window;        // Rx window
+       uint16_t nr;            // next receive
+       uint16_t ns;            // next send

        int state;              // current state (tunnelstate enum)
        clockt last;            // when last control message sent (used for resend timeout)
        clockt retry;           // when to try resenting pending control
        int state;              // current state (tunnelstate enum)
        clockt last;            // when last control message sent (used for resend timeout)
        clockt retry;           // when to try resenting pending control


@@ -238,31 +320,30 @@ typedef struct
        clockt lastrec;         // when the last control message was received
        char hostname[128];     // tunnel hostname
        char vendor[128];       // LAC vendor
        clockt lastrec;         // when the last control message was received
        char hostname[128];     // tunnel hostname
        char vendor[128];       // LAC vendor

-       u8 try;                 // number of retrys on a control message
-       u16 controlc;           // outstaind messages in queue
+       uint8_t try;            // number of retrys on a control message
+       uint16_t controlc;      // outstaind messages in queue

        controlt *controls;     // oldest message
        controlt *controle;     // newest message
 }
 tunnelt;
 
        controlt *controls;     // oldest message
        controlt *controle;     // newest message
 }
 tunnelt;
 

-// 180 bytes per radius session
+// 160 bytes per radius session

 typedef struct                 // outstanding RADIUS requests
 {
        sessionidt session;     // which session this applies to
        hasht auth;             // request authenticator
        clockt retry;           // when to try next
 typedef struct                 // outstanding RADIUS requests
 {
        sessionidt session;     // which session this applies to
        hasht auth;             // request authenticator
        clockt retry;           // when to try next

-       char calling[MAXTEL];   // calling number

        char pass[129];         // password
        char pass[129];         // password

-       u8 id;                  // ID for PPP response
-       u8 try;                 // which try we are on
-       u8 state;               // state of radius requests
-       u8 chap;                // set if CHAP used (is CHAP identifier)
+       uint8_t id;             // ID for PPP response
+       uint8_t try;            // which try we are on
+       uint8_t state;          // state of radius requests
+       uint8_t chap;           // set if CHAP used (is CHAP identifier)

 }
 radiust;
 
 typedef struct
 {
 }
 radiust;
 
 typedef struct
 {

-       ipt             address;        // Host byte order..
+       in_addr_t       address;        // Host byte order..

        char            assigned;       // 1 if assigned, 0 if free
        sessionidt      session;
        clockt          last;           // last used
        char            assigned;       // 1 if assigned, 0 if free
        sessionidt      session;
        clockt          last;           // last used


@@ -277,7 +358,6 @@ struct Tringbuffer
                char level;
                sessionidt session;
                tunnelidt tunnel;
                char level;
                sessionidt session;
                tunnelidt tunnel;

-               ipt address;

                char message[MAX_LOG_LENGTH];
        } buffer[RINGBUFFER_SIZE];
        int head;
                char message[MAX_LOG_LENGTH];
        } buffer[RINGBUFFER_SIZE];
        int head;


@@ -303,87 +383,98 @@ enum
        RADIUSNULL,             // Not in use
        RADIUSCHAP,             // sending CHAP down PPP
        RADIUSAUTH,             // sending auth to RADIUS server
        RADIUSNULL,             // Not in use
        RADIUSCHAP,             // sending CHAP down PPP
        RADIUSAUTH,             // sending auth to RADIUS server

-       RADIUSIPCP,             // sending IPCP to end user

        RADIUSSTART,            // sending start accounting to RADIUS server
        RADIUSSTOP,             // sending stop accounting to RADIUS server
        RADIUSSTART,            // sending start accounting to RADIUS server
        RADIUSSTOP,             // sending stop accounting to RADIUS server

+       RADIUSINTERIM,          // sending interim accounting to RADIUS server

        RADIUSWAIT,             // waiting timeout before available, in case delayed replies
        RADIUSWAIT,             // waiting timeout before available, in case delayed replies

-       RADIUSDEAD,             // errored while talking to radius server.

 };
 
 struct Tstats
 {
 };
 
 struct Tstats
 {

-    time_t             start_time;
-    time_t             last_reset;
-
-    unsigned long      tun_rx_packets;
-    unsigned long      tun_tx_packets;
-    unsigned long      tun_rx_bytes;
-    unsigned long      tun_tx_bytes;
-    unsigned long      tun_rx_errors;
-    unsigned long      tun_tx_errors;
-
-    unsigned long      tunnel_rx_packets;
-    unsigned long      tunnel_tx_packets;
-    unsigned long      tunnel_rx_bytes;
-    unsigned long      tunnel_tx_bytes;
-    unsigned long      tunnel_rx_errors;
-    unsigned long      tunnel_tx_errors;
-
-    unsigned long      tunnel_retries;
-    unsigned long      radius_retries;
-
-    unsigned long      arp_sent;
-
-    unsigned long      packets_snooped;
-
-    unsigned long      tunnel_created;
-    unsigned long      session_created;
-    unsigned long      tunnel_timeout;
-    unsigned long      session_timeout;
-    unsigned long      radius_timeout;
-    unsigned long      radius_overflow;
-    unsigned long      tunnel_overflow;
-    unsigned long      session_overflow;
-
-    unsigned long      ip_allocated;
-    unsigned long      ip_freed;
-
-    unsigned long      c_forwarded;
-    unsigned long      recv_forward;
+    time_t     start_time;
+    time_t     last_reset;
+
+    uint32_t   tun_rx_packets;
+    uint32_t   tun_tx_packets;
+    uint32_t   tun_rx_bytes;
+    uint32_t   tun_tx_bytes;
+    uint32_t   tun_rx_errors;
+    uint32_t   tun_tx_errors;
+    uint32_t   tun_rx_dropped;
+
+    uint32_t   tunnel_rx_packets;
+    uint32_t   tunnel_tx_packets;
+    uint32_t   tunnel_rx_bytes;
+    uint32_t   tunnel_tx_bytes;
+    uint32_t   tunnel_rx_errors;
+    uint32_t   tunnel_tx_errors;
+
+    uint32_t   tunnel_retries;
+    uint32_t   radius_retries;
+
+    uint32_t   arp_sent;
+
+    uint32_t   packets_snooped;
+
+    uint32_t   tunnel_created;
+    uint32_t   session_created;
+    uint32_t   tunnel_timeout;
+    uint32_t   session_timeout;
+    uint32_t   radius_timeout;
+    uint32_t   radius_overflow;
+    uint32_t   tunnel_overflow;
+    uint32_t   session_overflow;
+
+    uint32_t   ip_allocated;
+    uint32_t   ip_freed;
+
+    uint32_t   c_forwarded;
+    uint32_t   recv_forward;
+
+    uint32_t   select_called;
+    uint32_t   multi_read_used;
+    uint32_t   multi_read_exceeded;
+

 #ifdef STATISTICS
 #ifdef STATISTICS

-    unsigned long      call_processtun;
-    unsigned long      call_processipout;
-    unsigned long      call_processudp;
-    unsigned long      call_sessionbyip;
-    unsigned long      call_sessionbyuser;
-    unsigned long      call_sendarp;
-    unsigned long      call_sendipcp;
-    unsigned long      call_tunnelsend;
-    unsigned long      call_sessionkill;
-    unsigned long      call_sessionshutdown;
-    unsigned long      call_tunnelkill;
-    unsigned long      call_tunnelshutdown;
-    unsigned long      call_assign_ip_address;
-    unsigned long      call_free_ip_address;
-    unsigned long      call_dump_acct_info;
-    unsigned long      call_sessionsetup;
-    unsigned long      call_processpap;
-    unsigned long      call_processchap;
-    unsigned long      call_processlcp;
-    unsigned long      call_processipcp;
-    unsigned long      call_processipin;
-    unsigned long      call_processccp;
-    unsigned long      call_sendchap;
-    unsigned long      call_processrad;
-    unsigned long      call_radiussend;
-    unsigned long      call_radiusretry;
+    uint32_t   call_processtun;
+    uint32_t   call_processipout;
+    uint32_t   call_processipv6out;
+    uint32_t   call_processudp;
+    uint32_t   call_sessionbyip;
+    uint32_t   call_sessionbyipv6;
+    uint32_t   call_sessionbyuser;
+    uint32_t   call_sendarp;
+    uint32_t   call_sendipcp;
+    uint32_t   call_sendipv6cp;
+    uint32_t   call_processipv6cp;
+    uint32_t   call_tunnelsend;
+    uint32_t   call_sessionkill;
+    uint32_t   call_sessionshutdown;
+    uint32_t   call_tunnelkill;
+    uint32_t   call_tunnelshutdown;
+    uint32_t   call_assign_ip_address;
+    uint32_t   call_free_ip_address;
+    uint32_t   call_dump_acct_info;
+    uint32_t   call_sessionsetup;
+    uint32_t   call_processpap;
+    uint32_t   call_processchap;
+    uint32_t   call_processlcp;
+    uint32_t   call_processipcp;
+    uint32_t   call_processipin;
+    uint32_t   call_processipv6in;
+    uint32_t   call_processccp;
+    uint32_t   call_sendchap;
+    uint32_t   call_processrad;
+    uint32_t   call_radiussend;
+    uint32_t   call_radiusretry;
+    uint32_t    call_random_data;

 #endif
 };
 
 #ifdef STATISTICS
 
 #ifdef STAT_CALLS
 #endif
 };
 
 #ifdef STATISTICS
 
 #ifdef STAT_CALLS

-#define CSTAT(x)       STAT(x)
+#define CSTAT(x)       STAT(call_ ## x)

 #else
 #define CSTAT(x)
 #endif
 #else
 #define CSTAT(x)
 #endif


@@ -413,29 +504,41 @@ typedef struct
 
        char            config_file[128];
        int             reload_config;                  // flag to re-read config (set by cli)
 
        char            config_file[128];
        int             reload_config;                  // flag to re-read config (set by cli)

-       int             cleanup_interval;               // interval between regular cleanups (in seconds)

        int             multi_read_count;               // amount of packets to read per fd in processing loop
 
        char            tundevice[10];                  // tun device name
        char            log_filename[128];
        char            l2tpsecret[64];
 
        int             multi_read_count;               // amount of packets to read per fd in processing loop
 
        char            tundevice[10];                  // tun device name
        char            log_filename[128];
        char            l2tpsecret[64];
 

+       char            random_device[256];             // random device path, defaults to RANDOMDEVICE
+
+       int             ppp_restart_time;               // timeout for PPP restart
+       int             ppp_max_configure;              // max lcp configure requests to send
+       int             ppp_max_failure;                // max lcp configure naks to send
+

        char            radiussecret[64];
        int             radius_accounting;
        char            radiussecret[64];
        int             radius_accounting;

-       ipt             radiusserver[MAXRADSERVER];     // radius servers
-       u16             radiusport[MAXRADSERVER];       // radius base ports
-       u8              numradiusservers;               // radius server count
-       short           num_radfds;                     // Number of radius filehandles allocated
+       int             radius_interim;
+       in_addr_t       radiusserver[MAXRADSERVER];     // radius servers
+       uint16_t        radiusport[MAXRADSERVER];       // radius base ports
+       uint8_t         numradiusservers;               // radius server count

 
 

-       ipt             default_dns1, default_dns2;
+       uint16_t        radius_dae_port;                // local port for radius dae
+
+       char            radius_authtypes_s[32];         // list of valid authentication types (chap, pap) in order of preference
+       int             radius_authtypes;
+       int             radius_authprefer;
+
+       int             allow_duplicate_users;          // allow multiple logins with the same username
+
+       in_addr_t       default_dns1, default_dns2;

 
        unsigned long   rl_rate;                        // default throttle rate
        int             num_tbfs;                       // number of throttle buckets
 
 
        unsigned long   rl_rate;                        // default throttle rate
        int             num_tbfs;                       // number of throttle buckets
 

-       int             save_state;

        char            accounting_dir[128];
        char            accounting_dir[128];

-       ipt             bind_address;
-       ipt             peer_address;
+       in_addr_t       bind_address;
+       in_addr_t       peer_address;

        int             send_garp;                      // Set to true to garp for vip address on startup
 
        int             target_uid;
        int             send_garp;                      // Set to true to garp for vip address on startup
 
        int             target_uid;


@@ -444,16 +547,18 @@ typedef struct
        char            old_plugins[64][MAXPLUGINS];
 
        int             next_tbf;                       // Next HTB id available to use
        char            old_plugins[64][MAXPLUGINS];
 
        int             next_tbf;                       // Next HTB id available to use

-       int             scheduler_fifo;                 // If the system has multiple CPUs, use FIFO scheduling policy for this process.
+       int             scheduler_fifo;                 // If the system has multiple CPUs, use FIFO scheduling
+                                                       // policy for this process.

        int             lock_pages;                     // Lock pages into memory.
        int             lock_pages;                     // Lock pages into memory.

-       int             icmp_rate;                      // Max number of ICMP unreachable per second to send>
+       int             icmp_rate;                      // Max number of ICMP unreachable per second to send
+       int             max_packets;                    // DoS prevention: per session limit of packets/0.1s

 
 

-       u32             cluster_address;                // Multicast address of cluster.
+       in_addr_t       cluster_address;                // Multicast address of cluster.

                                                        // Send to this address to have everyone hear.
        char            cluster_interface[64];          // Which interface to listen for multicast on.
        int             cluster_iam_master;             // Are we the cluster master???
        int             cluster_iam_uptodate;           // Set if we've got a full set of state from the master.
                                                        // Send to this address to have everyone hear.
        char            cluster_interface[64];          // Which interface to listen for multicast on.
        int             cluster_iam_master;             // Are we the cluster master???
        int             cluster_iam_uptodate;           // Set if we've got a full set of state from the master.

-       u32             cluster_master_address;         // The network address of the cluster master.
+       in_addr_t       cluster_master_address;         // The network address of the cluster master.

                                                        // Zero if i am the cluster master.
        int             cluster_seq_number;             // Sequence number of the next heartbeat we'll send out
                                                        // (or the seq number we're next expecting if we're a slave).
                                                        // Zero if i am the cluster master.
        int             cluster_seq_number;             // Sequence number of the next heartbeat we'll send out
                                                        // (or the seq number we're next expecting if we're a slave).


@@ -462,24 +567,32 @@ typedef struct
        int             cluster_highest_sessionid;
        int             cluster_highest_tunnelid;
        clockt          cluster_last_hb;                // Last time we saw a heartbeat from the master.
        int             cluster_highest_sessionid;
        int             cluster_highest_tunnelid;
        clockt          cluster_last_hb;                // Last time we saw a heartbeat from the master.

+       int             cluster_last_hb_ver;            // Heartbeat version last seen from master

        int             cluster_num_changes;            // Number of changes queued.
 
        int             cluster_hb_interval;            // How often to send a heartbeat.
        int             cluster_hb_timeout;             // How many missed heartbeats trigger an election.
        int             cluster_num_changes;            // Number of changes queued.
 
        int             cluster_hb_interval;            // How often to send a heartbeat.
        int             cluster_hb_timeout;             // How many missed heartbeats trigger an election.

+       uint64_t        cluster_table_version;          // # state changes processed by cluster
+
+       struct in6_addr ipv6_prefix;                    // Our IPv6 network pool.
+
+
+       int             cluster_master_min_adv;         // Master advertises routes while the number of up to date
+                                                       // slaves is less than this value.

 
 #ifdef BGP
 #define BGP_NUM_PEERS  2
 
 #ifdef BGP
 #define BGP_NUM_PEERS  2

-       u16             as_number;
+       uint16_t as_number;

        struct {
        struct {

-               char    name[64];
-               u16     as;
-               int     keepalive;
-               int     hold;
-       }               neighbour[BGP_NUM_PEERS];
+               char name[64];
+               uint16_t as;
+               int keepalive;
+               int hold;
+       } neighbour[BGP_NUM_PEERS];

 #endif
 } configt;
 
 #endif
 } configt;
 

-enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC };
+enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6, MAC };

 typedef struct
 {
        char *key;
 typedef struct
 {
        char *key;


@@ -490,15 +603,15 @@ typedef struct
 
 typedef struct
 {
 
 typedef struct
 {

-       u8 op;          // operation
+       uint8_t op;     // operation

 #define FILTER_PORT_OP_NONE    0 // all ports match
 #define FILTER_PORT_OP_EQ      1
 #define FILTER_PORT_OP_NEQ     2
 #define FILTER_PORT_OP_GT      3
 #define FILTER_PORT_OP_LT      4
 #define FILTER_PORT_OP_RANGE   5
 #define FILTER_PORT_OP_NONE    0 // all ports match
 #define FILTER_PORT_OP_EQ      1
 #define FILTER_PORT_OP_NEQ     2
 #define FILTER_PORT_OP_GT      3
 #define FILTER_PORT_OP_LT      4
 #define FILTER_PORT_OP_RANGE   5

-       portt port;     // port (host byte order)
-       portt port2;    // range
+       uint16_t port;  // port (host byte order)
+       uint16_t port2; // range

 } ip_filter_portt;
 
 typedef struct
 } ip_filter_portt;
 
 typedef struct


@@ -506,18 +619,21 @@ typedef struct
        int action;             // permit/deny
 #define FILTER_ACTION_DENY     1
 #define FILTER_ACTION_PERMIT   2
        int action;             // permit/deny
 #define FILTER_ACTION_DENY     1
 #define FILTER_ACTION_PERMIT   2

-       u8 proto;               // protocol: IPPROTO_* (netinet/in.h)
-       ipt src_ip;             // source ip (network byte order)
-       ipt src_wild;
+       uint8_t proto;          // protocol: IPPROTO_* (netinet/in.h)
+       in_addr_t src_ip;       // source ip (network byte order)
+       in_addr_t src_wild;

        ip_filter_portt src_ports;
        ip_filter_portt src_ports;

-       ipt dst_ip;             // dest ip
-       ipt dst_wild;
+       in_addr_t dst_ip;       // dest ip
+       in_addr_t dst_wild;

        ip_filter_portt dst_ports;
        ip_filter_portt dst_ports;

-       u8 tcp_flag_op;         // match type: any, all
+       uint8_t frag;           // apply to non-initial fragments
+       uint8_t tcp_flag_op;    // match type: any, all, established

 #define FILTER_FLAG_OP_ANY     1
 #define FILTER_FLAG_OP_ALL     2
 #define FILTER_FLAG_OP_ANY     1
 #define FILTER_FLAG_OP_ALL     2

-       u8 tcp_sflags;          // flags set
-       u8 tcp_cflags;          // flags clear
+#define FILTER_FLAG_OP_EST     3
+       uint8_t tcp_sflags;     // flags set
+       uint8_t tcp_cflags;     // flags clear
+       uint32_t counter;       // match count

 } ip_filter_rulet;
 
 #define TCP_FLAG_FIN   0x01
 } ip_filter_rulet;
 
 #define TCP_FLAG_FIN   0x01


@@ -538,53 +654,67 @@ typedef struct
 } ip_filtert;
 
 // arp.c
 } ip_filtert;
 
 // arp.c

-void sendarp(int ifr_idx, const unsigned char* mac, ipt ip);
+void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip);

 
 
 // ppp.c
 
 
 // ppp.c

-void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l);
-void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l);
-void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l);
-void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l);
-void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l);
-void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l);
+void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void lcp_open(tunnelidt t, sessionidt s);
+void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);

 void sendchap(tunnelidt t, sessionidt s);
 void sendchap(tunnelidt t, sessionidt s);

-u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype);
-void initlcp(tunnelidt t, sessionidt s);
-void send_ipin(sessionidt s, u8 * buf, int len);
+uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionidt s, uint16_t mtype);
+void sendlcp(tunnelidt t, sessionidt s, int authtype);
+void send_ipin(sessionidt s, uint8_t *buf, int len);
+void sendccp(tunnelidt t, sessionidt s);

 
 
 // radius.c
 void initrad(void);
 
 
 // radius.c
 void initrad(void);

-void radiussend(u16 r, u8 state);
-void processrad(u8 *buf, int len, char socket_index);
-void radiusretry(u16 r);
-u16 radiusnew(sessionidt s);
-void radiusclear(u16 r, sessionidt s);
+void radiussend(uint16_t r, uint8_t state);
+void processrad(uint8_t *buf, int len, char socket_index);
+void radiusretry(uint16_t r);
+uint16_t radiusnew(sessionidt s);
+void radiusclear(uint16_t r, sessionidt s);
+void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen);

 
 
 // l2tpns.c
 
 
 // l2tpns.c

-clockt backoff(u8 try);
-sessionidt sessionbyip(ipt ip);
+clockt backoff(uint8_t try);
+void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip);
+void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add);
+sessionidt sessionbyip(in_addr_t ip);
+sessionidt sessionbyipv6(struct in6_addr ip);

 sessionidt sessionbyuser(char *username);
 sessionidt sessionbyuser(char *username);

-void sessionshutdown(sessionidt s, char *reason);
-void send_garp(ipt ip);
-void tunnelsend(u8 * buf, u16 l, tunnelidt t);
+void increment_counter(uint32_t *counter, uint32_t *wrap, uint32_t delta);
+void random_data(uint8_t *buf, int len);
+void sessionkill(sessionidt s, char *reason);
+void sessionshutdown(sessionidt s, char *reason, int result, int error);
+void filter_session(sessionidt s, int filter_in, int filter_out);
+void send_garp(in_addr_t ip);
+void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t);

 void sendipcp(tunnelidt t, sessionidt s);
 void sendipcp(tunnelidt t, sessionidt s);

-void processudp(u8 * buf, int len, struct sockaddr_in *addr);
-void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port);
-int ip_filter(u8 *buf, int len, u8 filter);
+void sendipv6cp(tunnelidt t, sessionidt s);
+void processudp(uint8_t *buf, int len, struct sockaddr_in *addr);
+void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, uint16_t port);
+int find_filter(char const *name, size_t len);
+int ip_filter(uint8_t *buf, int len, uint8_t filter);

 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);
 
 #undef LOG
 #undef LOG_HEX
 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);
 
 #undef LOG
 #undef LOG_HEX

-#define LOG(D, a, s, t, f, ...)        ({ if (D <= config->debug) _log(D, a, s, t, f, ## __VA_ARGS__); })
+#define LOG(D, s, t, f, ...)   ({ if (D <= config->debug) _log(D, s, t, f, ## __VA_ARGS__); })

 #define LOG_HEX(D, t, d, s)    ({ if (D <= config->debug) _log_hex(D, t, d, s); })
 
 #define LOG_HEX(D, t, d, s)    ({ if (D <= config->debug) _log_hex(D, t, d, s); })
 

-void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 5, 6)));
-void _log_hex(int level, const char *title, const char *data, int maxsize);
+void _log(int level, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 4, 5)));
+void _log_hex(int level, const char *title, const uint8_t *data, int maxsize);

 
 int sessionsetup(tunnelidt t, sessionidt s);
 int run_plugins(int plugin_type, void *data);
 
 int sessionsetup(tunnelidt t, sessionidt s);
 int run_plugins(int plugin_type, void *data);


@@ -602,12 +732,12 @@ int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);
 
 
 // icmp.c
 
 
 // icmp.c

-void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int packet_len);
+void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, uint8_t *packet, int packet_len);

 
 
 extern tunnelt *tunnel;
 extern sessiont *session;
 
 
 extern tunnelt *tunnel;
 extern sessiont *session;

-extern sessioncountt *sess_count;
+extern sessionlocalt *sess_local;

 extern ippoolt *ip_address_pool;
 #define sessionfree (session[0].next)
 
 extern ippoolt *ip_address_pool;
 #define sessionfree (session[0].next)
 


@@ -616,12 +746,12 @@ if (count++ < max) { \
        void *array[20]; \
        char **strings; \
        int size, i; \
        void *array[20]; \
        char **strings; \
        int size, i; \

-       LOG(0, 0, 0, t, "Backtrace follows"); \
+       LOG(0, 0, t, "Backtrace follows:\n"); \

        size = backtrace(array, 10); \
        strings = backtrace_symbols(array, size); \
        if (strings) for (i = 0; i < size; i++) \
        { \
        size = backtrace(array, 10); \
        strings = backtrace_symbols(array, size); \
        if (strings) for (i = 0; i < size; i++) \
        { \

-               LOG(0, 0, 0, t, "%s\n", strings[i]); \
+               LOG(0, 0, t, " %s\n", strings[i]); \

        } \
        free(strings); \
 }
        } \
        free(strings); \
 }


@@ -630,12 +760,27 @@ if (count++ < max) { \
 extern configt *config;
 extern time_t basetime;                // Time when this process started.
 extern time_t time_now;                // Seconds since EPOCH.
 extern configt *config;
 extern time_t basetime;                // Time when this process started.
 extern time_t time_now;                // Seconds since EPOCH.

-extern u32 last_id;
+extern char main_quit;
+extern uint32_t last_id;

 extern struct Tstats *_statistics;
 extern struct Tstats *_statistics;

-extern ipt my_address;
-extern int tun_write(u8 *data, int size);
+extern in_addr_t my_address;
+extern int tun_write(uint8_t *data, int size);

 extern int clifd;
 extern int clifd;

-
+extern int epollfd;
+
+struct event_data {
+       enum {
+               FD_TYPE_CLI,
+               FD_TYPE_CLUSTER,
+               FD_TYPE_TUN,
+               FD_TYPE_UDP,
+               FD_TYPE_CONTROL,
+               FD_TYPE_DAE,
+               FD_TYPE_RADIUS,
+               FD_TYPE_BGP,
+       } type;
+       int index; // for RADIUS, BGP
+};

 
 #define TIME (config->current_time)
 
 
 #define TIME (config->current_time)