B.A.T.M.A.N December 2015

b.a.t.m.a.n@lists.open-mesh.org

15 participants
50 discussions

[B.A.T.M.A.N.] pull request: batman-adv 20151216
by Antonio Quartulli 16 Dec '15

16 Dec '15

Hello David, here you have our batch of patches intended for net-next. Marek Lindner is introducing a list of direct neighbours per interface and is exporting it via debugfs. This comes very handy in case of network debugging or simple topology analysis. Add lock protection for CRC computation in the Bridge Loop Avoidance code to prevent racy updates, by Simon Wunderlich. Update my email address in the relevant files. Other than those changes you also have some code restyling, cleanups and minor fixes.. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 5833e0526820c3216de8ae60661fb307c89c8710: net/macb: add support for resetting PHY using GPIO (2015-12-14 22:04:12 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 5a1dd8a4773d4c24e925cc6154826d555a85c370: batman-adv: lock crc access in bridge loop avoidance (2015-12-16 15:17:09 +0800) ---------------------------------------------------------------- Included changes: - change my email in MAINTAINERS and Doc files - create and export list of single hop neighs per interface - protect CRC in the BLA code by means of its own lock - minor fixes and code cleanups ---------------------------------------------------------------- Antonio Quartulli (2): MAINTAINERS: update email address Doc: update email address Marek Lindner (4): batman-adv: add list of unique single hop neighbors per hard-interface batman-adv: add bat_hardif_neigh_init algo ops call batman-adv: export single hop neighbor list via debugfs batman-adv: update last seen field of single hop originators Simon Wunderlich (4): batman-adv: rename equiv/equal or better to similar or better batman-adv: detect local excess vlans in TT request batman-adv: unify flags access style in tt global add batman-adv: lock crc access in bridge loop avoidance Sven Eckelmann (2): batman-adv: Use chain pointer when purging fragments batman-adv: Fix typo 'wether' -> 'whether' Documentation/ABI/testing/sysfs-class-net-mesh | 4 +- MAINTAINERS | 2 +- net/batman-adv/bat_iv_ogm.c | 71 ++++++++- net/batman-adv/bridge_loop_avoidance.c | 35 ++++- net/batman-adv/debugfs.c | 9 ++ net/batman-adv/fragmentation.c | 8 +- net/batman-adv/hard-interface.c | 4 + net/batman-adv/main.c | 6 +- net/batman-adv/originator.c | 195 +++++++++++++++++++++++++ net/batman-adv/originator.h | 7 + net/batman-adv/routing.c | 6 +- net/batman-adv/translation-table.c | 16 +- net/batman-adv/types.h | 34 ++++- 13 files changed, 370 insertions(+), 27 deletions(-)

2 13

[B.A.T.M.A.N.] [PATCH 0/3] Couple of patches while developing BATMAN V
by Simon Wunderlich 15 Dec '15

15 Dec '15

From: Simon Wunderlich <simon(a)open-mesh.com> This series includes a couple of patches which fix some issues and prepare for the upcoming BATMAN V code. Simon Wunderlich (3): batman-adv: fix lockdep splat when doing mcast_free batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet batman-adv: add seqno maximum age and protection start flag parameters net/batman-adv/bat_iv_ogm.c | 12 ++++++++++-- net/batman-adv/main.h | 3 +++ net/batman-adv/multicast.c | 2 ++ net/batman-adv/routing.c | 13 ++++++++++--- net/batman-adv/routing.h | 3 ++- 5 files changed, 27 insertions(+), 6 deletions(-) -- 2.6.2

5 13

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix build with linux < 3.9.0
by Sven Eckelmann 14 Dec '15

14 Dec '15

netdev_master_upper_dev_link already had a compat layer definition for linux < 3.9. Move these two different definitions to the same block to avoid using redefinitions which can break the build. Fixes: e19f387b9538 ("batman-adv: add possibility to pass information about upper device via notifier") Fixes: d794c1cd9d4f ("batman-adv: propagate upper priv via netdev_master_upper_dev_link") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- compat-include/linux/netdevice.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 10253e0..eca7668 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -84,7 +84,6 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) -#define netdev_master_upper_dev_link netdev_set_master #define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL) #define netdev_master_upper_dev_get(dev) \ ({\ @@ -120,7 +119,12 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #endif /* < KERNEL_VERSION(3, 19, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ + netdev_set_master(dev, upper_dev) + +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) #define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ netdev_master_upper_dev_link(dev, upper_dev) -- 2.6.4

