X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/4ad75362584e275243a7b70bc64f1762ebc552d9..6f73a1b071bc286a9482d37c580452188e26ac37:/l2tpns.h?ds=inline

diff --git a/l2tpns.h b/l2tpns.h
index ea13670..bc6938f 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.10 2004-07-07 09:09:53 bodea Exp $
+// $Id: l2tpns.h,v 1.25 2004-10-30 07:17:41 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.0.0"
+#define VERSION	"2.0.2"
 
 // Limits
 #define MAXTUNNEL	500		// could be up to 65535
@@ -24,13 +24,13 @@
 
 #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.
 
 #define	MAXCONTROL	1000		// max length control message we ever send...
-#define	MAXETHER	(1500+18)	// max packet we try sending to tap
+#define	MAXETHER	(1500+18)	// max packet we try sending to tun
 #define	MAXTEL		96		// telephone number
 #define MAXPLUGINS	20		// maximum number of plugins to load
 #define MAXRADSERVER	10		// max radius servers
@@ -40,26 +40,38 @@
 #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
 
-#define TAPDEVICE	"/dev/net/tun"
+#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
@@ -67,7 +79,6 @@
 #define ACCT_TIME	3000		// 5 minute accounting interval
 #define	L2TPPORT	1701		// L2TP port
 #define RADPORT		1645		// old radius port...
-#define	RADAPORT	1646		// old radius accounting port
 #define	PKTARP		0x0806		// ARP packet type
 #define	PKTIP		0x0800		// IP packet type
 #define PSEUDOMAC	0x0200		// pseudo MAC prefix (local significant MAC)
@@ -91,7 +102,8 @@ enum
 	ProtocolRej,
 	EchoReq,
 	EchoReply,
-	DiscardRequest
+	DiscardRequest,
+	IdentRequest
 };
 
 // Types
@@ -105,6 +117,26 @@ typedef u16 tunnelidt;
 typedef u32 clockt;
 typedef u8 hasht[16];
 
+// CLI actions
+struct cli_session_actions {
+	char action;
+	ipt snoop_ip;
+	u16 snoop_port;
+	int throttle;
+};
+
+#define CLI_SESS_KILL		0x01
+#define CLI_SESS_SNOOP		0x02
+#define CLI_SESS_NOSNOOP	0x04
+#define CLI_SESS_THROTTLE	0x08
+#define CLI_SESS_NOTHROTTLE	0x10
+
+struct cli_tunnel_actions {
+	char action;
+};
+
+#define CLI_TUN_KILL		0x01
+
 // dump header: update number if internal format changes
 #define DUMP_MAGIC "L2TPNS#" VERSION "#"
 
@@ -128,10 +160,10 @@ typedef struct sessions
 {
 	sessionidt next;		// next session in linked list
 	sessionidt far;			// far end session ID
-	tunnelidt tunnel;		// tunnel ID
+	tunnelidt tunnel;		// near end tunnel ID
 	ipt 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
+	unsigned long unique_id;	// unique session id
 	u16 nr;				// next receive
 	u16 ns;				// next send
 	u32 magic;			// ppp magic number
@@ -151,6 +183,7 @@ typedef struct sessions
 	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];
@@ -163,7 +196,8 @@ typedef struct sessions
 	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
+	u16 sid;			// near end session id.
+	char reserved[20];		// Space to expand structure without changing HB_VERSION
 }
 sessiont;
 
@@ -176,6 +210,7 @@ typedef struct {
 
 #define	SESSIONPFC	1            // PFC negotiated flags
 #define	SESSIONACFC	2           // ACFC negotiated flags
+#define SESSIONLCPACK	4	// LCP negotiated
 
 // 168 bytes per tunnel
 typedef struct tunnels
@@ -270,12 +305,12 @@ struct Tstats
     time_t		start_time;
     time_t		last_reset;
 
-    unsigned long	tap_rx_packets;
-    unsigned long	tap_tx_packets;
-    unsigned long	tap_rx_bytes;
-    unsigned long	tap_tx_bytes;
-    unsigned long	tap_rx_errors;
-    unsigned long	tap_tx_errors;
+    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;
@@ -287,11 +322,7 @@ struct Tstats
     unsigned long	tunnel_retries;
     unsigned long	radius_retries;
 
-    unsigned long	arp_errors;
-    unsigned long	arp_replies;
-    unsigned long	arp_discarded;
     unsigned long	arp_sent;
-    unsigned long	arp_recv;
 
     unsigned long	packets_snooped;
 
@@ -310,8 +341,7 @@ struct Tstats
     unsigned long	c_forwarded;
     unsigned long	recv_forward;
 #ifdef STATISTICS
-    unsigned long	call_processtap;
-    unsigned long	call_processarp;
+    unsigned long	call_processtun;
     unsigned long	call_processipout;
     unsigned long	call_processudp;
     unsigned long	call_sessionbyip;
@@ -365,6 +395,8 @@ struct configt
 	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!
@@ -374,19 +406,22 @@ struct configt
 	int		cleanup_interval;		// interval between regular cleanups (in seconds)
 	int		multi_read_count;		// amount of packets to read per fd in processing loop
 
-	char		tapdevice[10];			// tap device name
+	char		tundevice[10];			// tun device name
 	char		log_filename[128];
 	char		l2tpsecret[64];
 
 	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
 
 	ipt		default_dns1, default_dns2;
 
-	unsigned long	rl_rate;
+	unsigned long	rl_rate;			// throttle rate
+	int		num_tbfs;			// number of throttle buckets
+
 	int		save_state;
 	char		accounting_dir[128];
 	ipt		bind_address;
@@ -398,9 +433,9 @@ struct configt
 	char		old_plugins[64][MAXPLUGINS];
 
 	int		next_tbf;			// Next HTB id available to use
-	int		scheduler_fifo;			// If 1, will force scheduler to use SCHED_FIFO.
-							// Don't use this unless you have a dual processor machine!
-	int		icmp_rate;			// Max number of ICMP unreachable per second to send
+	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>
 
 	u32		cluster_address;		// Multicast address of cluster.
 							// Send to this address to have everyone hear.
@@ -433,7 +468,7 @@ struct config_descriptt
 	char *key;
 	int offset;
 	int size;
-	enum { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP } type;
+	enum { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC } type;
 };
 
 // arp.c
@@ -462,25 +497,14 @@ 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);
-
 
 // l2tpns.c
 clockt now(void);
 clockt backoff(u8 try);
 void routeset(sessionidt, ipt ip, ipt mask, ipt gw, u8 add);
-void inittap(void);
+void inittun(void);
 void initudp(void);
-void initdata(void);
+void initdata(int optdebug, char *optconfig);
 void initippool();
 sessionidt sessionbyip(ipt ip);
 sessionidt sessionbyuser(char *username);
@@ -502,7 +526,7 @@ 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 processtap(u8 * buf, int len);
+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);
@@ -569,7 +593,7 @@ if (count++ < max) { \
 extern struct configt *config;
 extern time_t basetime;		// Time when this process started.
 extern time_t time_now;		// Seconds since EPOCH.
-extern u32 last_sid;
+extern u32 last_id;
 extern struct Tstats *_statistics;
 extern ipt my_address;
 extern int tun_write(u8 *data, int size);