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 v2] batman-adv: enable B.A.T.M.A.N. V compilation by default
by Marek Lindner 14 May '18

14 May '18

Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Antonio Quartulli <a(a)unstable.cc> --- v2: * add relevant changes to README.external.rst & gen-compat-autoconf.sh Makefile | 2 +- README.external.rst | 2 +- gen-compat-autoconf.sh | 2 +- net/batman-adv/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index de607ad9..ea995216 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ export CONFIG_BATMAN_ADV_NC=n # B.A.T.M.A.N. multicast optimizations: export CONFIG_BATMAN_ADV_MCAST=y # B.A.T.M.A.N. V routing algorithm (experimental): -export CONFIG_BATMAN_ADV_BATMAN_V=n +export CONFIG_BATMAN_ADV_BATMAN_V=y PWD:=$(shell pwd) BUILD_DIR=$(PWD)/build diff --git a/README.external.rst b/README.external.rst index a7694bbf..a6f14a03 100644 --- a/README.external.rst +++ b/README.external.rst @@ -49,7 +49,7 @@ module). Available options and their possible values are * ``CONFIG_BATMAN_ADV_DAT=[y*|n]`` (B.A.T.M.A.N. Distributed ARP Table) * ``CONFIG_BATMAN_ADV_MCAST=[y*|n]`` (B.A.T.M.A.N. multicast optimizations) * ``CONFIG_BATMAN_ADV_NC=[y|n*]`` (B.A.T.M.A.N. Network Coding) - * ``CONFIG_BATMAN_ADV_BATMAN_V=[y|n*]`` (B.A.T.M.A.N. V routing algorithm) + * ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm) e.g., debugging can be enabled by:: diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 071b6ccf..5dcd875d 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -58,7 +58,7 @@ gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_MCAST' ${CONFIG_BATMAN_ADV_MCAST:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_NC' ${CONFIG_BATMAN_ADV_NC:="n"} >> "${TMP}" -gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="n"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}" # only regenerate compat-autoconf.h when config was changed diff "${TMP}" "${TARGET}" > /dev/null 2>&1 || cp "${TMP}" "${TARGET}" diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index bee034a9..de8034d8 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -35,7 +35,7 @@ config BATMAN_ADV config BATMAN_ADV_BATMAN_V bool "B.A.T.M.A.N. V protocol (experimental)" depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y) - default n + default y help This option enables the B.A.T.M.A.N. V protocol, the successor of the currently used B.A.T.M.A.N. IV protocol. The main -- 2.17.0

2 1

[B.A.T.M.A.N.] [PATCH v2] batman-adv: disable ethtool link speed detection when auto negotiation off
by Marek Lindner 14 May '18

14 May '18

