Fix cluster group update

[l2tpns.git] / cluster.c

diff --git a/cluster.c b/cluster.c
index b54ae0c..fc4d58a 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -16,11 +16,13 @@
 #include <malloc.h>
 #include <errno.h>
 #include <libcli.h>
 #include <malloc.h>
 #include <errno.h>
 #include <libcli.h>

+#include <linux/rtnetlink.h>

 
 #include "l2tpns.h"
 #include "cluster.h"
 #include "util.h"
 #include "tbf.h"
 
 #include "l2tpns.h"
 #include "cluster.h"
 #include "util.h"
 #include "tbf.h"

+#include "pppoe.h"

 
 #ifdef BGP
 #include "bgp.h"
 
 #ifdef BGP
 #include "bgp.h"


@@ -42,6 +44,7 @@ in_addr_t my_address = 0;             // The network address of my ethernet port.
 static int walk_session_number = 0;    // The next session to send when doing the slow table walk.
 static int walk_bundle_number = 0;     // The next bundle to send when doing the slow table walk.
 static int walk_tunnel_number = 0;     // The next tunnel to send when doing the slow table walk.
 static int walk_session_number = 0;    // The next session to send when doing the slow table walk.
 static int walk_bundle_number = 0;     // The next bundle to send when doing the slow table walk.
 static int walk_tunnel_number = 0;     // The next tunnel to send when doing the slow table walk.

+static int walk_groupe_number = 0;     // The next groupe to send when doing the slow table walk.

 int forked = 0;                                // Sanity check: CLI must not diddle with heartbeat table
 
 #define MAX_HEART_SIZE (8192)  // Maximum size of heartbeat packet. Must be less than max IP packet size :)
 int forked = 0;                                // Sanity check: CLI must not diddle with heartbeat table
 
 #define MAX_HEART_SIZE (8192)  // Maximum size of heartbeat packet. Must be less than max IP packet size :)


@@ -86,6 +89,7 @@ int cluster_init()
        config->cluster_undefined_sessions = MAXSESSION-1;
        config->cluster_undefined_bundles = MAXBUNDLE-1;
        config->cluster_undefined_tunnels = MAXTUNNEL-1;
        config->cluster_undefined_sessions = MAXSESSION-1;
        config->cluster_undefined_bundles = MAXBUNDLE-1;
        config->cluster_undefined_tunnels = MAXTUNNEL-1;

+       config->cluster_undefined_groupes = MAXGROUPE-1;

 
        if (!config->cluster_address)
                return 0;
 
        if (!config->cluster_address)
                return 0;


@@ -227,7 +231,8 @@ static void cluster_uptodate(void)
        if (config->cluster_iam_uptodate)
                return;
 
        if (config->cluster_iam_uptodate)
                return;
 

-       if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels || config->cluster_undefined_bundles)
+       if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels ||
+               config->cluster_undefined_bundles || config->cluster_undefined_groupes)

                return;
 
        config->cluster_iam_uptodate = 1;
                return;
 
        config->cluster_iam_uptodate = 1;


@@ -303,10 +308,40 @@ static int _forward_packet(uint8_t *data, int size, in_addr_t addr, int port, in
 //
 // The master just processes the payload as if it had
 // received it off the tun device.
 //
 // The master just processes the payload as if it had
 // received it off the tun device.

-//
-int master_forward_packet(uint8_t *data, int size, in_addr_t addr, int port)
+//(note: THIS ROUTINE WRITES TO pack[-6]).
+int master_forward_packet(uint8_t *data, int size, in_addr_t addr, uint16_t port, uint16_t indexudp)

 {
 {

-       return _forward_packet(data, size, addr, port, C_FORWARD);
+       uint8_t *p = data - (3 * sizeof(uint32_t));
+       uint8_t *psave = p;
+       uint32_t indexandport = port | ((indexudp << 16) & 0xFFFF0000);
+
+       if (!config->cluster_master_address) // No election has been held yet. Just skip it.
+               return -1;
+
+       LOG(4, 0, 0, "Forwarding packet from %s to master (size %d)\n", fmtaddr(addr, 0), size);
+
+       STAT(c_forwarded);
+       add_type(&p, C_FORWARD, addr, (uint8_t *) &indexandport, sizeof(indexandport));
+
+       return peer_send_data(config->cluster_master_address, psave, size + (3 * sizeof(uint32_t)));
+}
+
+// Forward PPPOE packet to the master.
+//(note: THIS ROUTINE WRITES TO pack[-4]).
+int master_forward_pppoe_packet(uint8_t *data, int size, uint8_t codepad)
+{
+       uint8_t *p = data - (2 * sizeof(uint32_t));
+       uint8_t *psave = p;
+
+       if (!config->cluster_master_address) // No election has been held yet. Just skip it.
+               return -1;
+
+       LOG(4, 0, 0, "Forward PPPOE packet to master, code %s (size %d)\n", get_string_codepad(codepad), size);
+
+       STAT(c_forwarded);
+       add_type(&p, C_PPPOE_FORWARD, codepad, NULL, 0);
+
+       return peer_send_data(config->cluster_master_address, psave, size + (2 * sizeof(uint32_t)));

 }
 
 // Forward a DAE RADIUS packet to the master.
 }
 
 // Forward a DAE RADIUS packet to the master.


@@ -422,7 +457,8 @@ void cluster_send_ping(time_t basetime)
 
        x.ver = 1;
        x.addr = config->bind_address;
 
        x.ver = 1;
        x.addr = config->bind_address;

-       x.undef = config->cluster_undefined_sessions + config->cluster_undefined_tunnels + config->cluster_undefined_bundles;
+       x.undef = config->cluster_undefined_sessions + config->cluster_undefined_tunnels +
+                       config->cluster_undefined_groupes + config->cluster_undefined_bundles;

        x.basetime = basetime;
 
        add_type(&p, C_PING, basetime, (uint8_t *) &x, sizeof(x));
        x.basetime = basetime;
 
        add_type(&p, C_PING, basetime, (uint8_t *) &x, sizeof(x));


@@ -606,6 +642,7 @@ void cluster_check_master(void)
                // to become a master!!!
 
        config->cluster_iam_master = 1;
                // to become a master!!!
 
        config->cluster_iam_master = 1;

+       pppoe_send_garp(); // gratuitous arp of the pppoe interface

 
        LOG(0, 0, 0, "I am declaring myself the master!\n");
 
 
        LOG(0, 0, 0, "I am declaring myself the master!\n");
 


@@ -643,6 +680,20 @@ void cluster_check_master(void)
                         config->cluster_highest_bundleid = i;
         }
 
                         config->cluster_highest_bundleid = i;
         }
 

+               //
+               // Go through and mark all the groupes as defined.
+               // Count the highest used groupe number as well.
+               //
+               config->cluster_highest_groupeid = 0;
+               for (i = 0; i < MAXGROUPE; ++i)
+               {
+                       if (grpsession[i].state == GROUPEUNDEF)
+                               grpsession[i].state = GROUPEFREE;
+
+                       if (grpsession[i].state != GROUPEFREE && i > config->cluster_highest_groupeid)
+                               config->cluster_highest_groupeid = i;
+               }
+

                //
                // Go through and mark all the sessions as being defined.
                // reset the idle timeouts.
                //
                // Go through and mark all the sessions as being defined.
                // reset the idle timeouts.


@@ -710,6 +761,7 @@ void cluster_check_master(void)
        config->cluster_undefined_sessions = 0;
        config->cluster_undefined_bundles = 0;
        config->cluster_undefined_tunnels = 0;
        config->cluster_undefined_sessions = 0;
        config->cluster_undefined_bundles = 0;
        config->cluster_undefined_tunnels = 0;

+       config->cluster_undefined_groupes = 0;

        config->cluster_iam_uptodate = 1; // assume all peers are up-to-date
 
        // FIXME. We need to fix up the tunnel control message
        config->cluster_iam_uptodate = 1; // assume all peers are up-to-date
 
        // FIXME. We need to fix up the tunnel control message


@@ -726,7 +778,7 @@ void cluster_check_master(void)
 // we fix it up here, and we ensure that the 'first free session'
 // pointer is valid.
 //
 // we fix it up here, and we ensure that the 'first free session'
 // pointer is valid.
 //

