commits

commits@lists.open-mesh.org

1 participants
12399 discussions

[batman-adv] master: batman-adv: mcast: add MRD + routable IPv4 multicast with bridges support (e65e26c6)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit e65e26c67ffc9dd99eccdb08b3bd064bc7cdbd17 Author: Linus L��ssing <linus.luessing(a)c0d3.blue> Date: Sat May 15 17:22:08 2021 +0200 batman-adv: mcast: add MRD + routable IPv4 multicast with bridges support This adds support for routable IPv4 multicast addresses (224.0.0.0/4, excluding 224.0.0.0/24) in bridged setups. This utilizes the Multicast Router Discovery (MRD, RFC4286) support in the Linux bridge. batman-adv will now query the Linux bridge for IPv4 multicast routers, which the bridge has previously learned about via MRD. This allows us to then safely send routable IPv4 multicast packets in bridged setups to multicast listeners and multicast routers only. Before we had to flood such packets to avoid potential multicast packet loss to IPv4 multicast routers, which we were not able to detect before. With the bridge MRD integration, we are now also able to perform more fine-grained detection of IPv6 multicast routers in bridged setups: Before we were "guessing" IPv6 multicast routers by looking up multicast listeners for the link-local All Routers multicast address (ff02::2), which every IPv6 multicast router is listening to. However this would also include more nodes than necessary: For instance nodes which are just a router for unicast, but not multicast would be included, too. Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e65e26c67ffc9dd99eccdb08b3bd064bc7cdbd17 compat-include/linux/if_bridge.h | 42 ++++++++++++++++++++++++++++++++++++++++ net/batman-adv/multicast.c | 41 +++++---------------------------------- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/compat-include/linux/if_bridge.h b/compat-include/linux/if_bridge.h index da00c8b0..dfc4a092 100644 --- a/compat-include/linux/if_bridge.h +++ b/compat-include/linux/if_bridge.h @@ -53,4 +53,46 @@ inline void __batadv_br_ip_list_check(void) #endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */ +#if LINUX_VERSION_IS_LESS(5, 14, 0) + +#include <net/addrconf.h> + +#if IS_ENABLED(CONFIG_IPV6) +static inline bool +br_multicast_has_router_adjacent(struct net_device *dev, int proto) +{ + struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list); + struct br_ip_list *br_ip_entry, *tmp; + int ret; + + if (proto != ETH_P_IPV6) + return true; + + ret = br_multicast_list_adjacent(dev, &bridge_mcast_list); + if (ret < 0) + return true; + + ret = false; + + list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) { + if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) && + ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) + ret = true; + + list_del(&br_ip_entry->list); + kfree(br_ip_entry); + } + + return ret; +} +#else +static inline bool +br_multicast_has_router_adjacent(struct net_device *dev, int proto) +{ + return true; +} +#endif + +#endif /* LINUX_VERSION_IS_LESS(5, 14, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ */ diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1d63c8cb..923e2197 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -193,53 +193,22 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get(struct batadv_priv *bat_priv, * BATADV_MCAST_WANT_NO_RTR6: No IPv6 multicast router is present * The former two OR'd: no multicast router is present */ -#if IS_ENABLED(CONFIG_IPV6) static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, struct net_device *bridge) { - struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list); struct net_device *dev = bat_priv->soft_iface; - struct br_ip_list *br_ip_entry, *tmp; - u8 flags = BATADV_MCAST_WANT_NO_RTR6; - int ret; + u8 flags = BATADV_NO_FLAGS; if (!bridge) return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6; - /* TODO: ask the bridge if a multicast router is present (the bridge - * is capable of performing proper RFC4286 multicast router - * discovery) instead of searching for a ff02::2 listener here - */ - ret = br_multicast_list_adjacent(dev, &bridge_mcast_list); - if (ret < 0) - return BATADV_NO_FLAGS; - - list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) { - /* the bridge snooping does not maintain IPv4 link-local - * addresses - therefore we won't find any IPv4 multicast router - * address here, only IPv6 ones - */ - if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) && - ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) - flags &= ~BATADV_MCAST_WANT_NO_RTR6; - - list_del(&br_ip_entry->list); - kfree(br_ip_entry); - } + if (!br_multicast_has_router_adjacent(dev, ETH_P_IP)) + flags |= BATADV_MCAST_WANT_NO_RTR4; + if (!br_multicast_has_router_adjacent(dev, ETH_P_IPV6)) + flags |= BATADV_MCAST_WANT_NO_RTR6; return flags; } -#else -static inline u8 -batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, - struct net_device *bridge) -{ - if (bridge) - return BATADV_NO_FLAGS; - else - return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6; -} -#endif /** * batadv_mcast_mla_rtr_flags_get() - get multicast router flags

1 0

[alfred] tag 'v2021.1' created
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/alfred New tag : v2021.1 Referencing: 4a6a129d6a636eaa8b16bb6e82f99cf0cdaa959d

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (f54a497)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit f54a497fc2de321ce9a21277b2b0d0ec0f19d581 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:57:26 2021 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- f54a497fc2de321ce9a21277b2b0d0ec0f19d581 CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 52817c9..73db3e1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,11 @@ .. SPDX-License-Identifier: GPL-2.0 +2021.1 (2021-05-18) +=================== + +* Allow to force of alfred startup when the interfaces don't work/exist (yet) +* coding style cleanups and refactoring + 2021.0 (2021-01-28) ===================

