git: b5bff921452e - main - syslogd/tests: wait for tcpdump before sending the message
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 20:07:51 UTC
The branch main has been updated by olivier:
URL: https://cgit.FreeBSD.org/src/commit/?id=b5bff921452e4dcbe6c50f82ed4c7c07881d68e4
commit b5bff921452e4dcbe6c50f82ed4c7c07881d68e4
Author: Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2026-11-17 19:26:46 +0000
Commit: Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2026-11-17 20:01:56 +0000
syslogd/tests: wait for tcpdump before sending the message
The forwarded and relayed format tests could send the message before tcpdump
attached to lo0, so "tcpdump -c 1" never saw it and the test hung until the
300s timeout. Also make syslogd_stop_on_ports stop every port it is given.
Reviewed by: markj
Approved by: markj
Sponsored by: Netflix
Differential Revision: https://ron-dev.freebsd.org/FreeBSD/src/pulls/108
---
usr.sbin/syslogd/tests/syslogd_format_test_common.sh | 18 +++++++++++++++---
.../syslogd/tests/syslogd_forwarded_format_test.sh | 5 +++--
usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh | 7 ++++---
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh
index ea32561ccbb3..cf2ecf09ba5f 100644
--- a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh
+++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh
@@ -57,6 +57,20 @@ set_common_atf_metadata()
atf_set require.user root
}
+# Wait for a background "tcpdump -w" to start capturing. tcpdump
+# creates the pcap file only after it attaches the BPF filter, so a
+# packet sent earlier is missed and "tcpdump -c 1" never exits.
+tcpdump_wait_ready()
+{
+ local pid="$1"
+ local pcapfile="$2"
+
+ while [ ! -e "${pcapfile}" ]; do
+ kill -0 "${pid}" 2>/dev/null || atf_fail "tcpdump exited early"
+ sleep 0.1
+ done
+}
+
# Wrapper with better semantic name for networking context
syslogd_start_on_port()
{
@@ -75,9 +89,7 @@ syslogd_start_on_port()
# Wrapper with better semantic name for networking context
syslogd_stop_on_ports()
{
- local ports="$@"
-
- for port in "${ports}"; do
+ for port in "$@"; do
syslogd_stop \
"$(pid_filename ${port})" \
"$(local_socket_filename ${port})" \
diff --git a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh
index db607a33d093..81e1b7d13b3e 100644
--- a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh
+++ b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh
@@ -22,6 +22,7 @@ setup_forwarded_format_test()
tcpdump --immediate-mode -c 1 -i lo0 -w "${pcapfile}" \
dst port "${SERVER_1_PORT}" &
tcpdump_pid="$!"
+ tcpdump_wait_ready "${tcpdump_pid}" "${pcapfile}"
# Start first server: receive UDP, log to file
printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "$(config_filename ${SERVER_1_PORT})"
@@ -111,8 +112,8 @@ O_flag_rfc3164strict_forwarded_body()
O_flag_rfc3164strict_forwarded_cleanup()
{
syslogd_stop_on_ports \
- "${SYSLOGD_UDP_PORT_1}" \
- "${SYSLOGD_UDP_PORT_2}"
+ "${SERVER_1_PORT}" \
+ "${SERVER_2_PORT}"
}
atf_test_case "O_flag_syslog_forwarded" "cleanup"
diff --git a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh
index 6a5aeba77a25..121a9ad97187 100644
--- a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh
+++ b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh
@@ -23,6 +23,7 @@ setup_relayed_format_test()
tcpdump --immediate-mode -c 1 -i lo0 -w "${pcapfile}" dst port \
"${SERVER_1_PORT}" &
tcpdump_pid="$!"
+ tcpdump_wait_ready "${tcpdump_pid}" "${pcapfile}"
# Start first (central) server: receive UDP, log to file
printf "user.debug\t${SYSLOGD_LOGFILE}\n" \
@@ -118,9 +119,9 @@ O_flag_rfc3164strict_relayed_body()
O_flag_rfc3164strict_relayed_cleanup()
{
syslogd_stop_on_ports \
- "${SYSLOGD_UDP_PORT_1}" \
- "${SYSLOGD_UDP_PORT_2}" \
- "${SYSLOGD_UDP_PORT_3}"
+ "${SERVER_1_PORT}" \
+ "${SERVER_2_PORT}" \
+ "${SERVER_3_PORT}"
}
atf_test_case "O_flag_syslog_relayed" "cleanup"