commits September 2020

commits@lists.open-mesh.org

1 participants
33 discussions

[batman-adv] master: batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh (4f50298c)
by postmaster＠open-mesh.org 15 Sep '20

15 Sep '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 4f50298c470705e084f5566e2319348549b03e70 Author: Linus L��ssing <linus.luessing(a)c0d3.blue> Date: Tue Sep 15 09:54:09 2020 +0200 batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh Scenario: * Multicast frame send from mesh to a BLA backbone (multiple nodes with their bat0 bridged together, with BLA enabled) Issue: * BLA backbone nodes receive the frame multiple times on bat0, once from mesh->bat0 and once from each backbone_gw from LAN For unicast, a node will send only to the best backbone gateway according to the TQ. However for multicast we currently cannot determine if multiple destination nodes share the same backbone if they don't share the same backbone with us. So we need to keep sending the unicasts to all backbone gateways and let the backbone gateways decide which one will forward the frame. We can use the CLAIM mechanism to make this decision. One catch: The batman-adv gateway feature for DHCP packets potentially sends multicast packets in the same batman-adv unicast header as the multicast optimizations code. And we are not allowed to drop those even if we did not claim the source address of the sender, as for such packets there is only this one multicast-in-unicast packet. How can we distinguish the two cases? The gateway feature uses a batman-adv unicast 4 address header. While the multicast-to-unicasts feature uses a simple, 3 address batman-adv unicast header. So let's use this to distinguish. Fixes: e32470167379 ("batman-adv: check incoming packet type for bla") Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4f50298c470705e084f5566e2319348549b03e70 net/batman-adv/bridge_loop_avoidance.c | 34 +++++++++++++++++++++++++--------- net/batman-adv/bridge_loop_avoidance.h | 4 ++-- net/batman-adv/soft-interface.c | 6 +++--- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 08419a2e..68715783 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1814,7 +1814,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb, * @bat_priv: the bat priv with all the soft interface information * @skb: the frame to be checked * @vid: the VLAN ID of the frame - * @is_bcast: the packet came in a broadcast packet type. + * @packet_type: the batman packet type this frame came in * * batadv_bla_rx avoidance checks if: * * we have to race for a claim @@ -1826,7 +1826,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb, * further process the skb. */ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid, bool is_bcast) + unsigned short vid, int packet_type) { struct batadv_bla_backbone_gw *backbone_gw; struct ethhdr *ethhdr; @@ -1848,9 +1848,24 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, goto handled; if (unlikely(atomic_read(&bat_priv->bla.num_requests))) - /* don't allow broadcasts while requests are in flight */ - if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) - goto handled; + /* don't allow multicast packets while requests are in flight */ + if (is_multicast_ether_addr(ethhdr->h_dest)) + /* Both broadcast flooding or multicast-via-unicasts + * delivery might send to multiple backbone gateways + * sharing the same LAN and therefore need to coordinate + * which backbone gateway forwards into the LAN, + * by claiming the payload source address. + * + * Broadcast flooding and multicast-via-unicasts + * delivery use the following two batman packet types. + * Note: explicitly exclude BATADV_UNICAST_4ADDR, + * as the DHCP gateway feature will send explicitly + * to only one BLA gateway, so the claiming process + * should be avoided there. + */ + if (packet_type == BATADV_BCAST || + packet_type == BATADV_UNICAST) + goto handled; ether_addr_copy(search_claim.addr, ethhdr->h_source); search_claim.vid = vid; @@ -1885,13 +1900,14 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, goto allow; } - /* if it is a broadcast ... */ - if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast) { + /* if it is a multicast ... */ + if (is_multicast_ether_addr(ethhdr->h_dest) && + (packet_type == BATADV_BCAST || packet_type == BATADV_UNICAST)) { /* ... drop it. the responsible gateway is in charge. * - * We need to check is_bcast because with the gateway + * We need to check packet type because with the gateway * feature, broadcasts (like DHCP requests) may be sent - * using a unicast packet type. + * using a unicast 4 address packet type. See comment above. */ goto handled; } else { diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 41edb2c4..a81c41b6 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -35,7 +35,7 @@ static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac) #ifdef CONFIG_BATMAN_ADV_BLA bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid, bool is_bcast); + unsigned short vid, int packet_type); bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned short vid); bool batadv_bla_is_backbone_gw(struct sk_buff *skb, @@ -66,7 +66,7 @@ bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, static inline bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned short vid, - bool is_bcast) + int packet_type) { return false; } diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 3d037b17..cdde943c 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -424,10 +424,10 @@ void batadv_interface_rx(struct net_device *soft_iface, struct vlan_ethhdr *vhdr; struct ethhdr *ethhdr; unsigned short vid; - bool is_bcast; + int packet_type; batadv_bcast_packet = (struct batadv_bcast_packet *)skb->data; - is_bcast = (batadv_bcast_packet->packet_type == BATADV_BCAST); + packet_type = batadv_bcast_packet->packet_type; skb_pull_rcsum(skb, hdr_size); skb_reset_mac_header(skb); @@ -470,7 +470,7 @@ void batadv_interface_rx(struct net_device *soft_iface, /* Let the bridge loop avoidance check the packet. If will * not handle it, we can safely push it up. */ - if (batadv_bla_rx(bat_priv, skb, vid, is_bcast)) + if (batadv_bla_rx(bat_priv, skb, vid, packet_type)) goto out; if (orig_node)

1 0

[linux-merge]linux integration; annotated tag, v5.9-rc5, created. v5.9-rc5
by postmaster＠open-mesh.org 14 Sep '20

14 Sep '20

The annotated tag, v5.9-rc5 has been created at 43b10d5a9053d0111bb547ea09abe5e102355d06 (tag) tagging 856deb866d16e29bd65952e0289066f6078af773 (commit) replaces v5.9-rc4 tagged by Linus Torvalds on Sun Sep 13 16:06:00 2020 -0700 - Shortlog ------------------------------------------------------------ Linux 5.9-rc5 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl9epdgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG9IMH/jHCRSbcsIXHuQHn xcRLlhrDHfXoBza7auHfPWx2+9DZsmaSJs/SEiTGNag0Bi7jBcWcwBpsep7iVG/+ WiftD5uOMhZigyuvfMFrt0mjr2Kr3wg5p58lwMBeBdm8iL5uKV8ehKsh05/Fral2 6hu3jP8L0PCZMpF+sZ7s2jlhfVUMmjA8VzXZCvgQtmhoraHiF3mzfkcSMxnHwBPO HLo+TDDm49u+LbVsJT7+cSTiWxuUJCbix9Q4PCTx/BGg4ezYsjc6v0BnYRaYtrrA 1uYiT6PVBEUkYYBHKQlD3N2KnUmbKx7dGUF4t+peTg5/JiocAJMNi1N9Qzvv7N6Q CqTiuio= =q+kJ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] maint: batman-adv: Add missing include for in_interrupt() (6ea99cd9)
by postmaster＠open-mesh.org 14 Sep '20

