B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: fix another sparse warning in batadv_iv_ogm_emit
by Simon Wunderlich 25 Nov '13

25 Nov '13

From: Simon Wunderlich <simon(a)open-mesh.com> Since the directlink variable was not needed anymore and was removed, more variables are now obsolete too, so remove them. The directlink flag commit (which was obviously incomplete) was a0fc2f129f7193cbdd7e9c2e4da0d6e7ac15dd58 ("batman-adv: fix sparse warning in batadv_iv_ogm_emit"), which itself was a fix for 29b9256e6631876d4f1719f4d5e13d7ee140c61b ("batman-adv: consider outgoing interface in OGM sending"). Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- bat_iv_ogm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 92165cb..b9aec98 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -466,11 +466,6 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) struct net_device *soft_iface; struct batadv_priv *bat_priv; struct batadv_hard_iface *primary_if = NULL; - struct batadv_ogm_packet *batadv_ogm_packet; - uint8_t *packet_pos; - - packet_pos = forw_packet->skb->data; - batadv_ogm_packet = (struct batadv_ogm_packet *)packet_pos; if (!forw_packet->if_incoming) { pr_err("Error - can't forward packet: incoming iface not specified\n"); -- 1.7.10.4

2 5

[B.A.T.M.A.N.] [PATCH] batman-adv: fix compat macro for kstrtou32
by Antonio Quartulli 23 Nov '13

23 Nov '13

The macro previously introduced in the compat code to replace kstrtou32() may not work properly in case of a too large user input. Fix it by using a temporary variable of the proper length and then cast the result. Possibly return -ERANGE is the result is too big to fix a 32bit long variable. Cc: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index a050bb8..6daeff9 100644 --- a/compat.h +++ b/compat.h @@ -152,8 +152,16 @@ static inline int batadv_param_set_copystring(const char *val, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) -/* cast last argument of strict_strtoul() because we have a uint32_t */ -#define kstrtou32(cp, base, v) strict_strtoul(cp, base, (unsigned long *)v) +#define kstrtou32(cp, base, v)\ +({\ + unsigned long _v;\ + int _r;\ + _r = strict_strtoul(cp, base, &_v);\ + *(v) = (uint32_t)_v;\ + if ((unsigned long)*(v) != _v)\ + _r = -ERANGE;\ + _r;\ +}) #define kstrtoul strict_strtoul #define kstrtol strict_strtol -- 1.8.4.4

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix neigh_node multiif regression in network coding
by Simon Wunderlich 23 Nov '13

23 Nov '13

From: Simon Wunderlich <simon(a)open-mesh.com> A previous commit for the multi interface optimization did not change the member access for neigh_node to their respective new ifinfo structures for the network coding implementation. This was introduced by change 9bb33b8d88e318c4879d37d06ad28e3e018b9036 ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- network-coding.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/network-coding.c b/network-coding.c index 0b35e9e..8678448 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1005,6 +1005,8 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv, struct batadv_coded_packet *coded_packet; struct batadv_neigh_node *neigh_tmp, *router_neigh; struct batadv_neigh_node *router_coding = NULL; + struct batadv_neigh_ifinfo *router_neigh_ifinfo = NULL; + struct batadv_neigh_ifinfo *router_coding_ifinfo = NULL; uint8_t *first_source, *first_dest, *second_source, *second_dest; __be32 packet_id1, packet_id2; size_t count; @@ -1022,16 +1024,26 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv, if (!router_neigh) goto out; + router_neigh_ifinfo = batadv_neigh_ifinfo_get(router_neigh, + BATADV_IF_DEFAULT); + if (!router_neigh_ifinfo) + goto out; + neigh_tmp = nc_packet->neigh_node; router_coding = batadv_orig_router_get(neigh_tmp->orig_node, BATADV_IF_DEFAULT); if (!router_coding) goto out; - tq_tmp = batadv_nc_random_weight_tq(router_neigh->bat_iv.tq_avg); - tq_weighted_neigh = tq_tmp; - tq_tmp = batadv_nc_random_weight_tq(router_coding->bat_iv.tq_avg); - tq_weighted_coding = tq_tmp; + router_coding_ifinfo = batadv_neigh_ifinfo_get(router_coding, + BATADV_IF_DEFAULT); + if (!router_coding_ifinfo) + goto out; + + tq_tmp = router_neigh_ifinfo->bat_iv.tq_avg; + tq_weighted_neigh = batadv_nc_random_weight_tq(tq_tmp); + tq_tmp = router_coding_ifinfo->bat_iv.tq_avg; + tq_weighted_coding = batadv_nc_random_weight_tq(tq_tmp); /* Select one destination for the MAC-header dst-field based on * weighted TQ-values. @@ -1155,6 +1167,10 @@ out: batadv_neigh_node_free_ref(router_neigh); if (router_coding) batadv_neigh_node_free_ref(router_coding); + if (router_neigh_ifinfo) + batadv_neigh_ifinfo_free_ref(router_neigh_ifinfo); + if (router_coding_ifinfo) + batadv_neigh_ifinfo_free_ref(router_coding_ifinfo); return res; } -- 1.7.10.4

2 3

[B.A.T.M.A.N.] lost connection to a client / Q: transglobal-table
by Bastian Bittorf 23 Nov '13

23 Nov '13

in my small office-network we have _often_ the situation, that my laptop 8-) has no internet. if this happens, i can connect via ssh hop by hop and can see, that the network itself (wireless/wired) is working, but the 'routes' are wrong. here the transglobal-table in the master, my laptop is '00:21:6a:32:7c:1c' root@EG-labor-AP:~ batctl tg Globally announced TT entries received via the mesh bat0 Client (TTVN) Originator (Curr TTVN) (CRC ) Flags * 02:00:c0:ca:c0:1a ( 8) via 02:00:ca:b1:00:15 ( 8) (0xe285) [...] * 06:2f:65:8a:d2:b7 ( 1) via 02:00:ca:b1:00:02 ( 1) (0x50f6) [...] * 46:0a:75:3c:f2:47 ( 1) via 02:00:ca:b1:00:15 ( 8) (0xe285) [...] * 5e:27:29:d8:ee:b4 ( 1) via 02:00:ca:b1:00:76 ( 1) (0xc9fc) [...] * 72:f7:18:80:9d:9d ( 86) via 02:00:de:ad:00:03 ( 86) (0x7651) [...] * ae:d9:0f:ef:01:c3 ( 1) via 02:00:ca:b1:02:22 ( 5) (0x6456) [...] * 56:fb:55:27:b2:63 ( 1) via 02:00:ca:b1:00:58 ( 5) (0xac7c) [...] * 46:13:bf:2a:53:1e ( 1) via 02:00:ca:b1:00:13 ( 5) (0x8133) [...] * 0a:c6:fd:60:5d:5f ( 1) via 02:00:de:ad:02:23 ( 1) (0xa1c1) [...] ### interesting part: * 00:21:6a:32:7c:1c ( 4) via 02:00:ca:b1:02:22 ( 5) (0x6456) [.W.] + 00:21:6a:32:7c:1c ( 5) via 02:00:ca:b1:00:13 ( 5) [.W.] ### * e6:ad:ca:24:f6:10 ( 1) via 02:00:ca:b1:00:45 ( 3) (0x6182) [...] root@EG-labor-AP:~ batctl -v batctl 2013.4.0 [batman-adv: 2013.4.0] root@EG-labor-AP:~ cat /etc/openwrt_version r38568 the interesting thing is, that my laptop seems to be reachable via *:02:22 and *:00:13 - the 2nd entry has no hash (?), but 'batctl t 00:21:6a:32:7c:1c' outputs *:00:13 as originator. from the topology, it is impossible to be near this node, so no roaming can happen AND i can see on my laptop, that there was no roaming. the situation recovers without interaction after some minutes. the transglobal table does not change, but 'batctl t 00:21:6a:32:7c:1c' outputs the correct *:02:22 what can i do for more debugging or is this bug already solved in trunk? bye, bastian

3 9

[B.A.T.M.A.N.] [PATCH 1/4] batman-adv: fix multiline comment
by Simon Wunderlich 22 Nov '13

22 Nov '13

From: Simon Wunderlich <simon(a)open-mesh.com> This problem was introduced by commit 9bb33b8d88e318c4879d37d06ad28e3e018b9036 ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- main.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.h b/main.h index 09cdebb..d154d4d 100644 --- a/main.h +++ b/main.h @@ -71,7 +71,8 @@ /* default interface for multi interface operation. The default interface is * used for communication which originated locally (i.e. is not forwarded) - * or where special forwarding is not desired/necessary. */ + * or where special forwarding is not desired/necessary. + */ #define BATADV_IF_DEFAULT ((struct batadv_hard_iface *)NULL) #define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE) -- 1.7.10.4

2 7

[B.A.T.M.A.N.] [PATCHv4 0/2] debugfs files for the network wide multi interface optimization
by Simon Wunderlich 22 Nov '13

22 Nov '13

This patchset contains the remaining two debugfs patches for the network wide multi interface optimization. There are some small changes to the previous patchset as suggested by Marek: * omit the hardif directory and move hardif folders directly under $debugs/batman-adv, as there should be no conflict with the soft interfaces anyway * rename *multiif* functions to *hardif* * fix some outdated kerneldoc. Thanks for all the comments on this patchset, everyone! Simon Simon Wunderlich (2): batman-adv: add debugfs structure for information per interface batman-adv: add debugfs support to view multiif tables bat_iv_ogm.c | 12 ++++---- debugfs.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ debugfs.h | 2 ++ hard-interface.c | 9 ++++++ originator.c | 48 +++++++++++++++++++++++++++++- originator.h | 1 + types.h | 5 +++- 7 files changed, 156 insertions(+), 7 deletions(-) -- 1.7.10.4

2 5

[B.A.T.M.A.N.] [PATCH] batman-adv: add compat code for kstrtou32
by Antonio Quartulli 21 Nov '13

21 Nov '13

kstrtou32() does not exist before 2.6.39. Convert it to strict_strtoul() in that case. Used-by: e29249b4483b91d7a590a16e9b5ffe9412ce7fde ("batman-adv: add isolation_mark sysfs attribute") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index 01984b8..334dc5c 100644 --- a/compat.h +++ b/compat.h @@ -152,6 +152,8 @@ static inline int batadv_param_set_copystring(const char *val, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) +/* cast last argument of strict_strtoul() because we have a uint32_t */ +#define kstrtou32(cp, base, v) strict_strtoul(cp, base, (unsigned long *)v) #define kstrtoul strict_strtoul #define kstrtol strict_strtol -- 1.8.4.3

3 7

[B.A.T.M.A.N.] [PATCHv3 0/8] add network wide multi interface optimization
by Simon Wunderlich 21 Nov '13

21 Nov '13

This patchset adds the network wide multi interface optimization as proposed in our wiki [1] for BATMAN IV. The main purpose is to do interface alternating and bonding by considering multi interface capabilities globally and not just for the (next) link, otherwise non-optimal links may be chosen. This patchset needs to change a lot of core data structures and routing, please review it carefully. A local development branch exists on the public git repo [2]. Changes from PATCHv2 (thanks Linus and Marek for suggestions) are: * fix many rcu,reference and kerneldoc issues * remove some TODOs which are fixed in the series * rename debugfs file hardif/$IF/originators_multiif -> hardif/$IF/originators * rebase on Antonios extended isolation patches * ... check for more in the changelog of the individual patches I've tested the patchset in my VMs to confirm that bonding and alternating works as expected. Patches should be checkpatch and sparse clean. As always, any comments are appreciated! Thanks, Simon [1] http://www.open-mesh.org/projects/batman-adv/wiki/network-wide-multi-link-o… [2] http://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/simon/network-w… Simon Wunderlich (8): batman-adv: remove bonding and interface alternating batman-adv: split tq information in neigh_node struct batman-adv: split out router from orig_node batman-adv: add WiFi penalty batman-adv: consider outgoing interface in OGM sending batman-adv: add bonding again batman-adv: add debugfs structure for information per interface batman-adv: add debugfs support to view multiif tables bat_iv_ogm.c | 871 +++++++++++++++++++++++++++++++---------------- compat.c | 8 - compat.h | 1 - debugfs.c | 94 +++++ debugfs.h | 3 + distributed-arp-table.c | 3 +- gateway_client.c | 86 ++++- hard-interface.c | 9 + hard-interface.h | 18 + icmp_socket.c | 3 +- main.h | 5 + network-coding.c | 9 +- originator.c | 529 +++++++++++++++++++++++++--- originator.h | 20 +- routing.c | 429 ++++++++--------------- routing.h | 12 +- send.c | 19 +- soft-interface.c | 2 +- translation-table.c | 6 +- types.h | 130 ++++--- 20 files changed, 1553 insertions(+), 704 deletions(-) -- 1.7.10.4

2 17

[B.A.T.M.A.N.] [PATCH] batman-adv: improve README
by Antonio Quartulli 21 Nov '13

21 Nov '13

Add missing sysfs attributes in the proper section of the README Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- README | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README b/README index 89490be..58e4904 100644 --- a/README +++ b/README @@ -66,11 +66,10 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms gw_bandwidth log_level -# ap_isolation gw_mode orig_interval -# bonding gw_sel_class routing_algo -# bridge_loop_avoidance hop_penalty fragmentation - +#aggregated_ogms distributed_arp_table gw_sel_class orig_interval +#ap_isolation fragmentation hop_penalty routing_algo +#bonding gw_bandwidth isolation_mark vlan0 +#bridge_loop_avoidance gw_mode log_level There is a special folder for debugging information: -- 1.8.4.3

2 1

[B.A.T.M.A.N.] Automatically starting adaptors at boot
by tjhowse 20 Nov '13

20 Nov '13

Hello Ladies and Gentlemen, This might be a question better suited to the OpenWRT list, but I figure it would've been solved better here. I've got a two-node mesh set up and working well. Config files are below. I have some minor woes though. Each time one of the nodes boots up I must: brctl addif br-lan bat0 ifconfig bat0 up ...before traffic starts to flow between clients connected to the wlan0 radios of each node. What's the best way of having this happen automatically? I assume there's a better way than having an init script run those commands at boot. Please note that I'm somewhat of a networking novice, so if anything below seems super dumb, please say so. Thanks, Travis. radio0 is 2.4GHz, for connecting to clients. radio1 is 5GHz, for the mesh interconnects. wireless: config wifi-device radio0 option type mac80211 option channel 11 option hwmode 11ng option path 'platform/ar934x_wmac' option htmode HT20 list ht_capab LDPC list ht_capab SHORT-GI-20 list ht_capab SHORT-GI-40 list ht_capab TX-STBC list ht_capab RX-STBC1 list ht_capab DSSS_CCK-40 # REMOVE THIS LINE TO ENABLE WIFI: # option disabled 1 config wifi-iface option device radio0 option channel 10 option network lan option mode ap option ssid HWMesh2-Clients-10 option encryption psk2 option key 3141592653 config wifi-device radio1 option type mac80211 option channel 36 option hwmode 11na option path 'pci0000:00/0000:00:00.0' option htmode HT20 list ht_capab LDPC list ht_capab SHORT-GI-20 list ht_capab SHORT-GI-40 list ht_capab TX-STBC list ht_capab RX-STBC1 list ht_capab DSSS_CCK-40 # REMOVE THIS LINE TO ENABLE WIFI: # option disabled 1 config wifi-iface wmesh option device radio1 option ifname adhoc0 option network mesh option mode adhoc option ssid HWMesh2-Backbone option encryption psk2 option key 3141592653 network: config interface 'loopback' option ifname 'lo' option proto 'static' option ipaddr '127.0.0.1' option netmask '255.0.0.0' config globals 'globals' option ula_prefix 'fd87:bd28:e37e::/48' config interface 'lan' option ifname 'eth0.1' #option ifname 'bat0' #option ifname 'wlan0' option type 'bridge' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' option ip6assign '60' config interface 'wan' option ifname 'eth0.2' option proto 'dhcp' config interface 'wan6' option ifname '@wan' option proto 'dhcpv6' config switch option name 'switch0' option reset '1' option enable_vlan '1' config switch_vlan option device 'switch0' option vlan '1' option ports '0t 2 3 4 5' config switch_vlan option device 'switch0' option vlan '2' option ports '0t 1' config interface 'mesh' option ifname adhoc0 option mtu 1528 option proto batadv option mesh bat0 batman-adv: config 'mesh' 'bat0' option 'aggregated_ogms' option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' option 'gw_mode' option 'gw_sel_class' option 'log_level' option 'orig_interval' option 'vis_mode' option 'bridge_loop_avoidance' option 'distributed_arp_table' option 'network_coding' option 'hop_penalty' # yet another batX instance # config 'mesh' 'bat5' # option 'interfaces' 'second_mesh'

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N