X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c34bfa1cfc1b1e10c21defcb045e8dd7cd47d30f..9da560ae8ef7f5a1c98884183440e36eb7fb0c15:/l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 0220517..1ce46a3 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,47 +1,83 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.26 2004/11/02 04:35:04 bodea Exp $
+// $Id: l2tpns.h,v 1.121 2009-12-08 14:49:28 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #include <netinet/in.h>
-#include <execinfo.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <netinet/in.h>
+#include <net/ethernet.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.0.2"
+#define VERSION	"2.2.1"
 
 // Limits
 #define MAXTUNNEL	500		// could be up to 65535
-#define MAXSESSION	50000		// could be up to 65535
+#define MAXBUNDLE	300		// could be up to 65535
+#define MAXBUNDLESES	12		// Maximum number of member links in bundle
+#define MAXADDRESS	20		// Maximum length for the Endpoint Discrminiator address
+#define MAXSESSION	60000		// could be up to 65535
 #define MAXTBFS		6000		// Maximum token bucket filters. Might need up to 2 * session.
+#define MAXSESSINGRP	12		// Maximum number of member links in grouped session
+#define MAXGROUPE		300	// could be up to 65535, Maximum number of grouped session
+#define MAXROUTEINGRP	15		// max static routes per group
 
-#define RADIUS_SHIFT	5
-#define RADIUS_MASK	((unsigned short)(((unsigned short)~0) >> (16 - RADIUS_SHIFT)))
-#define	MAXRADIUS	((unsigned long)(1L << RADIUS_SHIFT) * 255)
+// Tunnel Id reserved for pppoe
+#define TUNNEL_ID_PPPOE	1
+
+#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	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 MINMTU		576		// minimum recommended MTU (rfc1063)
+#define MAXMTU		2600		// arbitrary maximum MTU
+#define PPPoE_MRU	1492		// maximum PPPoE MRU (rfc2516: 1500 less PPPoE header (6) and PPP protocol ID (2))
+#define MAXETHER	(MAXMTU+18)	// max packet we try sending to tun
+#define MAXTEL		96		// telephone number
+#define MAXHOSTNAME	256		// hostname
+#define MAXUSER		128		// username
+#define MAXPASS		128		// password
+#define MAXCLASS	128		// radius class attribute size
 #define MAXPLUGINS	20		// maximum number of plugins to load
 #define MAXRADSERVER	10		// max radius servers
-#define	MAXROUTE	10		// max static routes per session
+#define MAXROUTE	10		// max static routes per session
 #define MAXIPPOOL	131072		// max number of ip addresses in pool
 #define RINGBUFFER_SIZE	10000		// Number of ringbuffer entries to allocate
 #define MAX_LOG_LENGTH	512		// Maximum size of log message
-#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 ECHO_TIMEOUT	10		// Time between last packet sent and LCP ECHO generation
+#define IDLE_ECHO_TIMEOUT	240		// Time between last packet seen and session shutdown
 #define BUSY_WAIT_TIME	3000		// 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
 
+#define MP_BEGIN        0x80            // This value is used when (b)egin bit is set in MP header
+#define MP_END          0x40            // This value is used when (e)nd bit is set in MP header
+#define MP_BOTH_BITS    0xC0            // This value is used when both bits (begin and end) are set in MP header
+
+#define MINFRAGLEN	64		// Minumum fragment length
+#define MAXFRAGLEN	1496	// Maximum length for Multilink fragment (The multilink may contain only one link)
+#define MAXFRAGNUM	512		// Maximum number of Multilink fragment in a bundle (must be in the form of 2^X)
+					// it's not expected to have a space for more than 10 unassembled packets = 10 * MAXBUNDLESES
+#define	MAXFRAGNUM_MASK	(MAXFRAGNUM - 1)		// Must be equal to MAXFRAGNUM-1
+
+// Multi bind address constants
+#define MAX_UDPFD 4
+#define MAX_BINDADDR MAX_UDPFD
+// + 1 for the LAC Hostname
+#define MAX_NBHOSTNAME (MAX_UDPFD + 1)
+// 4 + 1 for the udplac
+#define INIT_TABUDPFD {-1, -1, -1, -1, -1}
+#define INIT_TABUDPVAR {0, 0, 0, 0, 0}
+
 // Constants
 #ifndef ETCDIR
 #define ETCDIR		"/etc/l2tpns"
