Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from diktynna.open-mesh.org (diktynna.open-mesh.org [136.243.236.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FC06CD98F0 for ; Sun, 21 Jun 2026 14:26:45 +0000 (UTC) Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id F19DB83F73 for ; Sun, 21 Jun 2026 16:26:43 +0200 (CEST) ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=open-mesh.org; s=20121; t=1782052003; b=W8q+uKnAgJJUciB4FoyfmszovnMwf+dPRJTVVgusF6s6lL9lObuUREDl89m0y57YSpzAE E0itvK6Ju7xflK7Sn/itYFy57A9hXnpQBxv1gdfwhfkX2jpLp6iTL433qiLzkJFzcai8sgF +tLgfwHMIi6nAOHcgN3gnwrBR1dcBsY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1782052003; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=xbC/EiZfjTBjh6YTTOuxS51BT3ny5Vn8ungWVzCYJ14=; b=vr69RcbbItJ3GsIV3/8ThRDYgGgogpM30sQXHN06pPo5xYpbaosQegZZY31BxXw39WM/v hzzUNKtH5QdeLJ99MosyRbN3WDucp3urylQaCzMlA4CUSXX6dY3h+p4poa+PJEbUTbgBBZX ncelxlM/71rRe+U/7+ivfVnn0RM+oaY= ARC-Authentication-Results: i=2; open-mesh.org; dkim=pass header.d=narfation.org; arc=pass; dmarc=pass header.from=narfation.org policy.dmarc=none Authentication-Results: open-mesh.org; dkim=pass header.d=narfation.org; arc=pass; dmarc=pass (Used From Domain Record) header.from=narfation.org policy.dmarc=none Received: from dvalin.narfation.org (dvalin.narfation.org [213.160.73.56]) by diktynna.open-mesh.org (Postfix) with UTF8SMTPS id 634738111C for ; Sun, 21 Jun 2026 16:24:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; d=open-mesh.org; s=20121; cv=none; t=1782051862; b=qtU2z5buRbkyqdyDYgMQH1iX2hDAR4+S1iZd7NhmU8BZmKBcRDTRxtmxV37IRSHC+tvi9K aHJWhIu+MG/qaMqrsg1vgtnKlnQw5ivEHljb1p5CjdlM4NO9QE71kRrfDKUbxycXMJWP9E Fwnr8lJCZWu8Pebs/qswTXj+cmrvxQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1782051862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xbC/EiZfjTBjh6YTTOuxS51BT3ny5Vn8ungWVzCYJ14=; b=gwdQThtT9vpinbQPN8UZQFcN+Z7yJl6WBhrTgAR5TAUGUNGG0Qrmf1cs41n5W73LcjeW6d UuO9KSiM0gANKEYZ/TPLnb/izZnrpmMG2HWsd02+SDyhgMScLFcAg4InXvESSxxCcBGgu6 ZO+hJaBkcp4UcXb/RWetP/TC73bsuOM= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=pass header.d=narfation.org header.s=20121 header.b=XbdecJNZ; spf=pass (diktynna.open-mesh.org: domain of sven@narfation.org designates 213.160.73.56 as permitted sender) smtp.mailfrom=sven@narfation.org; dmarc=pass (policy=none) header.from=narfation.org Received: by dvalin.narfation.org (Postfix) id 0B30A20131; Sun, 21 Jun 2026 14:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1782051857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xbC/EiZfjTBjh6YTTOuxS51BT3ny5Vn8ungWVzCYJ14=; b=XbdecJNZHdsfx2h0KoWraArsuCyo3VSDnBqLNnc5MVfPv9Wsp+ZPM2aANgn3ZQZR4IdKzq Yk94JFMm89KXJX1LVklwn9cMfJLsZ9J2P8CkYoDF+8Ojmos9Ay5Wbnd1wgJFKcB+lEJmE4 nGw561xDo9yYU7CASJbxhuUBjYp/frk= From: Sven Eckelmann Date: Sun, 21 Jun 2026 16:23:52 +0200 Subject: [PATCH 02/28] batctl: originators: fix throughput lines with bat_hosts MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260621-bugfixes-v1-2-b09736288a4a@narfation.org> References: <20260621-bugfixes-v1-0-b09736288a4a@narfation.org> In-Reply-To: <20260621-bugfixes-v1-0-b09736288a4a@narfation.org> To: b.a.t.m.a.n@lists.open-mesh.org Cc: Sven Eckelmann X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1242; i=sven@narfation.org; h=from:subject:message-id; bh=nySeFBdQ0x1je2MbkpfjIVkHflh5KQwuoSogxc+hcYw=; b=owGbwMvMwCXmy1+ufVnk62nG02pJDFnmX1h0ZXgv2Zpdb7vAfcRlyaw9E3u2O/pynpX0L+Sdd 6Ga5+DrjlIWBjEuBlkxRZY9V/LPb2Z/K/952sejMHNYmUCGMHBxCsBENJkY/vB1346r/OF1NjRd x9Q8OP3Rp8sLwx6dOcQTwH/Q9Z/ggV8Mf+W0XEwNOE5OeV/xgkvw4gz52TFNjt8fnlyV/Fu+W+b QV14A X-Developer-Key: i=sven@narfation.org; a=openpgp; fpr=522D7163831C73A635D12FE5EC371482956781AF Message-ID-Hash: IMEVKOJBAL5BQA5SIQ6IRSVZ2EMGEC4Z X-Message-ID-Hash: IMEVKOJBAL5BQA5SIQ6IRSVZ2EMGEC4Z X-MailFrom: sven@narfation.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; header-match-b.a.t.m.a.n.lists.open-mesh.org-2; header-match-b.a.t.m.a.n.lists.open-mesh.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When bat_hosts is used, the output should be the same as without it. But for B.A.T.M.A.N. V, there were two major differences: * when no hostname was found: extra space before the nexthop neighbor * when hostname was found: best-flag character before the hostname Sync the implementation with the B.A.T.M.A.N. IV implementation to get rid of the unexpected differences. Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") Signed-off-by: Sven Eckelmann --- originators.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/originators.c b/originators.c index 8059bdd..7f06b09 100644 --- a/originators.c +++ b/originators.c @@ -130,9 +130,9 @@ static int originators_callback(struct nl_msg *msg, void *arg) throughput_mbits, throughput_kbits / 100); bat_host = bat_hosts_find_by_mac((char *)neigh); if (bat_host) - printf(" %c %17s ", c, bat_host->name); + printf("%17s ", bat_host->name); else - printf(" %02x:%02x:%02x:%02x:%02x:%02x ", + printf("%02x:%02x:%02x:%02x:%02x:%02x ", neigh[0], neigh[1], neigh[2], neigh[3], neigh[4], neigh[5]); printf("[%10s]\n", ifname); -- 2.47.3