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] batman-adv: Fix genl notification for throughput_override
by Sven Eckelmann 03 Mar '19

03 Mar '19

The throughput_override sysfs file is not below the meshif but below a hardif. The kobj has therefore not a pointer which can be used to find the batadv_priv data. The pointer stored in the hardif object must be used instead to find the correct meshif private data. Fixes: 68e981a3a261 ("batman-adv: Trigger genl notification on sysfs config change") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/sysfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 0b4b3fb7..208655cf 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1116,9 +1116,9 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj, struct attribute *attr, char *buff, size_t count) { - struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); struct net_device *net_dev = batadv_kobj_to_netdev(kobj); struct batadv_hard_iface *hard_iface; + struct batadv_priv *bat_priv; u32 tp_override; u32 old_tp_override; bool ret; @@ -1147,7 +1147,10 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj, atomic_set(&hard_iface->bat_v.throughput_override, tp_override); - batadv_netlink_notify_hardif(bat_priv, hard_iface); + if (hard_iface->soft_iface) { + bat_priv = netdev_priv(hard_iface->soft_iface); + batadv_netlink_notify_hardif(bat_priv, hard_iface); + } out: batadv_hardif_put(hard_iface); -- 2.20.1

1 0

[B.A.T.M.A.N.] [PATCH 0/5] batman-adv: Deprecation of sysfs
by Sven Eckelmann 03 Mar '19

03 Mar '19

The old sysfs configuration interface was frowned upon by other kernel developers. To work around this problem, the sysfs files were replaced by the batadv generic netlink family. Still they are currently available as alternative interface. These files cannot be removed immediately because userspace tools might still depend on it. Instead schedule for its removal in 2021. To aid userspace tool developers, warn them when these files are still accessed and provide an option to build batman-adv without sysfs support. Kind regards, Sven Sven Eckelmann (5): batman-adv: Drop documentation about debugfs files batman-adv: Drop documentation about sysfs files batman-adv: Make sysfs support optional batman-adv: ABI: Mark sysfs files as deprecated batman-adv: Warn about sysfs file access .../sysfs-class-net-batman-adv | 2 + .../sysfs-class-net-mesh | 2 + Documentation/networking/batman-adv.rst | 110 +++++------------ MAINTAINERS | 4 +- Makefile | 3 + README.external.rst | 1 + gen-compat-autoconf.sh | 3 +- net/batman-adv/Kconfig | 12 ++ net/batman-adv/Makefile | 2 +- net/batman-adv/bridge_loop_avoidance.c | 1 - net/batman-adv/gateway_client.c | 1 - net/batman-adv/main.c | 73 +++++++++++ net/batman-adv/main.h | 2 + net/batman-adv/sysfs.c | 116 +++++++----------- net/batman-adv/sysfs.h | 38 +++++- 15 files changed, 210 insertions(+), 160 deletions(-) rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-batman-adv (92%) rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-mesh (97%) -- 2.20.1

1 5

[B.A.T.M.A.N.] [PATCH 0/4] alfred/batman-adv/batctl: Drop license boilerplate
by Sven Eckelmann 03 Mar '19

03 Mar '19

