From a1bcf1b27619ea77e568a627662b6f03b82861eb Mon Sep 17 00:00:00 2001 From: Kjell Wooding Date: Tue, 1 Feb 2000 19:30:03 +0000 Subject: Update to IPFilter 3.3.8. Man pages still to go. See sbin/ipf/HISTORY for details. --- usr.sbin/ipftest/ipft_ef.c | 5 +++-- usr.sbin/ipftest/ipft_hx.c | 5 +++-- usr.sbin/ipftest/ipft_pc.c | 5 +++-- usr.sbin/ipftest/ipft_sn.c | 5 +++-- usr.sbin/ipftest/ipft_td.c | 5 +++-- usr.sbin/ipftest/ipft_tx.c | 5 +++-- usr.sbin/ipftest/ipt.c | 7 +++++-- usr.sbin/ipftest/ipt.h | 5 +++-- usr.sbin/ipftest/misc.c | 5 +++-- usr.sbin/ipftest/pcap.h | 5 +++-- usr.sbin/ipftest/snoop.h | 5 +++-- 11 files changed, 35 insertions(+), 22 deletions(-) (limited to 'usr.sbin/ipftest') diff --git a/usr.sbin/ipftest/ipft_ef.c b/usr.sbin/ipftest/ipft_ef.c index 5cff7b076ad..3fccf5b14ae 100644 --- a/usr.sbin/ipftest/ipft_ef.c +++ b/usr.sbin/ipftest/ipft_ef.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipft_ef.c,v 1.11 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipft_ef.c,v 1.12 2000/02/01 19:30:01 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -52,7 +53,7 @@ etherfind -n -t #if !defined(lint) static const char sccsid[] = "@(#)ipft_ef.c 1.6 2/4/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 1.11 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipft_ef.c,v 2.1 1999/08/04 17:30:02 darrenr Exp $"; #endif static int etherf_open __P((char *)); diff --git a/usr.sbin/ipftest/ipft_hx.c b/usr.sbin/ipftest/ipft_hx.c index 36595779516..0b27c2efe06 100644 --- a/usr.sbin/ipftest/ipft_hx.c +++ b/usr.sbin/ipftest/ipft_hx.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipft_hx.c,v 1.9 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipft_hx.c,v 1.10 2000/02/01 19:30:01 kjell Exp $ */ + /* * Copyright (C) 1995-1998 by Darren Reed. * @@ -43,7 +44,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipft_hx.c 1.1 3/9/96 (C) 1996 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 1.9 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipft_hx.c,v 2.1 1999/08/04 17:30:03 darrenr Exp $"; #endif extern int opts; diff --git a/usr.sbin/ipftest/ipft_pc.c b/usr.sbin/ipftest/ipft_pc.c index 4e516699e5a..252ec566dd9 100644 --- a/usr.sbin/ipftest/ipft_pc.c +++ b/usr.sbin/ipftest/ipft_pc.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipft_pc.c,v 1.13 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipft_pc.c,v 1.14 2000/02/01 19:30:01 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -34,7 +35,7 @@ #include "ipt.h" #if !defined(lint) -static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 1.13 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipft_pc.c,v 2.1 1999/08/04 17:30:03 darrenr Exp $"; #endif struct llc { diff --git a/usr.sbin/ipftest/ipft_sn.c b/usr.sbin/ipftest/ipft_sn.c index 421ca51e369..210fec34100 100644 --- a/usr.sbin/ipftest/ipft_sn.c +++ b/usr.sbin/ipftest/ipft_sn.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipft_sn.c,v 1.10 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipft_sn.c,v 1.11 2000/02/01 19:30:01 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -38,7 +39,7 @@ #include "ipt.h" #if !defined(lint) -static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 1.10 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipft_sn.c,v 2.1 1999/08/04 17:30:04 darrenr Exp $"; #endif struct llc { diff --git a/usr.sbin/ipftest/ipft_td.c b/usr.sbin/ipftest/ipft_td.c index 335ff525c36..28520942f4a 100644 --- a/usr.sbin/ipftest/ipft_td.c +++ b/usr.sbin/ipftest/ipft_td.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipft_td.c,v 1.11 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipft_td.c,v 1.12 2000/02/01 19:30:01 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -61,7 +62,7 @@ tcpdump -nqte #if !defined(lint) static const char sccsid[] = "@(#)ipft_td.c 1.8 2/4/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_td.c,v 1.11 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipft_td.c,v 2.1 1999/08/04 17:30:04 darrenr Exp $"; #endif static int tcpd_open __P((char *)); diff --git a/usr.sbin/ipftest/ipft_tx.c b/usr.sbin/ipftest/ipft_tx.c index 7c3ec85fe04..e55c2b887f3 100644 --- a/usr.sbin/ipftest/ipft_tx.c +++ b/usr.sbin/ipftest/ipft_tx.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipft_tx.c,v 1.13 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipft_tx.c,v 1.14 2000/02/01 19:30:01 kjell Exp $ */ + /* * Copyright (C) 1995-1998 by Darren Reed. * @@ -44,7 +45,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.13 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipft_tx.c,v 2.1 1999/08/04 17:30:05 darrenr Exp $"; #endif extern int opts; diff --git a/usr.sbin/ipftest/ipt.c b/usr.sbin/ipftest/ipt.c index dee57e5d113..09d30e36ef4 100644 --- a/usr.sbin/ipftest/ipt.c +++ b/usr.sbin/ipftest/ipt.c @@ -1,4 +1,5 @@ -/* $OpenBSD: ipt.c,v 1.14 1999/12/15 05:20:26 kjell Exp $ */ +/* $OpenBSD: ipt.c,v 1.15 2000/02/01 19:30:02 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -56,7 +57,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipt.c 1.19 6/3/96 (C) 1993-1996 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipt.c,v 1.14 1999/12/15 05:20:26 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: ipt.c,v 2.1.2.1 2000/01/24 14:49:11 darrenr Exp $"; #endif extern char *optarg; @@ -65,6 +66,7 @@ extern struct ipread snoop, etherf, tcpd, pcap, iptext, iphex; extern struct ifnet *get_unit __P((char *)); extern void init_ifp __P((void)); extern ipnat_t *natparse __P((char *, int)); +extern int fr_running; int opts = 0; int main __P((int, char *[])); @@ -135,6 +137,7 @@ char *argv[]; nat_init(); fr_stateinit(); initparse(); + fr_running = 1; if (rules) { char line[513], *s; diff --git a/usr.sbin/ipftest/ipt.h b/usr.sbin/ipftest/ipt.h index bd49742d9ef..624a38b9493 100644 --- a/usr.sbin/ipftest/ipt.h +++ b/usr.sbin/ipftest/ipt.h @@ -1,11 +1,12 @@ -/* $OpenBSD: ipt.h,v 1.7 1999/12/15 05:20:27 kjell Exp $ */ +/* $OpenBSD: ipt.h,v 1.8 2000/02/01 19:30:02 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * * Redistribution and use in source and binary forms are permitted * provided that this notice is preserved and due credit is given * to the original author and the contributors. - * $Id: ipt.h,v 1.7 1999/12/15 05:20:27 kjell Exp $ + * $IPFilter: ipt.h,v 2.1 1999/08/04 17:30:08 darrenr Exp $ */ #ifndef __IPT_H__ diff --git a/usr.sbin/ipftest/misc.c b/usr.sbin/ipftest/misc.c index ba2ec314100..f18169b5888 100644 --- a/usr.sbin/ipftest/misc.c +++ b/usr.sbin/ipftest/misc.c @@ -1,4 +1,5 @@ -/* $OpenBSD: misc.c,v 1.9 1999/12/15 05:20:27 kjell Exp $ */ +/* $OpenBSD: misc.c,v 1.10 2000/02/01 19:30:02 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -53,7 +54,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: misc.c,v 1.9 1999/12/15 05:20:27 kjell Exp $"; +static const char rcsid[] = "@(#)$IPFilter: misc.c,v 2.1 1999/08/04 17:30:11 darrenr Exp $"; #endif extern int opts; diff --git a/usr.sbin/ipftest/pcap.h b/usr.sbin/ipftest/pcap.h index 451c8496417..f16592d3303 100644 --- a/usr.sbin/ipftest/pcap.h +++ b/usr.sbin/ipftest/pcap.h @@ -1,11 +1,12 @@ -/* $OpenBSD: pcap.h,v 1.7 1999/12/15 05:20:27 kjell Exp $ */ +/* $OpenBSD: pcap.h,v 1.8 2000/02/01 19:30:02 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * * Redistribution and use in source and binary forms are permitted * provided that this notice is preserved and due credit is given * to the original author and the contributors. - * $Id: pcap.h,v 1.7 1999/12/15 05:20:27 kjell Exp $ + * $IPFilter: pcap.h,v 2.1 1999/08/04 17:30:17 darrenr Exp $ */ /* * This header file is constructed to match the version described by diff --git a/usr.sbin/ipftest/snoop.h b/usr.sbin/ipftest/snoop.h index 5442ef1b4b8..a4265831f8a 100644 --- a/usr.sbin/ipftest/snoop.h +++ b/usr.sbin/ipftest/snoop.h @@ -1,4 +1,5 @@ -/* $OpenBSD: snoop.h,v 1.6 1999/12/15 05:20:27 kjell Exp $ */ +/* $OpenBSD: snoop.h,v 1.7 2000/02/01 19:30:02 kjell Exp $ */ + /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -12,7 +13,7 @@ /* * written to comply with the RFC (1761) from Sun. - * $Id: snoop.h,v 1.6 1999/12/15 05:20:27 kjell Exp $ + * $IPFilter: snoop.h,v 2.1 1999/08/04 17:30:19 darrenr Exp $ */ struct snoophdr { char s_id[8]; -- cgit v1.2.3