@@ -51,10 +87,6 @@
 #define LIBDIR		"/usr/lib/l2tpns"
 #endif
 
-#ifndef STATEDIR
-#define STATEDIR	"/var/lib/l2tpns"
-#endif
-
 #ifndef PLUGINDIR
 #define PLUGINDIR	LIBDIR		// Plugins
 #endif
@@ -67,31 +99,31 @@
 #define FLASHDIR	ETCDIR
 #endif
 
-#ifndef DATADIR
-#define DATADIR		STATEDIR
-#endif
-
 #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 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	PPPPAP		0xC023
-#define	PPPCHAP		0xC223
-#define	PPPLCP		0xC021
-#define	PPPIPCP		0x8021
-#define	PPPCCP		0x80FD
+#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 PPPIPV6CP	0x8057
+#define PPPCCP		0x80FD
 #define PPPIP		0x0021
+#define PPPIPV6		0x0057
 #define PPPMP		0x003D
 #define MIN_IP_SIZE	0x19
-enum
-{
+
+enum {
 	ConfigReq = 1,
 	ConfigAck,
 	ConfigNak,
@@ -106,24 +138,100 @@ enum
 	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 = 0
+
+// no more attempts
+#define zero_restart_count(_s, _fsm) ({				\
+	sess_local[_s]._fsm.conf_sent =				\
+		config->ppp_max_configure;			\
+	sess_local[_s]._fsm.restart =				\
+		time_now + config->ppp_restart_time;		\
+})
+
+// increment ConfReq counter and reset timer
+#define restart_timer(_s, _fsm) ({				\
+	sess_local[_s]._fsm.conf_sent++;			\
+	sess_local[_s]._fsm.restart =				\
+		time_now + config->ppp_restart_time;		\
+})
+
+// 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
-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 bundleidt;
+typedef uint16_t tunnelidt;
+typedef uint16_t groupidt;
+typedef uint32_t clockt;
+typedef uint8_t hasht[16];
 
 // 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 filter_out;
 };
 
 #define CLI_SESS_KILL		0x01
