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

iprule: 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:35 +02:00 committed by David Ahern
parent c4de9adaf5
commit 746035b4d1
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ip/iprule.c
View File

@ -76,8 +76,6 @@ static struct
static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len) static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len)
{ {
struct rtmsg *r = NLMSG_DATA(n); struct rtmsg *r = NLMSG_DATA(n);
inet_prefix src = { .family = r->rtm_family };
inet_prefix dst = { .family = r->rtm_family };
__u32 table; __u32 table;
if (preferred_family != AF_UNSPEC && r->rtm_family != preferred_family) if (preferred_family != AF_UNSPEC && r->rtm_family != preferred_family)
@ -90,24 +88,24 @@ static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len)
return false; return false;
if (filter.src.family) { if (filter.src.family) {
if (tb[FRA_SRC]) { inet_prefix *f_src = &filter.src;
memcpy(&src.data, RTA_DATA(tb[FRA_SRC]),
(r->rtm_src_len + 7) / 8); if (f_src->family != r->rtm_family ||
} f_src->bitlen > r->rtm_src_len)
if (filter.src.family != r->rtm_family || return false;
filter.src.bitlen > r->rtm_src_len ||
inet_addr_match(&src, &filter.src, filter.src.bitlen)) if (inet_addr_match_rta(f_src, tb[FRA_SRC]))
return false; return false;
} }
if (filter.dst.family) { if (filter.dst.family) {
if (tb[FRA_DST]) { inet_prefix *f_dst = &filter.dst;
memcpy(&dst.data, RTA_DATA(tb[FRA_DST]),
(r->rtm_dst_len + 7) / 8); if (f_dst->family != r->rtm_family ||
} f_dst->bitlen > r->rtm_dst_len)
if (filter.dst.family != r->rtm_family || return false;
filter.dst.bitlen > r->rtm_dst_len ||
inet_addr_match(&dst, &filter.dst, filter.dst.bitlen)) if (inet_addr_match_rta(f_dst, tb[FRA_DST]))
return false; return false;
} }
@ -500,13 +498,15 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action)
} else if (matches(*argv, "from") == 0 || } else if (matches(*argv, "from") == 0 ||
matches(*argv, "src") == 0) { matches(*argv, "src") == 0) {
NEXT_ARG(); NEXT_ARG();
get_prefix(&filter.src, *argv, af); if (get_prefix(&filter.src, *argv, af))
invarg("from value is invalid\n", *argv);
} else { } else {
if (matches(*argv, "dst") == 0 || if (matches(*argv, "dst") == 0 ||
matches(*argv, "to") == 0) { matches(*argv, "to") == 0) {
NEXT_ARG(); NEXT_ARG();
} }
get_prefix(&filter.dst, *argv, af); if (get_prefix(&filter.dst, *argv, af))
invarg("to value is invalid\n", *argv);
} }
argc--; argv++; argc--; argv++;
} }