strace: terminate itself if interrupted by a signal

[strace] / tests / ip_mreq.c

diff --git a/tests/ip_mreq.c b/tests/ip_mreq.c
index d21f579405460f33555a1fe93b136aa822a554ce..4ef342e697f38beb6a45e7ebe045cc4a607498ed 100644 (file)
--- a/tests/ip_mreq.c
+++ b/tests/ip_mreq.c
@@ -1,40 +1,20 @@
 /*
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2017 The strace developers.
+ * Copyright (c) 2015-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 <netinet/in.h>
 
 #if defined IP_ADD_MEMBERSHIP && defined IPV6_ADD_MEMBERSHIP \
- && defined IPV6_JOIN_ANYCAST && defined HAVE_IF_INDEXTONAME
+ && defined IPV6_JOIN_ANYCAST
 
+# include <limits.h>
 # include <stdio.h>
 # include <unistd.h>
-# include <sys/param.h>
 # include <sys/socket.h>
 # include <arpa/inet.h>
 # include <net/if.h>
@@ -55,7 +35,7 @@ main(void)
        inet_pton(AF_INET, interface, &m4->imr_interface);
        inet_pton(AF_INET6, multi6addr, &m6->ipv6mr_multiaddr);
 
-       m6->ipv6mr_interface = if_nametoindex("lo");
+       m6->ipv6mr_interface = ifindex_lo();
        if (!m6->ipv6mr_interface)
                perror_msg_and_skip("lo");
 
@@ -89,28 +69,28 @@ main(void)
                        m6, sizeof(*m6),
                        "{inet_pton(AF_INET6, \"" multi6addr
                        "\", &ipv6mr_multiaddr)"
-                       ", ipv6mr_interface=if_nametoindex(\"lo\")}"
+                       ", ipv6mr_interface=" IFINDEX_LO_STR "}"
                },
                {
                        ARG_STR(SOL_IPV6), ARG_STR(IPV6_DROP_MEMBERSHIP),
                        m6, sizeof(*m6),
                        "{inet_pton(AF_INET6, \"" multi6addr
                        "\", &ipv6mr_multiaddr)"
-                       ", ipv6mr_interface=if_nametoindex(\"lo\")}"
+                       ", ipv6mr_interface=" IFINDEX_LO_STR "}"
                },
                {
                        ARG_STR(SOL_IPV6), ARG_STR(IPV6_JOIN_ANYCAST),
                        m6, sizeof(*m6),
                        "{inet_pton(AF_INET6, \"" multi6addr
                        "\", &ipv6mr_multiaddr)"
-                       ", ipv6mr_interface=if_nametoindex(\"lo\")}"
+                       ", ipv6mr_interface=" IFINDEX_LO_STR "}"
                },
                {
                        ARG_STR(SOL_IPV6), ARG_STR(IPV6_LEAVE_ANYCAST),
                        m6, sizeof(*m6),
                        "{inet_pton(AF_INET6, \"" multi6addr
                        "\", &ipv6mr_multiaddr)"
-                       ", ipv6mr_interface=if_nametoindex(\"lo\")}"
+                       ", ipv6mr_interface=" IFINDEX_LO_STR "}"
                }
        };
 
@@ -158,6 +138,6 @@ main(void)
 #else
 
 SKIP_MAIN_UNDEFINED("IP_ADD_MEMBERSHIP && IPV6_ADD_MEMBERSHIP"
-                   " && IPV6_JOIN_ANYCAST && HAVE_IF_INDEXTONAME")
+                   " && IPV6_JOIN_ANYCAST")
 
 #endif