[src/trunk]: src/dist/ipf Resolve conflicts.

[veego <veego%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2cb25f6bf05b
branches:  trunk
changeset: 486420:2cb25f6bf05b
user:      veego <veego%NetBSD.org@localhost>
date:      Sun May 21 18:53:54 2000 +0000

description:
Resolve conflicts.

diffstat:

 dist/ipf/HISTORY   |  19 +++++++++++++++++++
 dist/ipf/ip_sfil.c |   6 ++----
 dist/ipf/ipnat.c   |   6 ++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diffs (84 lines):

diff -r 6061d5e34ee1 -r 2cb25f6bf05b dist/ipf/HISTORY
--- a/dist/ipf/HISTORY  Sun May 21 18:47:00 2000 +0000
+++ b/dist/ipf/HISTORY  Sun May 21 18:53:54 2000 +0000
@@ -20,6 +20,25 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+3.4.3  20/05/2000 - Released
+
+fix ipmon -F
+
+don't truncate IPv6 packets on Solaris
+
+fix keep state for ICMP ECHO
+
+add some NAT stats and use def_nat_age rather than DEF_NAT_AGE
+
+don't make ftp proxy drop packets
+
+use MCLISREFERENCED() in tandem with M_EXT to check if IP fields need to be
+swapped back.
+
+fix up RST generation for non-Solaris
+
+get "short" flag right for IPv6
+
 3.4.2 - 10/5/2000 - Released
 
 Fix bug in dealing with "hlen == 1 and opt > 1" - Itojun
diff -r 6061d5e34ee1 -r 2cb25f6bf05b dist/ipf/ip_sfil.c
--- a/dist/ipf/ip_sfil.c        Sun May 21 18:47:00 2000 +0000
+++ b/dist/ipf/ip_sfil.c        Sun May 21 18:53:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_sfil.c,v 1.3 2000/05/03 11:40:16 veego Exp $        */
+/*     $NetBSD: ip_sfil.c,v 1.4 2000/05/21 18:53:55 veego Exp $        */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -11,7 +11,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "%W% %G% (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ip_sfil.c,v 2.23 2000/03/17 03:10:22 darrenr Exp";
+static const char rcsid[] = "@(#)Id: ip_sfil.c,v 2.23.2.1 2000/05/13 07:47:26 darrenr Exp";
 #endif
 
 #include <sys/types.h>
@@ -714,9 +714,7 @@
        tcp2->th_ack = htonl(ntohl(tcp->th_seq) + tlen);
        tcp2->th_seq = tcp->th_ack;
        tcp2->th_off = sizeof(struct tcphdr) >> 2;
-       tcp2->th_x2 = 0;
        tcp2->th_flags = TH_RST|TH_ACK;
-       tcp2->th_win = 0;
 
        /*
         * This is to get around a bug in the Solaris 2.4/2.5 TCP checksum
diff -r 6061d5e34ee1 -r 2cb25f6bf05b dist/ipf/ipnat.c
--- a/dist/ipf/ipnat.c  Sun May 21 18:47:00 2000 +0000
+++ b/dist/ipf/ipnat.c  Sun May 21 18:53:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipnat.c,v 1.4 2000/05/11 19:54:36 veego Exp $  */
+/*     $NetBSD: ipnat.c,v 1.5 2000/05/21 18:53:55 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.2.1 2000/05/06 12:02:53 darrenr Exp";
+static const char rcsid[] = "@(#)Id: ipnat.c,v 2.16.2.2 2000/05/15 06:54:18 darrenr Exp";
 #endif
 
 
@@ -305,6 +305,8 @@
                        ns.ns_mapped[0], ns.ns_mapped[1]);
                printf("added\t%lu\texpired\t%lu\n",
                        ns.ns_added, ns.ns_expire);
+               printf("no memory\t%lu\tbad nat\t%lu\n",
+                       ns.ns_memfail, ns.ns_badnat);
                printf("inuse\t%lu\nrules\t%lu\n", ns.ns_inuse, ns.ns_rules);
                if (opts & OPT_VERBOSE)
                        printf("table %p list %p\n", ns.ns_table, ns.ns_list);