Date: Tue, 24 Mar 2026 21:25:24 +0000 From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cd05c88058b5 - main - tests/netinet: add test for getsockname() on a disconnected TCP socket Message-ID: <69c30144.207df.1b6a4494@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cd05c88058b5b3684f0d7f3086afa21a944d9cd1 commit cd05c88058b5b3684f0d7f3086afa21a944d9cd1 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2026-03-24 20:51:59 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> 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-c.h> -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()); }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c30144.207df.1b6a4494>