show session open time in "show session"/"show user" detailed output

[l2tpns.git] / cluster.c

diff --git a/cluster.c b/cluster.c
index 9cead15..c529fea 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -1,6 +1,6 @@
 // L2TPNS Clustering Stuff
 
 // L2TPNS Clustering Stuff
 

-char const *cvs_id_cluster = "$Id: cluster.c,v 1.36 2005/05/07 10:14:33 bodea Exp $";
+char const *cvs_id_cluster = "$Id: cluster.c,v 1.39 2005/05/26 12:17:30 bodea Exp $";

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


@@ -193,7 +193,7 @@ static void add_type(char **p, int type, int more, char *data, int size)
 }
 
 // advertise our presence via BGP or gratuitous ARP
 }
 
 // advertise our presence via BGP or gratuitous ARP

-static void advertise(void)
+static void advertise_routes(void)

 {
 #ifdef BGP
        if (bgp_configured)
 {
 #ifdef BGP
        if (bgp_configured)


@@ -204,6 +204,15 @@ static void advertise(void)
                        send_garp(config->bind_address);        // Start taking traffic.
 }
 
                        send_garp(config->bind_address);        // Start taking traffic.
 }
 

+// withdraw our routes (BGP only)
+static void withdraw_routes(void)
+{
+#ifdef BGP
+       if (bgp_configured)
+               bgp_enable_routing(0);
+#endif /* BGP */
+}
+

 static void cluster_uptodate(void)
 {
        if (config->cluster_iam_uptodate)
 static void cluster_uptodate(void)
 {
        if (config->cluster_iam_uptodate)


@@ -215,7 +224,7 @@ static void cluster_uptodate(void)
        config->cluster_iam_uptodate = 1;
 
        LOG(0, 0, 0, "Now uptodate with master.\n");
        config->cluster_iam_uptodate = 1;
 
        LOG(0, 0, 0, "Now uptodate with master.\n");

-       advertise();
+       advertise_routes();

 }
 
 //
 }
 
 //


@@ -457,17 +466,22 @@ void cluster_check_slaves(void)
                        continue;       // Shutdown peer! Skip them.
 
                if (peers[i].uptodate)
                        continue;       // Shutdown peer! Skip them.
 
                if (peers[i].uptodate)

-                       have_peers = 1;
-
-               if (!peers[i].uptodate)
+                       have_peers++;
+               else

                        config->cluster_iam_uptodate = 0; // Start fast heartbeats
        }
 
                        config->cluster_iam_uptodate = 0; // Start fast heartbeats
        }
 

-#ifdef BGP
-       // in a cluster, withdraw/add routes when we get a peer/lose all peers
-       if (bgp_configured && have_peers != had_peers)
-               bgp_enable_routing(!have_peers);
-#endif /* BGP */
+       // in a cluster, withdraw/add routes when we get a peer/lose peers
+       if (have_peers != had_peers)
+       {
+               if (had_peers < config->cluster_master_min_adv &&
+                   have_peers >= config->cluster_master_min_adv)
+                       withdraw_routes();
+
+               else if (had_peers >= config->cluster_master_min_adv &&
+                   have_peers < config->cluster_master_min_adv)
+                       advertise_routes();
+       }

 }
 
 //
 }
 
 //


@@ -480,20 +494,22 @@ void cluster_check_master(void)
        int last_free = 0;
        clockt t = TIME;
        static int probed = 0;
        int last_free = 0;
        clockt t = TIME;
        static int probed = 0;

+       int have_peers;

 
        if (config->cluster_iam_master)
                return;         // Only runs on the slaves...
 
        // If the master is late (missed 2 hearbeats by a second and a
        // hair) it may be that the switch has dropped us from the
 
        if (config->cluster_iam_master)
                return;         // Only runs on the slaves...
 
        // If the master is late (missed 2 hearbeats by a second and a
        // hair) it may be that the switch has dropped us from the

-       // multicast group, try unicasting one probe to the master
+       // multicast group, try unicasting probes to the master

        // which will hopefully respond with a unicast heartbeat that
        // will allow us to limp along until the querier next runs.
        // which will hopefully respond with a unicast heartbeat that
        // will allow us to limp along until the querier next runs.