-static void cluster_check_sessions(int highsession, int freesession_ptr, int highbundle, int hightunnel)
+static void cluster_check_sessions(int highsession, int freesession_ptr, int highbundle, int hightunnel, int highgroupe)

 {
        int i;
 
 {
        int i;
 


@@ -735,7 +787,8 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
        if (config->cluster_iam_uptodate)
                return;
 
        if (config->cluster_iam_uptodate)
                return;
 

-       if (highsession > config->cluster_undefined_sessions && highbundle > config->cluster_undefined_bundles && hightunnel > config->cluster_undefined_tunnels)
+       if (highsession > config->cluster_undefined_sessions && highbundle > config->cluster_undefined_bundles &&
+               highgroupe > config->cluster_undefined_groupes && hightunnel > config->cluster_undefined_tunnels)

                return;
 
                // Clear out defined sessions, counting the number of
                return;
 
                // Clear out defined sessions, counting the number of


@@ -777,10 +830,23 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
                        ++config->cluster_undefined_tunnels;
        }
 
                        ++config->cluster_undefined_tunnels;
        }
 

+       // Clear out defined groupe, counting the number of
+       // undefs remaining.
+       config->cluster_undefined_groupes = 0;
+       for (i = 1 ; i < MAXGROUPE; ++i) {
+               if (i > highgroupe) {
+                       if (grpsession[i].state == GROUPEUNDEF) grpsession[i].state = GROUPEFREE; // Defined.
+                       continue;
+               }
+
+               if (grpsession[i].state == GROUPEUNDEF)
+                       ++config->cluster_undefined_groupes;
+       }

 
 

-       if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels || config->cluster_undefined_bundles) {
-               LOG(2, 0, 0, "Cleared undefined sessions/bundles/tunnels. %d sess (high %d), %d bund (high %d), %d tunn (high %d)\n",
-                       config->cluster_undefined_sessions, highsession, config->cluster_undefined_bundles, highbundle, config->cluster_undefined_tunnels, hightunnel);
+       if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels || config->cluster_undefined_bundles || config->cluster_undefined_groupes) {
+               LOG(2, 0, 0, "Cleared undefined sessions/bundles/tunnels. %d sess (high %d), %d bund (high %d), %d grp (high %d), %d tunn (high %d)\n",
+                       config->cluster_undefined_sessions, highsession, config->cluster_undefined_bundles, highbundle,
+                       config->cluster_undefined_groupes, highgroupe, config->cluster_undefined_tunnels, hightunnel);

                return;
        }
 
                return;
        }
 


@@ -834,6 +900,27 @@ static int hb_add_type(uint8_t **p, int type, int id)
                        add_type(p, C_BUNDLE, id, (uint8_t *) &bundle[id], sizeof(bundlet));
                        break;
 
                        add_type(p, C_BUNDLE, id, (uint8_t *) &bundle[id], sizeof(bundlet));
                        break;
 

