9 Oct
2017
9 Oct
'17
3:33 p.m.
It is enough to just request the data from netlink and skip debugfs when
netlink didn't return an error. The overwrite of the ret variable was only
for testing purposes and should no longer be used.
Fixes: a7bc3d9a2b3f ("alfred: Cache the global translation table entries")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
batadv_query.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/batadv_query.c b/batadv_query.c
index 8580f1b..78b92cd 100644
--- a/batadv_query.c
+++ b/batadv_query.c
@@ -308,7 +308,6 @@ struct hashtable_t *tg_hash_new(const char *mesh_iface)
ret = translate_mac_netlink(mesh_iface, tg_hash);
enable_net_admin_capability(0);
- ret = -EOPNOTSUPP;
if (ret == -EOPNOTSUPP)
translate_mac_debugfs(mesh_iface, tg_hash);
@@ -477,7 +476,6 @@ struct hashtable_t *orig_hash_new(const char *mesh_iface)
ret = get_tq_netlink(mesh_iface, orig_hash);
enable_net_admin_capability(0);
- ret = -EOPNOTSUPP;
if (ret == -EOPNOTSUPP)
get_tq_debugfs(mesh_iface, orig_hash);
--
2.11.0
9 Oct
9 Oct
3:33 p.m.
New subject: [B.A.T.M.A.N.] [PATCH 2/2] alfred: Only check for minimal length of fixed size packets
These fixed size packets could have some optional information in the
future. We should therefore not limit the size of these packets to the size
of the non-tlv header.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
---
Any objections? Not sure if this is really necessary. But could be useful
in the future.
---
recv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recv.c b/recv.c
index 12bb3f1..e897e3d 100644
--- a/recv.c
+++ b/recv.c
@@ -284,7 +284,7 @@ process_alfred_announce_master(struct globals *globals,
if (announce->header.version != ALFRED_VERSION)
return -1;
- if (len != (sizeof(*announce) - sizeof(announce->header)))
+ if (len < (sizeof(*announce) - sizeof(announce->header)))
return -1;
server = hash_find(interface->server_hash, &mac);
@@ -320,7 +320,7 @@ static int process_alfred_request(struct globals *globals,
if (request->header.version != ALFRED_VERSION)
return -1;
- if (len != (sizeof(*request) - sizeof(request->header)))
+ if (len < (sizeof(*request) - sizeof(request->header)))
return -1;
push_data(globals, interface, source, SOURCE_SYNCED,
@@ -343,7 +343,7 @@ static int process_alfred_status_txend(struct globals *globals,
if (request->header.version != ALFRED_VERSION)
return -1;
- if (len != (sizeof(*request) - sizeof(request->header)))
+ if (len < (sizeof(*request) - sizeof(request->header)))
return -1;
if (globals->ipv4mode)
--
2.11.0
23 Oct
23 Oct
3:27 p.m.
On Monday, October 9, 2017 5:33:06 PM CEST Sven Eckelmann wrote:
It is enough to just request the data from netlink and
skip debugfs when
netlink didn't return an error. The overwrite of the ret variable was only
for testing purposes and should no longer be used.
Fixes: a7bc3d9a2b3f ("alfred: Cache the global translation table entries")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
I've applied this series (b5e24fc, 6084780).
Thank you!
Simon
1986
days inactive
2000
days old
b.a.t.m.a.n@lists.open-mesh.org
2 comments
2 participants
participants (2)
-
Simon Wunderlich -
Sven Eckelmann