Index: stable/11/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c =================================================================== --- stable/11/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c (revision 330728) +++ stable/11/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c (revision 330729) @@ -1,141 +1,191 @@ /* $NetBSD: t_socketpair.c,v 1.2 2017/01/13 20:04:52 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Christos Zoulas. * * 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. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the NetBSD * Foundation, Inc. and its contributors. * 4. Neither the name of The NetBSD Foundation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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 __RCSID("$NetBSD: t_socketpair.c,v 1.2 2017/01/13 20:04:52 christos Exp $"); #include #include #include #include #include #include #include static void connected(int fd) { struct sockaddr_un addr; socklen_t len = (socklen_t)sizeof(addr); ATF_REQUIRE(getpeername(fd, (struct sockaddr*)(void *)&addr, &len) == 0); } static void -run(int flags) +run(int domain, int type, int flags) { int fd[2], i; while ((i = open("/", O_RDONLY)) < 3) ATF_REQUIRE(i != -1); #ifdef __FreeBSD__ closefrom(3); #else ATF_REQUIRE(closefrom(3) != -1); #endif - ATF_REQUIRE(socketpair(AF_UNIX, SOCK_DGRAM | flags, 0, fd) == 0); + ATF_REQUIRE(socketpair(domain, type | flags, 0, fd) == 0); ATF_REQUIRE(fd[0] == 3); ATF_REQUIRE(fd[1] == 4); connected(fd[0]); connected(fd[1]); if (flags & SOCK_CLOEXEC) { ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) != 0); ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) != 0); } else { ATF_REQUIRE((fcntl(fd[0], F_GETFD) & FD_CLOEXEC) == 0); ATF_REQUIRE((fcntl(fd[1], F_GETFD) & FD_CLOEXEC) == 0); } if (flags & SOCK_NONBLOCK) { ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) != 0); ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) != 0); } else { ATF_REQUIRE((fcntl(fd[0], F_GETFL) & O_NONBLOCK) == 0); ATF_REQUIRE((fcntl(fd[1], F_GETFL) & O_NONBLOCK) == 0); } ATF_REQUIRE(close(fd[0]) != -1); ATF_REQUIRE(close(fd[1]) != -1); } +ATF_TC(inet); +ATF_TC_HEAD(inet, tc) +{ + atf_tc_set_md_var(tc, "descr", + "socketpair(2) does not work in the PF_INET domain"); +} + +ATF_TC_BODY(inet, tc) +{ + int fd[2]; + + ATF_REQUIRE_EQ(socketpair(PF_INET, SOCK_DGRAM, 0, fd), -1); + ATF_REQUIRE_EQ(EOPNOTSUPP, errno); + ATF_REQUIRE_EQ(socketpair(PF_INET, SOCK_STREAM, 0, fd), -1); + ATF_REQUIRE_EQ(EOPNOTSUPP, errno); +} + +ATF_TC(null_sv); +ATF_TC_HEAD(null_sv, tc) +{ + atf_tc_set_md_var(tc, "descr", + "socketpair(2) should fail without return storage"); +} + +ATF_TC_BODY(null_sv, tc) +{ + int fd; + + closefrom(3); + ATF_REQUIRE_EQ(socketpair(AF_UNIX, SOCK_DGRAM, 0, NULL), -1); + ATF_REQUIRE_EQ(EFAULT, errno); + fd = open("/", O_RDONLY); + ATF_REQUIRE_EQ_MSG(fd, 3, + "socketpair(..., NULL) allocated descriptors"); +} + ATF_TC(socketpair_basic); ATF_TC_HEAD(socketpair_basic, tc) { atf_tc_set_md_var(tc, "descr", "A basic test of socketpair(2)"); } ATF_TC_BODY(socketpair_basic, tc) { - run(0); + run(AF_UNIX, SOCK_DGRAM, 0); } ATF_TC(socketpair_nonblock); ATF_TC_HEAD(socketpair_nonblock, tc) { atf_tc_set_md_var(tc, "descr", "A non-blocking test of socketpair(2)"); } ATF_TC_BODY(socketpair_nonblock, tc) { - run(SOCK_NONBLOCK); + run(AF_UNIX, SOCK_DGRAM, SOCK_NONBLOCK); } ATF_TC(socketpair_cloexec); ATF_TC_HEAD(socketpair_cloexec, tc) { atf_tc_set_md_var(tc, "descr", "A close-on-exec of socketpair(2)"); } ATF_TC_BODY(socketpair_cloexec, tc) { - run(SOCK_CLOEXEC); + run(AF_UNIX, SOCK_DGRAM, SOCK_CLOEXEC); } +ATF_TC(socketpair_stream); +ATF_TC_HEAD(socketpair_stream, tc) +{ + atf_tc_set_md_var(tc, "descr", "A stream-oriented socketpair(2)"); +} + +ATF_TC_BODY(socketpair_stream, tc) +{ + run(AF_UNIX, SOCK_STREAM, 0); +} + ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, inet); + ATF_TP_ADD_TC(tp, null_sv); ATF_TP_ADD_TC(tp, socketpair_basic); ATF_TP_ADD_TC(tp, socketpair_nonblock); ATF_TP_ADD_TC(tp, socketpair_cloexec); + ATF_TP_ADD_TC(tp, socketpair_stream); return atf_no_error(); } Index: stable/11/tools/regression/sockets/socketpair/socketpair.c =================================================================== --- stable/11/tools/regression/sockets/socketpair/socketpair.c (revision 330728) +++ stable/11/tools/regression/sockets/socketpair/socketpair.c (nonexistent) @@ -1,161 +0,0 @@ -/*- - * Copyright (c) 2004 Robert N. M. Watson - * All rights reserved. - * - * 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. - * - * $FreeBSD$ - */ - -#include -#include - -#include -#include -#include -#include -#include - -/* - * Open, then close a set of UNIX domain socket pairs for datagram and - * stream. - * - * Confirm that we can't open INET datagram or stream socket pairs. - * - * More tests should be added, including confirming that sending on either - * endpoint results in data at the other, that the right kind of socket was - * created (stream vs. datagram), and that message boundaries fall in the - * right places. - */ -int -main(void) -{ - int fd1, fd2, fd3; - int sv[2]; - - /* - * UNIX domain socket pair, datagram. - */ - if (socketpair(PF_UNIX, SOCK_DGRAM, 0, sv) != 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_DGRAM): %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (close(sv[0]) != 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_DGRAM) close 0: %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (close(sv[1]) != 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_DGRAM) close 1: %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - - /* - * UNIX domain socket pair, stream. - */ - if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) != 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_STREAM): %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (close(sv[0]) != 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_STREAM) close 0: %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (close(sv[1]) != 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_STREAM) close 1: " - "%s\n", strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - - /* - * Confirm that PF_INET datagram socket pair creation fails. - */ - if (socketpair(PF_INET, SOCK_DGRAM, 0, sv) == 0) { - fprintf(stderr, "socketpair(PF_INET, SOCK_DGRAM): opened\n"); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (errno != EOPNOTSUPP) { - fprintf(stderr, "socketpair(PF_INET, SOCK_DGRAM): %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - } - - /* - * Confirm that PF_INET stream socket pair creation fails. - */ - if (socketpair(PF_INET, SOCK_STREAM, 0, sv) == 0) { - fprintf(stderr, "socketpair(PF_INET, SOCK_STREAM): opened\n"); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (errno != EOPNOTSUPP) { - fprintf(stderr, "socketpair(PF_INET, SOCK_STREAM): %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - } - - /* - * Check for sequential fd allocation, and give up early if not. - */ - fd1 = dup(STDIN_FILENO); - fd2 = dup(STDIN_FILENO); - if (fd2 != fd1 + 1) { - fprintf(stderr, "Non-sequential fd allocation\n"); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - - /* Allocate a socketpair using a bad destination address. */ - if (socketpair(PF_UNIX, SOCK_DGRAM, 0, NULL) == 0) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_DGRAM, NULL): opened\n"); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - if (errno != EFAULT) { - fprintf(stderr, "socketpair(PF_UNIX, SOCK_DGRAM, NULL): %s\n", - strerror(errno)); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - - /* Allocate a file descriptor and make sure it's fd2+1. */ - fd3 = dup(STDIN_FILENO); - if (fd3 != fd2 + 1) { - fprintf(stderr, "socketpair(..., NULL) allocated descriptors\n"); - fprintf(stderr, "FAIL\n"); - exit(-1); - } - - fprintf(stderr, "PASS\n"); - exit(0); -} Property changes on: stable/11/tools/regression/sockets/socketpair/socketpair.c ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: stable/11/tools/regression/sockets/socketpair/Makefile =================================================================== --- stable/11/tools/regression/sockets/socketpair/Makefile (revision 330728) +++ stable/11/tools/regression/sockets/socketpair/Makefile (nonexistent) @@ -1,9 +0,0 @@ -# -# $FreeBSD$ -# - -PROG= socketpair -MAN= -WARNS?= 6 - -.include Property changes on: stable/11/tools/regression/sockets/socketpair/Makefile ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: stable/11 =================================================================== --- stable/11 (revision 330728) +++ stable/11 (revision 330729) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r329108