B.A.T.M.A.N Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Sven Eckelmann <sven@narfation.org>
Subject: [PATCH 7/8] alfred: vis: fix jsondoc output for nodes without vis entries
Date: Tue, 28 Jul 2026 18:01:36 +0200	[thread overview]
Message-ID: <20260728-bugfixes-vis-v1-7-2540447c8a67@narfation.org> (raw)
In-Reply-To: <20260728-bugfixes-vis-v1-0-2540447c8a67@narfation.org>

vis_read_answer() skipped the entries handler when a received vis record
contained no entries. For the jsondoc format, the per-node object is opened
by vis_jsondoc_interfaces() but only closed at the end of
vis_jsondoc_entries().

The entries handler must always be called and all entry handlers must
handled `entries_n == 0`.

Fixes: 38eae4d50e81 ("vis: Add an output format which is json conformant.")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 vis/vis.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vis/vis.c b/vis/vis.c
index 93f444b..025745d 100644
--- a/vis/vis.c
+++ b/vis/vis.c
@@ -1046,10 +1046,6 @@ static int vis_read_answer(struct globals *globals)
 		vis_entries = (struct vis_entry *) &ifaces[vis_data->iface_n];
 
 		ops->interfaces(vis_data->iface_n, ifaces);
-
-		if (vis_data->entries_n == 0)
-			continue;
-
 		ops->entries(vis_data->entries_n, vis_entries,
 			     vis_data->iface_n, ifaces);
 	}

-- 
2.47.3


  parent reply	other threads:[~2026-07-28 18:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-28 16:01 [PATCH 0/8] alfred: vis: random fixes Sven Eckelmann
2026-07-28 16:01 ` [PATCH 1/8] alfred: vis: reject too long unix socket paths Sven Eckelmann
2026-07-28 16:01 ` [PATCH 2/8] alfred: vis: keep interface names always in heap Sven Eckelmann
2026-07-28 16:01 ` [PATCH 3/8] alfred: vis: return query_rtnl_link error on failed send Sven Eckelmann
2026-07-28 16:01 ` [PATCH 4/8] alfred: vis: handle short reads on the unix socket Sven Eckelmann
2026-07-28 16:01 ` [PATCH 5/8] alfred: vis: report failures while reading the answer Sven Eckelmann
2026-07-28 16:01 ` [PATCH 6/8] alfred: vis: don't drop the rest of the answer for a bogus dataset Sven Eckelmann
2026-07-28 16:01 ` Sven Eckelmann [this message]
2026-07-28 16:01 ` [PATCH 8/8] alfred: vis: skip originators with unresolvable hard interface Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260728-bugfixes-vis-v1-7-2540447c8a67@narfation.org \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox