From nobody Tue Nov 17 20:07:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jTbPh28mvz71mXv for ; Tue, 17 Nov 2026 20:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTbPg6xt5z3MXt for ; Tue, 17 Nov 2026 20:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794946072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rpr5gLAK1fvHftGk6DeUAOFZkTzc1qkzBuB5s1CEToY=; b=fomHSOOb9z33vxCCmHe5+KHLWguMUdewt9iVPRI/YxwR/jNn04H7oZ9IACmA5KqRay0YxY e63zTH2JsF5foI8582b/lVPGvf4Z7kVveIDbg6LpH6vhcL2EX/pVd2xCBDYHo6vDnvvaDJ JeUmTFivw+iNnLpUmbSEr1S4TweDlDwe3XhhumAuBoyWp4mH+nwv94w1ELE9Xbju9Qiil0 QMMnjgdcHNGiBTjgGYZjRDsebAEeHE4NPTIhGmoAuSfbmkFxBqhKm15D2rKFOL00wPJGEg xywXgzXx/gIRVpZ7W9FeaPmuj6WvNxzyNRGuvL6iSTrRzYxSH6J0K6OIYrhC3Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794946072; b=FekuRMXgd1q2zQ76p5PYCsKlurJ8djVtkzCH43nRA6x7Ddvv95E9QzqhCLhIQzPjYCt1ND tdTMEqmpjfBrfLYq5zslgslEzNOzKdDjKPzlxJHWFuOpcRw59OivE3TaYMZj+74pQkinXx L70ZtueYE//4e70CzzlUfYcwM6uteaQZO6p2cINGm6J1GbOwuKhWZoAURl55ToEWtTldp6 /cjJfT94RCyVtYBr1r9dpcfhFSyUuPWZ0mzbrzkaVWfCvbwIRwPaCIVjmYCJRvXBDGftrD aBxXHuAb1emENHIf79E/86/le54lEBKM4YZyAgyUuB9IcWP8LCn34AvjQLebRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794946072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rpr5gLAK1fvHftGk6DeUAOFZkTzc1qkzBuB5s1CEToY=; b=eeTBl4Aj2+WS4I/PCTom/zq7Qs1vwhPuYa/3Hi1cpVylzIszqBQUu/WTGFr6oQXTN7pQbw vRuPQZWhD9KGAHBae+D0/l7M9RJ01ZSv6Byr84z8gB7mpquML3i+hY88PIeeAUrUB89nEz rFbpVdH2n812f0ElPyyBHMc7Q6aLTMdYekJpTujCreWl35gObXysq9INOUVNo/zTCp2DZf K44VAzDUllLa7lGBZJkIOgFKVC5ZCaK7gMWjNJqO6r9NdRsLbyV4RaK8GxhriCjhNvuvNL Bjuep8o04tENq+WSlYrSHwEraV2jPF6DPAkAqYYhSzvNPYos44Vl1nE3Mf3KKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTbPg5l7kzxmw for ; Tue, 17 Nov 2026 20:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11d5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 20:07:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: b5bff921452e - main - syslogd/tests: wait for tcpdump before sending the message List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5bff921452e4dcbe6c50f82ed4c7c07881d68e4 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 20:07:51 +0000 Message-Id: <6afcb417.11d5a.375f795c@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=b5bff921452e4dcbe6c50f82ed4c7c07881d68e4 commit b5bff921452e4dcbe6c50f82ed4c7c07881d68e4 Author: Olivier Cochard AuthorDate: 2026-11-17 19:26:46 +0000 Commit: Olivier Cochard 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"