2 1

[B.A.T.M.A.N.] [PATCH-next 1/3] net: propagate upper priv via netdev_master_upper_dev_link
by Sven Eckelmann 13 Dec '15

13 Dec '15

From: Jiri Pirko <jiri(a)mellanox.com> Eliminate netdev_master_upper_dev_link_private and pass priv directly as a parameter of netdev_master_upper_dev_link. Signed-off-by: Jiri Pirko <jiri(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> --- compat-include/linux/netdevice.h | 7 +++++++ net/batman-adv/hard-interface.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index f19f624..a8da7bf 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -117,4 +117,11 @@ static inline int batadv_netdev_set_master(struct net_device *slave, #endif /* < KERNEL_VERSION(3, 19, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv) \ + netdev_master_upper_dev_link(dev, upper_dev) + +#endif /* < KERNEL_VERSION(4, 5, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index bef9147..484c50e 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -466,7 +466,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); - ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface); + ret = netdev_master_upper_dev_link(hard_iface->net_dev, + soft_iface, NULL); if (ret) goto err_dev; -- 2.6.2

2 5

[B.A.T.M.A.N.] old batman-adv within 15.05 brunch?
by Ufo 10 Dec '15

10 Dec '15

is there a reason for staying with batman-adv 2014 for openwrt 15.05? our current freifunk leipzig running batman-adv 2015.0 and it seems to work https://github.com/openwrt-routing/packages/tree/master/batman-adv vs. https://github.com/openwrt-routing/packages/tree/for-15.05/batman-adv -- --- Freifunk Leipzig http://leipzig.freifunk.net

3 3

[B.A.T.M.A.N.] pull request [net]: batman-adv 20151207
by Antonio Quartulli 07 Dec '15

07 Dec '15

Hello David, long time no see :) I know it starts to be a bit late in the release cycle, but I think that these 4 small bug-fixes are still worth being merged. Patch 1 fixes a compatibility issue between our Distributed ARP Table mechanism and the "early client detection" feature. Such issue creates an inconsistency in the global translation table leading to user clients not being reachable anymore. Fix provided by Simon Wunderlich. Patch 2 is again provided by Simon Wunderlich and fixes another bug related to the "early client detection" feature. The fix consists in ensuring that temporary client entries not claimed by any originator are properly purged instead of being stored all time long till shutdown. Patch 3 fixes the function used by the TT hash tables to detect duplicate entries. At the moment two clients with the same MAC address but lying in different VLANs are considered the same, while this should not be the case. Bugfix by Marek Lindner. Patch 4 fixes an invalid stack access in the batadv_dat_select_candidates() function where a u32 pointer is accessed as it was a pointer to a batadv_dat_entry struct (larger than u32). Bugfix provided by Sven Eckelmann. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 326fcfa5acca446b3f71e99f6d19881145556e5c: net: remove unnecessary semicolon in netdev_alloc_pcpu_stats() (2015-12-06 22:32:32 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to b7fe3d4f4a65bc675e737d88071300ea9c4bcddd: batman-adv: Fix invalid stack access in batadv_dat_select_candidates (2015-12-07 22:40:21 +0800) ---------------------------------------------------------------- Included changes: - prevent compatibility issue between DAT and speedy join from creating inconsistencies in the global translation table - make sure temporary TT entries are purged out if not claimed - fix comparison function used for TT hash table - fix invalid stack access in batadv_dat_select_candidates() ---------------------------------------------------------------- Marek Lindner (1): batman-adv: fix erroneous client entry duplicate detection Simon Wunderlich (2): batman-adv: fix speedy join for DAT cache replies batman-adv: avoid keeping false temporary entry Sven Eckelmann (1): batman-adv: Fix invalid stack access in batadv_dat_select_candidates net/batman-adv/distributed-arp-table.c | 5 ++++- net/batman-adv/routing.c | 19 +++++++++++++++---- net/batman-adv/translation-table.c | 16 ++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-)

2 5

[B.A.T.M.A.N.] [PATCH] batmand: Switch to HTTPS version of links
by Sven Eckelmann 06 Dec '15

06 Dec '15

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Cc: elektra <onelektra(a)gmx.net> --- README | 2 +- vis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 1ddceed..b25dd77 100644 --- a/README +++ b/README @@ -61,6 +61,6 @@ is part of the s3d tools [2] - debian packages are available) to the vis servers dot draw output (on port 2004). If you have impressive screenshots don't hesitate to let us know. :-) -[1] http://downloads.open-mesh.net/batman/misc/wbm2009/08-vis_zoomed.png +[1] https://downloads.open-mesh.org/batman/misc/wbm2009/08-vis_zoomed.png [2] http://s3d.sourceforge.net/ diff --git a/vis.c b/vis.c index d92fbe8..774d24e 100644 --- a/vis.c +++ b/vis.c @@ -127,7 +127,7 @@ int32_t orig_comp(void *data1, void *data2) } /* hashfunction to choose an entry in a hash table of given size */ -/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ +/* hash algorithm from https://en.wikipedia.org/wiki/Hash_table */ int32_t orig_choose(void *data, int32_t size) { unsigned char *key= data; uint32_t hash = 0; -- 2.6.2

