commits March 2019

commits@lists.open-mesh.org

1 participants
63 discussions

[openwrt-feed-devel] master: batman-adv-devel: Fix description for BATMAN_ADV_DEBUG (101e9da)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 101e9da88da9a504ddd7911602f687b0e11087c9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 9 13:01:10 2019 +0100 batman-adv-devel: Fix description for BATMAN_ADV_DEBUG The debug messages of batman-adv are not printed to the kernel log at all but can be stored (depending on the compile setting) in the tracing buffer or the batadv specific log buffer. There is also no debug module parameter but a batadv netdev specific log_level setting to enable/disable different classes of debug messages at runtime. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 101e9da88da9a504ddd7911602f687b0e11087c9 batman-adv-devel/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 0f123f6..7ea862c 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # @@ -94,8 +94,9 @@ config BATMAN_ADV_DEVEL_DEBUG help This is an option for use by developers; most people should say N here. This enables compilation of support for - outputting debugging information to the kernel log. The - output is controlled via the module parameter debug. + outputting debugging information to the debugfs log or tracing + buffer. The output is controlled via the batadv netdev specific + log_level setting. config BATMAN_ADV_DEVEL_TRACING bool "B.A.T.M.A.N. tracing support"

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop unused compat-hacks.patch (951c2c2)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 951c2c2e161778aa35fe597e895ce5ad61e094c5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:04:35 2019 +0100 batman-adv-devel: Drop unused compat-hacks.patch The linux/build_bug.h is already provided by mac80211's backports. It is not needed anymore to adjust the includes to use the older linux/bug.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 951c2c2e161778aa35fe597e895ce5ad61e094c5 batman-adv-devel/patches/0001-compat-hacks.patch | 33 ------------------------ 1 file changed, 33 deletions(-) diff --git a/batman-adv-devel/patches/0001-compat-hacks.patch b/batman-adv-devel/patches/0001-compat-hacks.patch deleted file mode 100644 index 0a9994d..0000000 --- a/batman-adv-devel/patches/0001-compat-hacks.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/net/batman-adv/main.c -+++ b/net/batman-adv/main.c -@@ -19,7 +19,7 @@ - #include "main.h" - - #include <linux/atomic.h> --#include <linux/build_bug.h> -+#include <linux/bug.h> - #include <linux/byteorder/generic.h> - #include <linux/crc32c.h> - #include <linux/errno.h> ---- a/net/batman-adv/tp_meter.c -+++ b/net/batman-adv/tp_meter.c -@@ -20,7 +20,7 @@ - #include "main.h" - - #include <linux/atomic.h> --#include <linux/build_bug.h> -+#include <linux/bug.h> - #include <linux/byteorder/generic.h> - #include <linux/cache.h> - #include <linux/compiler.h> ---- a/net/batman-adv/translation-table.c -+++ b/net/batman-adv/translation-table.c -@@ -21,7 +21,7 @@ - - #include <linux/atomic.h> - #include <linux/bitops.h> --#include <linux/build_bug.h> -+#include <linux/bug.h> - #include <linux/byteorder/generic.h> - #include <linux/cache.h> - #include <linux/compiler.h>

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop compat-hack for __poll_t (ea0bab9)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit ea0bab9ebf2a63b89a3acf55d6fac042d4d0dd62 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:19:42 2019 +0100 batman-adv-devel: Drop compat-hack for __poll_t __poll_t is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ea0bab9ebf2a63b89a3acf55d6fac042d4d0dd62 batman-adv-devel/src/compat-hacks.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 5733d69..85c57be 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -167,13 +167,6 @@ static inline int batadv_cfg80211_get_station(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 18, 0) */ - -#ifdef __CHECK_POLL -typedef unsigned __bitwise __poll_t; -#else -typedef unsigned __poll_t; -#endif - #endif /* < KERNEL_VERSION(4, 16, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop compat-hack for skb_put* (a1e5bfb)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit a1e5bfb5a6dc26f3e480bad6592dc5778696581a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:19:42 2019 +0100 batman-adv-devel: Drop compat-hack for skb_put* skb_put* is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a1e5bfb5a6dc26f3e480bad6592dc5778696581a batman-adv-devel/src/compat-hacks.h | 42 ------------------------------------- 1 file changed, 42 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index c2e6e31..321ad6d 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -138,48 +138,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 11, 9) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) - -static inline void *batadv_skb_put(struct sk_buff *skb, unsigned int len) -{ - return (void *)skb_put(skb, len); -} -#ifdef skb_put -#undef skb_put -#endif - -#define skb_put batadv_skb_put - -static inline void *batadv_skb_put_zero(struct sk_buff *skb, unsigned int len) -{ - void *tmp = skb_put(skb, len); - - memset(tmp, 0, len); - - return tmp; -} -#ifdef skb_put_zero -#undef skb_put_zero -#endif - -#define skb_put_zero batadv_skb_put_zero - -static inline void *batadv_skb_put_data(struct sk_buff *skb, const void *data, - unsigned int len) -{ - void *tmp = skb_put(skb, len); - - memcpy(tmp, data, len); - - return tmp; -} -#ifdef skb_put_data -#undef skb_put_data -#endif - -#define skb_put_data batadv_skb_put_data - -#endif /* < KERNEL_VERSION(4, 13, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop compat-hack for from_timer (6500b27)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 6500b27e1d4f0589a5dd206a80d615aa405e26a1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:19:42 2019 +0100 batman-adv-devel: Drop compat-hack for from_timer from_timer is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6500b27e1d4f0589a5dd206a80d615aa405e26a1 batman-adv-devel/src/compat-hacks.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 321ad6d..5733d69 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -146,24 +146,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 15, 0) */ -#ifndef from_timer - -#define TIMER_DATA_TYPE unsigned long -#define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) - -static inline void timer_setup(struct timer_list *timer, - void (*callback)(struct timer_list *), - unsigned int flags) -{ - __setup_timer(timer, (TIMER_FUNC_TYPE)callback, - (TIMER_DATA_TYPE)timer, flags); -} - -#define from_timer(var, callback_timer, timer_fieldname) \ - container_of(callback_timer, typeof(*var), timer_fieldname) - -#endif /* !from_timer */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop compat-hack for netif_trans_update (d69dbb2)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit d69dbb2a5269b3845fd8af505ed9b02f64625696 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:19:42 2019 +0100 batman-adv-devel: Drop compat-hack for netif_trans_update netif_trans_update is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d69dbb2a5269b3845fd8af505ed9b02f64625696 batman-adv-devel/src/compat-hacks.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 748ba1d..217f4d1 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -104,20 +104,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 6, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) - -#ifdef netif_trans_update -#undef netif_trans_update -#endif - -#define netif_trans_update batadv_netif_trans_update -static inline void batadv_netif_trans_update(struct net_device *dev) -{ - dev->trans_start = jiffies; -} - -#endif /* < KERNEL_VERSION(4, 7, 0) */ - #include_next <linux/netlink.h>

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop redefinition of NL80211_STA_INFO_EXPECTED_THROUGHPUT (3fc7244)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 3fc724454ebce054f073bbbbeb90c09f59277ddb Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:19:42 2019 +0100 batman-adv-devel: Drop redefinition of NL80211_STA_INFO_EXPECTED_THROUGHPUT NL80211_STA_INFO_EXPECTED_THROUGHPUT is defined by the mac80211 package and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3fc724454ebce054f073bbbbeb90c09f59277ddb batman-adv-devel/src/compat-hacks.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 718a15c..748ba1d 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -36,11 +36,6 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) -/* for batadv_v_elp_get_throughput which would have used - * STATION_INFO_EXPECTED_THROUGHPUT in Linux 4.0.0 - */ -#define NL80211_STA_INFO_EXPECTED_THROUGHPUT 28 - /* wild hack for batadv_getlink_net only */ #define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop cfg80211_get_station memset workaround (1739aba)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 1739aba722180fdc00271d7163b1c8b30d27e158 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:40:11 2019 +0100 batman-adv-devel: Drop cfg80211_get_station memset workaround The actual memset fix for cfg80211_get_station's sinfo is already part of the mac80211 package and doesn't have to be shipped anymore with batman-adv. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1739aba722180fdc00271d7163b1c8b30d27e158 batman-adv-devel/src/compat-hacks.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 85c57be..cfeb348 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -146,28 +146,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 15, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) - - -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) - -#include <net/cfg80211.h> - -/* cfg80211 fix: https://patchwork.kernel.org/patch/10449857/ */ -static inline int batadv_cfg80211_get_station(struct net_device *dev, - const u8 *mac_addr, - struct station_info *sinfo) -{ - memset(sinfo, 0, sizeof(*sinfo)); - return cfg80211_get_station(dev, mac_addr, sinfo); -} - -#define cfg80211_get_station(dev, mac_addr, sinfo) \ - batadv_cfg80211_get_station(dev, mac_addr, sinfo) - -#endif /* < KERNEL_VERSION(4, 18, 0) */ - -#endif /* < KERNEL_VERSION(4, 16, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)