-       if (TIME > (config->cluster_last_hb + 2 * config->cluster_hb_interval + 11))
+       if (config->cluster_master_address
+           && TIME > (config->cluster_last_hb + 2 * config->cluster_hb_interval + 11))

        {
        {

-               if (!probed && config->cluster_master_address)
+               if (!probed || (TIME > (probed + 2 * config->cluster_hb_interval)))

                {
                {

-                       probed = 1;
+                       probed = TIME;

                        LOG(1, 0, 0, "Heartbeat from master %.1fs late, probing...\n",
                                0.1 * (TIME - (config->cluster_last_hb + config->cluster_hb_interval)));
 
                        LOG(1, 0, 0, "Heartbeat from master %.1fs late, probing...\n",
                                0.1 * (TIME - (config->cluster_last_hb + config->cluster_hb_interval)));
 


@@ -511,7 +527,7 @@ void cluster_check_master(void)
 
        LOG(0, 0, 0, "Master timed out! Holding election...\n");
 
 
        LOG(0, 0, 0, "Master timed out! Holding election...\n");
 

-       for (i = 0; i < num_peers; i++)
+       for (i = have_peers = 0; i < num_peers; i++)

        {
                if ((peers[i].timestamp + config->cluster_hb_timeout) < t)
                        continue;       // Stale peer! Skip them.
        {
                if ((peers[i].timestamp + config->cluster_hb_timeout) < t)
                        continue;       // Stale peer! Skip them.


@@ -529,6 +545,9 @@ void cluster_check_master(void)
                        LOG(1, 0, 0, "Expecting %s to become master\n", fmtaddr(peers[i].peer, 0));
                        return;         // They'll win the election. Wait for them to come up.
                }
                        LOG(1, 0, 0, "Expecting %s to become master\n", fmtaddr(peers[i].peer, 0));
                        return;         // They'll win the election. Wait for them to come up.
                }

+
+               if (peers[i].uptodate)
+                       have_peers++;

        }
 
                // Wow. it's been ages since I last heard a heartbeat
        }
 
                // Wow. it's been ages since I last heard a heartbeat


@@ -540,6 +559,11 @@ void cluster_check_master(void)
 
        LOG(0, 0, 0, "I am declaring myself the master!\n");
 
 
        LOG(0, 0, 0, "I am declaring myself the master!\n");
 

+       if (have_peers < config->cluster_master_min_adv)
+               advertise_routes();
+       else
+               withdraw_routes();
+

        if (config->cluster_seq_number == -1)
                config->cluster_seq_number = 0;
 
        if (config->cluster_seq_number == -1)
                config->cluster_seq_number = 0;
 


@@ -620,9 +644,6 @@ void cluster_check_master(void)
        config->cluster_undefined_tunnels = 0;
        config->cluster_iam_uptodate = 1; // assume all peers are up-to-date
 
        config->cluster_undefined_tunnels = 0;
        config->cluster_iam_uptodate = 1; // assume all peers are up-to-date
 

-       if (!num_peers) // lone master
-               advertise();
-

        // FIXME. We need to fix up the tunnel control message
        // queue here! There's a number of other variables we
        // should also update.
        // FIXME. We need to fix up the tunnel control message
        // queue here! There's a number of other variables we
        // should also update.


@@ -902,6 +923,13 @@ static int cluster_catchup_slave(int seq, in_addr_t slave)
        int diff;
 
        LOG(1, 0, 0, "Slave %s sent LASTSEEN with seq %d\n", fmtaddr(slave, 0), seq);
        int diff;
 
        LOG(1, 0, 0, "Slave %s sent LASTSEEN with seq %d\n", fmtaddr(slave, 0), seq);

+       if (!config->cluster_iam_master) {
+               LOG(1, 0, 0, "Got LASTSEEN but I'm not a master! Redirecting it to %s.\n",
+                       fmtaddr(config->cluster_master_address, 0));
+
+               peer_send_message(slave, C_MASTER, config->cluster_master_address, NULL, 0);
+               return 0;
+       }

 
        diff = config->cluster_seq_number - seq;        // How many packet do we need to send?
        if (diff < 0)
 
        diff = config->cluster_seq_number - seq;        // How many packet do we need to send?
        if (diff < 0)


@@ -913,9 +941,11 @@ static int cluster_catchup_slave(int seq, in_addr_t slave)
                return peer_send_message(slave, C_KILL, seq, NULL, 0);// Kill the slave. Nothing else to do.
        }
 
                return peer_send_message(slave, C_KILL, seq, NULL, 0);// Kill the slave. Nothing else to do.
        }
 

