Merge from master

[l2tpns.git] / cluster.h

diff --git a/cluster.h b/cluster.h
index 02f7965..b1aebaf 100644 (file)
--- a/cluster.h
+++ b/cluster.h
@@ -23,8 +23,13 @@
 #define C_FORWARD_DAE          16      // A DAE packet for the master to handle
 #define C_BUNDLE               17      // Bundle structure.
 #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.
 
-#define HB_VERSION             6       // Protocol version number..
+
+#define HB_VERSION             7       // 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)
 
@@ -56,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 */
@@ -79,16 +87,19 @@ 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);
+int master_forward_mppp_packet(sessionidt s, uint8_t *data, int size);
 void master_update_counts(void);
 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__ */