[PATCH iproute2] ip: neigh: Fix leftover attributes message during flush

[PATCH iproute2] ip: neigh: Fix leftover attributes message during flush

[Jeff Harris]

Use the same rtnl_dump_request_n call as the show.  The rtnl_wilddump_request
assumes the type uses an ifinfomsg which is not the case for the neighbor
table.

Signed-off-by: Jeff Harris <jefftharris@gmail.com>
---
 ip/ipneigh.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ip/ipneigh.c b/ip/ipneigh.c
index c49fb4e..4ddb747 100644
--- a/ip/ipneigh.c
+++ b/ip/ipneigh.c
@@ -430,6 +430,8 @@ static int do_show_or_flush(int argc, char **argv, int flush)
 		addattr32(&req.n, sizeof(req), NDA_IFINDEX, filter.index);
 	}
 
+	req.ndm.ndm_family = filter.family;
+
 	if (flush) {
 		int round = 0;
 		char flushb[4096-512];
@@ -440,7 +442,7 @@ static int do_show_or_flush(int argc, char **argv, int flush)
 		filter.state &= ~NUD_FAILED;
 
 		while (round < MAX_ROUNDS) {
-			if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNEIGH) < 0) {
+			if (rtnl_dump_request_n(&rth, &req.n) < 0) {
 				perror("Cannot send dump request");
 				exit(1);
 			}
@@ -472,8 +474,6 @@ static int do_show_or_flush(int argc, char **argv, int flush)
 		return 1;
 	}
 
-	req.ndm.ndm_family = filter.family;
-
 	if (rtnl_dump_request_n(&rth, &req.n) < 0) {
 		perror("Cannot send dump request");
 		exit(1);
-- 
1.7.9.5

Re: [PATCH iproute2] ip: neigh: Fix leftover attributes message during flush

[David Ahern]

On 4/14/16 12:15 PM, Jeff Harris wrote:
> Use the same rtnl_dump_request_n call as the show.  The rtnl_wilddump_request
> assumes the type uses an ifinfomsg which is not the case for the neighbor
> table.
>
> Signed-off-by: Jeff Harris <jefftharris@gmail.com>
> ---

Acked-by: David Ahern <dsa@cumulusnetworks.com>

Fixes the "netlink: 12 bytes leftover after parsing attributes in 
process `ip'." message.

Re: [PATCH iproute2] ip: neigh: Fix leftover attributes message during flush

[Stephen Hemminger]

On Thu, 14 Apr 2016 14:15:03 -0400
Jeff Harris <jefftharris@gmail.com> wrote:

> Use the same rtnl_dump_request_n call as the show.  The rtnl_wilddump_request
> assumes the type uses an ifinfomsg which is not the case for the neighbor
> table.
> 
> Signed-off-by: Jeff Harris <jefftharris@gmail.com>
> ---
>  ip/ipneigh.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied thanks