Merge "Remove ipx support." am: 749015bbd7 am: 40b807329e
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067
Change-Id: I4d3506f9886d0ad8caeebc0ce982c6c5131c5d8e
diff --git a/net.c b/net.c
index f791a92..775e14c 100644
--- a/net.c
+++ b/net.c
@@ -51,8 +51,6 @@
#include <asm/types.h>
#ifdef HAVE_NETIPX_IPX_H
# include <netipx/ipx.h>
-#else
-# include <linux/ipx.h>
#endif
#if defined(HAVE_LINUX_IP_VS_H)
diff --git a/sockaddr.c b/sockaddr.c
index cf60c32..6760463 100644
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -47,8 +47,6 @@
#ifdef HAVE_NETIPX_IPX_H
# include <netipx/ipx.h>
-#else
-# include <linux/ipx.h>
#endif
#include "xlat/addrfams.h"
@@ -349,23 +347,6 @@
tprints(", ...");
}
-static void
-print_sockaddr_data_ipx(const void *const buf, const int addrlen)
-{
- const struct sockaddr_ipx *const sa_ipx = buf;
- unsigned int i;
-
- PRINT_FIELD_NET_PORT("", *sa_ipx, sipx_port);
- tprintf(", sipx_network=htonl(%#08x)"
- ", sipx_node=[",
- ntohl(sa_ipx->sipx_network));
- for (i = 0; i < IPX_NODE_LEN; ++i) {
- tprintf("%s%#02x", i ? ", " : "",
- sa_ipx->sipx_node[i]);
- }
- PRINT_FIELD_0X("], ", *sa_ipx, sipx_type);
-}
-
void
print_x25_addr(const void /* struct x25_address */ *addr_void)
{
@@ -605,7 +586,6 @@
[AF_UNIX] = { print_sockaddr_data_un, SIZEOF_SA_FAMILY + 1 },
[AF_INET] = { print_sockaddr_data_in, sizeof(struct sockaddr_in) },
[AF_AX25] = { print_sockaddr_data_ax25, sizeof(struct sockaddr_ax25) },
- [AF_IPX] = { print_sockaddr_data_ipx, sizeof(struct sockaddr_ipx) },
[AF_X25] = { print_sockaddr_data_x25, sizeof(struct sockaddr_x25) },
[AF_INET6] = { print_sockaddr_data_in6, SIN6_MIN_LEN },
[AF_NETLINK] = { print_sockaddr_data_nl, SIZEOF_SA_FAMILY + 1 },