All files got a SPDX-License-Identifier since a while. All the required information about the license conditions can be found in LICENSES/. Drop the duplicated information now. I would also like to drop the copyright line with the contributers because it is most of the time just wrong. But there is no precedence in the kernel (I could find) and the FSFE REUSE specification proposes a a statement which basically no one is using: This file is part of project X. It’s copyrighted by the contributors recorded in the version control history of the file, available from its original location http://git.example.com/X/filename.c And this would also make it harder for other projects to write a bill of material. Sven Eckelmann (2): alfred: Switch packet.h license to MIT alfred: Drop license boilerplate batctl: Drop license boilerplate batman-adv: Drop license boilerplate alfred/Makefile | 14 -------------- alfred/alfred.h | 14 -------------- alfred/batadv_query.c | 14 -------------- alfred/batadv_query.h | 14 -------------- alfred/batadv_querynl.c | 14 -------------- alfred/batadv_querynl.h | 14 -------------- alfred/batman_adv.h | 18 ------------------ alfred/bitops.h | 18 +----------------- alfred/client.c | 14 -------------- alfred/debugfs.c | 14 -------------- alfred/debugfs.h | 14 -------------- alfred/gpsd/Makefile | 14 -------------- alfred/gpsd/alfred-gpsd.c | 14 -------------- alfred/gpsd/alfred-gpsd.h | 14 -------------- alfred/hash.c | 14 -------------- alfred/hash.h | 14 -------------- alfred/list.h | 14 -------------- alfred/main.c | 14 -------------- alfred/netlink.c | 14 -------------- alfred/netlink.h | 14 -------------- alfred/netsock.c | 14 -------------- alfred/packet.h | 16 ++-------------- alfred/recv.c | 14 -------------- alfred/send.c | 14 -------------- alfred/server.c | 14 -------------- alfred/unix_sock.c | 14 -------------- alfred/util.c | 14 -------------- alfred/vis/Makefile | 14 -------------- alfred/vis/vis.c | 14 -------------- alfred/vis/vis.h | 14 -------------- batctl/Makefile | 14 -------------- batctl/aggregation.c | 14 -------------- batctl/allocate.h | 14 -------------- batctl/ap_isolation.c | 14 -------------- batctl/backbonetable.c | 14 -------------- batctl/bat-hosts.c | 14 -------------- batctl/bat-hosts.h | 14 -------------- batctl/batadv_packet.h | 12 ------------ batctl/batman_adv.h | 18 ------------------ batctl/bisect_iv.c | 14 -------------- batctl/bisect_iv.h | 14 -------------- batctl/bonding.c | 14 -------------- batctl/bridge_loop_avoidance.c | 14 -------------- batctl/claimtable.c | 14 -------------- batctl/dat_cache.c | 14 -------------- batctl/debug.c | 14 -------------- batctl/debug.h | 14 -------------- batctl/debugfs.c | 14 -------------- batctl/debugfs.h | 14 -------------- batctl/distributed_arp_table.c | 14 -------------- batctl/event.c | 14 -------------- batctl/fragmentation.c | 14 -------------- batctl/functions.c | 14 -------------- batctl/functions.h | 14 -------------- batctl/gateways.c | 14 -------------- batctl/genl.c | 12 ------------ batctl/genl.h | 14 -------------- batctl/gw_mode.c | 14 -------------- batctl/hash.c | 14 -------------- batctl/hash.h | 14 -------------- batctl/hop_penalty.c | 14 -------------- batctl/icmp_helper.c | 14 -------------- batctl/icmp_helper.h | 14 -------------- batctl/interface.c | 14 -------------- batctl/isolation_mark.c | 14 -------------- batctl/list.h | 18 +----------------- batctl/log.c | 14 -------------- batctl/loglevel.c | 14 -------------- batctl/main.c | 14 -------------- batctl/main.h | 14 -------------- batctl/mcast_flags.c | 14 -------------- batctl/multicast_forceflood.c | 14 -------------- batctl/multicast_mode.c | 14 -------------- batctl/nc_nodes.c | 14 -------------- batctl/neighbors.c | 14 -------------- batctl/netlink.c | 14 -------------- batctl/netlink.h | 14 -------------- batctl/network_coding.c | 14 -------------- batctl/orig_interval.c | 14 -------------- batctl/originators.c | 14 -------------- batctl/ping.c | 14 -------------- batctl/routing_algo.c | 14 -------------- batctl/statistics.c | 14 -------------- batctl/sys.c | 14 -------------- batctl/sys.h | 14 -------------- batctl/tcpdump.c | 14 -------------- batctl/tcpdump.h | 14 -------------- batctl/throughputmeter.c | 14 -------------- batctl/traceroute.c | 14 -------------- batctl/transglobal.c | 14 -------------- batctl/translate.c | 14 -------------- batctl/translocal.c | 14 -------------- batman-adv/Makefile | 13 ------------- batman-adv/compat-include/linux/average.h | 12 ------------ batman-adv/compat-include/linux/build_bug.h | 12 ------------ batman-adv/compat-include/linux/cache.h | 12 ------------ batman-adv/compat-include/linux/compiler.h | 12 ------------ batman-adv/compat-include/linux/ethtool.h | 12 ------------ batman-adv/compat-include/linux/eventpoll.h | 12 ------------ batman-adv/compat-include/linux/fs.h | 12 ------------ batman-adv/compat-include/linux/if_bridge.h | 12 ------------ batman-adv/compat-include/linux/igmp.h | 12 ------------ batman-adv/compat-include/linux/list.h | 12 ------------ batman-adv/compat-include/linux/netdevice.h | 12 ------------ batman-adv/compat-include/linux/netlink.h | 12 ------------ batman-adv/compat-include/linux/nl80211.h | 12 ------------ batman-adv/compat-include/linux/seq_file.h | 12 ------------ batman-adv/compat-include/linux/skbuff.h | 12 ------------ batman-adv/compat-include/linux/timer.h | 12 ------------ batman-adv/compat-include/linux/types.h | 12 ------------ batman-adv/compat-include/linux/uaccess.h | 12 ------------ batman-adv/compat-include/net/addrconf.h | 12 ------------ batman-adv/compat-include/net/cfg80211.h | 12 ------------ batman-adv/compat-include/net/genetlink.h | 12 ------------ batman-adv/compat-include/net/ip6_checksum.h | 12 ------------ batman-adv/compat-include/net/netlink.h | 12 ------------ batman-adv/compat-include/uapi/linux/eventpoll.h | 12 ------------ batman-adv/compat-include/uapi/linux/nl80211.h | 12 ------------ batman-adv/compat-sources/Makefile | 12 ------------ batman-adv/compat-sources/net/core/skbuff.c | 5 ----- batman-adv/compat-sources/net/ipv4/igmp.c | 5 ----- batman-adv/compat-sources/net/ipv6/mcast_snoop.c | 13 ------------- batman-adv/compat.h | 15 --------------- batman-adv/gen-compat-autoconf.sh | 12 ------------ batman-adv/include/uapi/linux/batadv_packet.h | 12 ------------ batman-adv/include/uapi/linux/batman_adv.h | 18 ------------------ batman-adv/net/batman-adv/Kconfig | 12 ------------ batman-adv/net/batman-adv/Makefile | 13 ------------- batman-adv/net/batman-adv/bat_algo.c | 12 ------------ batman-adv/net/batman-adv/bat_algo.h | 12 ------------ batman-adv/net/batman-adv/bat_iv_ogm.c | 12 ------------ batman-adv/net/batman-adv/bat_iv_ogm.h | 12 ------------ batman-adv/net/batman-adv/bat_v.c | 12 ------------ batman-adv/net/batman-adv/bat_v.h | 12 ------------ batman-adv/net/batman-adv/bat_v_elp.c | 12 ------------ batman-adv/net/batman-adv/bat_v_elp.h | 12 ------------ batman-adv/net/batman-adv/bat_v_ogm.c | 12 ------------ batman-adv/net/batman-adv/bat_v_ogm.h | 12 ------------ batman-adv/net/batman-adv/bitarray.c | 12 ------------ batman-adv/net/batman-adv/bitarray.h | 12 ------------ batman-adv/net/batman-adv/bridge_loop_avoidance.c | 12 ------------ batman-adv/net/batman-adv/bridge_loop_avoidance.h | 12 ------------ batman-adv/net/batman-adv/debugfs.c | 12 ------------ batman-adv/net/batman-adv/debugfs.h | 12 ------------ batman-adv/net/batman-adv/distributed-arp-table.c | 12 ------------ batman-adv/net/batman-adv/distributed-arp-table.h | 12 ------------ batman-adv/net/batman-adv/fragmentation.c | 12 ------------ batman-adv/net/batman-adv/fragmentation.h | 12 ------------ batman-adv/net/batman-adv/gateway_client.c | 12 ------------ batman-adv/net/batman-adv/gateway_client.h | 12 ------------ batman-adv/net/batman-adv/gateway_common.c | 12 ------------ batman-adv/net/batman-adv/gateway_common.h | 12 ------------ batman-adv/net/batman-adv/hard-interface.c | 12 ------------ batman-adv/net/batman-adv/hard-interface.h | 12 ------------ batman-adv/net/batman-adv/hash.c | 12 ------------ batman-adv/net/batman-adv/hash.h | 12 ------------ batman-adv/net/batman-adv/icmp_socket.c | 12 ------------ batman-adv/net/batman-adv/icmp_socket.h | 12 ------------ batman-adv/net/batman-adv/log.c | 12 ------------ batman-adv/net/batman-adv/log.h | 12 ------------ batman-adv/net/batman-adv/main.c | 12 ------------ batman-adv/net/batman-adv/main.h | 12 ------------ batman-adv/net/batman-adv/multicast.c | 12 ------------ batman-adv/net/batman-adv/multicast.h | 12 ------------ batman-adv/net/batman-adv/netlink.c | 12 ------------ batman-adv/net/batman-adv/netlink.h | 12 ------------ batman-adv/net/batman-adv/network-coding.c | 12 ------------ batman-adv/net/batman-adv/network-coding.h | 12 ------------ batman-adv/net/batman-adv/originator.c | 12 ------------ batman-adv/net/batman-adv/originator.h | 12 ------------ batman-adv/net/batman-adv/routing.c | 12 ------------ batman-adv/net/batman-adv/routing.h | 12 ------------ batman-adv/net/batman-adv/send.c | 12 ------------ batman-adv/net/batman-adv/send.h | 12 ------------ batman-adv/net/batman-adv/soft-interface.c | 12 ------------ batman-adv/net/batman-adv/soft-interface.h | 12 ------------ batman-adv/net/batman-adv/sysfs.c | 12 ------------ batman-adv/net/batman-adv/sysfs.h | 12 ------------ batman-adv/net/batman-adv/tp_meter.c | 12 ------------ batman-adv/net/batman-adv/tp_meter.h | 12 ------------ batman-adv/net/batman-adv/trace.c | 12 ------------ batman-adv/net/batman-adv/trace.h | 12 ------------ batman-adv/net/batman-adv/translation-table.c | 12 ------------ batman-adv/net/batman-adv/translation-table.h | 12 ------------ batman-adv/net/batman-adv/tvlv.c | 12 ------------ batman-adv/net/batman-adv/tvlv.h | 12 ------------ batman-adv/net/batman-adv/types.h | 12 ------------ 187 files changed, 4 insertion(+), 2436 deletions(-) -- 2.20.1

1 4

[B.A.T.M.A.N.] Fwd: nodes start disappearing after a certain node count
by umut deniz 25 Feb '19

25 Feb '19