14 Sep '20

Repository : ssh://git@diktynna/batman-adv On branch : maint >--------------------------------------------------------------- commit 6ea99cd9c82b2d1bc4a313fe9006bcf5d956380e Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Sep 14 13:58:16 2020 +0200 batman-adv: Add missing include for in_interrupt() The fix for receiving (internally generated) bla packets outside the interrupt context introduced the usage of in_interrupt(). But this functionality is only defined in linux/preempt.h which was not included with the same patch. Fixes: 3747f81a1380 ("batman-adv: bla: use netif_rx_ni when not in interrupt context") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6ea99cd9c82b2d1bc4a313fe9006bcf5d956380e net/batman-adv/bridge_loop_avoidance.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index d8c5d317..08419a2e 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -25,6 +25,7 @@ #include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> +#include <linux/preempt.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h>

1 0

[batctl] maint's head updated: batctl: tcpdump: Fix endianness in ICMPv6 Echo Request/Reply parsing (e42f73d)
by postmaster＠open-mesh.org 14 Sep '20

14 Sep '20

Repository : ssh://git@diktynna/batctl Branch 'maint' now includes: e42f73d batctl: tcpdump: Fix endianness in ICMPv6 Echo Request/Reply parsing

1 0

[batctl] master: batctl: tcpdump: Fix endianness in ICMPv6 Echo Request/Reply parsing (e42f73d)
by postmaster＠open-mesh.org 14 Sep '20