@@ -131,6 +239,8 @@ struct cli_session_actions {
 #define CLI_SESS_NOSNOOP	0x04
 #define CLI_SESS_THROTTLE	0x08
 #define CLI_SESS_NOTHROTTLE	0x10
+#define CLI_SESS_FILTER		0x20
+#define CLI_SESS_NOFILTER	0x40
 
 struct cli_tunnel_actions {
 	char action;
@@ -138,123 +248,269 @@ struct cli_tunnel_actions {
 
 #define CLI_TUN_KILL		0x01
 
-// dump header: update number if internal format changes
-#define DUMP_MAGIC "L2TPNS#" VERSION "#"
-
 // structures
-typedef struct routes           // route
+typedef struct			// route
 {
-	ipt ip;
-	ipt mask;
+	in_addr_t ip;
+	int prefixlen;
 }
 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;
 
-typedef struct sessions
+typedef struct {
+	uint8_t length;			// Endpoint Discriminator length
+	uint8_t addr_class;		// Endpoint Discriminator class
+	uint8_t address[MAXADDRESS];	// Endpoint Discriminator address
+} epdist;
+
+typedef struct {
+	sessionidt sid;			// Fragment originating session
+	tunnelidt tid;			// Fragment originating tunnel
+	uint8_t	flags;			// MP frame flags
+	uint32_t seq;			// fragment seq num
+	uint32_t jitteravg;
+        uint16_t length;                // Fragment length
+        uint8_t data[MAXFRAGLEN];       // Fragment data
+} fragmentt;
+
+typedef struct
 {
 	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 flags;			// session flags: see SESSION_*
+	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
+	} ppp;
+	uint16_t mru;			// maximum receive unit
+	in_addr_t ip;			// IP of session set by RADIUS response (host byte order).
 	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
+	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 snoop_port;		// Interception destination port
+	in_addr_t snoop_ip;		// Interception destination IP
 	clockt opened;			// when started
 	clockt die;			// being closed, when to finally free
+	uint32_t session_timeout;	// Maximum session time in seconds
+	uint32_t idle_timeout;		// Maximum idle time in seconds
 	time_t last_packet;		// Last packet from the user (used for idle timeouts)
-	ipt dns1, dns2;			// DNS servers
+	time_t last_data;		// Last data packet to/from the user (used for idle timeouts)
+	in_addr_t dns1, dns2;		// DNS servers
 	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;
-	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 session for radius stop messages)
 	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.
-	char reserved[20];		// Space to expand structure without changing HB_VERSION
+	uint32_t tx_connect_speed;
+	uint32_t rx_connect_speed;
+	clockt timeout;                 // Session timeout
+	uint32_t mrru;                  // Multilink Max-Receive-Reconstructed-Unit
+	epdist epdis;                   // Multilink Endpoint Discriminator
+	bundleidt bundle;               // Multilink Bundle Identifier
+	uint8_t mssf;                   // Multilink Short Sequence Number Header Format
+	uint8_t walled_garden;		// is this session gardened?
+	uint8_t classlen;		// class (needed for radius accounting messages)
+	char class[MAXCLASS];
+	uint8_t ipv6prefixlen;		// IPv6 route prefix length
+	struct in6_addr ipv6route;	// Static IPv6 route
+	sessionidt forwardtosession;	// LNS id_session to forward
+	uint8_t src_hwaddr[ETH_ALEN];	// MAC addr source (for pppoe sessions 6 bytes)
+	char reserved[4];				// Space to expand structure without changing HB_VERSION
 }
 sessiont;
 
-#define SF_IPCP_ACKED	(1<<0)		// Has this session seen an IPCP Ack?
+typedef struct
+{
+	uint32_t tx_rate;
+	uint32_t prev_coutgrp;
+	sessionidt sid;
+	uint8_t weight;
+}
+groupsesslistt;
 
-typedef struct {
-	u32	cin;
-	u32	cout;
-} sessioncountt;
+typedef struct
+{
+	int state;				// current state (groupestate enum)
+	uint32_t time_changed;
+	groupidt prev;
+	sessionidt smax;
+	sessionidt smin;
+	groupsesslistt sesslist[MAXSESSINGRP];
+	routet route[MAXROUTEINGRP];		// static routes
+	uint8_t nbroutesgrp;
+	uint8_t nbsession;
+}
+groupsesst;
 
-#define	SESSIONPFC	1            // PFC negotiated flags
-#define	SESSIONACFC	2           // ACFC negotiated flags
-#define SESSIONLCPACK	4	// LCP negotiated
+union iphash
+{
+	sessionidt sess;
+	union iphash *idx;
+};			// Mapping from IP address to session structures.
+
+typedef struct
+{
+        int state;                              // current state (bundlestate enum)
+        uint32_t seq_num_t;                     // Sequence Number (transmission)
+        uint32_t timeout;                       // Session-Timeout for bundle
+	uint32_t max_seq;			// Max value of sequence number field
+        uint8_t num_of_links;                   // Number of links joint to this bundle
+        uint32_t online_time;                   // The time this bundle is online
+        clockt last_check;                      // Last time the timeout is checked
+        uint32_t mrru;                          // Multilink Max-Receive-Reconstructed-Unit
+        uint8_t mssf;                           // Multilink Short Sequence Number Header Format
+        epdist epdis;                           // Multilink Endpoint Discriminator
+        char user[MAXUSER];                     // Needed for matching member links
+        sessionidt current_ses;                 // Current session to use for sending (used in RR load-balancing)
+        sessionidt members[MAXBUNDLESES];       // Array for member links sessions
+}
+bundlet;
+
+typedef struct
+{
+	fragmentt fragment[MAXFRAGNUM];
+	uint8_t reassembled_frame[MAXETHER];    // The reassembled frame
+	uint16_t re_frame_len;                  // The reassembled frame length
+	uint16_t re_frame_begin_index, re_frame_end_index;	// reassembled frame begin index, end index respectively
+	uint16_t start_index, end_index;	// start and end sequence numbers available on the fragments array respectively
+	uint32_t M;				// Minumum frame sequence number received over all bundle members
+	uint32_t start_seq;                     // Last received frame sequence number (bearing B bit)
+}
+fragmentationt;
+
+#define AUTHPAP		1	// allow PAP
+#define AUTHCHAP	2	// allow CHAP
+
+typedef struct
+{
+	// 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;
+
+	// identifier for Protocol-Reject, Code-Reject
+	uint8_t lcp_ident;
+
+	// authentication to use
+	int lcp_authtype;
+
+	// our MRU
+	uint16_t ppp_mru;
+
+	// our MRRU
+	uint16_t mp_mrru;
+
+	// our mssf
+	uint16_t mp_mssf;
+
+	// our Endpoint Discriminator
+	in_addr_t mp_epdis;
+
+	// DoS prevention
+	clockt last_packet_out;
+	uint32_t packets_out;
+	uint32_t packets_dropped;
 
-// 168 bytes per tunnel
-typedef struct tunnels
+	// RADIUS session in use
+	uint16_t radius;
+
+	// interim RADIUS
+	time_t last_interim;
+
+	// last LCP Echo
+	time_t last_echo;
+
+	// Last Multilink frame sequence number received
+	uint32_t last_seq;
+
+	// jitter average of the session
+	uint32_t jitteravg;
+	// time in milliseconds of the last fragment.
+	uint64_t prev_time;
+} sessionlocalt;
+
+// session flags
+#define SESSION_PFC	(1 << 0)	// use Protocol-Field-Compression
+#define SESSION_ACFC	(1 << 1)	// use Address-and-Control-Field-Compression
+#define SESSION_STARTED	(1 << 2)	// RADIUS Start record sent
+
+// 328 bytes per tunnel
+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
+	clockt retry;		// when to try resending pending control
 	clockt die;		// being closed, when to finally free
 	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
+	uint16_t isremotelns;	// != 0 if the tunnel is to remote LNS (== index on the conf remote lns)
+	uint16_t indexudp;	// Index UDP file handle (in udpfd[])
+	char reserved[12];		// Space to expand structure without changing HB_VERSION
 }
 tunnelt;
 
