From a621f5233f1146966fb16efc2e78b0d63bf62c6a Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Sun, 19 Jan 2025 07:32:43 -0800
Subject: [PATCH] diod: log listen addresses

Problem: it may be useful, especially when debugging, to know
what ports and interfaces diod is listening on.

Log this when diod starts up.

Redirect log output to a file in tests/misc/t15 to avoid this causing
a test failure.
---
 src/libdiod/diod_rdma.c | 5 +++++
 src/libdiod/diod_sock.c | 3 +++
 tests/misc/Makefile.am  | 2 +-
 tests/misc/t15          | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libdiod/diod_rdma.c b/src/libdiod/diod_rdma.c
index 09d94ffa..503269c1 100644
--- a/src/libdiod/diod_rdma.c
+++ b/src/libdiod/diod_rdma.c
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/signal.h>
 #include <sys/param.h>
@@ -103,6 +104,10 @@ diod_rdma_listen (diod_rdma_t rdma)
     if (n)
         errn (n, "rdma_listen");
 
+    msg ("Listening on rdma %s:%d",
+         inet_ntoa (rdma->addr.sin_addr),
+         rdma_port);
+
     return 0;
 }
 
diff --git a/src/libdiod/diod_sock.c b/src/libdiod/diod_sock.c
index 47f3ac38..d2b710b0 100644
--- a/src/libdiod/diod_sock.c
+++ b/src/libdiod/diod_sock.c
@@ -177,6 +177,8 @@ _setup_one_inet (char *host, char *port, struct pollfd **fdsp, int *nfdsp)
             break;
         count++;
     }
+    if (count > 0)
+        msg ("Listening on %s:%s", host, port);
 done:
     if (res)
         freeaddrinfo (res);
@@ -211,6 +213,7 @@ _setup_one_unix (char *path, struct pollfd **fdsp, int *nfdsp)
     }
     if (_poll_add (fdsp, nfdsp, fd) < 0)
         goto error;
+    msg ("Listening on %s", path);
     return 1;
 error:
     if (fd != -1)
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 8785b2a8..9a942f70 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -28,4 +28,4 @@ LDADD = $(top_builddir)/src/cmd/opt.o \
 	$(top_builddir)/src/liblsd/liblsd.a \
 	$(LIBPTHREAD) $(LUA_LIB) $(LIBMUNGE) $(LIBCAP) $(LIBTCMALLOC)
 
-EXTRA_DIST = $(TESTS) $(TESTS:%=%.exp) memcheck valgrind.supp
+EXTRA_DIST = $(TESTS) memcheck valgrind.supp
diff --git a/tests/misc/t15 b/tests/misc/t15
index c7c7f5de..700ffe1d 100755
--- a/tests/misc/t15
+++ b/tests/misc/t15
@@ -12,7 +12,7 @@ bg_test ()
 TEST=$(basename $0 | cut -d- -f1)
 sockfile=$(mktemp)
 bg_test $sockfile &
-${MISC_SRCDIR}/memcheck ${TOP_BUILDDIR}/src/cmd/diod -c /dev/null -n -e ctl -l $sockfile -s >$TEST.out 2>&1
+${MISC_SRCDIR}/memcheck ${TOP_BUILDDIR}/src/cmd/diod -L $TEST.diod -c /dev/null -n -e ctl -l $sockfile -s >$TEST.out 2>&1
 diff ${MISC_SRCDIR}/$TEST.exp $TEST.out >$TEST.diff
 rm -f $sockfile
 wait %1