Final development LAC functionality.

[l2tpns.git] / cluster.c

diff --git a/cluster.c b/cluster.c
index abe2a63..b2a244e 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -1,7 +1,5 @@
 // L2TPNS Clustering Stuff
 
 // L2TPNS Clustering Stuff
 

-char const *cvs_id_cluster = "$Id: cluster.c,v 1.51 2006/04/27 09:53:49 bodea Exp $";
-

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>


@@ -365,6 +363,28 @@ int master_garden_packet(sessionidt s, uint8_t *data, int size)
 
 }
 
 
 }
 

+//
+// Forward a MPPP packet to the master for handling.
+//
+// (Note that this must be called with the tun header
+// as the start of the data).
+// (i.e. this routine writes to data[-8]).
+int master_forward_mppp_packet(sessionidt s, uint8_t *data, int size)
+{
+       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 MPPP packet to master (size %d)\n", size);
+
+       add_type(&p, C_MPPP_FORWARD, s, NULL, 0);
+
+       return peer_send_data(config->cluster_master_address, psave, size + (2 * sizeof(uint32_t)));
+
+}
+

 //
 // Send a chunk of data as a heartbeat..
 // We save it in the history buffer as we do so.
 //
 // Send a chunk of data as a heartbeat..
 // We save it in the history buffer as we do so.


@@ -402,7 +422,7 @@ 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;
+       x.undef = config->cluster_undefined_sessions + config->cluster_undefined_tunnels + 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));


@@ -428,12 +448,6 @@ void master_update_counts(void)
        if (!config->cluster_master_address)    // If we don't have a master, skip it for a while.
                return;
 
        if (!config->cluster_master_address)    // If we don't have a master, skip it for a while.
                return;
 

-       // C_BYTES format changed in 2.1.0 (cluster version 5)
-       // during upgrade from previous versions, hang onto our counters
-       // for a bit until the new master comes up
-       if (config->cluster_last_hb_ver < 5)
-               return;
-

        i = MAX_B_RECS * 5; // Examine max 3000 sessions;
        if (config->cluster_highest_sessionid > i)
                i = config->cluster_highest_sessionid;
        i = MAX_B_RECS * 5; // Examine max 3000 sessions;
        if (config->cluster_highest_sessionid > i)
                i = config->cluster_highest_sessionid;


@@ -522,7 +536,7 @@ void cluster_check_slaves(void)
 //
 void cluster_check_master(void)
 {
 //
 void cluster_check_master(void)
 {

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

        int last_free = 0;
        clockt t = TIME;
        static int probed = 0;
        int last_free = 0;
        clockt t = TIME;
        static int probed = 0;


@@ -608,7 +622,7 @@ void cluster_check_master(void)
                // Count the highest used tunnel number as well.
                //
        config->cluster_highest_tunnelid = 0;
                // Count the highest used tunnel number as well.
                //
        config->cluster_highest_tunnelid = 0;

-       for (i = 0, tcount = 0; i < MAXTUNNEL; ++i) {
+       for (i = 0; i < MAXTUNNEL; ++i) {

                if (tunnel[i].state == TUNNELUNDEF)
                        tunnel[i].state = TUNNELFREE;
 
                if (tunnel[i].state == TUNNELUNDEF)
                        tunnel[i].state = TUNNELFREE;
 


@@ -621,7 +635,7 @@ void cluster_check_master(void)
                 // Count the highest used bundle number as well.
                 //
         config->cluster_highest_bundleid = 0;
                 // Count the highest used bundle number as well.
                 //
         config->cluster_highest_bundleid = 0;

-        for (i = 0, bcount = 0; i < MAXBUNDLE; ++i) {
+        for (i = 0; i < MAXBUNDLE; ++i) {

                 if (bundle[i].state == BUNDLEUNDEF)
                         bundle[i].state = BUNDLEFREE;
 
                 if (bundle[i].state == BUNDLEUNDEF)
                         bundle[i].state = BUNDLEFREE;
 


@@ -654,7 +668,7 @@ void cluster_check_master(void)
                }
 
                        // Reset idle timeouts..
                }
 
                        // Reset idle timeouts..

-               session[i].last_packet = time_now;
+               session[i].last_packet = session[i].last_data = time_now;

 
                        // Reset die relative to our uptime rather than the old master's
                if (session[i].die) session[i].die = TIME;
 
                        // Reset die relative to our uptime rather than the old master's
                if (session[i].die) session[i].die = TIME;


@@ -940,9 +954,8 @@ void cluster_heartbeat()
                if (bcount >= config->cluster_highest_bundleid)
                        break;
 
                if (bcount >= config->cluster_highest_bundleid)
                        break;
 

-               hb_add_type(&p, C_CTUNNEL, walk_bundle_number);
-               walk_tunnel_number = (1+walk_bundle_number)%(config->cluster_highest_bundleid+1);       // +1 avoids divide by zero.
-
+               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;
         }
 
                ++bcount;
         }
 


@@ -954,7 +967,7 @@ void cluster_heartbeat()
                exit(1);
        }
 
                exit(1);
        }
 