-// 180 bytes per radius session
-typedef struct radiuss		// outstanding RADIUS requests
+// 164 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
-	char calling[MAXTEL];	// calling number
 	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)
+	uint8_t term_cause;	// Stop record: Acct-Terminate-Cause
+	char const *term_msg;	//   terminate reason
 }
 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
@@ -269,7 +525,6 @@ struct Tringbuffer
 		char level;
 		sessionidt session;
 		tunnelidt tunnel;
-		ipt address;
 		char message[MAX_LOG_LENGTH];
 	} buffer[RINGBUFFER_SIZE];
 	int head;
@@ -290,92 +545,128 @@ enum
 	TUNNELUNDEF,		// Undefined
 };
 
+enum
+{
+	BUNDLEFREE,		// Not in use
+	BUNDLEOPEN,		// Active bundle
+	BUNDLEUNDEF,		// Undefined
+};
+
+enum
+{
+	GROUPEFREE,		// Not in use
+	GROUPEOPEN,		// Active bundle
+	GROUPEUNDEF		// Undefined
+};
+
+enum
+{
+	NULLCLASS = 0,		//End Point Discriminator classes
+	LOCALADDR,
+	IPADDR,
+	IEEEMACADDR,
+	PPPMAGIC,
+	PSNDN,
+};
+
 enum
 {
 	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
+	RADIUSINTERIM,		// sending interim accounting to RADIUS server
 	RADIUSWAIT,		// waiting timeout before available, in case delayed replies
-	RADIUSDEAD,		// errored while talking to radius server.
+	RADIUSJUSTAUTH,         // sending auth to RADIUS server, just authentication, no ip assigning
 };
 
 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