2 1

[B.A.T.M.A.N.] [PATCH] batmand: Switch to HTTPS version of links
by Sven Eckelmann 06 Dec '15

06 Dec '15

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Cc: elektra <onelektra(a)gmx.net> --- CHANGELOG | 2 +- INSTALL | 6 +++--- bitarray.c | 4 ++-- man/batmand.8 | 2 +- originator.c | 2 +- posix/tunnel.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9552e53..b562a3d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,3 @@ For a reasonable up-to-date CHANGELOG visit: -http://git.open-mesh.org/?p=batmand.git;a=shortlog +https://git.open-mesh.org/batmand.git diff --git a/INSTALL b/INSTALL index eae3eac..e8ad3c2 100644 --- a/INSTALL +++ b/INSTALL @@ -39,12 +39,12 @@ Compiling You don't necessarily need to compile. May be your distribution or our download store offers precompiled packages. Check -http://www.open-mesh.org/wiki/open-mesh/Download to get an overview. +https://www.open-mesh.org/projects/open-mesh/wiki/Download to get an overview. Download and compile the latest stable sources from the download section -http://www.open-mesh.org/wiki/open-mesh/Download by executing eg.: +https://www.open-mesh.org/projects/open-mesh/wiki/Download by executing eg.: -$ wget http://downloads.open-mesh.org/batman/stable/sources/batmand/batmand-0.3.2.… +$ wget https://downloads.open-mesh.org/batman/stable/sources/batmand/batmand-0.3.2… $ tar xzvf batmand-0.3.2.tar.gz $ cd batman-0.3.2 $ make diff --git a/bitarray.c b/bitarray.c index 354eddd..69bf812 100644 --- a/bitarray.c +++ b/bitarray.c @@ -173,7 +173,7 @@ int bit_packet_count( TYPE_OF_WORD *seq_bits ) { while (word) { - word &= word-1; /* see http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan */ + word &= word-1; /* see https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan */ hamming++; } @@ -190,7 +190,7 @@ uint8_t bit_count( int32_t to_count ) { while ( to_count ) { - to_count &= to_count-1; /* see http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan */ + to_count &= to_count-1; /* see https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan */ hamming++; } diff --git a/man/batmand.8 b/man/batmand.8 index c26d62b..89fcde5 100644 --- a/man/batmand.8 +++ b/man/batmand.8 @@ -28,7 +28,7 @@ batmand \- better approach to mobile ad\(hyhoc networking .br .SH DESCRIPTION .B B.A.T.M.A.N -means better approach to mobile ad\(hyhoc networking, this is a new routing protocol for multi\(hyhop ad\(hyhoc mesh networks. Go to http://www.open\-mesh.org/ to get more information. +means better approach to mobile ad\(hyhoc networking, this is a new routing protocol for multi\(hyhop ad\(hyhoc mesh networks. Go to https://www.open\-mesh.org/ to get more information. .PP The following document will explain how to use the \fBbatman daemon\fP. .PP diff --git a/originator.c b/originator.c index f017741..9ed7353 100644 --- a/originator.c +++ b/originator.c @@ -74,7 +74,7 @@ int compare_orig( void *data1, void *data2 ) /* hashfunction to choose an entry in a hash table of given size */ -/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ +/* hash algorithm from https://en.wikipedia.org/wiki/Hash_table */ int choose_orig( void *data, int32_t size ) { unsigned char *key= data; diff --git a/posix/tunnel.c b/posix/tunnel.c index 8e7611b..88721ae 100644 --- a/posix/tunnel.c +++ b/posix/tunnel.c @@ -507,7 +507,7 @@ static int compare_vip(void *data1, void *data2) } /* hashfunction to choose an entry in a hash table of given size */ -/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ +/* hash algorithm from https://en.wikipedia.org/wiki/Hash_table */ static int choose_wip(void *data, int32_t size) { unsigned char *key= data; -- 2.6.2

2 1

[B.A.T.M.A.N.] [PATCH] alfred: Switch to HTTPS version of links
by Sven Eckelmann 06 Dec '15

06 Dec '15

open-mesh.org and its subdomains can only be accessed via HTTPS. HTTP-only requests are currently redirected automatically to HTTPS but references in the source code should be only https. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 6bbf915..fbca7d1 100644 --- a/README +++ b/README @@ -312,7 +312,7 @@ Mailing-list: b.a.t.m.a.n(a)lists.open-mesh.org (optional subscription If you have test reports/patches/ideas, please read the wiki for further instruction on how to contribute: -http://www.open-mesh.org/projects/open-mesh/wiki/Contribute +https://www.open-mesh.org/projects/open-mesh/wiki/Contribute You can also contact the Authors: -- 2.6.2

1 0

[B.A.T.M.A.N.] [PATCH net-next 0/4] Allow BATMAN to use hdlc-eth interfaces
by Andrew Lunn 05 Dec '15

05 Dec '15

BATMAN works over Ethernet like interfaces. hdlc-eth provides the need requirements. However, hdlc devices are often created as raw hdlc devices, which batman cannot use, and are then be transmuted into other types using sethdlc(1). Have the HDLC code emit NETDEV_*_TYPE_CHANGE events when the type changes, and have BATMAN react on these events. Andrew Lunn (4): WAN: HDLC: Detach protocol before unregistering device WAN: HDLC: Call notifiers before and after changing device type ipv6: Only act upon NETDEV_*_TYPE_CHANGE if we have ipv6 addresses batman-adv: Act on NETDEV_*_TYPE_CHANGE events drivers/net/wan/hdlc.c | 21 ++++++++++++++++++--- drivers/net/wan/hdlc_cisco.c | 1 + drivers/net/wan/hdlc_fr.c | 1 + drivers/net/wan/hdlc_ppp.c | 1 + drivers/net/wan/hdlc_raw.c | 1 + drivers/net/wan/hdlc_raw_eth.c | 1 + drivers/net/wan/hdlc_x25.c | 1 + include/linux/hdlc.h | 2 +- net/batman-adv/hard-interface.c | 4 +++- net/ipv6/addrconf.c | 3 ++- 10 files changed, 30 insertions(+), 6 deletions(-) -- 2.6.2

2 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N December 2015