From 6124cd9932368253d6eb9363797c1b2a82673959 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 25 Jan 2016 22:20:54 +0000 Subject: [PATCH] tests: replace unix-yy.test with net-yy-unix.test Unlike the former test that was based on match_awk, the new one uses match_diff and does more rigorous testing. * tests/net-yy-unix.c: New file. * tests/net-yy-unix.test: New test. * tests/unix-yy.test: Remove. * tests/unix-yy-accept.awk: Remove. * tests/unix-yy-connect.awk: Remove. * tests/.gitignore: Add net-yy-unix. * tests/Makefile.am (check_PROGRAMS): Likewise. (TESTS): Replace unix-yy.test with net-yy-unix.test. (EXTRA_DIST): Remove unix-yy-accept.awk and unix-yy-connect.awk. --- tests/.gitignore | 1 + tests/Makefile.am | 5 +- tests/net-yy-unix.c | 227 +++++++++++++++++++++++ tests/{unix-yy.test => net-yy-unix.test} | 28 +-- tests/unix-yy-accept.awk | 85 --------- tests/unix-yy-connect.awk | 81 -------- 6 files changed, 240 insertions(+), 187 deletions(-) create mode 100644 tests/net-yy-unix.c rename tests/{unix-yy.test => net-yy-unix.test} (67%) delete mode 100644 tests/unix-yy-accept.awk delete mode 100644 tests/unix-yy-connect.awk diff --git a/tests/.gitignore b/tests/.gitignore index 10214d35..ad61dc4a 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -58,6 +58,7 @@ mmsg mq nanosleep net-accept-connect +net-yy-unix netlink_inet_diag netlink_unix_diag newfstatat diff --git a/tests/Makefile.am b/tests/Makefile.am index 7aa80093..fa884819 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -105,6 +105,7 @@ check_PROGRAMS = \ mq \ nanosleep \ net-accept-connect \ + net-yy-unix \ netlink_inet_diag \ netlink_unix_diag \ newfstatat \ @@ -246,6 +247,7 @@ TESTS = \ nanosleep.test \ net-fd.test \ net-yy.test \ + net-yy-unix.test \ net.test \ newfstatat.test \ oldselect.test \ @@ -292,7 +294,6 @@ TESTS = \ umount2.test \ umovestr.test \ umovestr2.test \ - unix-yy.test \ userfaultfd.test \ utime.test \ utimensat.test \ @@ -358,8 +359,6 @@ EXTRA_DIST = init.sh run.sh match.awk \ uid.awk \ uio.expected \ umovestr.expected \ - unix-yy-accept.awk \ - unix-yy-connect.awk \ wait.expected \ xattr.expected \ xselect.c \ diff --git a/tests/net-yy-unix.c b/tests/net-yy-unix.c new file mode 100644 index 00000000..424f00c2 --- /dev/null +++ b/tests/net-yy-unix.c @@ -0,0 +1,227 @@ +/* + * This file is part of net-yy-unix strace test. + * + * Copyright (c) 2013-2016 Dmitry V. Levin + * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 "tests.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int +main(int ac, const char **av) +{ + assert(ac == 2); + + struct sockaddr_un addr = { .sun_family = AF_UNIX }; + unsigned int sun_path_len = strlen(av[1]); + assert(sun_path_len > 0 && sun_path_len <= sizeof(addr.sun_path)); + strncpy(addr.sun_path, av[1], sizeof(addr.sun_path)); + struct sockaddr * const listen_sa = tail_memdup(&addr, sizeof(addr)); + + socklen_t * const len = tail_alloc(sizeof(socklen_t)); + *len = offsetof(struct sockaddr_un, sun_path) + strlen(av[1]) + 1; + if (*len > sizeof(addr)) + *len = sizeof(addr); + + int listen_fd = socket(PF_LOCAL, SOCK_STREAM, 0); + if (listen_fd < 0) + perror_msg_and_skip("socket"); + unsigned long listen_inode = inode_of_sockfd(listen_fd); + printf("socket(PF_LOCAL, SOCK_STREAM, 0) = %d\n", + listen_fd, listen_inode); + + (void) unlink(av[1]); + if (bind(listen_fd, listen_sa, *len)) + perror_msg_and_skip("bind"); + printf("bind(%d, {sa_family=AF_LOCAL, sun_path=\"%s\"}" + ", %u) = 0\n", listen_fd, listen_inode, av[1], (unsigned) *len); + + if (listen(listen_fd, 1)) + perror_msg_and_skip("listen"); + printf("listen(%d, 1) = 0\n", + listen_fd, listen_inode, av[1]); + + unsigned int * const optval = tail_alloc(sizeof(unsigned int)); + *len = sizeof(*optval); + if (getsockopt(listen_fd, SOL_SOCKET, SO_PASSCRED, optval, len)) + perror_msg_and_fail("getsockopt"); + printf("getsockopt(%d, SOL_SOCKET, SO_PASSCRED" + ", [%u], [%u]) = 0\n", + listen_fd, listen_inode, av[1], *optval, (unsigned) *len); + + memset(listen_sa, 0, sizeof(addr)); + *len = sizeof(addr); + if (getsockname(listen_fd, listen_sa, len)) + perror_msg_and_fail("getsockname"); + printf("getsockname(%d, {sa_family=AF_LOCAL" + ", sun_path=\"%s\"}, [%u]) = 0\n", listen_fd, listen_inode, + av[1], av[1], (unsigned) *len); + + int connect_fd = socket(PF_LOCAL, SOCK_STREAM, 0); + if (connect_fd < 0) + perror_msg_and_fail("socket"); + unsigned long connect_inode = inode_of_sockfd(connect_fd); + printf("socket(PF_LOCAL, SOCK_STREAM, 0) = %d\n", + connect_fd, connect_inode); + + if (connect(connect_fd, listen_sa, *len)) + perror_msg_and_fail("connect"); + printf("connect(%d, {sa_family=AF_LOCAL" + ", sun_path=\"%s\"}, %u) = 0\n", + connect_fd, connect_inode, av[1], (unsigned) *len); + + struct sockaddr * const accept_sa = tail_alloc(sizeof(addr)); + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); + int accept_fd = accept(listen_fd, accept_sa, len); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + unsigned long accept_inode = inode_of_sockfd(accept_fd); + printf("accept(%d, {sa_family=AF_LOCAL, NULL}" + ", [%u]) = %d%lu,\"%s\"]>\n", + listen_fd, listen_inode, av[1], (unsigned) *len, + accept_fd, accept_inode, connect_inode, av[1]); + + memset(listen_sa, 0, sizeof(addr)); + *len = sizeof(addr); + if (getpeername(connect_fd, listen_sa, len)) + perror_msg_and_fail("getpeername"); + printf("getpeername(%d%lu]>, {sa_family=AF_LOCAL" + ", sun_path=\"%s\"}, [%u]) = 0\n", connect_fd, connect_inode, + accept_inode, av[1], (unsigned) *len); + + char text[] = "text"; + assert(sendto(connect_fd, text, sizeof(text) - 1, MSG_DONTWAIT, NULL, 0) + == sizeof(text) - 1); + printf("sendto(%d%lu]>, \"%s\", %u, MSG_DONTWAIT" + ", NULL, 0) = %u\n", + connect_fd, connect_inode, accept_inode, text, + (unsigned) sizeof(text) - 1, (unsigned) sizeof(text) - 1); + + assert(recvfrom(accept_fd, text, sizeof(text) - 1, MSG_DONTWAIT, NULL, NULL) + == sizeof(text) - 1); + printf("recvfrom(%d%lu,\"%s\"]>, \"%s\", %u, MSG_DONTWAIT" + ", NULL, NULL) = %u\n", + accept_fd, accept_inode, connect_inode, av[1], text, + (unsigned) sizeof(text) - 1, (unsigned) sizeof(text) - 1); + + assert(close(connect_fd) == 0); + printf("close(%d%lu]>) = 0\n", + connect_fd, connect_inode, accept_inode); + + assert(close(accept_fd) == 0); + printf("close(%d) = 0\n", + accept_fd, accept_inode, av[1]); + + connect_fd = socket(PF_LOCAL, SOCK_STREAM, 0); + if (connect_fd < 0) + perror_msg_and_fail("socket"); + connect_inode = inode_of_sockfd(connect_fd); + printf("socket(PF_LOCAL, SOCK_STREAM, 0) = %d\n", + connect_fd, connect_inode); + + *optval = 1; + *len = sizeof(*optval); + if (setsockopt(connect_fd, SOL_SOCKET, SO_PASSCRED, optval, *len)) + perror_msg_and_fail("setsockopt"); + printf("setsockopt(%d, SOL_SOCKET, SO_PASSCRED" + ", [%u], %u) = 0\n", + connect_fd, connect_inode, *optval, (unsigned) *len); + + memset(listen_sa, 0, sizeof(addr)); + *len = sizeof(addr); + if (getsockname(listen_fd, listen_sa, len)) + perror_msg_and_fail("getsockname"); + printf("getsockname(%d, {sa_family=AF_LOCAL" + ", sun_path=\"%s\"}, [%u]) = 0\n", listen_fd, listen_inode, + av[1], av[1], (unsigned) *len); + + if (connect(connect_fd, listen_sa, *len)) + perror_msg_and_fail("connect"); + printf("connect(%d, {sa_family=AF_LOCAL" + ", sun_path=\"%s\"}, %u) = 0\n", + connect_fd, connect_inode, av[1], (unsigned) *len); + + memset(accept_sa, 0, sizeof(addr)); + *len = sizeof(addr); + accept_fd = accept(listen_fd, accept_sa, len); + if (accept_fd < 0) + perror_msg_and_fail("accept"); + accept_inode = inode_of_sockfd(accept_fd); + const char * const sun_path1 = + ((struct sockaddr_un *) accept_sa) -> sun_path + 1; + printf("accept(%d, {sa_family=AF_LOCAL" + ", sun_path=@\"%s\"}, [%u]) = %d%lu,\"%s\"]>\n", + listen_fd, listen_inode, av[1], sun_path1, (unsigned) *len, + accept_fd, accept_inode, connect_inode, av[1]); + + memset(listen_sa, 0, sizeof(addr)); + *len = sizeof(addr); + if (getpeername(connect_fd, listen_sa, len)) + perror_msg_and_fail("getpeername"); + printf("getpeername(%d%lu,@\"%s\"]>, {sa_family=AF_LOCAL" + ", sun_path=\"%s\"}, [%u]) = 0\n", connect_fd, connect_inode, + accept_inode, sun_path1, av[1], (unsigned) *len); + + assert(sendto(connect_fd, text, sizeof(text) - 1, MSG_DONTWAIT, NULL, 0) + == sizeof(text) - 1); + printf("sendto(%d%lu,@\"%s\"]>, \"%s\", %u, MSG_DONTWAIT" + ", NULL, 0) = %u\n", + connect_fd, connect_inode, accept_inode, sun_path1, text, + (unsigned) sizeof(text) - 1, (unsigned) sizeof(text) - 1); + + assert(recvfrom(accept_fd, text, sizeof(text) - 1, MSG_DONTWAIT, NULL, NULL) + == sizeof(text) - 1); + printf("recvfrom(%d%lu,\"%s\"]>, \"%s\", %u, MSG_DONTWAIT" + ", NULL, NULL) = %u\n", + accept_fd, accept_inode, connect_inode, av[1], text, + (unsigned) sizeof(text) - 1, (unsigned) sizeof(text) - 1); + + assert(close(connect_fd) == 0); + printf("close(%d%lu,@\"%s\"]>) = 0\n", + connect_fd, connect_inode, accept_inode, sun_path1); + + assert(close(accept_fd) == 0); + printf("close(%d) = 0\n", + accept_fd, accept_inode, av[1]); + + assert(unlink(av[1]) == 0); + + assert(close(listen_fd) == 0); + printf("close(%d) = 0\n", + listen_fd, listen_inode, av[1]); + + puts("+++ exited with 0 +++"); + return 0; +} diff --git a/tests/unix-yy.test b/tests/net-yy-unix.test similarity index 67% rename from tests/unix-yy.test rename to tests/net-yy-unix.test index 84ee89d8..59212b78 100755 --- a/tests/unix-yy.test +++ b/tests/net-yy-unix.test @@ -4,7 +4,7 @@ # associated with unix domain socket descriptors. # # Copyright (c) 2014 Masatake YAMATO -# Copyright (c) 2014-2015 Dmitry V. Levin +# Copyright (c) 2014-2016 Dmitry V. Levin # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -36,24 +36,16 @@ framework_skip_ '/proc/self/fd/ is not available' check_prog sed - run_prog ./netlink_unix_diag -addr=unix-yy-local-stream -run_prog ./net-accept-connect $addr -run_strace_merge -yy -eclose,network $args - -child="$(sed -rn '/SIGCHLD/ s/^.*, si_pid=([1-9][0-9]*), .*/\1/p' "$LOG")" -[ -n "$child" ] || - dump_log_and_fail_with 'failed to find pid of child process' - -rm -f "$LOG"-* -sed -rn "/^$child"' /!d; / socket\(/,$ s/^[0-9]+ +[^ ]+ (.+)/\1/p' "$LOG" > "$LOG"-connect && -sed -rn "/^$child"' /d; /SIGCHLD/d; / socket\(/,$ s/^[0-9]+ +[^ ]+ (.+)/\1/p' "$LOG" > "$LOG"-accept || - dump_log_and_fail_with 'failed to separate logs' -match_awk "$LOG-connect" "$srcdir"/unix-yy-connect.awk "$STRACE $args connect output mismatch" -v addr=$addr -match_awk "$LOG-accept" "$srcdir"/unix-yy-accept.awk "$STRACE $args accept output mismatch" -v addr=$addr +addr="${ME_%.test}-local-stream" +run_prog "./${ME_%.test}" $addr > /dev/null -rm -f "$LOG"-connect "$LOG"-accept +OUT="$LOG.out" +EXP="$LOG.exp" +run_strace -a22 -yy -eclose,network $args > "$EXP" +# Filter out close() calls made by ld.so and libc. +sed -n '/socket/,$p' < "$LOG" > "$OUT" -exit 0 +match_diff "$OUT" "$EXP" +rm -f "$EXP" "$OUT" diff --git a/tests/unix-yy-accept.awk b/tests/unix-yy-accept.awk deleted file mode 100644 index 4ed60e4b..00000000 --- a/tests/unix-yy-accept.awk +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/gawk -# -# Copyright (c) 2014 Masatake YAMATO -# Copyright (c) 2014-2015 Dmitry V. Levin -# 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. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - -BEGIN { - lines = 8 - fail = 0 - - addrlen = length(addr) + 3 - r_i = "[1-9][0-9]*" - r_socket = "^socket\\(PF_(LOCAL|UNIX|FILE), SOCK_STREAM, 0\\) += 0$" -} - -NR == 1 { - if (match($0, r_socket, a)) { - inode_listen = a[2] - r_bind = "^bind\\(0, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, " addrlen "\\) += 0$" - r_listen = "^listen\\(0, 5\\) += 0$" - r_getsockname = "^getsockname\\(0, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, \\[" addrlen "\\]\\) += 0$" - r_accept = "^accept\\(0, \\{sa_family=AF_(LOCAL|UNIX|FILE), NULL\\}, \\[2\\]\\) += 1(" r_i "),\"" addr "\"\\]>" - next - } -} - -NR == 2 {if (r_bind != "" && match($0, r_bind)) next} - -NR == 3 {if (r_listen != "" && match($0, r_listen)) next} - -NR == 4 {if (r_getsockname != "" && match($0, r_getsockname)) next} - -NR == 5 { - if (r_accept != "" && match($0, r_accept, a)) { - inode_accepted = a[2] - inode_peer = a[3] - r_close_listen = "^close\\(0\\) += 0$" - r_close_accepted = "^close\\(1\\) += 0$" - next - } -} - -NR == 6 {if (r_close_listen != "" && match($0, r_close_listen)) next} -NR == 7 {if (r_close_accepted != "" && match($0, r_close_accepted)) next} - -NR == lines && $0 == "+++ exited with 0 +++" {next} - -{ - print "Line " NR " does not match: " $0 - fail=1 -} - -END { - if (NR != lines) { - print "Expected " lines " lines, found " NR " line(s)." - print "" - exit 1 - } - if (fail) { - print "" - exit 1 - } -} diff --git a/tests/unix-yy-connect.awk b/tests/unix-yy-connect.awk deleted file mode 100644 index 262bf2e2..00000000 --- a/tests/unix-yy-connect.awk +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/gawk -# -# Copyright (c) 2014 Masatake YAMATO -# Copyright (c) 2014-2015 Dmitry V. Levin -# 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. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - -BEGIN { - lines = 6 - fail = 0 - addrlen = length(addr) + 3 - - r_i = "[1-9][0-9]*" - r_socket = "^socket\\(PF_(LOCAL|UNIX|FILE), SOCK_STREAM, 0\\) += 1$" - r_close_listen = "^close\\(0\\) += 0$" -} - -NR == 1 { - if (match($0, r_socket, a)) { - inode = a[2] - r_connect = "^connect\\(1, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, " addrlen "\\) += 0$" - next - } -} - -NR == 2 {if (match($0, r_close_listen)) next} - -NR == 3 { - if (r_connect != "" && match($0, r_connect)) { - r_close_connected = "^close\\(1" r_i "\\]>\\) += 0$" - next - } -} - -NR == 4 && /^--- SIGUSR1 / {next} - -NR == 5 { - if (inode != "" && r_close_connected != "" && match($0, r_close_connected, a) && a[1] == inode) { - next - } -} - -NR == lines && $0 == "+++ exited with 0 +++" {next} - -{ - print "Line " NR " does not match: " $0 - fail=1 -} - -END { - if (NR != lines) { - print "Expected " lines " lines, found " NR " line(s)." - print "" - exit 1 - } - if (fail) { - print "" - exit 1 - } -} -- 2.40.0