2017-02-17 05:56:53 +03:00
|
|
|
/* $NetBSD: rtsock.c,v 1.201 2017/02/17 02:56:53 ozaki-r Exp $ */
|
1999-07-01 12:12:45 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
|
|
|
* All rights reserved.
|
2005-02-27 01:45:09 +03:00
|
|
|
*
|
1999-07-01 12:12:45 +04:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the name of the project nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
2005-02-27 01:45:09 +03:00
|
|
|
*
|
1999-07-01 12:12:45 +04:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
1994-06-29 10:29:24 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
1994-05-13 10:02:48 +04:00
|
|
|
* Copyright (c) 1988, 1991, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
1993-03-21 12:45:37 +03:00
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
2003-08-07 20:26:28 +04:00
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
1993-03-21 12:45:37 +03:00
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
1998-03-01 05:20:01 +03:00
|
|
|
* @(#)rtsock.c 8.7 (Berkeley) 10/12/95
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
|
|
|
|
2001-11-13 02:49:33 +03:00
|
|
|
#include <sys/cdefs.h>
|
2017-02-17 05:56:53 +03:00
|
|
|
__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.201 2017/02/17 02:56:53 ozaki-r Exp $");
|
2001-11-13 02:49:33 +03:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
#ifdef _KERNEL_OPT
|
1999-07-10 03:41:16 +04:00
|
|
|
#include "opt_inet.h"
|
2010-06-26 18:24:27 +04:00
|
|
|
#include "opt_mpls.h"
|
2009-01-11 05:45:45 +03:00
|
|
|
#include "opt_compat_netbsd.h"
|
2015-10-14 00:28:34 +03:00
|
|
|
#include "opt_sctp.h"
|
2017-01-19 09:58:55 +03:00
|
|
|
#include "opt_net_mpsafe.h"
|
2009-01-11 05:45:45 +03:00
|
|
|
#endif
|
1999-07-10 03:41:16 +04:00
|
|
|
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
|
|
|
#include <sys/proc.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/socketvar.h>
|
|
|
|
#include <sys/domain.h>
|
|
|
|
#include <sys/protosw.h>
|
1996-02-14 00:59:53 +03:00
|
|
|
#include <sys/sysctl.h>
|
2006-05-15 01:19:33 +04:00
|
|
|
#include <sys/kauth.h>
|
2014-05-19 06:51:24 +04:00
|
|
|
#include <sys/kmem.h>
|
2008-03-26 17:53:14 +03:00
|
|
|
#include <sys/intr.h>
|
1996-02-14 00:59:53 +03:00
|
|
|
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <net/if.h>
|
2016-04-04 10:37:07 +03:00
|
|
|
#include <net/if_llatbl.h>
|
|
|
|
#include <net/if_types.h>
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <net/route.h>
|
|
|
|
#include <net/raw_cb.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2016-04-04 10:37:07 +03:00
|
|
|
#include <netinet/in_var.h>
|
|
|
|
#include <netinet/if_inarp.h>
|
|
|
|
|
2010-06-26 18:24:27 +04:00
|
|
|
#include <netmpls/mpls.h>
|
|
|
|
|
2015-10-14 00:28:34 +03:00
|
|
|
#ifdef SCTP
|
|
|
|
extern void sctp_add_ip_address(struct ifaddr *);
|
|
|
|
extern void sctp_delete_ip_address(struct ifaddr *);
|
|
|
|
#endif
|
|
|
|
|
2016-09-21 13:50:22 +03:00
|
|
|
#if defined(COMPAT_14) || defined(COMPAT_50) || defined(COMPAT_70)
|
2009-01-11 05:45:45 +03:00
|
|
|
#include <compat/net/if.h>
|
2011-02-01 04:39:19 +03:00
|
|
|
#include <compat/net/route.h>
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_RTSOCK
|
|
|
|
#define RTM_XVERSION RTM_OVERSION
|
2016-09-21 13:50:22 +03:00
|
|
|
#define RTM_XNEWADDR RTM_ONEWADDR
|
|
|
|
#define RTM_XDELADDR RTM_ODELADDR
|
|
|
|
#define RTM_XCHGADDR RTM_OCHGADDR
|
2011-02-01 04:39:19 +03:00
|
|
|
#define RT_XADVANCE(a,b) RT_OADVANCE(a,b)
|
|
|
|
#define RT_XROUNDUP(n) RT_OROUNDUP(n)
|
|
|
|
#define PF_XROUTE PF_OROUTE
|
|
|
|
#define rt_xmsghdr rt_msghdr50
|
|
|
|
#define if_xmsghdr if_msghdr /* if_msghdr50 is for RTM_OIFINFO */
|
|
|
|
#define ifa_xmsghdr ifa_msghdr50
|
|
|
|
#define if_xannouncemsghdr if_announcemsghdr50
|
|
|
|
#define COMPATNAME(x) compat_50_ ## x
|
|
|
|
#define DOMAINNAME "oroute"
|
|
|
|
CTASSERT(sizeof(struct ifa_xmsghdr) == 20);
|
|
|
|
DOMAIN_DEFINE(compat_50_routedomain); /* forward declare and add to link set */
|
2016-09-21 13:50:22 +03:00
|
|
|
#undef COMPAT_70
|
2015-04-06 09:26:21 +03:00
|
|
|
#else /* COMPAT_RTSOCK */
|
2011-02-01 04:39:19 +03:00
|
|
|
#define RTM_XVERSION RTM_VERSION
|
2016-09-21 13:50:22 +03:00
|
|
|
#define RTM_XNEWADDR RTM_NEWADDR
|
|
|
|
#define RTM_XDELADDR RTM_DELADDR
|
|
|
|
#define RTM_XCHGADDR RTM_CHGADDR
|
2011-02-01 04:39:19 +03:00
|
|
|
#define RT_XADVANCE(a,b) RT_ADVANCE(a,b)
|
|
|
|
#define RT_XROUNDUP(n) RT_ROUNDUP(n)
|
|
|
|
#define PF_XROUTE PF_ROUTE
|
|
|
|
#define rt_xmsghdr rt_msghdr
|
|
|
|
#define if_xmsghdr if_msghdr
|
|
|
|
#define ifa_xmsghdr ifa_msghdr
|
|
|
|
#define if_xannouncemsghdr if_announcemsghdr
|
|
|
|
#define COMPATNAME(x) x
|
|
|
|
#define DOMAINNAME "route"
|
2016-09-21 13:50:22 +03:00
|
|
|
CTASSERT(sizeof(struct ifa_xmsghdr) == 32);
|
2011-02-01 04:39:19 +03:00
|
|
|
#ifdef COMPAT_50
|
|
|
|
#define COMPATCALL(name, args) compat_50_ ## name args
|
|
|
|
#endif
|
|
|
|
DOMAIN_DEFINE(routedomain); /* forward declare and add to link set */
|
|
|
|
#undef COMPAT_50
|
|
|
|
#undef COMPAT_14
|
2015-04-06 09:26:21 +03:00
|
|
|
#endif /* COMPAT_RTSOCK */
|
2009-01-11 05:45:45 +03:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
#ifndef COMPATCALL
|
|
|
|
#define COMPATCALL(name, args) do { } while (/*CONSTCOND*/ 0)
|
|
|
|
#endif
|
1996-02-14 00:59:53 +03:00
|
|
|
|
2014-12-02 23:25:47 +03:00
|
|
|
#ifdef RTSOCK_DEBUG
|
2016-05-17 18:21:14 +03:00
|
|
|
#define RT_IN_PRINT(info, b, a) (in_print((b), sizeof(b), \
|
|
|
|
&((const struct sockaddr_in *)(info)->rti_info[(a)])->sin_addr), (b))
|
2014-12-02 23:25:47 +03:00
|
|
|
#endif /* RTSOCK_DEBUG */
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
struct route_info COMPATNAME(route_info) = {
|
|
|
|
.ri_dst = { .sa_len = 2, .sa_family = PF_XROUTE, },
|
|
|
|
.ri_src = { .sa_len = 2, .sa_family = PF_XROUTE, },
|
|
|
|
.ri_maxqlen = IFQ_MAXLEN,
|
|
|
|
};
|
2008-03-26 17:53:14 +03:00
|
|
|
|
2011-02-10 10:42:18 +03:00
|
|
|
#define PRESERVED_RTF (RTF_UP | RTF_GATEWAY | RTF_HOST | RTF_DONE | RTF_MASK)
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
static void COMPATNAME(route_init)(void);
|
2016-01-21 00:43:59 +03:00
|
|
|
static int COMPATNAME(route_output)(struct mbuf *, struct socket *);
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2004-10-23 23:13:22 +04:00
|
|
|
static int rt_xaddrs(u_char, const char *, const char *, struct rt_addrinfo *);
|
2005-06-22 10:14:51 +04:00
|
|
|
static struct mbuf *rt_makeifannouncemsg(struct ifnet *, int, int,
|
|
|
|
struct rt_addrinfo *);
|
2016-04-04 10:37:07 +03:00
|
|
|
static int rt_msg2(int, struct rt_addrinfo *, void *, struct rt_walkarg *, int *);
|
2011-02-01 04:39:19 +03:00
|
|
|
static void rt_setmetrics(int, const struct rt_xmsghdr *, struct rtentry *);
|
|
|
|
static void rtm_setmetrics(const struct rtentry *, struct rt_xmsghdr *);
|
2009-09-16 19:23:04 +04:00
|
|
|
static void sysctl_net_route_setup(struct sysctllog **);
|
2007-06-09 07:07:21 +04:00
|
|
|
static int sysctl_dumpentry(struct rtentry *, void *);
|
2009-01-11 05:45:45 +03:00
|
|
|
static int sysctl_iflist(int, struct rt_walkarg *, int);
|
2004-04-22 01:03:43 +04:00
|
|
|
static int sysctl_rtable(SYSCTLFN_PROTO);
|
2009-02-20 13:54:57 +03:00
|
|
|
static void rt_adjustcount(int, int);
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2016-01-21 00:43:59 +03:00
|
|
|
static const struct protosw COMPATNAME(route_protosw)[];
|
|
|
|
|
2009-02-20 13:54:57 +03:00
|
|
|
static void
|
2004-04-22 01:03:43 +04:00
|
|
|
rt_adjustcount(int af, int cnt)
|
1998-12-10 18:52:39 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct route_cb * const cb = &COMPATNAME(route_info).ri_cb;
|
|
|
|
|
|
|
|
cb->any_count += cnt;
|
|
|
|
|
1998-12-10 18:52:39 +03:00
|
|
|
switch (af) {
|
|
|
|
case AF_INET:
|
2011-02-01 04:39:19 +03:00
|
|
|
cb->ip_count += cnt;
|
1998-12-10 18:52:39 +03:00
|
|
|
return;
|
1999-07-01 12:12:45 +04:00
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6:
|
2011-02-01 04:39:19 +03:00
|
|
|
cb->ip6_count += cnt;
|
1999-07-01 12:12:45 +04:00
|
|
|
return;
|
|
|
|
#endif
|
2010-06-26 18:24:27 +04:00
|
|
|
case AF_MPLS:
|
2011-02-01 04:39:19 +03:00
|
|
|
cb->mpls_count += cnt;
|
2010-06-26 18:24:27 +04:00
|
|
|
return;
|
1998-12-10 18:52:39 +03:00
|
|
|
}
|
|
|
|
}
|
2009-02-20 13:54:57 +03:00
|
|
|
|
2014-05-19 06:51:24 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_attach)(struct socket *so, int proto)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2014-05-19 06:51:24 +04:00
|
|
|
struct rawcb *rp;
|
|
|
|
int s, error;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2014-05-19 06:51:24 +04:00
|
|
|
KASSERT(sotorawcb(so) == NULL);
|
|
|
|
rp = kmem_zalloc(sizeof(*rp), KM_SLEEP);
|
2014-05-22 00:43:56 +04:00
|
|
|
rp->rcb_len = sizeof(*rp);
|
2014-05-19 06:51:24 +04:00
|
|
|
so->so_pcb = rp;
|
1997-02-22 06:47:01 +03:00
|
|
|
|
2014-05-19 06:51:24 +04:00
|
|
|
s = splsoftnet();
|
|
|
|
if ((error = raw_attach(so, proto)) == 0) {
|
1998-12-10 18:52:39 +03:00
|
|
|
rt_adjustcount(rp->rcb_proto.sp_protocol, 1);
|
2011-02-01 04:39:19 +03:00
|
|
|
rp->rcb_laddr = &COMPATNAME(route_info).ri_src;
|
|
|
|
rp->rcb_faddr = &COMPATNAME(route_info).ri_dst;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
splx(s);
|
2014-05-19 06:51:24 +04:00
|
|
|
|
|
|
|
if (error) {
|
|
|
|
kmem_free(rp, sizeof(*rp));
|
|
|
|
so->so_pcb = NULL;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
soisconnected(so);
|
|
|
|
so->so_options |= SO_USELOOPBACK;
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
COMPATNAME(route_detach)(struct socket *so)
|
|
|
|
{
|
|
|
|
struct rawcb *rp = sotorawcb(so);
|
|
|
|
int s;
|
|
|
|
|
|
|
|
KASSERT(rp != NULL);
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
s = splsoftnet();
|
|
|
|
rt_adjustcount(rp->rcb_proto.sp_protocol, -1);
|
|
|
|
raw_detach(so);
|
|
|
|
splx(s);
|
|
|
|
}
|
|
|
|
|
2014-07-09 18:41:42 +04:00
|
|
|
static int
|
2015-04-25 01:32:37 +03:00
|
|
|
COMPATNAME(route_accept)(struct socket *so, struct sockaddr *nam)
|
2014-07-09 18:41:42 +04:00
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
panic("route_accept");
|
2014-07-24 19:12:03 +04:00
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2015-04-03 23:01:07 +03:00
|
|
|
COMPATNAME(route_bind)(struct socket *so, struct sockaddr *nam, struct lwp *l)
|
2014-07-24 19:12:03 +04:00
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2014-08-05 09:24:26 +04:00
|
|
|
COMPATNAME(route_listen)(struct socket *so, struct lwp *l)
|
2014-07-24 19:12:03 +04:00
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
2014-07-09 18:41:42 +04:00
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-07-30 14:04:25 +04:00
|
|
|
static int
|
2015-05-02 20:18:03 +03:00
|
|
|
COMPATNAME(route_connect)(struct socket *so, struct sockaddr *nam, struct lwp *l)
|
2014-07-30 14:04:25 +04:00
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-08-09 09:33:00 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_connect2)(struct socket *so, struct socket *so2)
|
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
split PRU_DISCONNECT, PRU_SHUTDOWN and PRU_ABORT function out of
pr_generic() usrreq switches and put into separate functions
xxx_disconnect(struct socket *)
xxx_shutdown(struct socket *)
xxx_abort(struct socket *)
- always KASSERT(solocked(so)) even if not implemented
- replace calls to pr_generic() with req =
PRU_{DISCONNECT,SHUTDOWN,ABORT}
with calls to pr_{disconnect,shutdown,abort}() respectively
rename existing internal functions used to implement above functionality
to permit use of the names for xxx_{disconnect,shutdown,abort}().
- {l2cap,sco,rfcomm}_disconnect() ->
{l2cap,sco,rfcomm}_disconnect_pcb()
- {unp,rip,tcp}_disconnect() -> {unp,rip,tcp}_disconnect1()
- unp_shutdown() -> unp_shutdown1()
patch reviewed by rmind
2014-07-31 07:39:35 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_disconnect)(struct socket *so)
|
|
|
|
{
|
|
|
|
struct rawcb *rp = sotorawcb(so);
|
|
|
|
int s;
|
|
|
|
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
KASSERT(rp != NULL);
|
|
|
|
|
|
|
|
s = splsoftnet();
|
|
|
|
soisdisconnected(so);
|
|
|
|
raw_disconnect(rp);
|
|
|
|
splx(s);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
COMPATNAME(route_shutdown)(struct socket *so)
|
|
|
|
{
|
|
|
|
int s;
|
|
|
|
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Mark the connection as being incapable of further input.
|
|
|
|
*/
|
|
|
|
s = splsoftnet();
|
|
|
|
socantsendmore(so);
|
|
|
|
splx(s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
COMPATNAME(route_abort)(struct socket *so)
|
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
panic("route_abort");
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-06-22 12:10:18 +04:00
|
|
|
static int
|
2014-07-01 09:49:18 +04:00
|
|
|
COMPATNAME(route_ioctl)(struct socket *so, u_long cmd, void *nam,
|
|
|
|
struct ifnet * ifp)
|
2014-06-22 12:10:18 +04:00
|
|
|
{
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-07-06 07:33:33 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_stat)(struct socket *so, struct stat *ub)
|
|
|
|
{
|
2014-07-07 21:13:56 +04:00
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
2014-07-07 19:13:21 +04:00
|
|
|
return 0;
|
2014-07-06 07:33:33 +04:00
|
|
|
}
|
|
|
|
|
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
usrreq switches and put into separate functions
xxx_{peer,sock}addr(struct socket *, struct mbuf *).
- KASSERT(solocked(so)) always in new functions even if request
is not implemented
- KASSERT(pcb != NULL) and KASSERT(nam) if the request is
implemented and not for tcp.
* for tcp roll #ifdef KPROF and #ifdef DEBUG code from tcp_usrreq() into
easier to cut & paste functions tcp_debug_capture() and
tcp_debug_trace()
- functions provided by rmind
- remaining use of PRU_{PEER,SOCK}ADDR #define to be removed in a
future commit.
* rename netbt functions to permit consistency of pru function names
(as has been done with other requests already split out).
- l2cap_{peer,sock}addr() -> l2cap_{peer,sock}_addr_pcb()
- rfcomm_{peer,sock}addr() -> rfcomm_{peer,sock}_addr_pcb()
- sco_{peer,sock}addr() -> sco_{peer,sock}_addr_pcb()
* split/refactor do_sys_getsockname(lwp, fd, which, nam) into
two functions do_sys_get{peer,sock}name(fd, nam).
- move PRU_PEERADDR handling into do_sys_getpeername() from
do_sys_getsockname()
- have svr4_stream directly call do_sys_get{sock,peer}name()
respectively instead of providing `which' & fix a DPRINTF string
that incorrectly wrote "getpeername" when it meant "getsockname"
- fix sys_getpeername() and sys_getsockname() to call
do_sys_get{sock,peer}name() without `which' and `lwp' & adjust
comments
- bump kernel version for removal of lwp & which parameters from
do_sys_getsockname()
note: future cleanup to remove struct mbuf * abuse in
xxx_{peer,sock}name()
still to come, not done in this commit since it is easier to do post
split.
patch reviewed by rmind
welcome to 6.99.47
2014-07-09 08:54:03 +04:00
|
|
|
static int
|
2015-04-25 01:32:37 +03:00
|
|
|
COMPATNAME(route_peeraddr)(struct socket *so, struct sockaddr *nam)
|
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
usrreq switches and put into separate functions
xxx_{peer,sock}addr(struct socket *, struct mbuf *).
- KASSERT(solocked(so)) always in new functions even if request
is not implemented
- KASSERT(pcb != NULL) and KASSERT(nam) if the request is
implemented and not for tcp.
* for tcp roll #ifdef KPROF and #ifdef DEBUG code from tcp_usrreq() into
easier to cut & paste functions tcp_debug_capture() and
tcp_debug_trace()
- functions provided by rmind
- remaining use of PRU_{PEER,SOCK}ADDR #define to be removed in a
future commit.
* rename netbt functions to permit consistency of pru function names
(as has been done with other requests already split out).
- l2cap_{peer,sock}addr() -> l2cap_{peer,sock}_addr_pcb()
- rfcomm_{peer,sock}addr() -> rfcomm_{peer,sock}_addr_pcb()
- sco_{peer,sock}addr() -> sco_{peer,sock}_addr_pcb()
* split/refactor do_sys_getsockname(lwp, fd, which, nam) into
two functions do_sys_get{peer,sock}name(fd, nam).
- move PRU_PEERADDR handling into do_sys_getpeername() from
do_sys_getsockname()
- have svr4_stream directly call do_sys_get{sock,peer}name()
respectively instead of providing `which' & fix a DPRINTF string
that incorrectly wrote "getpeername" when it meant "getsockname"
- fix sys_getpeername() and sys_getsockname() to call
do_sys_get{sock,peer}name() without `which' and `lwp' & adjust
comments
- bump kernel version for removal of lwp & which parameters from
do_sys_getsockname()
note: future cleanup to remove struct mbuf * abuse in
xxx_{peer,sock}name()
still to come, not done in this commit since it is easier to do post
split.
patch reviewed by rmind
welcome to 6.99.47
2014-07-09 08:54:03 +04:00
|
|
|
{
|
|
|
|
struct rawcb *rp = sotorawcb(so);
|
|
|
|
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
KASSERT(rp != NULL);
|
|
|
|
KASSERT(nam != NULL);
|
|
|
|
|
|
|
|
if (rp->rcb_faddr == NULL)
|
|
|
|
return ENOTCONN;
|
|
|
|
|
|
|
|
raw_setpeeraddr(rp, nam);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2015-04-25 01:32:37 +03:00
|
|
|
COMPATNAME(route_sockaddr)(struct socket *so, struct sockaddr *nam)
|
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
usrreq switches and put into separate functions
xxx_{peer,sock}addr(struct socket *, struct mbuf *).
- KASSERT(solocked(so)) always in new functions even if request
is not implemented
- KASSERT(pcb != NULL) and KASSERT(nam) if the request is
implemented and not for tcp.
* for tcp roll #ifdef KPROF and #ifdef DEBUG code from tcp_usrreq() into
easier to cut & paste functions tcp_debug_capture() and
tcp_debug_trace()
- functions provided by rmind
- remaining use of PRU_{PEER,SOCK}ADDR #define to be removed in a
future commit.
* rename netbt functions to permit consistency of pru function names
(as has been done with other requests already split out).
- l2cap_{peer,sock}addr() -> l2cap_{peer,sock}_addr_pcb()
- rfcomm_{peer,sock}addr() -> rfcomm_{peer,sock}_addr_pcb()
- sco_{peer,sock}addr() -> sco_{peer,sock}_addr_pcb()
* split/refactor do_sys_getsockname(lwp, fd, which, nam) into
two functions do_sys_get{peer,sock}name(fd, nam).
- move PRU_PEERADDR handling into do_sys_getpeername() from
do_sys_getsockname()
- have svr4_stream directly call do_sys_get{sock,peer}name()
respectively instead of providing `which' & fix a DPRINTF string
that incorrectly wrote "getpeername" when it meant "getsockname"
- fix sys_getpeername() and sys_getsockname() to call
do_sys_get{sock,peer}name() without `which' and `lwp' & adjust
comments
- bump kernel version for removal of lwp & which parameters from
do_sys_getsockname()
note: future cleanup to remove struct mbuf * abuse in
xxx_{peer,sock}name()
still to come, not done in this commit since it is easier to do post
split.
patch reviewed by rmind
welcome to 6.99.47
2014-07-09 08:54:03 +04:00
|
|
|
{
|
|
|
|
struct rawcb *rp = sotorawcb(so);
|
|
|
|
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
KASSERT(rp != NULL);
|
|
|
|
KASSERT(nam != NULL);
|
|
|
|
|
|
|
|
if (rp->rcb_faddr == NULL)
|
|
|
|
return ENOTCONN;
|
|
|
|
|
|
|
|
raw_setsockaddr(rp, nam);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-08 07:05:44 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_rcvd)(struct socket *so, int flags, struct lwp *l)
|
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-07-23 17:17:18 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_recvoob)(struct socket *so, struct mbuf *m, int flags)
|
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-08-05 11:55:31 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_send)(struct socket *so, struct mbuf *m,
|
2015-05-02 20:18:03 +03:00
|
|
|
struct sockaddr *nam, struct mbuf *control, struct lwp *l)
|
2014-08-05 11:55:31 +04:00
|
|
|
{
|
|
|
|
int error = 0;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
KASSERT(solocked(so));
|
2016-01-21 00:43:59 +03:00
|
|
|
KASSERT(so->so_proto == &COMPATNAME(route_protosw)[0]);
|
2014-08-05 11:55:31 +04:00
|
|
|
|
|
|
|
s = splsoftnet();
|
2016-01-21 00:43:59 +03:00
|
|
|
error = raw_send(so, m, nam, control, l, &COMPATNAME(route_output));
|
2014-08-05 11:55:31 +04:00
|
|
|
splx(s);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2014-07-23 17:17:18 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_sendoob)(struct socket *so, struct mbuf *m,
|
|
|
|
struct mbuf *control)
|
|
|
|
{
|
|
|
|
KASSERT(solocked(so));
|
|
|
|
|
|
|
|
m_freem(m);
|
|
|
|
m_freem(control);
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
2014-08-09 09:33:00 +04:00
|
|
|
static int
|
|
|
|
COMPATNAME(route_purgeif)(struct socket *so, struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
|
|
|
|
panic("route_purgeif");
|
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
2014-07-23 17:17:18 +04:00
|
|
|
|
2016-04-05 13:03:33 +03:00
|
|
|
#ifdef INET
|
2016-04-04 10:37:07 +03:00
|
|
|
static int
|
|
|
|
route_get_sdl_index(struct rt_addrinfo *info, int *sdl_index)
|
|
|
|
{
|
|
|
|
struct rtentry *nrt;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
error = rtrequest1(RTM_GET, info, &nrt);
|
|
|
|
if (error != 0)
|
|
|
|
return error;
|
|
|
|
/*
|
|
|
|
* nrt->rt_ifp->if_index may not be correct
|
|
|
|
* due to changing to ifplo0.
|
|
|
|
*/
|
|
|
|
*sdl_index = satosdl(nrt->rt_gateway)->sdl_index;
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
rt_unref(nrt);
|
2016-04-04 10:37:07 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2016-04-05 13:03:33 +03:00
|
|
|
#endif /* INET */
|
2016-04-04 10:37:07 +03:00
|
|
|
|
|
|
|
static void
|
|
|
|
route_get_sdl(const struct ifnet *ifp, const struct sockaddr *dst,
|
|
|
|
struct sockaddr_dl *sdl, int *flags)
|
|
|
|
{
|
2016-04-08 00:41:02 +03:00
|
|
|
struct llentry *la;
|
2016-04-04 10:37:07 +03:00
|
|
|
|
|
|
|
KASSERT(ifp != NULL);
|
|
|
|
|
|
|
|
IF_AFDATA_RLOCK(ifp);
|
|
|
|
switch (dst->sa_family) {
|
|
|
|
case AF_INET:
|
|
|
|
la = lla_lookup(LLTABLE(ifp), 0, dst);
|
|
|
|
break;
|
|
|
|
case AF_INET6:
|
|
|
|
la = lla_lookup(LLTABLE6(ifp), 0, dst);
|
|
|
|
break;
|
|
|
|
default:
|
2016-04-08 00:41:02 +03:00
|
|
|
la = NULL;
|
2016-04-04 10:37:07 +03:00
|
|
|
KASSERTMSG(0, "Invalid AF=%d\n", dst->sa_family);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
IF_AFDATA_RUNLOCK(ifp);
|
|
|
|
|
2016-04-08 00:41:02 +03:00
|
|
|
void *a = (LLE_IS_VALID(la) && (la->la_flags & LLE_VALID) == LLE_VALID)
|
|
|
|
? &la->ll_addr : NULL;
|
|
|
|
|
|
|
|
a = sockaddr_dl_init(sdl, sizeof(*sdl), ifp->if_index, ifp->if_type,
|
2016-04-08 15:01:22 +03:00
|
|
|
NULL, 0, a, ifp->if_addrlen);
|
2016-04-08 00:41:02 +03:00
|
|
|
KASSERT(a != NULL);
|
2016-04-04 10:37:07 +03:00
|
|
|
|
|
|
|
if (la != NULL) {
|
|
|
|
*flags = la->la_flags;
|
|
|
|
LLE_RUNLOCK(la);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-17 15:58:21 +03:00
|
|
|
static int
|
|
|
|
route_output_report(struct rtentry *rt, struct rt_addrinfo *info,
|
|
|
|
struct rt_xmsghdr *rtm, struct rt_xmsghdr **new_rtm)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
struct ifnet *ifp;
|
|
|
|
|
|
|
|
if ((rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) == 0)
|
|
|
|
;
|
|
|
|
else if ((ifp = rt->rt_ifp) != NULL) {
|
|
|
|
const struct ifaddr *rtifa;
|
|
|
|
info->rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
|
|
|
|
/* rtifa used to be simply rt->rt_ifa.
|
|
|
|
* If rt->rt_ifa != NULL, then
|
|
|
|
* rt_get_ifa() != NULL. So this
|
|
|
|
* ought to still be safe. --dyoung
|
|
|
|
*/
|
|
|
|
rtifa = rt_get_ifa(rt);
|
|
|
|
info->rti_info[RTAX_IFA] = rtifa->ifa_addr;
|
|
|
|
#ifdef RTSOCK_DEBUG
|
|
|
|
if (info->rti_info[RTAX_IFA]->sa_family == AF_INET) {
|
|
|
|
char ibuf[INET_ADDRSTRLEN];
|
|
|
|
char abuf[INET_ADDRSTRLEN];
|
|
|
|
printf("%s: copying out RTAX_IFA %s "
|
|
|
|
"for info->rti_info[RTAX_DST] %s "
|
|
|
|
"ifa_getifa %p ifa_seqno %p\n",
|
|
|
|
__func__,
|
2016-05-17 18:21:14 +03:00
|
|
|
RT_IN_PRINT(info, ibuf, RTAX_IFA),
|
|
|
|
RT_IN_PRINT(info, abuf, RTAX_DST),
|
2016-05-17 15:58:21 +03:00
|
|
|
(void *)rtifa->ifa_getifa,
|
|
|
|
rtifa->ifa_seqno);
|
|
|
|
}
|
|
|
|
#endif /* RTSOCK_DEBUG */
|
|
|
|
if (ifp->if_flags & IFF_POINTOPOINT)
|
|
|
|
info->rti_info[RTAX_BRD] = rtifa->ifa_dstaddr;
|
|
|
|
else
|
|
|
|
info->rti_info[RTAX_BRD] = NULL;
|
|
|
|
rtm->rtm_index = ifp->if_index;
|
|
|
|
} else {
|
|
|
|
info->rti_info[RTAX_IFP] = NULL;
|
|
|
|
info->rti_info[RTAX_IFA] = NULL;
|
|
|
|
}
|
|
|
|
(void)rt_msg2(rtm->rtm_type, info, NULL, NULL, &len);
|
|
|
|
if (len > rtm->rtm_msglen) {
|
|
|
|
struct rt_xmsghdr *old_rtm = rtm;
|
|
|
|
R_Malloc(*new_rtm, struct rt_xmsghdr *, len);
|
|
|
|
if (*new_rtm == NULL)
|
|
|
|
return ENOBUFS;
|
|
|
|
(void)memcpy(*new_rtm, old_rtm, old_rtm->rtm_msglen);
|
|
|
|
rtm = *new_rtm;
|
|
|
|
}
|
|
|
|
(void)rt_msg2(rtm->rtm_type, info, rtm, NULL, 0);
|
|
|
|
rtm->rtm_flags = rt->rt_flags;
|
|
|
|
rtm_setmetrics(rt, rtm);
|
|
|
|
rtm->rtm_addrs = info->rti_addrs;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-21 06:45:56 +03:00
|
|
|
static struct ifaddr *
|
|
|
|
route_output_get_ifa(const struct rt_addrinfo info, const struct rtentry *rt,
|
2016-08-01 06:15:30 +03:00
|
|
|
struct ifnet **ifp, struct psref *psref)
|
2016-07-21 06:45:56 +03:00
|
|
|
{
|
|
|
|
struct ifaddr *ifa = NULL;
|
|
|
|
|
|
|
|
*ifp = NULL;
|
|
|
|
if (info.rti_info[RTAX_IFP] != NULL) {
|
2016-08-01 06:15:30 +03:00
|
|
|
ifa = ifa_ifwithnet_psref(info.rti_info[RTAX_IFP], psref);
|
2016-07-21 06:45:56 +03:00
|
|
|
if (ifa == NULL)
|
|
|
|
goto next;
|
|
|
|
*ifp = ifa->ifa_ifp;
|
|
|
|
if (info.rti_info[RTAX_IFA] == NULL &&
|
|
|
|
info.rti_info[RTAX_GATEWAY] == NULL)
|
|
|
|
goto next;
|
|
|
|
if (info.rti_info[RTAX_IFA] == NULL) {
|
|
|
|
/* route change <dst> <gw> -ifp <if> */
|
2016-08-01 06:15:30 +03:00
|
|
|
ifa = ifaof_ifpforaddr_psref(info.rti_info[RTAX_GATEWAY],
|
|
|
|
*ifp, psref);
|
2016-07-21 06:45:56 +03:00
|
|
|
} else {
|
|
|
|
/* route change <dst> -ifp <if> -ifa <addr> */
|
2016-08-01 06:15:30 +03:00
|
|
|
ifa = ifa_ifwithaddr_psref(info.rti_info[RTAX_IFA], psref);
|
2016-07-21 06:45:56 +03:00
|
|
|
if (ifa != NULL)
|
|
|
|
goto out;
|
2016-08-01 06:15:30 +03:00
|
|
|
ifa = ifaof_ifpforaddr_psref(info.rti_info[RTAX_IFA],
|
|
|
|
*ifp, psref);
|
2016-07-21 06:45:56 +03:00
|
|
|
}
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
next:
|
|
|
|
if (info.rti_info[RTAX_IFA] != NULL) {
|
|
|
|
/* route change <dst> <gw> -ifa <addr> */
|
2016-08-01 06:15:30 +03:00
|
|
|
ifa = ifa_ifwithaddr_psref(info.rti_info[RTAX_IFA], psref);
|
2016-07-21 06:45:56 +03:00
|
|
|
if (ifa != NULL)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (info.rti_info[RTAX_GATEWAY] != NULL) {
|
|
|
|
/* route change <dst> <gw> */
|
2016-08-01 06:15:30 +03:00
|
|
|
ifa = ifa_ifwithroute_psref(rt->rt_flags, rt_getkey(rt),
|
|
|
|
info.rti_info[RTAX_GATEWAY], psref);
|
2016-07-21 06:45:56 +03:00
|
|
|
}
|
|
|
|
out:
|
|
|
|
if (ifa != NULL && *ifp == NULL)
|
|
|
|
*ifp = ifa->ifa_ifp;
|
|
|
|
return ifa;
|
|
|
|
}
|
|
|
|
|
2016-10-26 09:49:10 +03:00
|
|
|
static int
|
|
|
|
route_output_change(struct rtentry *rt, struct rt_addrinfo *info,
|
|
|
|
struct rt_xmsghdr *rtm)
|
|
|
|
{
|
|
|
|
int error = 0;
|
|
|
|
struct ifnet *ifp, *new_ifp;
|
|
|
|
struct ifaddr *ifa, *new_ifa;
|
|
|
|
struct psref psref_ifa, psref_new_ifa, psref_ifp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* new gateway could require new ifaddr, ifp;
|
|
|
|
* flags may also be different; ifp may be specified
|
|
|
|
* by ll sockaddr when protocol address is ambiguous
|
|
|
|
*/
|
|
|
|
ifp = rt_getifp(info, &psref_ifp);
|
|
|
|
ifa = rt_getifa(info, &psref_ifa);
|
|
|
|
if (ifa == NULL) {
|
|
|
|
error = ENETUNREACH;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (info->rti_info[RTAX_GATEWAY]) {
|
|
|
|
error = rt_setgate(rt, info->rti_info[RTAX_GATEWAY]);
|
|
|
|
if (error != 0)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (info->rti_info[RTAX_TAG]) {
|
|
|
|
const struct sockaddr *tag;
|
|
|
|
tag = rt_settag(rt, info->rti_info[RTAX_TAG]);
|
|
|
|
if (tag == NULL) {
|
|
|
|
error = ENOBUFS;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* new gateway could require new ifaddr, ifp;
|
|
|
|
flags may also be different; ifp may be specified
|
|
|
|
by ll sockaddr when protocol address is ambiguous */
|
|
|
|
new_ifa = route_output_get_ifa(*info, rt, &new_ifp, &psref_new_ifa);
|
|
|
|
if (new_ifa != NULL) {
|
|
|
|
ifa_release(ifa, &psref_ifa);
|
|
|
|
ifa = new_ifa;
|
|
|
|
}
|
|
|
|
if (ifa) {
|
|
|
|
struct ifaddr *oifa = rt->rt_ifa;
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
if (oifa != ifa &&
|
|
|
|
!ifa_is_destroying(ifa) && !if_is_deactivated(new_ifp)) {
|
2016-10-26 09:49:10 +03:00
|
|
|
if (oifa && oifa->ifa_rtrequest)
|
|
|
|
oifa->ifa_rtrequest(RTM_DELETE, rt, info);
|
|
|
|
rt_replace_ifa(rt, ifa);
|
|
|
|
rt->rt_ifp = new_ifp;
|
|
|
|
}
|
|
|
|
if (new_ifa == NULL)
|
|
|
|
ifa_release(ifa, &psref_ifa);
|
|
|
|
}
|
|
|
|
ifa_release(new_ifa, &psref_new_ifa);
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
if (new_ifp && rt->rt_ifp != new_ifp
|
|
|
|
&& !if_is_deactivated(new_ifp))
|
2016-10-26 09:49:10 +03:00
|
|
|
rt->rt_ifp = new_ifp;
|
|
|
|
rt_setmetrics(rtm->rtm_inits, rtm, rt);
|
|
|
|
if (rt->rt_flags != info->rti_flags)
|
|
|
|
rt->rt_flags = (info->rti_flags & ~PRESERVED_RTF)
|
|
|
|
| (rt->rt_flags & PRESERVED_RTF);
|
|
|
|
if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
|
|
|
|
rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, info);
|
|
|
|
out:
|
|
|
|
if_put(ifp, &psref_ifp);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*ARGSUSED*/
|
1994-05-11 13:26:46 +04:00
|
|
|
int
|
2016-01-21 00:43:59 +03:00
|
|
|
COMPATNAME(route_output)(struct mbuf *m, struct socket *so)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct sockproto proto = { .sp_family = PF_XROUTE, };
|
|
|
|
struct rt_xmsghdr *rtm = NULL;
|
2016-05-17 15:58:21 +03:00
|
|
|
struct rt_xmsghdr *old_rtm = NULL, *new_rtm = NULL;
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
struct rtentry *rt = NULL;
|
|
|
|
struct rtentry *saved_nrt = NULL;
|
1994-05-13 10:02:48 +04:00
|
|
|
struct rt_addrinfo info;
|
2009-03-11 12:26:27 +03:00
|
|
|
int len, error = 0;
|
2002-02-22 20:26:31 +03:00
|
|
|
sa_family_t family;
|
2016-04-04 10:37:07 +03:00
|
|
|
struct sockaddr_dl sdl;
|
2016-08-01 06:15:30 +03:00
|
|
|
int bound = curlwp_bind();
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
bool do_rt_free = false;
|
1996-02-14 00:59:53 +03:00
|
|
|
|
2002-11-02 10:20:42 +03:00
|
|
|
#define senderr(e) do { error = e; goto flush;} while (/*CONSTCOND*/ 0)
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (m == NULL || ((m->m_len < sizeof(int32_t)) &&
|
2016-08-01 06:15:30 +03:00
|
|
|
(m = m_pullup(m, sizeof(int32_t))) == NULL)) {
|
|
|
|
error = ENOBUFS;
|
|
|
|
goto out;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
if ((m->m_flags & M_PKTHDR) == 0)
|
2011-02-01 04:39:19 +03:00
|
|
|
panic("%s", __func__);
|
1993-03-21 12:45:37 +03:00
|
|
|
len = m->m_pkthdr.len;
|
|
|
|
if (len < sizeof(*rtm) ||
|
2011-02-01 04:39:19 +03:00
|
|
|
len != mtod(m, struct rt_xmsghdr *)->rtm_msglen) {
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_DST] = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(EINVAL);
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2011-02-01 04:39:19 +03:00
|
|
|
R_Malloc(rtm, struct rt_xmsghdr *, len);
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (rtm == NULL) {
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_DST] = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(ENOBUFS);
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2008-10-25 01:38:18 +04:00
|
|
|
m_copydata(m, 0, len, rtm);
|
2011-02-01 04:39:19 +03:00
|
|
|
if (rtm->rtm_version != RTM_XVERSION) {
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_DST] = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(EPROTONOSUPPORT);
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
rtm->rtm_pid = curproc->p_pid;
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&info, 0, sizeof(info));
|
1994-05-13 10:02:48 +04:00
|
|
|
info.rti_addrs = rtm->rtm_addrs;
|
2008-10-25 01:38:18 +04:00
|
|
|
if (rt_xaddrs(rtm->rtm_type, (const char *)(rtm + 1), len + (char *)rtm,
|
2011-02-01 04:39:19 +03:00
|
|
|
&info)) {
|
2000-09-28 05:14:06 +04:00
|
|
|
senderr(EINVAL);
|
2011-02-01 04:39:19 +03:00
|
|
|
}
|
2001-01-17 07:05:41 +03:00
|
|
|
info.rti_flags = rtm->rtm_flags;
|
2006-11-13 22:16:01 +03:00
|
|
|
#ifdef RTSOCK_DEBUG
|
2008-10-28 05:03:06 +03:00
|
|
|
if (info.rti_info[RTAX_DST]->sa_family == AF_INET) {
|
2014-12-02 23:25:47 +03:00
|
|
|
char abuf[INET_ADDRSTRLEN];
|
2008-10-28 05:03:06 +03:00
|
|
|
printf("%s: extracted info.rti_info[RTAX_DST] %s\n", __func__,
|
2016-05-17 18:21:14 +03:00
|
|
|
RT_IN_PRINT(&info, abuf, RTAX_DST));
|
2006-11-13 22:16:01 +03:00
|
|
|
}
|
|
|
|
#endif /* RTSOCK_DEBUG */
|
2008-10-28 14:41:23 +03:00
|
|
|
if (info.rti_info[RTAX_DST] == NULL ||
|
2011-02-01 04:39:19 +03:00
|
|
|
(info.rti_info[RTAX_DST]->sa_family >= AF_MAX)) {
|
1998-03-01 05:20:01 +03:00
|
|
|
senderr(EINVAL);
|
2011-02-01 04:39:19 +03:00
|
|
|
}
|
2008-10-28 14:41:23 +03:00
|
|
|
if (info.rti_info[RTAX_GATEWAY] != NULL &&
|
2011-02-01 04:39:19 +03:00
|
|
|
(info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) {
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(EINVAL);
|
2011-02-01 04:39:19 +03:00
|
|
|
}
|
1997-02-22 06:47:01 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify that the caller has the appropriate privilege; RTM_GET
|
|
|
|
* is the only operation the non-superuser is allowed.
|
|
|
|
*/
|
First take at security model abstraction.
- Add a few scopes to the kernel: system, network, and machdep.
- Add a few more actions/sub-actions (requests), and start using them as
opposed to the KAUTH_GENERIC_ISSUSER place-holders.
- Introduce a basic set of listeners that implement our "traditional"
security model, called "bsd44". This is the default (and only) model we
have at the moment.
- Update all relevant documentation.
- Add some code and docs to help folks who want to actually use this stuff:
* There's a sample overlay model, sitting on-top of "bsd44", for
fast experimenting with tweaking just a subset of an existing model.
This is pretty cool because it's *really* straightforward to do stuff
you had to use ugly hacks for until now...
* And of course, documentation describing how to do the above for quick
reference, including code samples.
All of these changes were tested for regressions using a Python-based
testsuite that will be (I hope) available soon via pkgsrc. Information
about the tests, and how to write new ones, can be found on:
http://kauth.linbsd.org/kauthwiki
NOTE FOR DEVELOPERS: *PLEASE* don't add any code that does any of the
following:
- Uses a KAUTH_GENERIC_ISSUSER kauth(9) request,
- Checks 'securelevel' directly,
- Checks a uid/gid directly.
(or if you feel you have to, contact me first)
This is still work in progress; It's far from being done, but now it'll
be a lot easier.
Relevant mailing list threads:
http://mail-index.netbsd.org/tech-security/2006/01/25/0011.html
http://mail-index.netbsd.org/tech-security/2006/03/24/0001.html
http://mail-index.netbsd.org/tech-security/2006/04/18/0000.html
http://mail-index.netbsd.org/tech-security/2006/05/15/0000.html
http://mail-index.netbsd.org/tech-security/2006/08/01/0000.html
http://mail-index.netbsd.org/tech-security/2006/08/25/0000.html
Many thanks to YAMAMOTO Takashi, Matt Thomas, and Christos Zoulas for help
stablizing kauth(9).
Full credit for the regression tests, making sure these changes didn't break
anything, goes to Matt Fleming and Jaime Fournier.
Happy birthday Randi! :)
2006-09-09 00:58:56 +04:00
|
|
|
if (kauth_authorize_network(curlwp->l_cred, KAUTH_NETWORK_ROUTE,
|
2006-09-20 01:42:29 +04:00
|
|
|
0, rtm, NULL, NULL) != 0)
|
1997-02-22 06:47:01 +03:00
|
|
|
senderr(EACCES);
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
switch (rtm->rtm_type) {
|
1994-05-13 10:02:48 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
case RTM_ADD:
|
2011-02-01 04:39:19 +03:00
|
|
|
if (info.rti_info[RTAX_GATEWAY] == NULL) {
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(EINVAL);
|
2011-02-01 04:39:19 +03:00
|
|
|
}
|
2016-04-05 13:03:33 +03:00
|
|
|
#ifdef INET
|
2016-04-04 10:37:07 +03:00
|
|
|
/* support for new ARP code with keeping backcompat */
|
|
|
|
if (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK) {
|
2016-04-06 20:34:33 +03:00
|
|
|
const struct sockaddr_dl *sdlp =
|
|
|
|
satocsdl(info.rti_info[RTAX_GATEWAY]);
|
2016-04-04 10:37:07 +03:00
|
|
|
|
2016-04-06 20:34:33 +03:00
|
|
|
/* Allow routing requests by interface index */
|
|
|
|
if (sdlp->sdl_nlen == 0 && sdlp->sdl_alen == 0
|
|
|
|
&& sdlp->sdl_slen == 0)
|
|
|
|
goto fallback;
|
2016-04-04 10:37:07 +03:00
|
|
|
/*
|
|
|
|
* Old arp binaries don't set the sdl_index
|
|
|
|
* so we have to complement it.
|
|
|
|
*/
|
2016-04-06 20:34:33 +03:00
|
|
|
int sdl_index = sdlp->sdl_index;
|
2016-04-04 10:37:07 +03:00
|
|
|
if (sdl_index == 0) {
|
|
|
|
error = route_get_sdl_index(&info, &sdl_index);
|
|
|
|
if (error != 0)
|
|
|
|
goto fallback;
|
|
|
|
} else if (
|
|
|
|
info.rti_info[RTAX_DST]->sa_family == AF_INET) {
|
|
|
|
/*
|
|
|
|
* XXX workaround for SIN_PROXY case; proxy arp
|
|
|
|
* entry should be in an interface that has
|
|
|
|
* a network route including the destination,
|
|
|
|
* not a local (link) route that may not be a
|
|
|
|
* desired place, for example a tap.
|
|
|
|
*/
|
|
|
|
const struct sockaddr_inarp *sina =
|
|
|
|
(const struct sockaddr_inarp *)
|
|
|
|
info.rti_info[RTAX_DST];
|
|
|
|
if (sina->sin_other & SIN_PROXY) {
|
|
|
|
error = route_get_sdl_index(&info,
|
|
|
|
&sdl_index);
|
|
|
|
if (error != 0)
|
|
|
|
goto fallback;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
error = lla_rt_output(rtm->rtm_type, rtm->rtm_flags,
|
|
|
|
rtm->rtm_rmx.rmx_expire, &info, sdl_index);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
fallback:
|
2016-04-05 13:03:33 +03:00
|
|
|
#endif /* INET */
|
2001-01-17 07:05:41 +03:00
|
|
|
error = rtrequest1(rtm->rtm_type, &info, &saved_nrt);
|
2015-07-17 05:21:08 +03:00
|
|
|
if (error == 0) {
|
2011-02-01 04:39:19 +03:00
|
|
|
rt_setmetrics(rtm->rtm_inits, rtm, saved_nrt);
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
rt_unref(saved_nrt);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RTM_DELETE:
|
2016-04-05 13:03:33 +03:00
|
|
|
#ifdef INET
|
2016-04-04 10:37:07 +03:00
|
|
|
/* support for new ARP code */
|
|
|
|
if (info.rti_info[RTAX_GATEWAY] &&
|
|
|
|
(info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK) &&
|
|
|
|
(rtm->rtm_flags & RTF_LLDATA) != 0) {
|
|
|
|
error = lla_rt_output(rtm->rtm_type, rtm->rtm_flags,
|
|
|
|
rtm->rtm_rmx.rmx_expire, &info, 0);
|
|
|
|
break;
|
|
|
|
}
|
2016-04-05 13:03:33 +03:00
|
|
|
#endif /* INET */
|
2001-01-17 07:05:41 +03:00
|
|
|
error = rtrequest1(rtm->rtm_type, &info, &saved_nrt);
|
2016-05-17 15:58:21 +03:00
|
|
|
if (error != 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
rt = saved_nrt;
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
do_rt_free = true;
|
2016-05-17 15:58:21 +03:00
|
|
|
info.rti_info[RTAX_DST] = rt_getkey(rt);
|
|
|
|
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
|
|
|
|
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
|
|
|
|
info.rti_info[RTAX_TAG] = rt_gettag(rt);
|
|
|
|
error = route_output_report(rt, &info, rtm, &new_rtm);
|
|
|
|
if (error)
|
|
|
|
senderr(error);
|
|
|
|
if (new_rtm != NULL) {
|
|
|
|
old_rtm = rtm;
|
|
|
|
rtm = new_rtm;
|
1995-08-19 11:48:14 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case RTM_GET:
|
|
|
|
case RTM_CHANGE:
|
|
|
|
case RTM_LOCK:
|
2008-10-28 14:41:23 +03:00
|
|
|
/* XXX This will mask info.rti_info[RTAX_DST] with
|
|
|
|
* info.rti_info[RTAX_NETMASK] before
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
* searching. It did not used to do that. --dyoung
|
|
|
|
*/
|
2015-07-17 05:21:08 +03:00
|
|
|
rt = NULL;
|
2008-05-14 00:16:30 +04:00
|
|
|
error = rtrequest1(RTM_GET, &info, &rt);
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (error != 0)
|
|
|
|
senderr(error);
|
2003-06-24 12:31:32 +04:00
|
|
|
if (rtm->rtm_type != RTM_GET) {/* XXX: too grotty */
|
2008-10-28 14:41:23 +03:00
|
|
|
if (memcmp(info.rti_info[RTAX_DST], rt_getkey(rt),
|
|
|
|
info.rti_info[RTAX_DST]->sa_len) != 0)
|
2003-06-24 12:31:32 +04:00
|
|
|
senderr(ESRCH);
|
2011-03-31 23:40:51 +04:00
|
|
|
if (info.rti_info[RTAX_NETMASK] == NULL &&
|
|
|
|
rt_mask(rt) != NULL)
|
2003-06-24 12:31:32 +04:00
|
|
|
senderr(ETOOMANYREFS);
|
|
|
|
}
|
2000-03-10 17:47:12 +03:00
|
|
|
|
2016-04-04 10:37:07 +03:00
|
|
|
/*
|
|
|
|
* XXX if arp/ndp requests an L2 entry, we have to obtain
|
|
|
|
* it from lltable while for the route command we have to
|
|
|
|
* return a route as it is. How to distinguish them?
|
|
|
|
* For newer arp/ndp, RTF_LLDATA flag set by arp/ndp
|
|
|
|
* indicates an L2 entry is requested. For old arp/ndp
|
|
|
|
* binaries, we check RTF_UP flag is NOT set; it works
|
|
|
|
* by the fact that arp/ndp don't set it while the route
|
|
|
|
* command sets it.
|
|
|
|
*/
|
|
|
|
if (((rtm->rtm_flags & RTF_LLDATA) != 0 ||
|
|
|
|
(rtm->rtm_flags & RTF_UP) == 0) &&
|
|
|
|
rtm->rtm_type == RTM_GET &&
|
|
|
|
sockaddr_cmp(rt_getkey(rt), info.rti_info[RTAX_DST]) != 0) {
|
2016-05-17 15:58:21 +03:00
|
|
|
int ll_flags = 0;
|
2016-04-04 10:37:07 +03:00
|
|
|
route_get_sdl(rt->rt_ifp, info.rti_info[RTAX_DST], &sdl,
|
|
|
|
&ll_flags);
|
|
|
|
info.rti_info[RTAX_GATEWAY] = sstocsa(&sdl);
|
2016-05-17 15:58:21 +03:00
|
|
|
error = route_output_report(rt, &info, rtm, &new_rtm);
|
|
|
|
if (error)
|
|
|
|
senderr(error);
|
|
|
|
if (new_rtm != NULL) {
|
|
|
|
old_rtm = rtm;
|
|
|
|
rtm = new_rtm;
|
|
|
|
}
|
|
|
|
rtm->rtm_flags |= RTF_LLDATA;
|
|
|
|
rtm->rtm_flags |= (ll_flags & LLE_STATIC) ? RTF_STATIC : 0;
|
|
|
|
break;
|
2016-04-04 10:37:07 +03:00
|
|
|
}
|
|
|
|
|
2003-05-02 07:15:23 +04:00
|
|
|
switch (rtm->rtm_type) {
|
1993-03-21 12:45:37 +03:00
|
|
|
case RTM_GET:
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_DST] = rt_getkey(rt);
|
|
|
|
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
|
|
|
|
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
|
2011-10-31 16:50:50 +04:00
|
|
|
info.rti_info[RTAX_TAG] = rt_gettag(rt);
|
2016-05-17 15:58:21 +03:00
|
|
|
error = route_output_report(rt, &info, rtm, &new_rtm);
|
|
|
|
if (error)
|
|
|
|
senderr(error);
|
|
|
|
if (new_rtm != NULL) {
|
2008-12-13 01:34:58 +03:00
|
|
|
old_rtm = rtm;
|
2016-05-17 15:58:21 +03:00
|
|
|
rtm = new_rtm;
|
2016-04-04 10:37:07 +03:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
|
2016-10-26 09:49:10 +03:00
|
|
|
case RTM_CHANGE:
|
2017-01-19 09:58:55 +03:00
|
|
|
#ifdef NET_MPSAFE
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
error = rt_update_prepare(rt);
|
|
|
|
if (error == 0) {
|
|
|
|
error = route_output_change(rt, &info, rtm);
|
|
|
|
rt_update_finish(rt);
|
|
|
|
}
|
2017-01-19 09:58:55 +03:00
|
|
|
#else
|
|
|
|
error = route_output_change(rt, &info, rtm);
|
|
|
|
#endif
|
2016-10-26 09:49:10 +03:00
|
|
|
if (error != 0)
|
|
|
|
goto flush;
|
2008-10-28 14:41:23 +03:00
|
|
|
/*FALLTHROUGH*/
|
1993-03-21 12:45:37 +03:00
|
|
|
case RTM_LOCK:
|
1994-05-13 10:02:48 +04:00
|
|
|
rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
|
1993-03-21 12:45:37 +03:00
|
|
|
rt->rt_rmx.rmx_locks |=
|
1996-07-01 05:12:32 +04:00
|
|
|
(rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
break;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
default:
|
|
|
|
senderr(EOPNOTSUPP);
|
|
|
|
}
|
|
|
|
|
|
|
|
flush:
|
|
|
|
if (rtm) {
|
|
|
|
if (error)
|
|
|
|
rtm->rtm_errno = error;
|
2005-02-27 01:45:09 +03:00
|
|
|
else
|
1993-03-21 12:45:37 +03:00
|
|
|
rtm->rtm_flags |= RTF_DONE;
|
|
|
|
}
|
2008-10-28 14:41:23 +03:00
|
|
|
family = info.rti_info[RTAX_DST] ? info.rti_info[RTAX_DST]->sa_family :
|
|
|
|
0;
|
2008-12-13 01:34:58 +03:00
|
|
|
/* We cannot free old_rtm until we have stopped using the
|
|
|
|
* pointers in info, some of which may point to sockaddrs
|
|
|
|
* in old_rtm.
|
|
|
|
*/
|
|
|
|
if (old_rtm != NULL)
|
|
|
|
Free(old_rtm);
|
Make the routing table and rtcaches MP-safe
See the following descriptions for details.
Proposed on tech-kern and tech-net
Overview
--------
We protect the routing table with a rwock and protect
rtcaches with another rwlock. Each rtentry is protected
from being freed or updated via reference counting and psref.
Global rwlocks
--------------
There are two rwlocks; one for the routing table (rt_lock) and
the other for rtcaches (rtcache_lock). rtcache_lock covers
all existing rtcaches; there may have room for optimizations
(future work).
The locking order is rtcache_lock first and rt_lock is next.
rtentry references
------------------
References to an rtentry is managed with reference counting
and psref. Either of the two mechanisms is used depending on
where a rtentry is obtained. Reference counting is used when
we obtain a rtentry from the routing table directly via
rtalloc1 and rtrequest{,1} while psref is used when we obtain
a rtentry from a rtcache via rtcache_* APIs. In both cases,
a caller can sleep/block with holding an obtained rtentry.
The reasons why we use two different mechanisms are (i) only
using reference counting hurts the performance due to atomic
instructions (rtcache case) (ii) ease of implementation;
applying psref to APIs such rtaloc1 and rtrequest{,1} requires
additional works (adding a local variable and an argument).
We will finally migrate to use only psref but we can do it
when we have a lockless routing table alternative.
Reference counting for rtentry
------------------------------
rt_refcnt now doesn't count permanent references such as for
rt_timers and rtcaches, instead it is used only for temporal
references when obtaining a rtentry via rtalloc1 and rtrequest{,1}.
We can do so because destroying a rtentry always involves
removing references of rt_timers and rtcaches to the rtentry
and we don't need to track such references. This also makes
it easy to wait for readers to release references on deleting
or updating a rtentry, i.e., we can simply wait until the
reference counter is 0 or 1. (If there are permanent references
the counter can be arbitrary.)
rt_ref increments a reference counter of a rtentry and rt_unref
decrements it. rt_ref is called inside APIs (rtalloc1 and
rtrequest{,1} so users don't need to care about it while
users must call rt_unref to an obtained rtentry after using it.
rtfree is removed and we use rt_unref and rt_free instead.
rt_unref now just decrements the counter of a given rtentry
and rt_free just tries to destroy a given rtentry.
See the next section for destructions of rtentries by rt_free.
Destructions of rtentries
-------------------------
We destroy a rtentry only when we call rtrequst{,1}(RTM_DELETE);
the original implementation can destroy in any rtfree where it's
the last reference. If we use reference counting or psref, it's
easy to understand if the place that a rtentry is destroyed is
fixed.
rt_free waits for references to a given rtentry to be released
before actually destroying the rtentry. rt_free uses a condition
variable (cv_wait) (and psref_target_destroy for psref) to wait.
Unfortunately rtrequst{,1}(RTM_DELETE) can be called in softint
that we cannot use cv_wait. In that case, we have to defer the
destruction to a workqueue.
rtentry#rt_cv, rtentry#rt_psref and global variables
(see rt_free_global) are added to conduct the procedure.
Updates of rtentries
--------------------
One difficulty to use refcnt/psref instead of rwlock for rtentry
is updates of rtentries. We need an additional mechanism to
prevent readers from seeing inconsistency of a rtentry being
updated.
We introduce RTF_UPDATING flag to rtentries that are updating.
While the flag is set to a rtentry, users cannot acquire the
rtentry. By doing so, we avoid users to see inconsistent
rtentries.
There are two options when a user tries to acquire a rtentry
with the RTF_UPDATING flag; if a user runs in softint context
the user fails to acquire a rtentry (NULL is returned).
Otherwise a user waits until the update completes by waiting
on cv.
The procedure of a updater is simpler to destruction of
a rtentry. Wait on cv (and psref) and after all readers left,
proceed with the update.
Global variables (see rt_update_global) are added to conduct
the procedure.
Currently we apply the mechanism to only RTM_CHANGE in
rtsock.c. We would have to apply other codes. See
"Known issues" section.
psref for rtentry
-----------------
When we obtain a rtentry from a rtcache via rtcache_* APIs,
psref is used to reference to the rtentry.
rtcache_ref acquires a reference to a rtentry with psref
and rtcache_unref releases the reference after using it.
rtcache_ref is called inside rtcache_* APIs and users don't
need to take care of it while users must call rtcache_unref
to release the reference.
struct psref and int bound that is needed for psref is
embedded into struct route. By doing so we don't need to
add local variables and additional argument to APIs.
However this adds another constraint to psref other than
reference counting one's; holding a reference of an rtentry
via a rtcache is allowed by just one caller at the same time.
So we must not acquire a rtentry via a rtcache twice and
avoid a recursive use of a rtcache. And also a rtcache must
be arranged to be used by a LWP/softint at the same time
somehow. For IP forwarding case, we have per-CPU rtcaches
used in softint so the constraint is guaranteed. For a h
rtcache of a PCB case, the constraint is guaranteed by the
solock of each PCB. Any other cases (pf, ipf, stf and ipsec)
are currently guaranteed by only the existence of the global
locks (softnet_lock and/or KERNEL_LOCK). If we've found the
cases that we cannot guarantee the constraint, we would need
to introduce other rtcache APIs that use simple reference
counting.
psref of rtcache is created with IPL_SOFTNET and so rtcache
shouldn't used at an IPL higher than IPL_SOFTNET.
Note that rtcache_free is used to invalidate a given rtcache.
We don't need another care by my change; just keep them as
they are.
Performance impact
------------------
When NET_MPSAFE is disabled the performance drop is 3% while
when it's enabled the drop is increased to 11%. The difference
comes from that currently we don't take any global locks and
don't use psref if NET_MPSAFE is disabled.
We can optimize the performance of the case of NET_MPSAFE
on by reducing lookups of rtcache that uses psref;
currently we do two lookups but we should be able to trim
one of two. This is a future work.
Known issues
------------
There are two known issues to be solved; one is that
a caller of rtrequest(RTM_ADD) may change rtentry (see rtinit).
We need to prevent new references during the update. Or
we may be able to remove the code (perhaps, need more
investigations).
The other is rtredirect that updates a rtentry. We need
to apply our update mechanism, however it's not easy because
rtredirect is called in softint and we cannot apply our
mechanism simply. One solution is to defer rtredirect to
a workqueue but it requires some code restructuring.
2016-12-12 06:55:57 +03:00
|
|
|
if (rt) {
|
|
|
|
if (do_rt_free)
|
|
|
|
rt_free(rt);
|
|
|
|
else
|
|
|
|
rt_unref(rt);
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
struct rawcb *rp = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
|
|
|
* Check to see if we don't want our own messages.
|
|
|
|
*/
|
|
|
|
if ((so->so_options & SO_USELOOPBACK) == 0) {
|
2011-02-01 04:39:19 +03:00
|
|
|
if (COMPATNAME(route_info).ri_cb.any_count <= 1) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (rtm)
|
|
|
|
Free(rtm);
|
|
|
|
m_freem(m);
|
2016-08-01 06:15:30 +03:00
|
|
|
goto out;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
/* There is another listener, so construct message */
|
|
|
|
rp = sotorawcb(so);
|
|
|
|
}
|
|
|
|
if (rtm) {
|
2008-10-25 01:38:18 +04:00
|
|
|
m_copyback(m, 0, rtm->rtm_msglen, rtm);
|
2001-06-04 12:57:58 +04:00
|
|
|
if (m->m_pkthdr.len < rtm->rtm_msglen) {
|
2001-06-04 05:30:11 +04:00
|
|
|
m_freem(m);
|
|
|
|
m = NULL;
|
2001-06-04 12:57:58 +04:00
|
|
|
} else if (m->m_pkthdr.len > rtm->rtm_msglen)
|
2001-06-04 05:30:11 +04:00
|
|
|
m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len);
|
1993-03-21 12:45:37 +03:00
|
|
|
Free(rtm);
|
|
|
|
}
|
|
|
|
if (rp)
|
|
|
|
rp->rcb_proto.sp_family = 0; /* Avoid us */
|
2002-02-22 20:26:31 +03:00
|
|
|
if (family)
|
2008-03-26 17:53:14 +03:00
|
|
|
proto.sp_protocol = family;
|
2001-06-04 05:30:11 +04:00
|
|
|
if (m)
|
2011-02-01 04:39:19 +03:00
|
|
|
raw_input(m, &proto, &COMPATNAME(route_info).ri_src,
|
|
|
|
&COMPATNAME(route_info).ri_dst);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (rp)
|
2011-02-01 04:39:19 +03:00
|
|
|
rp->rcb_proto.sp_family = PF_XROUTE;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2016-08-01 06:15:30 +03:00
|
|
|
out:
|
|
|
|
curlwp_bindx(bound);
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return error;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
static void
|
|
|
|
rt_setmetrics(int which, const struct rt_xmsghdr *in, struct rtentry *out)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
#define metric(f, e) if (which & (f)) out->rt_rmx.e = in->rtm_rmx.e;
|
1993-03-21 12:45:37 +03:00
|
|
|
metric(RTV_RPIPE, rmx_recvpipe);
|
|
|
|
metric(RTV_SPIPE, rmx_sendpipe);
|
|
|
|
metric(RTV_SSTHRESH, rmx_ssthresh);
|
|
|
|
metric(RTV_RTT, rmx_rtt);
|
|
|
|
metric(RTV_RTTVAR, rmx_rttvar);
|
|
|
|
metric(RTV_HOPCOUNT, rmx_hopcount);
|
|
|
|
metric(RTV_MTU, rmx_mtu);
|
|
|
|
#undef metric
|
2015-08-07 11:11:33 +03:00
|
|
|
if (which & RTV_EXPIRE) {
|
|
|
|
out->rt_rmx.rmx_expire = in->rtm_rmx.rmx_expire ?
|
|
|
|
time_wall_to_mono(in->rtm_rmx.rmx_expire) : 0;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
static void
|
|
|
|
rtm_setmetrics(const struct rtentry *in, struct rt_xmsghdr *out)
|
|
|
|
{
|
|
|
|
#define metric(e) out->rtm_rmx.e = in->rt_rmx.e;
|
|
|
|
metric(rmx_recvpipe);
|
|
|
|
metric(rmx_sendpipe);
|
|
|
|
metric(rmx_ssthresh);
|
|
|
|
metric(rmx_rtt);
|
|
|
|
metric(rmx_rttvar);
|
|
|
|
metric(rmx_hopcount);
|
|
|
|
metric(rmx_mtu);
|
2017-02-17 05:56:53 +03:00
|
|
|
metric(rmx_locks);
|
2011-02-01 04:39:19 +03:00
|
|
|
#undef metric
|
2015-08-07 11:11:33 +03:00
|
|
|
out->rtm_rmx.rmx_expire = in->rt_rmx.rmx_expire ?
|
|
|
|
time_mono_to_wall(in->rt_rmx.rmx_expire) : 0;
|
2011-02-01 04:39:19 +03:00
|
|
|
}
|
|
|
|
|
2000-09-28 05:14:06 +04:00
|
|
|
static int
|
2008-10-28 14:41:23 +03:00
|
|
|
rt_xaddrs(u_char rtmtype, const char *cp, const char *cplim,
|
|
|
|
struct rt_addrinfo *rtinfo)
|
1994-05-13 10:02:48 +04:00
|
|
|
{
|
2004-04-22 01:03:43 +04:00
|
|
|
const struct sockaddr *sa = NULL; /* Quell compiler warning */
|
2000-03-30 13:45:33 +04:00
|
|
|
int i;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2008-10-25 01:38:18 +04:00
|
|
|
for (i = 0; i < RTAX_MAX && cp < cplim; i++) {
|
1994-05-13 10:02:48 +04:00
|
|
|
if ((rtinfo->rti_addrs & (1 << i)) == 0)
|
|
|
|
continue;
|
2008-12-13 01:34:58 +03:00
|
|
|
rtinfo->rti_info[i] = sa = (const struct sockaddr *)cp;
|
2011-02-01 04:39:19 +03:00
|
|
|
RT_XADVANCE(cp, sa);
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2000-11-10 06:37:42 +03:00
|
|
|
|
2008-10-28 14:41:23 +03:00
|
|
|
/*
|
|
|
|
* Check for extra addresses specified, except RTM_GET asking
|
|
|
|
* for interface info.
|
|
|
|
*/
|
2004-10-23 23:13:22 +04:00
|
|
|
if (rtmtype == RTM_GET) {
|
2008-10-28 14:41:23 +03:00
|
|
|
if (((rtinfo->rti_addrs &
|
2016-07-28 10:54:31 +03:00
|
|
|
(~((1 << RTAX_IFP) | (1 << RTAX_IFA)))) & (~0U << i)) != 0)
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return 1;
|
2016-07-28 10:54:31 +03:00
|
|
|
} else if ((rtinfo->rti_addrs & (~0U << i)) != 0)
|
2008-10-28 05:03:06 +03:00
|
|
|
return 1;
|
2000-11-10 06:37:42 +03:00
|
|
|
/* Check for bad data length. */
|
|
|
|
if (cp != cplim) {
|
2008-10-25 01:38:18 +04:00
|
|
|
if (i == RTAX_NETMASK + 1 && sa != NULL &&
|
2011-02-01 04:39:19 +03:00
|
|
|
cp - RT_XROUNDUP(sa->sa_len) + sa->sa_len == cplim)
|
2000-11-10 06:37:42 +03:00
|
|
|
/*
|
2008-10-28 05:03:06 +03:00
|
|
|
* The last sockaddr was info.rti_info[RTAX_NETMASK].
|
2000-11-10 06:37:42 +03:00
|
|
|
* We accept this for now for the sake of old
|
|
|
|
* binaries or third party softwares.
|
|
|
|
*/
|
|
|
|
;
|
|
|
|
else
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return 1;
|
2000-11-10 06:37:42 +03:00
|
|
|
}
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return 0;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
|
|
|
|
2010-12-25 23:37:44 +03:00
|
|
|
static int
|
|
|
|
rt_getlen(int type)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
#ifndef COMPAT_RTSOCK
|
|
|
|
CTASSERT(__alignof(struct ifa_msghdr) >= sizeof(uint64_t));
|
|
|
|
CTASSERT(__alignof(struct if_msghdr) >= sizeof(uint64_t));
|
|
|
|
CTASSERT(__alignof(struct if_announcemsghdr) >= sizeof(uint64_t));
|
|
|
|
CTASSERT(__alignof(struct rt_msghdr) >= sizeof(uint64_t));
|
|
|
|
#endif
|
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
switch (type) {
|
2016-09-21 13:50:22 +03:00
|
|
|
case RTM_ODELADDR:
|
|
|
|
case RTM_ONEWADDR:
|
|
|
|
case RTM_OCHGADDR:
|
|
|
|
#ifdef COMPAT_70
|
|
|
|
return sizeof(struct ifa_msghdr70);
|
|
|
|
#else
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
printf("RTM_ONEWADDR\n");
|
|
|
|
#endif
|
|
|
|
return -1;
|
|
|
|
#endif
|
1994-05-13 10:02:48 +04:00
|
|
|
case RTM_DELADDR:
|
|
|
|
case RTM_NEWADDR:
|
2010-11-12 19:30:26 +03:00
|
|
|
case RTM_CHGADDR:
|
2011-02-01 04:39:19 +03:00
|
|
|
return sizeof(struct ifa_xmsghdr);
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2009-01-11 05:45:45 +03:00
|
|
|
case RTM_OOIFINFO:
|
2010-12-25 23:37:44 +03:00
|
|
|
#ifdef COMPAT_14
|
|
|
|
return sizeof(struct if_msghdr14);
|
|
|
|
#else
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
printf("RTM_OOIFINFO\n");
|
|
|
|
#endif
|
|
|
|
return -1;
|
1999-11-19 13:41:41 +03:00
|
|
|
#endif
|
2009-01-11 05:45:45 +03:00
|
|
|
case RTM_OIFINFO:
|
2010-12-25 23:37:44 +03:00
|
|
|
#ifdef COMPAT_50
|
|
|
|
return sizeof(struct if_msghdr50);
|
|
|
|
#else
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
printf("RTM_OIFINFO\n");
|
|
|
|
#endif
|
|
|
|
return -1;
|
2009-01-11 05:45:45 +03:00
|
|
|
#endif
|
1999-11-19 13:41:41 +03:00
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
case RTM_IFINFO:
|
2011-02-01 04:39:19 +03:00
|
|
|
return sizeof(struct if_xmsghdr);
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2000-03-06 23:49:00 +03:00
|
|
|
case RTM_IFANNOUNCE:
|
2005-06-22 10:14:51 +04:00
|
|
|
case RTM_IEEE80211:
|
2011-02-01 04:39:19 +03:00
|
|
|
return sizeof(struct if_xannouncemsghdr);
|
2000-03-06 23:49:00 +03:00
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
default:
|
2011-02-01 04:39:19 +03:00
|
|
|
return sizeof(struct rt_xmsghdr);
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2010-12-25 23:37:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct mbuf *
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(rt_msg1)(int type, struct rt_addrinfo *rtinfo, void *data, int datalen)
|
2010-12-25 23:37:44 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct rt_xmsghdr *rtm;
|
2010-12-25 23:37:44 +03:00
|
|
|
struct mbuf *m;
|
|
|
|
int i;
|
|
|
|
const struct sockaddr *sa;
|
|
|
|
int len, dlen;
|
|
|
|
|
|
|
|
m = m_gethdr(M_DONTWAIT, MT_DATA);
|
|
|
|
if (m == NULL)
|
|
|
|
return m;
|
2011-02-01 04:39:19 +03:00
|
|
|
MCLAIM(m, &COMPATNAME(routedomain).dom_mowner);
|
2010-12-25 23:37:44 +03:00
|
|
|
|
|
|
|
if ((len = rt_getlen(type)) == -1)
|
|
|
|
goto out;
|
2001-06-04 12:57:58 +04:00
|
|
|
if (len > MHLEN + MLEN)
|
2011-02-01 04:39:19 +03:00
|
|
|
panic("%s: message too long", __func__);
|
2001-06-04 12:57:58 +04:00
|
|
|
else if (len > MHLEN) {
|
1999-11-19 13:41:41 +03:00
|
|
|
m->m_next = m_get(M_DONTWAIT, MT_DATA);
|
2010-12-25 23:37:44 +03:00
|
|
|
if (m->m_next == NULL)
|
|
|
|
goto out;
|
2003-02-26 09:31:08 +03:00
|
|
|
MCLAIM(m->m_next, m->m_owner);
|
2001-06-04 12:57:58 +04:00
|
|
|
m->m_pkthdr.len = len;
|
|
|
|
m->m_len = MHLEN;
|
|
|
|
m->m_next->m_len = len - MHLEN;
|
|
|
|
} else {
|
|
|
|
m->m_pkthdr.len = m->m_len = len;
|
1999-11-19 13:41:41 +03:00
|
|
|
}
|
2016-06-10 16:27:10 +03:00
|
|
|
m_reset_rcvif(m);
|
1999-11-19 13:41:41 +03:00
|
|
|
m_copyback(m, 0, datalen, data);
|
2008-06-02 02:05:47 +04:00
|
|
|
if (len > datalen)
|
|
|
|
(void)memset(mtod(m, char *) + datalen, 0, len - datalen);
|
2011-02-01 04:39:19 +03:00
|
|
|
rtm = mtod(m, struct rt_xmsghdr *);
|
1994-05-13 10:02:48 +04:00
|
|
|
for (i = 0; i < RTAX_MAX; i++) {
|
|
|
|
if ((sa = rtinfo->rti_info[i]) == NULL)
|
|
|
|
continue;
|
|
|
|
rtinfo->rti_addrs |= (1 << i);
|
2011-02-01 04:39:19 +03:00
|
|
|
dlen = RT_XROUNDUP(sa->sa_len);
|
|
|
|
m_copyback(m, len, sa->sa_len, sa);
|
|
|
|
if (dlen != sa->sa_len) {
|
2012-01-31 00:02:55 +04:00
|
|
|
/*
|
|
|
|
* Up to 6 + 1 nul's since roundup is to
|
|
|
|
* sizeof(uint64_t) (8 bytes)
|
|
|
|
*/
|
2011-02-01 04:39:19 +03:00
|
|
|
m_copyback(m, len + sa->sa_len,
|
|
|
|
dlen - sa->sa_len, "\0\0\0\0\0\0");
|
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
len += dlen;
|
|
|
|
}
|
2010-12-25 23:37:44 +03:00
|
|
|
if (m->m_pkthdr.len != len)
|
|
|
|
goto out;
|
1993-03-21 12:45:37 +03:00
|
|
|
rtm->rtm_msglen = len;
|
2011-02-01 04:39:19 +03:00
|
|
|
rtm->rtm_version = RTM_XVERSION;
|
1993-03-21 12:45:37 +03:00
|
|
|
rtm->rtm_type = type;
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return m;
|
2010-12-25 23:37:44 +03:00
|
|
|
out:
|
|
|
|
m_freem(m);
|
|
|
|
return NULL;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
|
|
|
|
1999-04-02 21:22:21 +04:00
|
|
|
/*
|
|
|
|
* rt_msg2
|
|
|
|
*
|
|
|
|
* fills 'cp' or 'w'.w_tmem with the routing socket message and
|
|
|
|
* returns the length of the message in 'lenp'.
|
|
|
|
*
|
|
|
|
* if walkarg is 0, cp is expected to be 0 or a buffer large enough to hold
|
|
|
|
* the message
|
|
|
|
* otherwise walkarg's w_needed is updated and if the user buffer is
|
|
|
|
* specified and w_needed indicates space exists the information is copied
|
|
|
|
* into the temp space (w_tmem). w_tmem is [re]allocated if necessary,
|
|
|
|
* if the allocation fails ENOBUFS is returned.
|
|
|
|
*/
|
1994-05-13 10:02:48 +04:00
|
|
|
static int
|
2009-01-11 05:45:45 +03:00
|
|
|
rt_msg2(int type, struct rt_addrinfo *rtinfo, void *cpv, struct rt_walkarg *w,
|
2004-04-22 01:03:43 +04:00
|
|
|
int *lenp)
|
1994-05-13 10:02:48 +04:00
|
|
|
{
|
2000-03-30 13:45:33 +04:00
|
|
|
int i;
|
1994-05-13 10:02:48 +04:00
|
|
|
int len, dlen, second_time = 0;
|
2007-03-04 08:59:00 +03:00
|
|
|
char *cp0, *cp = cpv;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
|
|
|
rtinfo->rti_addrs = 0;
|
|
|
|
again:
|
2010-12-25 23:37:44 +03:00
|
|
|
if ((len = rt_getlen(type)) == -1)
|
|
|
|
return EINVAL;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
1996-02-14 00:59:53 +03:00
|
|
|
if ((cp0 = cp) != NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
cp += len;
|
|
|
|
for (i = 0; i < RTAX_MAX; i++) {
|
2004-04-21 08:17:28 +04:00
|
|
|
const struct sockaddr *sa;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if ((sa = rtinfo->rti_info[i]) == NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
continue;
|
|
|
|
rtinfo->rti_addrs |= (1 << i);
|
2011-02-01 04:39:19 +03:00
|
|
|
dlen = RT_XROUNDUP(sa->sa_len);
|
1994-05-13 10:02:48 +04:00
|
|
|
if (cp) {
|
2012-01-31 00:02:55 +04:00
|
|
|
int diff = dlen - sa->sa_len;
|
|
|
|
(void)memcpy(cp, sa, (size_t)sa->sa_len);
|
|
|
|
cp += sa->sa_len;
|
|
|
|
if (diff > 0) {
|
|
|
|
(void)memset(cp, 0, (size_t)diff);
|
|
|
|
cp += diff;
|
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
len += dlen;
|
|
|
|
}
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (cp == NULL && w != NULL && !second_time) {
|
2009-01-11 05:45:45 +03:00
|
|
|
struct rt_walkarg *rw = w;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
|
|
|
rw->w_needed += len;
|
|
|
|
if (rw->w_needed <= 0 && rw->w_where) {
|
|
|
|
if (rw->w_tmemsize < len) {
|
|
|
|
if (rw->w_tmem)
|
|
|
|
free(rw->w_tmem, M_RTABLE);
|
2008-08-28 23:33:24 +04:00
|
|
|
rw->w_tmem = malloc(len, M_RTABLE, M_NOWAIT);
|
1996-02-14 00:59:53 +03:00
|
|
|
if (rw->w_tmem)
|
1994-05-13 10:02:48 +04:00
|
|
|
rw->w_tmemsize = len;
|
2008-08-28 23:33:24 +04:00
|
|
|
else
|
|
|
|
rw->w_tmemsize = 0;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
|
|
|
if (rw->w_tmem) {
|
|
|
|
cp = rw->w_tmem;
|
|
|
|
second_time = 1;
|
|
|
|
goto again;
|
1999-04-02 21:22:21 +04:00
|
|
|
} else {
|
|
|
|
rw->w_tmemneeded = len;
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return ENOBUFS;
|
1999-04-02 21:22:21 +04:00
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
if (cp) {
|
2011-02-01 04:39:19 +03:00
|
|
|
struct rt_xmsghdr *rtm = (struct rt_xmsghdr *)cp0;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
rtm->rtm_version = RTM_XVERSION;
|
1994-05-13 10:02:48 +04:00
|
|
|
rtm->rtm_type = type;
|
|
|
|
rtm->rtm_msglen = len;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1999-04-02 21:22:21 +04:00
|
|
|
if (lenp)
|
|
|
|
*lenp = len;
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return 0;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
|
|
|
|
2016-04-04 10:37:07 +03:00
|
|
|
#ifndef COMPAT_RTSOCK
|
|
|
|
int
|
|
|
|
rt_msg3(int type, struct rt_addrinfo *rtinfo, void *cpv, struct rt_walkarg *w,
|
|
|
|
int *lenp)
|
|
|
|
{
|
|
|
|
return rt_msg2(type, rtinfo, cpv, w, lenp);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
/*
|
|
|
|
* This routine is called to generate a message from the routing
|
2001-09-16 20:34:23 +04:00
|
|
|
* socket indicating that a redirect has occurred, a routing lookup
|
1994-05-13 10:02:48 +04:00
|
|
|
* has failed, or that a protocol has detected timeouts to a particular
|
|
|
|
* destination.
|
|
|
|
*/
|
|
|
|
void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(rt_missmsg)(int type, const struct rt_addrinfo *rtinfo, int flags,
|
|
|
|
int error)
|
1994-05-13 10:02:48 +04:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct rt_xmsghdr rtm;
|
2000-03-30 13:45:33 +04:00
|
|
|
struct mbuf *m;
|
2004-04-21 08:17:28 +04:00
|
|
|
const struct sockaddr *sa = rtinfo->rti_info[RTAX_DST];
|
2011-02-01 04:39:19 +03:00
|
|
|
struct rt_addrinfo info = *rtinfo;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATCALL(rt_missmsg, (type, rtinfo, flags, error));
|
|
|
|
if (COMPATNAME(route_info).ri_cb.any_count == 0)
|
1993-03-21 12:45:37 +03:00
|
|
|
return;
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&rtm, 0, sizeof(rtm));
|
2016-04-25 18:43:49 +03:00
|
|
|
rtm.rtm_pid = curproc->p_pid;
|
1999-11-19 13:41:41 +03:00
|
|
|
rtm.rtm_flags = RTF_DONE | flags;
|
|
|
|
rtm.rtm_errno = error;
|
2011-02-01 04:39:19 +03:00
|
|
|
m = COMPATNAME(rt_msg1)(type, &info, &rtm, sizeof(rtm));
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (m == NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
return;
|
2011-02-01 04:39:19 +03:00
|
|
|
mtod(m, struct rt_xmsghdr *)->rtm_addrs = info.rti_addrs;
|
|
|
|
COMPATNAME(route_enqueue)(m, sa ? sa->sa_family : 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1994-05-13 10:02:48 +04:00
|
|
|
* This routine is called to generate a message from the routing
|
|
|
|
* socket indicating that the status of a network interface has changed.
|
|
|
|
*/
|
|
|
|
void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
|
1994-05-13 10:02:48 +04:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct if_xmsghdr ifm;
|
1994-05-13 10:02:48 +04:00
|
|
|
struct mbuf *m;
|
|
|
|
struct rt_addrinfo info;
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATCALL(rt_ifmsg, (ifp));
|
|
|
|
if (COMPATNAME(route_info).ri_cb.any_count == 0)
|
1994-05-13 10:02:48 +04:00
|
|
|
return;
|
2009-01-11 05:45:45 +03:00
|
|
|
(void)memset(&info, 0, sizeof(info));
|
|
|
|
(void)memset(&ifm, 0, sizeof(ifm));
|
1999-11-19 13:41:41 +03:00
|
|
|
ifm.ifm_index = ifp->if_index;
|
|
|
|
ifm.ifm_flags = ifp->if_flags;
|
|
|
|
ifm.ifm_data = ifp->if_data;
|
|
|
|
ifm.ifm_addrs = 0;
|
2011-02-01 04:39:19 +03:00
|
|
|
m = COMPATNAME(rt_msg1)(RTM_IFINFO, &info, &ifm, sizeof(ifm));
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (m == NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
return;
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_enqueue)(m, 0);
|
1999-11-19 13:41:41 +03:00
|
|
|
#ifdef COMPAT_14
|
2011-02-01 04:39:19 +03:00
|
|
|
compat_14_rt_oifmsg(ifp);
|
2009-01-11 05:45:45 +03:00
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_50
|
2011-02-01 04:39:19 +03:00
|
|
|
compat_50_rt_oifmsg(ifp);
|
1999-11-19 13:41:41 +03:00
|
|
|
#endif
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
|
|
|
|
2016-09-21 13:50:22 +03:00
|
|
|
#ifndef COMPAT_RTSOCK
|
|
|
|
static int
|
|
|
|
if_addrflags(struct ifaddr *ifa)
|
|
|
|
{
|
|
|
|
|
|
|
|
switch (ifa->ifa_addr->sa_family) {
|
|
|
|
#ifdef INET
|
|
|
|
case AF_INET:
|
|
|
|
return ((struct in_ifaddr *)ifa)->ia4_flags;
|
|
|
|
#endif
|
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6:
|
|
|
|
return ((struct in6_ifaddr *)ifa)->ia6_flags;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2009-01-11 05:45:45 +03:00
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
/*
|
|
|
|
* This is called to generate messages from the routing socket
|
|
|
|
* indicating a network interface has had addresses associated with it.
|
|
|
|
* if we ever reverse the logic and replace messages TO the routing
|
|
|
|
* socket indicate a request to configure interfaces, then it will
|
|
|
|
* be unnecessary as the routing socket will automatically generate
|
|
|
|
* copies of it.
|
|
|
|
*/
|
|
|
|
void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(rt_newaddrmsg)(int cmd, struct ifaddr *ifa, int error,
|
|
|
|
struct rtentry *rt)
|
1994-05-13 10:02:48 +04:00
|
|
|
{
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
#define cmdpass(__cmd, __pass) (((__cmd) << 2) | (__pass))
|
1994-05-13 10:02:48 +04:00
|
|
|
struct rt_addrinfo info;
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
const struct sockaddr *sa;
|
1994-05-13 10:02:48 +04:00
|
|
|
int pass;
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
struct mbuf *m;
|
2012-01-01 00:41:58 +04:00
|
|
|
struct ifnet *ifp;
|
2011-02-01 04:39:19 +03:00
|
|
|
struct rt_xmsghdr rtm;
|
|
|
|
struct ifa_xmsghdr ifam;
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
int ncmd;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2012-01-01 00:41:58 +04:00
|
|
|
KASSERT(ifa != NULL);
|
2016-09-21 13:50:22 +03:00
|
|
|
KASSERT(ifa->ifa_addr != NULL);
|
2012-01-01 00:41:58 +04:00
|
|
|
ifp = ifa->ifa_ifp;
|
2015-10-14 00:28:34 +03:00
|
|
|
#ifdef SCTP
|
|
|
|
if (cmd == RTM_ADD) {
|
|
|
|
sctp_add_ip_address(ifa);
|
|
|
|
} else if (cmd == RTM_DELETE) {
|
|
|
|
sctp_delete_ip_address(ifa);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATCALL(rt_newaddrmsg, (cmd, ifa, error, rt));
|
|
|
|
if (COMPATNAME(route_info).ri_cb.any_count == 0)
|
1994-05-13 10:02:48 +04:00
|
|
|
return;
|
|
|
|
for (pass = 1; pass < 3; pass++) {
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&info, 0, sizeof(info));
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
switch (cmdpass(cmd, pass)) {
|
|
|
|
case cmdpass(RTM_ADD, 1):
|
|
|
|
case cmdpass(RTM_CHANGE, 1):
|
|
|
|
case cmdpass(RTM_DELETE, 2):
|
2011-12-12 04:06:39 +04:00
|
|
|
case cmdpass(RTM_NEWADDR, 1):
|
|
|
|
case cmdpass(RTM_DELADDR, 1):
|
|
|
|
case cmdpass(RTM_CHGADDR, 1):
|
2010-11-12 19:30:26 +03:00
|
|
|
switch (cmd) {
|
2011-12-12 04:06:39 +04:00
|
|
|
case RTM_ADD:
|
2016-09-21 13:50:22 +03:00
|
|
|
ncmd = RTM_XNEWADDR;
|
2011-12-12 04:06:39 +04:00
|
|
|
break;
|
2010-11-12 19:30:26 +03:00
|
|
|
case RTM_DELETE:
|
2016-09-21 13:50:22 +03:00
|
|
|
ncmd = RTM_XDELADDR;
|
2010-11-12 19:30:26 +03:00
|
|
|
break;
|
|
|
|
case RTM_CHANGE:
|
2016-09-21 13:50:22 +03:00
|
|
|
ncmd = RTM_XCHGADDR;
|
|
|
|
break;
|
|
|
|
case RTM_NEWADDR:
|
|
|
|
ncmd = RTM_XNEWADDR;
|
|
|
|
break;
|
|
|
|
case RTM_DELADDR:
|
|
|
|
ncmd = RTM_XDELADDR;
|
|
|
|
break;
|
|
|
|
case RTM_CHGADDR:
|
|
|
|
ncmd = RTM_XCHGADDR;
|
2010-11-12 19:30:26 +03:00
|
|
|
break;
|
|
|
|
default:
|
2016-09-21 13:50:22 +03:00
|
|
|
panic("%s: unknown command %d", __func__, cmd);
|
2010-11-12 19:30:26 +03:00
|
|
|
}
|
2016-09-21 13:50:22 +03:00
|
|
|
#ifdef COMPAT_70
|
|
|
|
compat_70_rt_newaddrmsg1(ncmd, ifa);
|
|
|
|
#endif
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFA] = sa = ifa->ifa_addr;
|
2012-01-01 00:41:58 +04:00
|
|
|
KASSERT(ifp->if_dl != NULL);
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
|
|
|
|
info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask;
|
|
|
|
info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr;
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&ifam, 0, sizeof(ifam));
|
1999-11-19 13:41:41 +03:00
|
|
|
ifam.ifam_index = ifp->if_index;
|
|
|
|
ifam.ifam_metric = ifa->ifa_metric;
|
|
|
|
ifam.ifam_flags = ifa->ifa_flags;
|
2016-09-21 13:50:22 +03:00
|
|
|
#ifndef COMPAT_RTSOCK
|
|
|
|
ifam.ifam_pid = curproc->p_pid;
|
|
|
|
ifam.ifam_addrflags = if_addrflags(ifa);
|
|
|
|
#endif
|
2011-02-01 04:39:19 +03:00
|
|
|
m = COMPATNAME(rt_msg1)(ncmd, &info, &ifam, sizeof(ifam));
|
1999-11-19 13:41:41 +03:00
|
|
|
if (m == NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
continue;
|
2011-02-01 04:39:19 +03:00
|
|
|
mtod(m, struct ifa_xmsghdr *)->ifam_addrs =
|
1999-11-19 13:41:41 +03:00
|
|
|
info.rti_addrs;
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
break;
|
|
|
|
case cmdpass(RTM_ADD, 2):
|
|
|
|
case cmdpass(RTM_CHANGE, 2):
|
|
|
|
case cmdpass(RTM_DELETE, 1):
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
if (rt == NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
continue;
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
|
|
|
|
info.rti_info[RTAX_DST] = sa = rt_getkey(rt);
|
|
|
|
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&rtm, 0, sizeof(rtm));
|
2016-04-25 18:43:49 +03:00
|
|
|
rtm.rtm_pid = curproc->p_pid;
|
1999-11-19 13:41:41 +03:00
|
|
|
rtm.rtm_index = ifp->if_index;
|
|
|
|
rtm.rtm_flags |= rt->rt_flags;
|
|
|
|
rtm.rtm_errno = error;
|
2011-02-01 04:39:19 +03:00
|
|
|
m = COMPATNAME(rt_msg1)(cmd, &info, &rtm, sizeof(rtm));
|
1999-11-19 13:41:41 +03:00
|
|
|
if (m == NULL)
|
1994-05-13 10:02:48 +04:00
|
|
|
continue;
|
2011-02-01 04:39:19 +03:00
|
|
|
mtod(m, struct rt_xmsghdr *)->rtm_addrs = info.rti_addrs;
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
continue;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2008-05-24 22:51:41 +04:00
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
if (m == NULL)
|
2008-05-25 05:59:55 +04:00
|
|
|
panic("%s: called with wrong command", __func__);
|
2008-05-24 22:51:41 +04:00
|
|
|
#endif
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_enqueue)(m, sa ? sa->sa_family : 0);
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
*** Summary ***
When a link-layer address changes (e.g., ifconfig ex0 link
02:de:ad:be:ef:02 active), send a gratuitous ARP and/or a Neighbor
Advertisement to update the network-/link-layer address bindings
on our LAN peers.
Refuse a change of ethernet address to the address 00:00:00:00:00:00
or to any multicast/broadcast address. (Thanks matt@.)
Reorder ifnet ioctl operations so that driver ioctls may inherit
the functions of their "class"---ether_ioctl(), fddi_ioctl(), et
cetera---and the class ioctls may inherit from the generic ioctl,
ifioctl_common(), but both driver- and class-ioctls may override
the generic behavior. Make network drivers share more code.
Distinguish a "factory" link-layer address from others for the
purposes of both protecting that address from deletion and computing
EUI64.
Return consistent, appropriate error codes from network drivers.
Improve readability. KNF.
*** Details ***
In if_attach(), always initialize the interface ioctl routine,
ifnet->if_ioctl, if the driver has not already initialized it.
Delete if_ioctl == NULL tests everywhere else, because it cannot
happen.
In the ioctl routines of network interfaces, inherit common ioctl
behaviors by calling either ifioctl_common() or whichever ioctl
routine is appropriate for the class of interface---e.g., ether_ioctl()
for ethernets.
Stop (ab)using SIOCSIFADDR and start to use SIOCINITIFADDR. In
the user->kernel interface, SIOCSIFADDR's argument was an ifreq,
but on the protocol->ifnet interface, SIOCSIFADDR's argument was
an ifaddr. That was confusing, and it would work against me as I
make it possible for a network interface to overload most ioctls.
On the protocol->ifnet interface, replace SIOCSIFADDR with
SIOCINITIFADDR. In ifioctl(), return EPERM if userland tries to
invoke SIOCINITIFADDR.
In ifioctl(), give the interface the first shot at handling most
interface ioctls, and give the protocol the second shot, instead
of the other way around. Finally, let compatibility code (COMPAT_OSOCK)
take a shot.
Pull device initialization out of switch statements under
SIOCINITIFADDR. For example, pull ..._init() out of any switch
statement that looks like this:
switch (...->sa_family) {
case ...:
..._init();
...
break;
...
default:
..._init();
...
break;
}
Rewrite many if-else clauses that handle all permutations of IFF_UP
and IFF_RUNNING to use a switch statement,
switch (x & (IFF_UP|IFF_RUNNING)) {
case 0:
...
break;
case IFF_RUNNING:
...
break;
case IFF_UP:
...
break;
case IFF_UP|IFF_RUNNING:
...
break;
}
unifdef lots of code containing #ifdef FreeBSD, #ifdef NetBSD, and
#ifdef SIOCSIFMTU, especially in fwip(4) and in ndis(4).
In ipw(4), remove an if_set_sadl() call that is out of place.
In nfe(4), reuse the jumbo MTU logic in ether_ioctl().
Let ethernets register a callback for setting h/w state such as
promiscuous mode and the multicast filter in accord with a change
in the if_flags: ether_set_ifflags_cb() registers a callback that
returns ENETRESET if the caller should reset the ethernet by calling
if_init(), 0 on success, != 0 on failure. Pull common code from
ex(4), gem(4), nfe(4), sip(4), tlp(4), vge(4) into ether_ioctl(),
and register if_flags callbacks for those drivers.
Return ENOTTY instead of EINVAL for inappropriate ioctls. In
zyd(4), use ENXIO instead of ENOTTY to indicate that the device is
not any longer attached.
Add to if_set_sadl() a boolean 'factory' argument that indicates
whether a link-layer address was assigned by the factory or some
other source. In a comment, recommend using the factory address
for generating an EUI64, and update in6_get_hw_ifid() to prefer a
factory address to any other link-layer address.
Add a routing message, RTM_LLINFO_UPD, that tells protocols to
update the binding of network-layer addresses to link-layer addresses.
Implement this message in IPv4 and IPv6 by sending a gratuitous
ARP or a neighbor advertisement, respectively. Generate RTM_LLINFO_UPD
messages on a change of an interface's link-layer address.
In ether_ioctl(), do not let SIOCALIFADDR set a link-layer address
that is broadcast/multicast or equal to 00:00:00:00:00:00.
Make ether_ioctl() call ifioctl_common() to handle ioctls that it
does not understand.
In gif(4), initialize if_softc and use it, instead of assuming that
the gif_softc and ifp overlap.
Let ifioctl_common() handle SIOCGIFADDR.
Sprinkle rtcache_invariants(), which checks on DIAGNOSTIC kernels
that certain invariants on a struct route are satisfied.
In agr(4), rewrite agr_ioctl_filter() to be a bit more explicit
about the ioctls that we do not allow on an agr(4) member interface.
bzero -> memset. Delete unnecessary casts to void *. Use
sockaddr_in_init() and sockaddr_in6_init(). Compare pointers with
NULL instead of "testing truth". Replace some instances of (type
*)0 with NULL. Change some K&R prototypes to ANSI C, and join
lines.
2008-11-07 03:20:01 +03:00
|
|
|
#undef cmdpass
|
2016-09-21 13:50:22 +03:00
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
|
|
|
|
2005-06-22 10:14:51 +04:00
|
|
|
static struct mbuf *
|
|
|
|
rt_makeifannouncemsg(struct ifnet *ifp, int type, int what,
|
|
|
|
struct rt_addrinfo *info)
|
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct if_xannouncemsghdr ifan;
|
2005-06-22 10:14:51 +04:00
|
|
|
|
|
|
|
memset(info, 0, sizeof(*info));
|
|
|
|
memset(&ifan, 0, sizeof(ifan));
|
|
|
|
ifan.ifan_index = ifp->if_index;
|
|
|
|
strlcpy(ifan.ifan_name, ifp->if_xname, sizeof(ifan.ifan_name));
|
|
|
|
ifan.ifan_what = what;
|
2011-02-01 04:39:19 +03:00
|
|
|
return COMPATNAME(rt_msg1)(type, info, &ifan, sizeof(ifan));
|
2005-06-22 10:14:51 +04:00
|
|
|
}
|
|
|
|
|
2000-03-06 23:49:00 +03:00
|
|
|
/*
|
|
|
|
* This is called to generate routing socket messages indicating
|
|
|
|
* network interface arrival and departure.
|
|
|
|
*/
|
|
|
|
void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(rt_ifannouncemsg)(struct ifnet *ifp, int what)
|
2000-03-06 23:49:00 +03:00
|
|
|
{
|
|
|
|
struct mbuf *m;
|
|
|
|
struct rt_addrinfo info;
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATCALL(rt_ifannouncemsg, (ifp, what));
|
|
|
|
if (COMPATNAME(route_info).ri_cb.any_count == 0)
|
2000-03-06 23:49:00 +03:00
|
|
|
return;
|
2005-06-22 10:14:51 +04:00
|
|
|
m = rt_makeifannouncemsg(ifp, RTM_IFANNOUNCE, what, &info);
|
|
|
|
if (m == NULL)
|
2000-03-06 23:49:00 +03:00
|
|
|
return;
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_enqueue)(m, 0);
|
2000-03-06 23:49:00 +03:00
|
|
|
}
|
|
|
|
|
2005-06-22 10:14:51 +04:00
|
|
|
/*
|
|
|
|
* This is called to generate routing socket messages indicating
|
|
|
|
* IEEE80211 wireless events.
|
|
|
|
* XXX we piggyback on the RTM_IFANNOUNCE msg format in a clumsy way.
|
|
|
|
*/
|
|
|
|
void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(rt_ieee80211msg)(struct ifnet *ifp, int what, void *data,
|
|
|
|
size_t data_len)
|
2005-06-22 10:14:51 +04:00
|
|
|
{
|
|
|
|
struct mbuf *m;
|
|
|
|
struct rt_addrinfo info;
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATCALL(rt_ieee80211msg, (ifp, what, data, data_len));
|
|
|
|
if (COMPATNAME(route_info).ri_cb.any_count == 0)
|
2005-06-22 10:14:51 +04:00
|
|
|
return;
|
|
|
|
m = rt_makeifannouncemsg(ifp, RTM_IEEE80211, what, &info);
|
|
|
|
if (m == NULL)
|
|
|
|
return;
|
|
|
|
/*
|
|
|
|
* Append the ieee80211 data. Try to stick it in the
|
|
|
|
* mbuf containing the ifannounce msg; otherwise allocate
|
|
|
|
* a new mbuf and append.
|
|
|
|
*
|
|
|
|
* NB: we assume m is a single mbuf.
|
|
|
|
*/
|
|
|
|
if (data_len > M_TRAILINGSPACE(m)) {
|
|
|
|
struct mbuf *n = m_get(M_NOWAIT, MT_DATA);
|
|
|
|
if (n == NULL) {
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
(void)memcpy(mtod(n, void *), data, data_len);
|
|
|
|
n->m_len = data_len;
|
|
|
|
m->m_next = n;
|
|
|
|
} else if (data_len > 0) {
|
2008-02-20 20:05:52 +03:00
|
|
|
(void)memcpy(mtod(m, uint8_t *) + m->m_len, data, data_len);
|
2005-06-22 10:14:51 +04:00
|
|
|
m->m_len += data_len;
|
|
|
|
}
|
|
|
|
if (m->m_flags & M_PKTHDR)
|
|
|
|
m->m_pkthdr.len += data_len;
|
2011-02-01 04:39:19 +03:00
|
|
|
mtod(m, struct if_xannouncemsghdr *)->ifan_msglen += data_len;
|
|
|
|
COMPATNAME(route_enqueue)(m, 0);
|
2005-06-22 10:14:51 +04:00
|
|
|
}
|
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
/*
|
|
|
|
* This is used in dumping the kernel table via sysctl().
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
2000-04-15 21:51:27 +04:00
|
|
|
static int
|
2007-06-09 07:07:21 +04:00
|
|
|
sysctl_dumpentry(struct rtentry *rt, void *v)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2009-01-11 05:45:45 +03:00
|
|
|
struct rt_walkarg *w = v;
|
1994-05-13 10:02:48 +04:00
|
|
|
int error = 0, size;
|
|
|
|
struct rt_addrinfo info;
|
|
|
|
|
|
|
|
if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg))
|
|
|
|
return 0;
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&info, 0, sizeof(info));
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_DST] = rt_getkey(rt);
|
|
|
|
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
|
|
|
|
info.rti_info[RTAX_NETMASK] = rt_mask(rt);
|
2013-07-24 19:31:04 +04:00
|
|
|
info.rti_info[RTAX_TAG] = rt_gettag(rt);
|
1995-08-19 11:48:14 +04:00
|
|
|
if (rt->rt_ifp) {
|
2006-11-13 22:16:01 +03:00
|
|
|
const struct ifaddr *rtifa;
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = rt->rt_ifp->if_dl->ifa_addr;
|
2006-11-13 22:16:01 +03:00
|
|
|
/* rtifa used to be simply rt->rt_ifa. If rt->rt_ifa != NULL,
|
|
|
|
* then rt_get_ifa() != NULL. So this ought to still be safe.
|
|
|
|
* --dyoung
|
|
|
|
*/
|
|
|
|
rtifa = rt_get_ifa(rt);
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFA] = rtifa->ifa_addr;
|
1995-08-19 11:48:14 +04:00
|
|
|
if (rt->rt_ifp->if_flags & IFF_POINTOPOINT)
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_BRD] = rtifa->ifa_dstaddr;
|
1995-08-19 11:48:14 +04:00
|
|
|
}
|
1999-04-02 21:22:21 +04:00
|
|
|
if ((error = rt_msg2(RTM_GET, &info, 0, w, &size)))
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return error;
|
1999-04-02 21:22:21 +04:00
|
|
|
if (w->w_where && w->w_tmem && w->w_needed <= 0) {
|
2011-02-01 04:39:19 +03:00
|
|
|
struct rt_xmsghdr *rtm = (struct rt_xmsghdr *)w->w_tmem;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
|
|
|
rtm->rtm_flags = rt->rt_flags;
|
|
|
|
rtm->rtm_use = rt->rt_use;
|
2011-02-01 04:39:19 +03:00
|
|
|
rtm_setmetrics(rt, rtm);
|
2006-04-15 06:14:44 +04:00
|
|
|
KASSERT(rt->rt_ifp != NULL);
|
1994-05-13 10:02:48 +04:00
|
|
|
rtm->rtm_index = rt->rt_ifp->if_index;
|
|
|
|
rtm->rtm_errno = rtm->rtm_pid = rtm->rtm_seq = 0;
|
|
|
|
rtm->rtm_addrs = info.rti_addrs;
|
1996-07-01 05:12:32 +04:00
|
|
|
if ((error = copyout(rtm, w->w_where, size)) != 0)
|
1994-05-13 10:02:48 +04:00
|
|
|
w->w_where = NULL;
|
|
|
|
else
|
2007-03-04 08:59:00 +03:00
|
|
|
w->w_where = (char *)w->w_where + size;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return error;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2016-09-01 22:04:30 +03:00
|
|
|
static int
|
|
|
|
sysctl_iflist_if(struct ifnet *ifp, struct rt_walkarg *w,
|
|
|
|
struct rt_addrinfo *info, size_t len)
|
|
|
|
{
|
|
|
|
struct if_xmsghdr *ifm;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
ifm = (struct if_xmsghdr *)w->w_tmem;
|
|
|
|
ifm->ifm_index = ifp->if_index;
|
|
|
|
ifm->ifm_flags = ifp->if_flags;
|
|
|
|
ifm->ifm_data = ifp->if_data;
|
|
|
|
ifm->ifm_addrs = info->rti_addrs;
|
|
|
|
if ((error = copyout(ifm, w->w_where, len)) == 0)
|
|
|
|
w->w_where = (char *)w->w_where + len;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_iflist_addr(struct rt_walkarg *w, struct ifaddr *ifa,
|
|
|
|
struct rt_addrinfo *info)
|
|
|
|
{
|
|
|
|
int len, error;
|
|
|
|
|
2016-09-21 13:50:22 +03:00
|
|
|
if ((error = rt_msg2(RTM_XNEWADDR, info, 0, w, &len)))
|
2016-09-01 22:04:30 +03:00
|
|
|
return error;
|
|
|
|
if (w->w_where && w->w_tmem && w->w_needed <= 0) {
|
|
|
|
struct ifa_xmsghdr *ifam;
|
|
|
|
|
|
|
|
ifam = (struct ifa_xmsghdr *)w->w_tmem;
|
|
|
|
ifam->ifam_index = ifa->ifa_ifp->if_index;
|
|
|
|
ifam->ifam_flags = ifa->ifa_flags;
|
|
|
|
ifam->ifam_metric = ifa->ifa_metric;
|
|
|
|
ifam->ifam_addrs = info->rti_addrs;
|
2016-09-21 13:50:22 +03:00
|
|
|
#ifndef COMPAT_RTSOCK
|
|
|
|
ifam->ifam_pid = 0;
|
|
|
|
ifam->ifam_addrflags = if_addrflags(ifa);
|
|
|
|
#endif
|
2016-09-01 22:04:30 +03:00
|
|
|
if ((error = copyout(w->w_tmem, w->w_where, len)) == 0)
|
|
|
|
w->w_where = (char *)w->w_where + len;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2000-04-15 21:51:27 +04:00
|
|
|
static int
|
2009-01-11 05:45:45 +03:00
|
|
|
sysctl_iflist(int af, struct rt_walkarg *w, int type)
|
1994-05-13 10:02:48 +04:00
|
|
|
{
|
2000-03-30 13:45:33 +04:00
|
|
|
struct ifnet *ifp;
|
|
|
|
struct ifaddr *ifa;
|
1994-05-13 10:02:48 +04:00
|
|
|
struct rt_addrinfo info;
|
2016-09-01 22:04:30 +03:00
|
|
|
int cmd, len, error = 0;
|
|
|
|
int (*iflist_if)(struct ifnet *, struct rt_walkarg *,
|
|
|
|
struct rt_addrinfo *, size_t);
|
2016-09-21 13:50:22 +03:00
|
|
|
int (*iflist_addr)(struct rt_walkarg *, struct ifaddr *,
|
|
|
|
struct rt_addrinfo *);
|
2016-05-12 05:24:16 +03:00
|
|
|
int s;
|
|
|
|
struct psref psref;
|
2016-06-16 05:38:40 +03:00
|
|
|
int bound = curlwp_bind();
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2016-09-01 22:04:30 +03:00
|
|
|
switch (type) {
|
|
|
|
case NET_RT_IFLIST:
|
|
|
|
cmd = RTM_IFINFO;
|
|
|
|
iflist_if = sysctl_iflist_if;
|
2016-09-21 13:50:22 +03:00
|
|
|
iflist_addr = sysctl_iflist_addr;
|
2016-09-01 22:04:30 +03:00
|
|
|
break;
|
|
|
|
#ifdef COMPAT_14
|
2016-09-21 13:50:22 +03:00
|
|
|
case NET_RT_OOOIFLIST:
|
2016-09-01 22:04:30 +03:00
|
|
|
cmd = RTM_OOIFINFO;
|
|
|
|
iflist_if = compat_14_iflist;
|
2016-09-21 13:50:22 +03:00
|
|
|
iflist_addr = compat_70_iflist_addr;
|
2016-09-01 22:04:30 +03:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_50
|
2016-09-21 13:50:22 +03:00
|
|
|
case NET_RT_OOIFLIST:
|
2016-09-01 22:04:30 +03:00
|
|
|
cmd = RTM_OIFINFO;
|
|
|
|
iflist_if = compat_50_iflist;
|
2016-09-21 13:50:22 +03:00
|
|
|
iflist_addr = compat_70_iflist_addr;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_70
|
|
|
|
case NET_RT_OIFLIST:
|
|
|
|
cmd = RTM_IFINFO;
|
|
|
|
iflist_if = sysctl_iflist_if;
|
|
|
|
iflist_addr = compat_70_iflist_addr;
|
2016-09-01 22:04:30 +03:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
printf("sysctl_iflist\n");
|
|
|
|
#endif
|
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&info, 0, sizeof(info));
|
2016-05-12 05:24:16 +03:00
|
|
|
|
|
|
|
s = pserialize_read_enter();
|
|
|
|
IFNET_READER_FOREACH(ifp) {
|
1994-05-13 10:02:48 +04:00
|
|
|
if (w->w_arg && w->w_arg != ifp->if_index)
|
|
|
|
continue;
|
2016-07-07 12:32:01 +03:00
|
|
|
if (IFADDR_READER_EMPTY(ifp))
|
2006-02-22 01:01:17 +03:00
|
|
|
continue;
|
2016-05-12 05:24:16 +03:00
|
|
|
|
|
|
|
psref_acquire(&psref, &ifp->if_psref, ifnet_psref_class);
|
|
|
|
pserialize_read_exit(s);
|
|
|
|
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
|
2016-09-01 22:04:30 +03:00
|
|
|
if ((error = rt_msg2(cmd, &info, NULL, w, &len)) != 0)
|
2016-05-12 05:24:16 +03:00
|
|
|
goto release_exit;
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = NULL;
|
1999-04-02 21:22:21 +04:00
|
|
|
if (w->w_where && w->w_tmem && w->w_needed <= 0) {
|
2016-09-01 22:04:30 +03:00
|
|
|
if ((error = iflist_if(ifp, w, &info, len)) != 0)
|
|
|
|
goto release_exit;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2016-07-07 12:32:01 +03:00
|
|
|
IFADDR_READER_FOREACH(ifa, ifp) {
|
1994-05-13 10:02:48 +04:00
|
|
|
if (af && af != ifa->ifa_addr->sa_family)
|
|
|
|
continue;
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFA] = ifa->ifa_addr;
|
|
|
|
info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask;
|
|
|
|
info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr;
|
2016-09-21 13:50:22 +03:00
|
|
|
if ((error = iflist_addr(w, ifa, &info)) != 0)
|
2016-05-12 05:24:16 +03:00
|
|
|
goto release_exit;
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2008-10-28 14:41:23 +03:00
|
|
|
info.rti_info[RTAX_IFA] = info.rti_info[RTAX_NETMASK] =
|
|
|
|
info.rti_info[RTAX_BRD] = NULL;
|
2016-05-12 05:24:16 +03:00
|
|
|
|
|
|
|
s = pserialize_read_enter();
|
|
|
|
psref_release(&psref, &ifp->if_psref, ifnet_psref_class);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2016-05-12 05:24:16 +03:00
|
|
|
pserialize_read_exit(s);
|
2016-06-16 05:38:40 +03:00
|
|
|
curlwp_bindx(bound);
|
2016-05-12 05:24:16 +03:00
|
|
|
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return 0;
|
2016-05-12 05:24:16 +03:00
|
|
|
|
|
|
|
release_exit:
|
|
|
|
psref_release(&psref, &ifp->if_psref, ifnet_psref_class);
|
2016-06-16 05:38:40 +03:00
|
|
|
curlwp_bindx(bound);
|
2016-05-12 05:24:16 +03:00
|
|
|
return error;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
2000-04-15 21:51:27 +04:00
|
|
|
static int
|
Dynamic sysctl.
Gone are the old kern_sysctl(), cpu_sysctl(), hw_sysctl(),
vfs_sysctl(), etc, routines, along with sysctl_int() et al. Now all
nodes are registered with the tree, and nodes can be added (or
removed) easily, and I/O to and from the tree is handled generically.
Since the nodes are registered with the tree, the mapping from name to
number (and back again) can now be discovered, instead of having to be
hard coded. Adding new nodes to the tree is likewise much simpler --
the new infrastructure handles almost all the work for simple types,
and just about anything else can be done with a small helper function.
All existing nodes are where they were before (numerically speaking),
so all existing consumers of sysctl information should notice no
difference.
PS - I'm sorry, but there's a distinct lack of documentation at the
moment. I'm working on sysctl(3/8/9) right now, and I promise to
watch out for buses.
2003-12-04 22:38:21 +03:00
|
|
|
sysctl_rtable(SYSCTLFN_ARGS)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
Dynamic sysctl.
Gone are the old kern_sysctl(), cpu_sysctl(), hw_sysctl(),
vfs_sysctl(), etc, routines, along with sysctl_int() et al. Now all
nodes are registered with the tree, and nodes can be added (or
removed) easily, and I/O to and from the tree is handled generically.
Since the nodes are registered with the tree, the mapping from name to
number (and back again) can now be discovered, instead of having to be
hard coded. Adding new nodes to the tree is likewise much simpler --
the new infrastructure handles almost all the work for simple types,
and just about anything else can be done with a small helper function.
All existing nodes are where they were before (numerically speaking),
so all existing consumers of sysctl information should notice no
difference.
PS - I'm sorry, but there's a distinct lack of documentation at the
moment. I'm working on sysctl(3/8/9) right now, and I promise to
watch out for buses.
2003-12-04 22:38:21 +03:00
|
|
|
void *where = oldp;
|
|
|
|
size_t *given = oldlenp;
|
1994-05-13 10:02:48 +04:00
|
|
|
int i, s, error = EINVAL;
|
|
|
|
u_char af;
|
2009-01-11 05:45:45 +03:00
|
|
|
struct rt_walkarg w;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2003-12-29 01:36:37 +03:00
|
|
|
if (namelen == 1 && name[0] == CTL_QUERY)
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return sysctl_query(SYSCTLFN_CALL(rnode));
|
2003-12-29 01:36:37 +03:00
|
|
|
|
2014-09-05 10:00:05 +04:00
|
|
|
if (newp)
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return EPERM;
|
1994-05-13 10:02:48 +04:00
|
|
|
if (namelen != 3)
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return EINVAL;
|
1994-05-13 10:02:48 +04:00
|
|
|
af = name[0];
|
1999-04-02 21:22:21 +04:00
|
|
|
w.w_tmemneeded = 0;
|
|
|
|
w.w_tmemsize = 0;
|
|
|
|
w.w_tmem = NULL;
|
|
|
|
again:
|
|
|
|
/* we may return here if a later [re]alloc of the t_mem buffer fails */
|
|
|
|
if (w.w_tmemneeded) {
|
2008-08-28 23:33:24 +04:00
|
|
|
w.w_tmem = malloc(w.w_tmemneeded, M_RTABLE, M_WAITOK);
|
1999-04-02 21:22:21 +04:00
|
|
|
w.w_tmemsize = w.w_tmemneeded;
|
|
|
|
w.w_tmemneeded = 0;
|
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
w.w_op = name[1];
|
|
|
|
w.w_arg = name[2];
|
1999-04-02 21:22:21 +04:00
|
|
|
w.w_given = *given;
|
|
|
|
w.w_needed = 0 - w.w_given;
|
|
|
|
w.w_where = where;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1995-08-13 03:59:09 +04:00
|
|
|
s = splsoftnet();
|
1994-05-13 10:02:48 +04:00
|
|
|
switch (w.w_op) {
|
|
|
|
|
|
|
|
case NET_RT_DUMP:
|
|
|
|
case NET_RT_FLAGS:
|
2016-04-05 13:03:33 +03:00
|
|
|
#ifdef INET
|
2016-04-04 10:37:07 +03:00
|
|
|
/*
|
|
|
|
* take care of llinfo entries, the caller must
|
|
|
|
* specify an AF
|
|
|
|
*/
|
|
|
|
if (w.w_op == NET_RT_FLAGS &&
|
|
|
|
(w.w_arg == 0 || w.w_arg & RTF_LLDATA)) {
|
|
|
|
if (af != 0)
|
|
|
|
error = lltable_sysctl_dumparp(af, &w);
|
|
|
|
else
|
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
2016-04-05 13:03:33 +03:00
|
|
|
#endif /* INET */
|
2016-04-04 10:37:07 +03:00
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
for (i = 1; i <= AF_MAX; i++)
|
2007-06-09 07:07:21 +04:00
|
|
|
if ((af == 0 || af == i) &&
|
|
|
|
(error = rt_walktree(i, sysctl_dumpentry, &w)))
|
1994-05-13 10:02:48 +04:00
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
1999-11-19 13:41:41 +03:00
|
|
|
#ifdef COMPAT_14
|
2016-09-21 13:50:22 +03:00
|
|
|
case NET_RT_OOOIFLIST:
|
2009-01-11 05:45:45 +03:00
|
|
|
error = sysctl_iflist(af, &w, w.w_op);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_50
|
2016-09-21 13:50:22 +03:00
|
|
|
case NET_RT_OOIFLIST:
|
|
|
|
error = sysctl_iflist(af, &w, w.w_op);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_70
|
1999-11-19 13:41:41 +03:00
|
|
|
case NET_RT_OIFLIST:
|
|
|
|
error = sysctl_iflist(af, &w, w.w_op);
|
|
|
|
break;
|
|
|
|
#endif
|
1994-05-13 10:02:48 +04:00
|
|
|
case NET_RT_IFLIST:
|
1999-11-19 13:41:41 +03:00
|
|
|
error = sysctl_iflist(af, &w, w.w_op);
|
2011-02-01 04:39:19 +03:00
|
|
|
break;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
splx(s);
|
1999-04-02 21:22:21 +04:00
|
|
|
|
|
|
|
/* check to see if we couldn't allocate memory with NOWAIT */
|
|
|
|
if (error == ENOBUFS && w.w_tmem == 0 && w.w_tmemneeded)
|
|
|
|
goto again;
|
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
if (w.w_tmem)
|
|
|
|
free(w.w_tmem, M_RTABLE);
|
1993-03-21 12:45:37 +03:00
|
|
|
w.w_needed += w.w_given;
|
1994-05-13 10:02:48 +04:00
|
|
|
if (where) {
|
2007-03-04 08:59:00 +03:00
|
|
|
*given = (char *)w.w_where - (char *)where;
|
1994-05-13 10:02:48 +04:00
|
|
|
if (*given < w.w_needed)
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return ENOMEM;
|
1994-05-13 10:02:48 +04:00
|
|
|
} else {
|
|
|
|
*given = (11 * w.w_needed) / 10;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
Take steps to hide the radix_node implementation of the forwarding table
from the forwarding table's users:
Introduce rt_walktree() for walking the routing table and
applying a function to each rtentry. Replace most
rn_walktree() calls with it.
Use rt_getkey()/rt_setkey() to get/set a route's destination.
Keep a pointer to the sockaddr key in the rtentry, so that
rtentry users do not have to grovel in the radix_node for
the key.
Add a RTM_GET method to rtrequest. Use that instead of
radix_node lookups in, e.g., carp(4).
Add sys/net/link_proto.c, which supplies sockaddr routines for
link-layer socket addresses (sockaddr_dl).
Cosmetic:
Constify. KNF. Stop open-coding LIST_FOREACH, TAILQ_FOREACH,
et cetera. Use NULL instead of 0 for null pointers. Use
__arraycount(). Reduce gratuitous parenthesization.
Stop using variadic arguments for rip6_output(), it is
unnecessary.
Remove the unnecessary rtentry member rt_genmask and the
code to maintain it, since nothing actually used it.
Make rt_maskedcopy() easier to read by using meaningful variable
names.
Extract a subroutine intern_netmask() for looking up a netmask in
the masks table.
Start converting backslash-ridden IPv6 macros in
sys/netinet6/in6_var.h into inline subroutines that one
can read without special eyeglasses.
One functional change: when the kernel serves an RTM_GET, RTM_LOCK,
or RTM_CHANGE request, it applies the netmask (if supplied) to a
destination before searching for it in the forwarding table.
I have changed sys/netinet/ip_carp.c, carp_setroute(), to remove
the unlawful radix_node knowledge.
Apart from the changes to carp(4), netiso, ATM, and strip(4), I
have run the changes on three nodes in my wireless routing testbed,
which involves IPv4 + IPv6 dynamic routing acrobatics, and it's
working beautifully so far.
2007-07-20 00:48:52 +04:00
|
|
|
return error;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
2008-03-26 17:53:14 +03:00
|
|
|
/*
|
|
|
|
* Routing message software interrupt routine
|
|
|
|
*/
|
|
|
|
static void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_intr)(void *cookie)
|
2008-03-26 17:53:14 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct sockproto proto = { .sp_family = PF_XROUTE, };
|
|
|
|
struct route_info * const ri = &COMPATNAME(route_info);
|
2008-03-26 17:53:14 +03:00
|
|
|
struct mbuf *m;
|
|
|
|
|
2008-04-24 15:38:36 +04:00
|
|
|
mutex_enter(softnet_lock);
|
|
|
|
KERNEL_LOCK(1, NULL);
|
2016-10-03 14:06:06 +03:00
|
|
|
for (;;) {
|
|
|
|
IFQ_LOCK(&ri->ri_intrq);
|
2011-02-01 04:39:19 +03:00
|
|
|
IF_DEQUEUE(&ri->ri_intrq, m);
|
2016-10-03 14:06:06 +03:00
|
|
|
IFQ_UNLOCK(&ri->ri_intrq);
|
2008-03-26 17:53:14 +03:00
|
|
|
if (m == NULL)
|
|
|
|
break;
|
2008-03-29 16:00:43 +03:00
|
|
|
proto.sp_protocol = M_GETCTX(m, uintptr_t);
|
2011-02-01 04:39:19 +03:00
|
|
|
raw_input(m, &proto, &ri->ri_src, &ri->ri_dst);
|
2008-03-26 17:53:14 +03:00
|
|
|
}
|
2008-04-24 15:38:36 +04:00
|
|
|
KERNEL_UNLOCK_ONE(NULL);
|
|
|
|
mutex_exit(softnet_lock);
|
2008-03-26 17:53:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Enqueue a message to the software interrupt routine.
|
|
|
|
*/
|
2009-01-11 05:45:45 +03:00
|
|
|
void
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_enqueue)(struct mbuf *m, int family)
|
2008-03-26 17:53:14 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct route_info * const ri = &COMPATNAME(route_info);
|
2016-10-03 14:06:06 +03:00
|
|
|
int wasempty;
|
2008-03-26 17:53:14 +03:00
|
|
|
|
2016-10-03 14:06:06 +03:00
|
|
|
IFQ_LOCK(&ri->ri_intrq);
|
2011-02-01 04:39:19 +03:00
|
|
|
if (IF_QFULL(&ri->ri_intrq)) {
|
|
|
|
IF_DROP(&ri->ri_intrq);
|
2016-10-03 14:06:06 +03:00
|
|
|
IFQ_UNLOCK(&ri->ri_intrq);
|
2008-03-26 17:53:14 +03:00
|
|
|
m_freem(m);
|
|
|
|
} else {
|
2011-02-01 04:39:19 +03:00
|
|
|
wasempty = IF_IS_EMPTY(&ri->ri_intrq);
|
2008-03-26 17:53:14 +03:00
|
|
|
M_SETCTX(m, (uintptr_t)family);
|
2011-02-01 04:39:19 +03:00
|
|
|
IF_ENQUEUE(&ri->ri_intrq, m);
|
2016-10-03 14:06:06 +03:00
|
|
|
IFQ_UNLOCK(&ri->ri_intrq);
|
|
|
|
if (wasempty) {
|
|
|
|
kpreempt_disable();
|
2011-02-01 04:39:19 +03:00
|
|
|
softint_schedule(ri->ri_sih);
|
2016-10-03 14:06:06 +03:00
|
|
|
kpreempt_enable();
|
|
|
|
}
|
2008-03-26 17:53:14 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
static void
|
|
|
|
COMPATNAME(route_init)(void)
|
2008-03-26 17:53:14 +03:00
|
|
|
{
|
2011-02-01 04:39:19 +03:00
|
|
|
struct route_info * const ri = &COMPATNAME(route_info);
|
|
|
|
|
|
|
|
#ifndef COMPAT_RTSOCK
|
|
|
|
rt_init();
|
|
|
|
#endif
|
2008-03-26 17:53:14 +03:00
|
|
|
|
2009-09-16 19:23:04 +04:00
|
|
|
sysctl_net_route_setup(NULL);
|
2011-02-01 04:39:19 +03:00
|
|
|
ri->ri_intrq.ifq_maxlen = ri->ri_maxqlen;
|
|
|
|
ri->ri_sih = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
|
|
|
|
COMPATNAME(route_intr), NULL);
|
2016-10-03 14:06:06 +03:00
|
|
|
IFQ_LOCK_INIT(&ri->ri_intrq);
|
2008-03-26 17:53:14 +03:00
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
|
|
|
* Definitions of protocols supported in the ROUTE domain.
|
|
|
|
*/
|
2011-02-01 04:39:19 +03:00
|
|
|
#ifndef COMPAT_RTSOCK
|
2014-05-20 23:04:00 +04:00
|
|
|
PR_WRAP_USRREQS(route);
|
2011-02-01 04:39:19 +03:00
|
|
|
#else
|
2014-05-20 23:04:00 +04:00
|
|
|
PR_WRAP_USRREQS(compat_50_route);
|
2011-02-01 04:39:19 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2014-05-18 18:46:15 +04:00
|
|
|
static const struct pr_usrreqs route_usrreqs = {
|
2014-05-20 23:04:00 +04:00
|
|
|
.pr_attach = COMPATNAME(route_attach_wrapper),
|
|
|
|
.pr_detach = COMPATNAME(route_detach_wrapper),
|
2014-07-09 18:41:42 +04:00
|
|
|
.pr_accept = COMPATNAME(route_accept_wrapper),
|
2014-07-24 19:12:03 +04:00
|
|
|
.pr_bind = COMPATNAME(route_bind_wrapper),
|
|
|
|
.pr_listen = COMPATNAME(route_listen_wrapper),
|
2014-07-30 14:04:25 +04:00
|
|
|
.pr_connect = COMPATNAME(route_connect_wrapper),
|
2014-08-09 09:33:00 +04:00
|
|
|
.pr_connect2 = COMPATNAME(route_connect2_wrapper),
|
split PRU_DISCONNECT, PRU_SHUTDOWN and PRU_ABORT function out of
pr_generic() usrreq switches and put into separate functions
xxx_disconnect(struct socket *)
xxx_shutdown(struct socket *)
xxx_abort(struct socket *)
- always KASSERT(solocked(so)) even if not implemented
- replace calls to pr_generic() with req =
PRU_{DISCONNECT,SHUTDOWN,ABORT}
with calls to pr_{disconnect,shutdown,abort}() respectively
rename existing internal functions used to implement above functionality
to permit use of the names for xxx_{disconnect,shutdown,abort}().
- {l2cap,sco,rfcomm}_disconnect() ->
{l2cap,sco,rfcomm}_disconnect_pcb()
- {unp,rip,tcp}_disconnect() -> {unp,rip,tcp}_disconnect1()
- unp_shutdown() -> unp_shutdown1()
patch reviewed by rmind
2014-07-31 07:39:35 +04:00
|
|
|
.pr_disconnect = COMPATNAME(route_disconnect_wrapper),
|
|
|
|
.pr_shutdown = COMPATNAME(route_shutdown_wrapper),
|
|
|
|
.pr_abort = COMPATNAME(route_abort_wrapper),
|
2014-06-22 12:10:18 +04:00
|
|
|
.pr_ioctl = COMPATNAME(route_ioctl_wrapper),
|
2014-07-06 07:33:33 +04:00
|
|
|
.pr_stat = COMPATNAME(route_stat_wrapper),
|
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
usrreq switches and put into separate functions
xxx_{peer,sock}addr(struct socket *, struct mbuf *).
- KASSERT(solocked(so)) always in new functions even if request
is not implemented
- KASSERT(pcb != NULL) and KASSERT(nam) if the request is
implemented and not for tcp.
* for tcp roll #ifdef KPROF and #ifdef DEBUG code from tcp_usrreq() into
easier to cut & paste functions tcp_debug_capture() and
tcp_debug_trace()
- functions provided by rmind
- remaining use of PRU_{PEER,SOCK}ADDR #define to be removed in a
future commit.
* rename netbt functions to permit consistency of pru function names
(as has been done with other requests already split out).
- l2cap_{peer,sock}addr() -> l2cap_{peer,sock}_addr_pcb()
- rfcomm_{peer,sock}addr() -> rfcomm_{peer,sock}_addr_pcb()
- sco_{peer,sock}addr() -> sco_{peer,sock}_addr_pcb()
* split/refactor do_sys_getsockname(lwp, fd, which, nam) into
two functions do_sys_get{peer,sock}name(fd, nam).
- move PRU_PEERADDR handling into do_sys_getpeername() from
do_sys_getsockname()
- have svr4_stream directly call do_sys_get{sock,peer}name()
respectively instead of providing `which' & fix a DPRINTF string
that incorrectly wrote "getpeername" when it meant "getsockname"
- fix sys_getpeername() and sys_getsockname() to call
do_sys_get{sock,peer}name() without `which' and `lwp' & adjust
comments
- bump kernel version for removal of lwp & which parameters from
do_sys_getsockname()
note: future cleanup to remove struct mbuf * abuse in
xxx_{peer,sock}name()
still to come, not done in this commit since it is easier to do post
split.
patch reviewed by rmind
welcome to 6.99.47
2014-07-09 08:54:03 +04:00
|
|
|
.pr_peeraddr = COMPATNAME(route_peeraddr_wrapper),
|
|
|
|
.pr_sockaddr = COMPATNAME(route_sockaddr_wrapper),
|
2014-08-08 07:05:44 +04:00
|
|
|
.pr_rcvd = COMPATNAME(route_rcvd_wrapper),
|
2014-07-23 17:17:18 +04:00
|
|
|
.pr_recvoob = COMPATNAME(route_recvoob_wrapper),
|
2014-08-05 11:55:31 +04:00
|
|
|
.pr_send = COMPATNAME(route_send_wrapper),
|
2014-07-23 17:17:18 +04:00
|
|
|
.pr_sendoob = COMPATNAME(route_sendoob_wrapper),
|
2014-08-09 09:33:00 +04:00
|
|
|
.pr_purgeif = COMPATNAME(route_purgeif_wrapper),
|
2014-05-18 18:46:15 +04:00
|
|
|
};
|
|
|
|
|
2016-01-21 18:41:29 +03:00
|
|
|
static const struct protosw COMPATNAME(route_protosw)[] = {
|
2007-02-19 01:46:32 +03:00
|
|
|
{
|
|
|
|
.pr_type = SOCK_RAW,
|
2011-02-01 04:39:19 +03:00
|
|
|
.pr_domain = &COMPATNAME(routedomain),
|
2007-02-19 01:46:32 +03:00
|
|
|
.pr_flags = PR_ATOMIC|PR_ADDR,
|
|
|
|
.pr_input = raw_input,
|
|
|
|
.pr_ctlinput = raw_ctlinput,
|
2014-05-18 18:46:15 +04:00
|
|
|
.pr_usrreqs = &route_usrreqs,
|
2007-02-19 01:46:32 +03:00
|
|
|
.pr_init = raw_init,
|
|
|
|
},
|
|
|
|
};
|
2004-04-22 01:03:43 +04:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
struct domain COMPATNAME(routedomain) = {
|
|
|
|
.dom_family = PF_XROUTE,
|
|
|
|
.dom_name = DOMAINNAME,
|
|
|
|
.dom_init = COMPATNAME(route_init),
|
|
|
|
.dom_protosw = COMPATNAME(route_protosw),
|
2016-01-21 18:41:29 +03:00
|
|
|
.dom_protoswNPROTOSW =
|
|
|
|
&COMPATNAME(route_protosw)[__arraycount(COMPATNAME(route_protosw))],
|
1993-03-21 12:45:37 +03:00
|
|
|
};
|
|
|
|
|
2009-09-16 19:23:04 +04:00
|
|
|
static void
|
|
|
|
sysctl_net_route_setup(struct sysctllog **clog)
|
Dynamic sysctl.
Gone are the old kern_sysctl(), cpu_sysctl(), hw_sysctl(),
vfs_sysctl(), etc, routines, along with sysctl_int() et al. Now all
nodes are registered with the tree, and nodes can be added (or
removed) easily, and I/O to and from the tree is handled generically.
Since the nodes are registered with the tree, the mapping from name to
number (and back again) can now be discovered, instead of having to be
hard coded. Adding new nodes to the tree is likewise much simpler --
the new infrastructure handles almost all the work for simple types,
and just about anything else can be done with a small helper function.
All existing nodes are where they were before (numerically speaking),
so all existing consumers of sysctl information should notice no
difference.
PS - I'm sorry, but there's a distinct lack of documentation at the
moment. I'm working on sysctl(3/8/9) right now, and I promise to
watch out for buses.
2003-12-04 22:38:21 +03:00
|
|
|
{
|
2006-05-28 03:08:11 +04:00
|
|
|
const struct sysctlnode *rnode = NULL;
|
|
|
|
|
|
|
|
sysctl_createv(clog, 0, NULL, &rnode,
|
2004-03-24 18:34:46 +03:00
|
|
|
CTLFLAG_PERMANENT,
|
2011-02-01 04:39:19 +03:00
|
|
|
CTLTYPE_NODE, DOMAINNAME,
|
2004-05-25 08:33:59 +04:00
|
|
|
SYSCTL_DESCR("PF_ROUTE information"),
|
Dynamic sysctl.
Gone are the old kern_sysctl(), cpu_sysctl(), hw_sysctl(),
vfs_sysctl(), etc, routines, along with sysctl_int() et al. Now all
nodes are registered with the tree, and nodes can be added (or
removed) easily, and I/O to and from the tree is handled generically.
Since the nodes are registered with the tree, the mapping from name to
number (and back again) can now be discovered, instead of having to be
hard coded. Adding new nodes to the tree is likewise much simpler --
the new infrastructure handles almost all the work for simple types,
and just about anything else can be done with a small helper function.
All existing nodes are where they were before (numerically speaking),
so all existing consumers of sysctl information should notice no
difference.
PS - I'm sorry, but there's a distinct lack of documentation at the
moment. I'm working on sysctl(3/8/9) right now, and I promise to
watch out for buses.
2003-12-04 22:38:21 +03:00
|
|
|
NULL, 0, NULL, 0,
|
2011-02-01 04:39:19 +03:00
|
|
|
CTL_NET, PF_XROUTE, CTL_EOL);
|
|
|
|
|
2004-03-24 18:34:46 +03:00
|
|
|
sysctl_createv(clog, 0, NULL, NULL,
|
|
|
|
CTLFLAG_PERMANENT,
|
2004-05-25 08:33:59 +04:00
|
|
|
CTLTYPE_NODE, "rtable",
|
|
|
|
SYSCTL_DESCR("Routing table information"),
|
Dynamic sysctl.
Gone are the old kern_sysctl(), cpu_sysctl(), hw_sysctl(),
vfs_sysctl(), etc, routines, along with sysctl_int() et al. Now all
nodes are registered with the tree, and nodes can be added (or
removed) easily, and I/O to and from the tree is handled generically.
Since the nodes are registered with the tree, the mapping from name to
number (and back again) can now be discovered, instead of having to be
hard coded. Adding new nodes to the tree is likewise much simpler --
the new infrastructure handles almost all the work for simple types,
and just about anything else can be done with a small helper function.
All existing nodes are where they were before (numerically speaking),
so all existing consumers of sysctl information should notice no
difference.
PS - I'm sorry, but there's a distinct lack of documentation at the
moment. I'm working on sysctl(3/8/9) right now, and I promise to
watch out for buses.
2003-12-04 22:38:21 +03:00
|
|
|
sysctl_rtable, 0, NULL, 0,
|
2011-02-01 04:39:19 +03:00
|
|
|
CTL_NET, PF_XROUTE, 0 /* any protocol */, CTL_EOL);
|
|
|
|
|
2006-05-28 03:08:11 +04:00
|
|
|
sysctl_createv(clog, 0, &rnode, NULL,
|
|
|
|
CTLFLAG_PERMANENT,
|
|
|
|
CTLTYPE_STRUCT, "stats",
|
|
|
|
SYSCTL_DESCR("Routing statistics"),
|
|
|
|
NULL, 0, &rtstat, sizeof(rtstat),
|
|
|
|
CTL_CREATE, CTL_EOL);
|
Dynamic sysctl.
Gone are the old kern_sysctl(), cpu_sysctl(), hw_sysctl(),
vfs_sysctl(), etc, routines, along with sysctl_int() et al. Now all
nodes are registered with the tree, and nodes can be added (or
removed) easily, and I/O to and from the tree is handled generically.
Since the nodes are registered with the tree, the mapping from name to
number (and back again) can now be discovered, instead of having to be
hard coded. Adding new nodes to the tree is likewise much simpler --
the new infrastructure handles almost all the work for simple types,
and just about anything else can be done with a small helper function.
All existing nodes are where they were before (numerically speaking),
so all existing consumers of sysctl information should notice no
difference.
PS - I'm sorry, but there's a distinct lack of documentation at the
moment. I'm working on sysctl(3/8/9) right now, and I promise to
watch out for buses.
2003-12-04 22:38:21 +03:00
|
|
|
}
|