1996-07-10 19:44:30 +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.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
* 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.
|
|
|
|
*
|
1999-08-28 01:08:13 +00:00
|
|
|
* $FreeBSD$
|
1996-07-10 19:44:30 +00:00
|
|
|
*/
|
|
|
|
|
1998-01-08 23:42:31 +00:00
|
|
|
#include "opt_inet.h"
|
1998-05-25 10:37:48 +00:00
|
|
|
#include "opt_ipfw.h"
|
1998-06-12 02:48:47 +00:00
|
|
|
#include "opt_ipdivert.h"
|
1999-12-22 19:13:38 +00:00
|
|
|
#include "opt_ipsec.h"
|
2002-07-31 16:42:47 +00:00
|
|
|
#include "opt_mac.h"
|
1998-01-08 23:42:31 +00:00
|
|
|
|
|
|
|
#ifndef INET
|
1998-05-15 20:11:40 +00:00
|
|
|
#error "IPDIVERT requires INET."
|
1998-01-08 23:42:31 +00:00
|
|
|
#endif
|
|
|
|
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/param.h>
|
2000-08-03 14:09:52 +00:00
|
|
|
#include <sys/kernel.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/lock.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/malloc.h>
|
2002-07-31 16:42:47 +00:00
|
|
|
#include <sys/mac.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/mbuf.h>
|
2001-11-08 02:13:18 +00:00
|
|
|
#include <sys/proc.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/protosw.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/signalvar.h>
|
|
|
|
#include <sys/socket.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/socketvar.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/sx.h>
|
2000-08-03 14:09:52 +00:00
|
|
|
#include <sys/sysctl.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/systm.h>
|
1998-03-28 10:18:26 +00:00
|
|
|
|
2002-03-20 05:48:55 +00:00
|
|
|
#include <vm/uma.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
#include <net/if.h>
|
|
|
|
#include <net/route.h>
|
|
|
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/in_pcb.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/in_systm.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <netinet/in_var.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/ip.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <netinet/ip_var.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Divert sockets
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate enough space to hold a full IP packet
|
|
|
|
*/
|
|
|
|
#define DIVSNDQ (65536 + 100)
|
|
|
|
#define DIVRCVQ (65536 + 100)
|
|
|
|
|
|
|
|
/*
|
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
|
|
|
* Divert sockets work in conjunction with ipfw, see the divert(4)
|
|
|
|
* manpage for features.
|
|
|
|
* Internally, packets selected by ipfw in ip_input() or ip_output(),
|
|
|
|
* and never diverted before, are passed to the input queue of the
|
|
|
|
* divert socket with a given 'divert_port' number (as specified in
|
|
|
|
* the matching ipfw rule), and they are tagged with a 16 bit cookie
|
|
|
|
* (representing the rule number of the matching ipfw rule), which
|
|
|
|
* is passed to process reading from the socket.
|
1998-05-25 10:37:48 +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
|
|
|
* Packets written to the divert socket are again tagged with a cookie
|
|
|
|
* (usually the same as above) and a destination address.
|
|
|
|
* If the destination address is INADDR_ANY then the packet is
|
|
|
|
* treated as outgoing and sent to ip_output(), otherwise it is
|
|
|
|
* treated as incoming and sent to ip_input().
|
|
|
|
* In both cases, the packet is tagged with the cookie.
|
1999-12-06 00:43:07 +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
|
|
|
* On reinjection, processing in ip_input() and ip_output()
|
|
|
|
* will be exactly the same as for the original packet, except that
|
|
|
|
* ipfw processing will start at the rule number after the one
|
|
|
|
* written in the cookie (so, tagging a packet with a cookie of 0
|
|
|
|
* will cause it to be effectively considered as a standard packet).
|
1996-07-10 19:44:30 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* Internal variables */
|
|
|
|
static struct inpcbhead divcb;
|
|
|
|
static struct inpcbinfo divcbinfo;
|
|
|
|
|
|
|
|
static u_long div_sendspace = DIVSNDQ; /* XXX sysctl ? */
|
|
|
|
static u_long div_recvspace = DIVRCVQ; /* XXX sysctl ? */
|
|
|
|
|
|
|
|
/* Optimization: have this preinitialized */
|
|
|
|
static struct sockaddr_in divsrc = { sizeof(divsrc), AF_INET };
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize divert connection block queue.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
div_init(void)
|
|
|
|
{
|
2002-06-11 10:58:57 +00:00
|
|
|
INP_INFO_LOCK_INIT(&divcbinfo, "div");
|
1996-07-10 19:44:30 +00:00
|
|
|
LIST_INIT(&divcb);
|
|
|
|
divcbinfo.listhead = &divcb;
|
|
|
|
/*
|
|
|
|
* XXX We don't use the hash list for divert IP, but it's easier
|
|
|
|
* to allocate a one entry hash list than it is to check all
|
|
|
|
* over the place for hashbase == NULL.
|
|
|
|
*/
|
1997-03-03 09:23:37 +00:00
|
|
|
divcbinfo.hashbase = hashinit(1, M_PCB, &divcbinfo.hashmask);
|
Improved connection establishment performance by doing local port lookups via
a hashed port list. In the new scheme, in_pcblookup() goes away and is
replaced by a new routine, in_pcblookup_local() for doing the local port
check. Note that this implementation is space inefficient in that the PCB
struct is now too large to fit into 128 bytes. I might deal with this in the
future by using the new zone allocator, but I wanted these changes to be
extensively tested in their current form first.
Also:
1) Fixed off-by-one errors in the port lookup loops in in_pcbbind().
2) Got rid of some unneeded rehashing. Adding a new routine, in_pcbinshash()
to do the initialial hash insertion.
3) Renamed in_pcblookuphash() to in_pcblookup_hash() for easier readability.
4) Added a new routine, in_pcbremlists() to remove the PCB from the various
hash lists.
5) Added/deleted comments where appropriate.
6) Removed unnecessary splnet() locking. In general, the PCB functions should
be called at splnet()...there are unfortunately a few exceptions, however.
7) Reorganized a few structs for better cache line behavior.
8) Killed my TCP_ACK_HACK kludge. It may come back in a different form in
the future, however.
These changes have been tested on wcarchive for more than a month. In tests
done here, connection establishment overhead is reduced by more than 50
times, thus getting rid of one of the major networking scalability problems.
Still to do: make tcp_fastimo/tcp_slowtimo scale well for systems with a
large number of connections. tcp_fastimo is easy; tcp_slowtimo is difficult.
WARNING: Anything that knows about inpcb and tcpcb structs will have to be
recompiled; at the very least, this includes netstat(1).
1998-01-27 09:15:13 +00:00
|
|
|
divcbinfo.porthashbase = hashinit(1, M_PCB, &divcbinfo.porthashmask);
|
2002-03-20 05:48:55 +00:00
|
|
|
divcbinfo.ipi_zone = uma_zcreate("divcb", sizeof(struct inpcb),
|
|
|
|
NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
|
|
|
|
uma_zone_set_max(divcbinfo.ipi_zone, maxsockets);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-10-29 16:46:13 +00:00
|
|
|
* IPPROTO_DIVERT is not in the real IP protocol number space; this
|
|
|
|
* function should never be called. Just in case, drop any packets.
|
1996-07-10 19:44:30 +00:00
|
|
|
*/
|
|
|
|
void
|
2001-09-03 20:03:55 +00:00
|
|
|
div_input(struct mbuf *m, int off)
|
1999-12-06 00:43:07 +00:00
|
|
|
{
|
|
|
|
ipstat.ips_noproto++;
|
|
|
|
m_freem(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Divert a packet by passing it up to the divert socket at port 'port'.
|
|
|
|
*
|
|
|
|
* Setup generic address and protocol structures for div_input routine,
|
|
|
|
* then pass them along with mbuf chain.
|
|
|
|
*/
|
|
|
|
void
|
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
|
|
|
divert_packet(struct mbuf *m, int incoming, int port, int rule)
|
1996-07-10 19:44:30 +00:00
|
|
|
{
|
1997-06-02 05:02:37 +00:00
|
|
|
struct ip *ip;
|
|
|
|
struct inpcb *inp;
|
|
|
|
struct socket *sa;
|
1999-12-06 00:43:07 +00:00
|
|
|
u_int16_t nport;
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
/* Sanity check */
|
2001-12-10 08:09:49 +00:00
|
|
|
KASSERT(port != 0, ("%s: port=0", __func__));
|
1999-12-06 00:43:07 +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
|
|
|
divsrc.sin_port = rule; /* record matching rule */
|
1997-06-02 05:02:37 +00:00
|
|
|
|
|
|
|
/* Assure header */
|
|
|
|
if (m->m_len < sizeof(struct ip) &&
|
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
|
|
|
(m = m_pullup(m, sizeof(struct ip))) == 0)
|
1997-06-02 05:02:37 +00:00
|
|
|
return;
|
|
|
|
ip = mtod(m, struct ip *);
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1998-07-06 09:06:58 +00:00
|
|
|
/*
|
1999-12-06 00:43:07 +00:00
|
|
|
* Record receive interface address, if any.
|
1998-07-06 09:06:58 +00:00
|
|
|
* But only for incoming packets.
|
|
|
|
*/
|
1996-07-10 19:44:30 +00:00
|
|
|
divsrc.sin_addr.s_addr = 0;
|
1999-12-06 00:43:07 +00:00
|
|
|
if (incoming) {
|
1996-07-10 19:44:30 +00:00
|
|
|
struct ifaddr *ifa;
|
|
|
|
|
1997-06-02 05:02:37 +00:00
|
|
|
/* Sanity check */
|
2001-12-10 08:09:49 +00:00
|
|
|
KASSERT((m->m_flags & M_PKTHDR), ("%s: !PKTHDR", __func__));
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1998-05-25 08:44:31 +00:00
|
|
|
/* Find IP address for receive interface */
|
2001-02-04 13:13:25 +00:00
|
|
|
TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrhead, ifa_link) {
|
1996-07-10 19:44:30 +00:00
|
|
|
if (ifa->ifa_addr == NULL)
|
|
|
|
continue;
|
|
|
|
if (ifa->ifa_addr->sa_family != AF_INET)
|
|
|
|
continue;
|
|
|
|
divsrc.sin_addr =
|
|
|
|
((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
|
|
|
|
break;
|
|
|
|
}
|
1998-06-12 01:54:29 +00:00
|
|
|
}
|
1998-07-06 09:06:58 +00:00
|
|
|
/*
|
|
|
|
* Record the incoming interface name whenever we have one.
|
|
|
|
*/
|
1998-12-04 22:54:57 +00:00
|
|
|
bzero(&divsrc.sin_zero, sizeof(divsrc.sin_zero));
|
1998-06-12 01:54:29 +00:00
|
|
|
if (m->m_pkthdr.rcvif) {
|
1998-05-25 08:44:31 +00:00
|
|
|
/*
|
|
|
|
* Hide the actual interface name in there in the
|
|
|
|
* sin_zero array. XXX This needs to be moved to a
|
|
|
|
* different sockaddr type for divert, e.g.
|
|
|
|
* sockaddr_div with multiple fields like
|
|
|
|
* sockaddr_dl. Presently we have only 7 bytes
|
|
|
|
* but that will do for now as most interfaces
|
|
|
|
* are 4 or less + 2 or less bytes for unit.
|
|
|
|
* There is probably a faster way of doing this,
|
|
|
|
* possibly taking it from the sockaddr_dl on the iface.
|
|
|
|
* This solves the problem of a P2P link and a LAN interface
|
|
|
|
* having the same address, which can result in the wrong
|
|
|
|
* interface being assigned to the packet when fed back
|
|
|
|
* into the divert socket. Theoretically if the daemon saves
|
|
|
|
* and re-uses the sockaddr_in as suggested in the man pages,
|
|
|
|
* this iface name will come along for the ride.
|
|
|
|
* (see div_output for the other half of this.)
|
|
|
|
*/
|
1998-12-04 22:54:57 +00:00
|
|
|
snprintf(divsrc.sin_zero, sizeof(divsrc.sin_zero),
|
|
|
|
"%s%d", m->m_pkthdr.rcvif->if_name,
|
|
|
|
m->m_pkthdr.rcvif->if_unit);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Put packet on socket queue, if any */
|
|
|
|
sa = NULL;
|
1999-12-06 00:43:07 +00:00
|
|
|
nport = htons((u_int16_t)port);
|
2001-02-04 13:13:25 +00:00
|
|
|
LIST_FOREACH(inp, &divcb, inp_list) {
|
1999-12-06 00:43:07 +00:00
|
|
|
if (inp->inp_lport == nport)
|
1996-07-10 19:44:30 +00:00
|
|
|
sa = inp->inp_socket;
|
|
|
|
}
|
|
|
|
if (sa) {
|
|
|
|
if (sbappendaddr(&sa->so_rcv, (struct sockaddr *)&divsrc,
|
|
|
|
m, (struct mbuf *)0) == 0)
|
|
|
|
m_freem(m);
|
2002-05-31 11:52:35 +00:00
|
|
|
else
|
1996-07-10 19:44:30 +00:00
|
|
|
sorwakeup(sa);
|
|
|
|
} else {
|
|
|
|
m_freem(m);
|
|
|
|
ipstat.ips_noproto++;
|
|
|
|
ipstat.ips_delivered--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Deliver packet back into the IP processing machinery.
|
|
|
|
*
|
|
|
|
* If no address specified, or address is 0.0.0.0, send to ip_output();
|
|
|
|
* otherwise, send to ip_input() and mark as having been received on
|
|
|
|
* the interface with that address.
|
|
|
|
*/
|
|
|
|
static int
|
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
|
|
|
div_output(struct socket *so, struct mbuf *m,
|
|
|
|
struct sockaddr_in *sin, struct mbuf *control)
|
1996-07-10 19:44:30 +00:00
|
|
|
{
|
|
|
|
int error = 0;
|
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 m_hdr divert_tag;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Prepare the tag for divert info. Note that a packet
|
|
|
|
* with a 0 tag in mh_data is effectively untagged,
|
|
|
|
* so we could optimize that case.
|
|
|
|
*/
|
|
|
|
divert_tag.mh_type = MT_TAG;
|
|
|
|
divert_tag.mh_flags = PACKET_TAG_DIVERT;
|
|
|
|
divert_tag.mh_next = m;
|
|
|
|
divert_tag.mh_data = 0; /* the matching rule # */
|
|
|
|
m->m_pkthdr.rcvif = NULL; /* XXX is it necessary ? */
|
1996-07-10 19:44:30 +00:00
|
|
|
|
2002-07-31 16:42:47 +00:00
|
|
|
#ifdef MAC
|
|
|
|
mac_create_mbuf_from_socket(so, m);
|
|
|
|
#endif
|
|
|
|
|
1996-07-10 19:44:30 +00:00
|
|
|
if (control)
|
|
|
|
m_freem(control); /* XXX */
|
|
|
|
|
1998-06-12 01:54:29 +00:00
|
|
|
/* Loopback avoidance and state recovery */
|
1998-05-25 07:41:23 +00:00
|
|
|
if (sin) {
|
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
|
|
|
int i;
|
1998-06-12 01:54:29 +00:00
|
|
|
|
2002-10-24 09:58:50 +00:00
|
|
|
divert_tag.mh_data = (caddr_t)(uintptr_t)sin->sin_port;
|
1998-06-12 01:54:29 +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
|
|
|
* Find receive interface with the given name, stuffed
|
|
|
|
* (if it exists) in the sin_zero[] field.
|
|
|
|
* The name is user supplied data so don't trust its size
|
|
|
|
* or that it is zero terminated.
|
1998-06-12 01:54:29 +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
|
|
|
for (i = 0; sin->sin_zero[i] && i < sizeof(sin->sin_zero); i++)
|
|
|
|
;
|
|
|
|
if ( i > 0 && i < sizeof(sin->sin_zero))
|
1998-06-12 01:54:29 +00:00
|
|
|
m->m_pkthdr.rcvif = ifunit(sin->sin_zero);
|
1998-05-25 10:37:48 +00:00
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
/* Reinject packet into the system as incoming or outgoing */
|
|
|
|
if (!sin || sin->sin_addr.s_addr == 0) {
|
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 inpcb *const inp = sotoinpcb(so);
|
|
|
|
struct ip *const ip = mtod(m, struct ip *);
|
|
|
|
|
1998-06-12 01:54:29 +00:00
|
|
|
/*
|
|
|
|
* Don't allow both user specified and setsockopt options,
|
|
|
|
* and don't allow packet length sizes that will crash
|
|
|
|
*/
|
1996-07-10 19:44:30 +00:00
|
|
|
if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) ||
|
|
|
|
((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
|
|
|
|
error = EINVAL;
|
|
|
|
goto cantsend;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert fields to host order for ip_output() */
|
2002-02-18 20:35:27 +00:00
|
|
|
ip->ip_len = ntohs(ip->ip_len);
|
|
|
|
ip->ip_off = ntohs(ip->ip_off);
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
/* Send packet to output processing */
|
|
|
|
ipstat.ips_rawout++; /* XXX */
|
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
|
|
|
error = ip_output((struct mbuf *)&divert_tag,
|
|
|
|
inp->inp_options, &inp->inp_route,
|
|
|
|
(so->so_options & SO_DONTROUTE) |
|
|
|
|
IP_ALLOWBROADCAST | IP_RAWOUTPUT,
|
2002-10-16 01:54:46 +00:00
|
|
|
inp->inp_moptions, NULL);
|
1996-07-10 19:44:30 +00:00
|
|
|
} else {
|
1998-06-12 01:54:29 +00:00
|
|
|
if (m->m_pkthdr.rcvif == NULL) {
|
1999-02-08 05:48:46 +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
|
|
|
* No luck with the name, check by IP address.
|
|
|
|
* Clear the port and the ifname to make sure
|
|
|
|
* there are no distractions for ifa_ifwithaddr.
|
1999-02-08 05:48:46 +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 ifaddr *ifa;
|
|
|
|
|
1999-02-08 05:48:46 +00:00
|
|
|
bzero(sin->sin_zero, sizeof(sin->sin_zero));
|
|
|
|
sin->sin_port = 0;
|
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
|
|
|
ifa = ifa_ifwithaddr((struct sockaddr *) sin);
|
|
|
|
if (ifa == NULL) {
|
1998-05-25 08:44:31 +00:00
|
|
|
error = EADDRNOTAVAIL;
|
|
|
|
goto cantsend;
|
|
|
|
}
|
|
|
|
m->m_pkthdr.rcvif = ifa->ifa_ifp;
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
/* Send packet to input processing */
|
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
|
|
|
ip_input((struct mbuf *)&divert_tag);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
|
|
|
cantsend:
|
|
|
|
m_freem(m);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
2001-09-12 08:38:13 +00:00
|
|
|
div_attach(struct socket *so, int proto, struct thread *td)
|
1996-07-10 19:44:30 +00:00
|
|
|
{
|
1997-05-24 17:23:11 +00:00
|
|
|
struct inpcb *inp;
|
1997-12-18 09:13:39 +00:00
|
|
|
int error, s;
|
1997-05-24 17:23:11 +00:00
|
|
|
|
|
|
|
inp = sotoinpcb(so);
|
|
|
|
if (inp)
|
|
|
|
panic("div_attach");
|
2002-04-01 21:31:13 +00:00
|
|
|
if (td && (error = suser(td)) != 0)
|
1997-05-24 17:23:11 +00:00
|
|
|
return error;
|
|
|
|
|
1999-12-22 19:13:38 +00:00
|
|
|
error = soreserve(so, div_sendspace, div_recvspace);
|
|
|
|
if (error)
|
|
|
|
return error;
|
1997-12-18 09:13:39 +00:00
|
|
|
s = splnet();
|
2001-09-12 08:38:13 +00:00
|
|
|
error = in_pcballoc(so, &divcbinfo, td);
|
1997-12-18 09:13:39 +00:00
|
|
|
splx(s);
|
|
|
|
if (error)
|
1997-05-24 17:23:11 +00:00
|
|
|
return error;
|
|
|
|
inp = (struct inpcb *)so->so_pcb;
|
|
|
|
inp->inp_ip_p = proto;
|
2000-08-03 14:09:52 +00:00
|
|
|
inp->inp_vflag |= INP_IPV4;
|
1997-05-24 17:23:11 +00:00
|
|
|
inp->inp_flags |= INP_HDRINCL;
|
|
|
|
/* The socket is always "connected" because
|
|
|
|
we always know "where" to send the packet */
|
|
|
|
so->so_state |= SS_ISCONNECTED;
|
|
|
|
return 0;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
|
|
|
div_detach(struct socket *so)
|
|
|
|
{
|
|
|
|
struct inpcb *inp;
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
inp = sotoinpcb(so);
|
|
|
|
if (inp == 0)
|
|
|
|
panic("div_detach");
|
|
|
|
in_pcbdetach(inp);
|
|
|
|
return 0;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
|
|
|
div_abort(struct socket *so)
|
|
|
|
{
|
|
|
|
soisdisconnected(so);
|
|
|
|
return div_detach(so);
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
|
|
|
div_disconnect(struct socket *so)
|
|
|
|
{
|
2002-05-31 11:52:35 +00:00
|
|
|
if ((so->so_state & SS_ISCONNECTED) == 0)
|
1997-05-24 17:23:11 +00:00
|
|
|
return ENOTCONN;
|
|
|
|
return div_abort(so);
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
2001-09-12 08:38:13 +00:00
|
|
|
div_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
|
1997-05-24 17:23:11 +00:00
|
|
|
{
|
|
|
|
struct inpcb *inp;
|
|
|
|
int s;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
s = splnet();
|
1997-06-01 15:58:44 +00:00
|
|
|
inp = sotoinpcb(so);
|
2002-06-23 09:13:46 +00:00
|
|
|
/* in_pcbbind assumes that nam is a sockaddr_in
|
2000-05-02 23:53:46 +00:00
|
|
|
* and in_pcbbind requires a valid address. Since divert
|
|
|
|
* sockets don't we need to make sure the address is
|
|
|
|
* filled in properly.
|
|
|
|
* XXX -- divert should not be abusing in_pcbind
|
|
|
|
* and should probably have its own family.
|
|
|
|
*/
|
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
|
|
|
if (nam->sa_family != AF_INET)
|
2000-05-02 23:53:46 +00:00
|
|
|
error = EAFNOSUPPORT;
|
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
|
|
|
else {
|
2000-05-02 23:53:46 +00:00
|
|
|
((struct sockaddr_in *)nam)->sin_addr.s_addr = INADDR_ANY;
|
2001-09-12 08:38:13 +00:00
|
|
|
error = in_pcbbind(inp, nam, td);
|
2000-05-02 23:53:46 +00:00
|
|
|
}
|
1997-05-24 17:23:11 +00:00
|
|
|
splx(s);
|
2000-08-30 14:43:02 +00:00
|
|
|
return error;
|
1997-05-24 17:23:11 +00:00
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
|
|
|
div_shutdown(struct socket *so)
|
|
|
|
{
|
|
|
|
socantsendmore(so);
|
|
|
|
return 0;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
1997-09-13 15:40:55 +00:00
|
|
|
div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
|
2001-09-12 08:38:13 +00:00
|
|
|
struct mbuf *control, struct thread *td)
|
1997-05-24 17:23:11 +00:00
|
|
|
{
|
|
|
|
/* Packet must have a header (but that's about it) */
|
1999-12-22 19:13:38 +00:00
|
|
|
if (m->m_len < sizeof (struct ip) &&
|
1997-05-24 17:23:11 +00:00
|
|
|
(m = m_pullup(m, sizeof (struct ip))) == 0) {
|
|
|
|
ipstat.ips_toosmall++;
|
1996-07-10 19:44:30 +00:00
|
|
|
m_freem(m);
|
1997-05-24 17:23:11 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Send packet */
|
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
|
|
|
return div_output(so, m, (struct sockaddr_in *)nam, control);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
1997-05-24 17:23:11 +00:00
|
|
|
|
2000-08-03 14:09:52 +00:00
|
|
|
static int
|
|
|
|
div_pcblist(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
int error, i, n, s;
|
|
|
|
struct inpcb *inp, **inp_list;
|
|
|
|
inp_gen_t gencnt;
|
|
|
|
struct xinpgen xig;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The process of preparing the TCB list is too time-consuming and
|
|
|
|
* resource-intensive to repeat twice on every request.
|
|
|
|
*/
|
|
|
|
if (req->oldptr == 0) {
|
|
|
|
n = divcbinfo.ipi_count;
|
|
|
|
req->oldidx = 2 * (sizeof xig)
|
|
|
|
+ (n + n/8) * sizeof(struct xinpcb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (req->newptr != 0)
|
|
|
|
return EPERM;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OK, now we're committed to doing something.
|
|
|
|
*/
|
|
|
|
s = splnet();
|
|
|
|
gencnt = divcbinfo.ipi_gencnt;
|
|
|
|
n = divcbinfo.ipi_count;
|
|
|
|
splx(s);
|
|
|
|
|
|
|
|
xig.xig_len = sizeof xig;
|
|
|
|
xig.xig_count = n;
|
|
|
|
xig.xig_gen = gencnt;
|
|
|
|
xig.xig_sogen = so_gencnt;
|
|
|
|
error = SYSCTL_OUT(req, &xig, sizeof xig);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
|
|
|
|
inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
|
|
|
|
if (inp_list == 0)
|
|
|
|
return ENOMEM;
|
|
|
|
|
|
|
|
s = splnet();
|
2001-02-04 13:13:25 +00:00
|
|
|
for (inp = LIST_FIRST(divcbinfo.listhead), i = 0; inp && i < n;
|
|
|
|
inp = LIST_NEXT(inp, inp_list)) {
|
2002-04-09 20:04:10 +00:00
|
|
|
if (inp->inp_gencnt <= gencnt && !prison_xinpcb(req->td, inp))
|
2000-08-03 14:09:52 +00:00
|
|
|
inp_list[i++] = inp;
|
|
|
|
}
|
|
|
|
splx(s);
|
|
|
|
n = i;
|
|
|
|
|
|
|
|
error = 0;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
inp = inp_list[i];
|
|
|
|
if (inp->inp_gencnt <= gencnt) {
|
|
|
|
struct xinpcb xi;
|
|
|
|
xi.xi_len = sizeof xi;
|
|
|
|
/* XXX should avoid extra copy */
|
|
|
|
bcopy(inp, &xi.xi_inp, sizeof *inp);
|
|
|
|
if (inp->inp_socket)
|
|
|
|
sotoxsocket(inp->inp_socket, &xi.xi_socket);
|
|
|
|
error = SYSCTL_OUT(req, &xi, sizeof xi);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!error) {
|
|
|
|
/*
|
|
|
|
* Give the user an updated idea of our state.
|
|
|
|
* If the generation differs from what we told
|
|
|
|
* her before, she knows that something happened
|
|
|
|
* while we were processing this request, and it
|
|
|
|
* might be necessary to retry.
|
|
|
|
*/
|
|
|
|
s = splnet();
|
|
|
|
xig.xig_gen = divcbinfo.ipi_gencnt;
|
|
|
|
xig.xig_sogen = so_gencnt;
|
|
|
|
xig.xig_count = divcbinfo.ipi_count;
|
|
|
|
splx(s);
|
|
|
|
error = SYSCTL_OUT(req, &xig, sizeof xig);
|
|
|
|
}
|
|
|
|
free(inp_list, M_TEMP);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2002-06-10 20:05:46 +00:00
|
|
|
/*
|
|
|
|
* This is the wrapper function for in_setsockaddr. We just pass down
|
|
|
|
* the pcbinfo for in_setpeeraddr to lock.
|
|
|
|
*/
|
|
|
|
static int
|
2002-06-11 10:56:49 +00:00
|
|
|
div_sockaddr(struct socket *so, struct sockaddr **nam)
|
2002-06-10 20:05:46 +00:00
|
|
|
{
|
|
|
|
return (in_setsockaddr(so, nam, &divcbinfo));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the wrapper function for in_setpeeraddr. We just pass down
|
|
|
|
* the pcbinfo for in_setpeeraddr to lock.
|
|
|
|
*/
|
|
|
|
static int
|
2002-06-11 10:56:49 +00:00
|
|
|
div_peeraddr(struct socket *so, struct sockaddr **nam)
|
2002-06-10 20:05:46 +00:00
|
|
|
{
|
|
|
|
return (in_setpeeraddr(so, nam, &divcbinfo));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-08-03 14:09:52 +00:00
|
|
|
SYSCTL_DECL(_net_inet_divert);
|
|
|
|
SYSCTL_PROC(_net_inet_divert, OID_AUTO, pcblist, CTLFLAG_RD, 0, 0,
|
|
|
|
div_pcblist, "S,xinpcb", "List of active divert sockets");
|
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
struct pr_usrreqs div_usrreqs = {
|
|
|
|
div_abort, pru_accept_notsupp, div_attach, div_bind,
|
|
|
|
pru_connect_notsupp, pru_connect2_notsupp, in_control, div_detach,
|
2002-06-10 20:05:46 +00:00
|
|
|
div_disconnect, pru_listen_notsupp, div_peeraddr, pru_rcvd_notsupp,
|
1997-05-24 17:23:11 +00:00
|
|
|
pru_rcvoob_notsupp, div_send, pru_sense_null, div_shutdown,
|
2002-06-10 20:05:46 +00:00
|
|
|
div_sockaddr, sosend, soreceive, sopoll
|
1997-05-24 17:23:11 +00:00
|
|
|
};
|