From 08aadfbb983a94932af342a1927b6c9356bc7ea6 Mon Sep 17 00:00:00 2001 From: Jonathan Lemon Date: Fri, 15 Jun 2001 21:00:32 +0000 Subject: Do not perform arp send/resolve on an interface marked NOARP. PR: 25006 MFC after: 2 weeks --- sys/netinet/if_ether.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'sys/netinet') diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index de5d906e33d7..8c8f01f0287b 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -368,7 +368,7 @@ arpresolve(ac, rt, m, dst, desten, rt0) register u_char *desten; struct rtentry *rt0; { - register struct llinfo_arp *la = 0; + struct llinfo_arp *la = 0; struct sockaddr_dl *sdl; if (m->m_flags & M_BCAST) { /* broadcast */ @@ -403,6 +403,14 @@ arpresolve(ac, rt, m, dst, desten, rt0) bcopy(LLADDR(sdl), desten, sdl->sdl_alen); return 1; } + /* + * If ARP is disabled on this interface, stop. + * XXX + * Probably should not allocate empty llinfo struct if we are + * not going to be sending out an arp request. + */ + if (ac->ac_if.if_flags & IFF_NOARP) + return (0); /* * There is an arptab entry, but no ethernet address * response yet. Replace the held mbuf with this -- cgit v1.3