move code from signal handlers into mainloop, avoiding a race

[l2tpns.git] / cluster.h

diff --git a/cluster.h b/cluster.h
index 63fbc77..fe95218 100644 (file)
--- a/cluster.h
+++ b/cluster.h
@@ -1,5 +1,5 @@
 // L2TPNS Clustering Stuff
 // L2TPNS Clustering Stuff

-// $Id: cluster.h,v 1.11 2005/05/26 12:17:30 bodea Exp $
+// $Id: cluster.h,v 1.14 2005/07/31 10:04:10 bodea Exp $

 
 #ifndef __CLUSTER_H__
 #define __CLUSTER_H__
 
 #ifndef __CLUSTER_H__
 #define __CLUSTER_H__


@@ -20,6 +20,7 @@
 #define C_CTUNNEL              13      // Compressed tunnel structure.
 #define C_GARDEN               14      // Gardened packet
 #define C_MASTER               15      // Tell a slave the address of the master.
 #define C_CTUNNEL              13      // Compressed tunnel structure.
 #define C_GARDEN               14      // Gardened packet
 #define C_MASTER               15      // Tell a slave the address of the master.

+#define C_FORWARD_DAE          16      // A DAE packet for the master to handle

 
 #define HB_VERSION             5       // Protocol version number..
 #define HB_MAX_SEQ             (1<<30) // Maximum sequence number. (MUST BE A POWER OF 2!)
 
 #define HB_VERSION             5       // Protocol version number..
 #define HB_MAX_SEQ             (1<<30) // Maximum sequence number. (MUST BE A POWER OF 2!)


@@ -57,8 +58,10 @@ typedef struct {
 typedef struct {               /* Used to update byte counters on the */
                                /* master. */
        uint32_t sid;
 typedef struct {               /* Used to update byte counters on the */
                                /* master. */
        uint32_t sid;

-       uint32_t in;
-       uint32_t out;
+       uint32_t pin;
+       uint32_t pout;
+       uint32_t cin;
+       uint32_t cout;

 } bytest;
 
 typedef struct {
 } bytest;
 
 typedef struct {


@@ -69,12 +72,13 @@ typedef struct {
 } pingt;
 
 int cluster_init(void);
 } pingt;
 
 int cluster_init(void);

-int processcluster(char *buf, int size, in_addr_t addr);
+int processcluster(uint8_t *buf, int size, in_addr_t addr);

 int cluster_send_session(int sid);
 int cluster_send_tunnel(int tid);
 int cluster_send_session(int sid);
 int cluster_send_tunnel(int tid);

-int master_forward_packet(char *data, int size, in_addr_t addr, int port);
-int master_throttle_packet(int tid, char *data, int size);
-int master_garden_packet(sessionidt s, char *data, int size);
+int master_forward_packet(uint8_t *data, int size, in_addr_t addr, int port);
+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);

 void master_update_counts(void);
 void cluster_send_ping(time_t basetime);
 void cluster_heartbeat(void);
 void master_update_counts(void);
 void cluster_send_ping(time_t basetime);
 void cluster_heartbeat(void);