Repository : ssh://git@open-mesh.org/alfred

On branch : master

commit 20fb7a66a576bac25d216a24b6dfea8bdbb214fb Author: Sven Eckelmann sven.eckelmann@openmesh.com Date: Wed May 24 12:32:08 2017 +0200

alfred: Only query tq of remote master in slave mode

The querying of the originator mac address and tq values of the orignator address takes significant amount of time. It is therefore better to avoid the TQ retrieval code when possible.

The TQ will not be used in master mode and it can therefore be skipped together with the code which tries to find the new best server.

Signed-off-by: Sven Eckelmann sven.eckelmann@openmesh.com Signed-off-by: Simon Wunderlich simon.wunderlich@openmesh.com

20fb7a66a576bac25d216a24b6dfea8bdbb214fb recv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/recv.c b/recv.c index 3fd964d..8aa512d 100644 --- a/recv.c +++ b/recv.c @@ -304,6 +304,13 @@ process_alfred_announce_master(struct globals *globals, }

clock_gettime(CLOCK_MONOTONIC, &server->last_seen); + + /* TQ is not used for master sync mode */ + if (globals->opmode == OPMODE_MASTER) { + server->tq = 0; + return 0; + } + if (strcmp(globals->mesh_iface, "none") != 0) { macaddr = translate_mac(globals->mesh_iface, (struct ether_addr *)&server->hwaddr); @@ -315,8 +322,7 @@ process_alfred_announce_master(struct globals *globals, server->tq = 255; }

- if (globals->opmode == OPMODE_SLAVE) - set_best_server(globals); + set_best_server(globals);

return 0; }