svn commit: r271438 - in head: share/man/man9 sys/net sys/netinet sys/netinet6 sys/sys
Alan Somers
asomers at FreeBSD.org
Thu Sep 11 20:21:06 UTC 2014
Author: asomers
Date: Thu Sep 11 20:21:03 2014
New Revision: 271438
URL: http://svnweb.freebsd.org/changeset/base/271438
Log:
Revisions 264905 and 266860 added a "int fib" argument to ifa_ifwithnet and
ifa_ifwithdstaddr. For the sake of backwards compatibility, the new
arguments were added to new functions named ifa_ifwithnet_fib and
ifa_ifwithdstaddr_fib, while the old functions became wrappers around the
new ones that passed RT_ALL_FIBS for the fib argument. However, the
backwards compatibility is not desired for FreeBSD 11, because there are
numerous other incompatible changes to the ifnet(9) API. We therefore
decided to remove it from head but leave it in place for stable/9 and
stable/10. In addition, this commit adds the fib argument to
ifa_ifwithbroadaddr for consistency's sake.
sys/sys/param.h
Increment __FreeBSD_version
sys/net/if.c
sys/net/if_var.h
sys/net/route.c
Add fibnum argument to ifa_ifwithbroadaddr, and remove the _fib
versions of ifa_ifwithdstaddr, ifa_ifwithnet, and ifa_ifwithroute.
sys/net/route.c
sys/net/rtsock.c
sys/netinet/in_pcb.c
sys/netinet/ip_options.c
sys/netinet/ip_output.c
sys/netinet6/nd6.c
Fixup calls of modified functions.
share/man/man9/ifnet.9
Document changed API.
CR: https://reviews.freebsd.org/D458
MFC after: Never
Sponsored by: Spectra Logic
Modified:
head/share/man/man9/ifnet.9
head/sys/net/if.c
head/sys/net/if_var.h
head/sys/net/route.c
head/sys/net/rtsock.c
head/sys/netinet/in_pcb.c
head/sys/netinet/ip_options.c
head/sys/netinet/ip_output.c
head/sys/netinet6/nd6.c
head/sys/sys/param.h
Modified: head/share/man/man9/ifnet.9
==============================================================================
--- head/share/man/man9/ifnet.9 Thu Sep 11 20:01:57 2014 (r271437)
+++ head/share/man/man9/ifnet.9 Thu Sep 11 20:21:03 2014 (r271438)
@@ -77,9 +77,9 @@
.Ft "struct ifaddr *"
.Fn ifa_ifwithaddr "struct sockaddr *addr"
.Ft "struct ifaddr *"
-.Fn ifa_ifwithdstaddr "struct sockaddr *addr"
+.Fn ifa_ifwithdstaddr "struct sockaddr *addr" "int fib"
.Ft "struct ifaddr *"
-.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp"
+.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp" "int fib"
.Ft "struct ifaddr *"
.Fn ifaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp"
.Ft void
@@ -1389,7 +1389,16 @@ returns an interface address for a point
remote
.Pq Dq destination
address is
-.Fa addr .
+.Fa addr
+and a fib is
+.Fa fib .
+If
+.Fa fib
+is
+.Dv RT_ALL_FIBS ,
+then the first interface address matching
+.Fa addr
+will be returned.
.Pp
.Fn ifa_ifwithnet
returns the most specific interface address which matches the
@@ -1401,7 +1410,10 @@ address whose remote address is
if one is found.
If
.Fa ignore_ptp
-is true, skip point-to-point interface addresses.
+is true, skip point-to-point interface addresses. The
+.Fa fib
+parameter is handled the same way as by
+.Fn ifa_ifwithdstaddr .
.Pp
.Fn ifaof_ifpforaddr
returns the most specific address configured on interface
Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/net/if.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -1694,13 +1694,15 @@ ifa_ifwithaddr_check(struct sockaddr *ad
*/
/* ARGSUSED */
struct ifaddr *
-ifa_ifwithbroadaddr(struct sockaddr *addr)
+ifa_ifwithbroadaddr(struct sockaddr *addr, int fibnum)
{
struct ifnet *ifp;
struct ifaddr *ifa;
IFNET_RLOCK_NOSLEEP();
TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
+ if ((fibnum != RT_ALL_FIBS) && (ifp->if_fib != fibnum))
+ continue;
IF_ADDR_RLOCK(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != addr->sa_family)
@@ -1727,7 +1729,7 @@ done:
*/
/*ARGSUSED*/
struct ifaddr *
-ifa_ifwithdstaddr_fib(struct sockaddr *addr, int fibnum)
+ifa_ifwithdstaddr(struct sockaddr *addr, int fibnum)
{
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1757,19 +1759,12 @@ done:
return (ifa);
}
-struct ifaddr *
-ifa_ifwithdstaddr(struct sockaddr *addr)
-{
-
- return (ifa_ifwithdstaddr_fib(addr, RT_ALL_FIBS));
-}
-
/*
* Find an interface on a specific network. If many, choice
* is most specific found.
*/
struct ifaddr *
-ifa_ifwithnet_fib(struct sockaddr *addr, int ignore_ptp, int fibnum)
+ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp, int fibnum)
{
struct ifnet *ifp;
struct ifaddr *ifa;
@@ -1867,13 +1862,6 @@ done:
return (ifa);
}
-struct ifaddr *
-ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp)
-{
-
- return (ifa_ifwithnet_fib(addr, ignore_ptp, RT_ALL_FIBS));
-}
-
/*
* Find an interface address specific to an interface best matching
* a given address.
Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/net/if_var.h Thu Sep 11 20:21:03 2014 (r271438)
@@ -513,13 +513,10 @@ int ifa_switch_loopback_route(struct ifa
struct ifaddr *ifa_ifwithaddr(struct sockaddr *);
int ifa_ifwithaddr_check(struct sockaddr *);
-struct ifaddr *ifa_ifwithbroadaddr(struct sockaddr *);
-struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct ifaddr *ifa_ifwithdstaddr_fib(struct sockaddr *, int);
-struct ifaddr *ifa_ifwithnet(struct sockaddr *, int);
-struct ifaddr *ifa_ifwithnet_fib(struct sockaddr *, int, int);
-struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
-struct ifaddr *ifa_ifwithroute_fib(int, struct sockaddr *, struct sockaddr *, u_int);
+struct ifaddr *ifa_ifwithbroadaddr(struct sockaddr *, int);
+struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *, int);
+struct ifaddr *ifa_ifwithnet(struct sockaddr *, int, int);
+struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *, u_int);
struct ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
int ifa_preferred(struct ifaddr *, struct ifaddr *);
Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/net/route.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -570,7 +570,7 @@ rtredirect_fib(struct sockaddr *dst,
}
/* verify the gateway is directly reachable */
- if ((ifa = ifa_ifwithnet_fib(gateway, 0, fibnum)) == NULL) {
+ if ((ifa = ifa_ifwithnet(gateway, 0, fibnum)) == NULL) {
error = ENETUNREACH;
goto out;
}
@@ -700,18 +700,8 @@ rtioctl_fib(u_long req, caddr_t data, u_
#endif /* INET */
}
-/*
- * For both ifa_ifwithroute() routines, 'ifa' is returned referenced.
- */
-struct ifaddr *
-ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway)
-{
-
- return (ifa_ifwithroute_fib(flags, dst, gateway, RT_DEFAULT_FIB));
-}
-
struct ifaddr *
-ifa_ifwithroute_fib(int flags, struct sockaddr *dst, struct sockaddr *gateway,
+ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway,
u_int fibnum)
{
struct ifaddr *ifa;
@@ -727,7 +717,7 @@ ifa_ifwithroute_fib(int flags, struct so
*/
ifa = NULL;
if (flags & RTF_HOST)
- ifa = ifa_ifwithdstaddr_fib(dst, fibnum);
+ ifa = ifa_ifwithdstaddr(dst, fibnum);
if (ifa == NULL)
ifa = ifa_ifwithaddr(gateway);
} else {
@@ -736,10 +726,10 @@ ifa_ifwithroute_fib(int flags, struct so
* or host, the gateway may still be on the
* other end of a pt to pt link.
*/
- ifa = ifa_ifwithdstaddr_fib(gateway, fibnum);
+ ifa = ifa_ifwithdstaddr(gateway, fibnum);
}
if (ifa == NULL)
- ifa = ifa_ifwithnet_fib(gateway, 0, fibnum);
+ ifa = ifa_ifwithnet(gateway, 0, fibnum);
if (ifa == NULL) {
struct rtentry *rt = rtalloc1_fib(gateway, 0, RTF_RNH_LOCKED, fibnum);
if (rt == NULL)
@@ -853,7 +843,7 @@ rt_getifa_fib(struct rt_addrinfo *info,
*/
if (info->rti_ifp == NULL && ifpaddr != NULL &&
ifpaddr->sa_family == AF_LINK &&
- (ifa = ifa_ifwithnet_fib(ifpaddr, 0, fibnum)) != NULL) {
+ (ifa = ifa_ifwithnet(ifpaddr, 0, fibnum)) != NULL) {
info->rti_ifp = ifa->ifa_ifp;
ifa_free(ifa);
}
@@ -867,10 +857,10 @@ rt_getifa_fib(struct rt_addrinfo *info,
if (sa != NULL && info->rti_ifp != NULL)
info->rti_ifa = ifaof_ifpforaddr(sa, info->rti_ifp);
else if (dst != NULL && gateway != NULL)
- info->rti_ifa = ifa_ifwithroute_fib(flags, dst, gateway,
+ info->rti_ifa = ifa_ifwithroute(flags, dst, gateway,
fibnum);
else if (sa != NULL)
- info->rti_ifa = ifa_ifwithroute_fib(flags, sa, sa,
+ info->rti_ifa = ifa_ifwithroute(flags, sa, sa,
fibnum);
}
if ((ifa = info->rti_ifa) != NULL) {
Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/net/rtsock.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -752,7 +752,8 @@ route_output(struct mbuf *m, struct sock
rt->rt_ifp->if_type == IFT_PROPVIRTUAL) {
struct ifaddr *ifa;
- ifa = ifa_ifwithnet(info.rti_info[RTAX_DST], 1);
+ ifa = ifa_ifwithnet(info.rti_info[RTAX_DST], 1,
+ RT_ALL_FIBS);
if (ifa != NULL)
rt_maskedcopy(ifa->ifa_addr,
&laddr,
Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/netinet/in_pcb.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -792,9 +792,11 @@ in_pcbladdr(struct inpcb *inp, struct in
struct in_ifaddr *ia;
struct ifnet *ifp;
- ia = ifatoia(ifa_ifwithdstaddr((struct sockaddr *)sin));
+ ia = ifatoia(ifa_ifwithdstaddr((struct sockaddr *)sin,
+ RT_ALL_FIBS));
if (ia == NULL)
- ia = ifatoia(ifa_ifwithnet((struct sockaddr *)sin, 0));
+ ia = ifatoia(ifa_ifwithnet((struct sockaddr *)sin, 0,
+ RT_ALL_FIBS));
if (ia == NULL) {
error = ENETUNREACH;
goto done;
@@ -909,9 +911,10 @@ in_pcbladdr(struct inpcb *inp, struct in
sain.sin_len = sizeof(struct sockaddr_in);
sain.sin_addr.s_addr = faddr->s_addr;
- ia = ifatoia(ifa_ifwithdstaddr(sintosa(&sain)));
+ ia = ifatoia(ifa_ifwithdstaddr(sintosa(&sain), RT_ALL_FIBS));
if (ia == NULL)
- ia = ifatoia(ifa_ifwithnet(sintosa(&sain), 0));
+ ia = ifatoia(ifa_ifwithnet(sintosa(&sain), 0,
+ RT_ALL_FIBS));
if (ia == NULL)
ia = ifatoia(ifa_ifwithaddr(sintosa(&sain)));
Modified: head/sys/netinet/ip_options.c
==============================================================================
--- head/sys/netinet/ip_options.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/netinet/ip_options.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -227,8 +227,11 @@ dropit:
if (opt == IPOPT_SSRR) {
#define INA struct in_ifaddr *
#define SA struct sockaddr *
- if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == NULL)
- ia = (INA)ifa_ifwithnet((SA)&ipaddr, 0);
+ ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr,
+ RT_ALL_FIBS);
+ if (ia == NULL)
+ ia = (INA)ifa_ifwithnet((SA)&ipaddr, 0,
+ RT_ALL_FIBS);
} else
/* XXX MRT 0 for routing */
ia = ip_rtaddr(ipaddr.sin_addr, M_GETFIB(m));
Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/netinet/ip_output.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -235,8 +235,10 @@ again:
* or the destination address of a ptp interface.
*/
if (flags & IP_SENDONES) {
- if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst)))) == NULL &&
- (ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL) {
+ if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst),
+ RT_ALL_FIBS))) == NULL &&
+ (ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst),
+ RT_ALL_FIBS))) == NULL) {
IPSTAT_INC(ips_noroute);
error = ENETUNREACH;
goto bad;
@@ -248,8 +250,10 @@ again:
ip->ip_ttl = 1;
isbroadcast = 1;
} else if (flags & IP_ROUTETOIF) {
- if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL &&
- (ia = ifatoia(ifa_ifwithnet(sintosa(dst), 0))) == NULL) {
+ if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst),
+ RT_ALL_FIBS))) == NULL &&
+ (ia = ifatoia(ifa_ifwithnet(sintosa(dst), 0,
+ RT_ALL_FIBS))) == NULL) {
IPSTAT_INC(ips_noroute);
error = ENETUNREACH;
goto bad;
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/netinet6/nd6.c Thu Sep 11 20:21:03 2014 (r271438)
@@ -945,7 +945,7 @@ nd6_is_new_addr_neighbor(struct sockaddr
* If the address is assigned on the node of the other side of
* a p2p interface, the address should be a neighbor.
*/
- dstaddr = ifa_ifwithdstaddr((struct sockaddr *)addr);
+ dstaddr = ifa_ifwithdstaddr((struct sockaddr *)addr, RT_ALL_FIBS);
if (dstaddr != NULL) {
if (dstaddr->ifa_ifp == ifp) {
ifa_free(dstaddr);
Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h Thu Sep 11 20:01:57 2014 (r271437)
+++ head/sys/sys/param.h Thu Sep 11 20:21:03 2014 (r271438)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1100031 /* Master, propagated to newvers */
+#define __FreeBSD_version 1100032 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
More information about the svn-src-head
mailing list