From nobody Tue Mar 24 21:25:24 2026 X-Original-To: dev-commits-src-main@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 4fgNP11Tr9z6WDGp for ; Tue, 24 Mar 2026 21:25:25 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fgNP06g6lz4JfR for ; Tue, 24 Mar 2026 21:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774387524; 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=NIhgyODH+Oo/hpEc62kELdIz+c8nPdrRnY4Ui+vImMw=; b=tlLvyY7laKG5jtzjRSfcq5bHBkTcryB64d3AIQxjYXdwpKtwRZqSQ33NZEvjUEhhk4cvKq Os5/h2AQ0147IhcGU7HLoNAaSGjJwS9T/b9hb+/Z+oILl6PGQxsLdHO1lXwAa6ulE0GxQZ JbqrzRYoCRvompblWtwp2fDGeB8U9IZQmWtKEKjVArEoWxVOPJhG2mLa/BxUF7fihmnUrN I19hpcFYI2gLQ/1uucDdhFMCmHvgOIr++hctTLfpZxTde0fpKC2K6aWtnXpwqtuDBnHLHu n/6gU/Dd5H61tIaikGjctcYe5TE61K2Dbpoo8eN2RQdHdZmuc+GdhhrQJWmzkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774387524; a=rsa-sha256; cv=none; b=CP3N7s4/wIeutY/BwxLee1rIbRcTUcvAEPBdQOJYCpn+vXoCzZUf3udy61PTEZcd/C+Yqy DkE96nLH04OHSsHLIfTAs2qp4NU2u8NfWT1bnvWtwpRxykueLmMaaOtyHuRQuAClaj8F5D +sq5Hc4BR2I2QkhSDM2QCQKdh8XGHF+EErI4V+Ulq3PFZTkgX4zWiQ4jKSxwefWy1S+BFF UjVxOAuxe5VWqz0QLAEzALLxnMya+EuhIk+lmqJJ1KaAuPCMxiToccKedx1xTDNJvir0ZO atq7zA/E6sV3pJ6cjWHY5hlQmIU5HljRnWsk3mPu6yMkhIDDm2Tt3vqnYGcEyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774387524; 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=NIhgyODH+Oo/hpEc62kELdIz+c8nPdrRnY4Ui+vImMw=; b=vixC85PEFRmD+3j9YLl/zY+d4XpQWnRMoANtvKWA00wIm1JT+cq2Tc68pX4Jblq86hYnLD MfmmwRCC0C7/6+hBMLVqDu2XMSjM6iakQR/tPa0hA8mXoKu02wAoWT502eU619+Ug6AKgF Io8Fj1aw0YNS3tbbZUUz4Yms389a4sJaEwWXgHuXttIsPW+hMg1+DgYeDBbBplXtPdjP0Z 4XuXS7P1cSBgZHz0RE1SWdXYwSgDz1wKjVpEVUoSjFrrXxAtMAJHHN1CaoTVhJip5hcfP6 c+hZ8yvJ9SIEWlD/1SF7wtNYn9Yo4PE6c0YCTpXFg6e62jGF28J3+273E6oyQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgNP05knNzcWT for ; Tue, 24 Mar 2026 21:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 207df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 21:25:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: cd05c88058b5 - main - tests/netinet: add test for getsockname() on a disconnected TCP socket List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd05c88058b5b3684f0d7f3086afa21a944d9cd1 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 21:25:24 +0000 Message-Id: <69c30144.207df.1b6a4494@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cd05c88058b5b3684f0d7f3086afa21a944d9cd1 commit cd05c88058b5b3684f0d7f3086afa21a944d9cd1 Author: Gleb Smirnoff AuthorDate: 2026-03-24 20:51:59 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-24 21:24:58 +0000 tests/netinet: add test for getsockname() on a disconnected TCP socket Stack it into existing file that exercises an other corner case of our TCP and rename the file to a more generic name. --- ObsoleteFiles.inc | 3 ++ tests/sys/netinet/Makefile | 2 +- .../{tcp_implied_connect.c => tcp_socket.c} | 39 ++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1b5fe1dec9b3..0f8fd14e2c44 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20260324: test file renamed +OLD_FILES+=usr/tests/sys/netinet/tcp_implied_connect + # 20260302: Remove obsolete le(4) ethernet driver OLD_FILES+=usr/share/man/man4/le.4.gz diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 564eabae3313..42906aa2dd93 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -13,7 +13,7 @@ ATF_TESTS_C= broadcast \ so_reuseport_lb_test \ socket_afinet \ tcp_connect_port_test \ - tcp_implied_connect \ + tcp_socket \ tcp_md5_getsockopt \ udp_bindings \ udp_io diff --git a/tests/sys/netinet/tcp_implied_connect.c b/tests/sys/netinet/tcp_socket.c similarity index 70% rename from tests/sys/netinet/tcp_implied_connect.c rename to tests/sys/netinet/tcp_socket.c index d03d6be4fb92..668a3915adb7 100644 --- a/tests/sys/netinet/tcp_implied_connect.c +++ b/tests/sys/netinet/tcp_socket.c @@ -33,8 +33,8 @@ #include -ATF_TC_WITHOUT_HEAD(tcp_implied_connect); -ATF_TC_BODY(tcp_implied_connect, tc) +ATF_TC_WITHOUT_HEAD(implied_connect); +ATF_TC_BODY(implied_connect, tc) { struct sockaddr_in sin = { .sin_family = AF_INET, @@ -72,9 +72,42 @@ ATF_TC_BODY(tcp_implied_connect, tc) ATF_REQUIRE(strcmp(buf, repl) == 0); } +/* + * A disconnected TCP socket shall return the local address it used before + * it was disconnected. + */ +ATF_TC_WITHOUT_HEAD(getsockname_disconnected); +ATF_TC_BODY(getsockname_disconnected, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + }; + socklen_t len; + int s, c, a; + + ATF_REQUIRE(s = socket(PF_INET, SOCK_STREAM, 0)); + ATF_REQUIRE(c = socket(PF_INET, SOCK_STREAM, 0)); + + ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + len = sizeof(sin); + ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sin, &len) == 0); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + ATF_REQUIRE(listen(s, -1) == 0); + ATF_REQUIRE(connect(c, (struct sockaddr *)&sin, sizeof(sin)) == 0); + ATF_REQUIRE((a = accept(s, NULL, NULL)) != 1); + ATF_REQUIRE(close(a) == 0); + ATF_REQUIRE(getsockname(c, (struct sockaddr *)&sin, &len) == 0); + ATF_REQUIRE(sin.sin_addr.s_addr == htonl(INADDR_LOOPBACK)); + + close(c); + close(s); +} + ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, tcp_implied_connect); + ATF_TP_ADD_TC(tp, implied_connect); + ATF_TP_ADD_TC(tp, getsockname_disconnected); return (atf_no_error()); }