-       LOG(3, 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",
            HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,
            count, bcount, tcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,
                     "(%d x-sess, %d x-bundles, %d x-tunnels, %d highsess, %d highbund, %d hightun, size %d)\n",
            HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,
            count, bcount, tcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,


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

+// The deleted session, must be before the new session
+int cluster_listinvert_session(int sidnew, int sidtodel)
+{
+       int i, inew = 0;
+
+       for (i = 0 ; i < config->cluster_num_changes ; ++i)
+       {
+               if ( cluster_changes[i].id == sidtodel && cluster_changes[i].type == C_CSESSION)
+                       return 0;       // Deleted session already before the new session.
+
+               if ( cluster_changes[i].id == sidnew && cluster_changes[i].type == C_CSESSION)
+               {
+                       inew = i;
+                       break;
+               }
+       }
+
+       for ( ; i < config->cluster_num_changes ; ++i)
+       {
+               if ( cluster_changes[i].id == sidtodel && cluster_changes[i].type == C_CSESSION)
+               {
+                       // Reverse position
+                       cluster_changes[i].id = sidnew;
+                       cluster_changes[inew].id = sidtodel;
+                       return 1;
+               }
+       }
+
+       return 0;
+}

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


@@ -1214,7 +1257,9 @@ static int cluster_handle_bytes(uint8_t *data, int size)
                session[b->sid].cout_delta += b->cout;
 
                if (b->cin)
                session[b->sid].cout_delta += b->cout;
 
                if (b->cin)

-                       session[b->sid].last_packet = time_now; // Reset idle timer!
+                       session[b->sid].last_packet = session[b->sid].last_data = time_now;
+               else if (b->cout)
+                       session[b->sid].last_data = time_now;

 
                size -= sizeof(*b);
                ++b;
 
                size -= sizeof(*b);
                ++b;


@@ -1312,54 +1357,62 @@ static int cluster_recv_tunnel(int more, uint8_t *p)
 }
 
 
 }
 
 