+       LOG(1, 0, 0, "Sending %d catchup packets to slave %s\n", diff, fmtaddr(slave, 0) );
+

                // Now resend every packet that it missed, in order.
        while (seq != config->cluster_seq_number) {
                // Now resend every packet that it missed, in order.
        while (seq != config->cluster_seq_number) {

-               s = seq%HB_HISTORY_SIZE;
+               s = seq % HB_HISTORY_SIZE;

                if (seq != past_hearts[s].seq) {
                        LOG(0, 0, 0, "Tried to re-send heartbeat for %s but %d doesn't match %d! (%d,%d)\n",
                                fmtaddr(slave, 0), seq, past_hearts[s].seq, s, config->cluster_seq_number);
                if (seq != past_hearts[s].seq) {
                        LOG(0, 0, 0, "Tried to re-send heartbeat for %s but %d doesn't match %d! (%d,%d)\n",
                                fmtaddr(slave, 0), seq, past_hearts[s].seq, s, config->cluster_seq_number);


@@ -968,8 +998,10 @@ static int cluster_add_peer(in_addr_t peer, time_t basetime, pingt *pp, int size
        }
 
        // Is this the master shutting down??
        }
 
        // Is this the master shutting down??

-       if (peer == config->cluster_master_address && !basetime) {
-               LOG(3, 0, 0, "Master %s shutting down...\n", fmtaddr(config->cluster_master_address, 0));
+       if (peer == config->cluster_master_address) {
+               LOG(3, 0, 0, "Master %s %s\n", fmtaddr(config->cluster_master_address, 0),
+                       basetime ? "has restarted!" : "shutting down...");
+

                config->cluster_master_address = 0;
                config->cluster_last_hb = 0; // Force an election.
                cluster_check_master();
                config->cluster_master_address = 0;
                config->cluster_last_hb = 0; // Force an election.
                cluster_check_master();


@@ -1010,6 +1042,20 @@ static int cluster_add_peer(in_addr_t peer, time_t basetime, pingt *pp, int size
        return 1;
 }
 
        return 1;
 }
 

+// A slave responds with C_MASTER when it gets a message which should have gone to a master.
+static int cluster_set_master(in_addr_t peer, in_addr_t master)
+{
+       if (config->cluster_iam_master) // Sanity...
+               return 0;
+
+       LOG(3, 0, 0, "Peer %s set the master to %s...\n", fmtaddr(peer, 0),
+               fmtaddr(master, 1));
+
+       config->cluster_master_address = master;
+       cluster_check_master();
+       return 0;
+}
+

 /* Handle the slave updating the byte counters for the master. */
 //
 // Note that we don't mark the session as dirty; We rely on
 /* Handle the slave updating the byte counters for the master. */
 //
 // Note that we don't mark the session as dirty; We rely on


@@ -1112,24 +1158,127 @@ static int cluster_recv_tunnel(int more, uint8_t *p)
 }
 
 
 }
 
 

+// pre v5 heartbeat session structure
+struct oldsession {
+       sessionidt next;
+       sessionidt far;
+       tunnelidt tunnel;
+       in_addr_t ip;
+       int ip_pool_index;
+       unsigned long unique_id;
+       uint16_t nr;
+       uint16_t ns;
+       uint32_t magic;
+       uint32_t cin, cout;
+       uint32_t pin, pout;
+       uint32_t total_cin;
+       uint32_t total_cout;
+       uint32_t id;
+       uint16_t throttle_in;
+       uint16_t throttle_out;
+       clockt opened;
+       clockt die;
+       time_t last_packet;
+       in_addr_t dns1, dns2;
+       routet route[MAXROUTE];
+       uint16_t radius;
+       uint16_t mru;
+       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;
+       char user[129];
+       char called[MAXTEL];
+       char calling[MAXTEL];
+       uint32_t tx_connect_speed;
+       uint32_t rx_connect_speed;
+       uint32_t flags;
+       in_addr_t snoop_ip;
+       uint16_t snoop_port;
+       uint16_t sid;
+       uint8_t filter_in;
+       uint8_t filter_out;
+       char reserved[18];
+};
+
+static uint8_t *convert_session(struct oldsession *old)
+{
+       static sessiont new;
+       int i;
+
+       memset(&new, 0, sizeof(new));
+
+       new.next = old->next;
+       new.far = old->far;
+       new.tunnel = old->tunnel;
+       new.l2tp_flags = old->l2tp_flags;
+       new.flags = old->flags;
+       new.ip = old->ip;
+       new.ip_pool_index = old->ip_pool_index;
+       new.unique_id = old->unique_id;
+       new.nr = old->nr;
+       new.ns = old->ns;
+       new.magic = old->magic;
+       new.cin = old->cin;
+       new.cout = old->cout;
+       new.pin = old->pin;
+       new.pout = old->pout;
+       new.total_cin = old->total_cin;
+       new.total_cout = old->total_cout;
+       new.throttle_in = old->throttle_in;
+       new.throttle_out = old->throttle_out;
+       new.filter_in = old->filter_in;
+       new.filter_out = old->filter_out;
+       new.mru = old->mru;
+       new.opened = old->opened;
+       new.die = old->die;
+       new.last_packet = old->last_packet;
+       new.dns1 = old->dns1;
+       new.dns2 = old->dns2;
+       new.tbf_in = old->tbf_in;
+       new.tbf_out = old->tbf_out;
+       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.snoop_ip = old->snoop_ip;
+       new.snoop_port = old->snoop_port;
+       new.walled_garden = old->walled_garden;
+
+       memcpy(new.random_vector, old->random_vector, sizeof(new.random_vector));
+       memcpy(new.user, old->user, sizeof(new.user));
+       memcpy(new.called, old->called, sizeof(new.called));
+       memcpy(new.calling, old->calling, sizeof(new.calling));
+
+       for (i = 0; i < MAXROUTE; i++)
+               memcpy(&new.route[i], &old->route[i], sizeof(new.route[i]));
+
+       return (uint8_t *) &new;
+}
+

 //
 // Process a heartbeat..
 //
 // v3: added interval, timeout
 // v4: added table_version
 //
 // Process a heartbeat..
 //
 // v3: added interval, timeout
 // v4: added table_version

+// v5: added ipv6, re-ordered session structure

 static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t *p, in_addr_t addr)
 {
        heartt *h;
        int s = size - (p-data);
        int i, type;
 static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t *p, in_addr_t addr)
 {
        heartt *h;
        int s = size - (p-data);
        int i, type;

+       int hb_ver = more;

 
 

-#if HB_VERSION != 4
+#if HB_VERSION != 5

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

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


@@ -1153,7 +1302,7 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                        return -1; // Skip it.
                }
 
                        return -1; // Skip it.
                }
 

