Date: Thu, 20 Dec 2001 02:30:19 -0800 (PST) From: Ruslan Ermilov <ru@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/net if.c if_disc.c if_faith.c if_loop.c if_stf.c if_var.h route.c route.h rtsock.c src/sys/netinet if_atm.c if_atm.h if_ether.c in_pcb.c src/sys/netinet6 in6_pcb.c nd6.c nd6.h Message-ID: <200112201030.fBKAUJs19100@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
ru 2001/12/20 02:30:19 PST
Modified files: (Branch: RELENG_4)
sys/net if.c if_disc.c if_faith.c if_loop.c
if_stf.c if_var.h route.c route.h
rtsock.c
sys/netinet if_atm.c if_atm.h if_ether.c in_pcb.c
sys/netinet6 in6_pcb.c nd6.c nd6.h
Log:
MFC:
net/ if.c,v 1.124, if_disc.c,v 1.29, if_faith.c,v 1.8,
if_loop.c,v 1.65, if_stf.c,v 1.14, if_var.h,v 1.40,
route.c,v 1.67, route.h,v 1.41, rtsock.c,v 1.61
netinet/ if_atm.c,v 1.9, if_atm.h,v 1.4, if_ether.c,v 1.85,
in_pcb.c,v 1.91
netinet6/ in6_pcb.c,v 1.21, nd6.c,v 1.14, nd6.h,v 1.9
Pull post-4.4BSD change to sys/net/route.c from BSD/OS 4.2, also
found in CSRG archive.
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 no one 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.
Also, bring in the following fixes from -CURRENT that prevented
this code from being MFC'ed earlier:
net/ rtsock.c,v 1.62
In RTM_CHANGE, only call rt_getifa() (to set the new ifp/ifa) if
we've either been passed a gateway (and the route is marked as
RTF_GATEWAY) or if we've been given an RTA_IFP or changed RTA_IFA
sockaddr.
net/ rtsock.c,v 1.63
Back out revision 1.7 -- it's no longer necessary to ensure that
``gate'' is set when RTF_GATEWAY is passed, as subsequent code
does that check now anyway.
Revision Changes Path
1.85.2.11 +4 -4 src/sys/net/if.c
1.26.2.2 +4 -4 src/sys/net/if_disc.c
1.3.2.5 +3 -3 src/sys/net/if_faith.c
1.47.2.6 +4 -4 src/sys/net/if_loop.c
1.1.2.8 +3 -3 src/sys/net/if_stf.c
1.18.2.11 +2 -1 src/sys/net/if_var.h
1.59.2.7 +154 -104 src/sys/net/route.c
1.36.2.4 +5 -0 src/sys/net/route.h
1.44.2.7 +20 -31 src/sys/net/rtsock.c
1.8.2.1 +3 -3 src/sys/netinet/if_atm.c
1.2.6.2 +1 -1 src/sys/netinet/if_atm.h
1.64.2.14 +3 -3 src/sys/netinet/if_ether.c
1.59.2.20 +4 -6 src/sys/netinet/in_pcb.c
1.10.2.7 +3 -5 src/sys/netinet6/in6_pcb.c
1.2.2.10 +3 -3 src/sys/netinet6/nd6.c
1.2.2.4 +1 -1 src/sys/netinet6/nd6.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112201030.fBKAUJs19100>