2012-01-31 00:02:55 +04:00
|
|
|
/* $NetBSD: rtsock.c,v 1.140 2012/01/30 20:02:55 christos 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>
|
2012-01-31 00:02:55 +04:00
|
|
|
__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.140 2012/01/30 20:02:55 christos 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"
|
|
|
|
#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>
|
1994-05-13 10:02:48 +04:00
|
|
|
#include <sys/mbuf.h>
|
1993-12-18 03:40:47 +03:00
|
|
|
#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>
|
2008-03-26 17:53:14 +03:00
|
|
|
#include <sys/intr.h>
|
2006-11-13 22:16:01 +03:00
|
|
|
#ifdef RTSOCK_DEBUG
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#endif /* RTSOCK_DEBUG */
|
1996-02-14 00:59:53 +03:00
|
|
|
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <net/if.h>
|
|
|
|
#include <net/route.h>
|
|
|
|
#include <net/raw_cb.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2010-06-26 18:24:27 +04:00
|
|
|
#include <netmpls/mpls.h>
|
|
|
|
|
2009-01-11 05:45:45 +03:00
|
|
|
#if defined(COMPAT_14) || defined(COMPAT_50)
|
|
|
|
#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
|
|
|
|
#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 */
|
|
|
|
#else
|
|
|
|
#define RTM_XVERSION RTM_VERSION
|
|
|
|
#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"
|
|
|
|
CTASSERT(sizeof(struct ifa_xmsghdr) == 24);
|
|
|
|
#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
|
2009-01-11 05:45:45 +03:00
|
|
|
#endif
|
|
|
|
|
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
|
|
|
|
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);
|
|
|
|
static int COMPATNAME(route_output)(struct mbuf *, ...);
|
|
|
|
static int COMPATNAME(route_usrreq)(struct socket *,
|
|
|
|
int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2009-01-11 05:45:45 +03:00
|
|
|
static int rt_msg2(int, struct rt_addrinfo *, void *, struct rt_walkarg *, int *);
|
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 *);
|
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
|
|
|
|
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
|
1998-12-10 18:52:39 +03:00
|
|
|
case AF_ISO:
|
2011-02-01 04:39:19 +03:00
|
|
|
cb->iso_count += cnt;
|
1998-12-10 18:52:39 +03:00
|
|
|
return;
|
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
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*ARGSUSED*/
|
1994-05-11 13:26:46 +04:00
|
|
|
int
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_usrreq)(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
|
2005-12-11 15:16:03 +03:00
|
|
|
struct mbuf *control, struct lwp *l)
|
1993-03-21 12:45:37 +03:00
|
|
|
{
|
2000-03-30 13:45:33 +04:00
|
|
|
int error = 0;
|
|
|
|
struct rawcb *rp = sotorawcb(so);
|
1993-03-21 12:45:37 +03:00
|
|
|
int s;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
if (req == PRU_ATTACH) {
|
2008-04-24 15:38:36 +04:00
|
|
|
sosetlock(so);
|
2008-12-17 23:51:31 +03:00
|
|
|
rp = malloc(sizeof(*rp), M_PCB, M_WAITOK|M_ZERO);
|
2008-06-16 00:36:55 +04:00
|
|
|
so->so_pcb = rp;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1998-12-10 18:52:39 +03:00
|
|
|
if (req == PRU_DETACH && rp)
|
|
|
|
rt_adjustcount(rp->rcb_proto.sp_protocol, -1);
|
1995-08-13 03:59:09 +04:00
|
|
|
s = splsoftnet();
|
1997-02-22 06:47:01 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't call raw_usrreq() in the attach case, because
|
|
|
|
* we want to allow non-privileged processes to listen on
|
|
|
|
* and send "safe" commands to the routing socket.
|
|
|
|
*/
|
|
|
|
if (req == PRU_ATTACH) {
|
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 (l == NULL)
|
1997-02-22 06:47:01 +03:00
|
|
|
error = EACCES;
|
|
|
|
else
|
|
|
|
error = raw_attach(so, (int)(long)nam);
|
|
|
|
} else
|
2005-12-11 15:16:03 +03:00
|
|
|
error = raw_usrreq(so, req, m, nam, control, l);
|
1997-02-22 06:47:01 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
rp = sotorawcb(so);
|
|
|
|
if (req == PRU_ATTACH && rp) {
|
|
|
|
if (error) {
|
2008-10-25 01:38:18 +04:00
|
|
|
free(rp, M_PCB);
|
1993-03-21 12:45:37 +03:00
|
|
|
splx(s);
|
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
|
|
|
}
|
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
|
|
|
soisconnected(so);
|
|
|
|
so->so_options |= SO_USELOOPBACK;
|
|
|
|
}
|
|
|
|
splx(s);
|
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
|
|
|
/*ARGSUSED*/
|
1994-05-11 13:26:46 +04:00
|
|
|
int
|
2011-02-01 04:39:19 +03:00
|
|
|
COMPATNAME(route_output)(struct mbuf *m, ...)
|
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;
|
|
|
|
struct rt_xmsghdr *old_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;
|
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 ifnet *ifp = NULL;
|
2009-03-11 12:26:27 +03:00
|
|
|
struct ifaddr *ifa = NULL;
|
1996-02-14 00:59:53 +03:00
|
|
|
struct socket *so;
|
|
|
|
va_list ap;
|
2002-02-22 20:26:31 +03:00
|
|
|
sa_family_t family;
|
1996-02-14 00:59:53 +03:00
|
|
|
|
|
|
|
va_start(ap, m);
|
|
|
|
so = va_arg(ap, struct socket *);
|
|
|
|
va_end(ap);
|
|
|
|
|
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)) &&
|
|
|
|
(m = m_pullup(m, sizeof(int32_t))) == NULL))
|
|
|
|
return ENOBUFS;
|
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) {
|
|
|
|
printf("%s: extracted info.rti_info[RTAX_DST] %s\n", __func__,
|
2008-10-28 14:41:23 +03:00
|
|
|
inet_ntoa(((const struct sockaddr_in *)
|
|
|
|
info.rti_info[RTAX_DST])->sin_addr));
|
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
|
|
|
}
|
2001-01-17 07:05:41 +03:00
|
|
|
error = rtrequest1(rtm->rtm_type, &info, &saved_nrt);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (error == 0 && saved_nrt) {
|
2011-02-01 04:39:19 +03:00
|
|
|
rt_setmetrics(rtm->rtm_inits, rtm, saved_nrt);
|
1993-03-21 12:45:37 +03:00
|
|
|
saved_nrt->rt_refcnt--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RTM_DELETE:
|
2001-01-17 07:05:41 +03:00
|
|
|
error = rtrequest1(rtm->rtm_type, &info, &saved_nrt);
|
1995-08-19 11:48:14 +04:00
|
|
|
if (error == 0) {
|
|
|
|
(rt = saved_nrt)->rt_refcnt++;
|
|
|
|
goto report;
|
|
|
|
}
|
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
|
|
|
|
*/
|
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
|
|
|
|
2003-05-02 07:15:23 +04:00
|
|
|
switch (rtm->rtm_type) {
|
1993-03-21 12:45:37 +03:00
|
|
|
case RTM_GET:
|
1995-08-19 11:48:14 +04:00
|
|
|
report:
|
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);
|
2006-11-13 22:16:01 +03:00
|
|
|
if ((rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) == 0)
|
|
|
|
;
|
|
|
|
else if ((ifp = rt->rt_ifp) != NULL) {
|
|
|
|
const struct ifaddr *rtifa;
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = 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;
|
2006-11-13 22:16:01 +03:00
|
|
|
#ifdef RTSOCK_DEBUG
|
2008-10-28 14:41:23 +03:00
|
|
|
if (info.rti_info[RTAX_IFA]->sa_family ==
|
|
|
|
AF_INET) {
|
2006-11-13 22:16:01 +03:00
|
|
|
printf("%s: copying out RTAX_IFA %s ",
|
2008-10-28 14:41:23 +03:00
|
|
|
__func__, inet_ntoa(
|
2009-09-12 22:09:25 +04:00
|
|
|
((const struct sockaddr_in *)
|
|
|
|
info.rti_info[RTAX_IFA])->sin_addr)
|
|
|
|
);
|
2008-10-28 14:41:23 +03:00
|
|
|
printf("for info.rti_info[RTAX_DST] %s "
|
|
|
|
"ifa_getifa %p ifa_seqno %p\n",
|
|
|
|
inet_ntoa(
|
2009-09-12 22:09:25 +04:00
|
|
|
((const struct sockaddr_in *)
|
2008-10-28 14:41:23 +03:00
|
|
|
info.rti_info[RTAX_DST])->sin_addr),
|
|
|
|
(void *)rtifa->ifa_getifa,
|
|
|
|
rtifa->ifa_seqno);
|
2000-03-10 17:47:12 +03:00
|
|
|
}
|
2006-11-13 22:16:01 +03:00
|
|
|
#endif /* RTSOCK_DEBUG */
|
2008-10-28 14:41:23 +03:00
|
|
|
if (ifp->if_flags & IFF_POINTOPOINT) {
|
|
|
|
info.rti_info[RTAX_BRD] =
|
|
|
|
rtifa->ifa_dstaddr;
|
|
|
|
} else
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_BRD] = NULL;
|
2006-11-13 22:16:01 +03:00
|
|
|
rtm->rtm_index = ifp->if_index;
|
|
|
|
} else {
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = NULL;
|
|
|
|
info.rti_info[RTAX_IFA] = NULL;
|
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
|
|
|
(void)rt_msg2(rtm->rtm_type, &info, NULL, NULL, &len);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (len > rtm->rtm_msglen) {
|
2008-12-13 01:34:58 +03:00
|
|
|
old_rtm = rtm;
|
2011-02-01 04:39:19 +03:00
|
|
|
R_Malloc(rtm, struct rt_xmsghdr *, len);
|
2008-12-13 01:34:58 +03:00
|
|
|
if (rtm == NULL)
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(ENOBUFS);
|
2008-12-13 01:34:58 +03:00
|
|
|
(void)memcpy(rtm, old_rtm, old_rtm->rtm_msglen);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2008-08-28 23:33:24 +04:00
|
|
|
(void)rt_msg2(rtm->rtm_type, &info, rtm, NULL, 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
rtm->rtm_flags = rt->rt_flags;
|
2011-02-01 04:39:19 +03:00
|
|
|
rtm_setmetrics(rt, rtm);
|
1994-05-13 10:02:48 +04:00
|
|
|
rtm->rtm_addrs = info.rti_addrs;
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case RTM_CHANGE:
|
2001-01-17 07:05:41 +03:00
|
|
|
/*
|
|
|
|
* new gateway could require new ifaddr, ifp;
|
|
|
|
* flags may also be different; ifp may be specified
|
|
|
|
* by ll sockaddr when protocol address is ambiguous
|
|
|
|
*/
|
|
|
|
if ((error = rt_getifa(&info)) != 0)
|
|
|
|
senderr(error);
|
2008-10-28 14:41:23 +03:00
|
|
|
if (info.rti_info[RTAX_GATEWAY] &&
|
|
|
|
rt_setgate(rt, info.rti_info[RTAX_GATEWAY]))
|
1993-03-21 12:45:37 +03:00
|
|
|
senderr(EDQUOT);
|
2010-06-26 18:24:27 +04:00
|
|
|
if (info.rti_info[RTAX_TAG])
|
|
|
|
rt_settag(rt, info.rti_info[RTAX_TAG]);
|
2000-02-17 07:28:00 +03:00
|
|
|
/* new gateway could require new ifaddr, ifp;
|
|
|
|
flags may also be different; ifp may be specified
|
|
|
|
by ll sockaddr when protocol address is ambiguous */
|
2008-10-28 14:41:23 +03:00
|
|
|
if (info.rti_info[RTAX_IFP] &&
|
|
|
|
(ifa = ifa_ifwithnet(info.rti_info[RTAX_IFP])) &&
|
|
|
|
(ifp = ifa->ifa_ifp) && (info.rti_info[RTAX_IFA] ||
|
|
|
|
info.rti_info[RTAX_GATEWAY])) {
|
2010-05-02 23:17:56 +04:00
|
|
|
if (info.rti_info[RTAX_IFA] == NULL ||
|
|
|
|
(ifa = ifa_ifwithaddr(
|
|
|
|
info.rti_info[RTAX_IFA])) == NULL)
|
|
|
|
ifa = ifaof_ifpforaddr(
|
|
|
|
info.rti_info[RTAX_IFA] ?
|
|
|
|
info.rti_info[RTAX_IFA] :
|
|
|
|
info.rti_info[RTAX_GATEWAY], ifp);
|
2008-10-28 14:41:23 +03:00
|
|
|
} else if ((info.rti_info[RTAX_IFA] &&
|
|
|
|
(ifa = ifa_ifwithaddr(info.rti_info[RTAX_IFA]))) ||
|
|
|
|
(info.rti_info[RTAX_GATEWAY] &&
|
|
|
|
(ifa = ifa_ifwithroute(rt->rt_flags,
|
|
|
|
rt_getkey(rt), info.rti_info[RTAX_GATEWAY])))) {
|
2000-02-17 07:28:00 +03:00
|
|
|
ifp = ifa->ifa_ifp;
|
2008-10-28 14:41:23 +03:00
|
|
|
}
|
2000-02-17 07:28:00 +03:00
|
|
|
if (ifa) {
|
2009-03-11 12:26:27 +03:00
|
|
|
struct ifaddr *oifa = rt->rt_ifa;
|
2000-02-17 07:28:00 +03:00
|
|
|
if (oifa != ifa) {
|
2006-11-13 08:13:38 +03:00
|
|
|
if (oifa && oifa->ifa_rtrequest) {
|
|
|
|
oifa->ifa_rtrequest(RTM_DELETE,
|
|
|
|
rt, &info);
|
|
|
|
}
|
|
|
|
rt_replace_ifa(rt, ifa);
|
|
|
|
rt->rt_ifp = ifp;
|
2000-02-17 07:28:00 +03:00
|
|
|
}
|
|
|
|
}
|
2010-06-28 21:26:11 +04:00
|
|
|
if (ifp && rt->rt_ifp != ifp)
|
|
|
|
rt->rt_ifp = ifp;
|
2011-02-01 04:39:19 +03:00
|
|
|
rt_setmetrics(rtm->rtm_inits, rtm, rt);
|
2011-02-10 10:42:18 +03:00
|
|
|
if (rt->rt_flags != info.rti_flags)
|
|
|
|
rt->rt_flags = (info.rti_flags & ~PRESERVED_RTF)
|
|
|
|
| (rt->rt_flags & PRESERVED_RTF);
|
2000-02-17 07:28:00 +03:00
|
|
|
if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
|
2001-01-17 07:05:41 +03:00
|
|
|
rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, &info);
|
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);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (rt)
|
|
|
|
rtfree(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
|
|
|
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);
|
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
|
|
|
}
|
|
|
|
/* 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
|
|
|
}
|
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);
|
|
|
|
metric(RTV_EXPIRE, rmx_expire);
|
|
|
|
#undef metric
|
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
metric(rmx_expire);
|
|
|
|
#undef metric
|
|
|
|
}
|
|
|
|
|
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 &
|
|
|
|
(~((1 << RTAX_IFP) | (1 << RTAX_IFA)))) & (~0 << 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;
|
2008-10-28 05:03:06 +03:00
|
|
|
} else if ((rtinfo->rti_addrs & (~0 << i)) != 0)
|
|
|
|
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) {
|
|
|
|
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
|
|
|
}
|
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
|
|
|
m->m_pkthdr.rcvif = NULL;
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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));
|
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
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
ifp = ifa->ifa_ifp;
|
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:
|
|
|
|
ncmd = RTM_NEWADDR;
|
|
|
|
break;
|
2010-11-12 19:30:26 +03:00
|
|
|
case RTM_DELETE:
|
*** 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
|
|
|
ncmd = RTM_DELADDR;
|
2010-11-12 19:30:26 +03:00
|
|
|
break;
|
|
|
|
case RTM_CHANGE:
|
|
|
|
ncmd = RTM_CHGADDR;
|
|
|
|
break;
|
|
|
|
default:
|
2011-12-12 04:06:39 +04:00
|
|
|
ncmd = cmd;
|
2010-11-12 19:30:26 +03:00
|
|
|
}
|
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;
|
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));
|
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
|
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);
|
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
|
|
|
|
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;
|
|
|
|
int len, error = 0;
|
|
|
|
|
2001-07-18 20:43:09 +04:00
|
|
|
memset(&info, 0, sizeof(info));
|
2005-01-25 00:25:09 +03:00
|
|
|
IFNET_FOREACH(ifp) {
|
1994-05-13 10:02:48 +04:00
|
|
|
if (w->w_arg && w->w_arg != ifp->if_index)
|
|
|
|
continue;
|
2007-12-20 22:53:29 +03:00
|
|
|
if (IFADDR_EMPTY(ifp))
|
2006-02-22 01:01:17 +03:00
|
|
|
continue;
|
2008-10-28 05:03:06 +03:00
|
|
|
info.rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
|
2003-05-02 07:15:23 +04:00
|
|
|
switch (type) {
|
1999-11-19 13:41:41 +03:00
|
|
|
case NET_RT_IFLIST:
|
2008-08-28 23:33:24 +04:00
|
|
|
error = rt_msg2(RTM_IFINFO, &info, NULL, w, &len);
|
1999-11-19 13:41:41 +03:00
|
|
|
break;
|
|
|
|
#ifdef COMPAT_14
|
2009-01-11 05:45:45 +03:00
|
|
|
case NET_RT_OOIFLIST:
|
|
|
|
error = rt_msg2(RTM_OOIFINFO, &info, NULL, w, &len);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_50
|
1999-11-19 13:41:41 +03:00
|
|
|
case NET_RT_OIFLIST:
|
2008-08-28 23:33:24 +04:00
|
|
|
error = rt_msg2(RTM_OIFINFO, &info, NULL, w, &len);
|
1999-11-19 13:41:41 +03:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
panic("sysctl_iflist(1)");
|
|
|
|
}
|
|
|
|
if (error)
|
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;
|
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) {
|
2003-05-02 07:15:23 +04:00
|
|
|
switch (type) {
|
1999-11-19 13:41:41 +03:00
|
|
|
case NET_RT_IFLIST: {
|
2011-02-01 04:39:19 +03:00
|
|
|
struct if_xmsghdr *ifm;
|
1999-11-19 13:41:41 +03:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
ifm = (struct if_xmsghdr *)w->w_tmem;
|
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 = info.rti_addrs;
|
|
|
|
error = copyout(ifm, w->w_where, len);
|
|
|
|
if (error)
|
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;
|
2007-03-04 08:59:00 +03:00
|
|
|
w->w_where = (char *)w->w_where + len;
|
1999-11-19 13:41:41 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef COMPAT_14
|
2009-01-11 05:45:45 +03:00
|
|
|
case NET_RT_OOIFLIST:
|
|
|
|
error = compat_14_iflist(ifp, w, &info, len);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_50
|
|
|
|
case NET_RT_OIFLIST:
|
|
|
|
error = compat_50_iflist(ifp, w, &info, len);
|
1999-11-19 13:41:41 +03:00
|
|
|
if (error)
|
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-11-19 13:41:41 +03:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
panic("sysctl_iflist(2)");
|
|
|
|
}
|
1994-05-13 10:02:48 +04:00
|
|
|
}
|
2007-12-20 22:53:29 +03:00
|
|
|
IFADDR_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;
|
1999-04-02 21:22:21 +04:00
|
|
|
if ((error = rt_msg2(RTM_NEWADDR, &info, 0, w, &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 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 ifa_xmsghdr *ifam;
|
1994-05-13 10:02:48 +04:00
|
|
|
|
2011-02-01 04:39:19 +03:00
|
|
|
ifam = (struct ifa_xmsghdr *)w->w_tmem;
|
1994-05-13 10:02:48 +04:00
|
|
|
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;
|
1996-02-14 00:59:53 +03:00
|
|
|
error = copyout(w->w_tmem, w->w_where, len);
|
|
|
|
if (error)
|
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;
|
2007-03-04 08:59:00 +03:00
|
|
|
w->w_where = (char *)w->w_where + len;
|
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;
|
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 0;
|
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;
|
|
|
|
const void *new = newp;
|
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
|
|
|
|
1994-05-13 10:02:48 +04:00
|
|
|
if (new)
|
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:
|
|
|
|
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
|
2009-01-11 05:45:45 +03:00
|
|
|
case NET_RT_OOIFLIST:
|
|
|
|
error = sysctl_iflist(af, &w, w.w_op);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef COMPAT_50
|
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;
|
|
|
|
int s;
|
|
|
|
|
2008-04-24 15:38:36 +04:00
|
|
|
mutex_enter(softnet_lock);
|
|
|
|
KERNEL_LOCK(1, NULL);
|
2011-02-01 04:39:19 +03:00
|
|
|
while (!IF_IS_EMPTY(&ri->ri_intrq)) {
|
2008-03-26 17:53:14 +03:00
|
|
|
s = splnet();
|
2011-02-01 04:39:19 +03:00
|
|
|
IF_DEQUEUE(&ri->ri_intrq, m);
|
2008-03-26 17:53:14 +03:00
|
|
|
splx(s);
|
|
|
|
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);
|
2008-03-26 17:53:14 +03:00
|
|
|
int s, wasempty;
|
|
|
|
|
|
|
|
s = splnet();
|
2011-02-01 04:39:19 +03:00
|
|
|
if (IF_QFULL(&ri->ri_intrq)) {
|
|
|
|
IF_DROP(&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);
|
2008-03-26 17:53:14 +03:00
|
|
|
if (wasempty)
|
2011-02-01 04:39:19 +03:00
|
|
|
softint_schedule(ri->ri_sih);
|
2008-03-26 17:53:14 +03:00
|
|
|
}
|
|
|
|
splx(s);
|
|
|
|
}
|
|
|
|
|
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);
|
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
|
|
|
|
PR_WRAP_USRREQ(route_usrreq);
|
|
|
|
#else
|
|
|
|
PR_WRAP_USRREQ(compat_50_route_usrreq);
|
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2011-02-01 04:39:19 +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,
|
2011-02-01 04:39:19 +03:00
|
|
|
.pr_output = COMPATNAME(route_output),
|
2007-02-19 01:46:32 +03:00
|
|
|
.pr_ctlinput = raw_ctlinput,
|
2011-02-01 04:39:19 +03:00
|
|
|
.pr_usrreq = COMPATNAME(route_usrreq_wrapper),
|
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),
|
|
|
|
.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;
|
|
|
|
|
2004-03-24 18:34:46 +03:00
|
|
|
sysctl_createv(clog, 0, NULL, NULL,
|
|
|
|
CTLFLAG_PERMANENT,
|
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
|
|
|
CTLTYPE_NODE, "net", NULL,
|
|
|
|
NULL, 0, NULL, 0,
|
|
|
|
CTL_NET, CTL_EOL);
|
|
|
|
|
2006-05-28 03:08:11 +04:00
|
|
|
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
|
|
|
}
|