strace: terminate itself if interrupted by a signal

[strace] / tests / netlink_inet_diag.c

diff --git a/tests/netlink_inet_diag.c b/tests/netlink_inet_diag.c
index fa4c5c721709f70d2a73e863a41f1fdd6c54e836..e3ccc05c0827882b1605884d20d4a27b38236e8e 100644 (file)
--- a/tests/netlink_inet_diag.c
+++ b/tests/netlink_inet_diag.c
@@ -2,38 +2,18 @@
  * This file is part of inet-yy strace test.
  *
  * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
  * 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.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <netinet/in.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/inet_diag.h>
 
@@ -76,13 +56,17 @@ send_query(const int fd, const int family, const int proto)
 static void
 check_responses(const int fd)
 {
-       static long buf[8192 / sizeof(long)];
+       static union {
+               struct nlmsghdr hdr;
+               long buf[8192 / sizeof(long)];
+       } hdr_buf;
+
        struct sockaddr_nl nladdr = {
                .nl_family = AF_NETLINK
        };
        struct iovec iov = {
-               .iov_base = buf,
-               .iov_len = sizeof(buf)
+               .iov_base = hdr_buf.buf,
+               .iov_len = sizeof(hdr_buf.buf)
        };
        struct msghdr msg = {
                .msg_name = (void *) &nladdr,
@@ -95,9 +79,9 @@ check_responses(const int fd)
        if (ret <= 0)
                perror_msg_and_skip("recvmsg");
 
-       struct nlmsghdr *h = (struct nlmsghdr *) buf;
-       if (!NLMSG_OK(h, ret))
-               error_msg_and_skip("!NLMSG_OK");
+       struct nlmsghdr *h = &hdr_buf.hdr;
+       if (!is_nlmsg_ok(h, ret))
+               error_msg_and_skip("!is_nlmsg_ok");
        if (h->nlmsg_type == NLMSG_ERROR) {
                const struct nlmsgerr *err = NLMSG_DATA(h);
                if (h->nlmsg_len < NLMSG_LENGTH(sizeof(*err)))
@@ -126,8 +110,8 @@ int main(void)
        close(0);
        close(1);
 
-       if (socket(PF_INET, SOCK_STREAM, 0))
-               perror_msg_and_skip("socket PF_INET");
+       if (socket(AF_INET, SOCK_STREAM, 0))
+               perror_msg_and_skip("socket AF_INET");
        if (bind(0, (struct sockaddr *) &addr, len))
                perror_msg_and_skip("bind");
        if (listen(0, 5))