X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/4d7d7850b5d242bf9b77ac07e7c06ef523c627e6..10353b0a8d25cf78006d3037e48ec29164080754:/l2tpns.h?ds=sidebyside

diff --git a/l2tpns.h b/l2tpns.h
index 1229096..7f7ecf5 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.48 2004/12/16 23:40:31 bodea Exp $
+// $Id: l2tpns.h,v 1.49.2.8 2005/05/16 04:51:42 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -15,16 +15,16 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.0.13"
+#define VERSION	"2.0.19"
 
 // 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 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_MASK	((1 << RADIUS_SHIFT) - 1)
+#define MAXRADIUS	((1 << (RADIUS_SHIFT + 8)) - 1)
 
 #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.
@@ -211,9 +211,15 @@ sessiont;
 
 typedef struct
 {
+	// byte counters
 	uint32_t cin;
 	uint32_t cout;
-} sessioncountt;
+
+	// DoS prevention
+	clockt last_packet_out;
+	uint32_t packets_out;
+	uint32_t packets_dropped;
+} sessionlocalt;
 
 #define	SESSIONPFC	1	// PFC negotiated flags
 #define	SESSIONACFC	2	// ACFC negotiated flags
@@ -316,6 +322,7 @@ struct Tstats
     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;
@@ -346,9 +353,9 @@ struct Tstats
     uint32_t	c_forwarded;
     uint32_t	recv_forward;
 
-    uint32_t	select_called;		// number of times select called
-    uint32_t	select_ready;		// number of fds returned by select
-    uint32_t	select_processed;	// number of read/writes handled per select
+    uint32_t	select_called;
+    uint32_t	multi_read_used;
+    uint32_t	multi_read_exceeded;
 
 #ifdef STATISTICS
     uint32_t	call_processtun;
@@ -446,7 +453,8 @@ typedef struct
 	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		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
 
 	in_addr_t	cluster_address;		// Multicast address of cluster.
 							// Send to this address to have everyone hear.
@@ -571,6 +579,7 @@ void radiusclear(uint16_t r, sessionidt s);
 clockt backoff(uint8_t try);
 sessionidt sessionbyip(in_addr_t ip);
 sessionidt sessionbyuser(char *username);
+void sessionkill(sessionidt s, char *reason);
 void sessionshutdown(sessionidt s, char *reason);
 void send_garp(in_addr_t ip);
 void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t);
@@ -611,7 +620,7 @@ void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char
 
 extern tunnelt *tunnel;
 extern sessiont *session;
-extern sessioncountt *sess_count;
+extern sessionlocalt *sess_local;
 extern ippoolt *ip_address_pool;
 #define sessionfree (session[0].next)