diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ipftest/ipft_ef.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ipftest/ipft_hx.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ipftest/ipft_pc.c | 15 | ||||
| -rw-r--r-- | usr.sbin/ipftest/ipft_sn.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ipftest/ipft_td.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ipftest/ipft_tx.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ipftest/ipt.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ipftest/misc.c | 4 |
8 files changed, 23 insertions, 20 deletions
diff --git a/usr.sbin/ipftest/ipft_ef.c b/usr.sbin/ipftest/ipft_ef.c index 4ac6cf70525..ac243cc9503 100644 --- a/usr.sbin/ipftest/ipft_ef.c +++ b/usr.sbin/ipftest/ipft_ef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipft_ef.c,v 1.15 2001/01/17 06:01:22 fgsch Exp $ */ +/* $OpenBSD: ipft_ef.c,v 1.16 2001/01/30 04:31:01 kjell Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -46,7 +46,7 @@ etherfind -n -t #include <netinet/ip_icmp.h> #include <net/if.h> #include <netdb.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include "ipf.h" #include "ipt.h" diff --git a/usr.sbin/ipftest/ipft_hx.c b/usr.sbin/ipftest/ipft_hx.c index 0a0299a7a4d..64d8e514e90 100644 --- a/usr.sbin/ipftest/ipft_hx.c +++ b/usr.sbin/ipftest/ipft_hx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipft_hx.c,v 1.13 2001/01/17 06:01:22 fgsch Exp $ */ +/* $OpenBSD: ipft_hx.c,v 1.14 2001/01/30 04:31:01 kjell Exp $ */ /* * Copyright (C) 1995-2000 by Darren Reed. @@ -37,7 +37,7 @@ #include <netdb.h> #include <arpa/nameser.h> #include <resolv.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include "ipf.h" #include "ipt.h" diff --git a/usr.sbin/ipftest/ipft_pc.c b/usr.sbin/ipftest/ipft_pc.c index e80d13fe0b8..1ce697153e6 100644 --- a/usr.sbin/ipftest/ipft_pc.c +++ b/usr.sbin/ipftest/ipft_pc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipft_pc.c,v 1.17 2001/01/17 06:01:22 fgsch Exp $ */ +/* $OpenBSD: ipft_pc.c,v 1.18 2001/01/30 04:31:01 kjell Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -28,7 +28,7 @@ #include <netinet/ip.h> #include <netinet/tcp.h> #include <net/if.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include "ipf.h" #include "pcap.h" @@ -48,9 +48,9 @@ struct llc { * While many of these maybe the same, some do have different header formats * which make this useful. */ -#define DLT_MAX 10 +#define DLT_MAX 14 -static struct llc llcs[DLT_MAX+1] = { +static struct llc llcs[DLT_MAX] = { { 0, 0, 0 }, /* DLT_NULL */ { 14, 12, 2 }, /* DLT_E10MB */ { 0, 0, 0 }, /* DLT_EN3MB */ @@ -61,7 +61,10 @@ static struct llc llcs[DLT_MAX+1] = { { 0, 0, 0 }, /* DLT_ARCNET */ { 0, 0, 0 }, /* DLT_SLIP */ { 0, 0, 0 }, /* DLT_PPP */ - { 0, 0, 0 } /* DLT_FDDI */ + { 0, 0, 0 }, /* DLT_FDDI */ + { 0, 0, 0 }, /* DLT_ATMRFC1483 */ + { 0, 0, 0 }, /* DLT_LOOP */ + { 0, 0, 0 } /* DLT_ENC */ }; static int pcap_open __P((char *)); @@ -116,7 +119,7 @@ char *fname; swap_hdr(&ph); } - if (ph.pc_v_maj != PCAP_VERSION_MAJ || ph.pc_type > DLT_MAX) { + if (ph.pc_v_maj != PCAP_VERSION_MAJ || ph.pc_type >= DLT_MAX) { (void) close(fd); return -2; } diff --git a/usr.sbin/ipftest/ipft_sn.c b/usr.sbin/ipftest/ipft_sn.c index fa7e7201239..3c8318afeab 100644 --- a/usr.sbin/ipftest/ipft_sn.c +++ b/usr.sbin/ipftest/ipft_sn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipft_sn.c,v 1.14 2001/01/17 06:01:22 fgsch Exp $ */ +/* $OpenBSD: ipft_sn.c,v 1.15 2001/01/30 04:31:01 kjell Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -32,7 +32,7 @@ #include <netinet/ip.h> #include <netinet/tcp.h> #include <net/if.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include "ipf.h" #include "snoop.h" diff --git a/usr.sbin/ipftest/ipft_td.c b/usr.sbin/ipftest/ipft_td.c index f79c4649da5..3c79dbcf499 100644 --- a/usr.sbin/ipftest/ipft_td.c +++ b/usr.sbin/ipftest/ipft_td.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipft_td.c,v 1.15 2001/01/17 06:01:22 fgsch Exp $ */ +/* $OpenBSD: ipft_td.c,v 1.16 2001/01/30 04:31:01 kjell Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -55,7 +55,7 @@ tcpdump -nqte #include <netinet/ip_icmp.h> #include <net/if.h> #include <netdb.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include "ipf.h" #include "ipt.h" diff --git a/usr.sbin/ipftest/ipft_tx.c b/usr.sbin/ipftest/ipft_tx.c index 8184186e5cb..18548abe243 100644 --- a/usr.sbin/ipftest/ipft_tx.c +++ b/usr.sbin/ipftest/ipft_tx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipft_tx.c,v 1.18 2001/01/17 07:26:58 fgsch Exp $ */ +/* $OpenBSD: ipft_tx.c,v 1.19 2001/01/30 04:31:02 kjell Exp $ */ /* * Copyright (C) 1995-2000 by Darren Reed. @@ -38,7 +38,7 @@ #include <netdb.h> #include <arpa/nameser.h> #include <resolv.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include "ipf.h" #include "ipt.h" diff --git a/usr.sbin/ipftest/ipt.c b/usr.sbin/ipftest/ipt.c index 755f1552df9..9cd04817000 100644 --- a/usr.sbin/ipftest/ipt.c +++ b/usr.sbin/ipftest/ipt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipt.c,v 1.18 2001/01/17 06:01:22 fgsch Exp $ */ +/* $OpenBSD: ipt.c,v 1.19 2001/01/30 04:31:02 kjell Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -47,7 +47,7 @@ #include <arpa/inet.h> #include <resolv.h> #include <ctype.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include <netinet/ip_fil.h> #include <netinet/ip_nat.h> diff --git a/usr.sbin/ipftest/misc.c b/usr.sbin/ipftest/misc.c index f1b7f94a49a..261619ae38e 100644 --- a/usr.sbin/ipftest/misc.c +++ b/usr.sbin/ipftest/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.13 2001/01/17 06:01:23 fgsch Exp $ */ +/* $OpenBSD: misc.c,v 1.14 2001/01/30 04:31:02 kjell Exp $ */ /* * Copyright (C) 1993-2000 by Darren Reed. @@ -46,7 +46,7 @@ #include <netdb.h> #include <arpa/nameser.h> #include <resolv.h> -#include <netinet/ip_compat.h> +#include <netinet/ip_fil_compat.h> #include <netinet/tcpip.h> #include <netinet/ip_fil.h> #include "ipf.h" |