// L2TPNS Clustering Stuff
-char const *cvs_id_cluster = "$Id: cluster.c,v 1.14 2004-10-30 07:35:00 bodea Exp $";
+char const *cvs_id_cluster = "$Id: cluster.c,v 1.22 2004-12-13 05:09:55 bodea Exp $";
#include <stdio.h>
#include <sys/file.h>
} peers[CLUSTER_MAX_SIZE]; // List of all the peers we've heard from.
static int num_peers; // Number of peers in list.
-int rle_decompress(u8 ** src_p, int ssize, u8 *dst, int dsize);
-int rle_compress(u8 ** src_p, int ssize, u8 *dst, int dsize);
+static int rle_decompress(u8 ** src_p, int ssize, u8 *dst, int dsize);
+static int rle_compress(u8 ** src_p, int ssize, u8 *dst, int dsize);
//
// Create a listening socket
struct sockaddr_in interface_addr;
struct ip_mreq mreq;
struct ifreq ifr;
- int opt = 0;
+ int opt;
config->cluster_undefined_sessions = MAXSESSION-1;
config->cluster_undefined_tunnels = MAXTUNNEL-1;
addr.sin_addr.s_addr = INADDR_ANY;
setsockopt(cluster_sockfd, SOL_SOCKET, SO_REUSEADDR, &addr, sizeof(addr));
+ opt = fcntl(cluster_sockfd, F_GETFL, 0);
+ fcntl(cluster_sockfd, F_SETFL, opt | O_NONBLOCK);
+
if (bind(cluster_sockfd, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, 0, 0, 0, "Failed to bind cluster socket: %s\n", strerror(errno));
+ LOG(0, 0, 0, "Failed to bind cluster socket: %s\n", strerror(errno));
return -1;
}
strcpy(ifr.ifr_name, config->cluster_interface);
if (ioctl(cluster_sockfd, SIOCGIFADDR, &ifr) < 0)
{
- log(0, 0, 0, 0, "Failed to get interface address for (%s): %s\n", config->cluster_interface, strerror(errno));
+ LOG(0, 0, 0, "Failed to get interface address for (%s): %s\n", config->cluster_interface, strerror(errno));
return -1;
}
if (setsockopt(cluster_sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) < 0)
{
- log(0, 0, 0, 0, "Failed to setsockopt (join mcast group): %s\n", strerror(errno));
+ LOG(0, 0, 0, "Failed to setsockopt (join mcast group): %s\n", strerror(errno));
return -1;
}
- if (setsockopt (cluster_sockfd, IPPROTO_IP, IP_MULTICAST_IF, &interface_addr, sizeof(interface_addr)) < 0)
+ if (setsockopt(cluster_sockfd, IPPROTO_IP, IP_MULTICAST_IF, &interface_addr, sizeof(interface_addr)) < 0)
{
- log(0, 0, 0, 0, "Failed to setsockopt (set mcast interface): %s\n", strerror(errno));
+ LOG(0, 0, 0, "Failed to setsockopt (set mcast interface): %s\n", strerror(errno));
return -1;
}
// address ).
//
-int cluster_send_data(void *data, int datalen)
+static int cluster_send_data(void *data, int datalen)
{
struct sockaddr_in addr = {0};
addr.sin_port = htons(CLUSTERPORT);
addr.sin_family = AF_INET;
- log(5,0,0,0, "Cluster send data: %d bytes\n", datalen);
+ LOG(5, 0, 0, "Cluster send data: %d bytes\n", datalen);
if (sendto(cluster_sockfd, data, datalen, MSG_NOSIGNAL, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, 0, 0, 0, "sendto: %s\n", strerror(errno));
+ LOG(0, 0, 0, "sendto: %s\n", strerror(errno));
return -1;
}
}
}
-void cluster_uptodate(void)
+// advertise our presence via BGP or gratuitous ARP
+static void advertise(void)
+{
+#ifdef BGP
+ if (bgp_configured)
+ bgp_enable_routing(1);
+ else
+#endif /* BGP */
+ if (config->send_garp)
+ send_garp(config->bind_address); // Start taking traffic.
+}
+
+static void cluster_uptodate(void)
{
if (config->cluster_iam_uptodate)
return;
config->cluster_iam_uptodate = 1;
- log(0,0,0,0, "Now uptodate with master.\n");
-
-#ifdef BGP
- if (bgp_configured)
- bgp_enable_routing(1);
- else
-#endif /* BGP */
- if (config->send_garp)
- send_garp(config->bind_address); // Start taking traffic.
+ LOG(0, 0, 0, "Now uptodate with master.\n");
+ advertise();
}
//
// Send a unicast UDP packet to a peer with 'data' as the
// contents.
//
-int peer_send_data(u32 peer, char * data, int size)
+static int peer_send_data(u32 peer, char * data, int size)
{
struct sockaddr_in addr = {0};
addr.sin_port = htons(CLUSTERPORT);
addr.sin_family = AF_INET;
- log_hex(5, "Peer send", data, size);
+ LOG_HEX(5, "Peer send", data, size);
if (sendto(cluster_sockfd, data, size, MSG_NOSIGNAL, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, 0, 0, 0, "sendto: %s\n", strerror(errno));
+ LOG(0, 0, 0, "sendto: %s\n", strerror(errno));
return -1;
}
//
// Send a structured message to a peer with a single element of type 'type'.
//
-int peer_send_message(u32 peer, int type, int more, char * data, int size)
+static int peer_send_message(u32 peer, int type, int more, char * data, int size)
{
char buf[65536]; // Vast overkill.
char * p = buf;
- log(4,0,0,0, "Sending message to peer (type %d, more %d, size %d)\n", type, more, size);
+ LOG(4, 0, 0, "Sending message to peer (type %d, more %d, size %d)\n", type, more, size);
add_type(&p, type, more, data, size);
return peer_send_data(peer, buf, (p-buf) );
if (!config->cluster_master_address) // No election has been held yet. Just skip it.
return -1;
- log(4,0,0,0, "Forwarding packet from %s to master (size %d)\n", inet_toa(addr), size);
+ 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, (char*) &port, sizeof(port) );
if (!config->cluster_master_address) // No election has been held yet. Just skip it.
return -1;
- log(4,0,0,0, "Throttling packet master (size %d, tbfid %d)\n", size, tbfid);
+ LOG(4, 0, 0, "Throttling packet master (size %d, tbfid %d)\n", size, tbfid);
add_type(&p, C_THROTTLE, tbfid, data, size);
if (!config->cluster_master_address) // No election has been held yet. Just skip it.
return -1;
- log(4,0,0,0, "Walled garden packet to master (size %d)\n", size);
+ LOG(4, 0, 0, "Walled garden packet to master (size %d)\n", size);
add_type(&p, C_GARDEN, s, data, size);
if (size > sizeof(past_hearts[0].data))
{
- log(0,0,0,0, "Tried to heartbeat something larger than the maximum packet!\n");
+ LOG(0, 0, 0, "Tried to heartbeat something larger than the maximum packet!\n");
kill(0, SIGTERM);
exit(1);
}
if (config->cluster_iam_master && basetime) // We're heartbeating so no need to ping.
return;
- log(5,0,0,0, "Sending cluster ping...\n");
+ LOG(5, 0, 0, "Sending cluster ping...\n");
x.ver = 1;
x.addr = config->bind_address;
// Forward the data to the master.
- log(4,0,0,0, "Sending byte counters to master (%d elements)\n", c);
+ LOG(4, 0, 0, "Sending byte counters to master (%d elements)\n", c);
peer_send_message(config->cluster_master_address, C_BYTES, c, (char*) &b, sizeof(b[0]) * c);
return;
}
}
#ifdef BGP
- // master lost all slaves, need to handle traffic ourself
- if (bgp_configured && had_peers && !have_peers)
- bgp_enable_routing(1);
- else if (bgp_configured && !had_peers && have_peers)
- bgp_enable_routing(0);
+ // 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 */
}
if (!probed && config->cluster_master_address)
{
probed = 1;
- log(1, 0, 0, 0, "Heartbeat from master %.1fs late, probing...\n",
+ LOG(1, 0, 0, "Heartbeat from master %.1fs late, probing...\n",
0.1 * (TIME - (config->cluster_last_hb + config->cluster_hb_interval)));
peer_send_message(config->cluster_master_address,
config->cluster_last_hb = TIME + 1; // Just the one election thanks.
- log(0,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++)
{
continue; // Shutdown peer! Skip them.
if (peers[i].basetime < basetime) {
- log(1,0,0,0, "Expecting %s to become master\n", inet_toa(peers[i].peer) );
+ LOG(1, 0, 0, "Expecting %s to become master\n", fmtaddr(peers[i].peer, 0));
return; // They'll win the election. Get out of here.
}
if (peers[i].basetime == basetime &&
peers[i].peer > my_address) {
- log(1,0,0,0, "Expecting %s to become master\n", inet_toa(peers[i].peer) );
+ 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.
}
}
config->cluster_iam_master = 1;
config->cluster_master_address = 0;
- log(0,0,0,0, "I am declaring myself the master!\n");
+ LOG(0, 0, 0, "I am declaring myself the master!\n");
if (config->cluster_seq_number == -1)
config->cluster_seq_number = 0;
session[i].tbf_in = session[i].tbf_out = 0; // Remove stale pointers from old master.
- throttle_session(i, session[i].throttle);
+ throttle_session(i, session[i].throttle_in, session[i].throttle_out);
if (session[i].tunnel != T_FREE && i > config->cluster_highest_sessionid)
config->cluster_highest_sessionid = i;
// If we're not the very first master, this is a big issue!
if(count>0)
- log(0,0,0,0, "Warning: Fixed %d uninitialized sessions in becoming master!\n", count);
+ LOG(0, 0, 0, "Warning: Fixed %d uninitialized sessions in becoming master!\n", count);
config->cluster_undefined_sessions = 0;
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.
if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels) {
- log(2,0,0,0, "Cleared undefined sessions/tunnels. %d sess (high %d), %d tunn (high %d)\n",
+ LOG(2, 0, 0, "Cleared undefined sessions/tunnels. %d sess (high %d), %d tunn (high %d)\n",
config->cluster_undefined_sessions, highsession, config->cluster_undefined_tunnels, hightunnel);
return;
}
cluster_uptodate();
}
-int hb_add_type(char **p, int type, int id)
+static int hb_add_type(char **p, int type, int id)
{
switch (type) {
case C_CSESSION: { // Compressed C_SESSION.
(char*) &tunnel[id], sizeof(tunnelt));
break;
default:
- log(0,0,0,0, "Found an invalid type in heart queue! (%d)\n", type);
+ LOG(0, 0, 0, "Found an invalid type in heart queue! (%d)\n", type);
kill(0, SIGTERM);
exit(1);
}
if (!config->cluster_iam_master) // Only the master does this.
return;
+ config->cluster_table_version += config->cluster_num_changes;
+
// Fill out the heartbeat header.
memset(&h, 0, sizeof(h));
h.size_tunn = sizeof(tunnelt);
h.interval = config->cluster_hb_interval;
h.timeout = config->cluster_hb_timeout;
+ h.table_version = config->cluster_table_version;
add_type(&p, C_HEARTBEAT, HB_VERSION, (char*) &h, sizeof(h));
}
if (p > (buff + sizeof(buff))) { // Did we somehow manage to overun the buffer?
- log(0,0,0,0, "FATAL: Overran the heartbeat buffer! This is fatal. Exiting. (size %d)\n", p - buff);
+ LOG(0, 0, 0, "FATAL: Overran the heartbeat buffer! This is fatal. Exiting. (size %d)\n", p - buff);
kill(0, SIGTERM);
exit(1);
}
//
// Did we do something wrong?
if (p > (buff + sizeof(buff))) { // Did we somehow manage to overun the buffer?
- log(0,0,0,0, "Overran the heartbeat buffer now! This is fatal. Exiting. (size %d)\n", p - buff);
+ LOG(0, 0, 0, "Overran the heartbeat buffer now! This is fatal. Exiting. (size %d)\n", p - buff);
kill(0, SIGTERM);
exit(1);
}
- log(3,0,0,0, "Sending heartbeat #%d with %d changes (%d x-sess, %d x-tunnels, %d highsess, %d hightun, size %d)\n",
- h.seq, config->cluster_num_changes, count, tcount, config->cluster_highest_sessionid,
- config->cluster_highest_tunnelid, (p-buff));
+ LOG(3, 0, 0, "Sending v%d heartbeat #%d, change #%llu with %d changes "
+ "(%d x-sess, %d x-tunnels, %d highsess, %d hightun, size %d)\n",
+ HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,
+ count, tcount, config->cluster_highest_sessionid,
+ config->cluster_highest_tunnelid, (p-buff));
config->cluster_num_changes = 0;
//
// A structure of type 'type' has changed; Add it to the queue to send.
//
-int type_changed(int type, int id)
+static int type_changed(int type, int id)
{
int i;
int cluster_send_session(int sid)
{
if (!config->cluster_iam_master) {
- log(0,0,sid,0, "I'm not a master, but I just tried to change a session!\n");
+ LOG(0, sid, 0, "I'm not a master, but I just tried to change a session!\n");
return -1;
}
int cluster_send_tunnel(int tid)
{
if (!config->cluster_iam_master) {
- log(0,0,0,tid, "I'm not a master, but I just tried to change a tunnel!\n");
+ LOG(0, 0, tid, "I'm not a master, but I just tried to change a tunnel!\n");
return -1;
}
// missed a packet. We'll resend it every packet since
// the last one it's seen.
//
-int cluster_catchup_slave(int seq, u32 slave)
+static int cluster_catchup_slave(int seq, u32 slave)
{
int s;
int diff;
- log(1,0,0,0, "Slave %s sent LASTSEEN with seq %d\n", inet_toa(slave), seq);
+ LOG(1, 0, 0, "Slave %s sent LASTSEEN with seq %d\n", fmtaddr(slave, 0), seq);
diff = config->cluster_seq_number - seq; // How many packet do we need to send?
if (diff < 0)
diff += HB_MAX_SEQ;
if (diff >= HB_HISTORY_SIZE) { // Ouch. We don't have the packet to send it!
- log(0,0,0,0, "A slaved asked for message %d when our seq number is %d. Killing it.\n",
+ LOG(0, 0, 0, "A slave asked for message %d when our seq number is %d. Killing it.\n",
seq, config->cluster_seq_number);
return peer_send_message(slave, C_KILL, seq, NULL, 0);// Kill the slave. Nothing else to do.
}
while (seq != config->cluster_seq_number) {
s = seq%HB_HISTORY_SIZE;
if (seq != past_hearts[s].seq) {
- log(0,0,0,0, "Tried to re-send heartbeat for %s but %d doesn't match %d! (%d,%d)\n",
- inet_toa(slave), seq, past_hearts[s].seq, s, config->cluster_seq_number);
+ 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);
return -1; // What to do here!?
}
peer_send_data(slave, past_hearts[s].data, past_hearts[s].size);
// We've heard from another peer! Add it to the list
// that we select from at election time.
//
-int cluster_add_peer(u32 peer, time_t basetime, pingt *pp, int size)
+static int cluster_add_peer(u32 peer, time_t basetime, pingt *pp, int size)
{
int i;
u32 clusterid;
if (clusterid != config->bind_address)
{
// Is this for us?
- log(4,0,0,0, "Skipping ping from %s (different cluster)\n", inet_toa(peer));
+ LOG(4, 0, 0, "Skipping ping from %s (different cluster)\n", fmtaddr(peer, 0));
return 0;
}
// Is this the master shutting down??
if (peer == config->cluster_master_address && !basetime) {
- log(3,0,0,0, "Master %s shutting down...\n", inet_toa(config->cluster_master_address));
+ LOG(3, 0, 0, "Master %s shutting down...\n", fmtaddr(config->cluster_master_address, 0));
config->cluster_master_address = 0;
config->cluster_last_hb = 0; // Force an election.
cluster_check_master();
if (i >= num_peers)
{
- log(4,0,0,0, "Adding %s as a peer\n", inet_toa(peer));
+ LOG(4, 0, 0, "Adding %s as a peer\n", fmtaddr(peer, 0));
// Not found. Is there a stale slot to re-use?
for (i = 0; i < num_peers ; ++i)
if (i >= CLUSTER_MAX_SIZE)
{
// Too many peers!!
- log(0,0,0,0, "Tried to add %s as a peer, but I already have %d of them!\n", inet_toa(peer), i);
+ LOG(0, 0, 0, "Tried to add %s as a peer, but I already have %d of them!\n", fmtaddr(peer, 0), i);
return -1;
}
if (i == num_peers)
++num_peers;
- log(1,0,0,0, "Added %s as a new peer. Now %d peers\n", inet_toa(peer), num_peers);
+ LOG(1, 0, 0, "Added %s as a new peer. Now %d peers\n", fmtaddr(peer, 0), num_peers);
}
return 1;
// Note that we don't mark the session as dirty; We rely on
// the slow table walk to propogate this back out to the slaves.
//
-int cluster_handle_bytes(char * data, int size)
+static int cluster_handle_bytes(char * data, int size)
{
bytest * b;
b = (bytest*) data;
- log(3,0,0,0, "Got byte counter update (size %d)\n", size);
+ LOG(3, 0, 0, "Got byte counter update (size %d)\n", size);
/* Loop around, adding the byte
counts to each of the sessions. */
while (size >= sizeof(*b) ) {
if (b->sid > MAXSESSION) {
- log(0,0,0,0, "Got C_BYTES with session #%d!\n", b->sid);
+ LOG(0, 0, 0, "Got C_BYTES with session #%d!\n", b->sid);
return -1; /* Abort processing */
}
}
if (size != 0)
- log(0,0,0,0, "Got C_BYTES with %d bytes of trailing junk!\n", size);
+ LOG(0, 0, 0, "Got C_BYTES with %d bytes of trailing junk!\n", size);
return size;
}
static int cluster_recv_session(int more , u8 * p)
{
if (more >= MAXSESSION) {
- log(0,0,0,0, "DANGER: Received a heartbeat session id > MAXSESSION!\n");
+ LOG(0, 0, 0, "DANGER: Received a heartbeat session id > MAXSESSION!\n");
return -1;
}
if (session[more].tunnel == T_UNDEF) {
if (config->cluster_iam_uptodate) { // Sanity.
- log(0,0,0,0, "I thought I was uptodate but I just found an undefined session!\n");
+ LOG(0, 0, 0, "I thought I was uptodate but I just found an undefined session!\n");
} else {
--config->cluster_undefined_sessions;
}
load_session(more, (sessiont*) p); // Copy session into session table..
- log(5,0,more,0, "Received session update (%d undef)\n", config->cluster_undefined_sessions);
+ LOG(5, more, 0, "Received session update (%d undef)\n", config->cluster_undefined_sessions);
if (!config->cluster_iam_uptodate)
cluster_uptodate(); // Check to see if we're up to date.
static int cluster_recv_tunnel(int more, u8 *p)
{
if (more >= MAXTUNNEL) {
- log(0,0,0,0, "DANGER: Received a tunnel session id > MAXTUNNEL!\n");
+ LOG(0, 0, 0, "DANGER: Received a tunnel session id > MAXTUNNEL!\n");
return -1;
}
if (tunnel[more].state == TUNNELUNDEF) {
if (config->cluster_iam_uptodate) { // Sanity.
- log(0,0,0,0, "I thought I was uptodate but I just found an undefined tunnel!\n");
+ LOG(0, 0, 0, "I thought I was uptodate but I just found an undefined tunnel!\n");
} else {
--config->cluster_undefined_tunnels;
}
tunnel[more].controls = tunnel[more].controle = NULL;
tunnel[more].controlc = 0;
- log(5,0,0,more, "Received tunnel update\n");
+ LOG(5, 0, more, "Received tunnel update\n");
if (!config->cluster_iam_uptodate)
cluster_uptodate(); // Check to see if we're up to date.
//
// Process a heartbeat..
//
+// v3: added interval, timeout
+// v4: added table_version
static int cluster_process_heartbeat(u8 * data, int size, int more, u8 * p, u32 addr)
{
heartt * h;
int s = size - (p-data);
int i, type;
-#if HB_VERSION != 3
+#if HB_VERSION != 4
# error "need to update cluster_process_heartbeat()"
#endif
- // we handle version 2+
- if (more < 2 || more > HB_VERSION) {
- log(0,0,0,0, "Received a heartbeat version that I don't support (%d)!\n", more);
+ // 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);
return -1; // Ignore it??
}
if (config->cluster_iam_master) { // Sanity...
// Note that this MUST match the election process above!
- log(0,0,0,0, "I just got a packet claiming to be from a master but _I_ am the master!\n");
+ LOG(0, 0, 0, "I just got a heartbeat from master %s, but _I_ am the master!\n", fmtaddr(addr, 0));
if (!h->basetime) {
- log(0,0,0,0, "Heartbeat from addr %s with zero basetime!\n", inet_toa(addr) );
+ LOG(0, 0, 0, "Heartbeat with zero basetime! Ignoring\n");
return -1; // Skip it.
}
+ if (more >= 4 && h->table_version > config->cluster_table_version) {
+ LOG(0, 0, 0, "They've seen more state changes (%llu vs my %llu) so I'm gone!\n",
+ h->table_version, config->cluster_table_version);
+
+ kill(0, SIGTERM);
+ exit(1);
+ }
if (basetime > h->basetime) {
- log(0,0,0,0, "They're (%s) an older master than me so I'm gone!\n", inet_toa(addr));
+ LOG(0, 0, 0, "They're an older master than me so I'm gone!\n");
kill(0, SIGTERM);
exit(1);
}
if (basetime == h->basetime && my_address < addr) { // Tie breaker.
- log(0,0,0,0, "They're a higher IP address than me, so I'm gone!\n");
+ LOG(0, 0, 0, "They're a higher IP address than me, so I'm gone!\n");
kill(0, SIGTERM);
exit(1);
}
config->cluster_last_hb = TIME; // Reset to ensure that we don't become master!!
if (config->cluster_seq_number != h->seq) { // Out of sequence heartbeat!
- log(1,0,0,0, "HB: Got seq# %d but was expecting %d. asking for resend.\n", h->seq, config->cluster_seq_number);
+ LOG(1, 0, 0, "HB: Got seq# %d but was expecting %d. asking for resend.\n", h->seq, config->cluster_seq_number);
peer_send_message(addr, C_LASTSEEN, config->cluster_seq_number, NULL, 0);
// that the free session pointer is correct.
cluster_check_sessions(h->highsession, h->freesession, h->hightunnel);
- if (more > 2) // reserved section of heartt was not initialized prior to v3
+ if (h->interval != config->cluster_hb_interval)
{
- if (h->interval != config->cluster_hb_interval)
- {
- log(2, 0, 0, 0, "Master set ping/heartbeat interval to %u (was %u)\n",
- h->interval, config->cluster_hb_interval);
+ LOG(2, 0, 0, "Master set ping/heartbeat interval to %u (was %u)\n",
+ h->interval, config->cluster_hb_interval);
- config->cluster_hb_interval = h->interval;
- }
+ config->cluster_hb_interval = h->interval;
+ }
- if (h->timeout != config->cluster_hb_timeout)
- {
- log(2, 0, 0, 0, "Master set heartbeat timeout to %u (was %u)\n",
- h->timeout, config->cluster_hb_timeout);
+ if (h->timeout != config->cluster_hb_timeout)
+ {
+ LOG(2, 0, 0, "Master set heartbeat timeout to %u (was %u)\n",
+ h->timeout, config->cluster_hb_timeout);
- config->cluster_hb_timeout = h->timeout;
- }
+ config->cluster_hb_timeout = h->timeout;
}
// Ok. process the packet...
s -= (p - orig_p);
if (size != sizeof(sessiont) ) { // Ouch! Very very bad!
- log(0,0,0,0, "DANGER: Received a CSESSION that didn't decompress correctly!\n");
+ LOG(0, 0, 0, "DANGER: Received a CSESSION that didn't decompress correctly!\n");
// Now what? Should exit! No-longer up to date!
break;
}
s -= (p - orig_p);
if (size != sizeof(tunnelt) ) { // Ouch! Very very bad!
- log(0,0,0,0, "DANGER: Received a CSESSION that didn't decompress correctly!\n");
+ LOG(0, 0, 0, "DANGER: Received a CSESSION that didn't decompress correctly!\n");
// Now what? Should exit! No-longer up to date!
break;
}
s -= sizeof(tunnel[more]);
break;
default:
- log(0,0,0,0, "DANGER: I received a heartbeat element where I didn't understand the type! (%d)\n", type);
+ 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!!
}
}
+
if (config->cluster_master_address != addr)
{
- char *str;
- str = strdup(inet_toa(config->cluster_master_address));
- log(0,0,0,0, "My master just changed from %s to %s!\n", str, inet_toa(addr));
- if (str) free(str);
+ LOG(0, 0, 0, "My master just changed from %s to %s!\n",
+ fmtaddr(config->cluster_master_address, 0), fmtaddr(addr, 1));
+
+ config->cluster_master_address = addr;
}
- config->cluster_master_address = addr;
config->cluster_last_hb = TIME; // Successfully received a heartbeat!
+ config->cluster_table_version = h->table_version;
return 0;
shortpacket:
- log(0,0,0,0, "I got an incomplete heartbeat packet! This means I'm probably out of sync!!\n");
+ LOG(0, 0, 0, "I got an incomplete heartbeat packet! This means I'm probably out of sync!!\n");
return -1;
}
if (addr == my_address)
return -1; // Ignore it. Something looped back the multicast!
- log(5,0,0,0, "Process cluster: %d bytes from %s\n", size, inet_toa(addr));
+ LOG(5, 0, 0, "Process cluster: %d bytes from %s\n", size, fmtaddr(addr, 0));
if (s <= 0) // Any data there??
return -1;
p += sizeof(int);
if (!config->cluster_iam_master) { // huh?
- log(0,0,0,0, "I'm not the master, but I got a C_FORWARD from %s?\n", inet_toa(addr));
+ LOG(0, 0, 0, "I'm not the master, but I got a C_FORWARD from %s?\n", fmtaddr(addr, 0));
return -1;
}
- log(4,0,0,0, "Got a forwarded packet... (%s:%d)\n", inet_toa(more), a.sin_port);
+ LOG(4, 0, 0, "Got a forwarded packet... (%s:%d)\n", fmtaddr(more, 0), a.sin_port);
STAT(recv_forward);
processudp(p, s, &a);
return 0;
}
case C_THROTTLE: { // Receive a forwarded packet from a slave.
if (!config->cluster_iam_master) {
- log(0,0,0,0, "I'm not the master, but I got a C_THROTTLE from %s?\n", inet_toa(addr));
+ LOG(0, 0, 0, "I'm not the master, but I got a C_THROTTLE from %s?\n", fmtaddr(addr, 0));
return -1;
}
case C_GARDEN:
// Receive a walled garden packet from a slave.
if (!config->cluster_iam_master) {
- log(0,0,0,0, "I'm not the master, but I got a C_GARDEN from %s?\n", inet_toa(addr));
+ LOG(0, 0, 0, "I'm not the master, but I got a C_GARDEN from %s?\n", fmtaddr(addr, 0));
return -1;
}
case C_KILL: // The master asked us to die!? (usually because we're too out of date).
if (config->cluster_iam_master) {
- log(0,0,0,0, "_I_ am master, but I received a C_KILL from %s! (Seq# %d)\n", inet_toa(addr), more);
+ LOG(0, 0, 0, "_I_ am master, but I received a C_KILL from %s! (Seq# %d)\n", fmtaddr(addr, 0), more);
return -1;
}
if (more != config->cluster_seq_number) {
- log(0,0,0,0, "The master asked us to die but the seq number didn't match!?\n");
+ LOG(0, 0, 0, "The master asked us to die but the seq number didn't match!?\n");
return -1;
}
if (addr != config->cluster_master_address) {
- log(0,0,0,0, "Received a C_KILL from %s which doesn't match config->cluster_master_address (%x)\n",
- inet_toa(addr), config->cluster_master_address);
+ LOG(0, 0, 0, "Received a C_KILL from %s which doesn't match config->cluster_master_address (%s)\n",
+ fmtaddr(addr, 0), fmtaddr(config->cluster_master_address, 1));
// We can only warn about it. The master might really have switched!
}
- log(0,0,0,0, "Received a valid C_KILL: I'm going to die now.\n");
+ LOG(0, 0, 0, "Received a valid C_KILL: I'm going to die now.\n");
kill(0, SIGTERM);
exit(0); // Lets be paranoid;
return -1; // Just signalling the compiler.
case C_HEARTBEAT:
- log(4,0,0,0, "Got a heartbeat from %s\n", inet_toa(addr));
+ LOG(4, 0, 0, "Got a heartbeat from %s\n", fmtaddr(addr, 0));
return cluster_process_heartbeat(data, size, more, p, addr);
default:
- log(0,0,0,0, "Strange type packet received on cluster socket (%d)\n", type);
+ LOG(0, 0, 0, "Strange type packet received on cluster socket (%d)\n", type);
return -1;
}
return 0;
shortpacket:
- log(0,0,0,0, "I got a _short_ cluster heartbeat packet! This means I'm probably out of sync!!\n");
+ LOG(0, 0, 0, "I got a _short_ cluster heartbeat packet! This means I'm probably out of sync!!\n");
return -1;
}
return CLI_HELP_NO_ARGS;
cli_print(cli, "Cluster status : %s", config->cluster_iam_master ? "Master" : "Slave" );
- cli_print(cli, "My address : %s", inet_toa(my_address));
- cli_print(cli, "VIP address : %s", inet_toa(config->bind_address));
- cli_print(cli, "Multicast address: %s", inet_toa(config->cluster_address));
+ cli_print(cli, "My address : %s", fmtaddr(my_address, 0));
+ cli_print(cli, "VIP address : %s", fmtaddr(config->bind_address, 0));
+ cli_print(cli, "Multicast address: %s", fmtaddr(config->cluster_address, 0));
cli_print(cli, "Multicast i'face : %s", config->cluster_interface);
if (!config->cluster_iam_master) {
cli_print(cli, "My master : %s (last heartbeat %.1f seconds old)",
- config->cluster_master_address ? inet_toa(config->cluster_master_address) : "Not defined",
+ config->cluster_master_address
+ ? fmtaddr(config->cluster_master_address, 0)
+ : "Not defined",
0.1 * (TIME - config->cluster_last_hb));
cli_print(cli, "Uptodate : %s", config->cluster_iam_uptodate ? "Yes" : "No");
+ cli_print(cli, "Table version # : %llu", config->cluster_table_version);
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 tunnels undefined of %d", config->cluster_undefined_tunnels, config->cluster_highest_tunnelid);
} else {
+ cli_print(cli, "Table version # : %llu", 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 tunnel : %d", config->cluster_highest_tunnelid);
if (num_peers)
cli_print(cli, "%20s %10s %8s", "Address", "Basetime", "Age");
for (i = 0; i < num_peers; ++i) {
- cli_print(cli, "%20s %10d %8d", inet_toa(peers[i].peer),
+ cli_print(cli, "%20s %10d %8d", fmtaddr(peers[i].peer, 0),
peers[i].basetime, TIME - peers[i].timestamp);
}
return CLI_OK;
//
// Worst case is a 50% expansion in space required (trying to
// compress { 0x00, 0x01 } * N )
-int rle_compress(u8 ** src_p, int ssize, u8 *dst, int dsize)
+static int rle_compress(u8 ** src_p, int ssize, u8 *dst, int dsize)
{
int count;
int orig_dsize = dsize;
// Return the number of dst bytes used.
// Updates the 'src_p' pointer to point to the
// first un-used byte.
-int rle_decompress(u8 ** src_p, int ssize, u8 *dst, int dsize)
+static int rle_decompress(u8 ** src_p, int ssize, u8 *dst, int dsize)
{
int count;
int orig_dsize = dsize;
projects / l2tpns.git / blobdiff