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

ipaddress: Use inet_addr_match_rta() 

While there check return from get_prefix() for filter address.

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:34 +02:00 committed by David Ahern
parent 27c523e209
commit c4de9adaf5
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ip/ipaddress.c
View File

@ -1523,19 +1523,13 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (fnmatch(filter.label, label, 0) != 0) if (fnmatch(filter.label, label, 0) != 0)
return 0; return 0;
} }
if (filter.pfx.family) {
if (rta_tb[IFA_LOCAL]) {
inet_prefix dst = { .family = ifa->ifa_family };
memcpy(&dst.data, RTA_DATA(rta_tb[IFA_LOCAL]), RTA_PAYLOAD(rta_tb[IFA_LOCAL]));
if (inet_addr_match(&dst, &filter.pfx, filter.pfx.bitlen))
return 0;
}
}
if (filter.family && filter.family != ifa->ifa_family) if (filter.family && filter.family != ifa->ifa_family)
return 0; return 0;
if (inet_addr_match_rta(&filter.pfx, rta_tb[IFA_LOCAL]))
return 0;
if (filter.flushb) { if (filter.flushb) {
struct nlmsghdr *fn; struct nlmsghdr *fn;
@ -1889,18 +1883,12 @@ static void ipaddr_filter(struct nlmsg_chain *linfo, struct nlmsg_chain *ainfo)
if ((filter.flags ^ ifa_flags) & filter.flagmask) if ((filter.flags ^ ifa_flags) & filter.flagmask)
continue; continue;
if (filter.pfx.family || filter.label) { if (filter.pfx.family || filter.label) {
if (!tb[IFA_LOCAL]) struct rtattr *rta =
tb[IFA_LOCAL] = tb[IFA_ADDRESS]; tb[IFA_LOCAL] ? : tb[IFA_ADDRESS];
if (filter.pfx.family && tb[IFA_LOCAL]) { if (inet_addr_match_rta(&filter.pfx, rta))
inet_prefix dst = { continue;
.family = ifa->ifa_family
};
memcpy(&dst.data, RTA_DATA(tb[IFA_LOCAL]), RTA_PAYLOAD(tb[IFA_LOCAL]));
if (inet_addr_match(&dst, &filter.pfx, filter.pfx.bitlen))
continue;
}
if (filter.label) { if (filter.label) {
SPRINT_BUF(b1); SPRINT_BUF(b1);
const char *label; const char *label;
@ -2072,7 +2060,8 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
while (argc > 0) { while (argc > 0) {
if (strcmp(*argv, "to") == 0) { if (strcmp(*argv, "to") == 0) {
NEXT_ARG(); NEXT_ARG();
get_prefix(&filter.pfx, *argv, filter.family); if (get_prefix(&filter.pfx, *argv, filter.family))
invarg("invalid \"to\"\n", *argv);
if (filter.family == AF_UNSPEC) if (filter.family == AF_UNSPEC)
filter.family = filter.pfx.family; filter.family = filter.pfx.family;
} else if (strcmp(*argv, "scope") == 0) { } else if (strcmp(*argv, "scope") == 0) {