Skip to contentSkip to conversation

batctl: ping: Add subsecond precision to ping interval

PATCH In review Noah Peterson 2 participants 3 messages Jan 4, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 batctl: ping: Add subsecond precision to ping interval

Modify the batctl ping utility to accept both integer and floating-point values for the interval between sending pings. This enhancement allows specifying intervals with subsecond precision.

For example:
sudo batctl ping aa:bb:cc:dd:ee:ff -i 0.5

---
v4: Rebasing on latest commit, reformatting into reverse X-mas tree order based on feedback from Sven <[email protected]>
v3: Rebasing on latest commit, reformatting code based on comments by Sven <[email protected]>
v2: Fixing use-after-free, adding a missing header file, noted by Sven <[email protected]>

---
 ping.c | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)
ping.c +27 -14
index 14d9c21..f7ef210 100644
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <sys/select.h>
 #include <sys/time.h>
+#include <time.h>
 #include <netinet/if_ether.h>
 
 #include "batadv_packet_compat.h"
@@ -58,12 +59,16 @@ static int ping(struct state *state, int argc, char **argv)
 	struct batadv_icmp_packet_rr icmp_packet_out;
 	struct batadv_icmp_packet_rr icmp_packet_in;
 	uint8_t last_rr[BATADV_RR_LEN][ETH_ALEN];
+	struct timespec loop_interval = {0, 0};
 	struct ether_addr *dst_mac = NULL;
 	struct ether_addr *rr_mac = NULL;
 	int disable_translate_mac = 0;
+	double fractional_part = 0.0;
 	unsigned int seq_counter = 0;
 	unsigned int packets_out = 0;
 	unsigned int packets_in = 0;
+	double ping_interval = 0.0;
+	double integral_part = 0.0;
 	unsigned int packets_loss;
 	struct bat_host *bat_host;
 	struct bat_host *rr_host;
@@ -101,10 +106,18 @@ static int ping(struct state *state, int argc, char **argv)
 			ping_usage();
 			return EXIT_SUCCESS;
 		case 'i':
-			loop_interval = strtol(optarg, NULL, 10);
-			if (loop_interval < 1)
-				loop_interval = 1;
-			found_args += ((*((char *)(optarg - 1)) == optchar) ? 1 : 2);
+			errno = 0;
+			ping_interval = strtod(optarg, &end);
+			if (errno) {
+				fprintf(stderr, "Error - invalid ping interval '%s'\n", optarg);
+				goto out;
+			} else {
+				ping_interval = fmax(ping_interval, 0.001);
+			}
+			fractional_part = modf(ping_interval, &integral_part);
+			loop_interval.tv_sec = (time_t)integral_part;
+			loop_interval.tv_nsec = (long)(fractional_part * 1000000000l);
+			found_args += ((*((char*)(optarg - 1)) == optchar ) ? 1 : 2);
 			break;
 		case 't':
 			timeout = strtol(optarg, NULL, 10);
@@ -178,7 +191,7 @@ static int ping(struct state *state, int argc, char **argv)
 	}
 
 	printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string,
-	       packet_len, packet_len + 28);
+		packet_len, packet_len + 28);
 
 	while (!is_aborted) {
 		tv.tv_sec = timeout;
@@ -224,7 +237,7 @@ static int ping(struct state *state, int argc, char **argv)
 
 		if ((size_t)read_len < packet_len) {
 			printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n",
-			       packet_len, read_len);
+				packet_len, read_len);
 			goto sleep;
 		}
 
@@ -236,10 +249,10 @@ static int ping(struct state *state, int argc, char **argv)
 		case BATADV_ECHO_REPLY:
 			time_delta = end_timer();
 			printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms",
-			       read_len, dst_string,
-			       ntohs(icmp_packet_in.seqno),
-			       icmp_packet_in.ttl,
-			       time_delta);
+					read_len, dst_string,
+					ntohs(icmp_packet_in.seqno),
+					icmp_packet_in.ttl,
+					time_delta);
 
 			if (read_len == sizeof(struct batadv_icmp_packet_rr)) {
 				if (last_rr_cur == icmp_packet_in.rr_cur &&
@@ -302,8 +315,8 @@ static int ping(struct state *state, int argc, char **argv)
 		if (loop_count == 0)
 			continue;
 
-		if (loop_interval > 0)
-			sleep(loop_interval);
+		if (loop_interval.tv_sec > 0 || loop_interval.tv_nsec > 0)
+			nanosleep(&loop_interval, NULL);
 		else if ((tv.tv_sec != 0) || (tv.tv_usec != 0))
 			select(0, NULL, NULL, NULL, &tv);
 	}
@@ -328,9 +341,9 @@ static int ping(struct state *state, int argc, char **argv)
 
 	printf("--- %s ping statistics ---\n", dst_string);
 	printf("%u packets transmitted, %u received, %u%% packet loss\n",
-	       packets_out, packets_in, packets_loss);
+		packets_out, packets_in, packets_loss);
 	printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n",
-	       min, avg, max, mdev);
+		min, avg, max, mdev);
 
 	if (packets_in)
 		ret = EXIT_SUCCESS;
Signature · 1 line
2.39.5 (Apple Git-154)
#1 lore raw
Quoted 11 lines · On Saturday, 4 January 2025 02:36:45 GMT+1 Noah Peterson wrote:

Modify the batctl ping utility to accept both integer and floating-point values for the interval between sending pings. This enhancement allows specifying intervals with subsecond precision.

For example:
sudo batctl ping aa:bb:cc:dd:ee:ff -i 0.5

---
v4: Rebasing on latest commit, reformatting into reverse X-mas tree order based on feedback from Sven <[email protected]>