Virtual interface drivers such as tun / tap interfaces, VLAN, etc tend to initialize the interface throughput with some value for the sake of having a throughput number to export via ethtool. This exported throughput leaves batman-adv to conclude the interface throughput is genuine (reflecting reality), thus no measurements are necessary. Based on the observation that those interface types also tend to set the link auto-negotiation to 'off', batman-adv shall check this setting to differentiate between genuine link throughput information and placeholders installed by virtual interfaces. The "default throughput" setting exported via sysfs still allows to configure the batman-adv throughput for the interface, thus disabling the measurements. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Antonio Quartulli <a(a)unstable.cc> --- v2: * added ethtool compat code for Linux < 4.6 * additional explanation text in the commit msg & code compat-include/linux/ethtool.h | 2 ++ net/batman-adv/bat_v_elp.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h index df9844d9..caa70071 100644 --- a/compat-include/linux/ethtool.h +++ b/compat-include/linux/ethtool.h @@ -33,6 +33,7 @@ struct batadv_ethtool_link_ksettings { struct { __u32 speed; __u8 duplex; + __u8 autoneg; } base; }; @@ -53,6 +54,7 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, return ret; link_ksettings->base.duplex = cmd.duplex; + link_ksettings->base.autoneg = cmd.autoneg; link_ksettings->base.speed = ethtool_cmd_speed(&cmd); return 0; diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 28687493..71c20c1d 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -127,7 +127,20 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) rtnl_lock(); ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); - if (ret == 0) { + + /* Virtual interface drivers such as tun / tap interfaces, VLAN, etc + * tend to initialize the interface throughput with some value for the + * sake of having a throughput number to export via ethtool. This + * exported throughput leaves batman-adv to conclude the interface + * throughput is genuine (reflecting reality), thus no measurements + * are necessary. + * + * Based on the observation that those interface types also tend to set + * the link auto-negotiation to 'off', batman-adv shall check this + * setting to differentiate between genuine link throughput information + * and placeholders installed by virtual interfaces. + */ + if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) { /* link characteristics might change over time */ if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; -- 2.17.0

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: disable ethtool link speed detection when auto negotiation off
by Marek Lindner 13 May '18

13 May '18

If link auto-negotiation is disabled the exported link speed can not be relied on. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- net/batman-adv/bat_v_elp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 28687493..fd6fe847 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -127,7 +127,11 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) rtnl_lock(); ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); - if (ret == 0) { + + /* If link auto-negotiation is disabled the exported link speed can + * not be relied on. + */ + if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) { /* link characteristics might change over time */ if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; -- 2.17.0

3 5

[B.A.T.M.A.N.] [PATCH] batman-adv: enable B.A.T.M.A.N. V compilation by default
by Marek Lindner 13 May '18

13 May '18

Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- Makefile | 2 +- net/batman-adv/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index de607ad9..ea995216 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ export CONFIG_BATMAN_ADV_NC=n # B.A.T.M.A.N. multicast optimizations: export CONFIG_BATMAN_ADV_MCAST=y # B.A.T.M.A.N. V routing algorithm (experimental): -export CONFIG_BATMAN_ADV_BATMAN_V=n +export CONFIG_BATMAN_ADV_BATMAN_V=y PWD:=$(shell pwd) BUILD_DIR=$(PWD)/build diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index bee034a9..de8034d8 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -35,7 +35,7 @@ config BATMAN_ADV config BATMAN_ADV_BATMAN_V bool "B.A.T.M.A.N. V protocol (experimental)" depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y) - default n + default y help This option enables the B.A.T.M.A.N. V protocol, the successor of the currently used B.A.T.M.A.N. IV protocol. The main -- 2.17.0

3 2

[B.A.T.M.A.N.] [PATCH v3 0/2] batman-adv: DHCP snooping for DAT
by Linus Lüssing 12 May '18

12 May '18

Finally, after some more discussions, observations and better overall understanding of the issue we were able to find a successful strategy for ARP reduction. The result is an additional patch which introduces a generic "noflood mark" which for ARP Requests means a prevention of the DAT broadcast fallback. At Freifunk Darmstadt, an 800 nodes setup, these two patches were tested for a month with no issues so far but a significant amount of ARP Request reduction. More details can be found here: https://www.open-mesh.org/projects/batman-adv/wiki/DAT_DHCP_Snooping Regards, Linus

3 4

[B.A.T.M.A.N.] [PATCH] batman-adv: don't implement skb_postpush_rcsum() for linux >=4.4.47
by Antonio Quartulli 11 May '18

11 May '18

skb_postpush_rcsum() has been implemented in 4.4.47 therefore our compat code has to be changed to prevent this function to be implemented when using those kernels. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> --- compat-include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index 6f739464..371bb561 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.h @@ -77,7 +77,7 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, #endif /* < KERNEL_VERSION(4, 2, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 47) static inline void skb_postpush_rcsum(struct sk_buff *skb, const void *start, unsigned int len) -- 2.17.0

2 1

[B.A.T.M.A.N.] [maint v3] batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs
by Marek Lindner 11 May '18

11 May '18

A translation table TVLV changset sent with an OGM consists of a number of headers (one per VLAN) plus the changeset itself (addition and/or deletion of entries). The per-VLAN headers are used by OGM recipients for consistency checks. Said consistency check might determine that a full translation table request is needed to restore consistency. If the TT sender adds per-VLAN headers of empty VLANs into the OGM, recipients are led to believe to have reached an inconsistent state and thus request a full table update. The full table does not contain empty VLANs (due to missing entries) the cycle restarts when the next OGM is issued. Consequently, when the translation table TVLV headers are composed, empty VLANs are to be excluded. Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- v3: * rebased on top of maint v2: * moved changes into batadv_tt_prepare_tvlv_local_data() * updated 'fixes' commit id net/batman-adv/translation-table.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 23f9c212..39865513 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -931,15 +931,20 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, struct batadv_tvlv_tt_vlan_data *tt_vlan; struct batadv_softif_vlan *vlan; u16 num_vlan = 0; - u16 num_entries = 0; + u16 vlan_entries = 0; + u16 total_entries = 0; u16 tvlv_len; u8 *tt_change_ptr; int change_offset; spin_lock_bh(&bat_priv->softif_vlan_list_lock); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + vlan_entries = atomic_read(&vlan->tt.num_entries); + if (vlan_entries < 1) + continue; + num_vlan++; - num_entries += atomic_read(&vlan->tt.num_entries); + total_entries += vlan_entries; } change_offset = sizeof(**tt_data); @@ -947,7 +952,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, /* if tt_len is negative, allocate the space needed by the full table */ if (*tt_len < 0) - *tt_len = batadv_tt_len(num_entries); + *tt_len = batadv_tt_len(total_entries); tvlv_len = *tt_len; tvlv_len += change_offset; @@ -964,6 +969,10 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + vlan_entries = atomic_read(&vlan->tt.num_entries); + if (vlan_entries < 1) + continue; + tt_vlan->vid = htons(vlan->vid); tt_vlan->crc = htonl(vlan->tt.crc); -- 2.17.0

2 1

[B.A.T.M.A.N.] sanity check please
by dan 11 May '18

11 May '18

I'm trying to see how many bits I can push across batman-adv. My test setup is 1 Proxmox host with 3 ubuntu 16.04 VM's. VM1 bat0 (ens19) 192.168.5.1/24 VM2 bat0 (ens19,ens20) 192.168.5.2/24 VM3 bat0 (ens20) 192.168.5.3/24 So VM1 and VM3 are on different 'physical' network segments. I'm running iperf3 with VM1 the server and VM3 the client VM1 iperf3 -s VM3 iperf3 -c 192.168.5.1 -b 10000M -t 60 -P 1 output is 1.75Gbits -P 99 output is 831Mbps -P 99 *BUT* hitting the 'native' LAN address of 192.168.1.1 (each VM has an ens18 on this network) 4.8Gbps -P 99 from VM2 ~1.67Gbps So I am definitely putting batman-adv in the way and it's having a clear impact of throughput. I've also double checked that killing VM2 breaks the connection. Based on the number of retries and how they compound with more parallel streams, and that the only substantial CPU used here is iperf3 in the VM and virtio on the host, the virtio nic is the bottleneck. Hardware network should likely perform better. Ultimate goal here is to basically replicate the concept of SPB but with a small batman-adv node instead of a switch to replace and OSPF/MPLS/VPLS wISP network. I am running bat0 at mtu 1400 so I wouldn't have to switch out from linux bridges in prox but I don't expect that to have a substantial effect, maybe a couple % difference. Has anyone else performed similar tests on hardware/wired connections? There would be point-to-point half-duplex and full duplex wireless links but no multipoint 'wifi' style links. I've also added an 8021q vlan 8 on top of bat0 (ie bat0.8, tagged) and batman-adv seems quite happy to transport this VLAN. VM2 does NOT have the vlan config on bat0. I'm pretty happy with the results here, hoping I'm not missing some obvious "In a VM you get abnormally high performance and low CPU" situation. Seeing >1G is great, my maximum links have 1G ports so that's the bar. I'm hoping to compare notes with someone before spending the cash on the hardware to do a field test. That platform would likely be the PCEngines APU2 and/or soekris or other hardened x86 device with 3+ ethernet ports.

