diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1998-06-20 18:37:51 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1998-06-20 18:37:51 +0000 |
| commit | 6054307b92d4e96bd06946f2d4cac16f5f08d034 (patch) | |
| tree | 79637b490b95e764cb7a2e0c1e5f10af0cffc3cd /sys/netinet/ip_fil.c | |
| parent | 847a1ab2645d6f5bfa1fadc0008d55293436231a (diff) | |
| download | src-6054307b92d4e96bd06946f2d4cac16f5f08d034.tar.gz src-6054307b92d4e96bd06946f2d4cac16f5f08d034.zip | |
Merge ipfilter 3.2.3 -> 3.2.7 changes onto mainline.
Notes
Notes:
svn path=/head/; revision=37077
Diffstat (limited to 'sys/netinet/ip_fil.c')
| -rw-r--r-- | sys/netinet/ip_fil.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c index d657b7f20f0c..d930811bb7b6 100644 --- a/sys/netinet/ip_fil.c +++ b/sys/netinet/ip_fil.c @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.3 1998/03/27 18:03:13 peter Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.4 1998/06/08 06:04:12 bde Exp $"; #endif #include "opt_ipfilter.h" @@ -167,7 +167,7 @@ struct devsw iplsw = { }; #endif /* _BSDI_VERSION >= 199510 && _KERNEL */ -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || (_BSDI_VERSION >= 199701) # include <sys/conf.h> # if defined(NETBSD_PF) # include <net/pfil.h> @@ -939,7 +939,8 @@ frdest_t *fdp; if (ro->ro_rt->rt_flags & RTF_GATEWAY) dst = (struct sockaddr_in *)&ro->ro_rt->rt_gateway; } - ro->ro_rt->rt_use++; + if (ro->ro_rt) + ro->ro_rt->rt_use++; /* * For input packets which are being "fastrouted", they won't |