commits October 2013

commits@lists.open-mesh.org

1 participants
109 discussions

[batctl] next: batctl: Start new development cycle (0500b81)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 0500b8130946ed0e929aaaaf2da187b74695ea7a Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Oct 14 18:00:27 2013 +0200 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0500b8130946ed0e929aaaaf2da187b74695ea7a main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 76eda47..6ee7c46 100644 --- a/main.h +++ b/main.h @@ -23,7 +23,7 @@ #define _BATCTL_MAIN_H #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2013.4.0" +#define SOURCE_VERSION "2013.5.0" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"

1 0

[batctl] next: Merge branch 'maint' into next (9f72477)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 9f72477b1c463c992738c7094c29ae63d3e9d022 Merge: 110aaff 647431e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Oct 14 17:59:13 2013 +0200 Merge branch 'maint' into next >--------------------------------------------------------------- 9f72477b1c463c992738c7094c29ae63d3e9d022

1 0

[batman-adv] next's head updated: batman-adv: Start new development cycle (d964188)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 4eea14c batman-adv: Update CHANGELOG for upcoming release 6b0bfa0 batman-adv: Update compatible kernel version number f5e3096 batman-adv: Start new development cycle 0f8cea6 Merge branch 'maint' into next d964188 batman-adv: Start new development cycle

1 0

[batman-adv] next: batman-adv: Start new development cycle (d964188)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit d96418873f2e27fb94d6c40f274e06ff59dfbd6e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Oct 14 18:01:01 2013 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- d96418873f2e27fb94d6c40f274e06ff59dfbd6e main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 811f5f8..c5d6eb2 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2013.4.0" +#define BATADV_SOURCE_VERSION "2013.5.0" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] next: Merge branch 'maint' into next (0f8cea6)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 0f8cea6cfcfc2bcc066f351abcf1701480f6f8c7 Merge: 05d4de2 f5e3096 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Oct 14 17:58:37 2013 +0200 Merge branch 'maint' into next >--------------------------------------------------------------- 0f8cea6cfcfc2bcc066f351abcf1701480f6f8c7 CHANGELOG | 11 +++++++++++ README.external | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[alfred] master: alfred: Start new development cycle (483315b)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 483315bc42c49f330bbf2018fe88d2e5744f64a6 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Oct 14 18:02:11 2013 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 483315bc42c49f330bbf2018fe88d2e5744f64a6 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 0b7a5ab..7586935 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2013.4.0" +#define SOURCE_VERSION "2013.5.0" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 206561e..38940ed 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2013.4.0" +#define SOURCE_VERSION "2013.5.0" #endif #define ALFRED_SOCK_PATH "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 4ccbdad..aab6e9b 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2013.4.0" +#define SOURCE_VERSION "2013.5.0" #endif #define ALFRED_SOCK_PATH "/var/run/alfred.sock"

1 0

[batman-adv] tag 'v2013.4.0' created
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv New tag : v2013.4.0 Referencing: e3745774000e8979d2e86d08fafe113345c0234d

1 0

[batctl] tag 'v2013.4.0' created
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batctl New tag : v2013.4.0 Referencing: 9f701dd97f737653362615cd331ce98db3692ea7

1 0

[alfred] tag 'v2013.4.0' created
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/alfred New tag : v2013.4.0 Referencing: 9a91304b373fb193911036640b24c4bd8f932210

1 0

[batman-adv] next: batman-adv: include the sync-flags when compute the global/local table CRC (05d4de2)
by postmaster＠open-mesh.org 14 Oct '13

14 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 05d4de2248d32dee5d5033d8a707fc9ad2a0890b Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Sun Oct 13 02:50:20 2013 +0200 batman-adv: 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(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 05d4de2248d32dee5d5033d8a707fc9ad2a0890b packet.h | 5 +++-- translation-table.c | 19 +++++++++++++++++++ types.h | 6 ++++++ 3 files changed, 28 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), diff --git a/translation-table.c b/translation-table.c index 7867b39..5750c88 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1959,6 +1959,7 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, struct batadv_tt_global_entry *tt_global; struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; + uint8_t flags; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1997,6 +1998,13 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, crc_tmp = crc32c(0, &tt_common->vid, sizeof(tt_common->vid)); + + /* compute the CRC on flags that have to be kept in sync + * among nodes + */ + flags = tt_common->flags & BATADV_TT_SYNC_MASK; + crc_tmp = crc32c(crc_tmp, &flags, sizeof(flags)); + crc ^= crc32c(crc_tmp, tt_common->addr, ETH_ALEN); } rcu_read_unlock(); @@ -2022,6 +2030,7 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, struct batadv_tt_common_entry *tt_common; struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; + uint8_t flags; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -2042,6 +2051,13 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, crc_tmp = crc32c(0, &tt_common->vid, sizeof(tt_common->vid)); + + /* compute the CRC on flags that have to be kept in sync + * among nodes + */ + flags = tt_common->flags & BATADV_TT_SYNC_MASK; + crc_tmp = crc32c(crc_tmp, &flags, sizeof(flags)); + crc ^= crc32c(crc_tmp, tt_common->addr, ETH_ALEN); } rcu_read_unlock(); @@ -3524,6 +3540,9 @@ int batadv_tt_init(struct batadv_priv *bat_priv) { int ret; + /* synchronized flags must be remote */ + BUILD_BUG_ON(!(BATADV_TT_SYNC_MASK & BATADV_TT_REMOTE_MASK)); + ret = batadv_tt_local_init(bat_priv); if (ret < 0) return ret; diff --git a/types.h b/types.h index 61297b6..3c21162 100644 --- a/types.h +++ b/types.h @@ -42,6 +42,12 @@ #define BATADV_TT_REMOTE_MASK 0x00FF /** + * BATADV_TT_SYNC_MASK - bitmask of the flags that need to be kept in sync + * among the nodes. These flags are used to compute the global/local CRC + */ +#define BATADV_TT_SYNC_MASK 0x00F0 + +/** * struct batadv_hard_iface_bat_iv - per hard interface B.A.T.M.A.N. IV data * @ogm_buff: buffer holding the OGM packet * @ogm_buff_len: length of the OGM packet buffer

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2013