B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

13 participants
4305 discussions

[PATCH v2] batctl: Dynamically select header format in netlink_print_neighbors
by noahbpeterson1997＠gmail.com 20 Sep '24

20 Sep '24

The netlink_print_neighbors() function previously used a static header format, which did not account for variations between the neighbor list output from different BATMAN routing algorithms (BATMAN_IV vs. BATMAN_V). This patch introduces a dynamic header selection mechanism that adjusts the output format based on the active routing algorithm: - For BATMAN_IV, the header is set to "IF Neighbor last-seen". - For BATMAN_V, it changes to " Neighbor last-seen speed IF". This change ensures that the table header output in `batctl n` is accurate for both BATMAN routing algorithms. Signed-off-by: Noah Peterson <noahbpeterson1997(a)gmail.com> --- neighbors.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/neighbors.c b/neighbors.c index 3102b0e..f34952b 100644 --- a/neighbors.c +++ b/neighbors.c @@ -6,6 +6,7 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ +#include <errno.h> #include <net/if.h> #include <netinet/if_ether.h> #include <netlink/netlink.h> @@ -119,9 +120,28 @@ static int netlink_print_neighbors(struct state *state, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) { + char *header = NULL; + char *info_header; + + /* only parse routing algorithm name */ + last_err = -EINVAL; + info_header = netlink_get_info(state, BATADV_CMD_GET_ORIGINATORS, NULL); + free(info_header); + + if (strlen(algo_name_buf) == 0) + return last_err; + + if (!strcmp("BATMAN_IV", algo_name_buf)) + header = "IF Neighbor last-seen\n"; + if (!strcmp("BATMAN_V", algo_name_buf)) + header = " Neighbor last-seen speed IF\n"; + + if (!header) + return -EINVAL; + return netlink_print_common(state, orig_iface, read_opts, orig_timeout, watch_interval, - "IF Neighbor last-seen\n", + header, BATADV_CMD_GET_NEIGHBORS, neighbors_callback); }

2 2

[syzbot] [batman?] INFO: rcu detected stall in batadv_bla_periodic_work (2)
by syzbot 17 Sep '24

17 Sep '24

