diff options
author | ru <ru@FreeBSD.org> | 2001-10-17 18:07:05 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2001-10-17 18:07:05 +0000 |
commit | ecb4d3d05f89eabc8020bb6563d903164e3002a1 (patch) | |
tree | 6e9f67b95d216263dd912c61fa5f86b94ce2d728 /sys/netinet/if_ether.c | |
parent | ddef7c98c51d09f80ae57f4f83e00ee5b6e3ee72 (diff) | |
download | FreeBSD-src-ecb4d3d05f89eabc8020bb6563d903164e3002a1.zip FreeBSD-src-ecb4d3d05f89eabc8020bb6563d903164e3002a1.tar.gz |
Pull post-4.4BSD change to sys/net/route.c from BSD/OS 4.2.
Have sys/net/route.c:rtrequest1(), which takes ``rt_addrinfo *''
as the argument. Pass rt_addrinfo all the way down to rtrequest1
and ifa->ifa_rtrequest. 3rd argument of ifa->ifa_rtrequest is now
``rt_addrinfo *'' instead of ``sockaddr *'' (almost noone is
using it anyways).
Benefit: the following command now works. Previously we needed
two route(8) invocations, "add" then "change".
# route add -inet6 default ::1 -ifp gif0
Remove unsafe typecast in rtrequest(), from ``rtentry *'' to
``sockaddr *''. It was introduced by 4.3BSD-Reno and never
corrected.
Obtained from: BSD/OS, NetBSD
MFC after: 1 month
PR: kern/28360
Diffstat (limited to 'sys/netinet/if_ether.c')
-rw-r--r-- | sys/netinet/if_ether.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index dc662a8..1b654f4 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -116,7 +116,7 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW, &arp_proxyall, 0, ""); static void arp_init __P((void)); -static void arp_rtrequest __P((int, struct rtentry *, struct sockaddr *)); +static void arp_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); static void arprequest __P((struct ifnet *, struct in_addr *, struct in_addr *, u_char *)); static void arpintr __P((void)); @@ -154,10 +154,10 @@ arptimer(ignored_arg) * Parallel to llc_rtrequest. */ static void -arp_rtrequest(req, rt, sa) +arp_rtrequest(req, rt, info) int req; register struct rtentry *rt; - struct sockaddr *sa; + struct rt_addrinfo *info; { register struct sockaddr *gate = rt->rt_gateway; register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo; |