hi, this mail would be my first post to the list so for a starter i would like to thank to the project owners, contributors and the community for the great work being done and appreciate the effort and time being spent for this piece of software like it is said software is hard. the main reason i am writing is as follows; for about 10 months i have been experimenting with batman on various platforms my current platform is ti's beagleboneblack wireless board running openwrt distribution (the required bbbw dtb and wl1835 driver firmware applied) with batman enabled and configured. with this high level description of the components i am able to build a mesh network 6 nodes (i.e. bbbw cards) but as soon as i introduce a 7th card into the network batman mesh becomes unresponsive as the last seen times start to increase and finally, after 200 seconds all the nodes drops from the originator and neighbor tables which could be inspected with < :#batctl o> and < :#batctl n> commands respectively. all the cards are on the same table and well powered. i would like to give some details about the configurations of the cards which are identical except the ip addresses //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# cat /etc/config/wireless config wifi-device 'radio0' option type 'mac80211' option channel '11' option hwmode '11g' option path 'platform/ocp/47400000.usb/47401c00.usb/musb-hdrc.1/usb1/1-1/1-1:1.0' option htmode 'HT20' option disabled '1' config wifi-iface 'default_radio0' option device 'radio0' option network 'wifi' option mode 'mesh' option ssid 'my-mesh-network' option mesh_id '02:12:34:56:78:9A' config wifi-device 'radio1' option type 'mac80211' option channel '3' option hwmode '11n' option path 'platform/ocp/47810000.mmc/mmc_host/mmc2/mmc2:0001/mmc2:0001:2/wl18xx.0.auto' option htmode 'HT40+' option disabled '0' config wifi-iface 'wmesh' option device 'radio1' option ifname 'adhoc0' option network 'bat0_hardif_wlan' option mode 'mesh' option ssid 'mesh' option mesh_fwding '0' option 'mcast_rate' '18000' option bssid '02:12:34:56:78:9A' //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# cat /etc/config/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 'fd99:5d77:fecc::/48' config interface 'bat0_hardif_wlan' option ifname 'adhoc0' option mtu '2304' option proto 'batadv' option mesh 'bat0' option ipaddr '192.168.3.100' option netmask '255.255.255.0' option routing_algo 'BATMAN_IV' option ap_isolation '1' //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# cat /etc/config/batman-adv config 'mesh' 'bat0' option 'aggregated_ogms' 1 option 'ap_isolation' 1 #option 'bonding' 0 option 'fragmentation' 1 #option 'gw_bandwidth' '10000/2000' option 'gw_mode' 'off' #option 'gw_sel_class' 20 option 'log_level' 15 option 'orig_interval' 1000 option 'bridge_loop_avoidance' 0 option 'distributed_arp_table' 0 option 'multicast_mode' 0 optiion 'network_coding' 0 option 'hop_penalty' 15 #option 'isolation_mark' '0x00000000/0x00000000' # yet another batX instance # config 'mesh' 'bat5' //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# ifconfig adhoc0 Link encap:Ethernet HWaddr 38:D2:69:DC:DE:43 inet6 addr: fe80::3ad2:69ff:fedc:de43/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:2304 Metric:1 RX packets:5924 errors:0 dropped:0 overruns:0 frame:0 TX packets:3707 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:370268 (361.5 KiB) TX bytes:327332 (319.6 KiB) lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:65536 Metric:1 RX packets:480 errors:0 dropped:0 overruns:0 frame:0 TX packets:480 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:39360 (38.4 KiB) TX bytes:39360 (38.4 KiB) ///////////////////// 6 node setup with 5 direct neighbors ///////////////////// root@OpenWrt:/# batctl o [B.A.T.M.A.N. adv openwrt-2019.0-0, MainIF/MAC: adhoc0/38:d2:69:dc:de:43 (bat0/6a:40:89:aa:93:a0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF] 38:d2:69:e0:c3:0d 0.010s (218) 38:d2:69:e0:5e:de [ adhoc0] 38:d2:69:e0:c3:0d 0.010s (211) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:c3:0d 0.010s (214) 38:d2:69:e0:8f:87 [ adhoc0] 38:d2:69:e0:c3:0d 0.010s (222) 38:d2:69:e0:71:73 [ adhoc0] * 38:d2:69:e0:c3:0d 0.010s (255) 38:d2:69:e0:c3:0d [ adhoc0] 98:84:e3:f0:a5:38 0.700s (225) 38:d2:69:e0:c3:0d [ adhoc0] 98:84:e3:f0:a5:38 0.700s (221) 38:d2:69:e0:5e:de [ adhoc0] 98:84:e3:f0:a5:38 0.700s (225) 38:d2:69:e0:71:73 [ adhoc0] 98:84:e3:f0:a5:38 0.700s (222) 38:d2:69:e0:8f:87 [ adhoc0] * 98:84:e3:f0:a5:38 0.700s (247) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:8f:87 0.030s (214) 38:d2:69:e0:c3:0d [ adhoc0] 38:d2:69:e0:8f:87 0.030s (221) 38:d2:69:e0:5e:de [ adhoc0] 38:d2:69:e0:8f:87 0.030s (217) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:8f:87 0.030s (225) 38:d2:69:e0:71:73 [ adhoc0] * 38:d2:69:e0:8f:87 0.030s (255) 38:d2:69:e0:8f:87 [ adhoc0] 38:d2:69:e0:71:73 0.460s (200) 38:d2:69:e0:c3:0d [ adhoc0] 38:d2:69:e0:71:73 0.460s (197) 38:d2:69:e0:5e:de [ adhoc0] 38:d2:69:e0:71:73 0.460s (200) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:71:73 0.460s (210) 38:d2:69:e0:8f:87 [ adhoc0] * 38:d2:69:e0:71:73 0.460s (255) 38:d2:69:e0:71:73 [ adhoc0] 38:d2:69:e0:5e:de 0.180s (225) 38:d2:69:e0:c3:0d [ adhoc0] 38:d2:69:e0:5e:de 0.180s (215) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:5e:de 0.180s (218) 38:d2:69:e0:8f:87 [ adhoc0] 38:d2:69:e0:5e:de 0.180s (225) 38:d2:69:e0:71:73 [ adhoc0] * 38:d2:69:e0:5e:de 0.180s (251) 38:d2:69:e0:5e:de [ adhoc0] root@OpenWrt:/# batctl n [B.A.T.M.A.N. adv openwrt-2019.0-0, MainIF/MAC: adhoc0/38:d2:69:dc:de:43 (bat0/6a:40:89:aa:93:a0 BATMAN_IV)] IF Neighbor last-seen adhoc0 38:d2:69:e0:c3:0d 0.160s adhoc0 38:d2:69:e0:5e:de 0.320s adhoc0 98:84:e3:f0:a5:38 0.830s adhoc0 38:d2:69:e0:8f:87 0.030s adhoc0 38:d2:69:e0:71:73 0.630s //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# iw dev adhoc0 station dump Station 38:d2:69:e0:71:73 (on adhoc0) inactive time: 80 ms rx bytes: 1775733 rx packets: 22623 tx bytes: 539 tx packets: 7 tx retries: 0 tx failed: 0 rx drop misc: 12797 signal: 0 dBm signal avg: -21 dBm tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 27.343Mbps mesh llid: 32171 mesh plid: 13983 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 491 seconds Station 38:d2:69:e0:8f:87 (on adhoc0) inactive time: 20 ms rx bytes: 1693321 rx packets: 21651 tx bytes: 329 tx packets: 4 tx retries: 0 tx failed: 0 rx drop misc: 12018 signal: 0 dBm signal avg: -25 dBm Toffset: 18446744071111214636 us tx bitrate: 1.0 MBit/s expected throughput: 121.93Mbps mesh llid: 30373 mesh plid: 56485 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: UNKNOWN mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 489 seconds Station 98:84:e3:f0:a5:38 (on adhoc0) inactive time: 50 ms rx bytes: 1640523 rx packets: 21040 tx bytes: 716 tx packets: 8 tx retries: 0 tx failed: 0 rx drop misc: 11384 signal: 0 dBm signal avg: -27 dBm tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 140.625Mbps mesh llid: 25917 mesh plid: 65422 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 487 seconds Station 38:d2:69:e0:5e:de (on adhoc0) inactive time: 70 ms rx bytes: 1580918 rx packets: 20324 tx bytes: 480 tx packets: 6 tx retries: 0 tx failed: 0 rx drop misc: 10662 signal: 0 dBm signal avg: -34 dBm Toffset: 18446744071107370820 us tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 140.625Mbps mesh llid: 52541 mesh plid: 55210 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 485 seconds Station 38:d2:69:e0:c3:0d (on adhoc0) inactive time: 60 ms rx bytes: 1605955 rx packets: 20603 tx bytes: 480 tx packets: 6 tx retries: 0 tx failed: 0 rx drop misc: 11110 signal: 0 dBm signal avg: -26 dBm Toffset: 18446744071104088264 us tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 140.625Mbps mesh llid: 36132 mesh plid: 36029 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 481 seconds //////////////////////////////////////////////////////////////////////////////// at this point everything is fine i can level 2 ping each neighbor etc. but when i boot up the 6th neighbor (i.e. 7th node in the mesh network) last-seen values start to increase and finally nodes disappear //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# batctl o [B.A.T.M.A.N. adv openwrt-2019.0-0, MainIF/MAC: adhoc0/38:d2:69:dc:de:43 (bat0/6a:40:89:aa:93:a0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF] 38:d2:69:e0:c3:0d 97.200s (225) 38:d2:69:e0:5e:de [ adhoc0] 38:d2:69:e0:c3:0d 97.200s (222) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:c3:0d 97.200s (214) 38:d2:69:e0:8f:87 [ adhoc0] 38:d2:69:e0:c3:0d 97.200s (225) 38:d2:69:e0:71:73 [ adhoc0] * 38:d2:69:e0:c3:0d 97.200s (251) 38:d2:69:e0:c3:0d [ adhoc0] 98:84:e3:f0:a5:38 100.970s (221) 38:d2:69:e0:c3:0d [ adhoc0] 98:84:e3:f0:a5:38 100.970s (225) 38:d2:69:e0:5e:de [ adhoc0] 98:84:e3:f0:a5:38 100.970s (225) 38:d2:69:e0:71:73 [ adhoc0] 98:84:e3:f0:a5:38 100.970s (214) 38:d2:69:e0:8f:87 [ adhoc0] * 98:84:e3:f0:a5:38 100.970s (255) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:8f:87 100.170s (221) 38:d2:69:e0:c3:0d [ adhoc0] 38:d2:69:e0:8f:87 100.170s (225) 38:d2:69:e0:5e:de [ adhoc0] 38:d2:69:e0:8f:87 100.170s (225) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:8f:87 100.170s (225) 38:d2:69:e0:71:73 [ adhoc0] * 38:d2:69:e0:8f:87 100.170s (255) 38:d2:69:e0:8f:87 [ adhoc0] 38:d2:69:e0:71:73 18.750s ( 0) 38:d2:69:e0:c3:0d [ adhoc0] 38:d2:69:e0:71:73 18.750s ( 0) 38:d2:69:e0:5e:de [ adhoc0] 38:d2:69:e0:71:73 18.750s ( 0) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:71:73 18.750s ( 0) 38:d2:69:e0:8f:87 [ adhoc0] * 38:d2:69:e0:71:73 18.750s ( 12) 38:d2:69:e0:71:73 [ adhoc0] 38:d2:69:e0:5e:de 93.200s (218) 38:d2:69:e0:c3:0d [ adhoc0] 38:d2:69:e0:5e:de 93.200s ( 0) 98:84:e3:f0:a5:38 [ adhoc0] 38:d2:69:e0:5e:de 93.200s ( 0) 38:d2:69:e0:8f:87 [ adhoc0] 38:d2:69:e0:5e:de 93.200s (211) 38:d2:69:e0:71:73 [ adhoc0] * 38:d2:69:e0:5e:de 93.200s (247) 38:d2:69:e0:5e:de [ adhoc0] root@OpenWrt:/# batctl n [B.A.T.M.A.N. adv openwrt-2019.0-0, MainIF/MAC: adhoc0/38:d2:69:dc:de:43 (bat0/6a:40:89:aa:93:a0 BATMAN_IV)] IF Neighbor last-seen adhoc0 38:d2:69:e0:c3:0d 121.780s adhoc0 38:d2:69:e0:5e:de 117.780s adhoc0 98:84:e3:f0:a5:38 125.560s adhoc0 38:d2:69:e0:8f:87 124.750s adhoc0 38:d2:69:e0:71:73 43.210s //////////////////////////////////////////////////////////////////////////////// at this point the neighbors are giong to dissapear after 200 sec timeout but the command < :#iw dev adhoc0 station dump> list all the nodes plink established //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# iw dev adhoc0 station dump Station 38:d2:69:e0:71:73 (on adhoc0) inactive time: 90 ms rx bytes: 3864389 rx packets: 49751 tx bytes: 539 tx packets: 7 tx retries: 0 tx failed: 0 rx drop misc: 26681 signal: 0 dBm signal avg: -21 dBm tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 27.343Mbps mesh llid: 32171 mesh plid: 13983 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 1159 seconds Station 38:d2:69:e0:8f:87 (on adhoc0) inactive time: 30 ms rx bytes: 3690399 rx packets: 47696 tx bytes: 329 tx packets: 4 tx retries: 0 tx failed: 0 rx drop misc: 24935 signal: 0 dBm signal avg: -24 dBm tx bitrate: 1.0 MBit/s expected throughput: 3.906Mbps mesh llid: 30373 mesh plid: 56485 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: UNKNOWN mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 1157 seconds Station 98:84:e3:f0:a5:38 (on adhoc0) inactive time: 60 ms rx bytes: 3622627 rx packets: 46907 tx bytes: 716 tx packets: 8 tx retries: 0 tx failed: 0 rx drop misc: 24144 signal: 0 dBm signal avg: -25 dBm Toffset: 18446744071109913820 us tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 140.625Mbps mesh llid: 25917 mesh plid: 65422 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 1155 seconds Station 38:d2:69:e0:5e:de (on adhoc0) inactive time: 80 ms rx bytes: 3489728 rx packets: 45344 tx bytes: 480 tx packets: 6 tx retries: 0 tx failed: 0 rx drop misc: 22514 signal: 0 dBm signal avg: -31 dBm Toffset: 18446744071107371412 us tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 140.625Mbps mesh llid: 52541 mesh plid: 55210 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 1153 seconds Station 38:d2:69:e0:c3:0d (on adhoc0) inactive time: 80 ms rx bytes: 3585647 rx packets: 46475 tx bytes: 480 tx packets: 6 tx retries: 0 tx failed: 0 rx drop misc: 23601 signal: 0 dBm signal avg: -25 dBm Toffset: 18446744071104087603 us tx bitrate: 72.2 MBit/s MCS 7 short GI rx bitrate: 65.0 MBit/s MCS 7 expected throughput: 140.625Mbps mesh llid: 36132 mesh plid: 36029 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: ACTIVE mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 1149 seconds Station 38:d2:69:cd:86:96 (on adhoc0) inactive time: 60 ms rx bytes: 195354 rx packets: 3004 tx bytes: 270 tx packets: 3 tx retries: 0 tx failed: 0 rx drop misc: 3 signal: 0 dBm signal avg: -41 dBm Toffset: 18446744070115910174 us tx bitrate: 1.0 MBit/s expected throughput: 70.312Mbps mesh llid: 25879 mesh plid: 29955 mesh plink: ESTAB mesh local PS mode: ACTIVE mesh peer PS mode: UNKNOWN mesh non-peer PS mode: ACTIVE authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: no TDLS peer: no DTIM period: 2 beacon interval:100 short slot time:yes connected time: 161 seconds //////////////////////////////////////////////////////////////////////////////// and finally //////////////////////////////////////////////////////////////////////////////// root@OpenWrt:/# batctl o [B.A.T.M.A.N. adv openwrt-2019.0-0, MainIF/MAC: adhoc0/38:d2:69:dc:de:43 (bat0/6a:40:89:aa:93:a0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF] //////////////////////////////////////////////////////////////////////////////// i researched for a while for the cause with no avail. i would appreciate any kind of help to point me to the right direction to solve this. ps: i can provide more detail explanation, configuration and logs i you could tell me which thank you in advance.