Patch was not marked as v4 in the Subject line

Quoted 4 lines

v3: Rebasing on latest commit, reformatting code based on comments by Sven <[email protected]>
v2: Fixing use-after-free, adding a missing header file, noted by Sven <[email protected]>

All the changelogs you added after the v1 are basically wrong (or incomplete)

[...]

Quoted 1 line

+ found_args += ((*((char*)(optarg - 1)) == optchar ) ? 1 : 2);

ERROR: "(foo*)" should be "(foo *)"
#63: FILE: ping.c:120:
+ found_args += ((*((char*)(optarg - 1)) == optchar ) ? 1 : 2);

ERROR: space prohibited before that close parenthesis ')' #63: FILE: ping.c:120:
+ found_args += ((*((char*)(optarg - 1)) == optchar ) ? 1 : 2);

Please change it back to the original form.

ping.c static int ping(struct state *state, int argc, char **argv) · line 197

Quoted 9 lines
ping.c +1 -1
@@ -178,7 +191,7 @@ static int ping(struct state *state, int argc, char **argv)
 	}
 
 	printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string,
-	       packet_len, packet_len + 28);
+		packet_len, packet_len + 28);
 
 	while (!is_aborted) {
 		tv.tv_sec = timeout;

This has nothing to do with the thing this patch is supposed to do. And it is also misaligning things. Please stop this.

ping.c static int ping(struct state *state, int argc, char **argv) · line 243

Quoted 9 lines
ping.c +1 -1
@@ -224,7 +237,7 @@ static int ping(struct state *state, int argc, char **argv)
 
 		if ((size_t)read_len < packet_len) {
 			printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n",
-			       packet_len, read_len);
+				packet_len, read_len);
 			goto sleep;
 		}
 

This has nothing to do with the thing this patch is supposed to do. And it is also misaligning things. Please stop this.

Quoted 5 lines
ping.c +0 -1
@@ -236,10 +249,10 @@ static int ping(struct state *state, int argc, char **argv)
 		case BATADV_ECHO_REPLY:
 			time_delta = end_timer();
 			printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms",
-			       read_len, dst_string,

ping.c static int ping(struct state *state, int argc, char **argv) · line 258

Quoted 10 lines
ping.c +4 -3
-			       ntohs(icmp_packet_in.seqno),
-			       icmp_packet_in.ttl,
-			       time_delta);
+					read_len, dst_string,
+					ntohs(icmp_packet_in.seqno),
+					icmp_packet_in.ttl,
+					time_delta);
 
 			if (read_len == sizeof(struct batadv_icmp_packet_rr)) {
 				if (last_rr_cur == icmp_packet_in.rr_cur &&

This has nothing to do with the thing this patch is supposed to do. And it is also misaligning things. Please stop this.

ping.c static int ping(struct state *state, int argc, char **argv) · line 349

Quoted 12 lines
ping.c +2 -2
@@ -328,9 +341,9 @@ static int ping(struct state *state, int argc, char **argv)
 
 	printf("--- %s ping statistics ---\n", dst_string);
 	printf("%u packets transmitted, %u received, %u%% packet loss\n",
-	       packets_out, packets_in, packets_loss);
+		packets_out, packets_in, packets_loss);
 	printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n",
-	       min, avg, max, mdev);
+		min, avg, max, mdev);
 
 	if (packets_in)
 		ret = EXIT_SUCCESS;

This has nothing to do with the thing this patch is supposed to do. And it is also misaligning things. Please stop this.

Kind regards,
Sven

#2 lore raw
In reply to Noah Peterson
Quoted 7 lines · On Saturday, 4 January 2025 02:36:45 GMT+1 Noah Peterson wrote:
ping.c +1 -0
@@ -58,12 +59,16 @@ static int ping(struct state *state, int argc, char **argv)
        struct batadv_icmp_packet_rr icmp_packet_out;
        struct batadv_icmp_packet_rr icmp_packet_in;
        uint8_t last_rr[BATADV_RR_LEN][ETH_ALEN];
+       struct timespec loop_interval = {0, 0};
        struct ether_addr *dst_mac = NULL;
        struct ether_addr *rr_mac = NULL;

ping.c static int ping(struct state *state, int argc, char **argv) · line 74

Quoted 10 lines
ping.c +3 -0
        int disable_translate_mac = 0;
+       double fractional_part = 0.0;
        unsigned int seq_counter = 0;
        unsigned int packets_out = 0;
        unsigned int packets_in = 0;
+       double ping_interval = 0.0;
+       double integral_part = 0.0;
        unsigned int packets_loss;
        struct bat_host *bat_host;
        struct bat_host *rr_host;

The code doesn't build:

CC ping.o
ping.c: In function ‘ping’:
ping.c:77:13: error: conflicting types for ‘loop_interval’; have ‘int’

   77 |         int loop_interval = 0;
      |             ^~~~~~~~~~~~~
ping.c:62:25: note: previous definition of ‘loop_interval’ with type ‘struct timespec’
   62 |         struct timespec loop_interval = {0, 0};
      |                         ^~~~~~~~~~~~~
ping.c:110:57: error: ‘end’ undeclared (first use in this function); did you mean ‘send’?
  110 |                         ping_interval = strtod(optarg, &end);
      |                                                         ^~~
      |                                                         send
ping.c:110:57: note: each undeclared identifier is reported only once for each function it appears in
ping.c:77:13: warning: unused variable ‘loop_interval’ [-Wunused-variable]
   77 |         int loop_interval = 0;
      |             ^~~~~~~~~~~~~

Kind regards,
Sven