X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/a17df3e475822332b4bdaee70992b44042316d32..c9dedbc735ba69c1f2c9ebc3281c87a1465db127:/l2tpns.h?ds=inline

diff --git a/l2tpns.h b/l2tpns.h
index 2cf1797..e7584f9 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.13 2004-07-26 00:20:41 fred_nerk Exp $
+// $Id: l2tpns.h,v 1.50 2004-12-18 01:20:05 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.0.1"
+#define VERSION	"2.1.0"
 
 // Limits
 #define MAXTUNNEL	500		// could be up to 65535
@@ -24,7 +24,7 @@
 
 #define RADIUS_SHIFT	5
 #define RADIUS_MASK	((unsigned short)(((unsigned short)~0) >> (16 - RADIUS_SHIFT)))
-#define	MAXRADIUS	((2 << (RADIUS_SHIFT - 1)) * 255)
+#define	MAXRADIUS	((unsigned long)(1L << RADIUS_SHIFT) * 255)
 
 #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.
@@ -40,42 +40,57 @@
 #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 BUSY_WAIT_TIME	3000		// 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
 
 // Constants
-#include "config.h"
-#ifndef PLUGINDIR
-#define PLUGINDIR	LIBDIR			// Plugins
+#ifndef ETCDIR
+#define ETCDIR		"/etc/l2tpns"
 #endif
 
-#ifndef PLUGINCONF
-#define PLUGINCONF	ETCDIR			// Plugin config dir
+#ifndef LIBDIR
+#define LIBDIR		"/usr/lib/l2tpns"
 #endif
 
-#ifndef DATADIR
-#define DATADIR		"/tmp"
+#ifndef STATEDIR
+#define STATEDIR	"/var/lib/l2tpns"
+#endif
+
+#ifndef PLUGINDIR
+#define PLUGINDIR	LIBDIR		// Plugins
+#endif
+
+#ifndef PLUGINCONF
+#define PLUGINCONF	ETCDIR		// Plugin config dir
 #endif
 
 #ifndef FLASHDIR
 #define FLASHDIR	ETCDIR
 #endif
 
+#ifndef DATADIR
+#define DATADIR		STATEDIR
+#endif
+
 #define TUNDEVICE	"/dev/net/tun"
 #define STATEFILE	DATADIR "/state.dump"		// State dump file
 #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 ACCT_SHUT_TIME	600		// 1 minute for counters of shutdown sessions
 #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	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
@@ -90,26 +105,25 @@ enum
 	ProtocolRej,
 	EchoReq,
 	EchoReply,
-	DiscardRequest
+	DiscardRequest,
+	IdentRequest
 };
 
 // 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;
-	ipt snoop_ip;
-	u16 snoop_port;
-	int throttle;
+	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
@@ -117,9 +131,11 @@ 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;
+	char action;
 };
 
 #define CLI_TUN_KILL		0x01
@@ -128,83 +144,93 @@ struct cli_tunnel_actions {
 #define DUMP_MAGIC "L2TPNS#" VERSION "#"
 
 // structures
-typedef struct routes           // route
+typedef struct			// route
 {
-	ipt ip;
-	ipt mask;
+	in_addr_t ip;
+	in_addr_t mask;
 }
 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
 {
 	sessionidt next;		// next session in linked list
 	sessionidt far;			// far end session ID
-	tunnelidt tunnel;		// tunnel ID
-	ipt ip;				// IP of session set by RADIUS response (host byte order).
+	tunnelidt tunnel;		// near end tunnel ID
+	in_addr_t ip;			// IP of session set by RADIUS response (host byte order).
 	int ip_pool_index;		// index to IP pool
-	unsigned long sid;		// session id for hsddb
-	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
-	u32 throttle;			// non-zero if this session is throttled.
+	unsigned long unique_id;	// unique session id
+	uint16_t nr;			// next receive
+	uint16_t ns;			// next send
+	uint32_t magic;			// ppp magic number
+	uint32_t cin, cout;		// byte counts
+	uint32_t pin, pout;		// packet counts
+	uint32_t total_cin;		// This counter is never reset while a session is open
+	uint32_t total_cout;		// This counter is never reset while a session is open
+	uint32_t id;			// session id
+	uint16_t throttle_in;		// upstream throttle rate (kbps)
+	uint16_t throttle_out;		// downstream throttle rate
 	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
-	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 walled_garden;		// is this session gardened?
-	u8 flags1;			// additional flags (currently unused);
+	uint16_t radius;		// which radius session is being used (0 for not waiting on authentication)
+	uint16_t mru;			// maximum receive unit
+	uint16_t tbf_in;		// filter bucket for throttling in from the user.
+	uint16_t tbf_out;		// filter bucket for throttling out to the user.
+	uint8_t l2tp_flags;		// various bit flags from the ICCN on the l2tp tunnel.
+	uint8_t reserved_old_snoop;	// No longer used - remove at some time
+	uint8_t walled_garden;		// is this session gardened?
+	uint8_t flags1;			// additional flags (currently unused);
 	char random_vector[MAXTEL];
 	int random_vector_length;
 	char user[129];			// user (needed in seesion for radius stop messages) (can we reduce this? --mo)
 	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
-	char reserved[28];		// Space to expand structure without changing HB_VERSION
+	uint32_t tx_connect_speed;
+	uint32_t rx_connect_speed;
+	uint32_t flags;			// Various session flags.
+	in_addr_t snoop_ip;		// Interception destination IP
+	uint16_t snoop_port;		// Interception destination port
+	uint16_t sid;			// near end session id.
+	uint8_t filter_in;		// input filter index (to ip_filters[N-1]; 0 if none)
+	uint8_t filter_out;		// output filter index
+	char reserved[18];		// Space to expand structure without changing HB_VERSION
 }
 sessiont;
 
-#define SF_IPCP_ACKED	(1<<0)		// Has this session seen an IPCP Ack?
+#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 SF_IPV6CP_ACKED	8	// IPv6 negotiated
+#define SF_IPV6_NACKED	16	// IPv6 rejected
 
-typedef struct {
-	u32	cin;
-	u32	cout;
+typedef struct
+{
+	uint32_t cin;
+	uint32_t cout;
 } sessioncountt;
 
-#define	SESSIONPFC	1            // PFC negotiated flags
-#define	SESSIONACFC	2           // ACFC negotiated flags
+#define	SESSIONPFC	1	// PFC negotiated flags
+#define	SESSIONACFC	2	// ACFC negotiated flags
 
 // 168 bytes per tunnel
-typedef struct tunnels
+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
@@ -212,31 +238,31 @@ typedef struct tunnels
 	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;
 
 // 180 bytes per radius session
-typedef struct radiuss		// outstanding RADIUS requests
+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)
 }
 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
