diff options
| author | alex <alex@FreeBSD.org> | 1997-08-08 14:36:29 +0000 |
|---|---|---|
| committer | alex <alex@FreeBSD.org> | 1997-08-08 14:36:29 +0000 |
| commit | dc3ab858903e9fc74c4e541e16641a227d47cab7 (patch) | |
| tree | 2066b4cf8d5ecb1b5b1299827858274c8dd48a20 /sys/netinet | |
| parent | 589d243b0950108d54f474d4143448c60c5cc065 (diff) | |
| download | FreeBSD-src-dc3ab858903e9fc74c4e541e16641a227d47cab7.zip FreeBSD-src-dc3ab858903e9fc74c4e541e16641a227d47cab7.tar.gz | |
Support interface names up to 15 characters in length. In order to
accommodate the expanded name, the ICMP types bitmap has been
reduced from 256 bits to 32.
A recompile of kernel and user level ipfw is required.
To be merged into 2.2 after a brief period in -current.
PR: bin/4209
Reviewed by: Archie Cobbs <archie@whistle.com>
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_fw.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 96d7357..d45be58 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -11,12 +11,14 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.h,v 1.1 1997/05/09 17:46:45 archie Exp $ + * $Id: ip_fw.h,v 1.27 1997/06/02 05:02:36 julian Exp $ */ #ifndef _IP_FW_H #define _IP_FW_H +#include <net/if.h> + /* * This union structure identifies an interface, either explicitly * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME @@ -33,7 +35,7 @@ union ip_fw_if { struct in_addr fu_via_ip; /* Specified by IP address */ struct { /* Specified by interface name */ -#define FW_IFNLEN 6 /* To keep structure on 2^x boundary */ +#define FW_IFNLEN IFNAMSIZ char name[FW_IFNLEN]; short unit; /* -1 means match any unit */ } fu_via_if; @@ -58,7 +60,7 @@ struct ip_fw { u_short fw_pts[IP_FW_MAX_PORTS]; /* Array of port numbers to match */ u_char fw_ipopt,fw_ipnopt; /* IP options set/unset */ u_char fw_tcpf,fw_tcpnf; /* TCP flags set/unset */ -#define IP_FW_ICMPTYPES_DIM (256 / (sizeof(unsigned) * 8)) +#define IP_FW_ICMPTYPES_DIM (32 / (sizeof(unsigned) * 8)) unsigned fw_icmptypes[IP_FW_ICMPTYPES_DIM]; /* ICMP types bitmap */ long timestamp; /* timestamp (tv_sec) of last match */ union ip_fw_if fw_in_if, fw_out_if; /* Incoming and outgoing interfaces */ |