-    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
-#define CSTAT(x)	STAT(x)
+#define CSTAT(x)	STAT(call_ ## x)
 #else
 #define CSTAT(x)
 #endif
@@ -392,7 +683,11 @@ struct Tstats
 #define SET_STAT(x, y)
 #endif
 
-struct configt
+#ifndef IFNAMSIZ
+# define IFNAMSIZ 16
+#endif
+
+typedef struct
 {
 	int		debug;				// debugging level
 	time_t		start_time;			// time when l2tpns was started
@@ -405,222 +700,396 @@ struct configt
 
 	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		tundevicename[IFNAMSIZ];		// tun device name
 	char		log_filename[128];
-	char		l2tpsecret[64];
+
+	char		l2tp_secret[64];		// L2TP shared secret
+	int		l2tp_mtu;			// MTU of interface used for L2TP
+
+	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;
-	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;		// port for radius DAE
+	uint16_t	radius_bind_min;		// port range for udp sockets used to send/recv radius packets
+	uint16_t	radius_bind_max;
+
+	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
+	int		kill_timedout_sessions;		// kill authenticated sessions with "session_timeout == 0"
+
+	in_addr_t	default_dns1, default_dns2;
 
 	unsigned long	rl_rate;			// default throttle rate
 	int		num_tbfs;			// number of throttle buckets
 
-	int		save_state;
 	char		accounting_dir[128];
-	ipt		bind_address;
+	int		account_all_origin; // Accouting all origin (LAC data + Remote LNS Data + PPPOE data)
+	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		dump_speed;
 	char		plugins[64][MAXPLUGINS];
 	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		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
+	char		epdis_addr[20];			// MP Endpoint Discriminator address
 
-	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.
-	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).
 	int		cluster_undefined_sessions;	// How many sessions we're yet to receive from the master.
+	int		cluster_undefined_bundles;	// How many bundles we're yet to receive from the master.
 	int		cluster_undefined_tunnels;	// How many tunnels we're yet to receive from the master.
+	int		cluster_undefined_groupes;	// How many groupes we're yet to receive from the master.
 	int		cluster_highest_sessionid;
+	int		cluster_highest_bundleid;
+	int		cluster_highest_groupeid;
 	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_mcast_ttl;		// TTL for multicast packets
 	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.
+	in_addr_t	cli_bind_address;		// bind address for CLI
+	char		hostname[MAXHOSTNAME];	// hostname (overridden by -h on command line)
+	// Guest change
+	char            guest_user[MAXUSER];            // Guest account username
 
 #ifdef BGP
-	u16		as_number;
-	char		bgp_peer[2][64];
-	u16		bgp_peer_as[2];
+#define BGP_NUM_PEERS	2
+	uint16_t as_number;
+	struct {
+		char name[64];
+	    	uint16_t as;
+		int keepalive;
+		int hold;
+		struct in_addr update_source;
+	} neighbour[BGP_NUM_PEERS];
+	in_addr_t	nexthop_address;
+	struct in6_addr	nexthop6_address;
 #endif
-};
 
