[src/netbsd-1-5]: src/sys/netinet pullup 1.39 -> 1.40 (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/f4ebfb4628ff
branches:  netbsd-1-5
changeset: 489718:f4ebfb4628ff
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Oct 08 21:49:23 2000 +0000

description:
pullup 1.39 -> 1.40 (approved by releng-1-5)

ipfilter currently supports IPv4 only.  do not try to touch non-IPv4
packets.  PR 11082.

This is a short-term workaround.  whenever new ipfilter comes out with
proper non-IPv4 support, we should migrate to the new ipfilter.

diffstat:

 sys/netinet/fil.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 1ea0f50e8dd7 -r f4ebfb4628ff sys/netinet/fil.c
--- a/sys/netinet/fil.c Sun Oct 08 19:51:35 2000 +0000
+++ b/sys/netinet/fil.c Sun Oct 08 21:49:23 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.36.2.2 2000/08/31 14:55:00 veego Exp $       */
+/*     $NetBSD: fil.c,v 1.36.2.3 2000/10/08 21:49:23 itojun Exp $      */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: fil.c,v 1.36.2.2 2000/08/31 14:55:00 veego Exp $";
+static const char rcsid[] = "$NetBSD: fil.c,v 1.36.2.3 2000/10/08 21:49:23 itojun Exp $";
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 2.35.2.19 2000/07/27 13:08:18 darrenr Exp";
@@ -770,6 +770,9 @@
        }
 #  endif /* CSUM_DELAY_DATA */
 
+       /* at this moment, ipfilter supports IPv4 traffic only. */
+       if (ip->ip_v != 4)
+               return 0;
 
        if ((ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP ||
             ip->ip_p == IPPROTO_ICMP)) {