glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netlink_inet_diag: prepare decode_inet_addr for export

Browse Source 
* netlink_inet_diag.c (decode_inet_addr): Change return type to bool,
parametrize field name using new var_name argument.
(decode_inet_diag_hostcond): Specify "addr" field name
to decode_inet_addr.
This commit is contained in:
Дмитрий Левин 2017-08-21 11:30:47 +00:00
parent b3cbf90920
commit 7c6f8ad313
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netlink_inet_diag.c
View File

@ -58,11 +58,12 @@ print_inet_diag_sockid(const struct inet_diag_sockid *id, const uint8_t family)
tprints("}");
}
static void
static bool
decode_inet_addr(struct tcb *const tcp,
const kernel_ulong_t addr,
const unsigned int len,
const int family)
const int family,
const char *const var_name)
{
union {
struct in_addr a4;
@ -80,18 +81,20 @@ decode_inet_addr(struct tcb *const tcp,
}
if (!size || len < size) {
tprints("addr=");
if (var_name)
tprintf("%s=", var_name);
printstr_ex(tcp, addr, len, QUOTE_FORCE_HEX);
return;
return false;
}
if (umoven(tcp, addr, size, &addrbuf) < 0) {
tprints("addr=");
if (var_name)
tprintf("%s=", var_name);
printaddr(addr);
return;
return false;
}
print_inet_addr(family, &addrbuf, size, "addr");
return print_inet_addr(family, &addrbuf, size, var_name);
}
static void
@ -115,7 +118,7 @@ decode_inet_diag_hostcond(struct tcb *const tcp,
if (len > sizeof(cond)) {
tprints(", ");
decode_inet_addr(tcp, addr + sizeof(cond),
len - sizeof(cond), cond.family);
len - sizeof(cond), cond.family, "addr");
}
tprints("}");
}