j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Slightly randomize all timeouts.

Browse source
This commit is contained in:
Guus Sliepen 2012-10-21 17:45:16 +02:00
parent 717ea66d7b
commit edc08b73a9
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/net.c
View file

@ -164,7 +164,7 @@ static void timeout_handler(int fd, short events, void *event) {
} }
} }
event_add(event, &(struct timeval){pingtimeout, 0}); event_add(event, &(struct timeval){pingtimeout, rand() % 100000});
} }
static void periodic_handler(int fd, short events, void *event) { static void periodic_handler(int fd, short events, void *event) {
@ -278,7 +278,7 @@ static void periodic_handler(int fd, short events, void *event) {
} }
} }
event_add(event, &(struct timeval){5, 0}); event_add(event, &(struct timeval){5, rand() % 100000});
} }
void handle_meta_connection_data(int fd, short events, void *data) { void handle_meta_connection_data(int fd, short events, void *data) {
@ -449,10 +449,10 @@ int main_loop(void) {
struct event periodic_event; struct event periodic_event;
timeout_set(&timeout_event, timeout_handler, &timeout_event); timeout_set(&timeout_event, timeout_handler, &timeout_event);
event_add(&timeout_event, &(struct timeval){pingtimeout, 0}); event_add(&timeout_event, &(struct timeval){pingtimeout, rand() % 100000});
timeout_set(&periodic_event, periodic_handler, &periodic_event); timeout_set(&periodic_event, periodic_handler, &periodic_event);
event_add(&periodic_event, &(struct timeval){5, 0}); event_add(&periodic_event, &(struct timeval){5, rand() % 100000});
#ifndef HAVE_MINGW #ifndef HAVE_MINGW
struct event sighup_event; struct event sighup_event;

2
src/net_packet.c
View file

@ -151,7 +151,7 @@ static void send_mtu_probe_handler(int fd, short events, void *data) {
} }
end: end:
event_add(&n->mtuevent, &(struct timeval){timeout, 0}); event_add(&n->mtuevent, &(struct timeval){timeout, rand() % 100000});
} }
void send_mtu_probe(node_t *n) { void send_mtu_probe(node_t *n) {

2
src/net_setup.c
View file

@ -285,7 +285,7 @@ void regenerate_key(void) {
timeout_set(&keyexpire_event, keyexpire_handler, NULL); timeout_set(&keyexpire_event, keyexpire_handler, NULL);
} }
event_add(&keyexpire_event, &(struct timeval){keylifetime, 0}); event_add(&keyexpire_event, &(struct timeval){keylifetime, rand() % 100000});
} }
/* /*

2
src/net_socket.c
View file

@ -282,7 +282,7 @@ void retry_outgoing(outgoing_t *outgoing) {
outgoing->timeout = maxtimeout; outgoing->timeout = maxtimeout;
timeout_set(&outgoing->ev, retry_outgoing_handler, outgoing); timeout_set(&outgoing->ev, retry_outgoing_handler, outgoing);
event_add(&outgoing->ev, &(struct timeval){outgoing->timeout, 0}); event_add(&outgoing->ev, &(struct timeval){outgoing->timeout, rand() % 100000});
logger(DEBUG_CONNECTIONS, LOG_NOTICE, logger(DEBUG_CONNECTIONS, LOG_NOTICE,
"Trying to re-establish outgoing connection in %d seconds", "Trying to re-establish outgoing connection in %d seconds",

4
src/protocol.c
View file

@ -180,7 +180,7 @@ bool seen_request(const char *request) {
new->request = xstrdup(request); new->request = xstrdup(request);
new->firstseen = time(NULL); new->firstseen = time(NULL);
splay_insert(past_request_tree, new); splay_insert(past_request_tree, new);
event_add(&past_request_event, &(struct timeval){10, 0}); event_add(&past_request_event, &(struct timeval){10, rand() % 100000});
return false; return false;
} }
} }
@ -201,7 +201,7 @@ static void age_past_requests(int fd, short events, void *data) {
deleted, left); deleted, left);
if(left) if(left)
event_add(&past_request_event, &(struct timeval){10, 0}); event_add(&past_request_event, &(struct timeval){10, rand() % 100000});
} }
void init_requests(void) { void init_requests(void) {

4
src/route.c
View file

@ -209,7 +209,7 @@ static void age_subnets(int fd, short events, void *data) {
} }
if(left) if(left)
event_add(&age_subnets_event, &(struct timeval){10, 0}); event_add(&age_subnets_event, &(struct timeval){10, rand() % 100000});
} }
static void learn_mac(mac_t *address) { static void learn_mac(mac_t *address) {
@ -238,7 +238,7 @@ static void learn_mac(mac_t *address) {
if(!timeout_initialized(&age_subnets_event)) if(!timeout_initialized(&age_subnets_event))
timeout_set(&age_subnets_event, age_subnets, NULL); timeout_set(&age_subnets_event, age_subnets, NULL);
event_add(&age_subnets_event, &(struct timeval){10, 0}); event_add(&age_subnets_event, &(struct timeval){10, rand() % 100000});
} else { } else {
if(subnet->expires) if(subnet->expires)
subnet->expires = time(NULL) + macexpire; subnet->expires = time(NULL) + macexpire;