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

gluon-radv-filterd: Reset chain when daemon shuts down

Browse Source 
The daemon must make sure that it doesn't filter any incoming router
advertisement when it was shut down. This can be achieved by flushing all
current rules and/or adding an ACCEPT all rule at the end. When both
commands work, the state of the chain will be the same as
/lib/gluon/ebtables/400-radv-filter created it.

This doesn't handle the problem that the daemon may have been crashed and
thus the chain is in an undefined state.

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

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

@ -118,6 +118,8 @@ static struct global {
.mesh_iface = "bat0", .mesh_iface = "bat0",
}; };
static int fork_execvp_timeout(struct timespec *timeout, const char *file,
const char *const argv[]);
static void error_message(int status, int errnum, char *message, ...) { static void error_message(int status, int errnum, char *message, ...) {
va_list ap; va_list ap;
@ -149,6 +151,10 @@ static int timespec_diff(struct timespec *tv1, struct timespec *tv2,
static void cleanup(void) { static void cleanup(void) {
struct router *router; struct router *router;
struct timespec timeout = {
.tv_nsec = EBTABLES_TIMEOUT,
};
close(G.sock); close(G.sock);
while (G.routers != NULL) { while (G.routers != NULL) {
@ -156,6 +162,17 @@ static void cleanup(void) {
G.routers = router->next; G.routers = router->next;
free(router); free(router);
} }
if (G.chain) {
/* Reset chain to accept everything again */
if (fork_execvp_timeout(&timeout, "ebtables", (const char *[])
{ "ebtables", "-F", G.chain, NULL }))
DEBUG_MSG("warning: flushing ebtables chain %s failed, not adding a new rule", G.chain);
if (fork_execvp_timeout(&timeout, "ebtables", (const char *[])
{ "ebtables", "-A", G.chain, "-j", "ACCEPT", NULL }))
DEBUG_MSG("warning: adding new rule to ebtables chain %s failed", G.chain);
}
} }
static void usage(const char *msg) { static void usage(const char *msg) {