@@ -251,7 +277,6 @@ struct Tringbuffer
 		char level;
 		sessionidt session;
 		tunnelidt tunnel;
-		ipt address;
 		char message[MAX_LOG_LENGTH];
 	} buffer[RINGBUFFER_SIZE];
 	int head;
@@ -286,71 +311,76 @@ enum
 
 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	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_processudp;
+    uint32_t	call_sessionbyip;
+    uint32_t	call_sessionbyuser;
+    uint32_t	call_sendarp;
+    uint32_t	call_sendipcp;
+    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_processccp;
+    uint32_t	call_sendchap;
+    uint32_t	call_processrad;
+    uint32_t	call_radiussend;
+    uint32_t	call_radiusretry;
 #endif
 };
 
@@ -374,11 +404,13 @@ struct Tstats
 #define SET_STAT(x, y)
 #endif
 
-struct configt
+typedef struct
 {
 	int		debug;				// debugging level
 	time_t		start_time;			// time when l2tpns was started
 	char		bandwidth[256];			// current bandwidth
+	char		pid_file[256];			// file to write PID to on startup
+	int		wrote_pid;
 	clockt		current_time;			// 1/10ths of a second since the process started.
 							// means that we can only run a given process
 							// for 13 years without re-starting!
@@ -394,17 +426,20 @@ struct configt
 
 	char		radiussecret[64];
 	int		radius_accounting;
-	ipt		radiusserver[MAXRADSERVER];	// radius servers
-	u16		radiusport[MAXRADSERVER];	// radius base ports
-	u8		numradiusservers;		// radius server count
+	in_addr_t	radiusserver[MAXRADSERVER];	// radius servers
+	uint16_t	radiusport[MAXRADSERVER];	// radius base ports
+	uint8_t		numradiusservers;		// radius server count
 	short		num_radfds;			// Number of radius filehandles allocated
 
-	ipt		default_dns1, default_dns2;
+	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;
 	int		save_state;
 	char		accounting_dir[128];
-	ipt		bind_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;
@@ -417,12 +452,12 @@ struct configt
 	int		lock_pages;			// Lock pages into memory.
 	int		icmp_rate;			// Max number of ICMP unreachable per second to send>
 
-	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).
@@ -435,130 +470,149 @@ struct configt
 
 	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
 
 #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;
+	} neighbour[BGP_NUM_PEERS];
 #endif
-};
+} configt;
 
-struct config_descriptt
+enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6, MAC };
+typedef struct
 {
 	char *key;
 	int offset;
 	int size;
-	enum { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP } 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;
 
 // 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 processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
+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 processipin(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);
-u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype);
-u8 *findppp(u8 * b, u8 mtype);
+uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionidt s, uint16_t mtype);
 void initlcp(tunnelidt t, sessionidt s);
-void dumplcp(u8 *p, int l);
+void send_ipin(sessionidt s, uint8_t *buf, int len);
 
 
 // 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);
-
-// throttle.c
-int throttle_session(sessionidt s, int throttle);
-
-
-// rl.c
-void init_rl();
-u16 rl_create_tbf();
-u16 rl_get_tbf();
-void rl_done_tbf(u16 t);
-void rl_destroy_tbf(u16 t);
+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);
 
 
 // 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(void);
-void initippool();
-sessionidt sessionbyip(ipt ip);
+clockt backoff(uint8_t try);
+sessionidt sessionbyip(in_addr_t ip);
 sessionidt sessionbyuser(char *username);
 void sessionshutdown(sessionidt s, char *reason);
-void sessionsendarp(sessionidt s);
-void send_garp(ipt ip);
-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 send_garp(in_addr_t ip);
+void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t);
 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 processudp(uint8_t *buf, int len, struct sockaddr_in *addr);
+void snoop_send_packet(char *packet, uint16_t size, in_addr_t destination, uint16_t port);
+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);
+#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 char *data, int maxsize);
+
 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);
 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);
-int throttle_session(sessionidt s, int throttle);
+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(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, char *packet, int packet_len);
+
+
 extern tunnelt *tunnel;
 extern sessiont *session;
 extern sessioncountt *sess_count;
@@ -570,24 +624,25 @@ if (count++ < max) { \
 	void *array[20]; \
 	char **strings; \
 	int size, i; \
-	log(0, 0, 0, t, "Backtrace follows"); \
+	LOG(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]); \
+		LOG(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_sid;
+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 tun_write(uint8_t *data, int size);
+extern int clifd;
 
 
 #define TIME (config->current_time)