1 0

[openwrt-feed-devel] master: batman-adv-devel: Split batadv proto in meshif and hardif part (7d7df36)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 7d7df362a935df3495b84a5bf4270a872f375e7f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 24 17:51:13 2019 +0100 batman-adv-devel: Split batadv proto in meshif and hardif part batman-adv allows to configure three different objects: * batadv hardif - network interface used by batadv meshif to transport the batman-adv packets - its master interface is set to the batadv meshif * batadv (meshif/softif) - virtual interface that emulates a normal 802.3 interface on top - encapsulates traffic and forwards it via the batadv hardifs * batadv vlan - potential VLAN ID on top of batadv meshif - allows filtering of traffic from specific VIDs While batadv vlan objects were already represented as an own proto "batadv_vlan", the batadv meshif could never be fully configured using /etc/config/network. Instead, parts of its configuration were stored in /etc/config/batman_adv and some in the interfaces with the "batadv" proto. To increase the confusion, the "batadv" proto wasn't used to define the batadv meshif but to identify batadv (slave) hardifs. The batman-adv meshifs were also never created directly but only when a hardif was configured. The actual modification of the configuration settings was then applied using a hotplug script hack. The batadv meshif network interface could therefore only be created when an hardif was available and not manipulated with ifup/ifdown. Also `/etc/init.d/network reload` didn't modify the batadv meshif interface configuration correctly. The "batadv" is now renamed to "batadv_hardif" and a new "batadv" proto is used to configure the main (meshif) network interface with all its configuration. A simple network configuration with WiFi & ethernet interfaces and static IP on top of bat0 would look like: # batadv meshif bat0 config interface 'bat0' option proto 'batadv' option routing_algo 'BATMAN_IV' option aggregated_ogms 1 option ap_isolation 0 option bonding 0 option fragmentation 1 #option gw_bandwidth '10000/2000' option gw_mode 'off' #option gw_sel_class 20 option log_level 0 option orig_interval 1000 option bridge_loop_avoidance 1 option distributed_arp_table 1 option multicast_mode 1 option network_coding 0 option hop_penalty 30 option isolation_mark '0x00000000/0x00000000' # add *single* wifi-iface with network bat0_hardif_wlan as hardif to bat0 config interface 'bat0_hardif_wlan' option mtu '1536' option proto 'batadv_hardif' option master 'bat0' # option ifname is filled out by the wifi-iface # add eth0 as hardif to bat0 config interface 'bat0_hardif_eth0' option proto 'batadv_hardif' option master 'bat0' option ifname 'eth0' option mtu '1536' # configure IP on bat0 config interface 'bat0_lan' option ifname 'bat0' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' option ip6assign '60' Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7d7df362a935df3495b84a5bf4270a872f375e7f batman-adv-devel/files/etc/config/batman-adv | 20 ---- .../files/etc/hotplug.d/net/99-batman-adv | 12 --- .../etc/uci-defaults/99-migrate-batadv_hardif | 97 ++++++++++++++++++ batman-adv-devel/files/lib/batman-adv/config.sh | 69 ------------- batman-adv-devel/files/lib/netifd/proto/batadv.sh | 112 ++++++++++++++++++--- .../files/lib/netifd/proto/batadv_hardif.sh | 40 ++++++++ 6 files changed, 234 insertions(+), 116 deletions(-) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv deleted file mode 100644 index 21138cb..0000000 --- a/batman-adv-devel/files/etc/config/batman-adv +++ /dev/null @@ -1,20 +0,0 @@ - -config 'mesh' 'bat0' - #option 'aggregated_ogms' 1 - #option 'ap_isolation' 0 - #option 'bonding' 0 - #option 'fragmentation' 1 - #option 'gw_bandwidth' '10000/2000' - #option 'gw_mode' 'off' - #option 'gw_sel_class' 20 - #option 'log_level' 0 - #option 'orig_interval' 1000 - #option 'bridge_loop_avoidance' 1 - #option 'distributed_arp_table' 1 - #option 'multicast_mode' 1 - #option 'network_coding' 0 - #option 'hop_penalty' 30 - #option 'isolation_mark' '0x00000000/0x00000000' - -# yet another batX instance -# config 'mesh' 'bat5' diff --git a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv deleted file mode 100644 index f0c391f..0000000 --- a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. /lib/batman-adv/config.sh - -bat_load_module -config_load batman-adv - -case "$ACTION" in - add) - [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" - ;; -esac diff --git a/batman-adv-devel/files/etc/uci-defaults/99-migrate-batadv_hardif b/batman-adv-devel/files/etc/uci-defaults/99-migrate-batadv_hardif new file mode 100755 index 0000000..156a33f --- /dev/null +++ b/batman-adv-devel/files/etc/uci-defaults/99-migrate-batadv_hardif @@ -0,0 +1,97 @@ +#!/bin/sh + +# This UCI-Defaults script will split the batadv proto network interfaces +# in batadv_hardif and batadv proto. The configuration options from +# /etc/config/batman-adv will be moved to the latter. + +. /lib/functions.sh + +proto_batadv_to_batadv_hardif() { + local section="$1" + local proto + local mesh + local routing_algo + + config_get proto "${section}" proto + config_get mesh "${section}" mesh + config_get routing_algo "${section}" routing_algo + + if [ -z "$mesh" -o "${proto}" != "batadv" ]; then + continue + fi + + uci set network."${section}".proto="batadv_hardif" + uci rename network."${section}".mesh="master" + uci delete network."${section}".routing_algo + + # create new section or adjust existing one + uci set network."${mesh}"=interface + uci set network."${mesh}".proto=batadv + [ -n "${routing_algo}" ] && uci set network."${mesh}".routing_algo="${routing_algo}" +} + +mv_batadv_config_section() { + local section="$1" + local aggregated_ogms + local ap_isolation + local bonding + local bridge_loop_avoidance + local distributed_arp_table + local fragmentation + local gw_bandwidth + local gw_mode + local gw_sel_class + local hop_penalty + local isolation_mark + local log_level + local multicast_mode + local network_coding + local orig_interval + + config_get aggregated_ogms "${section}" aggregated_ogms + config_get ap_isolation "${section}" ap_isolation + config_get bonding "${section}" bonding + config_get bridge_loop_avoidance "${section}" bridge_loop_avoidance + config_get distributed_arp_table "${section}" distributed_arp_table + config_get fragmentation "${section}" fragmentation + config_get gw_bandwidth "${section}" gw_bandwidth + config_get gw_mode "${section}" gw_mode + config_get gw_sel_class "${section}" gw_sel_class + config_get hop_penalty "${section}" hop_penalty + config_get isolation_mark "${section}" isolation_mark + config_get log_level "${section}" log_level + config_get multicast_mode "${section}" multicast_mode + config_get network_coding "${section}" network_coding + config_get orig_interval "${section}" orig_interval + + # update section in case it exists + [ -n "${aggregated_ogms}" ] && uci set network."${section}".aggregated_ogms="${aggregated_ogms}" + [ -n "${ap_isolation}" ] && uci set network."${section}".ap_isolation="${ap_isolation}" + [ -n "${bonding}" ] && uci set network."${section}".bonding="${bonding}" + [ -n "${bridge_loop_avoidance}" ] && uci set network."${section}".bridge_loop_avoidance="${bridge_loop_avoidance}" + [ -n "${distributed_arp_table}" ] && uci set network."${section}".distributed_arp_table="${distributed_arp_table}" + [ -n "${fragmentation}" ] && uci set network."${section}".fragmentation="${fragmentation}" + [ -n "${gw_bandwidth}" ] && uci set network."${section}".gw_bandwidth="${gw_bandwidth}" + [ -n "${gw_mode}" ] && uci set network."${section}".gw_mode="${gw_mode}" + [ -n "${gw_sel_class}" ] && uci set network."${section}".gw_sel_class="${gw_sel_class}" + [ -n "${hop_penalty}" ] && uci set network."${section}".hop_penalty="${hop_penalty}" + [ -n "${isolation_mark}" ] && uci set network."${section}".isolation_mark="${isolation_mark}" + [ -n "${log_level}" ] && uci set network."${section}".log_level="${log_level}" + [ -n "${multicast_mode}" ] && uci set network."${section}".multicast_mode="${multicast_mode}" + [ -n "${network_coding}" ] && uci set network."${section}".network_coding="${network_coding}" + [ -n "${orig_interval}" ] && uci set network."${section}".orig_interval="${orig_interval}" +} + +if [ -f /etc/config/batman-adv ]; then + config_load network + config_foreach proto_batadv_to_batadv_hardif 'interface' + uci commit network + + config_load batman-adv + config_foreach mv_batadv_config_section 'mesh' + uci commit batman-adv + + rm -f /etc/config/batman-adv +fi + +exit 0 diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh deleted file mode 100644 index 952f93e..0000000 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -bat_load_module() -{ - [ -d "/sys/module/batman_adv/" ] && return - - . /lib/functions.sh - load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv* -} - -bat_config() -{ - local mesh="$1" - local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation - local gw_bandwidth gw_mode gw_sel_class isolation_mark hop_penalty multicast_mode network_coding log_level - local orig_interval - - config_get aggregated_ogms "$mesh" aggregated_ogms - config_get ap_isolation "$mesh" ap_isolation - config_get bonding "$mesh" bonding - config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance - config_get distributed_arp_table "$mesh" distributed_arp_table - config_get fragmentation "$mesh" fragmentation - config_get gw_bandwidth "$mesh" gw_bandwidth - config_get gw_mode "$mesh" gw_mode - config_get gw_sel_class "$mesh" gw_sel_class - config_get hop_penalty "$mesh" hop_penalty - config_get isolation_mark "$mesh" isolation_mark - config_get multicast_mode "$mesh" multicast_mode - config_get network_coding "$mesh" network_coding - config_get log_level "$mesh" log_level - config_get orig_interval "$mesh" orig_interval - - [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 - - [ -n "$aggregated_ogms" ] && batctl -m "$mesh" aggregation "$aggregated_ogms" - [ -n "$ap_isolation" ] && batctl -m "$mesh" ap_isolation "$ap_isolation" - [ -n "$bonding" ] && batctl -m "$mesh" bonding "$bonding" - [ -n "$bridge_loop_avoidance" ] && batctl -m "$mesh" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&- - [ -n "$distributed_arp_table" ] && batctl -m "$mesh" distributed_arp_table "$distributed_arp_table" 2>&- - [ -n "$fragmentation" ] && batctl -m "$mesh" fragmentation "$fragmentation" - - case "$gw_mode" in - server) - if [ -n "$gw_bandwidth" ]; then - batctl -m "$mesh" gw_mode "server" "$gw_bandwidth" - else - batctl -m "$mesh" gw_mode "server" - fi - ;; - client) - if [ -n "$gw_sel_class" ]; then - batctl -m "$mesh" gw_mode "client" "$gw_sel_class" - else - batctl -m "$mesh" gw_mode "client" - fi - ;; - *) - batctl -m "$mesh" gw_mode "off" - ;; - esac - - [ -n "$hop_penalty" ] && batctl -m "$mesh" hop_penalty "$hop_penalty" - [ -n "$isolation_mark" ] && batctl -m "$mesh" isolation_mark "$isolation_mark" - [ -n "$multicast_mode" ] && batctl -m "$mesh" multicast_mode "$multicast_mode" 2>&- - [ -n "$network_coding" ] && batctl -m "$mesh" network_coding "$network_coding" 2>&- - [ -n "$log_level" ] && batctl -m "$mesh" loglevel "$log_level" 2>&- - [ -n "$orig_interval" ] && batctl -m "$mesh" orig_interval "$orig_interval" -} diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh index 2233091..eb8153c 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -1,37 +1,119 @@ #!/bin/sh -. /lib/functions.sh -. ../netifd-proto.sh -init_proto "$@" +[ -n "$INCLUDE_ONLY" ] || { + . /lib/functions.sh + . ../netifd-proto.sh + init_proto "$@" +} proto_batadv_init_config() { - proto_config_add_string "mesh" - proto_config_add_string "routing_algo" + no_device=1 + available=1 + + proto_config_add_boolean 'aggregated_ogms:bool' + proto_config_add_boolean 'ap_isolation:bool' + proto_config_add_boolean 'bonding:bool' + proto_config_add_boolean 'bridge_loop_avoidance:bool' + proto_config_add_boolean 'distributed_arp_table:bool' + proto_config_add_boolean 'fragmentation:bool' + proto_config_add_string 'gw_bandwidth' + proto_config_add_string 'gw_mode' + proto_config_add_int 'gw_sel_class' + proto_config_add_int 'hop_penalty' + proto_config_add_string 'isolation_mark' + proto_config_add_string 'log_level' + proto_config_add_boolean 'multicast_mode:bool' + proto_config_add_boolean 'network_coding:bool' + proto_config_add_int 'orig_interval' + proto_config_add_string 'routing_algo' } proto_batadv_setup() { local config="$1" - local iface="$2" + local iface="$config" + + local aggregated_ogms + local ap_isolation + local bonding + local bridge_loop_avoidance + local distributed_arp_table + local fragmentation + local gw_bandwidth + local gw_mode + local gw_sel_class + local hop_penalty + local isolation_mark + local log_level + local multicast_mode + local network_coding + local orig_interval + local routing_algo + + json_get_vars aggregated_ogms + json_get_vars ap_isolation + json_get_vars bonding + json_get_vars bridge_loop_avoidance + json_get_vars distributed_arp_table + json_get_vars fragmentation + json_get_vars gw_bandwidth + json_get_vars gw_mode + json_get_vars gw_sel_class + json_get_vars hop_penalty + json_get_vars isolation_mark + json_get_vars log_level + json_get_vars multicast_mode + json_get_vars network_coding + json_get_vars orig_interval + json_get_vars routing_algo - local mesh routing_algo - json_get_vars mesh routing_algo + set_default routing_algo 'BATMAN_IV' - [ -n "$routing_algo" ] || routing_algo="BATMAN_IV" batctl routing_algo "$routing_algo" + batctl -m "$iface" interface create + + [ -n "$aggregated_ogms" ] && batctl -m "$iface" aggregation "$aggregated_ogms" + [ -n "$ap_isolation" ] && batctl -m "$iface" ap_isolation "$ap_isolation" + [ -n "$bonding" ] && batctl -m "$iface" bonding "$bonding" + [ -n "$bridge_loop_avoidance" ] && batctl -m "$iface" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&- + [ -n "$distributed_arp_table" ] && batctl -m "$iface" distributed_arp_table "$distributed_arp_table" 2>&- + [ -n "$fragmentation" ] && batctl -m "$iface" fragmentation "$fragmentation" + + case "$gw_mode" in + server) + if [ -n "$gw_bandwidth" ]; then + batctl -m "$iface" gw_mode "server" "$gw_bandwidth" + else + batctl -m "$iface" gw_mode "server" + fi + ;; + client) + if [ -n "$gw_sel_class" ]; then + batctl -m "$iface" gw_mode "client" "$gw_sel_class" + else + batctl -m "$iface" gw_mode "client" + fi + ;; + *) + batctl -m "$iface" gw_mode "off" + ;; + esac + + [ -n "$hop_penalty" ] && batctl -m "$iface" hop_penalty "$hop_penalty" + [ -n "$isolation_mark" ] && batctl -m "$iface" isolation_mark "$isolation_mark" + [ -n "$multicast_mode" ] && batctl -m "$iface" multicast_mode "$multicast_mode" 2>&- + [ -n "$network_coding" ] && batctl -m "$iface" network_coding "$network_coding" 2>&- + [ -n "$log_level" ] && batctl -m "$iface" loglevel "$log_level" 2>&- + [ -n "$orig_interval" ] && batctl -m "$iface" orig_interval "$orig_interval" - batctl -m "$mesh" interface add "$iface" proto_init_update "$iface" 1 proto_send_update "$config" } proto_batadv_teardown() { local config="$1" - local iface="$2" - - local mesh - json_get_vars mesh + local iface="$config" - batctl -m "$mesh" interface del "$iface" || true + batctl -m "$iface" interface destroy } add_protocol batadv diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh new file mode 100755 index 0000000..9283d2b --- /dev/null +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +[ -n "$INCLUDE_ONLY" ] || { + . /lib/functions.sh + . ../netifd-proto.sh + init_proto "$@" +} + +proto_batadv_hardif_init_config() { + proto_config_add_string "master" +} + +proto_batadv_hardif_setup() { + local config="$1" + local iface="$2" + + local master + + json_get_vars master + + ( proto_add_host_dependency "$config" '' "$master" ) + + batctl -m "$master" interface -M add "$iface" + + proto_init_update "$iface" 1 + proto_send_update "$config" +} + +proto_batadv_hardif_teardown() { + local config="$1" + local iface="$2" + + local master + + json_get_vars master + + batctl -m "$master" interface -M del "$iface" || true +} + +add_protocol batadv_hardif