Hello, syzbot found the following issue on: HEAD commit: 196145c606d0 Merge tag 'clk-fixes-for-linus' of git://git... git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=13eb27c7980000 kernel config: https://syzkaller.appspot.com/x/.config?x=28869f34c32848cf dashboard link: https://syzkaller.appspot.com/bug?extid=fc38cf2d6e727d8415c7 compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15be7807980000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/94719b44a92c/disk-196145c6.raw… vmlinux: https://storage.googleapis.com/syzbot-assets/bc25f4396b64/vmlinux-196145c6.… kernel image: https://storage.googleapis.com/syzbot-assets/d587a9ecda3e/bzImage-196145c6.… IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+fc38cf2d6e727d8415c7(a)syzkaller.appspotmail.com rcu: INFO: rcu_preempt detected expedited stalls on CPUs/tasks: { 0-...D } 2684 jiffies s: 3397 root: 0x1/. rcu: blocking rcu_node structures (internal RCU debug): Sending NMI from CPU 1 to CPUs 0: NMI backtrace for cpu 0 CPU: 0 UID: 0 PID: 29 Comm: kworker/u8:2 Not tainted 6.11.0-rc7-syzkaller-00097-g196145c606d0 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 08/06/2024 Workqueue: bat_events batadv_bla_periodic_work RIP: 0010:kasan_check_range+0x14f/0x1a0 mm/kasan/generic.c:190 Code: 83 c0 01 49 89 d3 48 39 d0 74 11 80 38 00 74 ef 4d 8d 1c 2c 48 85 c0 48 89 c2 75 93 48 89 da 4c 89 d8 4c 29 da e9 2c ff ff ff <5b> b8 01 00 00 00 5d 41 5c c3 cc cc cc cc b8 01 00 00 00 c3 cc cc RSP: 0018:ffffc90000007a68 EFLAGS: 00000046 RAX: fffffbfff2d248e1 RBX: fffffbfff2d248e1 RCX: ffffffff8168d93e RDX: fffffbfff2d248e1 RSI: 0000000000000008 RDI: ffffffff96924700 RBP: fffffbfff2d248e0 R08: 0000000000000000 R09: fffffbfff2d248e0 R10: ffffffff96924707 R11: 0000000000000000 R12: 0000000000000002 R13: ffff88801d698b58 R14: 0000000000000001 R15: ffff88801d698000 FS: 0000000000000000(0000) GS:ffff8880b8800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000557158cde858 CR3: 000000000db7c000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <NMI> </NMI> <IRQ> instrument_atomic_read include/linux/instrumented.h:68 [inline] _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] hlock_class+0x4e/0x130 kernel/locking/lockdep.c:227 check_wait_context kernel/locking/lockdep.c:4772 [inline] __lock_acquire+0x415/0x3cb0 kernel/locking/lockdep.c:5092 lock_acquire kernel/locking/lockdep.c:5759 [inline] lock_acquire+0x1b1/0x560 kernel/locking/lockdep.c:5724 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x3a/0x60 kernel/locking/spinlock.c:162 debug_object_activate+0x199/0x540 lib/debugobjects.c:709 debug_hrtimer_activate kernel/time/hrtimer.c:423 [inline] debug_activate kernel/time/hrtimer.c:478 [inline] enqueue_hrtimer+0x25/0x3c0 kernel/time/hrtimer.c:1085 __run_hrtimer kernel/time/hrtimer.c:1706 [inline] __hrtimer_run_queues+0xaac/0xcc0 kernel/time/hrtimer.c:1753 hrtimer_interrupt+0x31b/0x800 kernel/time/hrtimer.c:1815 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1032 [inline] __sysvec_apic_timer_interrupt+0x10f/0x450 arch/x86/kernel/apic/apic.c:1049 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1043 [inline] sysvec_apic_timer_interrupt+0x90/0xb0 arch/x86/kernel/apic/apic.c:1043 </IRQ> <TASK> asm_sysvec_apic_timer_interrupt+0x1a/0x20 arch/x86/include/asm/idtentry.h:702 RIP: 0010:bytes_is_nonzero mm/kasan/generic.c:87 [inline] RIP: 0010:memory_is_nonzero mm/kasan/generic.c:104 [inline] RIP: 0010:memory_is_poisoned_n mm/kasan/generic.c:129 [inline] RIP: 0010:memory_is_poisoned mm/kasan/generic.c:161 [inline] RIP: 0010:check_region_inline mm/kasan/generic.c:180 [inline] RIP: 0010:kasan_check_range+0x111/0x1a0 mm/kasan/generic.c:189 Code: 44 89 c2 e8 a1 ea ff ff 83 f0 01 5b 5d 41 5c c3 cc cc cc cc 48 85 d2 74 4f 48 01 ea eb 09 48 83 c0 01 48 39 d0 74 41 80 38 00 <74> f2 eb b2 41 bc 08 00 00 00 45 29 dc 49 8d 14 2c eb 0c 48 83 c0 RSP: 0018:ffffc90000a57a58 EFLAGS: 00000246 RAX: fffffbfff20289b3 RBX: fffffbfff20289b4 RCX: ffffffff8169d04b RDX: fffffbfff20289b4 RSI: 0000000000000008 RDI: ffffffff90144d98 RBP: fffffbfff20289b3 R08: 0000000000000000 R09: fffffbfff20289b3 R10: ffffffff90144d9f R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: ffffffff8ddb9fe0 R15: 0000000000000000 instrument_atomic_read include/linux/instrumented.h:68 [inline] _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline] cpumask_test_cpu include/linux/cpumask.h:562 [inline] cpu_online include/linux/cpumask.h:1105 [inline] trace_lock_acquire include/trace/events/lock.h:24 [inline] lock_acquire+0xbb/0x560 kernel/locking/lockdep.c:5730 rcu_lock_acquire include/linux/rcupdate.h:326 [inline] rcu_read_lock include/linux/rcupdate.h:838 [inline] batadv_bla_purge_claims+0x160/0x780 net/batman-adv/bridge_loop_avoidance.c:1289 batadv_bla_periodic_work+0x51/0x9e0 net/batman-adv/bridge_loop_avoidance.c:1444 process_one_work+0x9c5/0x1b40 kernel/workqueue.c:3231 process_scheduled_works kernel/workqueue.c:3312 [inline] worker_thread+0x6c8/0xf00 kernel/workqueue.c:3393 kthread+0x2c1/0x3a0 kernel/kthread.c:389 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 </TASK> --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing. If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup

