proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-06 09:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipmroute: Use inet_addr_match_rta()

Browse Source 
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:36 +02:00 committed by David Ahern
parent 746035b4d1
commit ba6052df6d
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ip/ipmroute.c
View File

@ -95,21 +95,11 @@ int print_mroute(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (filter.af && filter.af != r->rtm_family) if (filter.af && filter.af != r->rtm_family)
return 0; return 0;
if (tb[RTA_DST] && filter.mdst.bitlen > 0) { if (inet_addr_match_rta(&filter.mdst, tb[RTA_DST]))
inet_prefix dst = { .family = r->rtm_family }; return 0;
memcpy(&dst.data, RTA_DATA(tb[RTA_DST]), RTA_PAYLOAD(tb[RTA_DST])); if (inet_addr_match_rta(&filter.msrc, tb[RTA_SRC]))
if (inet_addr_match(&dst, &filter.mdst, filter.mdst.bitlen)) return 0;
return 0;
}
if (tb[RTA_SRC] && filter.msrc.bitlen > 0) {
inet_prefix src = { .family = r->rtm_family };
memcpy(&src.data, RTA_DATA(tb[RTA_SRC]), RTA_PAYLOAD(tb[RTA_SRC]));
if (inet_addr_match(&src, &filter.msrc, filter.msrc.bitlen))
return 0;
}
family = get_real_family(r->rtm_type, r->rtm_family); family = get_real_family(r->rtm_type, r->rtm_family);
@ -213,6 +203,8 @@ static int mroute_list(int argc, char **argv)
} else } else
filter.af = RTNL_FAMILY_IP6MR; filter.af = RTNL_FAMILY_IP6MR;
filter.msrc.family = filter.mdst.family = family;
while (argc > 0) { while (argc > 0) {
if (matches(*argv, "table") == 0) { if (matches(*argv, "table") == 0) {
__u32 tid; __u32 tid;
@ -233,14 +225,16 @@ static int mroute_list(int argc, char **argv)
id = *argv; id = *argv;
} else if (matches(*argv, "from") == 0) { } else if (matches(*argv, "from") == 0) {
NEXT_ARG(); NEXT_ARG();
get_prefix(&filter.msrc, *argv, family); if (get_prefix(&filter.msrc, *argv, family))
invarg("from value is invalid\n", *argv);
} else { } else {
if (strcmp(*argv, "to") == 0) { if (strcmp(*argv, "to") == 0) {
NEXT_ARG(); NEXT_ARG();
} }
if (matches(*argv, "help") == 0) if (matches(*argv, "help") == 0)
usage(); usage();
get_prefix(&filter.mdst, *argv, family); if (get_prefix(&filter.mdst, *argv, family))
invarg("to value is invalid\n", *argv);
} }
argc--; argv++; argc--; argv++;
} }