-               if (more >= 4) {
+               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",
                                        h->table_version, config->cluster_table_version);
                        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);


@@ -1180,9 +1329,33 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                        exit(1);
                }
 
                        exit(1);
                }
 

+                       //
+                       // Send it a unicast heartbeat to see give it a chance to die.
+                       // NOTE: It's actually safe to do seq-number - 1 without checking
+                       // for wrap around.
+                       //
+               cluster_catchup_slave(config->cluster_seq_number - 1, addr);
+

                return -1; // Skip it.
        }
 
                return -1; // Skip it.
        }
 

+               //
+               // Try and guard against a stray master appearing.
+               //
+               // Ignore heartbeats received from another master before the
+               // timeout (less a smidgen) for the old master has elapsed.
+               //
+               // Note that after a clean failover, the cluster_master_address
+               // is cleared, so this doesn't run. 
+               //
+       if (config->cluster_master_address && addr != config->cluster_master_address
+           && (config->cluster_last_hb + config->cluster_hb_timeout - 11) > TIME) {
+                   LOG(0, 0, 0, "Ignoring stray heartbeat from %s, current master %s has not yet timed out (last heartbeat %.1f seconds ago).\n",
+                           fmtaddr(addr, 0), fmtaddr(config->cluster_master_address, 1),
+                           0.1 * (TIME - config->cluster_last_hb));
+                   return -1; // ignore
+       }
+

        if (config->cluster_seq_number == -1)   // Don't have one. Just align to the master...
                config->cluster_seq_number = h->seq;
 
        if (config->cluster_seq_number == -1)   // Don't have one. Just align to the master...
                config->cluster_seq_number = h->seq;
 


@@ -1261,6 +1434,18 @@ 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);
 

+                               // session struct changed with v5
+                               if (hb_ver < 5)
+                               {
+                                       if (size != sizeof(struct oldsession)) {
+                                               LOG(0, 0, 0, "DANGER: Received a v%d CSESSION that didn't decompress correctly!\n", hb_ver);
+                                                       // Now what? Should exit! No-longer up to date!
+                                               break;
+                                       }
+                                       cluster_recv_session(more, convert_session((struct oldsession *) c));
+                                       break;
+                               }
+

                                if (size != sizeof(sessiont) ) { // Ouch! Very very bad!
                                        LOG(0, 0, 0, "DANGER: Received a CSESSION that didn't decompress correctly!\n");
                                                // Now what? Should exit! No-longer up to date!
                                if (size != sizeof(sessiont) ) { // Ouch! Very very bad!
                                        LOG(0, 0, 0, "DANGER: Received a CSESSION that didn't decompress correctly!\n");
                                                // Now what? Should exit! No-longer up to date!


@@ -1271,6 +1456,18 @@ 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 (s < sizeof(struct oldsession))
+                                               goto shortpacket;
+
+                                       cluster_recv_session(more, convert_session((struct oldsession *) p));
+
+                                       p += sizeof(struct oldsession);
+                                       s -= sizeof(struct oldsession);
+                                       break;
+                               }
+

                                if ( s < sizeof(session[more]))
                                        goto shortpacket;
 
                                if ( s < sizeof(session[more]))
                                        goto shortpacket;
 


@@ -1360,15 +1557,13 @@ int processcluster(char *data, int size, in_addr_t addr)
        s -= sizeof(uint32_t);
 
        switch (type) {
        s -= sizeof(uint32_t);
 
        switch (type) {

-       case C_PING:    // Update the peers table.
+       case C_PING: // Update the peers table.

                return cluster_add_peer(addr, more, (pingt *) p, s);
 
                return cluster_add_peer(addr, more, (pingt *) p, s);
 

-       case C_LASTSEEN:        // Catch up a slave (slave missed a packet).
-               if (!config->cluster_iam_master) { // huh?
-                       LOG(0, 0, 0, "I'm not the master, but I got a C_LASTSEEN from %s?\n", fmtaddr(addr, 0));
-                       return -1;
-               }
+       case C_MASTER: // Our master is wrong
+               return cluster_set_master(addr, more);

 
 

+       case C_LASTSEEN: // Catch up a slave (slave missed a packet).

                return cluster_catchup_slave(more, addr);
 
        case C_FORWARD: { // Forwarded control packet. pass off to processudp.
                return cluster_catchup_slave(more, addr);
 
        case C_FORWARD: { // Forwarded control packet. pass off to processudp.


@@ -1409,6 +1604,11 @@ int processcluster(char *data, int size, in_addr_t addr)
                return 0;
 
        case C_BYTES:
                return 0;
 
        case C_BYTES:

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

                return cluster_handle_bytes(p, s);
 
        case C_KILL:    // The master asked us to die!? (usually because we're too out of date).
                return cluster_handle_bytes(p, s);
 
        case C_KILL:    // The master asked us to die!? (usually because we're too out of date).