X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/bd2ec601493cece0de9e565e7bd497b129bece10..f7d7b969237382bbed0f0494c12c1ed9b5f6647f:/l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 040861c..6a359fd 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.75 2005-06-02 11:32:31 bodea Exp $
+// $Id: l2tpns.h,v 1.79 2005-06-24 07:05:04 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.1.0"
+#define VERSION	"2.1.2"
 
 // Limits
 #define MAXTUNNEL	500		// could be up to 65535
@@ -23,6 +23,7 @@
 #define MAXTBFS		6000		// Maximum token bucket filters. Might need up to 2 * session.
 
 #define RADIUS_SHIFT	6
+#define	RADIUS_FDS	(1 << RADIUS_SHIFT)
 #define RADIUS_MASK	((1 << RADIUS_SHIFT) - 1)
 #define MAXRADIUS	(1 << (8 + RADIUS_SHIFT))
 
@@ -455,7 +456,6 @@ typedef struct
 	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
 
 	char		radius_authtypes_s[32];		// list of valid authentication types (chap, pap) in order of preference
 	int		radius_authtypes;
@@ -672,12 +672,12 @@ if (count++ < max) { \
 	void *array[20]; \
 	char **strings; \
 	int size, i; \
-	LOG(0, 0, t, "Backtrace follows"); \
+	LOG(0, 0, t, "Backtrace follows:\n"); \
 	size = backtrace(array, 10); \
 	strings = backtrace_symbols(array, size); \
 	if (strings) for (i = 0; i < size; i++) \
 	{ \
-		LOG(0, 0, t, "%s\n", strings[i]); \
+		LOG(0, 0, t, " %s\n", strings[i]); \
 	} \
 	free(strings); \
 }
@@ -692,7 +692,20 @@ extern struct Tstats *_statistics;
 extern in_addr_t my_address;
 extern int tun_write(uint8_t *data, int size);
 extern int clifd;
-
+extern int epollfd;
+
+struct event_data {
+	enum {
+	    	FD_TYPE_CONTROL,
+	    	FD_TYPE_CLI,
+	    	FD_TYPE_UDP,
+	    	FD_TYPE_TUN,
+	    	FD_TYPE_CLUSTER,
+		FD_TYPE_RADIUS,
+		FD_TYPE_BGP,
+	} type;
+	int index; // for RADIUS, BGP
+};
 
 #define TIME (config->current_time)