+               case C_CGROUPE: { // Compressed C_GROUPE
+                       uint8_t c[sizeof(groupsesst) * 2]; // Bigger than worst case.
+                       uint8_t *d = (uint8_t *) &grpsession[id];
+                       uint8_t *orig = d;
+                       int size;
+
+                       size = rle_compress( &d,  sizeof(groupsesst), c, sizeof(c) );
+
+                       // Did we compress the full structure, and is the size actually
+                       // reduced??
+                       if ( (d - orig) == sizeof(groupsesst) && size < sizeof(groupsesst) )
+                       {
+                               add_type(p, C_CGROUPE, id, c, size);
+                               break;
+                       }
+                       // Failed to compress : Fall through.
+               }
+               case C_GROUPE:
+                       add_type(p, C_GROUPE, id, (uint8_t *) &grpsession[id], sizeof(groupsesst));
+                       break;
+

                case C_CTUNNEL: { // Compressed C_TUNNEL
                        uint8_t c[sizeof(tunnelt) * 2]; // Bigger than worst case.
                        uint8_t *d = (uint8_t *) &tunnel[id];
                case C_CTUNNEL: { // Compressed C_TUNNEL
                        uint8_t c[sizeof(tunnelt) * 2]; // Bigger than worst case.
                        uint8_t *d = (uint8_t *) &tunnel[id];


@@ -866,7 +953,7 @@ static int hb_add_type(uint8_t **p, int type, int id)
 //
 void cluster_heartbeat()
 {
 //
 void cluster_heartbeat()
 {

-       int i, count = 0, tcount = 0, bcount = 0;
+       int i, count = 0, tcount = 0, bcount = 0, gcount = 0;

        uint8_t buff[MAX_HEART_SIZE + sizeof(heartt) + sizeof(int) ];
        heartt h;
        uint8_t *p = buff;
        uint8_t buff[MAX_HEART_SIZE + sizeof(heartt) + sizeof(int) ];
        heartt h;
        uint8_t *p = buff;


@@ -888,9 +975,11 @@ void cluster_heartbeat()
        h.freesession = sessionfree;
        h.hightunnel = config->cluster_highest_tunnelid;
        h.highbundle = config->cluster_highest_bundleid;
        h.freesession = sessionfree;
        h.hightunnel = config->cluster_highest_tunnelid;
        h.highbundle = config->cluster_highest_bundleid;

+       h.highgroupe = config->cluster_highest_groupeid;

        h.size_sess = sizeof(sessiont);         // Just in case.
        h.size_bund = sizeof(bundlet);
        h.size_tunn = sizeof(tunnelt);
        h.size_sess = sizeof(sessiont);         // Just in case.
        h.size_bund = sizeof(bundlet);
        h.size_tunn = sizeof(tunnelt);

+       h.nextgrpid = gnextgrpid;

        h.interval = config->cluster_hb_interval;
        h.timeout  = config->cluster_hb_timeout;
        h.table_version = config->cluster_table_version;
        h.interval = config->cluster_hb_interval;
        h.timeout  = config->cluster_hb_timeout;
        h.table_version = config->cluster_table_version;


@@ -909,7 +998,7 @@ void cluster_heartbeat()
 
                //
                // Fill out the packet with sessions from the session table...
 
                //
                // Fill out the packet with sessions from the session table...

-               // (not forgetting to leave space so we can get some tunnels in too )
+               // (not forgetting to leave space so we can get some tunnels,bundle,groupe in too )

        while ( (p + sizeof(uint32_t) * 2 + sizeof(sessiont) * 2 ) < (buff + MAX_HEART_SIZE) ) {
 
                if (!walk_session_number)       // session #0 isn't valid.
        while ( (p + sizeof(uint32_t) * 2 + sizeof(sessiont) * 2 ) < (buff + MAX_HEART_SIZE) ) {
 
                if (!walk_session_number)       // session #0 isn't valid.


@@ -924,40 +1013,59 @@ void cluster_heartbeat()
                ++count;                        // Count the number of extra sessions we're sending.
        }
 
                ++count;                        // Count the number of extra sessions we're sending.
        }
 

-               //
-               // Fill out the packet with tunnels from the tunnel table...
-               // This effectively means we walk the tunnel table more quickly
-               // than the session table. This is good because stuffing up a 
-               // tunnel is a much bigger deal than stuffing up a session.
-               //
-       while ( (p + sizeof(uint32_t) * 2 + sizeof(tunnelt) ) < (buff + MAX_HEART_SIZE) ) {
+       //
+       // Fill out the packet with tunnels from the tunnel table...
+       // This effectively means we walk the tunnel table more quickly
+       // than the session table. This is good because stuffing up a
+       // tunnel is a much bigger deal than stuffing up a session.
+       //
+       int maxsize = (sizeof(tunnelt) < sizeof(bundlet)) ? sizeof(bundlet):sizeof(tunnelt);
+       maxsize = (sizeof(groupsesst) < maxsize) ? maxsize:sizeof(groupsesst);
+       maxsize += (sizeof(uint32_t) * 2);
+
+       // Fill out the packet with tunnels,bundlets, groupes from the tables...
+       while ( (p + maxsize) < (buff + MAX_HEART_SIZE) )
+       {
+               if ((tcount >= config->cluster_highest_tunnelid) &&
+                       (bcount >= config->cluster_highest_bundleid) &&
+                       (gcount >= config->cluster_highest_groupeid))
+                               break;

 
 

-               if (!walk_tunnel_number)        // tunnel #0 isn't valid.
-                       ++walk_tunnel_number;
+               if ( ((p + sizeof(uint32_t) * 2 + sizeof(tunnelt) ) < (buff + MAX_HEART_SIZE)) &&
+                        (tcount < config->cluster_highest_tunnelid))
+               {
+                       if (!walk_tunnel_number)        // tunnel #0 isn't valid.
+                               ++walk_tunnel_number;

 
 

-               if (tcount >= config->cluster_highest_tunnelid)
-                       break;
+                       hb_add_type(&p, C_CTUNNEL, walk_tunnel_number);
+                       walk_tunnel_number = (1+walk_tunnel_number)%(config->cluster_highest_tunnelid+1);       // +1 avoids divide by zero.

 
 

-               hb_add_type(&p, C_CTUNNEL, walk_tunnel_number);
-               walk_tunnel_number = (1+walk_tunnel_number)%(config->cluster_highest_tunnelid+1);       // +1 avoids divide by zero.
+                       ++tcount;
+               }

 
 

-               ++tcount;
-       }
+               if ( ((p + sizeof(uint32_t) * 2 + sizeof(bundlet) ) < (buff + MAX_HEART_SIZE)) &&
+                        (bcount < config->cluster_highest_bundleid))
+               {
+                       if (!walk_bundle_number)        // bundle #0 isn't valid.
+                               ++walk_bundle_number;

 
 

-               //
-               // Fill out the packet with bundles from the bundle table...
-       while ( (p + sizeof(uint32_t) * 2 + sizeof(bundlet) ) < (buff + MAX_HEART_SIZE) ) {
+                       hb_add_type(&p, C_CBUNDLE, walk_bundle_number);
+                       walk_bundle_number = (1+walk_bundle_number)%(config->cluster_highest_bundleid+1);       // +1 avoids divide by zero.

 
 

-               if (!walk_bundle_number)        // bundle #0 isn't valid.
-                       ++walk_bundle_number;
+                       ++bcount;
+               }

 
 

-               if (bcount >= config->cluster_highest_bundleid)
-                       break;
+               if ( ((p + sizeof(uint32_t) * 2 + sizeof(groupsesst) ) < (buff + MAX_HEART_SIZE)) &&
+                        (gcount < config->cluster_highest_groupeid))
+               {
+                       if (!walk_groupe_number)        // groupe #0 isn't valid.
+                               ++walk_groupe_number;

 
 

-               hb_add_type(&p, C_CBUNDLE, walk_bundle_number);
-               walk_bundle_number = (1+walk_bundle_number)%(config->cluster_highest_bundleid+1);       // +1 avoids divide by zero.
-               ++bcount;
-        }
+                       hb_add_type(&p, C_CGROUPE, walk_groupe_number);
+                       walk_groupe_number = (1+walk_groupe_number)%(config->cluster_highest_groupeid+1);       // +1 avoids divide by zero.
+                       ++gcount;
+               }
+       }

 
                //
                // Did we do something wrong?
 
                //
                // Did we do something wrong?


@@ -968,10 +1076,10 @@ void cluster_heartbeat()
        }
 
        LOG(4, 0, 0, "Sending v%d heartbeat #%d, change #%" PRIu64 " with %d changes "
        }
 
        LOG(4, 0, 0, "Sending v%d heartbeat #%d, change #%" PRIu64 " with %d changes "

-                    "(%d x-sess, %d x-bundles, %d x-tunnels, %d highsess, %d highbund, %d hightun, size %d)\n",
+                    "(%d x-sess, %d x-bundles, %d x-tunnels, %d x-groupes, %d highsess, %d highbund, %d hightun, %d highgrp, size %d)\n",

            HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,
            HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,

-           count, bcount, tcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,
-           config->cluster_highest_tunnelid, (int) (p - buff));
+           count, bcount, tcount, gcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,
+           config->cluster_highest_tunnelid, config->cluster_highest_groupeid, (int) (p - buff));

 
        config->cluster_num_changes = 0;
 
 
        config->cluster_num_changes = 0;
 


@@ -988,12 +1096,20 @@ static int type_changed(int type, int id)
        int i;
 
        for (i = 0 ; i < config->cluster_num_changes ; ++i)
        int i;
 
        for (i = 0 ; i < config->cluster_num_changes ; ++i)

-               if ( cluster_changes[i].id == id &&
-                       cluster_changes[i].type == type)
-                       return 0;       // Already marked for change.
+       {
+               if ( cluster_changes[i].id == id && cluster_changes[i].type == type)
+               {
+                       // Already marked for change, remove it
+                       --config->cluster_num_changes;
+                       memmove(&cluster_changes[i],
+                                       &cluster_changes[i+1],
+                                       (config->cluster_num_changes - i) * sizeof(cluster_changes[i]));
+                       break;
+               }
+       }

 
 

-       cluster_changes[i].type = type;
-       cluster_changes[i].id = id;
+       cluster_changes[config->cluster_num_changes].type = type;
+       cluster_changes[config->cluster_num_changes].id = id;

        ++config->cluster_num_changes;
 
        if (config->cluster_num_changes > MAX_CHANGES)
        ++config->cluster_num_changes;
 
        if (config->cluster_num_changes > MAX_CHANGES)


@@ -1002,7 +1118,6 @@ static int type_changed(int type, int id)
        return 1;
 }
 
        return 1;
 }
 

