X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/caa9662496578822d24926b927365639c936c761..92bfbe46e854e7ff40d6d4297c8df74f1efcf10f:/cluster.h

diff --git a/cluster.h b/cluster.h
index 6a769e4..3df6c4d 100644
--- a/cluster.h
+++ b/cluster.h
@@ -25,12 +25,11 @@
 #define C_CBUNDLE		18	// Compressed bundle structure.
 #define C_MPPP_FORWARD	19	// MPPP Forwarded packet..
 #define C_PPPOE_FORWARD	20	// PPPOE Forwarded packet..
+#define C_GROUPE		21	// Groupe structure.
+#define C_CGROUPE		22	// Compressed groupe structure.
 
-#ifdef LAC
-#define HB_VERSION		7	// Protocol version number..
-#else
-#define HB_VERSION		6	// Protocol version number..
-#endif
+
+#define HB_VERSION		9	// Protocol version number..
 #define HB_MAX_SEQ		(1<<30)	// Maximum sequence number. (MUST BE A POWER OF 2!)
 #define HB_HISTORY_SIZE		64	// How many old heartbeats we remember?? (Must be a factor of HB_MAX_SEQ)
 
@@ -62,7 +61,10 @@ typedef struct {
 
 	uint64_t table_version;	// # state changes processed by cluster
 
-	char reserved[128 - 13*sizeof(uint32_t) - sizeof(uint64_t)];	// Pad out to 128 bytes.
+	uint32_t highgroupe;	// Id of the highest used groupe.
+	uint32_t nextgrpid;	// nextgrpid to set gnextgrpid on slave
+
+	char reserved[128 - 15*sizeof(uint32_t) - sizeof(uint64_t)];	// Pad out to 128 bytes.
 } heartt;
 
 typedef struct {		/* Used to update byte counters on the */
@@ -85,8 +87,9 @@ int cluster_init(void);
 int processcluster(uint8_t *buf, int size, in_addr_t addr);
 int cluster_send_session(int sid);
 int cluster_send_bundle(int bid);
+int cluster_send_groupe(int gid);
 int cluster_send_tunnel(int tid);
-int master_forward_packet(uint8_t *data, int size, in_addr_t addr, int port);
+int master_forward_packet(uint8_t *data, int size, in_addr_t addr, uint16_t port, uint16_t indexudp);
 int master_forward_dae_packet(uint8_t *data, int size, in_addr_t addr, int port);
 int master_throttle_packet(int tid, uint8_t *data, int size);
 int master_garden_packet(sessionidt s, uint8_t *data, int size);
@@ -96,7 +99,7 @@ void cluster_send_ping(time_t basetime);
 void cluster_heartbeat(void);
 void cluster_check_master(void);
 void cluster_check_slaves(void);
-int cmd_show_cluster(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_cluster(struct cli_def *cli, const char *command, char **argv, int argc);
 int master_forward_pppoe_packet(uint8_t *data, int size, uint8_t codepad);
 
 #endif /* __CLUSTER_H__ */