Mon Mar 9 17:57:19 2020 UTC ()

arp: report RTM_MISS when removing an unresolved entry in the arp table

Otherwise we only get it when renewing and we've sent too many requests.
This mirrors INET6 behaviour.


(roy)

diff -r1.292 -r1.293 src/sys/netinet/if_arp.c

--- src/sys/netinet/if_arp.c 2020/01/23 17:27:35	1.292
+++ src/sys/netinet/if_arp.c 2020/03/09 17:57:19	1.293

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_arp.c,v 1.292 2020/01/23 17:27:35 roy Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.293 2020/03/09 17:57:19 roy Exp $	*/
 /*
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Public Access Networks Corporation ("Panix").  It was developed under
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -58,27 +58,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)if_ether.c	8.2 (Berkeley) 9/26/94
  */
 /*
  * Ethernet address resolution protocol.
  * TODO:
  *	add "inuse/lock" bit (or ref. count) along with valid bit
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.292 2020/01/23 17:27:35 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.293 2020/03/09 17:57:19 roy Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #ifdef INET
 #include "arp.h"
 #include "bridge.h"
 #include <sys/param.h>
 @@ -297,38 +297,42 @@ arptimer(void *arg)
 		return;
+	}
 	ifp = lle->lle_tbl->llt_ifp;
 	/* XXX: LOR avoidance. We still have ref on lle. */
 	LLE_WUNLOCK(lle);
 	IF_AFDATA_LOCK(ifp);
 	LLE_WLOCK(lle);
 	/* Guard against race with other llentry_free(). */
 	if (lle->la_flags & LLE_LINKED) {
 		int rt_cmd;
 		struct in_addr *in;
 		struct sockaddr_in sin;
 		const char *lladdr;
 		size_t pkts_dropped;
 		in = &lle->r_l3addr.addr4;
 		sockaddr_in_init(&sin, in, 0);
 		if (lle->la_flags & LLE_VALID) {
-			struct in_addr *in;
+			rt_cmd = RTM_DELETE;
 			struct sockaddr_in sin;
 			const char *lladdr;
 			in = &lle->r_l3addr.addr4;
 			sockaddr_in_init(&sin, in, 0);
 			lladdr = (const char *)&lle->ll_addr;
-			rt_clonedmsg(RTM_DELETE, sintosa(&sin), lladdr, ifp);
+		} else {
 			rt_cmd = RTM_MISS;
 			lladdr = NULL;
+		}
 		rt_clonedmsg(rt_cmd, sintosa(&sin), lladdr, ifp);
 		LLE_REMREF(lle);
 		pkts_dropped = llentry_free(lle);
 		ARP_STATADD(ARP_STAT_DFRDROPPED, pkts_dropped);
 		ARP_STATADD(ARP_STAT_DFRTOTAL, pkts_dropped);
 	} else {
 		LLE_FREE_LOCKED(lle);
+	}
 	IF_AFDATA_UNLOCK(ifp);
+}
 static void