Skip to contentSkip to conversation

batctl: drop bisect_iv tool

PATCH New Sven Eckelmann 1 participant 1 message Jul 22 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 batctl: drop bisect_iv tool

The bisect_iv was used in the past to analyze logfiles. But this tool is not build by default and wasn't updated since a long time. It is currently not even able to parse the output from trace-cmd.

The bisect_iv tool is most likely not actively used and can be dropped. This reduces the maintenance overhead. Because it is one of the larger portions of the codebase and has various known problems.

---
See https://www.open-mesh.org/issues/454 for some pending reports.
---
Changes in v2:
- rebased
- drop now no longer used functions
- Link to v1: https://patch.msgid.link/[email protected]

---
 Makefile        |    6 +-
 README.rst      |  103 ----
 cmd/bisect_iv.c | 1652 -------------------------------------------------------
 cmd/bisect_iv.h |   85 ---
 functions.c     |   11 -
 functions.h     |    1 -
 hash.c          |    2 +-
 hash.h          |    3 -
 man/batctl.8    |    9 -
 9 files changed, 2 insertions(+), 1870 deletions(-)
Makefile +1 -5
index e98a6ee..0a2fdfe 100755
@@ -6,9 +6,6 @@
 #
 # License-Filename: LICENSES/preferred/GPL-2.0
 
-# just for backward compatibility - please use CONFIG_bisect_iv instead
-export CONFIG_BATCTL_BISECT=n
-
 # batctl build
 BINARY_NAME = batctl
 
@@ -34,12 +31,11 @@ define add_command
   obj-$$(CONFIG_$(1)) += cmd/$(1).o
 endef # add_command
 
-# using the make parameter CONFIG_* (e.g. CONFIG_bisect_iv) with the value 'y'
+# using the make parameter CONFIG_* (e.g. CONFIG_aggregation) with the value 'y'
 # enables the related feature and 'n' disables it
 $(eval $(call add_command,aggregation,y))
 $(eval $(call add_command,ap_isolation,y))
 $(eval $(call add_command,backbonetable,y))
-$(eval $(call add_command,bisect_iv,$(CONFIG_BATCTL_BISECT)))
 $(eval $(call add_command,bla_backbone_json,y))
 $(eval $(call add_command,bla_claim_json,y))
 $(eval $(call add_command,bonding,y))
README.rst +0 -103

109 lines not on this page · raw message

cmd/bisect_iv.c deleted +0 -1652

1,652 lines not on this page · raw message

cmd/bisect_iv.h deleted +0 -85

85 lines not on this page · raw message

functions.c +0 -11
index e535c1e..24c79da 100644
@@ -99,17 +99,6 @@ char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt)
 	return host_name;
 }
 
-char *get_name_by_macstr(char *mac_str, int read_opt)
-{
-	struct ether_addr *mac_addr;
-
-	mac_addr = ether_aton(mac_str);
-	if (!mac_addr)
-		return mac_str;
-
-	return get_name_by_macaddr(mac_addr, read_opt);
-}
-
 static void file_open_problem_dbg(const char *full_path)
 {
 	fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, strerror(errno));
functions.h +0 -1
index 19334df..b6b33f5 100644
@@ -41,7 +41,6 @@ void start_timer(void);
 double end_timer(void);
 char *ether_ntoa_long(const struct ether_addr *addr);
 char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt);
-char *get_name_by_macstr(char *mac_str, int read_opt);
 int read_file(const char *full_path, int read_opt);
 struct ether_addr *translate_mac(struct state *state,
 				 const struct ether_addr *mac);
hash.c +1 -1
index 4b64d17..58046fa 100644
@@ -101,7 +101,7 @@ static void hash_destroy(struct hashtable_t *hash)
 }
 
 /* free hash_it_t pointer when stopping hash_iterate early */
-void hash_iterate_free(struct hash_it_t *iter_in)
+static void hash_iterate_free(struct hash_it_t *iter_in)
 {
 	free(iter_in);
 }
hash.h +0 -3
index db30017..09cc206 100644
@@ -83,7 +83,4 @@ void hash_debug(struct hashtable_t *hash);
 struct hash_it_t *hash_iterate(struct hashtable_t *hash,
 			       struct hash_it_t *iter_in);
 
-/* free hash_it_t pointer when stopping hash_iterate early */
-void hash_iterate_free(struct hash_it_t *iter_in);
-
 #endif
man/batctl.8 +0 -9
index c0f3aa0..e54e1d9 100644
@@ -56,15 +56,6 @@ print batctl version and batman-adv version (if the module is loaded)
 
 .SH COMMANDS
 
-.TP
-\fBbisect_iv\fP [\fB\-l MAC\fP][\fB\-t\fP \fIMAC\fP][\fB\-r\fP \fIMAC\fP][\fB\-s\fP \fImin\fP [\- \fImax\fP]][\fB\-o\fP \fIMAC\fP][\fB\-n\fP] \fIlogfile1\fP ...
-Analyses the B.A.T.M.A.N. IV logfiles to build a small internal database of all sent sequence numbers and routing table
-changes. This database can then be analyzed in a number of different ways. With "\-l" the database can be used to search
-for routing loops. Use "\-t" to trace OGMs of a host throughout the network. Use "\-r" to display routing tables of the
-nodes. The option "\-s" can be used to limit the output to a range of sequence numbers, between min and max, or to one
-specific sequence number, min. Furthermore using "\-o" you can filter the output to a specified originator. If "\-n" is
-given batctl will not replace the MAC addresses with bat\-host names in the output.
-.RE
 .TP
 \fBevent\fP|\fBe\fP [\fB\-t\fP|\fB\-r\fP]
 batctl will monitor for events from the netlink kernel interface of batman-adv. The local timestamp of the event will be printed

---
base-commit: c8782f50e39e75341988fa98a8a54d07f4b65071
change-id: 20260708-drop-bisect_iv-3f5747bee259

Best regards,

Signature · 1 line
Sven Eckelmann <[email protected]>