2 2

[B.A.T.M.A.N.] [RFC PATCH] batman-adv: mitigate issue when empty vlan is received
by Leonardo Mörlein 11 May '18

11 May '18

This patch is not a fix for the issue itself, but a fix for the other nodes, which are also influenced by the issue. - Some (affected) nodes send TT announcements for an empty vlan (for now only seen with vlan_id = 0). - This behaviour is a bug! Batman-adv nodes must not send TT announcements for empty vlans. - The receiving batman-adv can not handle incoming TT announcements with empty vlans. (The crc check routine batadv_tt_global_check_crc() fails.) - As the receiving node thinks, the crc is broken, it does a full table request then. - The announcing node sends a TT full table to the receiving node then, which also contains the empty vlan, so *batadv_tt_global_check_crc()* fails again on the receiver side. - This causes a lot of unneeded TT traffic. In Freifunk Hannover we decreased the amount of from ~20kpp/s to ~4kpp/s on our supernodes. We have ~800 nodes, which are connected via vpn to one of six supernodes. Those supernodes are connected with each other in a fully connected mesh. Signed-off-by: Leonardo Mörlein <me(a)irrelefant.net> --- net/batman-adv/translation-table.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0225616d..d2a843fd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2996,8 +2996,21 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, vlan = batadv_orig_node_vlan_get(orig_node, ntohs(tt_vlan_tmp->vid)); - if (!vlan) - return false; + if (!vlan) { + /* Due to a bug, some originators send TT + * announcements for empty vlans. As the receiving + * nodes will ignore those empty vlans (they do not + * add a batadv_orig_node_vlan into the transglobal + * for the originating node), crc check will fail + * here. To circumvent this issue, we skip the + * verification for the vlan if the crc is + * equal to 0x00000000. + */ + if (tt_vlan_tmp->crc == 0x00000000) + continue; + else + return false; + } crc = vlan->tt.crc; batadv_orig_node_vlan_put(vlan); -- 2.17.0

6 15

[B.A.T.M.A.N.] [PATCH v3 maint] batman-adv: Fix TT sync flags for intermediate TT responses
by Linus Lüssing 11 May '18

11 May '18

