[src/trunk]: src/dist/ipf Back out version 1.8 as it fixes the display BUT br...

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

details:   https://anonhg.NetBSD.org/src/rev/72400cc35719
branches:  trunk
changeset: 521734:72400cc35719
user:      martti <martti%NetBSD.org@localhost>
date:      Mon Feb 04 12:00:52 2002 +0000

description:
Back out version 1.8 as it fixes the display BUT breaks the icmp-type rules:

  ROOT localhost:~> /etc/rc.d/ipfilter reload
  Reloading ipfilter rules.
  22: Invalid icmp-type (echo) specified

With version 1.7 everything works just fine:

  ROOT localhost:~> /etc/rc.d/ipfilter reload
  Reloading ipfilter rules.
  Set 1 now inactive

diffstat:

 dist/ipf/parse.c |  16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diffs (44 lines):

diff -r c4873c4ffb2e -r 72400cc35719 dist/ipf/parse.c
--- a/dist/ipf/parse.c  Mon Feb 04 11:13:33 2002 +0000
+++ b/dist/ipf/parse.c  Mon Feb 04 12:00:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.8 2002/02/01 11:31:56 martti Exp $ */
+/*     $NetBSD: parse.c,v 1.9 2002/02/04 12:00:52 martti Exp $ */
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -991,7 +991,7 @@
        if (!**cp)
                return -1;
 
-       if (isdigit(***cp) || (fp->fr_proto == IPPROTO_ICMPV6)) {
+       if (isdigit(***cp)) {
                if (!ratoi(**cp, &i, 0, 255)) {
                        fprintf(stderr,
                                "%d: Invalid icmp-type (%s) specified\n",
@@ -1291,7 +1291,7 @@
                        printf(" frag");
                }
        }
-       if (fp->fr_proto == IPPROTO_ICMP && fp->fr_icmpm != 0) {
+       if (fp->fr_proto == IPPROTO_ICMP && fp->fr_icmpm) {
                int     type = fp->fr_icmp, code;
 
                type = ntohs(fp->fr_icmp);
@@ -1305,16 +1305,6 @@
                if (ntohs(fp->fr_icmpm) & 0xff)
                        printf(" code %d", code);
        }
-       if (fp->fr_proto == IPPROTO_ICMPV6 && fp->fr_icmpm != 0) {
-               int     type = fp->fr_icmp, code;
-
-               type = ntohs(fp->fr_icmp);
-               code = type & 0xff;
-               type /= 256;
-               printf(" icmp-type %d", type);
-               if (ntohs(fp->fr_icmpm) & 0xff)
-                       printf(" code %d", code);
-       }
        if (fp->fr_proto == IPPROTO_TCP && (fp->fr_tcpf || fp->fr_tcpfm)) {
                printf(" flags ");
                if (fp->fr_tcpf & ~TCPF_ALL)