1 0

[PATCH v2] batctl: add dat_dht command
by Linus Lüssing 11 Sep '24

11 Sep '24

This adds a dat_dht command to query the DHT part of DAT in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v2: - rebased to current main branch: -> removed now obsolete debugfs code Makefile | 2 + README.rst | 27 +++++++++- batadv_packet.h | 4 +- batman_adv.h | 5 ++ dat_cache.c | 2 +- dat_dht.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++ dat_dht_json.c | 20 ++++++++ man/batctl.8 | 6 +++ 8 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 dat_dht.c create mode 100644 dat_dht_json.c diff --git a/Makefile b/Makefile index c1212c444971..92f84e5bf012 100755 --- a/Makefile +++ b/Makefile @@ -47,6 +47,8 @@ $(eval $(call add_command,bridge_loop_avoidance,y)) $(eval $(call add_command,claimtable,y)) $(eval $(call add_command,dat_cache,y)) $(eval $(call add_command,dat_cache_json,y)) +$(eval $(call add_command,dat_dht,y)) +$(eval $(call add_command,dat_dht_json,y)) $(eval $(call add_command,distributed_arp_table,y)) $(eval $(call add_command,elp_interval,y)) $(eval $(call add_command,event,y)) diff --git a/README.rst b/README.rst index 3495fba02e0e..dc1852068e0d 100644 --- a/README.rst +++ b/README.rst @@ -278,7 +278,32 @@ Usage:: Example:: - Distributed ARP Table (bat0): + Distributed ARP Table Cache (bat0): + IPv4 MAC last-seen + * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 + +where + +IPv4: + is the IP address of a client in the mesh network +MAC: + is the MAC address associated to that IP +last-seen: + is the amount of time since last refresh of this entry + + +batctl dat_dht +================= + +display the local D.A.T. DHT + +Usage:: + + batctl dat_dht|dd + +Example:: + + Distributed ARP Table DHT (bat0): IPv4 MAC last-seen * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 diff --git a/batadv_packet.h b/batadv_packet.h index 6e25753015df..93df068b00f3 100644 --- a/batadv_packet.h +++ b/batadv_packet.h @@ -60,13 +60,15 @@ enum batadv_packettype { * @BATADV_P_DATA: user payload * @BATADV_P_DAT_DHT_GET: DHT request message * @BATADV_P_DAT_DHT_PUT: DHT store message - * @BATADV_P_DAT_CACHE_REPLY: ARP reply generated by DAT + * @BATADV_P_DAT_CACHE_REPLY: deprecated: use BATADV_P_DAT_DHT_REPLY instead + * @BATADV_P_DAT_DHT_REPLY: ARP reply generated by DAT */ enum batadv_subtype { BATADV_P_DATA = 0x01, BATADV_P_DAT_DHT_GET = 0x02, BATADV_P_DAT_DHT_PUT = 0x03, BATADV_P_DAT_CACHE_REPLY = 0x04, + BATADV_P_DAT_DHT_REPLY = 0x04, }; /* this file is included by batctl which needs these defines */ diff --git a/batman_adv.h b/batman_adv.h index 35dc016c9bb4..9498ccb09d67 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -613,6 +613,11 @@ enum batadv_nl_commands { */ BATADV_CMD_SET_VLAN, + /** + * @BATADV_CMD_GET_DAT_DHT: Query list of DAT DHT entries + */ + BATADV_CMD_GET_DAT_DHT, + /* add new commands above here */ /** diff --git a/dat_cache.c b/dat_cache.c index 8d471718e4b3..d34375563aad 100644 --- a/dat_cache.c +++ b/dat_cache.c @@ -106,7 +106,7 @@ static int netlink_print_dat_cache(struct state *state, char *orig_iface, char *header; int ret; - ret = asprintf(&header, "Distributed ARP Table (%s):\n%s\n", + ret = asprintf(&header, "Distributed ARP Table Cache (%s):\n%s\n", state->mesh_iface, " IPv4 MAC VID last-seen"); diff --git a/dat_dht.c b/dat_dht.c new file mode 100644 index 000000000000..b9619ec00a73 --- /dev/null +++ b/dat_dht.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <arpa/inet.h> +#include <netinet/if_ether.h> +#include <netinet/in.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <sys/socket.h> + +#include "batadv_packet.h" +#include "batman_adv.h" +#include "bat-hosts.h" +#include "debug.h" +#include "functions.h" +#include "main.h" +#include "netlink.h" + +static const int dat_dht_mandatory[] = { + BATADV_ATTR_DAT_CACHE_IP4ADDRESS, + BATADV_ATTR_DAT_CACHE_HWADDRESS, + BATADV_ATTR_DAT_CACHE_VID, + BATADV_ATTR_LAST_SEEN_MSECS, +}; + +static int dat_dht_callback(struct nl_msg *msg, void *arg) +{ + int last_seen_msecs, last_seen_secs, last_seen_mins; + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct print_opts *opts = arg; + struct bat_host *bat_host; + struct genlmsghdr *ghdr; + struct in_addr in_addr; + uint8_t *hwaddr; + int16_t vid; + char *addr; + + if (!genlmsg_valid_hdr(nlh, 0)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + ghdr = nlmsg_data(nlh); + + if (ghdr->cmd != BATADV_CMD_GET_DAT_DHT) + return NL_OK; + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + if (missing_mandatory_attrs(attrs, dat_dht_mandatory, + ARRAY_SIZE(dat_dht_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + in_addr.s_addr = nla_get_u32(attrs[BATADV_ATTR_DAT_CACHE_IP4ADDRESS]); + addr = inet_ntoa(in_addr); + hwaddr = nla_data(attrs[BATADV_ATTR_DAT_CACHE_HWADDRESS]); + vid = nla_get_u16(attrs[BATADV_ATTR_DAT_CACHE_VID]); + + last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); + last_seen_mins = last_seen_msecs / 60000; + last_seen_msecs = last_seen_msecs % 60000; + last_seen_secs = last_seen_msecs / 1000; + + if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01)) + return NL_OK; + + if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01)) + return NL_OK; + + printf(" * %15s ", addr); + + bat_host = bat_hosts_find_by_mac((char *)hwaddr); + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + hwaddr[0], hwaddr[1], hwaddr[2], + hwaddr[3], hwaddr[4], hwaddr[5]); + else + printf("%17s ", bat_host->name); + + printf("%4i %6i:%02i\n", + BATADV_PRINT_VID(vid), last_seen_mins, last_seen_secs); + + return NL_OK; +} + +static int netlink_print_dat_dht(struct state *state, char *orig_iface, + int read_opts, float orig_timeout, + float watch_interval) +{ + char *header; + int ret; + + ret = asprintf(&header, "Distributed ARP Table DHT (%s):\n%s\n", + state->mesh_iface, + " IPv4 MAC VID last-seen"); + + if (ret < 0) + return ret; + + ret = netlink_print_common(state, orig_iface, read_opts, + orig_timeout, watch_interval, header, + BATADV_CMD_GET_DAT_DHT, + dat_dht_callback); + + free(header); + return ret; +} + +static struct debug_table_data batctl_debug_table_dat_dht = { + .netlink_fn = netlink_print_dat_dht, +}; + +COMMAND_NAMED(DEBUGTABLE, dat_dht, "dd", handle_debug_table, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_debug_table_dat_dht, ""); diff --git a/dat_dht_json.c b/dat_dht_json.c new file mode 100644 index 000000000000..43eb3c586d74 --- /dev/null +++ b/dat_dht_json.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Linus Lüssing <linus.luessing(a)c0d3.blue> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include "main.h" + +#include "genl_json.h" + +static struct json_query_data batctl_json_query_dat_dht = { + .nlm_flags = NLM_F_DUMP, + .cmd = BATADV_CMD_GET_DAT_DHT, +}; + +COMMAND_NAMED(JSON_MIF, dat_dht_json, "ddj", handle_json_query, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_json_query_dat_dht, ""); diff --git a/man/batctl.8 b/man/batctl.8 index b5be0b801708..417f5412c885 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -388,6 +388,10 @@ The local and global translation tables also support the "\-u" and "\-m" option [\fBmeshif\fP \fInetdev\fP] \fBdat_cache\fP|\fBdc\fP [\fB-n\fP] [\fB-H\fP] [\fB-w\fP \fIinterval\fP] (compile time option) .TP +.TP +[\fBmeshif\fP \fInetdev\fP] \fBdat_dht\fP|\fBdd\fP [\fB-n\fP] [\fB-H\fP] [\fB-w\fP \fIinterval\fP] +(compile time option) +.TP [\fBmeshif\fP \fInetdev\fP] \fBgateways\fP|\fBgwl\fP [\fB-n\fP] [\fB-H\fP] [\fB-w\fP \fIinterval\fP] .TP [\fBmeshif\fP \fInetdev\fP] \fBmcast_flags\fP|\fBmf\fP [\fB-n\fP] [\fB-H\fP] [\fB-w\fP \fIinterval\fP] @@ -416,6 +420,8 @@ the freeform debug tables or the native netlink messages. .TP [\fBmeshif\fP \fInetdev\fP] \fBdat_cache_json\fP|\fBdcj\fP .TP +[\fBmeshif\fP \fInetdev\fP] \fBdat_dht_json\fP|\fBdcj\fP +.TP [\fBmeshif\fP \fInetdev\fP] \fBgateways_json\fP|\fBgwj\fP .TP \fBhardif\fP \fIhardif\fP \fBhardif_json\fP|\fBhj\fP -- 2.45.2

1 0

[PATCH v3] batctl: Dynamically select header format in netlink_print_neighbors
by Noah Peterson 10 Sep '24

10 Sep '24

From: Noah Peterson <NoahBPeterson1997(a)gmail.com> The netlink_print_neighbors() function previously used a static header format, which did not account for variations between the neighbor list output from different BATMAN routing algorithms (BATMAN_IV vs. BATMAN_V). This change ensures that the table header output in `batctl n` is accurate for both BATMAN routing algorithms. Signed-off-by: Noah Peterson <noahbpeterson1997(a)gmail.com> --- v3: Correcting commit message and newlines, noted by Sven <sven(a)narfation.org> v2: Changing output based on BATMAN routing algorithm, noted by Sven <sven(a)narfation.org> This patch introduces a dynamic header selection mechanism that adjusts the output format based on the active routing algorithm: - For BATMAN_IV, the header is set to "IF Neighbor last-seen". - For BATMAN_V, it changes to " Neighbor last-seen speed IF". --- neighbors.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/neighbors.c b/neighbors.c index 3102b0e..f34952b 100644 --- a/neighbors.c +++ b/neighbors.c @@ -6,6 +6,7 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ +#include <errno.h> #include <net/if.h> #include <netinet/if_ether.h> #include <netlink/netlink.h> @@ -119,9 +120,28 @@ static int netlink_print_neighbors(struct state *state, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) { + char *header = NULL; + char *info_header; + + /* only parse routing algorithm name */ + last_err = -EINVAL; + info_header = netlink_get_info(state, BATADV_CMD_GET_ORIGINATORS, NULL); + free(info_header); + + if (strlen(algo_name_buf) == 0) + return last_err; + + if (!strcmp("BATMAN_IV", algo_name_buf)) + header = "IF Neighbor last-seen\n"; + if (!strcmp("BATMAN_V", algo_name_buf)) + header = " Neighbor last-seen speed IF\n"; + + if (!header) + return -EINVAL; + return netlink_print_common(state, orig_iface, read_opts, orig_timeout, watch_interval, - "IF Neighbor last-seen\n", + header, BATADV_CMD_GET_NEIGHBORS, neighbors_callback); } -- 2.39.3 (Apple Git-146)

1 0

[PATCH v3] alfred: add more verbose error message
by Noah Peterson 10 Sep '24

10 Sep '24

From: Noah Peterson <NoahBPeterson1997(a)gmail.com> There is an issue with some Linux distributions where network interfaces are up and active, but do not have the correct link-local address. This condition is now checked and output to stderr to better help users troubleshoot this issue. Signed-off-by: Noah Peterson <noahbpeterson1997(a)gmail.com> --- v3: Add changelog, change newlines, noted by Sven <sven(a)narfation.org> v2: Fixed IPv6 address string, noted by Sven <sven(a)narfation.org> --- netsock.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/netsock.c b/netsock.c index feed21d..95dbf5e 100644 --- a/netsock.c +++ b/netsock.c @@ -21,6 +21,7 @@ #include <sys/types.h> #include <stdlib.h> #include <sys/epoll.h> +#include <arpa/inet.h> #ifdef CONFIG_ALFRED_CAPABILITIES #include <sys/capability.h> #endif @@ -322,7 +323,19 @@ static int netsock_open(struct globals *globals, struct interface *interface) enable_raw_bind_capability(0); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { - perror("can't bind"); + char ipstr_buf[INET6_ADDRSTRLEN]; + const char *ipstr; + + ipstr = inet_ntop(AF_INET6, &interface->address.ipv6.s6_addr, + ipstr_buf, INET6_ADDRSTRLEN); + + if (errno == EADDRNOTAVAIL) + fprintf(stderr, "can't bind to interface %s; " + "expected ipv6 address not found: %s\n", + interface->interface, + ipstr); + else + perror("can't bind"); goto err; } -- 2.39.3 (Apple Git-146)

1 0

[PATCH v2] alfred: add more verbose error message
by noahbpeterson1997＠gmail.com 10 Sep '24

10 Sep '24

There is an issue with some Linux distributions where network interfaces are up and active, but do not have the correct link-local address. This condition is now checked and output to stderr to help better users troubleshoot this issue. Signed-off-by: Noah Peterson noahbpeterson1997(a)gmail.com --- netsock.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/netsock.c b/netsock.c index feed21d..a3101df 100644 --- a/netsock.c +++ b/netsock.c @@ -21,6 +21,7 @@ #include <sys/types.h> #include <stdlib.h> #include <sys/epoll.h> +#include <arpa/inet.h> #ifdef CONFIG_ALFRED_CAPABILITIES #include <sys/capability.h> #endif @@ -321,8 +322,19 @@ static int netsock_open(struct globals *globals, struct interface *interface) } enable_raw_bind_capability(0); + if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { - perror("can't bind"); + char ipstr_buf[INET6_ADDRSTRLEN]; + const char *ipstr; + ipstr = inet_ntop(AF_INET6, &interface->address.ipv6.s6_addr, + ipstr_buf, INET6_ADDRSTRLEN); + if (errno == EADDRNOTAVAIL) + fprintf(stderr, "can't bind to interface %s; " + "expected ipv6 address not found: %s\n", + interface->interface, + ipstr); + else + perror("can't bind"); goto err; }

2 1

[PATCH] batctl: neighbor: Fix print neighbors table header
by noahbpeterson1997＠gmail.com 09 Sep '24

09 Sep '24

netlink_print_neighbors() now prints the correct header to match what batman-advanced currently outputs. The examples in the README.rst are updated too. Signed-off-by: Noah Peterson <noahbpeterson1997(a)gmail.com> --- README.rst | 6 +++--- neighbors.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 3495fba..5eda1d3 100644 --- a/README.rst +++ b/README.rst @@ -376,9 +376,9 @@ Usage:: Example:: - IF Neighbor last-seen - enp0s1 16:7b:3c:c2:bf:b8 4.612s - enp0s1 ae:1b:bf:52:25:58 0.740s + Neighbor last-seen speed IF + 16:7b:3c:c2:bf:b8 4.612s ( 1000.0) [ enp0s1] + ae:1b:bf:52:25:58 0.740s ( 1000.0) [ enp0s1] batctl originators diff --git a/neighbors.c b/neighbors.c index 3102b0e..9dcdb81 100644 --- a/neighbors.c +++ b/neighbors.c @@ -121,7 +121,7 @@ static int netlink_print_neighbors(struct state *state, char *orig_iface, { return netlink_print_common(state, orig_iface, read_opts, orig_timeout, watch_interval, - "IF Neighbor last-seen\n", + " Neighbor last-seen speed IF\n", BATADV_CMD_GET_NEIGHBORS, neighbors_callback); }

2 3

[PATCH] alfred: add more verbose error message
by noahbpeterson1997＠gmail.com 09 Sep '24

09 Sep '24

There is an issue with some Linux distributions (Raspian) where network interfaces are up and active, but do not have the correct link-local address. This condition is now checked and output to stderr to better help users troubleshoot this issue. Signed-off-by: Noah Peterson noahbpeterson1997(a)gmail.com --- netsock.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/netsock.c b/netsock.c index feed21d..04f95c7 100644 --- a/netsock.c +++ b/netsock.c @@ -322,7 +322,23 @@ static int netsock_open(struct globals *globals, struct interface *interface) enable_raw_bind_capability(0); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { - perror("can't bind"); + if (errno == EADDRNOTAVAIL) + fprintf(stderr, "can't bind to interface %s; " + "expected ipv6 address not found: " + "%02x%02x::%02x%02x:%02x%02x:%02x%02x:%02x%02x\n", + interface->interface, + (int)interface->address.ipv6.s6_addr[0], + (int)interface->address.ipv6.s6_addr[1], + (int)interface->address.ipv6.s6_addr[8], + (int)interface->address.ipv6.s6_addr[9], + (int)interface->address.ipv6.s6_addr[10], + (int)interface->address.ipv6.s6_addr[11], + (int)interface->address.ipv6.s6_addr[12], + (int)interface->address.ipv6.s6_addr[13], + (int)interface->address.ipv6.s6_addr[14], + (int)interface->address.ipv6.s6_addr[15]); + else + perror("can't bind"); goto err; }

2 1

Re: bat0 not capable of MTU > 1500
by Rich Chase 03 Sep '24

03 Sep '24

I am trying to create an unimpeded path MTU of 1500 on my OpenWRT router (Belkin RT-3200). I built the firmware from git Master, with kernel version 6.1, and batman-adv version 2023.2. I have a batmesh hard-if device mastering an 802.1S mesh, which are both set to MTU=2304. Using Luci (OpenWRT web gui for uci), I set the MTU of bat0 to 1504 to accommodate .1q vlans on bat0 -- bat0.5, bat0.110, etc. I see in the system log: kern.err kernel: [751585.375855] bat0: mtu greater than device maximum Also, if I do: #> ip link set bat0 mtu 1504 I get: ip: SIOCSIFMTU: Invalid argument and if I test: #> ip link show bat0 ...it says that my mtu is 1500 still. For my life I can't see anything I'm doing wrong. Why can't bat0 have MTU greater than 1500? I don't have any other devices mastered by bat0, other than my .1s wifi mesh link. Throwing myself at your mercy. Help?

3 3

[PATCH] batctl: add switch for setting multicast_mld_rtr_only
by Linus Lüssing 31 Aug '24

31 Aug '24

This patch adds an option for the new multicast_mld_rtr_only setting in batman-adv. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Makefile | 1 + README.rst | 10 +++++ batman_adv.h | 9 +++++ event.c | 4 ++ man/batctl.8 | 18 +++++++++ multicast_mld_rtr_only.c | 83 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 125 insertions(+) create mode 100644 multicast_mld_rtr_only.c diff --git a/Makefile b/Makefile index c1212c444971..9e6f535c7816 100755 --- a/Makefile +++ b/Makefile @@ -66,6 +66,7 @@ $(eval $(call add_command,mesh_json,y)) $(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) +$(eval $(call add_command,multicast_mld_rtr_only,y)) $(eval $(call add_command,neighbors,y)) $(eval $(call add_command,neighbors_json,y)) $(eval $(call add_command,network_coding,y)) diff --git a/README.rst b/README.rst index 3495fba02e0e..63b16b0f66af 100644 --- a/README.rst +++ b/README.rst @@ -669,6 +669,16 @@ Usage:: batctl multicast_forceflood|mff [0|1] +batctl multicast_mld_rtr_only +----------------------------- + +display or modify the multicast MLD router only setting + +Usage:: + + batctl multicast_mld_rtr_only|mro [0|1] + + batctl network_coding --------------------- diff --git a/batman_adv.h b/batman_adv.h index 35dc016c9bb4..11cd170036ff 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -481,6 +481,15 @@ enum batadv_nl_attrs { */ BATADV_ATTR_MULTICAST_FANOUT, + /** + * @BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED: defines how IGMP/MLD + * reports are forwarded in the mesh. If set to non-zero then IGMP/MLD + * reports are only forwarded to detected multicast routers. If set to + * zero then they are flooded instead. + * Warning: The former is experimental and potentially unsafe! + */ + BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED, + /* add attributes above here, update the policy in netlink.c */ /** diff --git a/event.c b/event.c index 274f99fcb65a..14700ea57ae0 100644 --- a/event.c +++ b/event.c @@ -283,6 +283,10 @@ static void event_parse_set_mesh(struct nlattr **attrs) printf("* multicast_forceflood %s\n", u8_to_boolstr(attrs[BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED])); + if (attrs[BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED]) + printf("* multicast_forceflood %s\n", + u8_to_boolstr(attrs[BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED])); + if (attrs[BATADV_ATTR_NETWORK_CODING_ENABLED]) printf("* network_coding %s\n", u8_to_boolstr(attrs[BATADV_ATTR_NETWORK_CODING_ENABLED])); diff --git a/man/batctl.8 b/man/batctl.8 index b5be0b801708..9d830907ac7f 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -341,6 +341,24 @@ disable multicast forceflood. This setting defines whether multicast optimizatio flooding of multicast packets. If set to non-zero then all nodes in the mesh are going to use classic flooding for any multicast packet with no optimizations. .TP +[\fBmeshif\fP \fInetdev\fP] \fBmulticast_mld_rtr_only\fP|\fBmro\fP [\fI0\fP|\fI1\fP] +If no parameter is given the current multicast MLD router only setting is displayed. Otherwise the parameter is used to +set the IGMP/MLD report forwarding behaviour. If enabled then MLD reports are forwarded to detected multicast routers only. +If disabled then they are flooded instead. + +.br +.br +Warning: Enabling this is experimental and potentially unsafe! + +.br +.br +If the IGMP/MLD querier is configured directly on the bridge on top of +bat0. But there is no multicast router on or behind this node. Then this +bridge will be unable to detect multicast listeners on/behind other +nodes which have the MLD-RTR-ONLY setting enabled. (A workaround for this +can then in turn be to set multicast_router=2 on the bat0 bridge port +on the node with the IGMP/MLD querier.) +.TP [\fBmeshif\fP \fInetdev\fP] \fBnetwork_coding\fP|\fBnc\fP [\fI0\fP|\fI1\fP] If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. diff --git a/multicast_mld_rtr_only.c b/multicast_mld_rtr_only.c new file mode 100644 index 000000000000..599f96fb2375 --- /dev/null +++ b/multicast_mld_rtr_only.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Linus Lüssing <linus.luessing(a)c0d3.blue> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include "main.h" + +#include <errno.h> +#include <linux/genetlink.h> +#include <netlink/genl/genl.h> + +#include "batman_adv.h" +#include "netlink.h" +#include "sys.h" + +static struct simple_boolean_data multicast_mld_rtr_only; + +static int print_multicast_mld_rtr_only(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED]) + return NL_OK; + + printf("%s\n", nla_get_u8(attrs[BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED]) ? "enabled" : "disabled"); + + *result = 0; + return NL_STOP; +} + +static int get_multicast_mld_rtr_only(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_MESH, + NULL, print_multicast_mld_rtr_only); +} + +static int set_attrs_multicast_mld_rtr_only(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct simple_boolean_data *data = settings->data; + + if (data->val) + printf("Warning: MLD-RTR-ONLY is experimental and has known, broken scenarios\n"); + + nla_put_u8(msg, BATADV_ATTR_MULTICAST_MLD_RTR_ONLY_ENABLED, data->val); + + return 0; +} + +static int set_multicast_mld_rtr_only(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_MESH, + set_attrs_multicast_mld_rtr_only, NULL); +} + +static struct settings_data batctl_settings_multicast_mld_rtr_only = { + .data = &multicast_mld_rtr_only, + .parse = parse_simple_boolean, + .netlink_get = get_multicast_mld_rtr_only, + .netlink_set = set_multicast_mld_rtr_only, +}; + +COMMAND_NAMED(SUBCOMMAND_MIF, multicast_mld_rtr_only, "mro", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_multicast_mld_rtr_only, + "[0|1] \tdisplay or modify multicast_mld_rtr_only setting"); -- 2.45.2

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N