nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-radv-filterd: Move election prereq checks into function

Browse Source 
The check of prerequisitions is rather long and becomes unreadable. Having
it in an extra function makes the code slightly more structured and better
readable.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann 2017-12-20 12:37:18 +01:00 committed by Jan-Philipp Litza
parent a6298493f7
commit c9f661740c
No known key found for this signature in database
GPG Key ID: 1FB658053CE27196
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/gluon-radv-filterd/src/gluon-radv-filterd.c
View File

@ -533,6 +533,14 @@ static int fork_execvp_timeout(struct timespec *timeout, const char *file, const
return -1; return -1;
} }
static bool election_required(void)
{
if (!G.best_router)
return true;
return G.best_router->tq < G.max_tq - G.hysteresis_thresh;
}
static void update_ebtables(void) { static void update_ebtables(void) {
struct timespec timeout = { struct timespec timeout = {
.tv_nsec = EBTABLES_TIMEOUT, .tv_nsec = EBTABLES_TIMEOUT,
@ -540,7 +548,7 @@ static void update_ebtables(void) {
char mac[F_MAC_LEN + 1]; char mac[F_MAC_LEN + 1];
struct router *router; struct router *router;
if (G.best_router && G.best_router->tq >= G.max_tq - G.hysteresis_thresh) { if (!election_required()) {
DEBUG_MSG(F_MAC " is still good enough with TQ=%d (max_tq=%d), not executing ebtables", DEBUG_MSG(F_MAC " is still good enough with TQ=%d (max_tq=%d), not executing ebtables",
F_MAC_VAR(G.best_router->src), F_MAC_VAR(G.best_router->src),
G.best_router->tq, G.best_router->tq,