X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/92db0e2617cec9b118708c722c1a9f273001f87d..ce928583b47102056e28201bd677f4813fada3c6:/l2tpns.h?ds=inline

diff --git a/l2tpns.h b/l2tpns.h
index 8e3d26e..6314ae7 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -49,7 +49,7 @@
 #define RINGBUFFER_SIZE	10000		// Number of ringbuffer entries to allocate
 #define MAX_LOG_LENGTH	512		// Maximum size of log message
 #define ECHO_TIMEOUT	10		// Time between last packet sent and LCP ECHO generation
-#define IDLE_TIMEOUT	240		// Time between last packet seen and session shutdown
+#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
@@ -57,10 +57,10 @@
 #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	750		// Maximum length for Multilink fragment (MTU / 2 sessions)
-#define MAXFRAGNUM	128		// Maximum number of Multilink fragment in a bundle (must be in the form of 2^X)
+#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	127		// Must be equal to MAXFRAGNUM-1
+#define	MAXFRAGNUM_MASK	511		// Must be equal to MAXFRAGNUM-1
 
 // Constants
 #ifndef ETCDIR
@@ -258,8 +258,10 @@ typedef struct {
 
 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;
@@ -407,6 +409,11 @@ typedef struct
 
 	// 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
@@ -739,6 +746,10 @@ typedef struct
 	in_addr_t	nexthop_address;
 	struct in6_addr	nexthop6_address;
 #endif
+
+	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
 } configt;
 
 enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
@@ -886,6 +897,7 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t
 void sendipcp(sessionidt s, tunnelidt t);
 void sendipv6cp(sessionidt s, tunnelidt t);
 void processudp(uint8_t *buf, int len, struct sockaddr_in *addr);
+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);