summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authormartti <martti@NetBSD.org>2002-09-25 06:43:17 +0000
committermartti <martti@NetBSD.org>2002-09-25 06:43:17 +0000
commit15e6ca78da77a575b59a78489bbae4c19ba32b3b (patch)
tree9ebebaee5b1c7a83c76bea993194ce1f9418a17a /sys/netinet
parent5031fe3837a9ec72d0e8a7aba2e345be38a8d083 (diff)
Fix ipmon problems on 64-bit platforms (PR#17403 and PR#17404).
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_fil.h6
-rw-r--r--sys/netinet/ip_log.c14
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h
index c7ffa6b1ebe..c5e15ca630c 100644
--- a/sys/netinet/ip_fil.h
+++ b/sys/netinet/ip_fil.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil.h,v 1.47 2002/09/19 08:12:48 martti Exp $ */
+/* $NetBSD: ip_fil.h,v 1.48 2002/09/25 06:43:20 martti Exp $ */
/*
* Copyright (C) 1993-2002 by Darren Reed.
@@ -416,7 +416,7 @@ typedef struct frgroup {
typedef struct iplog {
u_32_t ipl_magic;
u_int ipl_count;
- u_long ipl_sec;
+ struct timeval ipl_time;
u_long ipl_usec;
size_t ipl_dsize;
struct iplog *ipl_next;
@@ -644,7 +644,7 @@ extern int fr_minttllog;
extern fr_info_t frcache[2];
extern char ipfilter_version[];
extern iplog_t **iplh[IPL_LOGMAX+1], *iplt[IPL_LOGMAX+1];
-extern size_t iplused[IPL_LOGMAX + 1];
+extern int iplused[IPL_LOGMAX + 1];
extern struct frentry *ipfilter[2][2], *ipacct[2][2];
#ifdef USE_INET6
extern struct frentry *ipfilter6[2][2], *ipacct6[2][2];
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index 7b2cf6b4c31..945f239492f 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_log.c,v 1.22 2002/09/19 08:12:51 martti Exp $ */
+/* $NetBSD: ip_log.c,v 1.23 2002/09/25 06:43:21 martti Exp $ */
/*
* Copyright (C) 1997-2001 by Darren Reed.
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.22 2002/09/19 08:12:51 martti Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.23 2002/09/25 06:43:21 martti Exp $");
#include <sys/param.h>
#if defined(KERNEL) && !defined(_KERNEL)
@@ -133,7 +133,7 @@ extern kcondvar_t iplwait;
# endif
iplog_t **iplh[IPL_LOGMAX+1], *iplt[IPL_LOGMAX+1], *ipll[IPL_LOGMAX+1];
-size_t iplused[IPL_LOGMAX+1];
+int iplused[IPL_LOGMAX+1];
static fr_info_t iplcrc[IPL_LOGMAX+1];
@@ -340,15 +340,15 @@ int *types, cnt;
ipl->ipl_dsize = len;
# ifdef _KERNEL
# if SOLARIS || defined(sun)
- uniqtime((struct timeval *)&ipl->ipl_sec);
+ uniqtime(&ipl->ipl_time);
# else
# if BSD >= 199306 || defined(__FreeBSD__) || defined(__sgi)
- microtime((struct timeval *)&ipl->ipl_sec);
+ microtime(&ipl->ipl_time);
# endif
# endif
# else
- ipl->ipl_sec = 0;
- ipl->ipl_usec = 0;
+ ipl->ipl_time.tv_sec = 0;
+ ipl->ipl_time.tv_usec = 0;
# endif
/*