-// pre v5 heartbeat session structure
+// pre v6 heartbeat session structure

 struct oldsession {
        sessionidt next;
        sessionidt far;
        tunnelidt tunnel;
 struct oldsession {
        sessionidt next;
        sessionidt far;
        tunnelidt tunnel;

+       uint8_t flags;
+       struct {
+               uint8_t phase;
+               uint8_t lcp:4;
+               uint8_t ipcp:4;
+               uint8_t ipv6cp:4;
+               uint8_t ccp:4;
+       } ppp;
+       char reserved_1[2];

        in_addr_t ip;
        int ip_pool_index;
        in_addr_t ip;
        int ip_pool_index;

-       unsigned long unique_id;
-       uint16_t nr;
-       uint16_t ns;
+       uint32_t unique_id;
+       char reserved_2[4];

        uint32_t magic;
        uint32_t magic;

-       uint32_t cin, cout;

        uint32_t pin, pout;
        uint32_t pin, pout;

-       uint32_t total_cin;
-       uint32_t total_cout;
-       uint32_t id;
+       uint32_t cin, cout;
+       uint32_t cin_wrap, cout_wrap;
+       uint32_t cin_delta, cout_delta;

        uint16_t throttle_in;
        uint16_t throttle_out;
        uint16_t throttle_in;
        uint16_t throttle_out;

+       uint8_t filter_in;
+       uint8_t filter_out;
+       uint16_t mru;

        clockt opened;
        clockt die;
        clockt opened;
        clockt die;

+       uint32_t session_timeout;
+       uint32_t idle_timeout;

        time_t last_packet;
        time_t last_packet;

+       time_t last_data;

        in_addr_t dns1, dns2;
        routet route[MAXROUTE];
        in_addr_t dns1, dns2;
        routet route[MAXROUTE];

-       uint16_t radius;
-       uint16_t mru;

        uint16_t tbf_in;
        uint16_t tbf_out;
        uint16_t tbf_in;
        uint16_t tbf_out;

-       uint8_t l2tp_flags;
-       uint8_t reserved_old_snoop;
-       uint8_t walled_garden;
-       uint8_t flags1;
-       char random_vector[MAXTEL];

        int random_vector_length;
        int random_vector_length;

-       char user[129];
+       uint8_t random_vector[MAXTEL];
+       char user[MAXUSER];

        char called[MAXTEL];
        char calling[MAXTEL];
        uint32_t tx_connect_speed;
        uint32_t rx_connect_speed;
        char called[MAXTEL];
        char calling[MAXTEL];
        uint32_t tx_connect_speed;
        uint32_t rx_connect_speed;

-       uint32_t flags;
-#define SF_IPCP_ACKED  1       // Has this session seen an IPCP Ack?
-#define SF_LCP_ACKED   2       // LCP negotiated
-#define SF_CCP_ACKED   4       // CCP negotiated
+       clockt timeout;
+       uint32_t mrru;
+       uint8_t mssf;
+       epdist epdis;
+       bundleidt bundle;

        in_addr_t snoop_ip;
        uint16_t snoop_port;
        in_addr_t snoop_ip;
        uint16_t snoop_port;

-       uint16_t sid;
-       uint8_t filter_in;
-       uint8_t filter_out;
-       char reserved[18];
+       uint8_t walled_garden;
+       uint8_t ipv6prefixlen;
+       struct in6_addr ipv6route;
+       char reserved_3[11];

 };
 
 static uint8_t *convert_session(struct oldsession *old)
 };
 
 static uint8_t *convert_session(struct oldsession *old)


@@ -1372,17 +1425,24 @@ static uint8_t *convert_session(struct oldsession *old)
        new.next = old->next;
        new.far = old->far;
        new.tunnel = old->tunnel;
        new.next = old->next;
        new.far = old->far;
        new.tunnel = old->tunnel;

-       new.flags = old->l2tp_flags;
+       new.flags = old->flags;
+       new.ppp.phase = old->ppp.phase;
+       new.ppp.lcp = old->ppp.lcp;
+       new.ppp.ipcp = old->ppp.ipcp;
+       new.ppp.ipv6cp = old->ppp.ipv6cp;
+       new.ppp.ccp = old->ppp.ccp;

        new.ip = old->ip;
        new.ip_pool_index = old->ip_pool_index;
        new.unique_id = old->unique_id;
        new.magic = old->magic;
        new.pin = old->pin;
        new.pout = old->pout;
        new.ip = old->ip;
        new.ip_pool_index = old->ip_pool_index;
        new.unique_id = old->unique_id;
        new.magic = old->magic;
        new.pin = old->pin;
        new.pout = old->pout;

-       new.cin = old->total_cin;
-       new.cout = old->total_cout;
-       new.cin_delta = old->cin;
-       new.cout_delta = old->cout;
+       new.cin = old->cin;
+       new.cout = old->cout;
+       new.cin_wrap = old->cin_wrap;
+       new.cout_wrap = old->cout_wrap;
+       new.cin_delta = old->cin_delta;
+       new.cout_delta = old->cout_delta;

        new.throttle_in = old->throttle_in;
        new.throttle_out = old->throttle_out;
        new.filter_in = old->filter_in;
        new.throttle_in = old->throttle_in;
        new.throttle_out = old->throttle_out;
        new.filter_in = old->filter_in;


@@ -1390,7 +1450,10 @@ static uint8_t *convert_session(struct oldsession *old)
        new.mru = old->mru;
        new.opened = old->opened;
        new.die = old->die;
        new.mru = old->mru;
        new.opened = old->opened;
        new.die = old->die;

+       new.session_timeout = old->session_timeout;
+       new.idle_timeout = old->idle_timeout;

        new.last_packet = old->last_packet;
        new.last_packet = old->last_packet;

