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

On branch : next

commit 80775a259810656ca4403eb3480dac5a94d25bdc Author: Antonio Quartulli antonio@open-mesh.com Date: Sun Oct 13 02:50:20 2013 +0200

batctl: include the sync-flags when compute the global/local table CRC

Flags covered by TT_SYNC_MASK are kept in sync among the nodes in the network and therefore they have to be considered while computing the global/local table CRC.

In this way a generic originator is able to understand if its table contains the correct flags or not.

Bits from 4 to 7 in the TT flags fields are now reserved for "synchronized" flags only.

This allows future developers to add more flags of this type without breaking compatibility.

It's important to note that not all the remote TT flags are synchronised. This comes from the fact that some flags are used to inject an information once only.

Signed-off-by: Antonio Quartulli antonio@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

80775a259810656ca4403eb3480dac5a94d25bdc packet.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packet.h b/packet.h index 9fbcaac..843b96a 100644 --- a/packet.h +++ b/packet.h @@ -110,12 +110,13 @@ enum batadv_tt_data_flags {

/* BATADV_TT_CLIENT flags. * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to - * BIT(15) are used for local computation only + * BIT(15) are used for local computation only. + * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network. */ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0), BATADV_TT_CLIENT_ROAM = BIT(1), - BATADV_TT_CLIENT_WIFI = BIT(2), + BATADV_TT_CLIENT_WIFI = BIT(4), BATADV_TT_CLIENT_NOPURGE = BIT(8), BATADV_TT_CLIENT_NEW = BIT(9), BATADV_TT_CLIENT_PENDING = BIT(10),