-struct config_descriptt
+	int echo_timeout; // Time between last packet sent and LCP ECHO generation
+	int idle_echo_timeout; // Time between last packet seen and
+						   // Drop sessions who have not responded within IDLE_ECHO_TIMEOUT seconds
+	in_addr_t iftun_address;
+	int disable_lac_func;
+	int auth_tunnel_change_addr_src;
+	int highest_rlnsid;
+	uint16_t bind_portremotelns;
+	in_addr_t bind_address_remotelns;
+	char pppoe_if_to_bind[IFNAMSIZ];	// Name pppoe interface to bind
+	char pppoe_service_name[64];	// pppoe service name
+	char pppoe_ac_name[64];
+	uint8_t pppoe_hwaddr[ETH_ALEN];	// MAC addr of interface pppoe to bind
+	int pppoe_only_equal_svc_name; // Accept only PADI with service-name equal to server
+	int disable_sending_hello; // Disable l2tp sending HELLO message for Apple compatibility.
+	int disable_no_spoof; // Disable no spoof (permit load balancing client --> internet)
+	int nbudpfd; // number UDP file handle
+	int nbmultiaddress; // number multi address to bind
+	int indexlacudpfd;	// Index UDP LAC file handle (in udpfd[])
+	int nbmultihostname;	// number hostname, normally the same number as the nbudpfd
+	int grp_txrate_average_time; // caculation txrate average time (default 10s)
+	in_addr_t bind_n_address[MAX_BINDADDR];
+	in_addr_t iftun_n_address[MAX_BINDADDR];
+	char bind_multi_address[256];
+	char multi_hostname[512];
+	char multi_n_hostname[MAX_NBHOSTNAME][MAXHOSTNAME];	// list hostname
+} configt;
+
+enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
+typedef struct
 {
 	char *key;
 	int offset;
 	int size;
-	enum { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC } type;
-};
+	enum config_typet type;
+} config_descriptt;
+
+typedef struct
+{
+	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
+	uint16_t port;	// port (host byte order)
+	uint16_t port2;	// range
+} ip_filter_portt;
+
+typedef struct
+{
+	int action;		// permit/deny
+#define FILTER_ACTION_DENY	1
+#define FILTER_ACTION_PERMIT	2
+	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;
+	in_addr_t dst_ip;	// dest ip
+	in_addr_t dst_wild;
+	ip_filter_portt dst_ports;
+	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_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
+#define TCP_FLAG_SYN	0x02
+#define TCP_FLAG_RST	0x04
+#define TCP_FLAG_PSH	0x08
+#define TCP_FLAG_ACK	0x10
+#define TCP_FLAG_URG	0x20
+
+#define MAXFILTER		32
+#define MAXFILTER_RULES		32
+typedef struct
+{
+    	char name[32];		// ACL name
+	int extended;		// type: 0 = standard, 1 = extended
+	ip_filter_rulet rules[MAXFILTER_RULES];
+	int used;		// session ref count
+} ip_filtert;
+
+// CDN result/error codes
+#define CDN_NONE			0, 0
+#define CDN_TRY_ANOTHER			2, 7
+#define CDN_ADMIN_DISC			3, 0
+#define CDN_UNAVAILABLE			4, 0
+
+// RADIUS Acct-Terminate-Cause values
+#define TERM_USER_REQUEST		1
+#define TERM_LOST_CARRIER		2
+#define TERM_LOST_SERVICE		3
+#define TERM_IDLE_TIMEOUT		4
+#define TERM_SESSION_TIMEOUT		5
+#define TERM_ADMIN_RESET		6
+#define TERM_ADMIN_REBOOT		7
+#define TERM_PORT_ERROR			8
+#define TERM_NAS_ERROR			9
+#define TERM_NAS_REQUEST		10
+#define TERM_NAS_REBOOT			11
+#define TERM_PORT_UNNEEDED		12
+#define TERM_PORT_PREEMPTED		13
+#define TERM_PORT_SUSPENDED		14
+#define TERM_SERVICE_UNAVAILABLE	15
+#define TERM_CALLBACK			16
+#define TERM_USER_ERROR			17
+#define TERM_HOST_REQUEST		18
+#define TERM_SUPPLICANT_RESTART		19
+#define TERM_REAUTHENTICATION_FAILURE	20
+#define TERM_PORT_REINIT		21
+#define TERM_PORT_DISABLED		22
+
+// on slaves, alow BGP to withdraw cleanly before exiting
+#define QUIT_DELAY	5
+
+// quit actions (master)
+#define QUIT_FAILOVER	1 // SIGTERM: exit when all control messages have been acked (for cluster failover)
+#define QUIT_SHUTDOWN	2 // SIGQUIT: shutdown sessions/tunnels, reject new connections
 
 // 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
-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 sendchap(tunnelidt t, sessionidt s);
-u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype);
-u8 *findppp(u8 * b, u8 mtype);
-void initlcp(tunnelidt t, sessionidt s);
-void dumplcp(u8 *p, int l);
+void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void lcp_open(sessionidt s, tunnelidt t);
+void lcp_restart(sessionidt s);
+void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processmpframe(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint8_t extra);
+void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void sendchap(sessionidt s, tunnelidt t);
+uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits);
+uint8_t *opt_makeppp(uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits);
+void sendlcp(sessionidt s, tunnelidt t);
+void send_ipin(sessionidt s, uint8_t *buf, int len);
+void sendccp(sessionidt s, tunnelidt t);
+void protoreject(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint16_t proto);
+int join_bundle(sessionidt s);
 
 
 // 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, struct in_addr *local);