+       new.last_data = old->last_data;

        new.dns1 = old->dns1;
        new.dns2 = old->dns2;
        new.tbf_in = old->tbf_in;
        new.dns1 = old->dns1;
        new.dns2 = old->dns2;
        new.tbf_in = old->tbf_in;


@@ -1398,9 +1461,16 @@ static uint8_t *convert_session(struct oldsession *old)
        new.random_vector_length = old->random_vector_length;
        new.tx_connect_speed = old->tx_connect_speed;
        new.rx_connect_speed = old->rx_connect_speed;
        new.random_vector_length = old->random_vector_length;
        new.tx_connect_speed = old->tx_connect_speed;
        new.rx_connect_speed = old->rx_connect_speed;

+       new.timeout = old->timeout;
+       new.mrru = old->mrru;
+       new.mssf = old->mssf;
+       new.epdis = old->epdis;
+       new.bundle = old->bundle;

        new.snoop_ip = old->snoop_ip;
        new.snoop_port = old->snoop_port;
        new.walled_garden = old->walled_garden;
        new.snoop_ip = old->snoop_ip;
        new.snoop_port = old->snoop_port;
        new.walled_garden = old->walled_garden;

+       new.ipv6prefixlen = old->ipv6prefixlen;
+       new.ipv6route = old->ipv6route;

 
        memcpy(new.random_vector, old->random_vector, sizeof(new.random_vector));
        memcpy(new.user, old->user, sizeof(new.user));
 
        memcpy(new.random_vector, old->random_vector, sizeof(new.random_vector));
        memcpy(new.user, old->user, sizeof(new.user));


@@ -1410,30 +1480,14 @@ static uint8_t *convert_session(struct oldsession *old)
        for (i = 0; i < MAXROUTE; i++)
                memcpy(&new.route[i], &old->route[i], sizeof(new.route[i]));
 
        for (i = 0; i < MAXROUTE; i++)
                memcpy(&new.route[i], &old->route[i], sizeof(new.route[i]));
 

-       if (new.opened)
-       {
-               new.ppp.phase = Establish;
-               if (old->flags & (SF_IPCP_ACKED|SF_LCP_ACKED))
-               {
-                       new.ppp.phase = Network;
-                       new.ppp.lcp   = Opened;
-                       new.ppp.ipcp  = (old->flags & SF_IPCP_ACKED) ? Opened : Starting;
-                       new.ppp.ccp   = (old->flags & SF_CCP_ACKED)  ? Opened : Stopped;
-               }
-
-               // no PPPv6 in old session
-               new.ppp.ipv6cp = Stopped;
-       }
-

        return (uint8_t *) &new;
 }
 
 //
 // Process a heartbeat..
 //
        return (uint8_t *) &new;
 }
 
 //
 // Process a heartbeat..
 //

-// v3: added interval, timeout
-// v4: added table_version
-// v5: added ipv6, re-ordered session structure
+// 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;


@@ -1441,17 +1495,28 @@ 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 != 5
+#ifdef LAC
+#if HB_VERSION != 7
+# error "need to update cluster_process_heartbeat()"
+#endif
+#else
+#if HB_VERSION != 6

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

+#endif
+

 
 

-       // we handle versions 3 through 5
-       if (hb_ver < 3 || hb_ver > HB_VERSION) {
+       // 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??
        }
 
                LOG(0, 0, 0, "Received a heartbeat version that I don't support (%d)!\n", hb_ver);
                return -1; // Ignore it??
        }
 

-               // Ok. It's a heartbeat packet from a cluster master!
+       if (size > sizeof(past_hearts[0].data)) {
+               LOG(0, 0, 0, "Received an oversize heartbeat from %s (%d)!\n", fmtaddr(addr, 0), size);
+               return -1;
+       }
+

        if (s < sizeof(*h))
                goto shortpacket;
 
        if (s < sizeof(*h))
                goto shortpacket;
 


@@ -1471,18 +1536,17 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                        return -1; // Skip it.
                }
 
                        return -1; // Skip it.
                }
 