-

 // A particular session has been changed!
 int cluster_send_session(int sid)
 {
 // A particular session has been changed!
 int cluster_send_session(int sid)
 {


@@ -1030,6 +1145,18 @@ int cluster_send_bundle(int bid)
        return type_changed(C_CBUNDLE, bid);
 }
 
        return type_changed(C_CBUNDLE, bid);
 }
 

+// A particular groupe has been changed!
+int cluster_send_groupe(int gid)
+{
+       if (!config->cluster_iam_master)
+       {
+               LOG(0, 0, gid, "I'm not a master, but I just tried to change a groupe!\n");
+               return -1;
+       }
+
+       return type_changed(C_CGROUPE, gid);
+}
+

 // A particular tunnel has been changed!
 int cluster_send_tunnel(int tid)
 {
 // A particular tunnel has been changed!
 int cluster_send_tunnel(int tid)
 {


@@ -1294,6 +1421,31 @@ static int cluster_recv_bundle(int more, uint8_t *p)
         return 0;
 }
 
         return 0;
 }
 

+static int cluster_recv_groupe(int more, uint8_t *p)
+{
+       if (more >= MAXGROUPE) {
+               LOG(0, 0, 0, "DANGER: Received a group id > MAXGROUPE!\n");
+               return -1;
+       }
+
+       if (grpsession[more].state == GROUPEUNDEF) {
+               if (config->cluster_iam_uptodate) { // Sanity.
+                       LOG(0, 0, 0, "I thought I was uptodate but I just found an undefined group!\n");
+               } else {
+                       --config->cluster_undefined_groupes;
+               }
+       }
+
+       grp_cluster_load_groupe(more, (groupsesst *) p);        // Copy groupe into groupe table..
+
+       LOG(5, 0, more, "Received group update (%d undef)\n", config->cluster_undefined_groupes);
+
+       if (!config->cluster_iam_uptodate)
+               cluster_uptodate();     // Check to see if we're up to date.
+
+        return 0;
+}
+

 static int cluster_recv_tunnel(int more, uint8_t *p)
 {
        if (more >= MAXTUNNEL) {
 static int cluster_recv_tunnel(int more, uint8_t *p)
 {
        if (more >= MAXTUNNEL) {


@@ -1457,6 +1609,7 @@ static uint8_t *convert_session(struct oldsession *old)
 // Process a heartbeat..
 //
 // v6: added RADIUS class attribute, re-ordered session structure
 // Process a heartbeat..
 //
 // v6: added RADIUS class attribute, re-ordered session structure

+// v7: added tunnelt attribute at the end of struct (tunnelt size change)

 static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t *p, in_addr_t addr)
 {
        heartt *h;
 static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t *p, in_addr_t addr)
 {
        heartt *h;


@@ -1464,11 +1617,11 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
        int i, type;
        int hb_ver = more;
 
        int i, type;
        int hb_ver = more;
 

-#if HB_VERSION != 6
+#if HB_VERSION != 7

 # error "need to update cluster_process_heartbeat()"
 #endif
 
 # error "need to update cluster_process_heartbeat()"
 #endif
 

-       // we handle versions 5 through 6
+       // we handle versions 5 through 7

        if (hb_ver < 5 || hb_ver > HB_VERSION) {
                LOG(0, 0, 0, "Received a heartbeat version that I don't support (%d)!\n", hb_ver);
                return -1; // Ignore it??
        if (hb_ver < 5 || hb_ver > HB_VERSION) {
                LOG(0, 0, 0, "Received a heartbeat version that I don't support (%d)!\n", hb_ver);
                return -1; // Ignore it??


@@ -1589,9 +1742,10 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
        memcpy(&past_hearts[i].data, data, size);       // Save it.
 
 
        memcpy(&past_hearts[i].data, data, size);       // Save it.
 
 

-                       // Check that we don't have too many undefined sessions, and
-                       // that the free session pointer is correct.
-       cluster_check_sessions(h->highsession, h->freesession, h->highbundle, h->hightunnel);
+       // Check that we don't have too many undefined sessions, and
+       // that the free session pointer is correct.
+       gnextgrpid = h->nextgrpid;
+       cluster_check_sessions(h->highsession, h->freesession, h->highbundle, h->hightunnel, h->highgroupe);

 
        if (h->interval != config->cluster_hb_interval)
        {
 
        if (h->interval != config->cluster_hb_interval)
        {


@@ -1680,7 +1834,9 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                                size = rle_decompress((uint8_t **) &p, s, c, sizeof(c));
                                s -= (p - orig_p);
 
                                size = rle_decompress((uint8_t **) &p, s, c, sizeof(c));
                                s -= (p - orig_p);
 

-                               if (size != sizeof(tunnelt) ) { // Ouch! Very very bad!
+                               if ( ((hb_ver >= HB_VERSION) && (size != sizeof(tunnelt))) ||
+                                        ((hb_ver < HB_VERSION) && (size > sizeof(tunnelt))) )
+                               { // Ouch! Very very bad!

                                        LOG(0, 0, 0, "DANGER: Received a CTUNNEL that didn't decompress correctly!\n");
                                                // Now what? Should exit! No-longer up to date!
                                        break;
                                        LOG(0, 0, 0, "DANGER: Received a CTUNNEL that didn't decompress correctly!\n");
                                                // Now what? Should exit! No-longer up to date!
                                        break;


@@ -1727,6 +1883,36 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                                 p += sizeof(bundle[more]);
                                 s -= sizeof(bundle[more]);
                                 break;
                                 p += sizeof(bundle[more]);
                                 s -= sizeof(bundle[more]);
                                 break;

+
+                       case C_CGROUPE:
+                       { // Compressed Groupe structure.
+                               uint8_t c[ sizeof(groupsesst) + 2];
+                               int size;
+                               uint8_t *orig_p = p;
+
+                               size = rle_decompress((uint8_t **) &p, s, c, sizeof(c));
+                               s -= (p - orig_p);
+
+                               if (size != sizeof(groupsesst) )
+                               { // Ouch! Very very bad!
+                                       LOG(0, 0, 0, "DANGER: Received a C_CGROUPE that didn't decompress correctly!\n");
+                                       // Now what? Should exit! No-longer up to date!
+                                       break;
+                               }
+
+                               cluster_recv_groupe(more, c);
+                               break;
+                       }
+                       case C_GROUPE:
+                               if ( s < sizeof(grpsession[more]))
+                                       goto shortpacket;
+
+                               cluster_recv_groupe(more, p);
+
+                               p += sizeof(grpsession[more]);
+                               s -= sizeof(grpsession[more]);
+                       break;
+

                        default:
                                LOG(0, 0, 0, "DANGER: I received a heartbeat element where I didn't understand the type! (%d)\n", type);
                                return -1; // can't process any more of the packet!!
                        default:
                                LOG(0, 0, 0, "DANGER: I received a heartbeat element where I didn't understand the type! (%d)\n", type);
                                return -1; // can't process any more of the packet!!


@@ -1802,9 +1988,11 @@ int processcluster(uint8_t *data, int size, in_addr_t addr)
                else
                {
                        struct sockaddr_in a;
                else
                {
                        struct sockaddr_in a;

+                       uint16_t indexudp;

                        a.sin_addr.s_addr = more;
 
                        a.sin_addr.s_addr = more;
 

-                       a.sin_port = *(int *) p;
+                       a.sin_port = (*(int *) p) & 0xFFFF;
+                       indexudp = ((*(int *) p) >> 16) & 0xFFFF;

                        s -= sizeof(int);
                        p += sizeof(int);
 
                        s -= sizeof(int);
                        p += sizeof(int);
 


@@ -1819,10 +2007,21 @@ int processcluster(uint8_t *data, int size, in_addr_t addr)
                                processdae(p, s, &a, sizeof(a), &local);
                        }
                        else
                                processdae(p, s, &a, sizeof(a), &local);
                        }
                        else

-                               processudp(p, s, &a);
+                               processudp(p, s, &a, indexudp);

 
                        return 0;
                }
 
                        return 0;
                }

+       case C_PPPOE_FORWARD:
+               if (!config->cluster_iam_master)
+               {
+                       LOG(0, 0, 0, "I'm not the master, but I got a C_PPPOE_FORWARD from %s?\n", fmtaddr(addr, 0));
+                       return -1;
+               }
+               else
+               {
+                       pppoe_process_forward(p, s, addr);
+                       return 0;
+               }

 
        case C_MPPP_FORWARD:
                // Receive a MPPP packet from a slave.
 
        case C_MPPP_FORWARD:
                // Receive a MPPP packet from a slave.


@@ -1923,12 +2122,14 @@ int cmd_show_cluster(struct cli_def *cli, char *command, char **argv, int argc)
                cli_print(cli, "Next sequence number expected: %d", config->cluster_seq_number);
                cli_print(cli, "%d sessions undefined of %d", config->cluster_undefined_sessions, config->cluster_highest_sessionid);
                cli_print(cli, "%d bundles undefined of %d", config->cluster_undefined_bundles, config->cluster_highest_bundleid);
                cli_print(cli, "Next sequence number expected: %d", config->cluster_seq_number);
                cli_print(cli, "%d sessions undefined of %d", config->cluster_undefined_sessions, config->cluster_highest_sessionid);
                cli_print(cli, "%d bundles undefined of %d", config->cluster_undefined_bundles, config->cluster_highest_bundleid);

+               cli_print(cli, "%d groupes undefined of %d", config->cluster_undefined_groupes, config->cluster_highest_groupeid);

                cli_print(cli, "%d tunnels undefined of %d", config->cluster_undefined_tunnels, config->cluster_highest_tunnelid);
        } else {
                cli_print(cli, "Table version #  : %" PRIu64, config->cluster_table_version);
                cli_print(cli, "Next heartbeat # : %d", config->cluster_seq_number);
                cli_print(cli, "Highest session  : %d", config->cluster_highest_sessionid);
                cli_print(cli, "Highest bundle   : %d", config->cluster_highest_bundleid);
                cli_print(cli, "%d tunnels undefined of %d", config->cluster_undefined_tunnels, config->cluster_highest_tunnelid);
        } else {
                cli_print(cli, "Table version #  : %" PRIu64, config->cluster_table_version);
                cli_print(cli, "Next heartbeat # : %d", config->cluster_seq_number);
                cli_print(cli, "Highest session  : %d", config->cluster_highest_sessionid);
                cli_print(cli, "Highest bundle   : %d", config->cluster_highest_bundleid);

+               cli_print(cli, "Highest groupe   : %d", config->cluster_highest_groupeid);

                cli_print(cli, "Highest tunnel   : %d", config->cluster_highest_tunnelid);
                cli_print(cli, "%d changes queued for sending", config->cluster_num_changes);
        }
                cli_print(cli, "Highest tunnel   : %d", config->cluster_highest_tunnelid);
                cli_print(cli, "%d changes queued for sending", config->cluster_num_changes);
        }