3 5

[B.A.T.M.A.N.] batman-adv: Reduce claim hash refcnt only for removed entry
by Sven Eckelmann 24 Feb '19

24 Feb '19

The batadv_hash_remove is a function which searches the hashtable for an entry using a needle, a hashtable bucket selection function and a compare function. It will lock the bucket list and delete an entry when the compare function matches it with the needle. It returns the pointer to the hlist_node which matches or NULL when no entry matches the needle. The batadv_bla_del_claim is not itself protected in anyway to avoid that any other function is modifying the hashtable between the search for the entry and the call to batadv_hash_remove. It can therefore happen that the entry either doesn't exist anymore or an entry was deleted which is not the same object as the needle. In such an situation, the reference counter (for the reference stored in the hashtable) must not be reduced for the needle. Instead the reference counter of the actually removed entry has to be reduced. Otherwise the reference counter will underflow and the object might be freed before all its references were dropped. The kref helpers reported this problem as: refcount_t: underflow; use-after-free. Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Cc: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index ef39aabdb69435f384ae2ebef26d4d31367f427c..4fb01108e5f534b8a055edface0717f950ccdacc 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -803,6 +803,8 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, const u8 *mac, const unsigned short vid) { struct batadv_bla_claim search_claim, *claim; + struct batadv_bla_claim *claim_removed_entry; + struct hlist_node *claim_removed_node; ether_addr_copy(search_claim.addr, mac); search_claim.vid = vid; @@ -813,10 +815,18 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): %pM, vid %d\n", __func__, mac, batadv_print_vid(vid)); - batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim, - batadv_choose_claim, claim); - batadv_claim_put(claim); /* reference from the hash is gone */ + claim_removed_node = batadv_hash_remove(bat_priv->bla.claim_hash, + batadv_compare_claim, + batadv_choose_claim, claim); + if (!claim_removed_node) + goto free_claim; + /* reference from the hash is gone */ + claim_removed_entry = hlist_entry(claim_removed_node, + struct batadv_bla_claim, hash_entry); + batadv_claim_put(claim_removed_entry); + +free_claim: /* don't need the reference from hash_find() anymore */ batadv_claim_put(claim); }

