Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/ipf Resolve conflicts.
details: https://anonhg.NetBSD.org/src/rev/1da880b47f9c
branches: trunk
changeset: 486039:1da880b47f9c
user: veego <veego%NetBSD.org@localhost>
date: Thu May 11 19:54:35 2000 +0000
description:
Resolve conflicts.
diffstat:
dist/ipf/HISTORY | 12 ++++++++++++
dist/ipf/fils.c | 34 +++++++++++++++++++---------------
dist/ipf/ipf.h | 5 +++--
dist/ipf/ipfs.c | 4 ++--
dist/ipf/ipnat.c | 25 +++++++++++++++++--------
dist/ipf/man/ipmon.8 | 2 +-
6 files changed, 54 insertions(+), 28 deletions(-)
diffs (211 lines):
diff -r 8cc296bdd08a -r 1da880b47f9c dist/ipf/HISTORY
--- a/dist/ipf/HISTORY Thu May 11 19:49:13 2000 +0000
+++ b/dist/ipf/HISTORY Thu May 11 19:54:35 2000 +0000
@@ -20,6 +20,18 @@
# and especially those who have found the time to port IP Filter to new
# platforms.
#
+3.4.2 - 10/5/2000 - Released
+
+Fix bug in dealing with "hlen == 1 and opt > 1" - Itojun
+
+ignore previous NAT mappings for 0/0 and 0/32 rules
+
+bring in a completely new ftp proxy
+
+allow NAT to cause packets to be dropped.
+
+add NetBSD callout support for 1.4-current
+
3.4.1 - 30/4/2000 - Released
add ratoui() and fix parsing of group numbers to allow 0 - UINT_MAX
diff -r 8cc296bdd08a -r 1da880b47f9c dist/ipf/fils.c
--- a/dist/ipf/fils.c Thu May 11 19:49:13 2000 +0000
+++ b/dist/ipf/fils.c Thu May 11 19:54:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fils.c,v 1.7 2000/05/08 13:07:56 veego Exp $ */
+/* $NetBSD: fils.c,v 1.8 2000/05/11 19:54:35 veego Exp $ */
/*
* Copyright (C) 1993-2000 by Darren Reed.
@@ -67,7 +67,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: fils.c,v 2.21.2.1 2000/04/28 17:03:11 darrenr Exp";
+static const char rcsid[] = "@(#)Id: fils.c,v 2.21.2.3 2000/05/08 12:35:51 darrenr Exp";
#endif
extern char *optarg;
@@ -157,7 +157,11 @@
static void Usage(name)
char *name;
{
+#ifdef USE_INET6
fprintf(stderr, "Usage: %s [-6aAfhIinosv] [-d <device>]\n", name);
+#else
+ fprintf(stderr, "Usage: %s [-aAfhIinosv] [-d <device>]\n", name);
+#endif
fprintf(stderr, " %s -t [-S source address] [-D destination address] [-P protocol] [-T refreshtime] [-C] [-d <device>]\n", name);
exit(1);
}
@@ -451,15 +455,15 @@
fp->fr_flags |= FR_OUTQUE;
if (opts & (OPT_HITS|OPT_VERBOSE))
#ifdef USE_QUAD_T
- PRINTF("%qu ", (unsigned long long)fp->fr_hits);
+ PRINTF("%qu ", (unsigned long long) fp->fr_hits);
#else
- PRINTF("%ld ", fp->fr_hits);
+ PRINTF("%lu ", fp->fr_hits);
#endif
if (opts & (OPT_ACCNT|OPT_VERBOSE))
#ifdef USE_QUAD_T
- PRINTF("%qu ", (unsigned long long)fp->fr_bytes);
+ PRINTF("%qu ", (unsigned long long) fp->fr_bytes);
#else
- PRINTF("%ld ", fp->fr_bytes);
+ PRINTF("%lu ", fp->fr_bytes);
#endif
if (opts & OPT_SHOWLINENO)
PRINTF("@%d ", n);
@@ -559,9 +563,9 @@
ips.is_age, ips.is_pass, ips.is_p,
ips.is_state[0], ips.is_state[1]);
#ifdef USE_QUAD_T
- PRINTF("\tpkts %qu bytes %qd",
- (unsigned long long)ips.is_pkts,
- (unsigned long long)ips.is_bytes);
+ PRINTF("\tpkts %qu bytes %qu",
+ (unsigned long long) ips.is_pkts,
+ (unsigned long long) ips.is_bytes);
#else
PRINTF("\tpkts %ld bytes %ld", ips.is_pkts, ips.is_bytes);
#endif
@@ -904,10 +908,10 @@
printw(" %4s", str1);
/* print #pkt/#bytes */
#ifdef USE_QUAD_T
- printw(" %7qu %9qu", (unsigned long long)tp->st_pkts,
- (unsigned long long)tp->st_bytes);
+ printw(" %7qu %9qu", (unsigned long long) tp->st_pkts,
+ (unsigned long long) tp->st_bytes);
#else
- printw(" %7ld %9ld", tp->st_pkts, tp->st_bytes);
+ printw(" %7lu %9lu", tp->st_pkts, tp->st_bytes);
#endif
printw(" %9s", ttl_to_string(tp->st_age));
@@ -1001,9 +1005,9 @@
frauthent_t *frap, fra;
#ifdef USE_QUAD_T
- printf("Authorisation hits: %qd\tmisses %qd\n",
- (unsigned long long)asp->fas_hits,
- (unsigned long long)asp->fas_miss);
+ printf("Authorisation hits: %qu\tmisses %qu\n",
+ (unsigned long long) asp->fas_hits,
+ (unsigned long long) asp->fas_miss);
#else
printf("Authorisation hits: %ld\tmisses %ld\n", asp->fas_hits,
asp->fas_miss);
diff -r 8cc296bdd08a -r 1da880b47f9c dist/ipf/ipf.h
--- a/dist/ipf/ipf.h Thu May 11 19:49:13 2000 +0000
+++ b/dist/ipf/ipf.h Thu May 11 19:54:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipf.h,v 1.2 2000/05/03 11:40:16 veego Exp $ */
+/* $NetBSD: ipf.h,v 1.3 2000/05/11 19:54:35 veego Exp $ */
/*
* Copyright (C) 1993-2000 by Darren Reed.
@@ -8,7 +8,7 @@
* to the original author and the contributors.
*
* @(#)ipf.h 1.12 6/5/96
- * Id: ipf.h,v 2.9.2.1 2000/04/28 15:27:40 darrenr Exp
+ * Id: ipf.h,v 2.9.2.2 2000/05/06 11:20:20 darrenr Exp
*/
#ifndef __IPF_H__
@@ -96,6 +96,7 @@
extern void printpacket __P((ip_t *));
extern void printportcmp __P((int, struct frpcmp *));
extern void printhostmask __P((int, u_32_t *, u_32_t *));
+extern void printbuf __P((char *, int, int));
#if SOLARIS
extern int inet_aton __P((const char *, struct in_addr *));
extern int gethostname __P((char *, int ));
diff -r 8cc296bdd08a -r 1da880b47f9c dist/ipf/ipfs.c
--- a/dist/ipf/ipfs.c Thu May 11 19:49:13 2000 +0000
+++ b/dist/ipf/ipfs.c Thu May 11 19:54:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipfs.c,v 1.2 2000/05/05 20:59:17 veego Exp $ */
+/* $NetBSD: ipfs.c,v 1.3 2000/05/11 19:54:35 veego Exp $ */
/*
* Copyright (C) 1999 by Darren Reed.
@@ -43,7 +43,7 @@
#include "ipf.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: ipfs.c,v 2.6 2000/02/26 07:42:20 darrenr Exp";
+static const char rcsid[] = "@(#)Id: ipfs.c,v 2.6.2.1 2000/05/06 00:11:18 darrenr Exp";
#endif
#ifndef IPF_SAVEDIR
diff -r 8cc296bdd08a -r 1da880b47f9c dist/ipf/ipnat.c
--- a/dist/ipf/ipnat.c Thu May 11 19:49:13 2000 +0000
+++ b/dist/ipf/ipnat.c Thu May 11 19:54:35 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipnat.c,v 1.3 2000/05/03 11:40:16 veego Exp $ */
+/* $NetBSD: ipnat.c,v 1.4 2000/05/11 19:54:36 veego Exp $ */
/*
* Copyright (C) 1993-2000 by Darren Reed.
@@ -59,7 +59,7 @@
#if !defined(lint)
static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipnat.c,v 2.16 2000/03/17 03:11:13 darrenr Exp";
+static const char rcsid[] = "@(#)Id: ipnat.c,v 2.16.2.1 2000/05/06 12:02:53 darrenr Exp";
#endif
@@ -232,12 +232,21 @@
return;
printf("\tFTP Proxy:\n");
printf("\t\tpassok: %d\n", ftp.ftp_passok);
- printf("\t\teol: %d,%d,%d,%d\n",
- ftp.ftp_eol[0][0], ftp.ftp_eol[0][1],
- ftp.ftp_eol[1][0], ftp.ftp_eol[1][1]);
- printf("\t\tseq: %x,%x,%x,%x\n",
- ftp.ftp_seq[0][0], ftp.ftp_seq[0][1],
- ftp.ftp_seq[1][0], ftp.ftp_seq[1][1]);
+ ftp.ftp_side[0].ftps_buf[FTP_BUFSZ - 1] = '\0';
+ ftp.ftp_side[1].ftps_buf[FTP_BUFSZ - 1] = '\0';
+ printf("\tClient:\n");
+ printf("\t\trptr %p wptr %p seq %x junk %d\n",
+ ftp.ftp_side[0].ftps_rptr, ftp.ftp_side[0].ftps_wptr,
+ ftp.ftp_side[0].ftps_seq, ftp.ftp_side[0].ftps_junk);
+ printf("\t\tbuf [");
+ printbuf(ftp.ftp_side[0].ftps_buf, FTP_BUFSZ, 1);
+ printf("]\n\tServer:\n");
+ printf("\t\trptr %p wptr %p seq %x junk %d\n",
+ ftp.ftp_side[1].ftps_rptr, ftp.ftp_side[1].ftps_wptr,
+ ftp.ftp_side[1].ftps_seq, ftp.ftp_side[1].ftps_junk);
+ printf("\t\tbuf [");
+ printbuf(ftp.ftp_side[1].ftps_buf, FTP_BUFSZ, 1);
+ printf("]\n");
}
}
diff -r 8cc296bdd08a -r 1da880b47f9c dist/ipf/man/ipmon.8
--- a/dist/ipf/man/ipmon.8 Thu May 11 19:49:13 2000 +0000
+++ b/dist/ipf/man/ipmon.8 Thu May 11 19:54:35 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipmon.8,v 1.5 2000/05/03 11:40:20 veego Exp $
+.\" $NetBSD: ipmon.8,v 1.6 2000/05/11 19:54:36 veego Exp $
.\"
.TH ipmon 8
.SH NAME
Home |
Main Index |
Thread Index |
Old Index