-               if (hb_ver >= 4) {
-                       if (h->table_version > config->cluster_table_version) {
-                               LOG(0, 0, 0, "They've seen more state changes (%" PRIu64 " vs my %" PRIu64 ") so I'm gone!\n",
+               if (h->table_version > config->cluster_table_version) {
+                       LOG(0, 0, 0, "They've seen more state changes (%" PRIu64 " vs my %" PRIu64 ") so I'm gone!\n",

                                        h->table_version, config->cluster_table_version);
 
                                        h->table_version, config->cluster_table_version);
 

-                               kill(0, SIGTERM);
-                               exit(1);
-                       }
-                       if (h->table_version < config->cluster_table_version)
-                               return -1;
+                       kill(0, SIGTERM);
+                       exit(1);

                }
 
                }
 

+               if (h->table_version < config->cluster_table_version)
+                       return -1;
+

                if (basetime > h->basetime) {
                        LOG(0, 0, 0, "They're an older master than me so I'm gone!\n");
                        kill(0, SIGTERM);
                if (basetime > h->basetime) {
                        LOG(0, 0, 0, "They're an older master than me so I'm gone!\n");
                        kill(0, SIGTERM);


@@ -1604,7 +1668,7 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                                s -= (p - orig_p);
 
                                // session struct changed with v5
                                s -= (p - orig_p);
 
                                // session struct changed with v5

-                               if (hb_ver < 5)
+                               if (hb_ver < 6)

                                {
                                        if (size != sizeof(struct oldsession)) {
                                                LOG(0, 0, 0, "DANGER: Received a v%d CSESSION that didn't decompress correctly!\n", hb_ver);
                                {
                                        if (size != sizeof(struct oldsession)) {
                                                LOG(0, 0, 0, "DANGER: Received a v%d CSESSION that didn't decompress correctly!\n", hb_ver);


@@ -1625,7 +1689,7 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                                break;
                        }
                        case C_SESSION:
                                break;
                        }
                        case C_SESSION:

-                               if (hb_ver < 5)
+                               if (hb_ver < 6)

                                {
                                        if (s < sizeof(struct oldsession))
                                                goto shortpacket;
                                {
                                        if (s < sizeof(struct oldsession))
                                                goto shortpacket;


@@ -1654,7 +1718,13 @@ 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!
+#ifdef LAC
+                               if ( ((hb_ver >= HB_VERSION) && (size != sizeof(tunnelt))) ||
+                                        ((hb_ver < HB_VERSION) && (size > sizeof(tunnelt))) )
+#else
+                               if (size != sizeof(tunnelt) )
+#endif
+                               { // 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;


@@ -1768,7 +1838,7 @@ int processcluster(uint8_t *data, int size, in_addr_t addr)
        case C_FORWARD_DAE: // Forwarded DAE packet. pass off to processdae.
                if (!config->cluster_iam_master)
                {
        case C_FORWARD_DAE: // Forwarded DAE packet. pass off to processdae.
                if (!config->cluster_iam_master)
                {

-                       LOG(0, 0, 0, "I'm not the master, but I got a C_FORWARD_%s from %s?\n",
+                       LOG(0, 0, 0, "I'm not the master, but I got a C_FORWARD%s from %s?\n",

                                type == C_FORWARD_DAE ? "_DAE" : "", fmtaddr(addr, 0));
 
                        return -1;
                                type == C_FORWARD_DAE ? "_DAE" : "", fmtaddr(addr, 0));
 
                        return -1;


@@ -1798,6 +1868,16 @@ int processcluster(uint8_t *data, int size, in_addr_t addr)
                        return 0;
                }
 
                        return 0;
                }
 

+       case C_MPPP_FORWARD:
+               // Receive a MPPP packet from a slave.
+               if (!config->cluster_iam_master) {
+                       LOG(0, 0, 0, "I'm not the master, but I got a C_MPPP_FORWARD from %s?\n", fmtaddr(addr, 0));
+                       return -1;
+               }
+
+               processipout(p, s);
+               return 0;
+

        case C_THROTTLE: {      // Receive a forwarded packet from a slave.
                if (!config->cluster_iam_master) {
                        LOG(0, 0, 0, "I'm not the master, but I got a C_THROTTLE from %s?\n", fmtaddr(addr, 0));
        case C_THROTTLE: {      // Receive a forwarded packet from a slave.
                if (!config->cluster_iam_master) {
                        LOG(0, 0, 0, "I'm not the master, but I got a C_THROTTLE from %s?\n", fmtaddr(addr, 0));