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

Merge pull request #2068 from freifunk-gluon/radv-filterd

Browse Source 
gluon-radv-filterd: minor cleanup
This commit is contained in:
David Bauer 2020-07-04 21:02:40 +02:00 committed by GitHub
commit b099b3ceba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,14 +559,13 @@ static int parse_tt_local(struct nl_msg *msg,
} }
static void update_tqs(void) { static void update_tqs(void) {
static const struct ether_addr unspec = {};
struct router *router; struct router *router;
bool update_originators = false; bool update_originators = false;
struct ether_addr unspec;
struct batadv_nlquery_opts opts; struct batadv_nlquery_opts opts;
int ret; int ret;
// reset TQs // reset TQs
memset(&unspec, 0, sizeof(unspec));
foreach(router, G.routers) { foreach(router, G.routers) {
router->tq = 0; router->tq = 0;
if (ether_addr_equal(router->originator, unspec)) if (ether_addr_equal(router->originator, unspec))
@ -609,12 +608,12 @@ static void update_tqs(void) {
foreach(router, G.routers) { foreach(router, G.routers) {
if (router->tq == 0) { if (router->tq == 0) {
if (ether_addr_equal(router->originator, unspec)) if (ether_addr_equal(router->originator, unspec))
fprintf(stderr, DEBUG_MSG(
"Unable to find router " F_MAC " in transtable_{global,local}\n", "Unable to find router " F_MAC " in transtable_{global,local}",
F_MAC_VAR(router->src)); F_MAC_VAR(router->src));
else else
fprintf(stderr, DEBUG_MSG(
"Unable to find TQ for originator " F_MAC " (router " F_MAC ")\n", "Unable to find TQ for originator " F_MAC " (router " F_MAC ")",
F_MAC_VAR(router->originator), F_MAC_VAR(router->originator),
F_MAC_VAR(router->src)); F_MAC_VAR(router->src));
} }

3
package/gluon-radv-filterd/src/mac.h
View File

@ -1,4 +1,7 @@
#pragma once
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#define F_MAC "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define F_MAC "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"