Index: stable/10/tools/regression/sockets/rtsocket/rtsocket.c =================================================================== --- stable/10/tools/regression/sockets/rtsocket/rtsocket.c (revision 294640) +++ stable/10/tools/regression/sockets/rtsocket/rtsocket.c (revision 294641) @@ -1,101 +1,101 @@ /*- * Copyright (c) 2006 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$ */ /* * Simple routing socket regression test: create and destroy a raw routing * socket, and make sure that dgram and stream don't work, socketpair, etc. */ #include #include #include #include #include #include int main(void) { int sock, socks[2]; sock = socket(PF_ROUTE, SOCK_STREAM, 0); if (sock >= 0) { close(sock); errx(-1, "socket(PF_ROUTE, SOCK_STREAM, 0) returned %d", sock); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socket(PF_ROUTE, SOCK_STREAM, 0)"); sock = socket(PF_ROUTE, SOCK_DGRAM, 0); if (sock >= 0) { close(sock); errx(-1, "socket(PF_ROUTE, SOCK_DGRAM, 0) returned %d", sock); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socket(PF_ROUTE, SOCK_DGRAM, 0)"); sock = socket(PF_ROUTE, SOCK_RAW, 0); if (sock < 0) err(-1, "socket(PF_ROUTE, SOCK_RAW, 0)"); close(sock); if (socketpair(PF_ROUTE, SOCK_STREAM, 0, socks) == 0) { close(socks[0]); close(socks[1]); errx(-1, "socketpair(PF_ROUTE, SOCK_STREAM, 0, socks) success"); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socketpair(PF_ROUTE, SOCK_STREAM, 0, socks)"); if (socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks) == 0) { close(socks[0]); close(socks[1]); errx(-1, "socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks) success"); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks)"); if (socketpair(PF_ROUTE, SOCK_RAW, 0, socks) == 0) { close(socks[0]); close(socks[1]); errx(-1, "socketpair(PF_ROUTE, SOCK_STREAM, 0, socks) success"); } return (0); } Index: stable/10/tools/regression/sockets/unix_socket/unix_socket.c =================================================================== --- stable/10/tools/regression/sockets/unix_socket/unix_socket.c (revision 294640) +++ stable/10/tools/regression/sockets/unix_socket/unix_socket.c (revision 294641) @@ -1,84 +1,84 @@ /*- * Copyright (c) 2006 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$ */ /* * Simple UNIX domain socket regression test: create and tear down various * supported and unsupported socket types. */ #include #include #include #include #include #include int main(void) { int sock, socks[2]; sock = socket(PF_LOCAL, SOCK_STREAM, 0); if (sock < 0) err(-1, "socket(PF_LOCAL, SOCK_STREAM, 0)"); close(sock); sock = socket(PF_LOCAL, SOCK_DGRAM, 0); if (sock < 0) err(-1, "socket(PF_LOCAL, SOCK_DGRAM, 0)"); close(sock); sock = socket(PF_LOCAL, SOCK_RAW, 0); if (sock >= 0) { close(sock); errx(-1, "socket(PF_LOCAL, SOCK_RAW, 0) returned %d", sock); } - if (errno != EPROTONOSUPPORT) + if (errno != EPROTOTYPE) err(-1, "socket(PF_LOCAL, SOCK_RAW, 0)"); if (socketpair(PF_LOCAL, SOCK_STREAM, 0, socks) < 0) err(-1, "socketpair(PF_LOCAL, SOCK_STREAM, 0, socks)"); if (socks[0] < 0) errx(-1, "socketpair(PF_LOCAL, SOCK_STREAM, 0, socks) [0] < 0"); if (socks[1] < 0) errx(-1, "socketpair(PF_LOCAL, SOCK_STREAM, 0, socks) [1] < 1"); close(socks[0]); close(socks[1]); if (socketpair(PF_LOCAL, SOCK_DGRAM, 0, socks) < 0) err(-1, "socketpair(PF_LOCAL, SOCK_DGRAM, 0, socks)"); if (socks[0] < 0) errx(-1, "socketpair(PF_LOCAL, SOCK_DGRAM, 0, socks) [0] < 0"); if (socks[1] < 0) errx(-1, "socketpair(PF_LOCAL, SOCK_DGRAM, 0, socks) [1] < 1"); close(socks[0]); close(socks[1]); return (0); } Index: stable/10 =================================================================== --- stable/10 (revision 294640) +++ stable/10 (revision 294641) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,2 ## Merged /head:r294125 Merged /user/ngie/socket-tests:r294117,294119