+int rad_tunnel_pwdecode(uint8_t *pl2tpsecret, size_t *pl2tpsecretlen, const char *radiussecret, const uint8_t * auth);
 
 // l2tpns.c
-clockt now(void);
-clockt backoff(u8 try);
-void routeset(sessionidt, ipt ip, ipt mask, ipt gw, u8 add);
-void inittun(void);
-void initudp(void);
-void initdata(int optdebug, char *optconfig);
-void initippool();
-sessionidt sessionbyip(ipt ip);
+clockt backoff(uint8_t try);
+void send_ipv6_ra(sessionidt s, tunnelidt t, 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);
-void sessionshutdown(sessionidt s, char *reason);
-void sessionsendarp(sessionidt s);
-void send_garp(ipt ip);
+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 control16(controlt * c, u16 avp, u16 val, u8 m);
-void control32(controlt * c, u16 avp, u32 val, u8 m);
-void controls(controlt * c, u16 avp, char *val, u8 m);
-void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m);
-controlt *controlnew(u16 mtype);
-void controlnull(tunnelidt t);
-void controladd(controlt * c, tunnelidt t, sessionidt s);
-void tunnelsend(u8 * buf, u16 l, tunnelidt t);
-void tunnelkill(tunnelidt t, char *reason);
-void tunnelshutdown(tunnelidt t, char *reason);
-void sendipcp(tunnelidt t, sessionidt s);
-void processipout(u8 * buf, int len);
-void processarp(u8 * buf, int len);
-void processudp(u8 * buf, int len, struct sockaddr_in *addr);
-void processtun(u8 * buf, int len);
-void processcontrol(u8 * buf, int len, struct sockaddr_in *addr);
-int assign_ip_address(sessionidt s);
-void free_ip_address(sessionidt s);
-void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port);
-void dump_acct_info();
-void mainloop(void);
+void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_error, int term_cause);
+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);
+int tun_write(uint8_t *data, int size);
+void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *tcp);
+void sendipcp(sessionidt s, tunnelidt t);
+void sendipv6cp(sessionidt s, tunnelidt t);
+void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexudpfd);
+void processipout(uint8_t *buf, int len);
+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);
-
-#define log _log
-#ifndef log_hex
-#define log_hex(a,b,c,d) do{if (a <= config->debug) _log_hex(a,0,0,0,b,c,d);}while (0)
-#endif
-void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 5, 6)));
-void _log_hex(int level, ipt address, sessionidt s, tunnelidt t, const char *title, const char *data, int maxsize);
-void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response);
-int sessionsetup(tunnelidt t, sessionidt s);
-int cluster_send_session(int s);
-int cluster_send_tunnel(int t);
-int cluster_send_goodbye();
-void init_cli(char *hostname);
-void cli_do_file(FILE *fh);
-void cli_do(int sockfd);
-int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);
-#ifdef RINGBUFFER
-void ringbuffer_dump(FILE *stream);
-#endif
-void initplugins(void);
+void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
+ssize_t netlink_send(struct nlmsghdr *nh);
+void cache_ipmap(in_addr_t ip, sessionidt s);
+
+tunnelidt lac_new_tunnel();
+void lac_tunnelclear(tunnelidt t);
+void lac_send_SCCRQ(tunnelidt t, uint8_t * auth, unsigned int auth_len);
+void lac_send_ICRQ(tunnelidt t, sessionidt s);
+void lac_tunnelshutdown(tunnelidt t, char *reason, int result, int error, char *msg);
+
+// grpsess.c
+sessionidt grp_getnextsession(groupidt g, in_addr_t ip);
+void grp_initdata(void);
+void grp_processvendorspecific(sessionidt s, uint8_t *pvs);
+groupidt grp_groupbysession(sessionidt s);
+groupidt grp_groupbyip(in_addr_t ip);
+void grp_setgrouproute(groupidt g, int add);
+void grp_time_changed(void);
+void grp_removesession(groupidt g, sessionidt s);
+int grp_cluster_load_groupe(groupidt g, groupsesst *new);
+
+#undef LOG
+#undef LOG_HEX
+#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); })
+
+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(sessionidt s, tunnelidt t);
 int run_plugins(int plugin_type, void *data);
