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

gluon-radv-filterd: Use ebtables locking

Browse Source 
This enables the ebtables internal locking mechanism which will avoid race
conditions between multiple, concurrent ebtables calls.

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

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

@ -168,11 +168,11 @@ static void cleanup(void) {
if (G.chain) { if (G.chain) {
/* Reset chain to accept everything again */ /* Reset chain to accept everything again */
if (fork_execvp_timeout(&timeout, "ebtables", (const char *[]) if (fork_execvp_timeout(&timeout, "ebtables", (const char *[])
{ "ebtables", "-F", G.chain, NULL })) { "ebtables", "--concurrent", "-F", G.chain, NULL }))
DEBUG_MSG("warning: flushing ebtables chain %s failed, not adding a new rule", G.chain); DEBUG_MSG("warning: flushing ebtables chain %s failed, not adding a new rule", G.chain);
if (fork_execvp_timeout(&timeout, "ebtables", (const char *[]) if (fork_execvp_timeout(&timeout, "ebtables", (const char *[])
{ "ebtables", "-A", G.chain, "-j", "ACCEPT", NULL })) { "ebtables", "--concurrent", "-A", G.chain, "-j", "ACCEPT", NULL }))
DEBUG_MSG("warning: adding new rule to ebtables chain %s failed", G.chain); DEBUG_MSG("warning: adding new rule to ebtables chain %s failed", G.chain);
} }
} }
@ -720,10 +720,10 @@ static void update_ebtables(void) {
G.best_router = router; G.best_router = router;
if (fork_execvp_timeout(&timeout, "ebtables", (const char *[]) if (fork_execvp_timeout(&timeout, "ebtables", (const char *[])
{ "ebtables", "-F", G.chain, NULL })) { "ebtables", "--concurrent", "-F", G.chain, NULL }))
error_message(0, 0, "warning: flushing ebtables chain %s failed, not adding a new rule", G.chain); error_message(0, 0, "warning: flushing ebtables chain %s failed, not adding a new rule", G.chain);
else if (fork_execvp_timeout(&timeout, "ebtables", (const char *[]) else if (fork_execvp_timeout(&timeout, "ebtables", (const char *[])
{ "ebtables", "-A", G.chain, "-s", mac, "-j", "ACCEPT", NULL })) { "ebtables", "--concurrent", "-A", G.chain, "-s", mac, "-j", "ACCEPT", NULL }))
error_message(0, 0, "warning: adding new rule to ebtables chain %s failed", G.chain); error_message(0, 0, "warning: adding new rule to ebtables chain %s failed", G.chain);
} }

2
package/gluon-radv-filterd/src/respondd.c
View File

@ -8,7 +8,7 @@
#include "mac.h" #include "mac.h"
static struct json_object * get_radv_filter() { static struct json_object * get_radv_filter() {
FILE *f = popen("exec ebtables -L RADV_FILTER", "r"); FILE *f = popen("exec ebtables --concurrent -L RADV_FILTER", "r");
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
struct ether_addr mac = {}; struct ether_addr mac = {};