1 0

[openwrt-feed-devel] master: batman-adv-devel: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls (501db53)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 501db53fc606e87b99ea653026dd511752ceca64 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 9 12:31:45 2019 +0100 batman-adv-devel: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls The ip_mc_check_igmp and ipv6_mc_check_mld functions don't use the skb_trimmed parameter anymore. batman-adv was restructured to use the new kernel interface but the remaining parts of OpenWrt are still using the old function signature. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 501db53fc606e87b99ea653026dd511752ceca64 batman-adv-devel/src/compat-hacks.h | 38 +++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index cfeb348..d8de483 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -48,9 +48,43 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, unsigned int transport_len, __sum16(*skb_chkf)(struct sk_buff *skb)); -int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed); +int ip_mc_check_igmp(struct sk_buff *skb); +int ipv6_mc_check_mld(struct sk_buff *skb); -int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed); +#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) + +#include_next <linux/igmp.h> +#include_next <net/addrconf.h> + +static inline int batadv_ipv6_mc_check_mld1(struct sk_buff *skb) +{ + return ipv6_mc_check_mld(skb, NULL); +} + +static inline int batadv_ipv6_mc_check_mld2(struct sk_buff *skb, + struct sk_buff **skb_trimmed) +{ + return ipv6_mc_check_mld(skb, skb_trimmed); +} + +#define ipv6_mc_check_mld_get(_1, _2, ipv6_mc_check_mld_name, ...) ipv6_mc_check_mld_name +#define ipv6_mc_check_mld(...) \ + ipv6_mc_check_mld_get(__VA_ARGS__, batadv_ipv6_mc_check_mld2, batadv_ipv6_mc_check_mld1)(__VA_ARGS__) + +static inline int batadv_ip_mc_check_igmp1(struct sk_buff *skb) +{ + return ip_mc_check_igmp(skb, NULL); +} + +static inline int batadv_ip_mc_check_igmp2(struct sk_buff *skb, + struct sk_buff **skb_trimmed) +{ + return ip_mc_check_igmp(skb, skb_trimmed); +} + +#define ip_mc_check_igmp_get(_1, _2, ip_mc_check_igmp_name, ...) ip_mc_check_igmp_name +#define ip_mc_check_igmp(...) \ + ip_mc_check_igmp_get(__VA_ARGS__, batadv_ip_mc_check_igmp2, batadv_ip_mc_check_igmp1)(__VA_ARGS__) #endif /* < KERNEL_VERSION(4, 2, 0) */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2019