-void add_plugin(char *plugin_name);
-void remove_plugin(char *plugin_name);
-void plugins_done(void);
-void tunnelclear(tunnelidt t);
-void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int packet_len);
-void fix_address_pool(int sid);
 void rebuild_address_pool(void);
-void send_ipin(sessionidt s, u8 * buf, int len);
 void throttle_session(sessionidt s, int rate_in, int rate_out);
 int load_session(sessionidt, sessiont *);
 void become_master(void);	// We're the master; kick off any required master initializations.
+
+
+// cli.c
+void init_cli();
+void cli_init_complete(char *hostname);
+void cli_do_file(FILE *fh);
+void cli_do(int sockfd);
+int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);
+
+
+// icmp.c
+void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, uint8_t *packet, int packet_len);
+
+
 extern tunnelt *tunnel;
+extern bundlet *bundle;
 extern sessiont *session;
-extern sessioncountt *sess_count;
+extern sessionlocalt *sess_local;
 extern ippoolt *ip_address_pool;
+extern groupsesst *grpsession;
+extern groupidt gnextgrpid;
 #define sessionfree (session[0].next)
 
-#define log_backtrace(count, max) \
-if (count++ < max) { \
-	void *array[20]; \
-	char **strings; \
-	int size, i; \
-	log(0, 0, 0, t, "Backtrace follows"); \
-	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]); \
-	} \
-	free(strings); \
-}
-
 
-extern struct configt *config;
+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 ipt my_address;
-extern int tun_write(u8 *data, int size);
+extern in_addr_t my_address;
 extern int clifd;
-
+extern int epollfd;
+extern int tunidx;		// ifr_ifindex of tun device
+extern union iphash ip_hash[256];
+
+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,
+		FD_TYPE_NETLINK,
+		FD_TYPE_PPPOEDISC,
+		FD_TYPE_PPPOESESS
+	} type;
+	int index; // for RADIUS, BGP, UDP
+};
 
 #define TIME (config->current_time)
 
+extern uint16_t MRU;
+extern uint16_t MSS;
+
 // macros for handling help in cli commands
 #define CLI_HELP_REQUESTED	(argc > 0 && argv[argc-1][strlen(argv[argc-1])-1] == '?')
 #define CLI_HELP_NO_ARGS	(argc > 1 || argv[0][1]) ? CLI_OK : cli_arg_help(cli, 1, NULL)
 
-// CVS identifiers (for "show version file")
-extern char const *cvs_id_arp;
-extern char const *cvs_id_cli;
-extern char const *cvs_id_cluster;
-extern char const *cvs_id_constants;
-extern char const *cvs_id_control;
-extern char const *cvs_id_icmp;
-extern char const *cvs_id_l2tpns;
-extern char const *cvs_id_ll;
-extern char const *cvs_id_md5;
-extern char const *cvs_id_ppp;
-extern char const *cvs_id_radius;
-extern char const *cvs_id_tbf;
-extern char const *cvs_id_util;
-
 #endif /* __L2TPNS_H__ */