From: Donald Sharp <sharpd@nvidia.com>
Date: Wed, 19 Mar 2025 16:39:37 +0000 (-0400)
Subject: zebra: Add timestamp to output
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F18431%2Fhead;p=mirror%2Ffrr.git

zebra: Add timestamp to output

It's interesting to know the time we received the route.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/zebra/fpm_listener.c b/zebra/fpm_listener.c
index 00c3c3e6f5..70dcaf91a1 100644
--- a/zebra/fpm_listener.c
+++ b/zebra/fpm_listener.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <time.h>
 
 #ifdef GNU_LINUX
 #include <stdint.h>
@@ -70,6 +71,24 @@ get_print_buf(size_t *buf_len)
 	return &print_bufs[counter][0];
 }
 
+/*
+ * get_timestamp
+ * Returns a timestamp string.
+ */
+static const char *get_timestamp(void)
+{
+	static char timestamp[64];
+	struct timespec ts;
+	struct tm tm;
+
+	clock_gettime(CLOCK_REALTIME, &ts);
+	localtime_r(&ts.tv_sec, &tm);
+	snprintf(timestamp, sizeof(timestamp), "%04d-%02d-%02d %02d:%02d:%02d.%09ld",
+		 tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
+		 ts.tv_nsec);
+	return timestamp;
+}
+
 /*
  * create_listen_sock
  */
@@ -131,7 +150,7 @@ static int accept_conn(int listen_sock)
 			      &client_len);
 
 		if (sock >= 0) {
-			fprintf(glob->output_file, "Accepted client %s\n",
+			fprintf(glob->output_file, "[%s] Accepted client %s\n", get_timestamp(),
 				inet_ntop(AF_INET, &client_addr.sin_addr, buf, sizeof(buf)));
 			return sock;
 		}
@@ -585,12 +604,10 @@ static int netlink_msg_ctx_snprint(struct netlink_msg_ctx *ctx, char *buf,
 	cur = buf;
 	end = buf + buf_len;
 
-	cur += snprintf(cur, end - cur, "%s %s/%d, Prot: %s(%u)",
+	cur += snprintf(cur, end - cur, "[%s] %s %s/%d, Prot: %s(%u)", get_timestamp(),
 			netlink_msg_type_to_s(hdr->nlmsg_type),
-			addr_to_s(rtmsg->rtm_family, RTA_DATA(ctx->dest)),
-			rtmsg->rtm_dst_len,
-			netlink_prot_to_s(rtmsg->rtm_protocol),
-			rtmsg->rtm_protocol);
+			addr_to_s(rtmsg->rtm_family, RTA_DATA(ctx->dest)), rtmsg->rtm_dst_len,
+			netlink_prot_to_s(rtmsg->rtm_protocol), rtmsg->rtm_protocol);
 
 	if (ctx->metric)
 		cur += snprintf(cur, end - cur, ", Metric: %d", *ctx->metric);
@@ -712,8 +729,9 @@ static void parse_netlink_msg(char *buf, size_t buf_len, fpm_msg_hdr_t *fpm)
 
 			if (glob->reflect && hdr->nlmsg_type == RTM_NEWROUTE &&
 			    ctx->rtmsg->rtm_protocol > RTPROT_STATIC) {
-				fprintf(glob->output_file, "  Route %s(%u) reflecting back as %s\n",
-					netlink_prot_to_s(ctx->rtmsg->rtm_protocol),
+				fprintf(glob->output_file,
+					"[%s] Route %s(%u) reflecting back as %s\n",
+					get_timestamp(), netlink_prot_to_s(ctx->rtmsg->rtm_protocol),
 					ctx->rtmsg->rtm_protocol,
 					glob->reflect_fail_all ? "Offload Failed" : "Offloaded");
 				if (glob->reflect_fail_all)
@@ -725,8 +743,9 @@ static void parse_netlink_msg(char *buf, size_t buf_len, fpm_msg_hdr_t *fpm)
 			break;
 
 		default:
-			fprintf(glob->output_file, "Ignoring netlink message - Type: %s(%d)\n",
-				netlink_msg_type_to_s(hdr->nlmsg_type), hdr->nlmsg_type);
+			fprintf(glob->output_file, "[%s] Ignoring netlink message - Type: %s(%d)\n",
+				get_timestamp(), netlink_msg_type_to_s(hdr->nlmsg_type),
+				hdr->nlmsg_type);
 		}
 	}
 }
@@ -736,8 +755,8 @@ static void parse_netlink_msg(char *buf, size_t buf_len, fpm_msg_hdr_t *fpm)
  */
 static void process_fpm_msg(fpm_msg_hdr_t *hdr)
 {
-	fprintf(glob->output_file, "FPM message - Type: %d, Length %d\n", hdr->msg_type,
-		ntohs(hdr->msg_len));
+	fprintf(glob->output_file, "[%s] FPM message - Type: %d, Length %d\n", get_timestamp(),
+		hdr->msg_type, ntohs(hdr->msg_len));
 
 	if (hdr->msg_type != FPM_MSG_TYPE_NETLINK) {
 		fprintf(stderr, "Unknown fpm message type %u\n", hdr->msg_type);