2 4

[B.A.T.M.A.N.] [PATCH] batctl: Add hop_penalty setting command
by Sven Eckelmann 23 Feb '19

23 Feb '19

OpenWrt was switched to use batctl as abstraction of the sysfs and netlink configuration interface. The only additional configuration option to finish this process is hop_penalty. It is required to defines the penalty which will be applied to an not available via batctl was hop_penalty originator message's tq-field on every hop. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 1 + README.rst | 15 +++++++ hop_penalty.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ man/batctl.8 | 4 ++ 4 files changed, 135 insertions(+) create mode 100644 hop_penalty.c diff --git a/Makefile b/Makefile index 4d8b709..55105cc 100755 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ $(eval $(call add_command,event,y)) $(eval $(call add_command,fragmentation,y)) $(eval $(call add_command,gateways,y)) $(eval $(call add_command,gw_mode,y)) +$(eval $(call add_command,hop_penalty,y)) $(eval $(call add_command,interface,y)) $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) diff --git a/README.rst b/README.rst index 4c0f544..e30b5b9 100644 --- a/README.rst +++ b/README.rst @@ -530,6 +530,21 @@ Usage:: batctl aggregation|ag [0|1] +batctl hop_penalty +================== + +display or modify the hop_penalty (0-255) + +Usage:: + + batctl hop_penalty|hp [penalty] + +Example:: + + $ batctl penalty + 30 + + batctl isolation_mark ===================== diff --git a/hop_penalty.c b/hop_penalty.c new file mode 100644 index 0000000..58067bf --- /dev/null +++ b/hop_penalty.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "main.h" +#include "sys.h" + +static struct hop_penalty_data { + uint8_t hop_penalty; +} hop_penalty; + +static int parse_hop_penalty(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct hop_penalty_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->hop_penalty = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_hop_penalty(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_HOP_PENALTY]) + return NL_OK; + + printf("%u\n", nla_get_u8(attrs[BATADV_ATTR_HOP_PENALTY])); + + *result = 0; + return NL_STOP; +} + +static int get_hop_penalty(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_hop_penalty); +} + +static int set_attrs_hop_penalty(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct hop_penalty_data *data = settings->data; + + nla_put_u8(msg, BATADV_ATTR_HOP_PENALTY, data->hop_penalty); + + return 0; +} + +static int set_hop_penalty(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_hop_penalty, NULL); +} + +static struct settings_data batctl_settings_hop_penalty = { + .sysfs_name = "hop_penalty", + .data = &hop_penalty, + .parse = parse_hop_penalty, + .netlink_get = get_hop_penalty, + .netlink_set = set_hop_penalty, +}; + +COMMAND_NAMED(SUBCOMMAND, hop_penalty, "hp", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_hop_penalty, + "[penalty] \tdisplay or modify hop_penalty setting"); diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..0fbf1dd 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -97,6 +97,10 @@ when parameter \fB\-t\fP is specified. Parameter \fB\-r\fP will do the same but If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation. .br +.IP "\fBhop_penalty\fP|\fBhp\fP [\fBpenalty\fP]" +If no parameter is given the current hop penalty setting is displayed. Otherwise the parameter is used to set the +hop penalty. The penalty is can be 0-255 (255 sets originator message's TQ to zero when forwarded by this hop). +.br .IP "\fBnetwork_coding\fP|\fBnc\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. -- 2.20.1

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: fix warning in function batadv_v_elp_get_throughput
by Anders Roxell 22 Feb '19

22 Feb '19

When CONFIG_CFG80211 isn't enabled the compiler correcly warns about 'sinfo.pertid' may be unused. It can also happen for other error conditions that it not warn about. net/batman-adv/bat_v_elp.c: In function ‘batadv_v_elp_get_throughput.isra.0’: include/net/cfg80211.h:6370:13: warning: ‘sinfo.pertid’ may be used uninitialized in this function [-Wmaybe-uninitialized] kfree(sinfo->pertid); ~~~~~^~~~~~~~ Rework so that we only release '&sinfo' if cfg80211_get_station returns zero. Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- net/batman-adv/bat_v_elp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index a9b7919c9de5..d5df0114f08a 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -104,8 +104,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo); - /* free the TID stats immediately */ - cfg80211_sinfo_release_content(&sinfo); + if (!ret) { + /* free the TID stats immediately */ + cfg80211_sinfo_release_content(&sinfo); + } dev_put(real_netdev); if (ret == -ENOENT) { -- 2.19.2

1 0

[B.A.T.M.A.N.] [PATCH] batctl: replace multicast_mode with multicast_forceflood command
by Linus Lüssing 16 Feb '19

16 Feb '19

