#include "xlat/socketlayers.h"
#include "xlat/inet_protocols.h"
-
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
#include "xlat/netlink_protocols.h"
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
}
static void
-decode_sockbuf(struct tcb *tcp, int fd, long addr, long addrlen)
+decode_sockbuf(struct tcb *const tcp, const int fd, const kernel_ureg_t addr,
+ const long addrlen)
{
switch (verbose(tcp) ? getfdproto(tcp, fd) : SOCK_PROTO_UNKNOWN) {
decode_netlink(tcp, addr, addrlen);
break;
default:
- printstr(tcp, addr, addrlen);
+ printstrn(tcp, addr, addrlen);
}
}
}
static bool
-fetch_socklen(struct tcb *tcp, int *plen,
- const unsigned long sockaddr, const unsigned long socklen)
+fetch_socklen(struct tcb *const tcp, int *const plen,
+ const kernel_ureg_t sockaddr, const kernel_ureg_t socklen)
{
return verbose(tcp) && sockaddr && socklen
&& umove(tcp, socklen, plen) == 0;
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
if (fetch_socklen(tcp, &ulen, tcp->u_arg[1], tcp->u_arg[2])) {
- /* abuse of auxstr to retain state */
- tcp->auxstr = (void *) (long) ulen;
+ set_tcb_priv_ulong(tcp, ulen);
return 0;
} else {
printaddr(tcp->u_arg[1]);
}
}
- ulen = (long) tcp->auxstr;
- tcp->auxstr = NULL;
+ ulen = get_tcb_priv_ulong(tcp);
if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &rlen) < 0) {
printaddr(tcp->u_arg[1]);
return RVAL_DECODED;
}
-SYS_FUNC(sendmsg)
-{
- printfd(tcp, tcp->u_arg[0]);
- tprints(", ");
- decode_msghdr(tcp, 0, tcp->u_arg[1], (unsigned long) -1L);
- /* flags */
- tprints(", ");
- printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-
- return RVAL_DECODED;
-}
-
SYS_FUNC(recv)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
if (fetch_socklen(tcp, &ulen, tcp->u_arg[4], tcp->u_arg[5])) {
- /* abuse of auxstr to retain state */
- tcp->auxstr = (void *) (long) ulen;
+ set_tcb_priv_ulong(tcp, ulen);
}
} else {
/* buf */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
tprints(", ");
- ulen = (long) tcp->auxstr;
- tcp->auxstr = NULL;
+ ulen = get_tcb_priv_ulong(tcp);
if (!fetch_socklen(tcp, &rlen, tcp->u_arg[4], tcp->u_arg[5])) {
/* from address */
return 0;
}
-SYS_FUNC(recvmsg)
-{
- int msg_namelen;
-
- if (entering(tcp)) {
- printfd(tcp, tcp->u_arg[0]);
- tprints(", ");
- if (fetch_msghdr_namelen(tcp, tcp->u_arg[1], &msg_namelen)) {
- /* abuse of auxstr to retain state */
- tcp->auxstr = (void *) (long) msg_namelen;
- return 0;
- }
- printaddr(tcp->u_arg[1]);
- } else {
- msg_namelen = (long) tcp->auxstr;
- tcp->auxstr = NULL;
-
- if (syserror(tcp))
- tprintf("{msg_namelen=%d}", msg_namelen);
- else
- decode_msghdr(tcp, &msg_namelen, tcp->u_arg[1],
- tcp->u_rval);
- }
-
- /* flags */
- tprints(", ");
- printflags(msg_flags, tcp->u_arg[2], "MSG_???");
-
- return RVAL_DECODED;
-}
-
#include "xlat/shutdown_modes.h"
SYS_FUNC(shutdown)
}
static void
-decode_pair_fd(struct tcb *tcp, const long addr)
+decode_pair_fd(struct tcb *const tcp, const kernel_ureg_t addr)
{
int pair[2];
}
static void
-print_linger(struct tcb *tcp, long addr, int len)
+print_linger(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
{
struct linger linger;
#ifdef SO_PEERCRED
static void
-print_ucred(struct tcb *tcp, long addr, int len)
+print_ucred(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
{
struct ucred uc;
#ifdef PACKET_STATISTICS
static void
-print_tpacket_stats(struct tcb *tcp, long addr, int len)
+print_tpacket_stats(struct tcb *const tcp, const kernel_ureg_t addr,
+ const int len)
{
struct tpacket_stats stats;
#include "xlat/icmpfilterflags.h"
static void
-print_icmp_filter(struct tcb *tcp, const long addr, int len)
+print_icmp_filter(struct tcb *const tcp, const kernel_ureg_t addr, int len)
{
struct icmp_filter filter = {};
}
static void
-print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
- long addr, int len)
+print_getsockopt(struct tcb *const tcp, const unsigned int level,
+ const unsigned int name, const kernel_ureg_t addr,
+ const int len)
{
if (addr && verbose(tcp))
switch (level) {
if (len == sizeof(int)) {
printnum_int(tcp, addr, "%d");
} else {
- printstr(tcp, addr, len);
+ printstrn(tcp, addr, len);
}
} else {
printaddr(addr);
#ifdef IP_ADD_MEMBERSHIP
static void
-print_mreq(struct tcb *tcp, long addr, unsigned int len)
+print_mreq(struct tcb *const tcp, const kernel_ureg_t addr,
+ const unsigned int len)
{
struct ip_mreq mreq;
if (len < sizeof(mreq)) {
- printstr(tcp, addr, len);
+ printstrn(tcp, addr, len);
return;
}
if (umove_or_printaddr(tcp, addr, &mreq))
#ifdef IPV6_ADD_MEMBERSHIP
static void
-print_mreq6(struct tcb *tcp, long addr, unsigned int len)
+print_mreq6(struct tcb *const tcp, const kernel_ureg_t addr,
+ const unsigned int len)
{
struct ipv6_mreq mreq;
return;
fail:
- printstr(tcp, addr, len);
+ printstrn(tcp, addr, len);
}
#endif /* IPV6_ADD_MEMBERSHIP */
#ifdef MCAST_JOIN_GROUP
static void
-print_group_req(struct tcb *tcp, long addr, int len)
+print_group_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
{
struct group_req greq;
tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
- tprintf("}");
+ tprints("}");
}
#endif /* MCAST_JOIN_GROUP */
#ifdef PACKET_RX_RING
static void
-print_tpacket_req(struct tcb *tcp, long addr, int len)
+print_tpacket_req(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
{
struct tpacket_req req;
# include "xlat/packet_mreq_type.h"
static void
-print_packet_mreq(struct tcb *tcp, long addr, int len)
+print_packet_mreq(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
{
struct packet_mreq mreq;
#endif /* PACKET_ADD_MEMBERSHIP */
static void
-print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
- long addr, int len)
+print_setsockopt(struct tcb *const tcp, const unsigned int level,
+ const unsigned int name, const kernel_ureg_t addr,
+ const int len)
{
if (addr && verbose(tcp))
switch (level) {
if (len == sizeof(int)) {
printnum_int(tcp, addr, "%d");
} else {
- printstr(tcp, addr, len);
+ printstrn(tcp, addr, len);
}
} else {
printaddr(addr);