14 Sep '20

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit e42f73d0d2a04edfbed1b9d0ad9fd57af9e90faf Author: Linus L��ssing <linus.luessing(a)c0d3.blue> Date: Sun Sep 13 23:30:19 2020 +0200 batctl: tcpdump: Fix endianness in ICMPv6 Echo Request/Reply parsing The ICMPv6 Echo Request/Reply sequence number and id as well as the IPv6 header length are two byte long fields and therefore might need a conversion on a little endian system. Otherwise the output will be broken on such a machine. Fixes: 35b37756f4a3 ("add IPv6 support to tcpdump parser") Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e42f73d0d2a04edfbed1b9d0ad9fd57af9e90faf tcpdump.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index db93681..b9edc20 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -589,13 +589,15 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, break; case ICMP6_ECHO_REQUEST: printf(" echo request, id: %d, seq: %d, length: %hu\n", - icmphdr->icmp6_id, icmphdr->icmp6_seq, - iphdr->ip6_plen); + ntohs(icmphdr->icmp6_id), + ntohs(icmphdr->icmp6_seq), + ntohs(iphdr->ip6_plen)); break; case ICMP6_ECHO_REPLY: printf(" echo reply, id: %d, seq: %d, length: %hu\n", - icmphdr->icmp6_id, icmphdr->icmp6_seq, - iphdr->ip6_plen); + ntohs(icmphdr->icmp6_id), + ntohs(icmphdr->icmp6_seq), + ntohs(iphdr->ip6_plen)); break; case ICMP6_TIME_EXCEEDED: printf(" time exceeded in-transit, length %zu\n",

1 0

[batctl] master: Merge branch 'maint' into master (2a13424)
by postmaster＠open-mesh.org 14 Sep '20

14 Sep '20

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 2a1342461c828f869c8a5ccf76c8320cba1168a6 Merge: 9cd28cb e42f73d Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Sep 14 08:23:51 2020 +0200 Merge branch 'maint' into master >--------------------------------------------------------------- 2a1342461c828f869c8a5ccf76c8320cba1168a6 tcpdump.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[doc] master: Merge branch 'backup-redmine/2020-09-12' into master (6a76618)
by postmaster＠open-mesh.org 12 Sep '20

12 Sep '20

Repository : ssh://git@diktynna/doc On branch : master >--------------------------------------------------------------- commit 6a766185a5c1e8d34854b18add6a0078173cf097 Merge: db18301 bb86b05 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Sep 12 10:48:52 2020 +0200 Merge branch 'backup-redmine/2020-09-12' into master >--------------------------------------------------------------- batman-adv/Batman-adv-openwrt-config.rst | 1 + batman-adv/Building-with-openwrt.rst | 2 +- batman-adv/Faq.rst | 4 ++-- open-mesh/Download.rst | 33 +++++++++++++++++-------------- open-mesh/Kernel_hacking_Debian_image.rst | 4 ++-- open-mesh/News-draft.rst | 3 +++ open-mesh/UsingBatmanGit.rst | 12 +++++------ 7 files changed, 33 insertions(+), 26 deletions(-) Diff suppressed because of size. To see it, use: git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6a766185a5c1e8d34854b18add6a0078173cf097

1 0

[doc] backup-redmine/2020-09-12,master: doc: open-mesh/Download (b5f4e69)
by postmaster＠open-mesh.org 12 Sep '20

12 Sep '20

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2020-09-12,master >--------------------------------------------------------------- commit b5f4e6986a7fd96ff5600123df4a96022a301182 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Aug 24 18:54:07 2020 +0000 doc: open-mesh/Download >--------------------------------------------------------------- b5f4e6986a7fd96ff5600123df4a96022a301182 open-mesh/Download.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/open-mesh/Download.textile b/open-mesh/Download.textile index f343c7f..dab4e49 100644 --- a/open-mesh/Download.textile +++ b/open-mesh/Download.textile @@ -7,9 +7,9 @@ Please use the maint branch for your public infrastructure unless you know exact h2. Download Released Source Code -* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2020.2.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.2.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.2.tar.gz.asc -* The latest version of batctl (management and control tool for batman-adv) is "batctl-2020.2.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.2.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.2.tar.gz.asc -* The latest version of alfred (Almighty Lightweight Fact Remote Exchange Daemon) is "alfred-2020.2.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.2.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.2.tar.gz.asc +* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2020.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2020.3.tar.gz.asc +* The latest version of batctl (management and control tool for batman-adv) is "batctl-2020.2.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2020.3.tar.gz.asc +* The latest version of alfred (Almighty Lightweight Fact Remote Exchange Daemon) is "alfred-2020.2.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2020.3.tar.gz.asc * The latest stable version of batmand ([[open-mesh:BranchesExplained#batmand|unmaintained]]) is "batman-0.3.2.tar.gz":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz "md5":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.asc * The latest version of the vis server for the batmand (package not needed for batman-adv) is "vis-0.3.2.tar.gz":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz "md5":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.asc

1 0

[doc] backup-redmine/2020-09-12,master: doc: batman-adv/Batman-adv-openwrt-config (ad1ccc1)
by postmaster＠open-mesh.org 12 Sep '20

12 Sep '20

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2020-09-12,master >--------------------------------------------------------------- commit ad1ccc11d61ffb51e72b099b1b7e78ef6b879654 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Aug 25 20:28:59 2020 +0000 doc: batman-adv/Batman-adv-openwrt-config >--------------------------------------------------------------- ad1ccc11d61ffb51e72b099b1b7e78ef6b879654 batman-adv/Batman-adv-openwrt-config.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Batman-adv-openwrt-config.textile b/batman-adv/Batman-adv-openwrt-config.textile index 683073a..13d48f9 100644 --- a/batman-adv/Batman-adv-openwrt-config.textile +++ b/batman-adv/Batman-adv-openwrt-config.textile @@ -93,7 +93,7 @@ config interface 'bat0_hardif_eth0' option mtu '1536' option ifname 'eth0' option 'elp_interval' 500 - option hop_penalty 2 + option hop_penalty 15 # change throughput_override to 0 to use automatic detection; also allows kbit suffix option 'throughput_override' '1mbit' </pre>

1 0

[doc] backup-redmine/2020-09-12,master: doc: batman-adv/Faq (bb86b05)
by postmaster＠open-mesh.org 12 Sep '20

12 Sep '20

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2020-09-12,master >--------------------------------------------------------------- commit bb86b05e379f754f1fed67aa17a29db8c0f07c66 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Sep 11 16:04:06 2020 +0000 doc: batman-adv/Faq >--------------------------------------------------------------- bb86b05e379f754f1fed67aa17a29db8c0f07c66 batman-adv/Faq.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Faq.textile b/batman-adv/Faq.textile index b67c1a9..66c4086 100644 --- a/batman-adv/Faq.textile +++ b/batman-adv/Faq.textile @@ -157,7 +157,7 @@ h3. VLAN forwarding doesn't work ip link add link bat0 name bat0.23 type vlan id 23 </pre> -Or in case of a VLAN-aware bridge, it is better to add the correctly add the VLANs as required to the specific ports: +Or in case of a VLAN-aware bridge, it is better to add the VLANs as required to the specific ports: <pre> bridge vlan add vid 23 dev bat0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2020