welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ping new master when we get C_MASTER and delay next election to allow

Browse source 
the unicast limp-along code to kick in if required.
This commit is contained in:
Brendan O'Dea 2005-06-14 05:37:09 +00:00
parent 02bdc1c32b
commit 973c5fd008
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Changes
View file

@ -9,6 +9,8 @@
- Always initialise PRNG. - Always initialise PRNG.
- Sanity check length of random_vector. - Sanity check length of random_vector.
- Fix segv in unhide_value. - Fix segv in unhide_value.
- Ping new master when we get C_MASTER and delay next election to allow
the unicast limp-along code to kick in if required.
* Sun Jun 5 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0 * Sun Jun 5 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0
- Add IPv6 support from Jonathan McDowell. - Add IPv6 support from Jonathan McDowell.

13
cluster.c
View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.41 2005-06-04 15:42:35 bodea Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.42 2005-06-14 05:37:09 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -1022,7 +1022,6 @@ static int cluster_add_peer(in_addr_t peer, time_t basetime, pingt *pp, int size
config->cluster_master_address = 0; config->cluster_master_address = 0;
config->cluster_last_hb = 0; // Force an election. config->cluster_last_hb = 0; // Force an election.
cluster_check_master(); cluster_check_master();
return 0;
} }
if (i >= num_peers) if (i >= num_peers)
@ -1069,6 +1068,16 @@ static int cluster_set_master(in_addr_t peer, in_addr_t master)
fmtaddr(master, 1)); fmtaddr(master, 1));
config->cluster_master_address = master; config->cluster_master_address = master;
if (master)
{
// catchup with new master
peer_send_message(master, C_LASTSEEN, config->cluster_seq_number, NULL, 0);
// delay next election
config->cluster_last_hb = TIME;
}
// run election (or reset "probed" if master was set)
cluster_check_master(); cluster_check_master();
return 0; return 0;
} }