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

Add functions for timers initialization and cleanup

Browse source
This commit is contained in:
thorkill 2017-05-06 17:23:59 +02:00
parent 3335860dc7
commit f96d2d5d76
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/net.c
View file

@ -511,13 +511,29 @@ void retry(void) {
timeout_set(&pingtimer, &(struct timeval){0, 0}); timeout_set(&pingtimer, &(struct timeval){0, 0});
} }
/*
Initialize timers
*/
void init_timers(void) {
timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000});
timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){0, 0});
}
/*
Release timers
*/
void exit_timers(void) {
timeout_del(&periodictimer);
timeout_del(&pingtimer);
}
/* /*
this is where it all happens... this is where it all happens...
*/ */
int main_loop(void) { int main_loop(void) {
last_periodic_run_time = now; last_periodic_run_time = now;
timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000}); init_timers();
timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){0, 0});
#ifndef HAVE_MINGW #ifndef HAVE_MINGW
signal_t sighup; signal_t sighup;
@ -552,8 +568,6 @@ int main_loop(void) {
signal_del(&sigalrm); signal_del(&sigalrm);
#endif #endif
timeout_del(&periodictimer); exit_timers();
timeout_del(&pingtimer);
return 0; return 0;
} }

2
src/net.h
View file

@ -220,6 +220,8 @@ extern void regenerate_key(void);
extern void update_edge_weight(void); extern void update_edge_weight(void);
extern void purge(void); extern void purge(void);
extern void retry(void); extern void retry(void);
extern void init_timers(void);
extern void exit_timers(void);
extern int reload_configuration(void); extern int reload_configuration(void);
extern void load_all_nodes(void); extern void load_all_nodes(void);
extern void try_tx(struct node_t *n, bool); extern void try_tx(struct node_t *n, bool);