This patch hides the multicast_mode setting in the UI and adds a new multicast_forceflood command. multicast_forceflood is basically the inverse of the current multicast_mode setting. For the netlink config additions to batman-adv "multicast_mode" was not added. Instead a "multicast_forceflood" attribute was introduced. The multicast_mode batctl command is kept for compatibility for now but should be removed eventually. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Makefile | 1 + README.rst | 8 ++--- functions.c | 16 ++++++++- functions.h | 1 + main.c | 3 ++ main.h | 1 + man/batctl.8 | 8 +++-- multicast_forceflood.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ multicast_mode.c | 3 +- sys.c | 30 +++++++++++++--- 10 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 multicast_forceflood.c diff --git a/Makefile b/Makefile index 4d8b709..7c050c0 100755 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) diff --git a/README.rst b/README.rst index 4c0f544..6db68d7 100644 --- a/README.rst +++ b/README.rst @@ -468,14 +468,14 @@ Usage:: Note that network coding requires a working promiscuous mode on all interfaces. -batctl multicast_mode -===================== +batctl multicast_forceflood +=========================== -display or modify the multicast mode setting +display or modify the multicast forceflood setting Usage:: - batctl multicast_mode|mm [0|1] + batctl multicast_forceflood|mff [0|1] batctl mcast_flags diff --git a/functions.c b/functions.c index 76deab7..a202969 100644 --- a/functions.c +++ b/functions.c @@ -175,6 +175,16 @@ static bool ether_addr_valid(const uint8_t *addr) return true; } +static void print_inv_bool(char *line) +{ + if (!strncmp("enabled", line, strlen("enabled"))) + printf("disabled\n"); + else if (!strncmp("disabled", line, strlen("disabled"))) + printf("enabled\n"); + else + printf("%s", line); +} + int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { @@ -237,7 +247,11 @@ int read_file(const char *dir, const char *fname, int read_opt, continue; if (!(read_opt & USE_BAT_HOSTS)) { - printf("%s", line_ptr); + if (read_opt & INVERSE_BOOL) + print_inv_bool(line_ptr); + else + printf("%s", line_ptr); + continue; } diff --git a/functions.h b/functions.h index e2bbb4e..b3f2159 100644 --- a/functions.h +++ b/functions.h @@ -91,6 +91,7 @@ enum { SKIP_HEADER = 0x100, UNICAST_ONLY = 0x200, MULTICAST_ONLY = 0x400, + INVERSE_BOOL = 0x800, }; #endif diff --git a/main.c b/main.c index 2a28642..199c7a4 100644 --- a/main.c +++ b/main.c @@ -74,6 +74,9 @@ static void print_usage(void) if (cmd->type != type[i]) continue; + if (!cmd->usage) + continue; + if (strcmp(cmd->name, cmd->abbr) == 0) snprintf(buf, sizeof(buf), "%s", cmd->name); else diff --git a/main.h b/main.h index fca2a32..92d0e61 100644 --- a/main.h +++ b/main.h @@ -67,6 +67,7 @@ extern char module_ver_path[]; enum command_flags { COMMAND_FLAG_MESH_IFACE = BIT(0), COMMAND_FLAG_NETLINK = BIT(1), + COMMAND_FLAG_INVERSE = BIT(2), }; enum command_type { diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..695067f 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -101,9 +101,11 @@ disable fragmentation. If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br -.IP "\fBmulticast_mode\fP|\fBmm\fP [\fB0\fP|\fB1\fP]" -If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or -disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). +.IP "\fBmulticast_forceflood\fP|\fBmff\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current multicast forceflood setting is displayed. Otherwise the parameter is used to enable or +disable multicast forceflood. This setting defines whether multicast optimizations should be replaced by simple broadcast-like +flooding of multicast packets. If set to non-zero then all nodes in the mesh are going to use classic flooding for any +multicast packet with no optimizations. .br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log diff --git a/multicast_forceflood.c b/multicast_forceflood.c new file mode 100644 index 0000000..daaa6d0 --- /dev/null +++ b/multicast_forceflood.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Linus Lüssing <linus.luessing(a)c0d3.blue> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include "main.h" + +#include <errno.h> +#include <linux/genetlink.h> +#include <netlink/genl/genl.h> + +#include "batman_adv.h" +#include "netlink.h" +#include "sys.h" + +static struct simple_boolean_data multicast_forceflood; + +static int print_multicast_forceflood(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) + return NL_OK; + + printf("%s\n", nla_get_u8(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) ? "enabled" : "disabled"); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_forceflood(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_forceflood); +} + +static int set_attrs_multicast_forceflood(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct simple_boolean_data *data = settings->data; + + nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, data->val); + + return 0; +} + +static int set_multicast_forceflood(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_forceflood, NULL); +} + +static struct settings_data batctl_settings_multicast_forceflood = { + .sysfs_name = "multicast_mode", + .data = &multicast_forceflood, + .parse = parse_simple_boolean, + .netlink_get = get_multicast_forceflood, + .netlink_set = set_multicast_forceflood, +}; + +COMMAND_NAMED(SUBCOMMAND, multicast_forceflood, "mff", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK | COMMAND_FLAG_INVERSE, + &batctl_settings_multicast_forceflood, + "[0|1] \tdisplay or modify multicast_forceflood setting"); diff --git a/multicast_mode.c b/multicast_mode.c index 836a744..fb17586 100644 --- a/multicast_mode.c +++ b/multicast_mode.c @@ -91,5 +91,4 @@ static struct settings_data batctl_settings_multicast_mode = { COMMAND_NAMED(SUBCOMMAND, multicast_mode, "mm", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_settings_multicast_mode, - "[0|1] \tdisplay or modify multicast_mode setting"); + &batctl_settings_multicast_mode, NULL); diff --git a/sys.c b/sys.c index 9a7966f..b0864cd 100644 --- a/sys.c +++ b/sys.c @@ -156,7 +156,8 @@ int sys_simple_print_boolean(struct nl_msg *msg, void *arg, static void settings_usage(struct state *state) { fprintf(stderr, "Usage: batctl [options] %s|%s [parameters] %s\n", - state->cmd->name, state->cmd->abbr, state->cmd->usage); + state->cmd->name, state->cmd->abbr, + state->cmd->usage ? state->cmd->usage : ""); fprintf(stderr, "parameters:\n"); fprintf(stderr, " \t -h print this help\n"); @@ -167,6 +168,7 @@ static int sys_read_setting(struct state *state, const char *path_buff, { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; + int read_opt = NO_FLAGS; if (settings->netlink_get) { res = settings->netlink_get(state); @@ -176,8 +178,12 @@ static int sys_read_setting(struct state *state, const char *path_buff, return EXIT_SUCCESS; } - if (sysfs_name) - res = read_file(path_buff, sysfs_name, NO_FLAGS, 0, 0, 0); + if (sysfs_name) { + if (state->cmd->flags & COMMAND_FLAG_INVERSE) + read_opt |= INVERSE_BOOL; + + res = read_file(path_buff, sysfs_name, read_opt, 0, 0, 0); + } return res; } @@ -187,6 +193,7 @@ static int sys_write_setting(struct state *state, const char *path_buff, { struct settings_data *settings = state->cmd->arg; int res = EXIT_FAILURE; + char *argv1 = argv[1]; if (settings->netlink_set) { res = settings->netlink_set(state); @@ -196,9 +203,22 @@ static int sys_write_setting(struct state *state, const char *path_buff, return EXIT_SUCCESS; } - if (sysfs_name) + if (sysfs_name) { + if (state->cmd->flags & COMMAND_FLAG_INVERSE) { + if (!strncmp("0", argv[1], strlen("0")) || + !strncmp("disable", argv[1], strlen("disable")) || + !strncmp("disabled", argv[1], strlen("disabled"))) { + argv1 = "enabled"; + } else if (!strncmp("1", argv[1], strlen("1")) || + !strncmp("enable", argv[1], strlen("enable")) || + !strncmp("enabled", argv[1], strlen("enabled"))) { + argv1 = "disabled"; + } + } + res = write_file(path_buff, sysfs_name, - argv[1], argc > 2 ? argv[2] : NULL); + argv1, argc > 2 ? argv[2] : NULL); + } return res; } -- 2.11.0

1 0

[B.A.T.M.A.N.] [PATCH v2] batctl: add switch for setting multicast_fanout
by Linus Lüssing 15 Feb '19

15 Feb '19

This patch adds an option for the new multicast_fanout setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v2: * fixed README.rst title * disabled sysfs_name * added BATADV_ATTR_MULTICAST_FANOUT to event monitor * added BATADV_ATTR_MULTICAST_FANOUT to batadv_netlink_policy * changed multicast_fanout order in Makefile --- Makefile | 1 + README.rst | 10 +++++ batman_adv.h | 7 ++++ event.c | 4 ++ man/batctl.8 | 5 +++ multicast_fanout.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.c | 1 + 7 files changed, 143 insertions(+) create mode 100644 multicast_fanout.c diff --git a/Makefile b/Makefile index 4d8b709..7c0cbf1 100755 --- a/Makefile +++ b/Makefile @@ -68,6 +68,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,nc_nodes,y)) $(eval $(call add_command,neighbors,y)) diff --git a/README.rst b/README.rst index 4c0f544..19dcc02 100644 --- a/README.rst +++ b/README.rst @@ -478,6 +478,16 @@ Usage:: batctl multicast_mode|mm [0|1] +batctl multicast_fanout +======================= + +display or modify the multicast fanout setting + +Usage:: + + batctl multicast_fanout|mo [fanout] + + batctl mcast_flags ================== diff --git a/batman_adv.h b/batman_adv.h index 9b12d2a..2f956e6 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/event.c b/event.c index 62ccf56..8fab5ae 100644 --- a/event.c +++ b/event.c @@ -284,6 +284,10 @@ static void event_parse_set_mesh(struct nlattr **attrs) printf("* log_level 0x%08x\n", nla_get_u32(attrs[BATADV_ATTR_LOG_LEVEL])); + if (attrs[BATADV_ATTR_MULTICAST_FANOUT]) + printf("* multicast_fanout %u\n", + nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + if (attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]) printf("* multicast_forceflood %s\n", u8_to_boolstr(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED])); diff --git a/man/batctl.8 b/man/batctl.8 index ed8e71f..92c0e32 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -105,6 +105,11 @@ disable network coding. If no parameter is given the current multicast mode setting is displayed. Otherwise the parameter is used to enable or disable multicast optimizations (i.e. disabling means always sending own multicast frames via classic flooding). .br +.IP "\fBmulticast_fanout\fP|\fBmo\fP [\fBfanout\fP]" +If no parameter is given the current multicast fanout setting is displayed. Otherwise the parameter is used to set +the multicast fanout. The multicast fanout defines the maximum number of packet copies that may be generated for a +multicast-to-unicast conversion. Once this limit is exceeded distribution will fall back to broadcast. +.br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. diff --git a/multicast_fanout.c b/multicast_fanout.c new file mode 100644 index 0000000..0de2622 --- /dev/null +++ b/multicast_fanout.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "main.h" +#include "sys.h" + +static struct multicast_fanout_data { + uint32_t multicast_fanout; +} multicast_fanout; + +static int parse_multicast_fanout(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->multicast_fanout = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_FANOUT]) + return NL_OK; + + printf("%u\n", nla_get_u32(attrs[BATADV_ATTR_MULTICAST_FANOUT])); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_fanout); +} + +static int set_attrs_multicast_fanout(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct multicast_fanout_data *data = settings->data; + + nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, data->multicast_fanout); + + return 0; +} + +static int set_multicast_fanout(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_fanout, NULL); +} + +static struct settings_data batctl_settings_multicast_fanout = { + .sysfs_name = NULL, + .data = &multicast_fanout, + .parse = parse_multicast_fanout, + .netlink_get = get_multicast_fanout, + .netlink_set = set_multicast_fanout, +}; + +COMMAND_NAMED(SUBCOMMAND, multicast_fanout, "mo", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_multicast_fanout, + "[fanout] \tdisplay or modify multicast_fanout setting"); diff --git a/netlink.c b/netlink.c index 5b9966c..49673a8 100644 --- a/netlink.c +++ b/netlink.c @@ -123,6 +123,7 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, -- 2.11.0

