d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFS 1.64.2.22: Re-enable non pre-emptive ARP requests.

Browse Source 
Submitted by: "Diomidis Spinellis" <dds@aueb.gr>
PR:           kern/46116
This commit is contained in:
Orion Hodson 2003-02-04 05:28:08 +00:00
parent 50618d61ae
commit 73224fb019
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/netinet/if_ether.c
View File

@ -96,8 +96,9 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, host_down_time, CTLFLAG_RW,
struct llinfo_arp {
LIST_ENTRY(llinfo_arp) la_le;
struct rtentry *la_rt;
struct mbuf *la_hold; /* last packet until resolved/timeout */
long la_asked; /* last time we QUERIED for this addr */
struct mbuf *la_hold; /* last packet until resolved/timeout */
u_short la_preempt; /* #times we QUERIED before entry expiration */
u_short la_asked; /* #times we QUERIED following expiration */
#define la_timer la_rt->rt_rmx.rmx_expire /* deletion time in seconds */
};
@ -441,13 +442,13 @@ arpresolve(ifp, rt, m, dst, desten, rt0)
* arpt_down interval.
*/
if ((rt->rt_expire != 0) &&
(time_second + (arp_maxtries - la->la_asked) * arpt_down >
rt->rt_expire)) {
(time_second + (arp_maxtries - la->la_preempt) * arpt_down
> rt->rt_expire)) {
arprequest(ifp,
&SIN(rt->rt_ifa->ifa_addr)->sin_addr,
&SIN(dst)->sin_addr,
IF_LLADDR(ifp));
la->la_asked++;
la->la_preempt++;
}
bcopy(LLADDR(sdl), desten, sdl->sdl_alen);
@ -475,15 +476,15 @@ arpresolve(ifp, rt, m, dst, desten, rt0)
rt->rt_flags &= ~RTF_REJECT;
if (la->la_asked == 0 || rt->rt_expire != time_second) {
rt->rt_expire = time_second;
if (la->la_asked++ < arp_maxtries)
arprequest(ifp,
&SIN(rt->rt_ifa->ifa_addr)->sin_addr,
&SIN(dst)->sin_addr,
IF_LLADDR(ifp));
else {
if (la->la_asked++ < arp_maxtries) {
arprequest(ifp,
&SIN(rt->rt_ifa->ifa_addr)->sin_addr,
&SIN(dst)->sin_addr,
IF_LLADDR(ifp));
} else {
rt->rt_flags |= RTF_REJECT;
rt->rt_expire += arpt_down;
la->la_asked = 0;
la->la_preempt = la->la_asked = 0;
}
}
@ -744,7 +745,7 @@ in_arpinput(m)
if (rt->rt_expire)
rt->rt_expire = time_second + arpt_keep;
rt->rt_flags &= ~RTF_REJECT;
la->la_asked = 0;
la->la_preempt = la->la_asked = 0;
if (la->la_hold) {
(*ifp->if_output)(ifp, la->la_hold,
rt_key(rt), rt);
@ -894,7 +895,7 @@ arptfree(la)
if (rt->rt_refcnt > 0 && (sdl = SDL(rt->rt_gateway)) &&
sdl->sdl_family == AF_LINK) {
sdl->sdl_alen = 0;
la->la_asked = 0;
la->la_preempt = la->la_asked = 0;
rt->rt_flags &= ~RTF_REJECT;
return;
}