diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240XXX: TCP implied connect demo test removed +OLD_FILES+=usr/tests/netinet/tcp_implied_connect + # 20240307: Improperly installed awk tests removed OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/missing-precision.ok OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/negative-nf.ok diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1063,45 +1063,6 @@ tp->t_acktime = ticks; sbappendstream(&so->so_snd, m, flags); m = NULL; - if (nam && tp->t_state < TCPS_SYN_SENT) { - KASSERT(tp->t_state == TCPS_CLOSED, - ("%s: tp %p is listening", __func__, tp)); - - /* - * Do implied connect if not yet connected, - * initialize window to default value, and - * initialize maxseg using peer's cached MSS. - */ -#ifdef INET6 - if (isipv6) - error = tcp6_connect(tp, sin6, td); -#endif /* INET6 */ -#if defined(INET6) && defined(INET) - else -#endif -#ifdef INET - error = tcp_connect(tp, sinp, td); -#endif - /* - * The bind operation in tcp_connect succeeded. We - * no longer want to restore the flags if later - * operations fail. - */ - if (error == 0 || inp->inp_lport != 0) - restoreflags = false; - - if (error) { - /* m is freed if PRUS_NOTREADY is unset. */ - sbflush(&so->so_snd); - goto out; - } - if (IS_FASTOPEN(tp->t_flags)) - tcp_fastopen_connect(tp); - else { - tp->snd_wnd = TTCP_CLIENT_SND_WND; - tcp_mss(tp, -1); - } - } if (flags & PRUS_EOF) { /* * Close the send side of the connection after @@ -1403,8 +1364,7 @@ struct protosw tcp_protosw = { .pr_type = SOCK_STREAM, .pr_protocol = IPPROTO_TCP, - .pr_flags = PR_CONNREQUIRED | PR_IMPLOPCL | PR_WANTRCVD | - PR_CAPATTACH, + .pr_flags = PR_CONNREQUIRED | PR_WANTRCVD | PR_CAPATTACH, .pr_ctloutput = tcp_ctloutput, .pr_abort = tcp_usr_abort, .pr_accept = tcp_usr_accept, @@ -1431,8 +1391,7 @@ struct protosw tcp6_protosw = { .pr_type = SOCK_STREAM, .pr_protocol = IPPROTO_TCP, - .pr_flags = PR_CONNREQUIRED | PR_IMPLOPCL |PR_WANTRCVD | - PR_CAPATTACH, + .pr_flags = PR_CONNREQUIRED | PR_WANTRCVD | PR_CAPATTACH, .pr_ctloutput = tcp_ctloutput, .pr_abort = tcp_usr_abort, .pr_accept = tcp6_usr_accept, diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -11,7 +11,6 @@ so_reuseport_lb_test \ socket_afinet \ tcp_connect_port_test \ - tcp_implied_connect \ tcp_md5_getsockopt ATF_TESTS_SH= arp \ diff --git a/tests/sys/netinet/tcp_implied_connect.c b/tests/sys/netinet/tcp_implied_connect.c deleted file mode 100644 --- a/tests/sys/netinet/tcp_implied_connect.c +++ /dev/null @@ -1,79 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2024 Gleb Smirnoff - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include - -ATF_TC_WITHOUT_HEAD(tcp_implied_connect); -ATF_TC_BODY(tcp_implied_connect, tc) -{ - struct sockaddr_in sin = { - .sin_family = AF_INET, - .sin_len = sizeof(sin), - }; - const char buf[] = "hello"; - char repl[sizeof(buf)]; - 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); - ATF_REQUIRE(listen(s, -1) == 0); -#if 0 - /* - * The disabled code is that you would normally do. - */ - ATF_REQUIRE(connect(c, (struct sockaddr *)&sin, sizeof(sin)) == 0); - ATF_REQUIRE(send(c, &buf, sizeof(buf), 0) == sizeof(buf)); -#else - /* - * And this is implied connect. - */ - ATF_REQUIRE(sendto(c, &buf, sizeof(buf), 0, (struct sockaddr *)&sin, - sizeof(sin)) == sizeof(buf)); -#endif - - ATF_REQUIRE((a = accept(s, NULL, NULL)) != 1); - ATF_REQUIRE(recv(a, &repl, sizeof(repl), 0) == sizeof(buf)); - ATF_REQUIRE(strcmp(buf, repl) == 0); -} - -ATF_TP_ADD_TCS(tp) -{ - ATF_TP_ADD_TC(tp, tcp_implied_connect); - - return (atf_no_error()); -}