matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcp_metric: Use get_addr_rta() 

While there remove & from inet_prefix.data when since it is array.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Serhey Popovych 2018-01-24 20:56:39 +02:00 committed by David Ahern
parent 62f9f94acf
commit 228f2e97ba
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ip/tcp_metrics.c
View File

@ -96,7 +96,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
struct rtattr *attrs[TCP_METRICS_ATTR_MAX + 1], *a; struct rtattr *attrs[TCP_METRICS_ATTR_MAX + 1], *a;
int len = n->nlmsg_len; int len = n->nlmsg_len;
inet_prefix daddr, saddr; inet_prefix daddr, saddr;
int family, i, atype, stype, dlen = 0, slen = 0; int i, atype, stype;
if (n->nlmsg_type != genl_family) if (n->nlmsg_type != genl_family)
return -1; return -1;
@ -116,61 +116,61 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (f.daddr.family && f.daddr.family != AF_INET) if (f.daddr.family && f.daddr.family != AF_INET)
return 0; return 0;
a = attrs[TCP_METRICS_ATTR_ADDR_IPV4]; a = attrs[TCP_METRICS_ATTR_ADDR_IPV4];
memcpy(&daddr.data, RTA_DATA(a), 4); daddr.family = AF_INET;
daddr.bytelen = 4;
family = AF_INET;
atype = TCP_METRICS_ATTR_ADDR_IPV4; atype = TCP_METRICS_ATTR_ADDR_IPV4;
dlen = RTA_PAYLOAD(a);
} else if (attrs[TCP_METRICS_ATTR_ADDR_IPV6]) { } else if (attrs[TCP_METRICS_ATTR_ADDR_IPV6]) {
if (f.daddr.family && f.daddr.family != AF_INET6) if (f.daddr.family && f.daddr.family != AF_INET6)
return 0; return 0;
a = attrs[TCP_METRICS_ATTR_ADDR_IPV6]; a = attrs[TCP_METRICS_ATTR_ADDR_IPV6];
memcpy(&daddr.data, RTA_DATA(a), 16); daddr.family = AF_INET6;
daddr.bytelen = 16;
family = AF_INET6;
atype = TCP_METRICS_ATTR_ADDR_IPV6; atype = TCP_METRICS_ATTR_ADDR_IPV6;
dlen = RTA_PAYLOAD(a);
} else { } else {
return 0; return 0;
} }
if (get_addr_rta(&daddr, a, daddr.family))
return 0;
if (f.daddr.family && f.daddr.bitlen >= 0 &&
inet_addr_match(&daddr, &f.daddr, f.daddr.bitlen))
return 0;
if (attrs[TCP_METRICS_ATTR_SADDR_IPV4]) { if (attrs[TCP_METRICS_ATTR_SADDR_IPV4]) {
if (f.saddr.family && f.saddr.family != AF_INET) if (f.saddr.family && f.saddr.family != AF_INET)
return 0; return 0;
a = attrs[TCP_METRICS_ATTR_SADDR_IPV4]; a = attrs[TCP_METRICS_ATTR_SADDR_IPV4];
memcpy(&saddr.data, RTA_DATA(a), 4); saddr.family = AF_INET;
saddr.bytelen = 4;
stype = TCP_METRICS_ATTR_SADDR_IPV4; stype = TCP_METRICS_ATTR_SADDR_IPV4;
slen = RTA_PAYLOAD(a);
} else if (attrs[TCP_METRICS_ATTR_SADDR_IPV6]) { } else if (attrs[TCP_METRICS_ATTR_SADDR_IPV6]) {
if (f.saddr.family && f.saddr.family != AF_INET6) if (f.saddr.family && f.saddr.family != AF_INET6)
return 0; return 0;
a = attrs[TCP_METRICS_ATTR_SADDR_IPV6]; a = attrs[TCP_METRICS_ATTR_SADDR_IPV6];
memcpy(&saddr.data, RTA_DATA(a), 16); saddr.family = AF_INET6;
saddr.bytelen = 16;
stype = TCP_METRICS_ATTR_SADDR_IPV6; stype = TCP_METRICS_ATTR_SADDR_IPV6;
slen = RTA_PAYLOAD(a); } else {
saddr.family = AF_UNSPEC;
stype = 0;
} }
if (f.daddr.family && f.daddr.bitlen >= 0 && /* Only get/check for the source-address if the kernel supports it. */
inet_addr_match(&daddr, &f.daddr, f.daddr.bitlen)) if (saddr.family) {
return 0; if (get_addr_rta(&saddr, a, saddr.family))
/* Only check for the source-address if the kernel supports it, return 0;
* meaning slen != 0.
*/ if (f.saddr.family && f.saddr.bitlen >= 0 &&
if (slen && f.saddr.family && f.saddr.bitlen >= 0 && inet_addr_match(&saddr, &f.saddr, f.saddr.bitlen))
inet_addr_match(&saddr, &f.saddr, f.saddr.bitlen)) return 0;
return 0; }
if (f.flushb) { if (f.flushb) {
struct nlmsghdr *fn; struct nlmsghdr *fn;
TCPM_REQUEST(req2, 128, TCP_METRICS_CMD_DEL, NLM_F_REQUEST); TCPM_REQUEST(req2, 128, TCP_METRICS_CMD_DEL, NLM_F_REQUEST);
addattr_l(&req2.n, sizeof(req2), atype, &daddr.data, addattr_l(&req2.n, sizeof(req2), atype, daddr.data,
daddr.bytelen); daddr.bytelen);
if (slen) if (saddr.family)
addattr_l(&req2.n, sizeof(req2), stype, &saddr.data, addattr_l(&req2.n, sizeof(req2), stype, saddr.data,
saddr.bytelen); saddr.bytelen);
if (NLMSG_ALIGN(f.flushp) + req2.n.nlmsg_len > f.flushe) { if (NLMSG_ALIGN(f.flushp) + req2.n.nlmsg_len > f.flushe) {
@ -190,7 +190,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
fprintf(fp, "Deleted "); fprintf(fp, "Deleted ");
fprintf(fp, "%s", fprintf(fp, "%s",
format_host(family, dlen, &daddr.data)); format_host(daddr.family, daddr.bytelen, daddr.data));
a = attrs[TCP_METRICS_ATTR_AGE]; a = attrs[TCP_METRICS_ATTR_AGE];
if (a) { if (a) {
@ -292,9 +292,9 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
fprintf(fp, " fo_cookie %s", cookie); fprintf(fp, " fo_cookie %s", cookie);
} }
if (slen) { if (saddr.family) {
fprintf(fp, " source %s", fprintf(fp, " source %s",
format_host(family, slen, &saddr.data)); format_host(saddr.family, saddr.bytelen, saddr.data));
} }
fprintf(fp, "\n"); fprintf(fp, "\n");