1 0

[alfred] master: alfred: Start new development cycle (71d57e8)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 71d57e8b0618b72ac1fc300377f561ed1d0ca6c4 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:57:48 2021 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 71d57e8b0618b72ac1fc300377f561ed1d0ca6c4 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index ac08253..69932f5 100644 --- a/alfred.h +++ b/alfred.h @@ -7,7 +7,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 3445bac..ac35c90 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -25,7 +25,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 5a6ef5b..dd2cde7 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -14,7 +14,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[batctl] tag 'v2021.1' created
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batctl New tag : v2021.1 Referencing: d1b9fb25208e720853c00bcb0334e5e04e7dbe6d

1 0

[batctl] master: batctl: Start new development cycle (f3df724)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit f3df7246349bc51622f0849e0b404ee0dc0b5b5f Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:56:01 2021 +0200 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- f3df7246349bc51622f0849e0b404ee0dc0b5b5f main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 6b4cd76..d1bea23 100644 --- a/main.h +++ b/main.h @@ -17,7 +17,7 @@ #include <netlink/netlink.h> #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2021.1" +#define SOURCE_VERSION "2021.2" #endif #define EXIT_NOSUCCESS 2

1 0

[batctl] maint's head updated: batctl: Update CHANGELOG for upcoming release (d48bd3d)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batctl Branch 'maint' now includes: 26c30ae batctl: Start new development cycle 8eff270 batctl: Update copyright years for 2021 9197b49 Merge branch 'maint' 5cfa894 batctl: Drop publication years from copyright info 0b81e8f batctl: Consume genl ACKs after setting reads b25e030 batctl: throughputmeter: Use global genl socket ff4f4de batctl: interface: List using shared genl socket 49355f2 batctl: Get meshif info using shared genl socket e2a3d35 batctl: Use common genl socket for netlink_query_common b1d342b batctl: routing_algo: List using shared genl socket 6aa8de3 batctl: originators: Get outgoing ifname from netlink 784009d batctl: neighbors: Get outgoing ifname from netlink 426e48c batctl: ping: Get outgoing ifname from netlink d12322e batctl: event: Get ifname from netlink message 7efb5de batctl: Realign netlink_policy array e23eb59 batctl: translocal: Simplify evaluation of last_seen 62af39f batctl: Avoid boolean in structures a92de0e batctl: netlink: Make netlink_query_common non-static ae1a3d3 batctl: genl_json: Add generic JSON interface 1b4c541 batctl: Don't mention log command in manpage 8005298 batctl: Introduce JSON_* command types 233f44e batctl: Reorder and clean up README 6ce86b6 batctl: netlink: Allow to use netlink_query_common hardif/vlan 57cc3c4 batctl: Introduce handler for JSON_* command types 3c5bf89 batctl: Add bla_backbone_json command 4b67ab0 batctl: Add bla_claim_json command 6f63d1f batctl: Add dat_cache_json command cce6890 batctl: Add gateways_json command 5df90bd batctl: Add hardif_json command 86b57e4 batctl: Add hardifs_json command 48c0811 batctl: Add mcast_flags_json command 8d6165c batctl: Add mcast_flags_json command ffce54a batctl: Add neighbors_json command 45eb2ac batctl: Add originators_json command 4a4c54e batctl: Add transtable_global_json command 20086d2 batctl: Add transtable_local_json command 35d8327 batctl: Add vlan_json command 1028b5e batctl: Drop additional '{' in JSON for loglevel d48bd3d batctl: Update CHANGELOG for upcoming release

1 0

[batctl] master: batctl: Update CHANGELOG for upcoming release (d48bd3d)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit d48bd3d96158270535b1763e97600bef353a3137 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:55:46 2021 +0200 batctl: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- d48bd3d96158270535b1763e97600bef353a3137 CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8a22839..92b6e39 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,11 @@ .. SPDX-License-Identifier: GPL-2.0 +2021.1 (2021-05-18) +=================== + +* add various commands to print generic netlink replies as JSON +* coding style cleanups and refactoring + 2021.0 (2021-01-28) ===================

1 0

[batman-adv] maint's head updated: batman-adv: Update compatible kernel version number (86dcfcfe)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: 105b247f batman-adv: Start new development cycle 35b2cd25 batman-adv: Update copyright years for 2021 069402af batman-adv: Avoid sizeof on flexible structure d7252022 batman-adv: Fix names for kernel-doc blocks 969cb132 batman-adv: remove redundant 'depends on NET' aaea6445 batman-adv: Drop publication years from copyright info 9fc9079c batman-adv: Use netif_rx_any_context(). a78a6c95 batman-adv: Fix order of kernel doc in batadv_priv a1d7220e batman-adv: Drop unused header preempt.h eae8d31b batman-adv: Fix misspelled "wont" 362da918 Merge branch 'maint' 6d67ca7f batman-adv: remove never implemented MODULE_SUPPORTED_DEVICE 007b4c4b batman-adv: convert ifmcaddr6 to RCU 5035cb7e batman-adv: Update CHANGELOG for upcoming release 86dcfcfe batman-adv: Update compatible kernel version number

1 0

[batman-adv] tag 'v2021.1' created
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv New tag : v2021.1 Referencing: 1bf0f3af0ea1125fed3209067b79e71354dc3872

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits