 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_arp.c,v 1.158 2014/06/03 01:24:32 ozaki-r Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.158.2.1 2015/11/06 00:46:50 riz 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.158 2014/06/03 01:24:32 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.158.2.1 2015/11/06 00:46:50 riz Exp $");
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #ifdef INET
 #include "bridge.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -184,26 +184,27 @@ struct	ifnet *myip_ifp = NULL;
 #ifdef DDB
 static void db_print_sa(const struct sockaddr *);
 static void db_print_ifa(struct ifaddr *);
 static void db_print_llinfo(void *);
 static int db_show_rtentry(struct rtentry *, void *);
 #endif
 static int arp_drainwanted;
 static int log_movements = 1;
 static int log_permanent_modify = 1;
 static int log_wrong_iface = 1;
 static int log_unknown_network = 1;
 /*
  * this should be elsewhere.
  */
 static char *
 lla_snprintf(u_int8_t *, int);
 static char *
 lla_snprintf(u_int8_t *adrp, int len)
+{
 #define NUMBUFS 3
 	static char buf[NUMBUFS][16*3];
 @@ -1295,37 +1296,40 @@ arplookup1(struct mbuf *m, const struct
 		rt->rt_refcnt--;
 	} else
 		rt = rt0;
 #define	IS_LLINFO(__rt)							  \
 	(((__rt)->rt_flags & (RTF_GATEWAY | RTF_LLINFO)) == RTF_LLINFO && \
 	 (__rt)->rt_gateway->sa_family == AF_LINK)
 	if (IS_LLINFO(rt))
 		return (struct llinfo_arp *)rt->rt_llinfo;
 	if (create) {
-		if (rt->rt_flags & RTF_GATEWAY)
+		if (rt->rt_flags & RTF_GATEWAY) {
-			why = "host is not on local network";
+			if (log_unknown_network)
-		else if ((rt->rt_flags & RTF_LLINFO) == 0) {
+				why = "host is not on local network";
 		} else if ((rt->rt_flags & RTF_LLINFO) == 0) {
 			ARP_STATINC(ARP_STAT_ALLOCFAIL);
 			why = "could not allocate llinfo";
 		} else
 			why = "gateway route is not ours";
-		log(LOG_DEBUG, "arplookup: unable to enter address"
+		if (why) {
-		    " for %s@%s on %s (%s)\n",
+			log(LOG_DEBUG, "arplookup: unable to enter address"
-		    in_fmtaddr(*addr), lla_snprintf(ar_sha(ah), ah->ar_hln),
+			    " for %s@%s on %s (%s)\n", in_fmtaddr(*addr),
-		    (ifp) ? ifp->if_xname : "null", why);
+			    lla_snprintf(ar_sha(ah), ah->ar_hln),
 			    (ifp) ? ifp->if_xname : "null", why);
+		}
 		if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_CLONED) != 0) {
 			rtrequest(RTM_DELETE, rt_getkey(rt),
 		    	    rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
+		}
+	}
 	return NULL;
+}
 int
 arpioctl(u_long cmd, void *data)
+{
 	return EOPNOTSUPP;
 @@ -1694,16 +1698,23 @@ sysctl_net_inet_arp_setup(struct sysctll
 			CTLTYPE_INT, "log_permanent_modify",
 			SYSCTL_DESCR("log ARP replies from MACs different than"
 			    " the one in the permanent arp entry"),
 			NULL, 0, &log_permanent_modify, 0,
 			CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 			CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 			CTLTYPE_INT, "log_wrong_iface",
 			SYSCTL_DESCR("log ARP packets arriving on the wrong"
 			    " interface"),
 			NULL, 0, &log_wrong_iface, 0,
 			CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 			CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 			CTLTYPE_INT, "log_unknown_network",
 			SYSCTL_DESCR("log ARP packets from non-local network"),
 			NULL, 0, &log_unknown_network, 0,
 			CTL_NET,PF_INET, node->sysctl_num, CTL_CREATE, CTL_EOL);
+}
 #endif /* INET */