X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/1e722029bc405a555e81840c00708084128c5cdd..f6b5140de23dd17f9a9c28fcca0fcef58b161a78:/l2tpns.h?ds=sidebyside

diff --git a/l2tpns.h b/l2tpns.h
index 89f49dd..1ce46a3 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -24,6 +24,9 @@
 #define MAXADDRESS	20		// Maximum length for the Endpoint Discrminiator address
 #define MAXSESSION	60000		// could be up to 65535
 #define MAXTBFS		6000		// Maximum token bucket filters. Might need up to 2 * session.
+#define MAXSESSINGRP	12		// Maximum number of member links in grouped session
+#define MAXGROUPE		300	// could be up to 65535, Maximum number of grouped session
+#define MAXROUTEINGRP	15		// max static routes per group
 
 // Tunnel Id reserved for pppoe
 #define TUNNEL_ID_PPPOE	1
@@ -69,6 +72,8 @@
 // Multi bind address constants
 #define MAX_UDPFD 4
 #define MAX_BINDADDR MAX_UDPFD
+// + 1 for the LAC Hostname
+#define MAX_NBHOSTNAME (MAX_UDPFD + 1)
 // 4 + 1 for the udplac
 #define INIT_TABUDPFD {-1, -1, -1, -1, -1}
 #define INIT_TABUDPVAR {0, 0, 0, 0, 0}
@@ -214,6 +219,7 @@ enum {
 typedef uint16_t sessionidt;
 typedef uint16_t bundleidt;
 typedef uint16_t tunnelidt;
+typedef uint16_t groupidt;
 typedef uint32_t clockt;
 typedef uint8_t hasht[16];
 
@@ -331,10 +337,39 @@ typedef struct
 	struct in6_addr ipv6route;	// Static IPv6 route
 	sessionidt forwardtosession;	// LNS id_session to forward
 	uint8_t src_hwaddr[ETH_ALEN];	// MAC addr source (for pppoe sessions 6 bytes)
-	char reserved[4];		// Space to expand structure without changing HB_VERSION
+	char reserved[4];				// Space to expand structure without changing HB_VERSION
 }
 sessiont;
 
+typedef struct
+{
+	uint32_t tx_rate;
+	uint32_t prev_coutgrp;
+	sessionidt sid;
+	uint8_t weight;
+}
+groupsesslistt;
+
+typedef struct
+{
+	int state;				// current state (groupestate enum)
+	uint32_t time_changed;
+	groupidt prev;
+	sessionidt smax;
+	sessionidt smin;
+	groupsesslistt sesslist[MAXSESSINGRP];
+	routet route[MAXROUTEINGRP];		// static routes
+	uint8_t nbroutesgrp;
+	uint8_t nbsession;
+}
+groupsesst;
+
+union iphash
+{
+	sessionidt sess;
+	union iphash *idx;
+};			// Mapping from IP address to session structures.
+
 typedef struct
 {
         int state;                              // current state (bundlestate enum)
@@ -517,6 +552,13 @@ enum
 	BUNDLEUNDEF,		// Undefined
 };
 
+enum
+{
+	GROUPEFREE,		// Not in use
+	GROUPEOPEN,		// Active bundle
+	GROUPEUNDEF		// Undefined
+};
+
 enum
 {
 	NULLCLASS = 0,		//End Point Discriminator classes
@@ -696,6 +738,7 @@ typedef struct
 	int		num_tbfs;			// number of throttle buckets
 
 	char		accounting_dir[128];
+	int		account_all_origin; // Accouting all origin (LAC data + Remote LNS Data + PPPOE data)
 	in_addr_t	bind_address;
 	in_addr_t	peer_address;
 	int		send_garp;			// Set to true to garp for vip address on startup
@@ -724,8 +767,10 @@ typedef struct
 	int		cluster_undefined_sessions;	// How many sessions we're yet to receive from the master.
 	int		cluster_undefined_bundles;	// How many bundles we're yet to receive from the master.
 	int		cluster_undefined_tunnels;	// How many tunnels we're yet to receive from the master.
+	int		cluster_undefined_groupes;	// How many groupes we're yet to receive from the master.
 	int		cluster_highest_sessionid;
 	int		cluster_highest_bundleid;
+	int		cluster_highest_groupeid;
 	int		cluster_highest_tunnelid;
 	clockt		cluster_last_hb;		// Last time we saw a heartbeat from the master.
 	int		cluster_last_hb_ver;		// Heartbeat version last seen from master
@@ -779,9 +824,13 @@ typedef struct
 	int nbudpfd; // number UDP file handle
 	int nbmultiaddress; // number multi address to bind
 	int indexlacudpfd;	// Index UDP LAC file handle (in udpfd[])
+	int nbmultihostname;	// number hostname, normally the same number as the nbudpfd
+	int grp_txrate_average_time; // caculation txrate average time (default 10s)
 	in_addr_t bind_n_address[MAX_BINDADDR];
 	in_addr_t iftun_n_address[MAX_BINDADDR];
 	char bind_multi_address[256];
+	char multi_hostname[512];
+	char multi_n_hostname[MAX_NBHOSTNAME][MAXHOSTNAME];	// list hostname
 } configt;
 
 enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
@@ -945,12 +994,27 @@ 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);
+void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
+ssize_t netlink_send(struct nlmsghdr *nh);
+void cache_ipmap(in_addr_t ip, sessionidt s);
+
 tunnelidt lac_new_tunnel();
 void lac_tunnelclear(tunnelidt t);
 void lac_send_SCCRQ(tunnelidt t, uint8_t * auth, unsigned int auth_len);
 void lac_send_ICRQ(tunnelidt t, sessionidt s);
 void lac_tunnelshutdown(tunnelidt t, char *reason, int result, int error, char *msg);
 
+// grpsess.c
+sessionidt grp_getnextsession(groupidt g, in_addr_t ip);
+void grp_initdata(void);
+void grp_processvendorspecific(sessionidt s, uint8_t *pvs);
+groupidt grp_groupbysession(sessionidt s);
+groupidt grp_groupbyip(in_addr_t ip);
+void grp_setgrouproute(groupidt g, int add);
+void grp_time_changed(void);
+void grp_removesession(groupidt g, sessionidt s);
+int grp_cluster_load_groupe(groupidt g, groupsesst *new);
+
 #undef LOG
 #undef LOG_HEX
 #define LOG(D, s, t, f, ...)	({ if (D <= config->debug) _log(D, s, t, f, ## __VA_ARGS__); })
@@ -985,6 +1049,8 @@ extern bundlet *bundle;
 extern sessiont *session;
 extern sessionlocalt *sess_local;
 extern ippoolt *ip_address_pool;
+extern groupsesst *grpsession;
+extern groupidt gnextgrpid;
 #define sessionfree (session[0].next)
 
 
@@ -997,6 +1063,8 @@ extern struct Tstats *_statistics;
 extern in_addr_t my_address;
 extern int clifd;
 extern int epollfd;
+extern int tunidx;		// ifr_ifindex of tun device
+extern union iphash ip_hash[256];
 
 struct event_data {
 	enum {