1 0

[B.A.T.M.A.N.] [PATCH v3] batman-adv: Add multicast-to-unicast support for multiple targets
by Linus Lüssing 15 Feb '19

15 Feb '19

With this patch multicast packets with a limited number of destinations (current default: 16) will be split and transmitted by the originator as individual unicast transmissions. Wifi broadcasts with their low bitrate are still a costly undertaking. In a mesh network this cost multiplies with the overall size of the mesh network. Therefore using multiple unicast transmissions instead of broadcast flooding is almost always less burdensome for the mesh network. The maximum amount of unicast packets can be configured via the newly introduced multicast_fanout parameter. If this limit is exceeded distribution will fall back to classic broadcast flooding. The multicast-to-unicast conversion is performed on the initial multicast sender node and counts on a final destination node, mesh-wide basis (and not next hop, neighbor node basis). Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v3: * removed sysfs support for multicast_fanout Changelog v2: * rebased to master (no conflicts/changes) * fixed a double free bug in the batman-adv multicast-to-multi-unicast patch: led to crashes, especially on netifd restart/shutdown -> https://github.com/freifunk-gluon/gluon/issues/1468 * fixed skb memory leaks in error cases * added netlink support for multicast_fanout * updated multicast_fanout sysfs ABI doc date to Feb 2019 --- include/uapi/linux/batman_adv.h | 7 ++ net/batman-adv/multicast.c | 241 ++++++++++++++++++++++++++++++++++++- net/batman-adv/multicast.h | 18 +++ net/batman-adv/netlink.c | 11 ++ net/batman-adv/soft-interface.c | 8 +- net/batman-adv/translation-table.c | 6 +- net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 6 + 8 files changed, 295 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 305bf316..e875e0c5 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -491,6 +491,13 @@ enum batadv_nl_attrs { */ BATADV_ATTR_THROUGHPUT_OVERRIDE, + /** + * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet + * copies that may be generated for a multicast-to-unicast conversion. + * Once this limit is exceeded distribution will fall back to broadcast. + */ + BATADV_ATTR_MULTICAST_FANOUT, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index f91b1b62..aa38736f 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -66,6 +66,7 @@ #include "hash.h" #include "log.h" #include "netlink.h" +#include "send.h" #include "soft-interface.h" #include "translation-table.h" #include "tvlv.h" @@ -992,6 +993,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, int ret, tt_count, ip_count, unsnoop_count, total_count; bool is_unsnoopable = false; struct ethhdr *ethhdr; + unsigned int mcast_fanout; ret = batadv_mcast_forw_mode_check(bat_priv, skb, &is_unsnoopable); if (ret == -ENOMEM) @@ -1025,8 +1027,245 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, case 0: return BATADV_FORW_NONE; default: - return BATADV_FORW_ALL; + mcast_fanout = atomic_read(&bat_priv->multicast_fanout); + + if (!unsnoop_count && total_count <= mcast_fanout) + return BATADV_FORW_SOME; } + + return BATADV_FORW_ALL; +} + +/** + * batadv_mcast_forw_tt_send() - send a packet to multicast listeners + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any multicast + * listener registered in the translation table. A transmission is performed + * via a batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_tt_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid, unsigned int *limit) +{ + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + struct batadv_tt_orig_list_entry *orig_entry; + + struct batadv_tt_global_entry *tt_global; + const u8 *addr = eth_hdr(skb)->h_dest; + + tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid); + if (!tt_global) + return NET_XMIT_DROP; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_entry, &tt_global->orig_list, list) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_entry->orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + batadv_tt_global_entry_put(tt_global); + *limit = limit_tmp; + + return ret; +} + +/** + * batadv_mcast_forw_want_all_ipv4_send() - send to nodes with want-all-ipv4 + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV4 flag set. A transmission is performed via a + * batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_want_all_ipv4_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + struct batadv_orig_node *orig_node; + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, + &bat_priv->mcast.want_all_ipv4_list, + mcast_want_all_ipv4_node) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + *limit = limit_tmp; + return ret; +} + +/** + * batadv_mcast_forw_want_all_ipv6_send() - send to nodes with want-all-ipv6 + * @bat_priv: the bat priv with all the soft interface information + * @skb: The multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV6 flag set. A transmission is performed via a + * batman-adv unicast packet for each such destination node. + * + * Return: NET_XMIT_DROP if limit was reached or on memory allocation failure, + * NET_XMIT_SUCCESS otherwise. + */ +static int +batadv_mcast_forw_want_all_ipv6_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + struct batadv_orig_node *orig_node; + unsigned int limit_tmp = *limit; + int ret = NET_XMIT_SUCCESS; + struct sk_buff *newskb; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, + &bat_priv->mcast.want_all_ipv6_list, + mcast_want_all_ipv6_node) { + if (!limit_tmp) { + ret = NET_XMIT_DROP; + break; + } + + newskb = skb_copy(skb, GFP_ATOMIC); + if (!newskb) { + ret = NET_XMIT_DROP; + break; + } + + batadv_send_skb_unicast(bat_priv, newskb, BATADV_UNICAST, 0, + orig_node, vid); + limit_tmp--; + } + rcu_read_unlock(); + + *limit = limit_tmp; + return ret; +} + +/** + * batadv_mcast_forw_want_all_send() - send packet to nodes in a want-all list + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node with a + * BATADV_MCAST_WANT_ALL_IPV4 or BATADV_MCAST_WANT_ALL_IPV6 flag set. A + * transmission is performed via a batman-adv unicast packet for each such + * destination node. + * + * Return: NET_XMIT_DROP if limit was reached, on memory allocation failure + * or if the protocol family is neither IPv4 nor IPv6. NET_XMIT_SUCCESS + * otherwise. + */ +static int +batadv_mcast_forw_want_all_send(struct batadv_priv *bat_priv, + struct sk_buff *skb, unsigned short vid, + unsigned int *limit) +{ + switch (ntohs(eth_hdr(skb)->h_proto)) { + case ETH_P_IP: + return batadv_mcast_forw_want_all_ipv4_send(bat_priv, skb, vid, + limit); + case ETH_P_IPV6: + return batadv_mcast_forw_want_all_ipv6_send(bat_priv, skb, vid, + limit); + default: + /* we shouldn't be here... */ + return NET_XMIT_DROP; + } +} + +/** + * batadv_mcast_forw_send() - send packet to any detected multicast recpient + * @bat_priv: the bat priv with all the soft interface information + * @skb: the multicast packet to transmit + * @vid: the vlan identifier + * @limit: number of remaining, maximum transmissions + * + * Sends copies of a frame with multicast destination to any node that signaled + * interest in it, that is either via the translation table or the according + * want-all flags. A transmission is performed via a batman-adv unicast packet + * for each such destination node. + * + * The given skb is consumed/freed. + * + * Return: NET_XMIT_DROP if limit was reached, on memory allocation failure + * or if the protocol family is neither IPv4 nor IPv6. NET_XMIT_SUCCESS + * otherwise. + */ +int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) +{ + /* The previous forw mode check will try to limit to the configured + * fanout. Here, we allow a little bit of flexibility in case some + * new listeners might have joined between these function calls. + */ + unsigned int limit = 2 * atomic_read(&bat_priv->multicast_fanout); + int ret; + + ret = batadv_mcast_forw_tt_send(bat_priv, skb, vid, &limit); + if (ret != NET_XMIT_SUCCESS) { + kfree_skb(skb); + return ret; + } + + ret = batadv_mcast_forw_want_all_send(bat_priv, skb, vid, &limit); + if (ret != NET_XMIT_SUCCESS) { + kfree_skb(skb); + return ret; + } + + consume_skb(skb); + return ret; } /** diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 466013fe..83c5ff51 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -36,6 +36,13 @@ enum batadv_forw_mode { BATADV_FORW_ALL, /** + * @BATADV_FORW_SOME: forward the packet to some nodes (currently via + * a multicast-to-unicast conversion and the BATMAN unicast routing + * protocol) + */ + BATADV_FORW_SOME, + + /** * @BATADV_FORW_SINGLE: forward the packet to a single node (currently * via the BATMAN unicast routing protocol) */ @@ -51,6 +58,9 @@ enum batadv_forw_mode batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, struct batadv_orig_node **mcast_single_orig); +int batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid); + void batadv_mcast_init(struct batadv_priv *bat_priv); int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset); @@ -73,6 +83,14 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, return BATADV_FORW_ALL; } +static inline int +batadv_mcast_forw_send(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid) +{ + kfree_skb(skb); + return NET_XMIT_DROP; +} + static inline int batadv_mcast_init(struct batadv_priv *bat_priv) { return 0; diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 67a58da2..f0458727 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -157,6 +157,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, + [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, @@ -353,6 +354,10 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg, if (nla_put_u8(msg, BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED, !atomic_read(&bat_priv->multicast_mode))) goto nla_put_failure; + + if (nla_put_u32(msg, BATADV_ATTR_MULTICAST_FANOUT, + atomic_read(&bat_priv->multicast_fanout))) + goto nla_put_failure; #endif /* CONFIG_BATMAN_ADV_MCAST */ #ifdef CONFIG_BATMAN_ADV_NC @@ -592,6 +597,12 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info) atomic_set(&bat_priv->multicast_mode, !nla_get_u8(attr)); } + + if (info->attrs[BATADV_ATTR_MULTICAST_FANOUT]) { + attr = info->attrs[BATADV_ATTR_MULTICAST_FANOUT]; + + atomic_set(&bat_priv->multicast_fanout, nla_get_u32(attr)); + } #endif /* CONFIG_BATMAN_ADV_MCAST */ #ifdef CONFIG_BATMAN_ADV_NC diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2e367230..db8ac4df 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -209,7 +209,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, unsigned short vid; u32 seqno; int gw_mode; - enum batadv_forw_mode forw_mode; + enum batadv_forw_mode forw_mode = BATADV_FORW_SINGLE; struct batadv_orig_node *mcast_single_orig = NULL; int network_offset = ETH_HLEN; __be16 proto; @@ -317,7 +317,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, if (forw_mode == BATADV_FORW_NONE) goto dropped; - if (forw_mode == BATADV_FORW_SINGLE) + if (forw_mode == BATADV_FORW_SINGLE || + forw_mode == BATADV_FORW_SOME) do_bcast = false; } } @@ -377,6 +378,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, ret = batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0, mcast_single_orig, vid); + } else if (forw_mode == BATADV_FORW_SOME) { + ret = batadv_mcast_forw_send(bat_priv, skb, vid); } else { if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb)) @@ -818,6 +821,7 @@ static int batadv_softif_init_late(struct net_device *dev) bat_priv->mcast.querier_ipv6.shadowing = false; bat_priv->mcast.flags = BATADV_NO_FLAGS; atomic_set(&bat_priv->multicast_mode, 1); + atomic_set(&bat_priv->multicast_fanout, 16); atomic_set(&bat_priv->mcast.num_want_all_unsnoopables, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f73d7913..8f83554b 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -61,6 +61,7 @@ #include "log.h" #include "netlink.h" #include "originator.h" +#include "send.h" #include "soft-interface.h" #include "tvlv.h" @@ -205,7 +206,7 @@ batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const u8 *addr, * Return: a pointer to the corresponding tt_global_entry struct if the client * is found, NULL otherwise. */ -static struct batadv_tt_global_entry * +struct batadv_tt_global_entry * batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid) { @@ -300,8 +301,7 @@ static void batadv_tt_global_entry_release(struct kref *ref) * possibly release it * @tt_global_entry: tt_global_entry to be free'd */ -static void -batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) +void batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) { kref_put(&tt_global_entry->common.refcount, batadv_tt_global_entry_release); diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 61bca75e..5b41f217 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -41,6 +41,10 @@ int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, s32 match_vid, const char *message); +struct batadv_tt_global_entry * +batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const u8 *addr, + unsigned short vid); +void batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry); int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid); struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a21b34ed..d22cf01e 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1565,6 +1565,12 @@ struct batadv_priv { * node's sender/originating side */ atomic_t multicast_mode; + + /** + * @multicast_fanout: Maximum number of packet copies to generate for a + * multicast-to-unicast conversion + */ + atomic_t multicast_fanout; #endif /** @orig_interval: OGM broadcast interval in milliseconds */ -- 2.11.0

1 0

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