30949fd4b5
structures (well, they're treated as opaque). It's now possible to manage IPv6 interface addresses and routing table entries and to filter IPV6 traffic whether encapsulated or not. IPV6CP support is crude for now, and hasn't been tested against any other implementations. RADIUS and IPv6 are independent of eachother for now. ppp.linkup/ppp.linkdown aren't currently used by IPV6CP o Understand all protocols(5) in filter rules rather than only a select few. o Allow a mask specification for the ``delete'' command. It's now possible to specifically delete one of two conflicting routes. o When creating and deleting proxy arp entries, do it for all IPv4 interface addresses rather than doing it just for the ``current'' peer address. o When iface-alias isn't in effect, don't blow away manually (via ``iface add'') added interface addresses. o When listening on a tcp server (diagnostic) socket, bind so that a tcp46 socket is created -- allowing both IPv4 and IPv6 connections. o When displaying ICMP traffic, don't display the icmp type twice. When display traffic, display at least some information about unrecognised traffic. o Bump version Inspired after filtering work by: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
102 lines
3.7 KiB
C
102 lines
3.7 KiB
C
/*-
|
|
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
|
|
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
|
|
* Internet Initiative Japan, Inc (IIJ)
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
/* Operations - f_srcop, f_dstop */
|
|
#define OP_NONE 0
|
|
#define OP_EQ 1
|
|
#define OP_GT 2
|
|
#define OP_LT 3
|
|
|
|
/* srctype or dsttype */
|
|
#define T_ADDR 0
|
|
#define T_MYADDR 1
|
|
#define T_MYADDR6 2
|
|
#define T_HISADDR 3
|
|
#define T_HISADDR6 4
|
|
#define T_DNS0 5
|
|
#define T_DNS1 6
|
|
|
|
/*
|
|
* There's a struct filterent for each possible filter rule. The
|
|
* layout is designed to minimise size (there are 4 * MAXFILTERS of
|
|
* them) - which is also conveniently a power of 2 (32 bytes) on
|
|
* architectures where sizeof(int)==4 (this makes indexing faster).
|
|
*
|
|
* Note that there are four free bits in the initial word for future
|
|
* extensions.
|
|
*/
|
|
struct filterent {
|
|
int f_proto; /* Protocol: getprotoby*() */
|
|
unsigned f_action : 8; /* Filtering action: goto or A_... */
|
|
unsigned f_srcop : 2; /* Source port operation: OP_... */
|
|
unsigned f_dstop : 2; /* Destination port operation: OP_... */
|
|
unsigned f_srctype : 3; /* T_ value of src */
|
|
unsigned f_dsttype : 3; /* T_ value of dst */
|
|
unsigned f_estab : 1; /* Check TCP ACK bit */
|
|
unsigned f_syn : 1; /* Check TCP SYN bit */
|
|
unsigned f_finrst : 1; /* Check TCP FIN/RST bits */
|
|
unsigned f_invert : 1; /* true to complement match */
|
|
struct ncprange f_src; /* Source address and mask */
|
|
struct ncprange f_dst; /* Destination address and mask */
|
|
u_short f_srcport; /* Source port, compared with f_srcop */
|
|
u_short f_dstport; /* Destination port, compared with f_dstop */
|
|
unsigned timeout; /* Keep alive value for passed packet */
|
|
};
|
|
|
|
#define MAXFILTERS 40 /* in each filter set */
|
|
|
|
/* f_action values [0..MAXFILTERS) specify the next filter rule, others are: */
|
|
#define A_NONE (MAXFILTERS)
|
|
#define A_PERMIT (A_NONE+1)
|
|
#define A_DENY (A_PERMIT+1)
|
|
|
|
struct filter {
|
|
struct filterent rule[MAXFILTERS]; /* incoming packet filter */
|
|
const char *name;
|
|
unsigned fragok : 1;
|
|
unsigned logok : 1;
|
|
};
|
|
|
|
/* Which filter set */
|
|
#define FL_IN 0
|
|
#define FL_OUT 1
|
|
#define FL_DIAL 2
|
|
#define FL_KEEP 3
|
|
|
|
struct ipcp;
|
|
struct cmdargs;
|
|
|
|
extern int filter_Show(struct cmdargs const *);
|
|
extern int filter_Set(struct cmdargs const *);
|
|
extern const char * filter_Action2Nam(int);
|
|
extern const char *filter_Op2Nam(int);
|
|
extern void filter_AdjustAddr(struct filter *, struct ncpaddr *,
|
|
struct ncpaddr *, struct in_addr *);
|