The previous TT sync fix so far only fixed TT responses issued by the target node directly. So far, TT responses issued by intermediate nodes still lead to the wrong flags being added, leading to CRC mismatches. This behaviour was observed at Freifunk Hannover in a 800 nodes setup where a considerable amount of nodes were still infected with 'WI' TT flags even with (most) nodes having the previous TT sync fix applied. I was able to reproduce the issue with intermediate TT responses in a four node test setup and this patch fixes this issue by ensuring to use the per originator instead of the summarized, OR'd ones. Fixes: fa614fd04692 ("batman-adv: fix tt_global_entries flags update") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changes v3: - renamed batadv_tt_{local,global}_get_flags() back to batadv_tt_{global,local}_valid as Antonio and I could not come up with a generic naming suiting both purposes - renamed flags_cb back to valid_cb - undid the rename from orig_node to orig and just used a newline - moved the valid_cb not NULL check to the top of batadv_tt_tvlv_generate() as it is unclear what to do about the flags otherwise (technically this does not change behaviour as so far valid_cb is never and has never been NULL) Changes v2: - repurpose current valid_cb callback to get the flags -> saves us a second, duplicate orig-entry hash table lookup -> avoids the "guessing" of TT local vs. TT global / cb_data type --- net/batman-adv/translation-table.c | 60 +++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 78993dd7..5176db25 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1538,6 +1538,7 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, * handled by a given originator * @entry: the TT global entry to check * @orig_node: the originator to search in the list + * @flags: a pointer to store TT flags for the given @orig_node and @entry to * * find out if an orig_node is already in the list of a tt_global_entry. * @@ -1545,7 +1546,8 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, */ static bool batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, - const struct batadv_orig_node *orig_node) + const struct batadv_orig_node *orig_node, + u8 *flags) { struct batadv_tt_orig_list_entry *orig_entry; bool found = false; @@ -1553,6 +1555,10 @@ batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, orig_entry = batadv_tt_global_orig_entry_find(entry, orig_node); if (orig_entry) { found = true; + + if (flags) + *flags = orig_entry->flags; + batadv_tt_orig_list_entry_put(orig_entry); } @@ -1731,7 +1737,7 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, if (!(common->flags & BATADV_TT_CLIENT_TEMP)) goto out; if (batadv_tt_global_entry_has_orig(tt_global_entry, - orig_node)) + orig_node, NULL)) goto out_remove; batadv_tt_global_del_orig_list(tt_global_entry); goto add_orig_entry; @@ -2880,23 +2886,46 @@ batadv_tt_req_node_new(struct batadv_priv *bat_priv, } /** - * batadv_tt_local_valid() - verify that given tt entry is a valid one + * batadv_tt_local_valid() - verify local tt entry and get flags * @entry_ptr: to be checked local tt entry * @data_ptr: not used but definition required to satisfy the callback prototype + * @flags: a pointer to store TT flags for this client to + * + * Checks the validity of the given local TT entry. If it is, then the provided + * flags pointer is updated. * * Return: true if the entry is a valid, false otherwise. */ -static bool batadv_tt_local_valid(const void *entry_ptr, const void *data_ptr) +static bool batadv_tt_local_valid(const void *entry_ptr, + const void *data_ptr, + u8 *flags) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; if (tt_common_entry->flags & BATADV_TT_CLIENT_NEW) return false; + + if (flags) + *flags = tt_common_entry->flags; + return true; } +/** + * batadv_tt_global_valid() - verify global tt entry and get flags + * @entry_ptr: to be checked global tt entry + * @data_ptr: an orig_node object (may be NULL) + * @flags: a pointer to store TT flags to + * + * Checks the validity of the given global TT entry. If it is, then the provided + * flags pointer is updated either with the common (summed) TT flags if data_ptr + * is NULL or the specific, per originator TT flags otherwise. + * + * Return: true if the entry is a valid, false otherwise. + */ static bool batadv_tt_global_valid(const void *entry_ptr, - const void *data_ptr) + const void *data_ptr, + u8 *flags) { const struct batadv_tt_common_entry *tt_common_entry = entry_ptr; const struct batadv_tt_global_entry *tt_global_entry; @@ -2910,7 +2939,8 @@ static bool batadv_tt_global_valid(const void *entry_ptr, struct batadv_tt_global_entry, common); - return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node); + return batadv_tt_global_entry_has_orig(tt_global_entry, orig_node, + flags); } /** @@ -2920,25 +2950,34 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * @hash: hash table containing the tt entries * @tt_len: expected tvlv tt data buffer length in number of bytes * @tvlv_buff: pointer to the buffer to fill with the TT data - * @valid_cb: function to filter tt change entries + * @valid_cb: function to filter tt change entries and to return TT flags * @cb_data: data passed to the filter function as argument + * + * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb + * is not provided then this becomes a no-op. */ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, struct batadv_hashtable *hash, void *tvlv_buff, u16 tt_len, bool (*valid_cb)(const void *, - const void *), + const void *, + u8 *flags), void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; struct hlist_head *head; u16 tt_tot, tt_num_entries = 0; + u8 flags; + bool ret; u32 i; tt_tot = batadv_tt_entries(tt_len); tt_change = (struct batadv_tvlv_tt_change *)tvlv_buff; + if (!valid_cb) + return; + rcu_read_lock(); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -2948,11 +2987,12 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, if (tt_tot == tt_num_entries) break; - if ((valid_cb) && (!valid_cb(tt_common_entry, cb_data))) + ret = valid_cb(tt_common_entry, cb_data, &flags); + if (!ret) continue; ether_addr_copy(tt_change->addr, tt_common_entry->addr); - tt_change->flags = tt_common_entry->flags; + tt_change->flags = flags; tt_change->vid = htons(tt_common_entry->vid); memset(tt_change->reserved, 0, sizeof(tt_change->reserved)); -- 2.11.0

2 2

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