#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_ulong_t addr,
+ const kernel_ulong_t 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);
}
}
#endif
default:
- tprintf("%lu", tcp->u_arg[2]);
+ tprintf("%" PRI_klu, tcp->u_arg[2]);
break;
}
{
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- tprintf("%lu", tcp->u_arg[1]);
+ tprintf("%" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}
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_ulong_t sockaddr, const kernel_ulong_t socklen)
{
return verbose(tcp) && sockaddr && socklen
&& umove(tcp, socklen, plen) == 0;
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
- tprintf(", %lu, ", tcp->u_arg[2]);
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* flags */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
- tprintf(", %lu, ", tcp->u_arg[2]);
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* flags */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
/* to address */
tcp->u_rval);
}
- tprintf(", %lu, ", tcp->u_arg[2]);
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
}
return 0;
tcp->u_rval);
}
/* size */
- tprintf(", %lu, ", tcp->u_arg[2]);
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* flags */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
tprints(", ");
}
static void
-decode_pair_fd(struct tcb *tcp, const long addr)
+decode_pair_fd(struct tcb *const tcp, const kernel_ulong_t addr)
{
int pair[2];
printxval(addrfams, tcp->u_arg[0], "AF_???");
tprints(", ");
tprint_sock_type(tcp->u_arg[1]);
- tprintf(", %lu", tcp->u_arg[2]);
+ tprintf(", %" PRI_klu, tcp->u_arg[2]);
} else {
tprints(", ");
decode_pair_fd(tcp, tcp->u_arg[3]);
}
static void
-print_linger(struct tcb *tcp, long addr, int len)
+print_linger(struct tcb *const tcp, const kernel_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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_ulong_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);