diff options
author | Christopher Ferris <cferris@google.com> | 2021-11-03 02:52:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-03 02:52:10 +0000 |
commit | ac5b8253819a0f9b153579caf6fa08212a222dba (patch) | |
tree | 32775e14db1c0f0700a478725be39deb6e3902dc | |
parent | 05b67532becd7f8329723a81207d3996fb85c6de (diff) | |
parent | 766180719af6d8f27e66d96ddc0e72c2a1dfcb76 (diff) | |
download | strace-ac5b8253819a0f9b153579caf6fa08212a222dba.tar.gz |
Merge "Remove ipx support." am: 749015bbd7 am: 40b807329e am: 766180719a
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067
Change-Id: I75caeb74b8567108da998a344b8ea28dcb13c3cd
-rw-r--r-- | net.c | 2 | ||||
-rw-r--r-- | sockaddr.c | 20 |
2 files changed, 0 insertions, 22 deletions
@@ -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) @@ -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 @@ digis_end: 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 @@ static const struct { [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 }, |