Commit c6995c48 authored by Phil Sutter's avatar Phil Sutter Committed by Stephen Hemminger

ipaddress: simplify ipaddr_flush()

Since it's no longer relevant whether an IP address is primary or
secondary when flushing, ipaddr_flush() can be simplified a bit.
Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
parent 68ef5072
...@@ -1148,28 +1148,6 @@ brief_exit: ...@@ -1148,28 +1148,6 @@ brief_exit:
return 0; return 0;
} }
static int print_addrinfo_primary(const struct sockaddr_nl *who,
struct nlmsghdr *n, void *arg)
{
struct ifaddrmsg *ifa = NLMSG_DATA(n);
if (ifa->ifa_flags & IFA_F_SECONDARY)
return 0;
return print_addrinfo(who, n, arg);
}
static int print_addrinfo_secondary(const struct sockaddr_nl *who,
struct nlmsghdr *n, void *arg)
{
struct ifaddrmsg *ifa = NLMSG_DATA(n);
if (!(ifa->ifa_flags & IFA_F_SECONDARY))
return 0;
return print_addrinfo(who, n, arg);
}
struct nlmsg_list struct nlmsg_list
{ {
struct nlmsg_list *next; struct nlmsg_list *next;
...@@ -1420,26 +1398,12 @@ static int ipaddr_flush(void) ...@@ -1420,26 +1398,12 @@ static int ipaddr_flush(void)
filter.flushe = sizeof(flushb); filter.flushe = sizeof(flushb);
while ((max_flush_loops == 0) || (round < max_flush_loops)) { while ((max_flush_loops == 0) || (round < max_flush_loops)) {
const struct rtnl_dump_filter_arg a[3] = {
{
.filter = print_addrinfo_secondary,
.arg1 = stdout,
},
{
.filter = print_addrinfo_primary,
.arg1 = stdout,
},
{
.filter = NULL,
.arg1 = NULL,
},
};
if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) { if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
exit(1); exit(1);
} }
filter.flushed = 0; filter.flushed = 0;
if (rtnl_dump_filter_l(&rth, a) < 0) { if (rtnl_dump_filter(&rth, print_addrinfo, stdout) < 0) {
fprintf(stderr, "Flush terminated\n"); fprintf(stderr, "Flush terminated\n");
exit(1); exit(1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment