2005-01-07 01:45:51 +00:00
|
|
|
/*-
|
1994-05-24 10:09:53 +00:00
|
|
|
* Copyright (c) 1982, 1986, 1988, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
|
|
|
|
*/
|
|
|
|
|
2007-10-07 20:44:24 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2004-07-08 22:35:36 +00:00
|
|
|
#include "opt_bootp.h"
|
1996-06-12 19:34:33 +00:00
|
|
|
#include "opt_ipfw.h"
|
1999-08-29 12:18:39 +00:00
|
|
|
#include "opt_ipstealth.h"
|
1999-12-22 19:13:38 +00:00
|
|
|
#include "opt_ipsec.h"
|
2009-02-27 14:12:05 +00:00
|
|
|
#include "opt_route.h"
|
2014-09-09 04:18:20 +00:00
|
|
|
#include "opt_rss.h"
|
1996-06-12 19:34:33 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
2015-11-25 07:31:59 +00:00
|
|
|
#include <sys/hhook.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/mbuf.h>
|
1998-12-14 18:09:13 +00:00
|
|
|
#include <sys/malloc.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/domain.h>
|
|
|
|
#include <sys/protosw.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/kernel.h>
|
Conditionally compile out V_ globals while instantiating the appropriate
container structures, depending on VIMAGE_GLOBALS compile time option.
Make VIMAGE_GLOBALS a new compile-time option, which by default will not
be defined, resulting in instatiations of global variables selected for
V_irtualization (enclosed in #ifdef VIMAGE_GLOBALS blocks) to be
effectively compiled out. Instantiate new global container structures
to hold V_irtualized variables: vnet_net_0, vnet_inet_0, vnet_inet6_0,
vnet_ipsec_0, vnet_netgraph_0, and vnet_gif_0.
Update the VSYM() macro so that depending on VIMAGE_GLOBALS the V_
macros resolve either to the original globals, or to fields inside
container structures, i.e. effectively
#ifdef VIMAGE_GLOBALS
#define V_rt_tables rt_tables
#else
#define V_rt_tables vnet_net_0._rt_tables
#endif
Update SYSCTL_V_*() macros to operate either on globals or on fields
inside container structs.
Extend the internal kldsym() lookups with the ability to resolve
selected fields inside the virtualization container structs. This
applies only to the fields which are explicitly registered for kldsym()
visibility via VNET_MOD_DECLARE() and vnet_mod_register(), currently
this is done only in sys/net/if.c.
Fix a few broken instances of MODULE_GLOBAL() macro use in SCTP code,
and modify the MODULE_GLOBAL() macro to resolve to V_ macros, which in
turn result in proper code being generated depending on VIMAGE_GLOBALS.
De-virtualize local static variables in sys/contrib/pf/net/pf_subr.c
which were prematurely V_irtualized by automated V_ prepending scripts
during earlier merging steps. PF virtualization will be done
separately, most probably after next PF import.
Convert a few variable initializations at instantiation to
initialization in init functions, most notably in ipfw. Also convert
TUNABLE_INT() initializers for V_ variables to TUNABLE_FETCH_INT() in
initializer functions.
Discussed at: devsummit Strassburg
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-12-10 23:12:39 +00:00
|
|
|
#include <sys/lock.h>
|
2015-07-29 08:12:05 +00:00
|
|
|
#include <sys/rmlock.h>
|
Conditionally compile out V_ globals while instantiating the appropriate
container structures, depending on VIMAGE_GLOBALS compile time option.
Make VIMAGE_GLOBALS a new compile-time option, which by default will not
be defined, resulting in instatiations of global variables selected for
V_irtualization (enclosed in #ifdef VIMAGE_GLOBALS blocks) to be
effectively compiled out. Instantiate new global container structures
to hold V_irtualized variables: vnet_net_0, vnet_inet_0, vnet_inet6_0,
vnet_ipsec_0, vnet_netgraph_0, and vnet_gif_0.
Update the VSYM() macro so that depending on VIMAGE_GLOBALS the V_
macros resolve either to the original globals, or to fields inside
container structures, i.e. effectively
#ifdef VIMAGE_GLOBALS
#define V_rt_tables rt_tables
#else
#define V_rt_tables vnet_net_0._rt_tables
#endif
Update SYSCTL_V_*() macros to operate either on globals or on fields
inside container structs.
Extend the internal kldsym() lookups with the ability to resolve
selected fields inside the virtualization container structs. This
applies only to the fields which are explicitly registered for kldsym()
visibility via VNET_MOD_DECLARE() and vnet_mod_register(), currently
this is done only in sys/net/if.c.
Fix a few broken instances of MODULE_GLOBAL() macro use in SCTP code,
and modify the MODULE_GLOBAL() macro to resolve to V_ macros, which in
turn result in proper code being generated depending on VIMAGE_GLOBALS.
De-virtualize local static variables in sys/contrib/pf/net/pf_subr.c
which were prematurely V_irtualized by automated V_ prepending scripts
during earlier merging steps. PF virtualization will be done
separately, most probably after next PF import.
Convert a few variable initializations at instantiation to
initialization in init functions, most notably in ipfw. Also convert
TUNABLE_INT() initializers for V_ variables to TUNABLE_FETCH_INT() in
initializer functions.
Discussed at: devsummit Strassburg
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-12-10 23:12:39 +00:00
|
|
|
#include <sys/rwlock.h>
|
2013-08-25 21:54:41 +00:00
|
|
|
#include <sys/sdt.h>
|
1995-03-16 18:22:28 +00:00
|
|
|
#include <sys/syslog.h>
|
1995-03-16 18:17:34 +00:00
|
|
|
#include <sys/sysctl.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2000-07-31 23:41:47 +00:00
|
|
|
#include <net/pfil.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <net/if.h>
|
2001-09-25 18:40:52 +00:00
|
|
|
#include <net/if_types.h>
|
1997-11-05 02:51:32 +00:00
|
|
|
#include <net/if_var.h>
|
1996-11-11 04:56:32 +00:00
|
|
|
#include <net/if_dl.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <net/route.h>
|
1995-05-11 00:13:26 +00:00
|
|
|
#include <net/netisr.h>
|
2015-01-18 18:06:40 +00:00
|
|
|
#include <net/rss_config.h>
|
2008-12-02 21:37:28 +00:00
|
|
|
#include <net/vnet.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
#include <netinet/in.h>
|
2013-08-25 21:54:41 +00:00
|
|
|
#include <netinet/in_kdtrace.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <netinet/in_systm.h>
|
1995-03-16 18:17:34 +00:00
|
|
|
#include <netinet/in_var.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <netinet/ip.h>
|
|
|
|
#include <netinet/in_pcb.h>
|
|
|
|
#include <netinet/ip_var.h>
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
#include <netinet/ip_fw.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <netinet/ip_icmp.h>
|
2005-11-18 20:12:40 +00:00
|
|
|
#include <netinet/ip_options.h>
|
1996-10-07 19:21:46 +00:00
|
|
|
#include <machine/in_cksum.h>
|
2005-02-22 13:04:05 +00:00
|
|
|
#include <netinet/ip_carp.h>
|
2007-07-03 12:13:45 +00:00
|
|
|
#ifdef IPSEC
|
2006-02-01 13:55:03 +00:00
|
|
|
#include <netinet/ip_ipsec.h>
|
2015-11-05 07:26:32 +00:00
|
|
|
#include <netipsec/ipsec.h>
|
|
|
|
#include <netipsec/key.h>
|
2007-07-03 12:13:45 +00:00
|
|
|
#endif /* IPSEC */
|
2014-09-09 04:18:20 +00:00
|
|
|
#include <netinet/in_rss.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
#include <sys/socketvar.h>
|
1996-05-08 04:29:08 +00:00
|
|
|
|
2006-10-22 11:52:19 +00:00
|
|
|
#include <security/mac/mac_framework.h>
|
|
|
|
|
2008-09-26 18:30:11 +00:00
|
|
|
#ifdef CTASSERT
|
|
|
|
CTASSERT(sizeof(struct ip) == 20);
|
|
|
|
#endif
|
|
|
|
|
2015-04-10 06:02:37 +00:00
|
|
|
/* IP reassembly functions are defined in ip_reass.c. */
|
2015-04-11 01:06:59 +00:00
|
|
|
extern void ipreass_init(void);
|
|
|
|
extern void ipreass_drain(void);
|
|
|
|
extern void ipreass_slowtimo(void);
|
2015-04-10 06:02:37 +00:00
|
|
|
#ifdef VIMAGE
|
2015-04-11 01:06:59 +00:00
|
|
|
extern void ipreass_destroy(void);
|
2015-04-10 06:02:37 +00:00
|
|
|
#endif
|
|
|
|
|
2015-07-29 08:12:05 +00:00
|
|
|
struct rmlock in_ifaddr_lock;
|
|
|
|
RM_SYSINIT(in_ifaddr_lock, &in_ifaddr_lock, "in_ifaddr_lock");
|
1994-09-06 22:42:31 +00:00
|
|
|
|
2010-04-29 11:52:42 +00:00
|
|
|
VNET_DEFINE(int, rsvp_on);
|
|
|
|
|
|
|
|
VNET_DEFINE(int, ipforwarding);
|
2014-11-07 09:39:05 +00:00
|
|
|
SYSCTL_INT(_net_inet_ip, IPCTL_FORWARDING, forwarding, CTLFLAG_VNET | CTLFLAG_RW,
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
&VNET_NAME(ipforwarding), 0,
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
"Enable IP forwarding between interfaces");
|
1995-11-14 20:34:56 +00:00
|
|
|
|
2010-11-22 19:32:54 +00:00
|
|
|
static VNET_DEFINE(int, ipsendredirects) = 1; /* XXX */
|
2010-04-29 11:52:42 +00:00
|
|
|
#define V_ipsendredirects VNET(ipsendredirects)
|
2014-11-07 09:39:05 +00:00
|
|
|
SYSCTL_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_VNET | CTLFLAG_RW,
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
&VNET_NAME(ipsendredirects), 0,
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
"Enable sending IP redirects");
|
1995-11-14 20:34:56 +00:00
|
|
|
|
2001-03-04 01:39:19 +00:00
|
|
|
/*
|
|
|
|
* XXX - Setting ip_checkinterface mostly implements the receive side of
|
|
|
|
* the Strong ES model described in RFC 1122, but since the routing table
|
2001-03-05 22:40:27 +00:00
|
|
|
* and transmit implementation do not implement the Strong ES model,
|
2001-03-04 01:39:19 +00:00
|
|
|
* setting this to 1 results in an odd hybrid.
|
2001-03-05 08:45:05 +00:00
|
|
|
*
|
2001-03-05 22:40:27 +00:00
|
|
|
* XXX - ip_checkinterface currently must be disabled if you use ipnat
|
|
|
|
* to translate the destination address to another local interface.
|
2001-03-05 08:45:05 +00:00
|
|
|
*
|
|
|
|
* XXX - ip_checkinterface must be disabled if you add IP aliases
|
|
|
|
* to the loopback interface instead of the interface where the
|
|
|
|
* packets for those addresses are received.
|
2001-03-04 01:39:19 +00:00
|
|
|
*/
|
2010-11-22 19:32:54 +00:00
|
|
|
static VNET_DEFINE(int, ip_checkinterface);
|
2010-04-29 11:52:42 +00:00
|
|
|
#define V_ip_checkinterface VNET(ip_checkinterface)
|
2014-11-07 09:39:05 +00:00
|
|
|
SYSCTL_INT(_net_inet_ip, OID_AUTO, check_interface, CTLFLAG_VNET | CTLFLAG_RW,
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
&VNET_NAME(ip_checkinterface), 0,
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
"Verify packet arrives on correct interface");
|
2001-03-02 20:54:03 +00:00
|
|
|
|
2009-10-11 05:59:43 +00:00
|
|
|
VNET_DEFINE(struct pfil_head, inet_pfil_hook); /* Packet filter hooks */
|
1994-05-24 10:09:53 +00:00
|
|
|
|
Reimplement the netisr framework in order to support parallel netisr
threads:
- Support up to one netisr thread per CPU, each processings its own
workstream, or set of per-protocol queues. Threads may be bound
to specific CPUs, or allowed to migrate, based on a global policy.
In the future it would be desirable to support topology-centric
policies, such as "one netisr per package".
- Allow each protocol to advertise an ordering policy, which can
currently be one of:
NETISR_POLICY_SOURCE: packets must maintain ordering with respect to
an implicit or explicit source (such as an interface or socket).
NETISR_POLICY_FLOW: make use of mbuf flow identifiers to place work,
as well as allowing protocols to provide a flow generation function
for mbufs without flow identifers (m2flow). Falls back on
NETISR_POLICY_SOURCE if now flow ID is available.
NETISR_POLICY_CPU: allow protocols to inspect and assign a CPU for
each packet handled by netisr (m2cpuid).
- Provide utility functions for querying the number of workstreams
being used, as well as a mapping function from workstream to CPU ID,
which protocols may use in work placement decisions.
- Add explicit interfaces to get and set per-protocol queue limits, and
get and clear drop counters, which query data or apply changes across
all workstreams.
- Add a more extensible netisr registration interface, in which
protocols declare 'struct netisr_handler' structures for each
registered NETISR_ type. These include name, handler function,
optional mbuf to flow ID function, optional mbuf to CPU ID function,
queue limit, and ordering policy. Padding is present to allow these
to be expanded in the future. If no queue limit is declared, then
a default is used.
- Queue limits are now per-workstream, and raised from the previous
IFQ_MAXLEN default of 50 to 256.
- All protocols are updated to use the new registration interface, and
with the exception of netnatm, default queue limits. Most protocols
register as NETISR_POLICY_SOURCE, except IPv4 and IPv6, which use
NETISR_POLICY_FLOW, and will therefore take advantage of driver-
generated flow IDs if present.
- Formalize a non-packet based interface between interface polling and
the netisr, rather than having polling pretend to be two protocols.
Provide two explicit hooks in the netisr worker for start and end
events for runs: netisr_poll() and netisr_pollmore(), as well as a
function, netisr_sched_poll(), to allow the polling code to schedule
netisr execution. DEVICE_POLLING still embeds single-netisr
assumptions in its implementation, so for now if it is compiled into
the kernel, a single and un-bound netisr thread is enforced
regardless of tunable configuration.
In the default configuration, the new netisr implementation maintains
the same basic assumptions as the previous implementation: a single,
un-bound worker thread processes all deferred work, and direct dispatch
is enabled by default wherever possible.
Performance measurement shows a marginal performance improvement over
the old implementation due to the use of batched dequeue.
An rmlock is used to synchronize use and registration/unregistration
using the framework; currently, synchronized use is disabled
(replicating current netisr policy) due to a measurable 3%-6% hit in
ping-pong micro-benchmarking. It will be enabled once further rmlock
optimization has taken place. However, in practice, netisrs are
rarely registered or unregistered at runtime.
A new man page for netisr will follow, but since one doesn't currently
exist, it hasn't been updated.
This change is not appropriate for MFC, although the polling shutdown
handler should be merged to 7-STABLE.
Bump __FreeBSD_version.
Reviewed by: bz
2009-06-01 10:41:38 +00:00
|
|
|
static struct netisr_handler ip_nh = {
|
|
|
|
.nh_name = "ip",
|
|
|
|
.nh_handler = ip_input,
|
|
|
|
.nh_proto = NETISR_IP,
|
2014-09-09 04:18:20 +00:00
|
|
|
#ifdef RSS
|
2015-08-29 06:58:30 +00:00
|
|
|
.nh_m2cpuid = rss_soft_m2cpuid_v4,
|
2014-09-09 04:18:20 +00:00
|
|
|
.nh_policy = NETISR_POLICY_CPU,
|
|
|
|
.nh_dispatch = NETISR_DISPATCH_HYBRID,
|
|
|
|
#else
|
Reimplement the netisr framework in order to support parallel netisr
threads:
- Support up to one netisr thread per CPU, each processings its own
workstream, or set of per-protocol queues. Threads may be bound
to specific CPUs, or allowed to migrate, based on a global policy.
In the future it would be desirable to support topology-centric
policies, such as "one netisr per package".
- Allow each protocol to advertise an ordering policy, which can
currently be one of:
NETISR_POLICY_SOURCE: packets must maintain ordering with respect to
an implicit or explicit source (such as an interface or socket).
NETISR_POLICY_FLOW: make use of mbuf flow identifiers to place work,
as well as allowing protocols to provide a flow generation function
for mbufs without flow identifers (m2flow). Falls back on
NETISR_POLICY_SOURCE if now flow ID is available.
NETISR_POLICY_CPU: allow protocols to inspect and assign a CPU for
each packet handled by netisr (m2cpuid).
- Provide utility functions for querying the number of workstreams
being used, as well as a mapping function from workstream to CPU ID,
which protocols may use in work placement decisions.
- Add explicit interfaces to get and set per-protocol queue limits, and
get and clear drop counters, which query data or apply changes across
all workstreams.
- Add a more extensible netisr registration interface, in which
protocols declare 'struct netisr_handler' structures for each
registered NETISR_ type. These include name, handler function,
optional mbuf to flow ID function, optional mbuf to CPU ID function,
queue limit, and ordering policy. Padding is present to allow these
to be expanded in the future. If no queue limit is declared, then
a default is used.
- Queue limits are now per-workstream, and raised from the previous
IFQ_MAXLEN default of 50 to 256.
- All protocols are updated to use the new registration interface, and
with the exception of netnatm, default queue limits. Most protocols
register as NETISR_POLICY_SOURCE, except IPv4 and IPv6, which use
NETISR_POLICY_FLOW, and will therefore take advantage of driver-
generated flow IDs if present.
- Formalize a non-packet based interface between interface polling and
the netisr, rather than having polling pretend to be two protocols.
Provide two explicit hooks in the netisr worker for start and end
events for runs: netisr_poll() and netisr_pollmore(), as well as a
function, netisr_sched_poll(), to allow the polling code to schedule
netisr execution. DEVICE_POLLING still embeds single-netisr
assumptions in its implementation, so for now if it is compiled into
the kernel, a single and un-bound netisr thread is enforced
regardless of tunable configuration.
In the default configuration, the new netisr implementation maintains
the same basic assumptions as the previous implementation: a single,
un-bound worker thread processes all deferred work, and direct dispatch
is enabled by default wherever possible.
Performance measurement shows a marginal performance improvement over
the old implementation due to the use of batched dequeue.
An rmlock is used to synchronize use and registration/unregistration
using the framework; currently, synchronized use is disabled
(replicating current netisr policy) due to a measurable 3%-6% hit in
ping-pong micro-benchmarking. It will be enabled once further rmlock
optimization has taken place. However, in practice, netisrs are
rarely registered or unregistered at runtime.
A new man page for netisr will follow, but since one doesn't currently
exist, it hasn't been updated.
This change is not appropriate for MFC, although the polling shutdown
handler should be merged to 7-STABLE.
Bump __FreeBSD_version.
Reviewed by: bz
2009-06-01 10:41:38 +00:00
|
|
|
.nh_policy = NETISR_POLICY_FLOW,
|
2014-09-09 04:18:20 +00:00
|
|
|
#endif
|
Reimplement the netisr framework in order to support parallel netisr
threads:
- Support up to one netisr thread per CPU, each processings its own
workstream, or set of per-protocol queues. Threads may be bound
to specific CPUs, or allowed to migrate, based on a global policy.
In the future it would be desirable to support topology-centric
policies, such as "one netisr per package".
- Allow each protocol to advertise an ordering policy, which can
currently be one of:
NETISR_POLICY_SOURCE: packets must maintain ordering with respect to
an implicit or explicit source (such as an interface or socket).
NETISR_POLICY_FLOW: make use of mbuf flow identifiers to place work,
as well as allowing protocols to provide a flow generation function
for mbufs without flow identifers (m2flow). Falls back on
NETISR_POLICY_SOURCE if now flow ID is available.
NETISR_POLICY_CPU: allow protocols to inspect and assign a CPU for
each packet handled by netisr (m2cpuid).
- Provide utility functions for querying the number of workstreams
being used, as well as a mapping function from workstream to CPU ID,
which protocols may use in work placement decisions.
- Add explicit interfaces to get and set per-protocol queue limits, and
get and clear drop counters, which query data or apply changes across
all workstreams.
- Add a more extensible netisr registration interface, in which
protocols declare 'struct netisr_handler' structures for each
registered NETISR_ type. These include name, handler function,
optional mbuf to flow ID function, optional mbuf to CPU ID function,
queue limit, and ordering policy. Padding is present to allow these
to be expanded in the future. If no queue limit is declared, then
a default is used.
- Queue limits are now per-workstream, and raised from the previous
IFQ_MAXLEN default of 50 to 256.
- All protocols are updated to use the new registration interface, and
with the exception of netnatm, default queue limits. Most protocols
register as NETISR_POLICY_SOURCE, except IPv4 and IPv6, which use
NETISR_POLICY_FLOW, and will therefore take advantage of driver-
generated flow IDs if present.
- Formalize a non-packet based interface between interface polling and
the netisr, rather than having polling pretend to be two protocols.
Provide two explicit hooks in the netisr worker for start and end
events for runs: netisr_poll() and netisr_pollmore(), as well as a
function, netisr_sched_poll(), to allow the polling code to schedule
netisr execution. DEVICE_POLLING still embeds single-netisr
assumptions in its implementation, so for now if it is compiled into
the kernel, a single and un-bound netisr thread is enforced
regardless of tunable configuration.
In the default configuration, the new netisr implementation maintains
the same basic assumptions as the previous implementation: a single,
un-bound worker thread processes all deferred work, and direct dispatch
is enabled by default wherever possible.
Performance measurement shows a marginal performance improvement over
the old implementation due to the use of batched dequeue.
An rmlock is used to synchronize use and registration/unregistration
using the framework; currently, synchronized use is disabled
(replicating current netisr policy) due to a measurable 3%-6% hit in
ping-pong micro-benchmarking. It will be enabled once further rmlock
optimization has taken place. However, in practice, netisrs are
rarely registered or unregistered at runtime.
A new man page for netisr will follow, but since one doesn't currently
exist, it hasn't been updated.
This change is not appropriate for MFC, although the polling shutdown
handler should be merged to 7-STABLE.
Bump __FreeBSD_version.
Reviewed by: bz
2009-06-01 10:41:38 +00:00
|
|
|
};
|
2001-09-29 04:34:11 +00:00
|
|
|
|
2014-09-09 04:18:20 +00:00
|
|
|
#ifdef RSS
|
|
|
|
/*
|
|
|
|
* Directly dispatched frames are currently assumed
|
|
|
|
* to have a flowid already calculated.
|
|
|
|
*
|
|
|
|
* It should likely have something that assert it
|
|
|
|
* actually has valid flow details.
|
|
|
|
*/
|
|
|
|
static struct netisr_handler ip_direct_nh = {
|
|
|
|
.nh_name = "ip_direct",
|
|
|
|
.nh_handler = ip_direct_input,
|
|
|
|
.nh_proto = NETISR_IP_DIRECT,
|
2015-09-06 20:20:48 +00:00
|
|
|
.nh_m2cpuid = rss_soft_m2cpuid_v4,
|
2014-09-09 04:18:20 +00:00
|
|
|
.nh_policy = NETISR_POLICY_CPU,
|
|
|
|
.nh_dispatch = NETISR_DISPATCH_HYBRID,
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
extern struct domain inetdomain;
|
2001-09-03 20:03:55 +00:00
|
|
|
extern struct protosw inetsw[];
|
1994-05-24 10:09:53 +00:00
|
|
|
u_char ip_protox[IPPROTO_MAX];
|
2010-04-29 11:52:42 +00:00
|
|
|
VNET_DEFINE(struct in_ifaddrhead, in_ifaddrhead); /* first inet address */
|
|
|
|
VNET_DEFINE(struct in_ifaddrhashhead *, in_ifaddrhashtbl); /* inet addr hash table */
|
|
|
|
VNET_DEFINE(u_long, in_ifaddrhmask); /* mask for hash table */
|
2001-09-29 04:34:11 +00:00
|
|
|
|
1995-11-14 20:34:56 +00:00
|
|
|
#ifdef IPCTL_DEFMTU
|
|
|
|
SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW,
|
1999-05-03 23:57:32 +00:00
|
|
|
&ip_mtu, 0, "Default MTU");
|
1995-11-14 20:34:56 +00:00
|
|
|
#endif
|
|
|
|
|
1999-02-22 18:19:57 +00:00
|
|
|
#ifdef IPSTEALTH
|
2010-04-29 11:52:42 +00:00
|
|
|
VNET_DEFINE(int, ipstealth);
|
2014-11-07 09:39:05 +00:00
|
|
|
SYSCTL_INT(_net_inet_ip, OID_AUTO, stealth, CTLFLAG_VNET | CTLFLAG_RW,
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
&VNET_NAME(ipstealth), 0,
|
|
|
|
"IP stealth mode, no TTL decrementation on forwarding");
|
1999-02-22 18:19:57 +00:00
|
|
|
#endif
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
|
2013-04-08 19:57:21 +00:00
|
|
|
/*
|
2013-07-09 09:43:03 +00:00
|
|
|
* IP statistics are stored in the "array" of counter(9)s.
|
2013-04-08 19:57:21 +00:00
|
|
|
*/
|
2013-07-09 09:43:03 +00:00
|
|
|
VNET_PCPUSTAT_DEFINE(struct ipstat, ipstat);
|
|
|
|
VNET_PCPUSTAT_SYSINIT(ipstat);
|
|
|
|
SYSCTL_VNET_PCPUSTAT(_net_inet_ip, IPCTL_STATS, stats, struct ipstat, ipstat,
|
|
|
|
"IP statistics (struct ipstat, netinet/ip_var.h)");
|
2013-04-08 19:57:21 +00:00
|
|
|
|
|
|
|
#ifdef VIMAGE
|
2013-07-09 09:43:03 +00:00
|
|
|
VNET_PCPUSTAT_SYSUNINIT(ipstat);
|
2013-04-08 19:57:21 +00:00
|
|
|
#endif /* VIMAGE */
|
|
|
|
|
2009-08-02 19:43:32 +00:00
|
|
|
/*
|
|
|
|
* Kernel module interface for updating ipstat. The argument is an index
|
2013-04-08 19:57:21 +00:00
|
|
|
* into ipstat treated as an array.
|
2009-08-02 19:43:32 +00:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
kmod_ipstat_inc(int statnum)
|
|
|
|
{
|
|
|
|
|
2013-07-09 09:43:03 +00:00
|
|
|
counter_u64_add(VNET(ipstat)[statnum], 1);
|
2009-08-02 19:43:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
kmod_ipstat_dec(int statnum)
|
|
|
|
{
|
|
|
|
|
2013-07-09 09:43:03 +00:00
|
|
|
counter_u64_add(VNET(ipstat)[statnum], -1);
|
2009-08-02 19:43:32 +00:00
|
|
|
}
|
|
|
|
|
Reimplement the netisr framework in order to support parallel netisr
threads:
- Support up to one netisr thread per CPU, each processings its own
workstream, or set of per-protocol queues. Threads may be bound
to specific CPUs, or allowed to migrate, based on a global policy.
In the future it would be desirable to support topology-centric
policies, such as "one netisr per package".
- Allow each protocol to advertise an ordering policy, which can
currently be one of:
NETISR_POLICY_SOURCE: packets must maintain ordering with respect to
an implicit or explicit source (such as an interface or socket).
NETISR_POLICY_FLOW: make use of mbuf flow identifiers to place work,
as well as allowing protocols to provide a flow generation function
for mbufs without flow identifers (m2flow). Falls back on
NETISR_POLICY_SOURCE if now flow ID is available.
NETISR_POLICY_CPU: allow protocols to inspect and assign a CPU for
each packet handled by netisr (m2cpuid).
- Provide utility functions for querying the number of workstreams
being used, as well as a mapping function from workstream to CPU ID,
which protocols may use in work placement decisions.
- Add explicit interfaces to get and set per-protocol queue limits, and
get and clear drop counters, which query data or apply changes across
all workstreams.
- Add a more extensible netisr registration interface, in which
protocols declare 'struct netisr_handler' structures for each
registered NETISR_ type. These include name, handler function,
optional mbuf to flow ID function, optional mbuf to CPU ID function,
queue limit, and ordering policy. Padding is present to allow these
to be expanded in the future. If no queue limit is declared, then
a default is used.
- Queue limits are now per-workstream, and raised from the previous
IFQ_MAXLEN default of 50 to 256.
- All protocols are updated to use the new registration interface, and
with the exception of netnatm, default queue limits. Most protocols
register as NETISR_POLICY_SOURCE, except IPv4 and IPv6, which use
NETISR_POLICY_FLOW, and will therefore take advantage of driver-
generated flow IDs if present.
- Formalize a non-packet based interface between interface polling and
the netisr, rather than having polling pretend to be two protocols.
Provide two explicit hooks in the netisr worker for start and end
events for runs: netisr_poll() and netisr_pollmore(), as well as a
function, netisr_sched_poll(), to allow the polling code to schedule
netisr execution. DEVICE_POLLING still embeds single-netisr
assumptions in its implementation, so for now if it is compiled into
the kernel, a single and un-bound netisr thread is enforced
regardless of tunable configuration.
In the default configuration, the new netisr implementation maintains
the same basic assumptions as the previous implementation: a single,
un-bound worker thread processes all deferred work, and direct dispatch
is enabled by default wherever possible.
Performance measurement shows a marginal performance improvement over
the old implementation due to the use of batched dequeue.
An rmlock is used to synchronize use and registration/unregistration
using the framework; currently, synchronized use is disabled
(replicating current netisr policy) due to a measurable 3%-6% hit in
ping-pong micro-benchmarking. It will be enabled once further rmlock
optimization has taken place. However, in practice, netisrs are
rarely registered or unregistered at runtime.
A new man page for netisr will follow, but since one doesn't currently
exist, it hasn't been updated.
This change is not appropriate for MFC, although the polling shutdown
handler should be merged to 7-STABLE.
Bump __FreeBSD_version.
Reviewed by: bz
2009-06-01 10:41:38 +00:00
|
|
|
static int
|
|
|
|
sysctl_netinet_intr_queue_maxlen(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
int error, qlimit;
|
|
|
|
|
|
|
|
netisr_getqlimit(&ip_nh, &qlimit);
|
|
|
|
error = sysctl_handle_int(oidp, &qlimit, 0, req);
|
|
|
|
if (error || !req->newptr)
|
|
|
|
return (error);
|
|
|
|
if (qlimit < 1)
|
|
|
|
return (EINVAL);
|
|
|
|
return (netisr_setqlimit(&ip_nh, qlimit));
|
|
|
|
}
|
|
|
|
SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_queue_maxlen,
|
|
|
|
CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_netinet_intr_queue_maxlen, "I",
|
|
|
|
"Maximum size of the IP input queue");
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_netinet_intr_queue_drops(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
u_int64_t qdrops_long;
|
|
|
|
int error, qdrops;
|
|
|
|
|
|
|
|
netisr_getqdrops(&ip_nh, &qdrops_long);
|
|
|
|
qdrops = qdrops_long;
|
|
|
|
error = sysctl_handle_int(oidp, &qdrops, 0, req);
|
|
|
|
if (error || !req->newptr)
|
|
|
|
return (error);
|
|
|
|
if (qdrops != 0)
|
|
|
|
return (EINVAL);
|
|
|
|
netisr_clearqdrops(&ip_nh);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQDROPS, intr_queue_drops,
|
|
|
|
CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_netinet_intr_queue_drops, "I",
|
|
|
|
"Number of packets dropped from the IP input queue");
|
|
|
|
|
2014-09-09 04:18:20 +00:00
|
|
|
#ifdef RSS
|
|
|
|
static int
|
|
|
|
sysctl_netinet_intr_direct_queue_maxlen(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
int error, qlimit;
|
|
|
|
|
|
|
|
netisr_getqlimit(&ip_direct_nh, &qlimit);
|
|
|
|
error = sysctl_handle_int(oidp, &qlimit, 0, req);
|
|
|
|
if (error || !req->newptr)
|
|
|
|
return (error);
|
|
|
|
if (qlimit < 1)
|
|
|
|
return (EINVAL);
|
|
|
|
return (netisr_setqlimit(&ip_direct_nh, qlimit));
|
|
|
|
}
|
|
|
|
SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQMAXLEN, intr_direct_queue_maxlen,
|
|
|
|
CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_netinet_intr_direct_queue_maxlen, "I",
|
|
|
|
"Maximum size of the IP direct input queue");
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_netinet_intr_direct_queue_drops(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
u_int64_t qdrops_long;
|
|
|
|
int error, qdrops;
|
|
|
|
|
|
|
|
netisr_getqdrops(&ip_direct_nh, &qdrops_long);
|
|
|
|
qdrops = qdrops_long;
|
|
|
|
error = sysctl_handle_int(oidp, &qdrops, 0, req);
|
|
|
|
if (error || !req->newptr)
|
|
|
|
return (error);
|
|
|
|
if (qdrops != 0)
|
|
|
|
return (EINVAL);
|
|
|
|
netisr_clearqdrops(&ip_direct_nh);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
SYSCTL_PROC(_net_inet_ip, IPCTL_INTRQDROPS, intr_direct_queue_drops,
|
|
|
|
CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_netinet_intr_direct_queue_drops, "I",
|
|
|
|
"Number of packets dropped from the IP direct input queue");
|
|
|
|
#endif /* RSS */
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* IP initialization: fill in IP protocol switch table.
|
|
|
|
* All protocols not implemented in kernel go to raw IP protocol handler.
|
|
|
|
*/
|
|
|
|
void
|
2007-05-10 15:58:48 +00:00
|
|
|
ip_init(void)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
2007-05-10 15:58:48 +00:00
|
|
|
struct protosw *pr;
|
|
|
|
int i;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
TAILQ_INIT(&V_in_ifaddrhead);
|
|
|
|
V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask);
|
First pass at separating per-vnet initializer functions
from existing functions for initializing global state.
At this stage, the new per-vnet initializer functions are
directly called from the existing global initialization code,
which should in most cases result in compiler inlining those
new functions, hence yielding a near-zero functional change.
Modify the existing initializer functions which are invoked via
protosw, like ip_init() et. al., to allow them to be invoked
multiple times, i.e. per each vnet. Global state, if any,
is initialized only if such functions are called within the
context of vnet0, which will be determined via the
IS_DEFAULT_VNET(curvnet) check (currently always true).
While here, V_irtualize a few remaining global UMA zones
used by net/netinet/netipsec networking code. While it is
not yet clear to me or anybody else whether this is the right
thing to do, at this stage this makes the code more readable,
and makes it easier to track uncollected UMA-zone-backed
objects on vnet removal. In the long run, it's quite possible
that some form of shared use of UMA zone pools among multiple
vnets should be considered.
Bump __FreeBSD_version due to changes in layout of structs
vnet_ipfw, vnet_inet and vnet_net.
Approved by: julian (mentor)
2009-04-06 22:29:41 +00:00
|
|
|
|
|
|
|
/* Initialize IP reassembly queue. */
|
2015-04-10 06:02:37 +00:00
|
|
|
ipreass_init();
|
First pass at separating per-vnet initializer functions
from existing functions for initializing global state.
At this stage, the new per-vnet initializer functions are
directly called from the existing global initialization code,
which should in most cases result in compiler inlining those
new functions, hence yielding a near-zero functional change.
Modify the existing initializer functions which are invoked via
protosw, like ip_init() et. al., to allow them to be invoked
multiple times, i.e. per each vnet. Global state, if any,
is initialized only if such functions are called within the
context of vnet0, which will be determined via the
IS_DEFAULT_VNET(curvnet) check (currently always true).
While here, V_irtualize a few remaining global UMA zones
used by net/netinet/netipsec networking code. While it is
not yet clear to me or anybody else whether this is the right
thing to do, at this stage this makes the code more readable,
and makes it easier to track uncollected UMA-zone-backed
objects on vnet removal. In the long run, it's quite possible
that some form of shared use of UMA zone pools among multiple
vnets should be considered.
Bump __FreeBSD_version due to changes in layout of structs
vnet_ipfw, vnet_inet and vnet_net.
Approved by: julian (mentor)
2009-04-06 22:29:41 +00:00
|
|
|
|
2009-10-11 05:59:43 +00:00
|
|
|
/* Initialize packet filter hooks. */
|
|
|
|
V_inet_pfil_hook.ph_type = PFIL_TYPE_AF;
|
|
|
|
V_inet_pfil_hook.ph_af = AF_INET;
|
|
|
|
if ((i = pfil_head_register(&V_inet_pfil_hook)) != 0)
|
|
|
|
printf("%s: WARNING: unable to register pfil hook, "
|
|
|
|
"error %d\n", __func__, i);
|
|
|
|
|
2015-11-25 07:31:59 +00:00
|
|
|
if (hhook_head_register(HHOOK_TYPE_IPSEC_IN, AF_INET,
|
|
|
|
&V_ipsec_hhh_in[HHOOK_IPSEC_INET],
|
|
|
|
HHOOK_WAITOK | HHOOK_HEADISINVNET) != 0)
|
|
|
|
printf("%s: WARNING: unable to register input helper hook\n",
|
|
|
|
__func__);
|
|
|
|
if (hhook_head_register(HHOOK_TYPE_IPSEC_OUT, AF_INET,
|
|
|
|
&V_ipsec_hhh_out[HHOOK_IPSEC_INET],
|
|
|
|
HHOOK_WAITOK | HHOOK_HEADISINVNET) != 0)
|
|
|
|
printf("%s: WARNING: unable to register output helper hook\n",
|
|
|
|
__func__);
|
|
|
|
|
First pass at separating per-vnet initializer functions
from existing functions for initializing global state.
At this stage, the new per-vnet initializer functions are
directly called from the existing global initialization code,
which should in most cases result in compiler inlining those
new functions, hence yielding a near-zero functional change.
Modify the existing initializer functions which are invoked via
protosw, like ip_init() et. al., to allow them to be invoked
multiple times, i.e. per each vnet. Global state, if any,
is initialized only if such functions are called within the
context of vnet0, which will be determined via the
IS_DEFAULT_VNET(curvnet) check (currently always true).
While here, V_irtualize a few remaining global UMA zones
used by net/netinet/netipsec networking code. While it is
not yet clear to me or anybody else whether this is the right
thing to do, at this stage this makes the code more readable,
and makes it easier to track uncollected UMA-zone-backed
objects on vnet removal. In the long run, it's quite possible
that some form of shared use of UMA zone pools among multiple
vnets should be considered.
Bump __FreeBSD_version due to changes in layout of structs
vnet_ipfw, vnet_inet and vnet_net.
Approved by: julian (mentor)
2009-04-06 22:29:41 +00:00
|
|
|
/* Skip initialization of globals for non-default instances. */
|
|
|
|
if (!IS_DEFAULT_VNET(curvnet))
|
|
|
|
return;
|
|
|
|
|
2001-09-03 20:03:55 +00:00
|
|
|
pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
|
2005-01-30 19:29:47 +00:00
|
|
|
if (pr == NULL)
|
2004-09-16 18:33:39 +00:00
|
|
|
panic("ip_init: PF_INET not found");
|
|
|
|
|
|
|
|
/* Initialize the entire ip_protox[] array to IPPROTO_RAW. */
|
1994-05-24 10:09:53 +00:00
|
|
|
for (i = 0; i < IPPROTO_MAX; i++)
|
|
|
|
ip_protox[i] = pr - inetsw;
|
2004-09-16 18:33:39 +00:00
|
|
|
/*
|
|
|
|
* Cycle through IP protocols and put them into the appropriate place
|
|
|
|
* in ip_protox[].
|
|
|
|
*/
|
2001-09-03 20:03:55 +00:00
|
|
|
for (pr = inetdomain.dom_protosw;
|
|
|
|
pr < inetdomain.dom_protoswNPROTOSW; pr++)
|
1994-05-24 10:09:53 +00:00
|
|
|
if (pr->pr_domain->dom_family == PF_INET &&
|
2004-09-16 18:33:39 +00:00
|
|
|
pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) {
|
|
|
|
/* Be careful to only index valid IP protocols. */
|
2005-02-23 00:38:12 +00:00
|
|
|
if (pr->pr_protocol < IPPROTO_MAX)
|
2004-09-16 18:33:39 +00:00
|
|
|
ip_protox[pr->pr_protocol] = pr - inetsw;
|
|
|
|
}
|
1997-09-15 23:07:01 +00:00
|
|
|
|
Reimplement the netisr framework in order to support parallel netisr
threads:
- Support up to one netisr thread per CPU, each processings its own
workstream, or set of per-protocol queues. Threads may be bound
to specific CPUs, or allowed to migrate, based on a global policy.
In the future it would be desirable to support topology-centric
policies, such as "one netisr per package".
- Allow each protocol to advertise an ordering policy, which can
currently be one of:
NETISR_POLICY_SOURCE: packets must maintain ordering with respect to
an implicit or explicit source (such as an interface or socket).
NETISR_POLICY_FLOW: make use of mbuf flow identifiers to place work,
as well as allowing protocols to provide a flow generation function
for mbufs without flow identifers (m2flow). Falls back on
NETISR_POLICY_SOURCE if now flow ID is available.
NETISR_POLICY_CPU: allow protocols to inspect and assign a CPU for
each packet handled by netisr (m2cpuid).
- Provide utility functions for querying the number of workstreams
being used, as well as a mapping function from workstream to CPU ID,
which protocols may use in work placement decisions.
- Add explicit interfaces to get and set per-protocol queue limits, and
get and clear drop counters, which query data or apply changes across
all workstreams.
- Add a more extensible netisr registration interface, in which
protocols declare 'struct netisr_handler' structures for each
registered NETISR_ type. These include name, handler function,
optional mbuf to flow ID function, optional mbuf to CPU ID function,
queue limit, and ordering policy. Padding is present to allow these
to be expanded in the future. If no queue limit is declared, then
a default is used.
- Queue limits are now per-workstream, and raised from the previous
IFQ_MAXLEN default of 50 to 256.
- All protocols are updated to use the new registration interface, and
with the exception of netnatm, default queue limits. Most protocols
register as NETISR_POLICY_SOURCE, except IPv4 and IPv6, which use
NETISR_POLICY_FLOW, and will therefore take advantage of driver-
generated flow IDs if present.
- Formalize a non-packet based interface between interface polling and
the netisr, rather than having polling pretend to be two protocols.
Provide two explicit hooks in the netisr worker for start and end
events for runs: netisr_poll() and netisr_pollmore(), as well as a
function, netisr_sched_poll(), to allow the polling code to schedule
netisr execution. DEVICE_POLLING still embeds single-netisr
assumptions in its implementation, so for now if it is compiled into
the kernel, a single and un-bound netisr thread is enforced
regardless of tunable configuration.
In the default configuration, the new netisr implementation maintains
the same basic assumptions as the previous implementation: a single,
un-bound worker thread processes all deferred work, and direct dispatch
is enabled by default wherever possible.
Performance measurement shows a marginal performance improvement over
the old implementation due to the use of batched dequeue.
An rmlock is used to synchronize use and registration/unregistration
using the framework; currently, synchronized use is disabled
(replicating current netisr policy) due to a measurable 3%-6% hit in
ping-pong micro-benchmarking. It will be enabled once further rmlock
optimization has taken place. However, in practice, netisrs are
rarely registered or unregistered at runtime.
A new man page for netisr will follow, but since one doesn't currently
exist, it hasn't been updated.
This change is not appropriate for MFC, although the polling shutdown
handler should be merged to 7-STABLE.
Bump __FreeBSD_version.
Reviewed by: bz
2009-06-01 10:41:38 +00:00
|
|
|
netisr_register(&ip_nh);
|
2014-09-09 04:18:20 +00:00
|
|
|
#ifdef RSS
|
|
|
|
netisr_register(&ip_direct_nh);
|
|
|
|
#endif
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
2010-02-20 19:59:52 +00:00
|
|
|
#ifdef VIMAGE
|
|
|
|
void
|
|
|
|
ip_destroy(void)
|
|
|
|
{
|
2015-11-25 07:31:59 +00:00
|
|
|
int error;
|
2013-09-13 18:45:10 +00:00
|
|
|
|
2015-11-25 07:31:59 +00:00
|
|
|
if ((error = pfil_head_unregister(&V_inet_pfil_hook)) != 0)
|
2013-09-13 18:45:10 +00:00
|
|
|
printf("%s: WARNING: unable to unregister pfil hook, "
|
2015-11-25 07:31:59 +00:00
|
|
|
"error %d\n", __func__, error);
|
|
|
|
|
|
|
|
error = hhook_head_deregister(V_ipsec_hhh_in[HHOOK_IPSEC_INET]);
|
|
|
|
if (error != 0) {
|
|
|
|
printf("%s: WARNING: unable to deregister input helper hook "
|
|
|
|
"type HHOOK_TYPE_IPSEC_IN, id HHOOK_IPSEC_INET: "
|
|
|
|
"error %d returned\n", __func__, error);
|
|
|
|
}
|
|
|
|
error = hhook_head_deregister(V_ipsec_hhh_out[HHOOK_IPSEC_INET]);
|
|
|
|
if (error != 0) {
|
|
|
|
printf("%s: WARNING: unable to deregister output helper hook "
|
|
|
|
"type HHOOK_TYPE_IPSEC_OUT, id HHOOK_IPSEC_INET: "
|
|
|
|
"error %d returned\n", __func__, error);
|
|
|
|
}
|
2010-02-20 19:59:52 +00:00
|
|
|
/* Cleanup in_ifaddr hash table; should be empty. */
|
|
|
|
hashdestroy(V_in_ifaddrhashtbl, M_IFADDR, V_in_ifaddrhmask);
|
|
|
|
|
2015-04-09 21:17:07 +00:00
|
|
|
/* Destroy IP reassembly queue. */
|
2015-04-10 06:02:37 +00:00
|
|
|
ipreass_destroy();
|
2010-02-20 19:59:52 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-09-09 04:18:20 +00:00
|
|
|
#ifdef RSS
|
|
|
|
/*
|
|
|
|
* IP direct input routine.
|
|
|
|
*
|
|
|
|
* This is called when reinjecting completed fragments where
|
|
|
|
* all of the previous checking and book-keeping has been done.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ip_direct_input(struct mbuf *m)
|
|
|
|
{
|
|
|
|
struct ip *ip;
|
|
|
|
int hlen;
|
|
|
|
|
|
|
|
ip = mtod(m, struct ip *);
|
|
|
|
hlen = ip->ip_hl << 2;
|
|
|
|
|
|
|
|
IPSTAT_INC(ips_delivered);
|
|
|
|
(*inetsw[ip_protox[ip->ip_p]].pr_input)(&m, &hlen, ip->ip_p);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Ip input routine. Checksum and byte swap header. If fragmented
|
|
|
|
* try to reassemble. Process options. Pass to next level.
|
|
|
|
*/
|
1996-02-05 20:36:02 +00:00
|
|
|
void
|
|
|
|
ip_input(struct mbuf *m)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
2003-11-14 21:02:22 +00:00
|
|
|
struct ip *ip = NULL;
|
2000-10-19 23:15:54 +00:00
|
|
|
struct in_ifaddr *ia = NULL;
|
2001-09-29 04:34:11 +00:00
|
|
|
struct ifaddr *ifa;
|
2009-04-20 14:35:42 +00:00
|
|
|
struct ifnet *ifp;
|
2004-08-17 22:05:54 +00:00
|
|
|
int checkif, hlen = 0;
|
2012-10-06 10:02:11 +00:00
|
|
|
uint16_t sum, ip_len;
|
2003-11-14 21:48:57 +00:00
|
|
|
int dchg = 0; /* dest changed after fw */
|
2003-10-16 16:25:25 +00:00
|
|
|
struct in_addr odst; /* original dst address */
|
1999-12-06 00:43:07 +00:00
|
|
|
|
2007-05-16 20:46:58 +00:00
|
|
|
M_ASSERTPKTHDR(m);
|
2006-02-01 13:55:03 +00:00
|
|
|
|
2004-02-25 19:55:29 +00:00
|
|
|
if (m->m_flags & M_FASTFWD_OURS) {
|
2004-09-15 20:17:03 +00:00
|
|
|
m->m_flags &= ~M_FASTFWD_OURS;
|
|
|
|
/* Set up some basics that will be used later. */
|
2004-08-17 22:05:54 +00:00
|
|
|
ip = mtod(m, struct ip *);
|
|
|
|
hlen = ip->ip_hl << 2;
|
2012-10-22 21:09:03 +00:00
|
|
|
ip_len = ntohs(ip->ip_len);
|
2007-05-16 20:46:58 +00:00
|
|
|
goto ours;
|
|
|
|
}
|
2004-02-18 00:04:52 +00:00
|
|
|
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_total);
|
1996-10-07 19:21:46 +00:00
|
|
|
|
|
|
|
if (m->m_pkthdr.len < sizeof(struct ip))
|
|
|
|
goto tooshort;
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
if (m->m_len < sizeof (struct ip) &&
|
2004-08-11 10:46:15 +00:00
|
|
|
(m = m_pullup(m, sizeof (struct ip))) == NULL) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_toosmall);
|
1996-02-05 20:36:02 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
ip = mtod(m, struct ip *);
|
1996-10-07 19:21:46 +00:00
|
|
|
|
2002-10-20 22:52:07 +00:00
|
|
|
if (ip->ip_v != IPVERSION) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_badvers);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
1996-10-07 19:21:46 +00:00
|
|
|
|
2002-10-20 22:52:07 +00:00
|
|
|
hlen = ip->ip_hl << 2;
|
1994-05-24 10:09:53 +00:00
|
|
|
if (hlen < sizeof(struct ip)) { /* minimum header length */
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_badhlen);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
if (hlen > m->m_len) {
|
2004-08-11 10:46:15 +00:00
|
|
|
if ((m = m_pullup(m, hlen)) == NULL) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_badhlen);
|
1996-02-05 20:36:02 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
ip = mtod(m, struct ip *);
|
|
|
|
}
|
2001-06-11 12:39:29 +00:00
|
|
|
|
2013-08-25 21:54:41 +00:00
|
|
|
IP_PROBE(receive, NULL, NULL, ip, m->m_pkthdr.rcvif, ip, NULL);
|
|
|
|
|
2001-06-11 12:39:29 +00:00
|
|
|
/* 127/8 must not appear on wire - RFC1122 */
|
2009-04-20 14:35:42 +00:00
|
|
|
ifp = m->m_pkthdr.rcvif;
|
2001-06-11 12:39:29 +00:00
|
|
|
if ((ntohl(ip->ip_dst.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET ||
|
|
|
|
(ntohl(ip->ip_src.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) {
|
2009-04-20 14:35:42 +00:00
|
|
|
if ((ifp->if_flags & IFF_LOOPBACK) == 0) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_badaddr);
|
2001-06-11 12:39:29 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-03-27 19:14:27 +00:00
|
|
|
if (m->m_pkthdr.csum_flags & CSUM_IP_CHECKED) {
|
|
|
|
sum = !(m->m_pkthdr.csum_flags & CSUM_IP_VALID);
|
1996-10-07 19:21:46 +00:00
|
|
|
} else {
|
2000-03-27 19:14:27 +00:00
|
|
|
if (hlen == sizeof(struct ip)) {
|
|
|
|
sum = in_cksum_hdr(ip);
|
|
|
|
} else {
|
|
|
|
sum = in_cksum(m, hlen);
|
|
|
|
}
|
1996-10-07 19:21:46 +00:00
|
|
|
}
|
1997-02-06 11:14:22 +00:00
|
|
|
if (sum) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_badsum);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
2004-06-13 17:29:10 +00:00
|
|
|
#ifdef ALTQ
|
|
|
|
if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0)
|
|
|
|
/* packet is dropped by traffic conditioner */
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
2012-10-06 10:02:11 +00:00
|
|
|
ip_len = ntohs(ip->ip_len);
|
|
|
|
if (ip_len < hlen) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_badlen);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check that the amount of data in the buffers
|
|
|
|
* is as at least much as the IP header would have us expect.
|
|
|
|
* Trim mbufs if longer than we expect.
|
|
|
|
* Drop packet if shorter than we expect.
|
|
|
|
*/
|
2012-10-06 10:02:11 +00:00
|
|
|
if (m->m_pkthdr.len < ip_len) {
|
1996-10-07 19:21:46 +00:00
|
|
|
tooshort:
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_tooshort);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto bad;
|
|
|
|
}
|
2012-10-06 10:02:11 +00:00
|
|
|
if (m->m_pkthdr.len > ip_len) {
|
1994-05-24 10:09:53 +00:00
|
|
|
if (m->m_len == m->m_pkthdr.len) {
|
2012-10-06 10:02:11 +00:00
|
|
|
m->m_len = ip_len;
|
|
|
|
m->m_pkthdr.len = ip_len;
|
1994-05-24 10:09:53 +00:00
|
|
|
} else
|
2012-10-06 10:02:11 +00:00
|
|
|
m_adj(m, ip_len - m->m_pkthdr.len);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
2014-09-09 04:18:20 +00:00
|
|
|
|
2015-11-05 07:26:32 +00:00
|
|
|
/* Try to forward the packet, but if we fail continue */
|
2007-07-03 12:13:45 +00:00
|
|
|
#ifdef IPSEC
|
2015-11-05 07:26:32 +00:00
|
|
|
/* For now we do not handle IPSEC in tryforward. */
|
|
|
|
if (!key_havesp(IPSEC_DIR_INBOUND) && !key_havesp(IPSEC_DIR_OUTBOUND) &&
|
|
|
|
(V_ipforwarding == 1))
|
|
|
|
if (ip_tryforward(m) == NULL)
|
|
|
|
return;
|
2003-07-22 18:58:34 +00:00
|
|
|
/*
|
2011-06-08 03:02:11 +00:00
|
|
|
* Bypass packet filtering for packets previously handled by IPsec.
|
2003-07-22 18:58:34 +00:00
|
|
|
*/
|
2007-08-05 16:16:15 +00:00
|
|
|
if (ip_ipsec_filtertunnel(m))
|
2004-08-27 15:16:24 +00:00
|
|
|
goto passin;
|
2015-11-05 07:26:32 +00:00
|
|
|
#else
|
|
|
|
if (V_ipforwarding == 1)
|
|
|
|
if (ip_tryforward(m) == NULL)
|
|
|
|
return;
|
2007-07-03 12:13:45 +00:00
|
|
|
#endif /* IPSEC */
|
2001-03-05 08:45:05 +00:00
|
|
|
|
1997-04-03 10:47:12 +00:00
|
|
|
/*
|
2003-09-23 17:54:04 +00:00
|
|
|
* Run through list of hooks for input packets.
|
2003-10-16 16:25:25 +00:00
|
|
|
*
|
|
|
|
* NB: Beware of the destination address changing (e.g.
|
|
|
|
* by NAT rewriting). When this happens, tell
|
|
|
|
* ip_forward to do the right thing.
|
1997-04-03 10:47:12 +00:00
|
|
|
*/
|
2004-08-27 15:16:24 +00:00
|
|
|
|
|
|
|
/* Jump over all PFIL processing if hooks are not active. */
|
2009-10-11 05:59:43 +00:00
|
|
|
if (!PFIL_HOOKED(&V_inet_pfil_hook))
|
2004-08-27 15:16:24 +00:00
|
|
|
goto passin;
|
|
|
|
|
2003-10-16 16:25:25 +00:00
|
|
|
odst = ip->ip_dst;
|
2009-10-11 05:59:43 +00:00
|
|
|
if (pfil_run_hooks(&V_inet_pfil_hook, &m, ifp, PFIL_IN, NULL) != 0)
|
2003-09-23 17:54:04 +00:00
|
|
|
return;
|
|
|
|
if (m == NULL) /* consumed by filter */
|
|
|
|
return;
|
2004-08-17 22:05:54 +00:00
|
|
|
|
2003-09-23 17:54:04 +00:00
|
|
|
ip = mtod(m, struct ip *);
|
2003-11-14 21:48:57 +00:00
|
|
|
dchg = (odst.s_addr != ip->ip_dst.s_addr);
|
2009-04-20 14:35:42 +00:00
|
|
|
ifp = m->m_pkthdr.rcvif;
|
1995-01-12 13:06:32 +00:00
|
|
|
|
2004-08-17 22:05:54 +00:00
|
|
|
if (m->m_flags & M_FASTFWD_OURS) {
|
|
|
|
m->m_flags &= ~M_FASTFWD_OURS;
|
|
|
|
goto ours;
|
|
|
|
}
|
2012-11-02 01:20:55 +00:00
|
|
|
if (m->m_flags & M_IP_NEXTHOP) {
|
2016-04-14 18:57:30 +00:00
|
|
|
if (m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL) {
|
2012-11-02 01:20:55 +00:00
|
|
|
/*
|
|
|
|
* Directly ship the packet on. This allows
|
|
|
|
* forwarding packets originally destined to us
|
|
|
|
* to some other directly connected host.
|
|
|
|
*/
|
|
|
|
ip_forward(m, 1);
|
|
|
|
return;
|
|
|
|
}
|
2005-02-22 17:40:40 +00:00
|
|
|
}
|
2004-08-27 15:16:24 +00:00
|
|
|
passin:
|
2012-10-06 10:02:11 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Process options and, if not destined for us,
|
|
|
|
* ship it on. ip_dooptions returns 1 when an
|
|
|
|
* error was detected (causing an icmp message
|
|
|
|
* to be sent and the original packet to be freed).
|
|
|
|
*/
|
2004-08-17 22:05:54 +00:00
|
|
|
if (hlen > sizeof (struct ip) && ip_dooptions(m, 0))
|
1996-02-05 20:36:02 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
/* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
|
1995-06-13 17:51:16 +00:00
|
|
|
* matter if it is destined to another node, or whether it is
|
1994-09-06 22:42:31 +00:00
|
|
|
* a multicast one, RSVP wants it! and prevents it from being forwarded
|
|
|
|
* anywhere else. Also checks if the rsvp daemon is running before
|
|
|
|
* grabbing the packet.
|
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_rsvp_on && ip->ip_p==IPPROTO_RSVP)
|
1994-09-06 22:42:31 +00:00
|
|
|
goto ours;
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Check our list of addresses, to see if the packet is for us.
|
1999-02-09 16:55:46 +00:00
|
|
|
* If we don't have any addresses, assume any unicast packet
|
|
|
|
* we receive might be for us (and let the upper layers deal
|
|
|
|
* with it).
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (TAILQ_EMPTY(&V_in_ifaddrhead) &&
|
1999-02-09 16:55:46 +00:00
|
|
|
(m->m_flags & (M_MCAST|M_BCAST)) == 0)
|
|
|
|
goto ours;
|
|
|
|
|
2001-03-04 01:39:19 +00:00
|
|
|
/*
|
|
|
|
* Enable a consistency check between the destination address
|
|
|
|
* and the arrival interface for a unicast packet (the RFC 1122
|
|
|
|
* strong ES model) if IP forwarding is disabled and the packet
|
2001-03-04 03:22:36 +00:00
|
|
|
* is not locally generated and the packet is not subject to
|
|
|
|
* 'ipfw fwd'.
|
2001-03-05 08:45:05 +00:00
|
|
|
*
|
2001-11-04 22:56:25 +00:00
|
|
|
* XXX - Checking also should be disabled if the destination
|
2001-03-05 08:45:05 +00:00
|
|
|
* address is ipnat'ed to a different interface.
|
|
|
|
*
|
2001-03-05 22:40:27 +00:00
|
|
|
* XXX - Checking is incompatible with IP aliases added
|
2001-03-05 08:45:05 +00:00
|
|
|
* to the loopback interface instead of the interface where
|
|
|
|
* the packets are received.
|
2005-02-22 13:04:05 +00:00
|
|
|
*
|
|
|
|
* XXX - This is the case for carp vhost IPs as well so we
|
|
|
|
* insert a workaround. If the packet got here, we already
|
|
|
|
* checked with carp_iamatch() and carp_forus().
|
2001-03-04 01:39:19 +00:00
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
checkif = V_ip_checkinterface && (V_ipforwarding == 0) &&
|
2009-04-20 14:35:42 +00:00
|
|
|
ifp != NULL && ((ifp->if_flags & IFF_LOOPBACK) == 0) &&
|
2010-08-11 00:51:50 +00:00
|
|
|
ifp->if_carp == NULL && (dchg == 0);
|
2001-03-04 01:39:19 +00:00
|
|
|
|
2001-09-29 04:34:11 +00:00
|
|
|
/*
|
|
|
|
* Check for exact addresses in the hash bucket.
|
|
|
|
*/
|
2009-06-25 11:52:33 +00:00
|
|
|
/* IN_IFADDR_RLOCK(); */
|
2004-08-17 22:05:54 +00:00
|
|
|
LIST_FOREACH(ia, INADDR_HASH(ip->ip_dst.s_addr), ia_hash) {
|
1998-07-06 03:20:19 +00:00
|
|
|
/*
|
2001-03-04 01:39:19 +00:00
|
|
|
* If the address matches, verify that the packet
|
|
|
|
* arrived via the correct interface if checking is
|
|
|
|
* enabled.
|
1998-07-06 03:20:19 +00:00
|
|
|
*/
|
2004-08-17 22:05:54 +00:00
|
|
|
if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr &&
|
2009-06-23 20:19:09 +00:00
|
|
|
(!checkif || ia->ia_ifp == ifp)) {
|
2013-10-15 11:37:57 +00:00
|
|
|
counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
|
|
|
|
counter_u64_add(ia->ia_ifa.ifa_ibytes,
|
|
|
|
m->m_pkthdr.len);
|
2009-06-25 11:52:33 +00:00
|
|
|
/* IN_IFADDR_RUNLOCK(); */
|
1999-03-12 01:15:57 +00:00
|
|
|
goto ours;
|
2009-06-23 20:19:09 +00:00
|
|
|
}
|
2001-09-29 04:34:11 +00:00
|
|
|
}
|
2009-06-25 11:52:33 +00:00
|
|
|
/* IN_IFADDR_RUNLOCK(); */
|
|
|
|
|
2001-09-29 04:34:11 +00:00
|
|
|
/*
|
|
|
|
* Check for broadcast addresses.
|
|
|
|
*
|
|
|
|
* Only accept broadcast packets that arrive via the matching
|
|
|
|
* interface. Reception of forwarded directed broadcasts would
|
|
|
|
* be handled via ip_forward() and ether_output() with the loopback
|
|
|
|
* into the stack for SIMPLEX interfaces handled by ether_output().
|
|
|
|
*/
|
2009-04-20 14:35:42 +00:00
|
|
|
if (ifp != NULL && ifp->if_flags & IFF_BROADCAST) {
|
2012-01-05 19:00:36 +00:00
|
|
|
IF_ADDR_RLOCK(ifp);
|
2009-04-20 14:35:42 +00:00
|
|
|
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
|
2001-09-29 04:34:11 +00:00
|
|
|
if (ifa->ifa_addr->sa_family != AF_INET)
|
|
|
|
continue;
|
|
|
|
ia = ifatoia(ifa);
|
1994-05-24 10:09:53 +00:00
|
|
|
if (satosin(&ia->ia_broadaddr)->sin_addr.s_addr ==
|
2009-04-20 14:35:42 +00:00
|
|
|
ip->ip_dst.s_addr) {
|
2013-10-15 11:37:57 +00:00
|
|
|
counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
|
|
|
|
counter_u64_add(ia->ia_ifa.ifa_ibytes,
|
|
|
|
m->m_pkthdr.len);
|
2012-01-05 19:00:36 +00:00
|
|
|
IF_ADDR_RUNLOCK(ifp);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto ours;
|
2009-04-20 14:35:42 +00:00
|
|
|
}
|
2004-07-08 22:35:36 +00:00
|
|
|
#ifdef BOOTP_COMPAT
|
2009-04-20 14:35:42 +00:00
|
|
|
if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY) {
|
2013-10-15 11:37:57 +00:00
|
|
|
counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
|
|
|
|
counter_u64_add(ia->ia_ifa.ifa_ibytes,
|
|
|
|
m->m_pkthdr.len);
|
2012-01-05 19:00:36 +00:00
|
|
|
IF_ADDR_RUNLOCK(ifp);
|
2004-07-08 22:35:36 +00:00
|
|
|
goto ours;
|
2009-04-20 14:35:42 +00:00
|
|
|
}
|
2004-07-08 22:35:36 +00:00
|
|
|
#endif
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
2012-01-05 19:00:36 +00:00
|
|
|
IF_ADDR_RUNLOCK(ifp);
|
2009-06-24 14:29:40 +00:00
|
|
|
ia = NULL;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
2007-02-03 06:45:51 +00:00
|
|
|
/* RFC 3927 2.7: Do not forward datagrams for 169.254.0.0/16. */
|
|
|
|
if (IN_LINKLOCAL(ntohl(ip->ip_dst.s_addr))) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_cantforward);
|
2007-02-03 06:45:51 +00:00
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ip_mrouter) {
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* If we are acting as a multicast router, all
|
|
|
|
* incoming multicast packets are passed to the
|
|
|
|
* kernel-level multicast forwarding function.
|
|
|
|
* The packet is returned (relatively) intact; if
|
|
|
|
* ip_mforward() returns a non-zero value, the packet
|
|
|
|
* must be discarded, else it may be accepted below.
|
|
|
|
*/
|
2009-04-20 14:35:42 +00:00
|
|
|
if (ip_mforward && ip_mforward(ip, ifp, m, 0) != 0) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_cantforward);
|
1994-05-24 10:09:53 +00:00
|
|
|
m_freem(m);
|
1996-02-05 20:36:02 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-05-12 00:22:38 +00:00
|
|
|
* The process-level routing daemon needs to receive
|
1994-05-24 10:09:53 +00:00
|
|
|
* all multicast IGMP packets, whether or not this
|
|
|
|
* host belongs to their destination groups.
|
|
|
|
*/
|
|
|
|
if (ip->ip_p == IPPROTO_IGMP)
|
|
|
|
goto ours;
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_forward);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
/*
|
2009-03-09 17:53:05 +00:00
|
|
|
* Assume the packet is for us, to avoid prematurely taking
|
|
|
|
* a lock on the in_multi hash. Protocols must perform
|
|
|
|
* their own filtering and update statistics accordingly.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
goto ours;
|
|
|
|
}
|
|
|
|
if (ip->ip_dst.s_addr == (u_long)INADDR_BROADCAST)
|
|
|
|
goto ours;
|
|
|
|
if (ip->ip_dst.s_addr == INADDR_ANY)
|
|
|
|
goto ours;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Not for us; forward if possible and desirable.
|
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ipforwarding == 0) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_cantforward);
|
2001-02-21 16:59:47 +00:00
|
|
|
m_freem(m);
|
2002-02-26 02:11:13 +00:00
|
|
|
} else {
|
2004-08-17 22:05:54 +00:00
|
|
|
ip_forward(m, dchg);
|
2002-02-26 02:11:13 +00:00
|
|
|
}
|
1996-02-05 20:36:02 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
ours:
|
2001-12-29 09:24:18 +00:00
|
|
|
#ifdef IPSTEALTH
|
|
|
|
/*
|
|
|
|
* IPSTEALTH: Process non-routing options only
|
|
|
|
* if the packet is destined for us.
|
|
|
|
*/
|
2013-10-15 11:37:57 +00:00
|
|
|
if (V_ipstealth && hlen > sizeof (struct ip) && ip_dooptions(m, 1))
|
2001-12-29 09:24:18 +00:00
|
|
|
return;
|
|
|
|
#endif /* IPSTEALTH */
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
2004-08-03 12:31:38 +00:00
|
|
|
* Attempt reassembly; if it succeeds, proceed.
|
|
|
|
* ip_reass() will return a different mbuf.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2012-10-22 21:09:03 +00:00
|
|
|
if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) {
|
2014-03-12 14:29:08 +00:00
|
|
|
/* XXXGL: shouldn't we save & set m_flags? */
|
2004-08-03 12:31:38 +00:00
|
|
|
m = ip_reass(m);
|
|
|
|
if (m == NULL)
|
2000-10-26 13:14:48 +00:00
|
|
|
return;
|
|
|
|
ip = mtod(m, struct ip *);
|
|
|
|
/* Get the header length of the reassembled packet */
|
2002-10-20 22:52:07 +00:00
|
|
|
hlen = ip->ip_hl << 2;
|
2004-08-03 12:31:38 +00:00
|
|
|
}
|
|
|
|
|
2007-07-03 12:13:45 +00:00
|
|
|
#ifdef IPSEC
|
2001-06-11 12:39:29 +00:00
|
|
|
/*
|
|
|
|
* enforce IPsec policy checking if we are seeing last header.
|
|
|
|
* note that we do not visit this with protocols with pcb layer
|
|
|
|
* code - like udp/tcp/raw ip.
|
|
|
|
*/
|
2014-12-11 14:58:55 +00:00
|
|
|
if (ip_ipsec_input(m, ip->ip_p) != 0)
|
2001-06-11 12:39:29 +00:00
|
|
|
goto bad;
|
2007-07-03 12:13:45 +00:00
|
|
|
#endif /* IPSEC */
|
2001-06-11 12:39:29 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Switch out to protocol's input routine.
|
|
|
|
*/
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_delivered);
|
2004-08-17 22:05:54 +00:00
|
|
|
|
2014-08-08 01:57:15 +00:00
|
|
|
(*inetsw[ip_protox[ip->ip_p]].pr_input)(&m, &hlen, ip->ip_p);
|
1996-02-05 20:36:02 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
bad:
|
|
|
|
m_freem(m);
|
1996-02-05 20:36:02 +00:00
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* IP timer processing;
|
|
|
|
* if a timer expires on a reassembly
|
|
|
|
* queue, discard it.
|
|
|
|
*/
|
|
|
|
void
|
2007-05-10 15:58:48 +00:00
|
|
|
ip_slowtimo(void)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
VNET_ITERATOR_DECL(vnet_iter);
|
1997-09-15 23:07:01 +00:00
|
|
|
|
2009-07-19 14:20:53 +00:00
|
|
|
VNET_LIST_RLOCK_NOSLEEP();
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
VNET_FOREACH(vnet_iter) {
|
|
|
|
CURVNET_SET(vnet_iter);
|
2015-04-10 06:02:37 +00:00
|
|
|
ipreass_slowtimo();
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
CURVNET_RESTORE();
|
2001-06-03 23:33:23 +00:00
|
|
|
}
|
2009-07-19 14:20:53 +00:00
|
|
|
VNET_LIST_RUNLOCK_NOSLEEP();
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2007-05-10 15:58:48 +00:00
|
|
|
ip_drain(void)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
VNET_ITERATOR_DECL(vnet_iter);
|
1995-12-19 20:46:15 +00:00
|
|
|
|
2009-07-19 14:20:53 +00:00
|
|
|
VNET_LIST_RLOCK_NOSLEEP();
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
VNET_FOREACH(vnet_iter) {
|
|
|
|
CURVNET_SET(vnet_iter);
|
2015-04-10 06:02:37 +00:00
|
|
|
ipreass_drain();
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
CURVNET_RESTORE();
|
1997-09-15 23:07:01 +00:00
|
|
|
}
|
2009-07-19 14:20:53 +00:00
|
|
|
VNET_LIST_RUNLOCK_NOSLEEP();
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
2004-10-19 15:45:57 +00:00
|
|
|
/*
|
|
|
|
* The protocol to be inserted into ip_protox[] must be already registered
|
|
|
|
* in inetsw[], either statically or through pf_proto_register().
|
|
|
|
*/
|
|
|
|
int
|
2010-09-02 17:43:44 +00:00
|
|
|
ipproto_register(short ipproto)
|
2004-10-19 15:45:57 +00:00
|
|
|
{
|
|
|
|
struct protosw *pr;
|
|
|
|
|
|
|
|
/* Sanity checks. */
|
2010-09-02 17:43:44 +00:00
|
|
|
if (ipproto <= 0 || ipproto >= IPPROTO_MAX)
|
2004-10-19 15:45:57 +00:00
|
|
|
return (EPROTONOSUPPORT);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The protocol slot must not be occupied by another protocol
|
|
|
|
* already. An index pointing to IPPROTO_RAW is unused.
|
|
|
|
*/
|
|
|
|
pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
|
|
|
|
if (pr == NULL)
|
|
|
|
return (EPFNOSUPPORT);
|
|
|
|
if (ip_protox[ipproto] != pr - inetsw) /* IPPROTO_RAW */
|
|
|
|
return (EEXIST);
|
|
|
|
|
|
|
|
/* Find the protocol position in inetsw[] and set the index. */
|
|
|
|
for (pr = inetdomain.dom_protosw;
|
|
|
|
pr < inetdomain.dom_protoswNPROTOSW; pr++) {
|
|
|
|
if (pr->pr_domain->dom_family == PF_INET &&
|
|
|
|
pr->pr_protocol && pr->pr_protocol == ipproto) {
|
2010-09-02 17:43:44 +00:00
|
|
|
ip_protox[pr->pr_protocol] = pr - inetsw;
|
|
|
|
return (0);
|
2004-10-19 15:45:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return (EPROTONOSUPPORT);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2010-09-02 17:43:44 +00:00
|
|
|
ipproto_unregister(short ipproto)
|
2004-10-19 15:45:57 +00:00
|
|
|
{
|
|
|
|
struct protosw *pr;
|
|
|
|
|
|
|
|
/* Sanity checks. */
|
2010-09-02 17:43:44 +00:00
|
|
|
if (ipproto <= 0 || ipproto >= IPPROTO_MAX)
|
2004-10-19 15:45:57 +00:00
|
|
|
return (EPROTONOSUPPORT);
|
|
|
|
|
|
|
|
/* Check if the protocol was indeed registered. */
|
|
|
|
pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
|
|
|
|
if (pr == NULL)
|
|
|
|
return (EPFNOSUPPORT);
|
|
|
|
if (ip_protox[ipproto] == pr - inetsw) /* IPPROTO_RAW */
|
|
|
|
return (ENOENT);
|
|
|
|
|
|
|
|
/* Reset the protocol slot to IPPROTO_RAW. */
|
|
|
|
ip_protox[ipproto] = pr - inetsw;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
u_char inetctlerrmap[PRC_NCMDS] = {
|
|
|
|
0, 0, 0, 0,
|
|
|
|
0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH,
|
|
|
|
EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED,
|
|
|
|
EMSGSIZE, EHOSTUNREACH, 0, 0,
|
2003-06-17 06:21:08 +00:00
|
|
|
0, 0, EHOSTUNREACH, 0,
|
2001-08-27 22:10:07 +00:00
|
|
|
ENOPROTOOPT, ECONNREFUSED
|
1994-05-24 10:09:53 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Forward a packet. If some error occurs return the sender
|
|
|
|
* an icmp packet. Note we can't always generate a meaningful
|
|
|
|
* icmp message because icmp doesn't have a large enough repertoire
|
|
|
|
* of codes and types.
|
|
|
|
*
|
|
|
|
* If not forwarding, just drop the packet. This could be confusing
|
|
|
|
* if ipforwarding was zero but some routing protocol was advancing
|
|
|
|
* us as a gateway to somewhere. However, we must let the routing
|
|
|
|
* protocol deal with that.
|
|
|
|
*
|
|
|
|
* The srcrt parameter indicates whether the packet is being forwarded
|
|
|
|
* via a source route.
|
|
|
|
*/
|
2004-08-17 22:05:54 +00:00
|
|
|
void
|
|
|
|
ip_forward(struct mbuf *m, int srcrt)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
struct ip *ip = mtod(m, struct ip *);
|
2009-05-27 12:44:36 +00:00
|
|
|
struct in_ifaddr *ia;
|
1994-05-24 10:09:53 +00:00
|
|
|
struct mbuf *mcopy;
|
2015-07-02 18:10:41 +00:00
|
|
|
struct sockaddr_in *sin;
|
2004-08-17 22:05:54 +00:00
|
|
|
struct in_addr dest;
|
2008-04-09 05:17:18 +00:00
|
|
|
struct route ro;
|
2005-05-04 13:09:19 +00:00
|
|
|
int error, type = 0, code = 0, mtu = 0;
|
2001-12-28 21:21:57 +00:00
|
|
|
|
2004-08-17 22:05:54 +00:00
|
|
|
if (m->m_flags & (M_BCAST|M_MCAST) || in_canforward(ip->ip_dst) == 0) {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_cantforward);
|
1994-05-24 10:09:53 +00:00
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
2014-12-11 16:53:29 +00:00
|
|
|
#ifdef IPSEC
|
|
|
|
if (ip_ipsec_fwd(m) != 0) {
|
|
|
|
IPSTAT_INC(ips_cantforward);
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif /* IPSEC */
|
1999-02-22 18:19:57 +00:00
|
|
|
#ifdef IPSTEALTH
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (!V_ipstealth) {
|
1999-02-22 18:19:57 +00:00
|
|
|
#endif
|
|
|
|
if (ip->ip_ttl <= IPTTLDEC) {
|
|
|
|
icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS,
|
2003-11-14 21:48:57 +00:00
|
|
|
0, 0);
|
1999-02-22 18:19:57 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#ifdef IPSTEALTH
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
1999-02-22 18:19:57 +00:00
|
|
|
#endif
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2015-07-02 18:10:41 +00:00
|
|
|
bzero(&ro, sizeof(ro));
|
|
|
|
sin = (struct sockaddr_in *)&ro.ro_dst;
|
|
|
|
sin->sin_family = AF_INET;
|
|
|
|
sin->sin_len = sizeof(*sin);
|
|
|
|
sin->sin_addr = ip->ip_dst;
|
|
|
|
#ifdef RADIX_MPATH
|
|
|
|
rtalloc_mpath_fib(&ro,
|
|
|
|
ntohl(ip->ip_src.s_addr ^ ip->ip_dst.s_addr),
|
|
|
|
M_GETFIB(m));
|
|
|
|
#else
|
|
|
|
in_rtalloc_ign(&ro, 0, M_GETFIB(m));
|
|
|
|
#endif
|
|
|
|
if (ro.ro_rt != NULL) {
|
|
|
|
ia = ifatoia(ro.ro_rt->rt_ifa);
|
|
|
|
ifa_ref(&ia->ia_ifa);
|
2015-07-09 16:28:36 +00:00
|
|
|
} else
|
|
|
|
ia = NULL;
|
2009-05-27 12:44:36 +00:00
|
|
|
#ifndef IPSEC
|
|
|
|
/*
|
|
|
|
* 'ia' may be NULL if there is no route for this destination.
|
|
|
|
* In case of IPsec, Don't discard it just yet, but pass it to
|
|
|
|
* ip_output in case of outgoing IPsec policy.
|
|
|
|
*/
|
2007-12-02 13:00:47 +00:00
|
|
|
if (!srcrt && ia == NULL) {
|
2003-11-14 21:48:57 +00:00
|
|
|
icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, 0, 0);
|
2015-07-02 18:10:41 +00:00
|
|
|
RO_RTFREE(&ro);
|
Make sure the cached forwarding route (ipforward_rt) is still up before
using it. Not checking this may have caused the wrong IP address to be
used when processing certain IP options (see example below). This also
caused the wrong route to be passed to ip_output() when forwarding, but
fortunately ip_output() is smart enough to detect this.
This example demonstrates the wrong behavior of the Record Route option
observed with this bug. Host ``freebsd'' is acting as the gateway for
the ``sysv''.
1. On the gateway, we add the route to the destination. The new route
will use the primary address of the loopback interface, 127.0.0.1:
: freebsd# route add 10.0.0.66 -iface lo0 -reject
: add host 10.0.0.66: gateway lo0
2. From the client, we ping the destination. We see the correct replies.
Please note that this also causes the relevant route on the ``freebsd''
gateway to be cached in ipforward_rt variable:
: sysv# ping -snv 10.0.0.66
: PING 10.0.0.66: 56 data bytes
: ICMP Host Unreachable from gateway 192.168.0.115
: ICMP Host Unreachable from gateway 192.168.0.115
: ICMP Host Unreachable from gateway 192.168.0.115
:
: ----10.0.0.66 PING Statistics----
: 3 packets transmitted, 0 packets received, 100% packet loss
3. On the gateway, we delete the route to the destination, thus making
the destination reachable through the `default' route:
: freebsd# route delete 10.0.0.66
: delete host 10.0.0.66
4. From the client, we ping destination again, now with the RR option
turned on. The surprise here is the 127.0.0.1 in the first reply.
This is caused by the bug in ip_rtaddr() not checking the cached
route is still up befor use. The debug code also shows that the
wrong (down) route is further passed to ip_output(). The latter
detects that the route is down, and replaces the bogus route with
the valid one, so we see the correct replies (192.168.0.115) on
further probes:
: sysv# ping -snRv 10.0.0.66
: PING 10.0.0.66: 56 data bytes
: 64 bytes from 10.0.0.66: icmp_seq=0. time=10. ms
: IP options: <record route> 127.0.0.1, 10.0.0.65, 10.0.0.66,
: 192.168.0.65, 192.168.0.115, 192.168.0.120,
: 0.0.0.0(Current), 0.0.0.0, 0.0.0.0
: 64 bytes from 10.0.0.66: icmp_seq=1. time=0. ms
: IP options: <record route> 192.168.0.115, 10.0.0.65, 10.0.0.66,
: 192.168.0.65, 192.168.0.115, 192.168.0.120,
: 0.0.0.0(Current), 0.0.0.0, 0.0.0.0
: 64 bytes from 10.0.0.66: icmp_seq=2. time=0. ms
: IP options: <record route> 192.168.0.115, 10.0.0.65, 10.0.0.66,
: 192.168.0.65, 192.168.0.115, 192.168.0.120,
: 0.0.0.0(Current), 0.0.0.0, 0.0.0.0
:
: ----10.0.0.66 PING Statistics----
: 3 packets transmitted, 3 packets received, 0% packet loss
: round-trip (ms) min/avg/max = 0/3/10
2001-03-18 13:04:07 +00:00
|
|
|
return;
|
2003-11-14 21:48:57 +00:00
|
|
|
}
|
2009-05-27 12:44:36 +00:00
|
|
|
#endif
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
It was possible for ip_forward() to supply to icmp_error()
an IP header with ip_len in network byte order. For certain
values of ip_len, this could cause icmp_error() to write
beyond the end of an mbuf, causing mbuf free-list corruption.
This problem was observed during generation of ICMP redirects.
We now make quite sure that the copy of the IP header kept
for icmp_error() is stored in a non-shared mbuf header so
that it will not be modified by ip_output().
Also:
- Calculate the correct number of bytes that need to be
retained for icmp_error(), instead of assuming that 64
is enough (it's not).
- In icmp_error(), use m_copydata instead of bcopy() to
copy from the supplied mbuf chain, in case the first 8
bytes of IP payload are not stored directly after the IP
header.
- Sanity-check ip_len in icmp_error(), and panic if it is
less than sizeof(struct ip). Incoming packets with bad
ip_len values are discarded in ip_input(), so this should
only be triggered by bugs in the code, not by bad packets.
This patch results from code and suggestions from Ruslan, Bosko,
Jonathan Lemon and Matt Dillon, with important testing by Mike
Tancsa, who could reproduce this problem at will.
Reported by: Mike Tancsa <mike@sentex.net>
Reviewed by: ru, bmilekic, jlemon, dillon
2001-03-08 19:03:26 +00:00
|
|
|
* Save the IP header and at most 8 bytes of the payload,
|
|
|
|
* in case we need to generate an ICMP message to the src.
|
|
|
|
*
|
2002-06-23 20:48:26 +00:00
|
|
|
* XXX this can be optimized a lot by saving the data in a local
|
|
|
|
* buffer on the stack (72 bytes at most), and only allocating the
|
|
|
|
* mbuf if really necessary. The vast majority of the packets
|
|
|
|
* are forwarded without having to send an ICMP back (either
|
|
|
|
* because unnecessary, or because rate limited), so we are
|
|
|
|
* really we are wasting a lot of work here.
|
|
|
|
*
|
It was possible for ip_forward() to supply to icmp_error()
an IP header with ip_len in network byte order. For certain
values of ip_len, this could cause icmp_error() to write
beyond the end of an mbuf, causing mbuf free-list corruption.
This problem was observed during generation of ICMP redirects.
We now make quite sure that the copy of the IP header kept
for icmp_error() is stored in a non-shared mbuf header so
that it will not be modified by ip_output().
Also:
- Calculate the correct number of bytes that need to be
retained for icmp_error(), instead of assuming that 64
is enough (it's not).
- In icmp_error(), use m_copydata instead of bcopy() to
copy from the supplied mbuf chain, in case the first 8
bytes of IP payload are not stored directly after the IP
header.
- Sanity-check ip_len in icmp_error(), and panic if it is
less than sizeof(struct ip). Incoming packets with bad
ip_len values are discarded in ip_input(), so this should
only be triggered by bugs in the code, not by bad packets.
This patch results from code and suggestions from Ruslan, Bosko,
Jonathan Lemon and Matt Dillon, with important testing by Mike
Tancsa, who could reproduce this problem at will.
Reported by: Mike Tancsa <mike@sentex.net>
Reviewed by: ru, bmilekic, jlemon, dillon
2001-03-08 19:03:26 +00:00
|
|
|
* We don't use m_copy() because it might return a reference
|
|
|
|
* to a shared cluster. Both this function and ip_output()
|
|
|
|
* assume exclusive access to the IP header in `m', so any
|
|
|
|
* data in a cluster may change before we reach icmp_error().
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2013-03-15 12:55:30 +00:00
|
|
|
mcopy = m_gethdr(M_NOWAIT, m->m_type);
|
2012-12-05 08:04:20 +00:00
|
|
|
if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_NOWAIT)) {
|
2002-12-30 20:22:40 +00:00
|
|
|
/*
|
|
|
|
* It's probably ok if the pkthdr dup fails (because
|
|
|
|
* the deep copy of the tag chain failed), but for now
|
|
|
|
* be conservative and just discard the copy since
|
|
|
|
* code below may some day want the tags.
|
|
|
|
*/
|
|
|
|
m_free(mcopy);
|
|
|
|
mcopy = NULL;
|
|
|
|
}
|
It was possible for ip_forward() to supply to icmp_error()
an IP header with ip_len in network byte order. For certain
values of ip_len, this could cause icmp_error() to write
beyond the end of an mbuf, causing mbuf free-list corruption.
This problem was observed during generation of ICMP redirects.
We now make quite sure that the copy of the IP header kept
for icmp_error() is stored in a non-shared mbuf header so
that it will not be modified by ip_output().
Also:
- Calculate the correct number of bytes that need to be
retained for icmp_error(), instead of assuming that 64
is enough (it's not).
- In icmp_error(), use m_copydata instead of bcopy() to
copy from the supplied mbuf chain, in case the first 8
bytes of IP payload are not stored directly after the IP
header.
- Sanity-check ip_len in icmp_error(), and panic if it is
less than sizeof(struct ip). Incoming packets with bad
ip_len values are discarded in ip_input(), so this should
only be triggered by bugs in the code, not by bad packets.
This patch results from code and suggestions from Ruslan, Bosko,
Jonathan Lemon and Matt Dillon, with important testing by Mike
Tancsa, who could reproduce this problem at will.
Reported by: Mike Tancsa <mike@sentex.net>
Reviewed by: ru, bmilekic, jlemon, dillon
2001-03-08 19:03:26 +00:00
|
|
|
if (mcopy != NULL) {
|
2012-10-22 21:09:03 +00:00
|
|
|
mcopy->m_len = min(ntohs(ip->ip_len), M_TRAILINGSPACE(mcopy));
|
2004-06-16 08:28:54 +00:00
|
|
|
mcopy->m_pkthdr.len = mcopy->m_len;
|
It was possible for ip_forward() to supply to icmp_error()
an IP header with ip_len in network byte order. For certain
values of ip_len, this could cause icmp_error() to write
beyond the end of an mbuf, causing mbuf free-list corruption.
This problem was observed during generation of ICMP redirects.
We now make quite sure that the copy of the IP header kept
for icmp_error() is stored in a non-shared mbuf header so
that it will not be modified by ip_output().
Also:
- Calculate the correct number of bytes that need to be
retained for icmp_error(), instead of assuming that 64
is enough (it's not).
- In icmp_error(), use m_copydata instead of bcopy() to
copy from the supplied mbuf chain, in case the first 8
bytes of IP payload are not stored directly after the IP
header.
- Sanity-check ip_len in icmp_error(), and panic if it is
less than sizeof(struct ip). Incoming packets with bad
ip_len values are discarded in ip_input(), so this should
only be triggered by bugs in the code, not by bad packets.
This patch results from code and suggestions from Ruslan, Bosko,
Jonathan Lemon and Matt Dillon, with important testing by Mike
Tancsa, who could reproduce this problem at will.
Reported by: Mike Tancsa <mike@sentex.net>
Reviewed by: ru, bmilekic, jlemon, dillon
2001-03-08 19:03:26 +00:00
|
|
|
m_copydata(m, 0, mcopy->m_len, mtod(mcopy, caddr_t));
|
|
|
|
}
|
Fixed broken ICMP error generation, unified conversion of IP header
fields between host and network byte order. The details:
o icmp_error() now does not add IP header length. This fixes the problem
when icmp_error() is called from ip_forward(). In this case the ip_len
of the original IP datagram returned with ICMP error was wrong.
o icmp_error() expects all three fields, ip_len, ip_id and ip_off in host
byte order, so DTRT and convert these fields back to network byte order
before sending a message. This fixes the problem described in PR 16240
and PR 20877 (ip_id field was returned in host byte order).
o ip_ttl decrement operation in ip_forward() was moved down to make sure
that it does not corrupt the copy of original IP datagram passed later
to icmp_error().
o A copy of original IP datagram in ip_forward() was made a read-write,
independent copy. This fixes the problem I first reported to Garrett
Wollman and Bill Fenner and later put in audit trail of PR 16240:
ip_output() (not always) converts fields of original datagram to network
byte order, but because copy (mcopy) and its original (m) most likely
share the same mbuf cluster, ip_output()'s manipulations on original
also corrupted the copy.
o ip_output() now expects all three fields, ip_len, ip_off and (what is
significant) ip_id in host byte order. It was a headache for years that
ip_id was handled differently. The only compatibility issue here is the
raw IP socket interface with IP_HDRINCL socket option set and a non-zero
ip_id field, but ip.4 manual page was unclear on whether in this case
ip_id field should be in host or network byte order.
2000-09-01 12:33:03 +00:00
|
|
|
|
|
|
|
#ifdef IPSTEALTH
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (!V_ipstealth) {
|
Fixed broken ICMP error generation, unified conversion of IP header
fields between host and network byte order. The details:
o icmp_error() now does not add IP header length. This fixes the problem
when icmp_error() is called from ip_forward(). In this case the ip_len
of the original IP datagram returned with ICMP error was wrong.
o icmp_error() expects all three fields, ip_len, ip_id and ip_off in host
byte order, so DTRT and convert these fields back to network byte order
before sending a message. This fixes the problem described in PR 16240
and PR 20877 (ip_id field was returned in host byte order).
o ip_ttl decrement operation in ip_forward() was moved down to make sure
that it does not corrupt the copy of original IP datagram passed later
to icmp_error().
o A copy of original IP datagram in ip_forward() was made a read-write,
independent copy. This fixes the problem I first reported to Garrett
Wollman and Bill Fenner and later put in audit trail of PR 16240:
ip_output() (not always) converts fields of original datagram to network
byte order, but because copy (mcopy) and its original (m) most likely
share the same mbuf cluster, ip_output()'s manipulations on original
also corrupted the copy.
o ip_output() now expects all three fields, ip_len, ip_off and (what is
significant) ip_id in host byte order. It was a headache for years that
ip_id was handled differently. The only compatibility issue here is the
raw IP socket interface with IP_HDRINCL socket option set and a non-zero
ip_id field, but ip.4 manual page was unclear on whether in this case
ip_id field should be in host or network byte order.
2000-09-01 12:33:03 +00:00
|
|
|
#endif
|
|
|
|
ip->ip_ttl -= IPTTLDEC;
|
|
|
|
#ifdef IPSTEALTH
|
|
|
|
}
|
|
|
|
#endif
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If forwarding packet using same interface that it came in on,
|
|
|
|
* perhaps should send a redirect to sender to shortcut a hop.
|
|
|
|
* Only send redirect if source is sending directly to us,
|
|
|
|
* and if packet was not source routed (or has any options).
|
|
|
|
* Also, don't send redirect if forwarding using a default route
|
|
|
|
* or a route modified by a redirect.
|
|
|
|
*/
|
2004-08-17 22:05:54 +00:00
|
|
|
dest.s_addr = 0;
|
2009-05-27 12:44:36 +00:00
|
|
|
if (!srcrt && V_ipsendredirects &&
|
|
|
|
ia != NULL && ia->ia_ifp == m->m_pkthdr.rcvif) {
|
2003-11-14 21:48:57 +00:00
|
|
|
struct rtentry *rt;
|
|
|
|
|
|
|
|
rt = ro.ro_rt;
|
|
|
|
|
|
|
|
if (rt && (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 &&
|
2004-08-17 22:05:54 +00:00
|
|
|
satosin(rt_key(rt))->sin_addr.s_addr != 0) {
|
1994-05-24 10:09:53 +00:00
|
|
|
#define RTA(rt) ((struct in_ifaddr *)(rt->rt_ifa))
|
2003-11-14 21:48:57 +00:00
|
|
|
u_long src = ntohl(ip->ip_src.s_addr);
|
|
|
|
|
|
|
|
if (RTA(rt) &&
|
|
|
|
(src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) {
|
|
|
|
if (rt->rt_flags & RTF_GATEWAY)
|
2004-08-17 22:05:54 +00:00
|
|
|
dest.s_addr = satosin(rt->rt_gateway)->sin_addr.s_addr;
|
2003-11-14 21:48:57 +00:00
|
|
|
else
|
2004-08-17 22:05:54 +00:00
|
|
|
dest.s_addr = ip->ip_dst.s_addr;
|
2003-11-14 21:48:57 +00:00
|
|
|
/* Router requirements says to only send host redirects */
|
|
|
|
type = ICMP_REDIRECT;
|
|
|
|
code = ICMP_REDIRECT_HOST;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-09 05:17:18 +00:00
|
|
|
error = ip_output(m, NULL, &ro, IP_FORWARDING, NULL, NULL);
|
|
|
|
|
|
|
|
if (error == EMSGSIZE && ro.ro_rt)
|
2014-03-05 01:17:47 +00:00
|
|
|
mtu = ro.ro_rt->rt_mtu;
|
2012-07-04 07:37:53 +00:00
|
|
|
RO_RTFREE(&ro);
|
2008-04-09 05:17:18 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
if (error)
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_cantforward);
|
1994-05-24 10:09:53 +00:00
|
|
|
else {
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_forward);
|
1994-05-24 10:09:53 +00:00
|
|
|
if (type)
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_redirectsent);
|
1994-05-24 10:09:53 +00:00
|
|
|
else {
|
2003-11-14 21:02:22 +00:00
|
|
|
if (mcopy)
|
1994-05-24 10:09:53 +00:00
|
|
|
m_freem(mcopy);
|
2009-06-23 20:19:09 +00:00
|
|
|
if (ia != NULL)
|
|
|
|
ifa_free(&ia->ia_ifa);
|
1994-05-24 10:09:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2009-06-23 20:19:09 +00:00
|
|
|
if (mcopy == NULL) {
|
|
|
|
if (ia != NULL)
|
|
|
|
ifa_free(&ia->ia_ifa);
|
1994-05-24 10:09:53 +00:00
|
|
|
return;
|
2009-06-23 20:19:09 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
switch (error) {
|
|
|
|
|
|
|
|
case 0: /* forwarded, but need redirect */
|
|
|
|
/* type, code set above */
|
|
|
|
break;
|
|
|
|
|
2009-05-27 12:44:36 +00:00
|
|
|
case ENETUNREACH:
|
1994-05-24 10:09:53 +00:00
|
|
|
case EHOSTUNREACH:
|
|
|
|
case ENETDOWN:
|
|
|
|
case EHOSTDOWN:
|
|
|
|
default:
|
|
|
|
type = ICMP_UNREACH;
|
|
|
|
code = ICMP_UNREACH_HOST;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case EMSGSIZE:
|
|
|
|
type = ICMP_UNREACH;
|
|
|
|
code = ICMP_UNREACH_NEEDFRAG;
|
2002-10-16 02:25:05 +00:00
|
|
|
|
2007-07-03 12:13:45 +00:00
|
|
|
#ifdef IPSEC
|
2008-04-09 05:17:18 +00:00
|
|
|
/*
|
|
|
|
* If IPsec is configured for this path,
|
|
|
|
* override any possibly mtu value set by ip_output.
|
|
|
|
*/
|
2010-04-21 10:21:34 +00:00
|
|
|
mtu = ip_ipsec_mtu(mcopy, mtu);
|
2007-07-03 12:13:45 +00:00
|
|
|
#endif /* IPSEC */
|
2004-08-17 22:05:54 +00:00
|
|
|
/*
|
2008-04-09 05:17:18 +00:00
|
|
|
* If the MTU was set before make sure we are below the
|
|
|
|
* interface MTU.
|
2006-01-24 17:57:19 +00:00
|
|
|
* If the MTU wasn't set before use the interface mtu or
|
|
|
|
* fall back to the next smaller mtu step compared to the
|
|
|
|
* current packet size.
|
2004-08-17 22:05:54 +00:00
|
|
|
*/
|
2008-04-09 05:17:18 +00:00
|
|
|
if (mtu != 0) {
|
|
|
|
if (ia != NULL)
|
|
|
|
mtu = min(mtu, ia->ia_ifp->if_mtu);
|
|
|
|
} else {
|
2006-01-24 17:57:19 +00:00
|
|
|
if (ia != NULL)
|
|
|
|
mtu = ia->ia_ifp->if_mtu;
|
|
|
|
else
|
2012-10-22 21:09:03 +00:00
|
|
|
mtu = ip_next_mtu(ntohs(ip->ip_len), 0);
|
2006-01-24 17:57:19 +00:00
|
|
|
}
|
2009-04-11 23:35:20 +00:00
|
|
|
IPSTAT_INC(ips_cantfrag);
|
1994-05-24 10:09:53 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ENOBUFS:
|
2000-05-15 18:41:01 +00:00
|
|
|
case EACCES: /* ipfw denied packet */
|
|
|
|
m_freem(mcopy);
|
2009-06-23 20:19:09 +00:00
|
|
|
if (ia != NULL)
|
|
|
|
ifa_free(&ia->ia_ifa);
|
2000-05-15 18:41:01 +00:00
|
|
|
return;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
2009-06-23 20:19:09 +00:00
|
|
|
if (ia != NULL)
|
|
|
|
ifa_free(&ia->ia_ifa);
|
2005-05-04 13:09:19 +00:00
|
|
|
icmp_error(mcopy, type, code, dest.s_addr, mtu);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1996-11-11 04:56:32 +00:00
|
|
|
void
|
2007-05-10 15:58:48 +00:00
|
|
|
ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip,
|
|
|
|
struct mbuf *m)
|
1996-11-11 04:56:32 +00:00
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
|
2004-01-31 10:40:25 +00:00
|
|
|
if (inp->inp_socket->so_options & (SO_BINTIME | SO_TIMESTAMP)) {
|
|
|
|
struct bintime bt;
|
|
|
|
|
|
|
|
bintime(&bt);
|
|
|
|
if (inp->inp_socket->so_options & SO_BINTIME) {
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)&bt, sizeof(bt),
|
|
|
|
SCM_BINTIME, SOL_SOCKET);
|
2004-01-31 10:40:25 +00:00
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
|
|
|
if (inp->inp_socket->so_options & SO_TIMESTAMP) {
|
|
|
|
struct timeval tv;
|
|
|
|
|
|
|
|
bintime2timeval(&bt, &tv);
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)&tv, sizeof(tv),
|
|
|
|
SCM_TIMESTAMP, SOL_SOCKET);
|
2004-01-31 10:40:25 +00:00
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
2002-05-31 11:52:35 +00:00
|
|
|
}
|
1996-11-11 04:56:32 +00:00
|
|
|
if (inp->inp_flags & INP_RECVDSTADDR) {
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)&ip->ip_dst,
|
1996-11-11 04:56:32 +00:00
|
|
|
sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
2003-04-29 21:36:18 +00:00
|
|
|
if (inp->inp_flags & INP_RECVTTL) {
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)&ip->ip_ttl,
|
2003-04-29 21:36:18 +00:00
|
|
|
sizeof(u_char), IP_RECVTTL, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
1996-11-11 04:56:32 +00:00
|
|
|
#ifdef notyet
|
|
|
|
/* XXX
|
|
|
|
* Moving these out of udp_input() made them even more broken
|
|
|
|
* than they already were.
|
|
|
|
*/
|
|
|
|
/* options were tossed already */
|
|
|
|
if (inp->inp_flags & INP_RECVOPTS) {
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)opts_deleted_above,
|
1996-11-11 04:56:32 +00:00
|
|
|
sizeof(struct in_addr), IP_RECVOPTS, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
|
|
|
/* ip_srcroute doesn't do what we want here, need to fix */
|
|
|
|
if (inp->inp_flags & INP_RECVRETOPTS) {
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)ip_srcroute(m),
|
1996-11-11 04:56:32 +00:00
|
|
|
sizeof(struct in_addr), IP_RECVRETOPTS, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (inp->inp_flags & INP_RECVIF) {
|
1997-11-05 02:51:32 +00:00
|
|
|
struct ifnet *ifp;
|
|
|
|
struct sdlbuf {
|
|
|
|
struct sockaddr_dl sdl;
|
|
|
|
u_char pad[32];
|
|
|
|
} sdlbuf;
|
|
|
|
struct sockaddr_dl *sdp;
|
|
|
|
struct sockaddr_dl *sdl2 = &sdlbuf.sdl;
|
|
|
|
|
2013-02-20 15:44:40 +00:00
|
|
|
if ((ifp = m->m_pkthdr.rcvif) &&
|
|
|
|
ifp->if_index && ifp->if_index <= V_if_index) {
|
2005-11-11 16:04:59 +00:00
|
|
|
sdp = (struct sockaddr_dl *)ifp->if_addr->ifa_addr;
|
1997-11-05 02:51:32 +00:00
|
|
|
/*
|
|
|
|
* Change our mind and don't try copy.
|
|
|
|
*/
|
2013-02-20 15:44:40 +00:00
|
|
|
if (sdp->sdl_family != AF_LINK ||
|
|
|
|
sdp->sdl_len > sizeof(sdlbuf)) {
|
1997-11-05 02:51:32 +00:00
|
|
|
goto makedummy;
|
|
|
|
}
|
|
|
|
bcopy(sdp, sdl2, sdp->sdl_len);
|
|
|
|
} else {
|
|
|
|
makedummy:
|
2013-02-20 15:44:40 +00:00
|
|
|
sdl2->sdl_len =
|
|
|
|
offsetof(struct sockaddr_dl, sdl_data[0]);
|
1997-11-05 02:51:32 +00:00
|
|
|
sdl2->sdl_family = AF_LINK;
|
|
|
|
sdl2->sdl_index = 0;
|
|
|
|
sdl2->sdl_nlen = sdl2->sdl_alen = sdl2->sdl_slen = 0;
|
|
|
|
}
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)sdl2, sdl2->sdl_len,
|
|
|
|
IP_RECVIF, IPPROTO_IP);
|
1996-11-11 04:56:32 +00:00
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
2012-06-12 14:02:38 +00:00
|
|
|
if (inp->inp_flags & INP_RECVTOS) {
|
2013-02-20 15:44:40 +00:00
|
|
|
*mp = sbcreatecontrol((caddr_t)&ip->ip_tos,
|
2012-06-12 14:02:38 +00:00
|
|
|
sizeof(u_char), IP_RECVTOS, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
2014-09-09 01:45:39 +00:00
|
|
|
|
|
|
|
if (inp->inp_flags2 & INP_RECVFLOWID) {
|
|
|
|
uint32_t flowid, flow_type;
|
|
|
|
|
|
|
|
flowid = m->m_pkthdr.flowid;
|
|
|
|
flow_type = M_HASHTYPE_GET(m);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX should handle the failure of one or the
|
|
|
|
* other - don't populate both?
|
|
|
|
*/
|
|
|
|
*mp = sbcreatecontrol((caddr_t) &flowid,
|
|
|
|
sizeof(uint32_t), IP_FLOWID, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
*mp = sbcreatecontrol((caddr_t) &flow_type,
|
|
|
|
sizeof(uint32_t), IP_FLOWTYPE, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef RSS
|
|
|
|
if (inp->inp_flags2 & INP_RECVRSSBUCKETID) {
|
|
|
|
uint32_t flowid, flow_type;
|
|
|
|
uint32_t rss_bucketid;
|
|
|
|
|
|
|
|
flowid = m->m_pkthdr.flowid;
|
|
|
|
flow_type = M_HASHTYPE_GET(m);
|
|
|
|
|
|
|
|
if (rss_hash2bucket(flowid, flow_type, &rss_bucketid) == 0) {
|
|
|
|
*mp = sbcreatecontrol((caddr_t) &rss_bucketid,
|
|
|
|
sizeof(uint32_t), IP_RSSBUCKETID, IPPROTO_IP);
|
|
|
|
if (*mp)
|
|
|
|
mp = &(*mp)->m_next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1996-11-11 04:56:32 +00:00
|
|
|
}
|
|
|
|
|
2002-06-23 20:48:26 +00:00
|
|
|
/*
|
2007-03-25 21:49:50 +00:00
|
|
|
* XXXRW: Multicast routing code in ip_mroute.c is generally MPSAFE, but the
|
|
|
|
* ip_rsvp and ip_rsvp_on variables need to be interlocked with rsvp_on
|
|
|
|
* locking. This code remains in ip_input.c as ip_mroute.c is optionally
|
|
|
|
* compiled.
|
2002-06-23 20:48:26 +00:00
|
|
|
*/
|
2010-11-22 19:32:54 +00:00
|
|
|
static VNET_DEFINE(int, ip_rsvp_on);
|
2010-04-29 11:52:42 +00:00
|
|
|
VNET_DEFINE(struct socket *, ip_rsvpd);
|
|
|
|
|
|
|
|
#define V_ip_rsvp_on VNET(ip_rsvp_on)
|
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
int
|
|
|
|
ip_rsvp_init(struct socket *so)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
|
1994-09-06 22:42:31 +00:00
|
|
|
if (so->so_type != SOCK_RAW ||
|
|
|
|
so->so_proto->pr_protocol != IPPROTO_RSVP)
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
return EOPNOTSUPP;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ip_rsvpd != NULL)
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
return EADDRINUSE;
|
1994-09-06 22:42:31 +00:00
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ip_rsvpd = so;
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* This may seem silly, but we need to be sure we don't over-increment
|
|
|
|
* the RSVP counter, in case something slips up.
|
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (!V_ip_rsvp_on) {
|
|
|
|
V_ip_rsvp_on = 1;
|
|
|
|
V_rsvp_on++;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
ip_rsvp_done(void)
|
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
V_ip_rsvpd = NULL;
|
1995-06-13 17:51:16 +00:00
|
|
|
/*
|
|
|
|
* This may seem silly, but we need to be sure we don't over-decrement
|
|
|
|
* the RSVP counter, in case something slips up.
|
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ip_rsvp_on) {
|
|
|
|
V_ip_rsvp_on = 0;
|
|
|
|
V_rsvp_on--;
|
1995-06-13 17:51:16 +00:00
|
|
|
}
|
1994-09-06 22:42:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
|
2014-08-08 01:57:15 +00:00
|
|
|
int
|
|
|
|
rsvp_input(struct mbuf **mp, int *offp, int proto)
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
{
|
2014-08-08 01:57:15 +00:00
|
|
|
struct mbuf *m;
|
|
|
|
|
|
|
|
m = *mp;
|
|
|
|
*mp = NULL;
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
if (rsvp_input_p) { /* call the real one if loaded */
|
2014-08-08 01:57:15 +00:00
|
|
|
*mp = m;
|
|
|
|
rsvp_input_p(mp, offp, proto);
|
|
|
|
return (IPPROTO_DONE);
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Can still get packets with rsvp_on = 0 if there is a local member
|
|
|
|
* of the group to which the RSVP packet is addressed. But in this
|
|
|
|
* case we want to throw the packet away.
|
|
|
|
*/
|
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (!V_rsvp_on) {
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
m_freem(m);
|
2014-08-08 01:57:15 +00:00
|
|
|
return (IPPROTO_DONE);
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
}
|
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
if (V_ip_rsvpd != NULL) {
|
2014-08-08 01:57:15 +00:00
|
|
|
*mp = m;
|
|
|
|
rip_input(mp, offp, proto);
|
|
|
|
return (IPPROTO_DONE);
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
}
|
|
|
|
/* Drop the packet */
|
|
|
|
m_freem(m);
|
2014-08-08 01:57:15 +00:00
|
|
|
return (IPPROTO_DONE);
|
Massive cleanup of the ip_mroute code.
No functional changes, but:
+ the mrouting module now should behave the same as the compiled-in
version (it did not before, some of the rsvp code was not loaded
properly);
+ netinet/ip_mroute.c is now truly optional;
+ removed some redundant/unused code;
+ changed many instances of '0' to NULL and INADDR_ANY as appropriate;
+ removed several static variables to make the code more SMP-friendly;
+ fixed some minor bugs in the mrouting code (mostly, incorrect return
values from functions).
This commit is also a prerequisite to the addition of support for PIM,
which i would like to put in before DP2 (it does not change any of
the existing APIs, anyways).
Note, in the process we found out that some device drivers fail to
properly handle changes in IFF_ALLMULTI, leading to interesting
behaviour when a multicast router is started. This bug is not
corrected by this commit, and will be fixed with a separate commit.
Detailed changes:
--------------------
netinet/ip_mroute.c all the above.
conf/files make ip_mroute.c optional
net/route.c fix mrt_ioctl hook
netinet/ip_input.c fix ip_mforward hook, move rsvp_input() here
together with other rsvp code, and a couple
of indentation fixes.
netinet/ip_output.c fix ip_mforward and ip_mcast_src hooks
netinet/ip_var.h rsvp function hooks
netinet/raw_ip.c hooks for mrouting and rsvp functions, plus
interface cleanup.
netinet/ip_mroute.h remove an unused and optional field from a struct
Most of the code is from Pavlin Radoslavov and the XORP project
Reviewed by: sam
MFC after: 1 week
2002-11-15 22:53:53 +00:00
|
|
|
}
|