]> granicus.if.org Git - strace/commitdiff
net.c: use AF_PACKET unconditionally
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 15 Jun 2016 21:42:30 +0000 (21:42 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 16 Jun 2016 01:00:24 +0000 (01:00 +0000)
* net.c: Do not check for AF_PACKET availability.

net.c

diff --git a/net.c b/net.c
index 8ba5e130572c778c3e8cdba28737a9a5f1fda23c..cb4e636931b73e12e8660f85f5117a73f72c2003 100644 (file)
--- a/net.c
+++ b/net.c
 
 #include "xlat/msg_flags.h"
 
-#if defined(AF_PACKET) /* from e.g. linux/if_packet.h */
-# include "xlat/af_packet_types.h"
-#endif
+#include "xlat/af_packet_types.h"
 
 static void
 print_ifindex(unsigned int ifindex)
@@ -131,9 +129,7 @@ typedef union {
 #if defined(AF_IPX)
        struct sockaddr_ipx sipx;
 #endif
-#ifdef AF_PACKET
        struct sockaddr_ll ll;
-#endif
        struct sockaddr_nl nl;
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
        struct sockaddr_hci hci;
@@ -212,7 +208,6 @@ print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
                }
                break;
 #endif /* AF_IPX */
-#ifdef AF_PACKET
        case AF_PACKET:
                {
                        int i;
@@ -228,7 +223,6 @@ print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
                }
                break;
 
-#endif /* AF_PACKET */
        case AF_NETLINK:
                tprintf("pid=%d, groups=%08x", addr->nl.nl_pid, addr->nl.nl_groups);
                break;