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

gluon-radv-filterd: Some minor fixes and cleanup

Browse Source
This commit is contained in:
Jan-Philipp Litza 2017-08-20 14:33:27 +02:00
parent 0aca838f37
commit 93e2820f61
No known key found for this signature in database
GPG Key ID: 1FB658053CE27196
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,10 +90,6 @@
#define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0])) #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
#endif #endif
struct list_item {
struct list *next;
};
#define foreach(item, list) \ #define foreach(item, list) \
for(item = list; item != NULL; item = item->next) for(item = list; item != NULL; item = item->next)
@ -422,10 +418,7 @@ static void update_tqs() {
foreach(router, G.routers) { foreach(router, G.routers) {
if (router->tq == 0) { if (router->tq == 0) {
for (i = 0; i < 6; i++) if (!memcmp(router->originator, unspec, sizeof(unspec)))
if (router->originator[i] != 0)
break;
if (i >= 6)
fprintf(stderr, fprintf(stderr,
"Unable to find router " F_MAC " in transtable_{global,local}\n", "Unable to find router " F_MAC " in transtable_{global,local}\n",
F_MAC_VAR(router->src)); F_MAC_VAR(router->src));
@ -448,8 +441,10 @@ static int fork_execvp_timeout(struct timespec *timeout, const char *file, const
sigemptyset(&signals); sigemptyset(&signals);
sigaddset(&signals, SIGCHLD); sigaddset(&signals, SIGCHLD);
sigprocmask(SIG_BLOCK, &signals, &oldsignals);
child = fork(); child = fork();
if (child == 0) { if (child == 0) {
sigprocmask(SIG_SETMASK, &oldsignals, NULL);
// casting discards const, but should be safe // casting discards const, but should be safe
// (see http://stackoverflow.com/q/36925388) // (see http://stackoverflow.com/q/36925388)
execvp(file, (char**) argv); execvp(file, (char**) argv);
@ -461,7 +456,6 @@ static int fork_execvp_timeout(struct timespec *timeout, const char *file, const
return -1; return -1;
} }
sigprocmask(SIG_BLOCK, &signals, &oldsignals);
ret = sigtimedwait(&signals, &info, timeout); ret = sigtimedwait(&signals, &info, timeout);
sigprocmask(SIG_SETMASK, &oldsignals, NULL); sigprocmask(SIG_SETMASK, &oldsignals, NULL);