#include <arpa/inet.h>
#include <net/if.h>
#include <asm/types.h>
-#if defined(__GLIBC__)
+#ifdef HAVE_NETIPX_IPX_H
# include <netipx/ipx.h>
#else
# include <linux/ipx.h>
#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)
struct sockaddr sa;
struct sockaddr_in sin;
struct sockaddr_un sau;
-#ifdef HAVE_INET_NTOP
struct sockaddr_in6 sa6;
-#endif
-#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;
#endif
} sockaddr_buf_t;
-static void
-print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
+void
+print_sockaddr(struct tcb *tcp, const void *const buf, const int addrlen)
{
+ const sockaddr_buf_t *const addr = buf;
+
tprints("{sa_family=");
printxval(addrfams, addr->sa.sa_family, "AF_???");
tprints(", ");
tprintf("sin_port=htons(%u), sin_addr=inet_addr(\"%s\")",
ntohs(addr->sin.sin_port), inet_ntoa(addr->sin.sin_addr));
break;
-#ifdef HAVE_INET_NTOP
+
case AF_INET6:
{
char string_addr[100];
", \"%s\", &sin6_addr), sin6_flowinfo=%u",
ntohs(addr->sa6.sin6_port), string_addr,
addr->sa6.sin6_flowinfo);
-# ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
tprints(", sin6_scope_id=");
-# if defined IN6_IS_ADDR_LINKLOCAL && defined IN6_IS_ADDR_MC_LINKLOCAL
+# if defined IN6_IS_ADDR_LINKLOCAL && defined IN6_IS_ADDR_MC_LINKLOCAL
if (IN6_IS_ADDR_LINKLOCAL(&addr->sa6.sin6_addr)
|| IN6_IS_ADDR_MC_LINKLOCAL(&addr->sa6.sin6_addr))
print_ifindex(addr->sa6.sin6_scope_id);
else
-# endif
+# endif
tprintf("%u", addr->sa6.sin6_scope_id);
-# endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */
+#endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */
}
break;
-#endif
-#if defined(AF_IPX)
+
case AF_IPX:
{
+ tprintf("sipx_port=htons(%u)"
+ ", sipx_network=htonl(%08x)"
+ ", sipx_node=[",
+ ntohs(addr->sipx.sipx_port),
+ ntohl(addr->sipx.sipx_network));
int i;
- tprintf("sipx_port=htons(%u), ",
- ntohs(addr->sipx.sipx_port));
- /* Yes, I know, this does not look too
- * strace-ish, but otherwise the IPX
- * addresses just look monstrous...
- * Anyways, feel free if you don't like
- * this way.. :)
- */
- tprintf("%08lx:", (unsigned long)ntohl(addr->sipx.sipx_network));
- for (i = 0; i < IPX_NODE_LEN; i++)
- tprintf("%02x", addr->sipx.sipx_node[i]);
- tprintf("/[%02x]", addr->sipx.sipx_type);
+ for (i = 0; i < IPX_NODE_LEN; ++i) {
+ tprintf("%s%02x", i ? ", " : "",
+ addr->sipx.sipx_node[i]);
+ }
+ tprintf("], sipx_type=%02x", addr->sipx.sipx_type);
}
break;
-#endif /* AF_IPX */
-#ifdef AF_PACKET
+
case AF_PACKET:
{
int i;
}
break;
-#endif /* AF_PACKET */
case AF_NETLINK:
tprintf("pid=%d, groups=%08x", addr->nl.nl_pid, addr->nl.nl_groups);
break;
-#if defined(AF_BLUETOOTH) && defined(HAVE_BLUETOOTH_BLUETOOTH_H)
+
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
case AF_BLUETOOTH:
tprintf("{sco_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X} or "
"{rc_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X, rc_channel=%d} or "
addr->l2.l2_bdaddr.b[5], btohs(addr->l2.l2_cid),
btohs(addr->hci.hci_dev));
break;
-#endif /* AF_BLUETOOTH && HAVE_BLUETOOTH_BLUETOOTH_H */
+#endif /* HAVE_BLUETOOTH_BLUETOOTH_H */
+
/* AF_AX25 AF_APPLETALK AF_NETROM AF_BRIDGE AF_AAL5
AF_X25 AF_ROSE etc. still need to be done */
tprints("}");
}
-void
+int
printsock(struct tcb *tcp, long addr, int addrlen)
{
- sockaddr_buf_t addrbuf;
-
if (addrlen < 2) {
printaddr(addr);
- return;
+ return -1;
}
- if (addrlen > (int) sizeof(addrbuf))
- addrlen = sizeof(addrbuf);
+ union {
+ struct sockaddr sa;
+ struct sockaddr_storage storage;
+ char pad[sizeof(struct sockaddr_storage) + 1];
+ } addrbuf;
+
+ if ((unsigned) addrlen > sizeof(addrbuf.storage))
+ addrlen = sizeof(addrbuf.storage);
- memset(&addrbuf, 0, sizeof(addrbuf));
if (umoven_or_printaddr(tcp, addr, addrlen, addrbuf.pad))
- return;
- addrbuf.pad[sizeof(addrbuf.pad) - 1] = '\0';
+ return -1;
+
+ memset(&addrbuf.pad[addrlen], 0, sizeof(addrbuf.pad) - addrlen);
print_sockaddr(tcp, &addrbuf, addrlen);
+
+ return addrbuf.sa.sa_family;
}
#include "xlat/scmvals.h"
", ee_info=%u, ee_data=%u, offender=",
err->ee_errno, err->ee_origin, err->ee_type,
err->ee_code, err->ee_info, err->ee_data);
- print_sockaddr(tcp, (const void *) &err->offender,
- sizeof(err->offender));
+ print_sockaddr(tcp, &err->offender, sizeof(err->offender));
tprints("}");
}
printsock(tcp, (long)msg->msg_name, msg->msg_namelen);
tprintf(", msg_iov(%lu)=", (unsigned long)msg->msg_iovlen);
+
tprint_iov_upto(tcp, (unsigned long)msg->msg_iovlen,
- (unsigned long)msg->msg_iov, 1, data_size);
+ (unsigned long)msg->msg_iov, IOV_DECODE_STR, data_size);
#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
tprintf(", msg_controllen=%lu", (unsigned long)msg->msg_controllen);
tprints(", ");
switch (tcp->u_arg[0]) {
case AF_INET:
-#ifdef AF_INET6
case AF_INET6:
-#endif
printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
break;
-#ifdef AF_IPX
- case AF_IPX:
- /* BTW: I don't believe this.. */
- tprints("[");
- printxval(addrfams, tcp->u_arg[2], "AF_???");
- tprints("]");
- break;
-#endif /* AF_IPX */
+
case AF_NETLINK:
printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
break;
-#if defined(AF_BLUETOOTH) && defined(HAVE_BLUETOOTH_BLUETOOTH_H)
+
+#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
case AF_BLUETOOTH:
printxval(bt_protocols, tcp->u_arg[2], "BTPROTO_???");
break;
#endif
+
default:
tprintf("%lu", tcp->u_arg[2]);
break;
tprints(", ");
}
-#ifdef SO_LINGER
static void
print_linger(struct tcb *tcp, long addr, int len)
{
linger.l_onoff,
linger.l_linger);
}
-#endif /* SO_LINGER */
#ifdef SO_PEERCRED
static void
switch (level) {
case SOL_SOCKET:
switch (name) {
-#ifdef SO_LINGER
case SO_LINGER:
print_linger(tcp, addr, len);
goto done;
-#endif
#ifdef SO_PEERCRED
case SO_PEERCRED:
print_ucred(tcp, addr, len);
if (umove_or_printaddr(tcp, addr, &mreq))
return;
-#ifdef HAVE_INET_NTOP
const struct in6_addr *in6 = &mreq.ipv6mr_multiaddr;
char address[INET6_ADDRSTRLEN];
print_ifindex(mreq.ipv6mr_interface);
tprints("}");
return;
-#endif /* HAVE_INET_NTOP */
fail:
printstr(tcp, addr, len);
}
tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
- print_sockaddr(tcp, (const void *) &greq.gr_group,
- sizeof(greq.gr_group));
+ print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
tprintf("}");
}
switch (level) {
case SOL_SOCKET:
switch (name) {
-#ifdef SO_LINGER
case SO_LINGER:
print_linger(tcp, addr, len);
goto done;
-#endif
}
break;
projects / strace / blobdiff