summaryrefslogtreecommitdiffstats
path: root/sys/contrib/ipfilter/netinet/ip_log.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_log.c')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_log.c595
1 files changed, 380 insertions, 215 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c
index abca4d8..c42ce0a 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/sys/contrib/ipfilter/netinet/ip_log.c
@@ -1,150 +1,178 @@
+/* $FreeBSD$ */
+
/*
- * Copyright (C) 1997-2001 by Darren Reed.
+ * Copyright (C) 1997-2003 by Darren Reed.
*
* See the IPFILTER.LICENCE file for details on licencing.
*
- * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $
* $FreeBSD$
+ * Id: ip_log.c,v 2.75.2.6 2004/10/16 07:59:27 darrenr Exp
*/
#include <sys/param.h>
-#if defined(KERNEL) && !defined(_KERNEL)
-# define _KERNEL
+#if defined(KERNEL) || defined(_KERNEL)
+# undef KERNEL
+# undef _KERNEL
+# define KERNEL 1
+# define _KERNEL 1
#endif
#if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \
defined(_KERNEL)
# include "opt_ipfilter_log.h"
#endif
-#ifdef __FreeBSD__
-# if defined(IPFILTER_LKM) || defined(_KERNEL)
-# if !defined(__FreeBSD_version)
-# include <sys/osreldate.h>
-# endif
-# if !defined(IPFILTER_LKM)
-# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
-# include "opt_ipfilter.h"
-# endif
+#if defined(__FreeBSD__) && !defined(IPFILTER_LKM)
+# if defined(_KERNEL)
+# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+# include "opt_ipfilter.h"
# endif
# else
-# ifdef KLD_MODULE
-# ifndef __FreeBSD_cc_version
-# include <osreldate.h>
-# else
-# if __FreeBSD_cc_version < 430000
-# include <osreldate.h>
-# endif
-# endif
-# endif
+# include <osreldate.h>
# endif
#endif
-#ifdef IPFILTER_LOG
-# ifndef SOLARIS
-# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+#ifndef SOLARIS
+# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+#endif
+#include <sys/errno.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#ifndef _KERNEL
+# include <stdio.h>
+# include <string.h>
+# include <stdlib.h>
+# include <ctype.h>
+# define _KERNEL
+# define KERNEL
+# ifdef __OpenBSD__
+struct file;
# endif
-# ifndef _KERNEL
-# include <stdio.h>
-# include <string.h>
-# include <stdlib.h>
-# include <ctype.h>
+# include <sys/uio.h>
+# undef _KERNEL
+# undef KERNEL
+#endif
+#if __FreeBSD_version >= 220000 && defined(_KERNEL)
+# include <sys/fcntl.h>
+# include <sys/filio.h>
+#else
+# include <sys/ioctl.h>
+#endif
+#include <sys/time.h>
+#if defined(_KERNEL)
+# include <sys/systm.h>
+# if defined(NetBSD) && (__NetBSD_Version__ >= 104000000)
+# include <sys/proc.h>
# endif
-# include <sys/errno.h>
-# include <sys/types.h>
-# include <sys/file.h>
-# if __FreeBSD_version >= 220000 && defined(_KERNEL)
-# include <sys/fcntl.h>
-# include <sys/filio.h>
+#endif /* _KERNEL */
+#if !SOLARIS && !defined(__hpux) && !defined(linux)
+# if (NetBSD > 199609) || (OpenBSD > 199603) || (__FreeBSD_version >= 300000)
+# include <sys/dirent.h>
# else
-# include <sys/ioctl.h>
+# include <sys/dir.h>
# endif
-# include <sys/time.h>
-# if defined(_KERNEL)
-# include <sys/systm.h>
-# endif
-# if !SOLARIS
-# if (NetBSD > 199609) || (OpenBSD > 199603) || (__FreeBSD_version >= 300000)
-# include <sys/dirent.h>
-# else
-# include <sys/dir.h>
-# endif
-# include <sys/mbuf.h>
-# else
+# include <sys/mbuf.h>
+#else
+# if !defined(__hpux) && defined(_KERNEL)
# include <sys/filio.h>
# include <sys/cred.h>
+# include <sys/ddi.h>
+# include <sys/sunddi.h>
+# include <sys/ksynch.h>
# include <sys/kmem.h>
-# ifdef _KERNEL
-# include <sys/ddi.h>
-# include <sys/sunddi.h>
-# include <sys/ksynch.h>
-# include <sys/dditypes.h>
-# include <sys/cmn_err.h>
-# endif
-# endif
+# include <sys/mkdev.h>
+# include <sys/dditypes.h>
+# include <sys/cmn_err.h>
+# endif /* !__hpux */
+#endif /* !SOLARIS && !__hpux */
+#if !defined(linux)
# include <sys/protosw.h>
-# include <sys/socket.h>
+#endif
+#include <sys/socket.h>
-# include <net/if.h>
-# ifdef sun
-# include <net/af.h>
-# endif
-# if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-# endif
-# include <net/route.h>
-# include <netinet/in.h>
-# ifdef __sgi
-# define _KMEMUSER
-# include <sys/ddi.h>
-# ifdef IFF_DRVRLOCK /* IRIX6 */
-# include <sys/hashing.h>
-# endif
-# endif
-# if !(defined(__sgi) && !defined(IFF_DRVRLOCK)) /*IRIX<6*/
-# include <netinet/in_var.h>
-# endif
-# include <netinet/in_systm.h>
-# include <netinet/ip.h>
-# include <netinet/tcp.h>
-# include <netinet/udp.h>
-# include <netinet/ip_icmp.h>
-# ifdef USE_INET6
-# include <netinet/icmp6.h>
+#include <net/if.h>
+#ifdef sun
+# include <net/af.h>
+#endif
+#if __FreeBSD_version >= 300000
+# include <net/if_var.h>
+#endif
+#include <net/route.h>
+#include <netinet/in.h>
+#ifdef __sgi
+# include <sys/ddi.h>
+# ifdef IFF_DRVRLOCK /* IRIX6 */
+# include <sys/hashing.h>
# endif
+#endif
+#if !defined(__hpux) && !defined(linux) && \
+ !(defined(__sgi) && !defined(IFF_DRVRLOCK)) /*IRIX<6*/
+# include <netinet/in_var.h>
+#endif
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <netinet/ip_icmp.h>
+#ifdef USE_INET6
+# include <netinet/icmp6.h>
+#endif
+#if !defined(linux)
# include <netinet/ip_var.h>
-# ifndef _KERNEL
-# include <syslog.h>
-# endif
-# include "netinet/ip_compat.h"
-# include <netinet/tcpip.h>
-# include "netinet/ip_fil.h"
-# if (__FreeBSD_version >= 300000)
-# include <sys/malloc.h>
-# endif
+#endif
+#ifndef _KERNEL
+# include <syslog.h>
+#endif
+#include "netinet/ip_compat.h"
+#include <netinet/tcpip.h>
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
+#include "netinet/ip_frag.h"
+#include "netinet/ip_state.h"
+#include "netinet/ip_auth.h"
+#if (__FreeBSD_version >= 300000) || defined(__NetBSD__)
+# include <sys/malloc.h>
+#endif
+/* END OF INCLUDES */
-# ifndef MIN
-# define MIN(a,b) (((a)<(b))?(a):(b))
-# endif
-# ifdef IPFILTER_LOGSIZE
-# undef IPLLOGSIZE
-# define IPLLOGSIZE IPFILTER_LOGSIZE
-# endif
+#ifdef IPFILTER_LOG
+# if defined(IPL_SELECT)
+# include <machine/sys/user.h>
+# include <sys/kthread_iface.h>
+# define READ_COLLISION 0x001
-# if USE_MUTEX
-extern kmutex_t ipl_mutex;
-# if SOLARIS
+iplog_select_t iplog_ss[IPL_LOGMAX+1];
+
+extern int selwait;
+# endif /* IPL_SELECT */
+
+# if defined(linux) && defined(_KERNEL)
+wait_queue_head_t iplh_linux[IPL_LOGSIZE];
+# endif
+# if SOLARIS
extern kcondvar_t iplwait;
-# endif
# endif
-iplog_t **iplh[IPL_LOGMAX+1], *iplt[IPL_LOGMAX+1], *ipll[IPL_LOGMAX+1];
-size_t iplused[IPL_LOGMAX+1];
-static fr_info_t iplcrc[IPL_LOGMAX+1];
+iplog_t **iplh[IPL_LOGSIZE], *iplt[IPL_LOGSIZE], *ipll[IPL_LOGSIZE];
+int iplused[IPL_LOGSIZE];
+static fr_info_t iplcrc[IPL_LOGSIZE];
+int ipl_suppress = 1;
+int ipl_buffer_sz;
+int ipl_logmax = IPL_LOGMAX;
+int ipl_logall = 0;
+int ipl_log_init = 0;
+int ipl_logsize = IPFILTER_LOGSIZE;
+int ipl_magic[IPL_LOGSIZE] = { IPL_MAGIC, IPL_MAGIC_NAT, IPL_MAGIC_STATE,
+ IPL_MAGIC, IPL_MAGIC, IPL_MAGIC,
+ IPL_MAGIC, IPL_MAGIC };
-/*
- * Initialise log buffers & pointers. Also iniialised the CRC to a local
- * secret for use in calculating the "last log checksum".
- */
-void ipflog_init()
+/* ------------------------------------------------------------------------ */
+/* Function: fr_loginit */
+/* Returns: int - 0 == success (always returned) */
+/* Parameters: Nil */
+/* */
+/* Initialise log buffers & pointers. Also iniialised the CRC to a local */
+/* secret for use in calculating the "last log checksum". */
+/* ------------------------------------------------------------------------ */
+int fr_loginit()
{
int i;
@@ -154,40 +182,88 @@ void ipflog_init()
iplh[i] = &iplt[i];
iplused[i] = 0;
bzero((char *)&iplcrc[i], sizeof(iplcrc[i]));
+# ifdef IPL_SELECT
+ iplog_ss[i].read_waiter = 0;
+ iplog_ss[i].state = 0;
+# endif
+# if defined(linux) && defined(_KERNEL)
+ init_waitqueue_head(iplh_linux + i);
+# endif
}
+
+# if SOLARIS && defined(_KERNEL)
+ cv_init(&iplwait, "ipl condvar", CV_DRIVER, NULL);
+# endif
+ MUTEX_INIT(&ipl_mutex, "ipf log mutex");
+
+ ipl_log_init = 1;
+
+ return 0;
}
-/*
- * ipflog
- * Create a log record for a packet given that it has been triggered by a
- * rule (or the default setting). Calculate the transport protocol header
- * size using predetermined size of a couple of popular protocols and thus
- * how much data to copy into the log, including part of the data body if
- * requested.
- */
-int ipflog(flags, ip, fin, m)
-u_int flags;
-ip_t *ip;
+/* ------------------------------------------------------------------------ */
+/* Function: fr_logunload */
+/* Returns: Nil */
+/* Parameters: Nil */
+/* */
+/* Clean up any log data that has accumulated without being read. */
+/* ------------------------------------------------------------------------ */
+void fr_logunload()
+{
+ int i;
+
+ if (ipl_log_init == 0)
+ return;
+
+ for (i = IPL_LOGMAX; i >= 0; i--)
+ (void) ipflog_clear(i);
+
+# if SOLARIS && defined(_KERNEL)
+ cv_destroy(&iplwait);
+# endif
+ MUTEX_DESTROY(&ipl_mutex);
+
+ ipl_log_init = 0;
+}
+
+
+/* ------------------------------------------------------------------------ */
+/* Function: ipflog */
+/* Returns: int - 0 == success, -1 == failure */
+/* Parameters: fin(I) - pointer to packet information */
+/* flags(I) - flags from filter rules */
+/* */
+/* Create a log record for a packet given that it has been triggered by a */
+/* rule (or the default setting). Calculate the transport protocol header */
+/* size using predetermined size of a couple of popular protocols and thus */
+/* how much data to copy into the log, including part of the data body if */
+/* requested. */
+/* ------------------------------------------------------------------------ */
+int ipflog(fin, flags)
fr_info_t *fin;
-mb_t *m;
+u_int flags;
{
- ipflog_t ipfl;
- register size_t mlen, hlen;
+ register size_t hlen;
+ int types[2], mlen;
size_t sizes[2];
void *ptrs[2];
- int types[2];
+ ipflog_t ipfl;
u_char p;
-# if SOLARIS && defined(_KERNEL)
- ill_t *ifp = fin->fin_ifp;
+ mb_t *m;
+# if (SOLARIS || defined(__hpux)) && defined(_KERNEL)
+ qif_t *ifp;
# else
- struct ifnet *ifp = fin->fin_ifp;
-# endif
+ struct ifnet *ifp;
+# endif /* SOLARIS || __hpux */
+ ipfl.fl_nattag.ipt_num[0] = 0;
+ m = fin->fin_m;
+ ifp = fin->fin_ifp;
+ hlen = fin->fin_hlen;
/*
* calculate header size.
*/
- hlen = fin->fin_hlen;
if (fin->fin_off == 0) {
p = fin->fin_fi.fi_p;
if (p == IPPROTO_TCP)
@@ -198,7 +274,7 @@ mb_t *m;
struct icmp *icmp;
icmp = (struct icmp *)fin->fin_dp;
-
+
/*
* For ICMP, if the packet is an error packet, also
* include the information about the packet which
@@ -220,12 +296,12 @@ mb_t *m;
break;
}
}
-#ifdef USE_INET6
+# ifdef USE_INET6
else if (p == IPPROTO_ICMPV6) {
struct icmp6_hdr *icmp;
icmp = (struct icmp6_hdr *)fin->fin_dp;
-
+
/*
* For ICMPV6, if the packet is an error packet, also
* include the information about the packet which
@@ -239,53 +315,71 @@ mb_t *m;
fin->fin_dlen);
}
}
-#endif
+# endif
}
/*
* Get the interface number and name to which this packet is
* currently associated.
*/
- bzero((char *)ipfl.fl_ifname, sizeof(ipfl.fl_ifname));
-# if SOLARIS && defined(_KERNEL)
- ipfl.fl_unit = (u_int)ifp->ill_ppa;
- bcopy(ifp->ill_name, ipfl.fl_ifname,
- MIN(ifp->ill_name_length, sizeof(ipfl.fl_ifname)));
- mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0;
+# if (SOLARIS || defined(__hpux)) && defined(_KERNEL)
+ ipfl.fl_unit = (u_int)ifp->qf_ppa;
+ COPYIFNAME(ifp, ipfl.fl_ifname);
# else
# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
- (defined(OpenBSD) && (OpenBSD >= 199603)) || \
+ (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
- strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ);
+ COPYIFNAME(ifp, ipfl.fl_ifname);
# else
ipfl.fl_unit = (u_int)ifp->if_unit;
- strncpy(ipfl.fl_ifname, ifp->if_name, MIN(sizeof(ipfl.fl_ifname),
- sizeof(ifp->if_name)));
+# if defined(_KERNEL)
+ if ((ipfl.fl_ifname[0] = ifp->if_name[0]))
+ if ((ipfl.fl_ifname[1] = ifp->if_name[1]))
+ if ((ipfl.fl_ifname[2] = ifp->if_name[2]))
+ ipfl.fl_ifname[3] = ifp->if_name[3];
+# else
+ (void) strncpy(ipfl.fl_ifname, IFNAME(ifp), sizeof(ipfl.fl_ifname));
+ ipfl.fl_ifname[sizeof(ipfl.fl_ifname) - 1] = '\0';
+# endif
# endif
- mlen = (flags & FR_LOGBODY) ? MIN(fin->fin_plen - hlen, 128) : 0;
-# endif
+# endif /* __hpux || SOLARIS */
+ mlen = fin->fin_plen - hlen;
+ if (!ipl_logall) {
+ mlen = (flags & FR_LOGBODY) ? MIN(mlen, 128) : 0;
+ } else if ((flags & FR_LOGBODY) == 0) {
+ mlen = 0;
+ }
+ if (mlen < 0)
+ mlen = 0;
ipfl.fl_plen = (u_char)mlen;
ipfl.fl_hlen = (u_char)hlen;
ipfl.fl_rule = fin->fin_rule;
- ipfl.fl_group = fin->fin_group;
- if (fin->fin_fr != NULL)
+ (void) strncpy(ipfl.fl_group, fin->fin_group, FR_GROUPLEN);
+ if (fin->fin_fr != NULL) {
ipfl.fl_loglevel = fin->fin_fr->fr_loglevel;
- else
+ ipfl.fl_logtag = fin->fin_fr->fr_logtag;
+ } else {
ipfl.fl_loglevel = 0xffff;
+ ipfl.fl_logtag = FR_NOLOGTAG;
+ }
+ if (fin->fin_nattag != NULL)
+ bcopy(fin->fin_nattag, (void *)&ipfl.fl_nattag,
+ sizeof(ipfl.fl_nattag));
ipfl.fl_flags = flags;
ipfl.fl_dir = fin->fin_out;
+ ipfl.fl_lflags = fin->fin_flx;
ptrs[0] = (void *)&ipfl;
sizes[0] = sizeof(ipfl);
types[0] = 0;
-# if SOLARIS && defined(_KERNEL)
+# if defined(MENTAT) && defined(_KERNEL)
/*
* Are we copied from the mblk or an aligned array ?
*/
- if (ip == (ip_t *)m->b_rptr) {
+ if (fin->fin_ip == (ip_t *)m->b_rptr) {
ptrs[1] = m;
sizes[1] = hlen + mlen;
types[1] = 1;
} else {
- ptrs[1] = ip;
+ ptrs[1] = fin->fin_ip;
sizes[1] = hlen + mlen;
types[1] = 0;
}
@@ -293,14 +387,25 @@ mb_t *m;
ptrs[1] = m;
sizes[1] = hlen + mlen;
types[1] = 1;
-# endif
+# endif /* MENTAT */
return ipllog(IPL_LOGIPF, fin, ptrs, sizes, types, 2);
}
-/*
- * ipllog
- */
+/* ------------------------------------------------------------------------ */
+/* Function: ipllog */
+/* Returns: int - 0 == success, -1 == failure */
+/* Parameters: dev(I) - device that owns this log record */
+/* fin(I) - pointer to packet information */
+/* items(I) - array of pointers to log data */
+/* itemsz(I) - array of size of valid memory pointed to */
+/* types(I) - type of data pointed to by items pointers */
+/* cnt(I) - number of elements in arrays items/itemsz/types */
+/* */
+/* Takes an array of parameters and constructs one record to include the */
+/* miscellaneous packet information, as well as packet data, for reading */
+/* from the log device. */
+/* ------------------------------------------------------------------------ */
int ipllog(dev, fin, items, itemsz, types, cnt)
int dev;
fr_info_t *fin;
@@ -308,33 +413,39 @@ void **items;
size_t *itemsz;
int *types, cnt;
{
- caddr_t buf, s;
+ caddr_t buf, ptr;
iplog_t *ipl;
size_t len;
int i;
-
+# if defined(_KERNEL) && !defined(MENTAT) && defined(USE_SPL)
+ int s;
+# endif
+
/*
* Check to see if this log record has a CRC which matches the last
* record logged. If it does, just up the count on the previous one
* rather than create a new one.
*/
- MUTEX_ENTER(&ipl_mutex);
- if ((fin != NULL) && (fin->fin_off == 0)) {
- if ((ipll[dev] != NULL) &&
- bcmp((char *)fin, (char *)&iplcrc[dev], FI_LCSIZE) == 0) {
- ipll[dev]->ipl_count++;
- MUTEX_EXIT(&ipl_mutex);
- return 1;
- }
- bcopy((char *)fin, (char *)&iplcrc[dev], FI_LCSIZE);
- } else
- bzero((char *)&iplcrc[dev], FI_LCSIZE);
- MUTEX_EXIT(&ipl_mutex);
+ if (ipl_suppress) {
+ MUTEX_ENTER(&ipl_mutex);
+ if ((fin != NULL) && (fin->fin_off == 0)) {
+ if ((ipll[dev] != NULL) &&
+ bcmp((char *)fin, (char *)&iplcrc[dev],
+ FI_LCSIZE) == 0) {
+ ipll[dev]->ipl_count++;
+ MUTEX_EXIT(&ipl_mutex);
+ return 0;
+ }
+ bcopy((char *)fin, (char *)&iplcrc[dev], FI_LCSIZE);
+ } else
+ bzero((char *)&iplcrc[dev], FI_CSIZE);
+ MUTEX_EXIT(&ipl_mutex);
+ }
/*
* Get the total amount of data to be logged.
*/
- for (i = 0, len = IPLOG_SIZE; i < cnt; i++)
+ for (i = 0, len = sizeof(iplog_t); i < cnt; i++)
len += itemsz[i];
/*
@@ -342,70 +453,85 @@ int *types, cnt;
* allocate that much.
*/
KMALLOCS(buf, caddr_t, len);
- if (!buf)
- return 0;
+ if (buf == NULL)
+ return -1;
+ SPL_NET(s);
MUTEX_ENTER(&ipl_mutex);
- if ((iplused[dev] + len) > IPLLOGSIZE) {
+ if ((iplused[dev] + len) > ipl_logsize) {
MUTEX_EXIT(&ipl_mutex);
+ SPL_X(s);
KFREES(buf, len);
- return 0;
+ return -1;
}
iplused[dev] += len;
MUTEX_EXIT(&ipl_mutex);
+ SPL_X(s);
/*
* advance the log pointer to the next empty record and deduct the
* amount of space we're going to use.
*/
ipl = (iplog_t *)buf;
- ipl->ipl_magic = IPL_MAGIC;
+ ipl->ipl_magic = ipl_magic[dev];
ipl->ipl_count = 1;
ipl->ipl_next = NULL;
ipl->ipl_dsize = len;
-# ifdef _KERNEL
-# if SOLARIS || defined(sun)
- uniqtime(&ipl->ipl_tv);
-# else
-# if BSD >= 199306 || defined(__FreeBSD__) || defined(__sgi)
- microtime(&ipl->ipl_tv);
-# endif
-# endif
-# else
+#ifdef _KERNEL
+ GETKTIME(&ipl->ipl_sec);
+#else
ipl->ipl_sec = 0;
ipl->ipl_usec = 0;
-# endif
+#endif
/*
* Loop through all the items to be logged, copying each one to the
* buffer. Use bcopy for normal data or the mb_t copyout routine.
*/
- for (i = 0, s = buf + IPLOG_SIZE; i < cnt; i++) {
- if (types[i] == 0)
- bcopy(items[i], s, itemsz[i]);
- else if (types[i] == 1) {
-# if SOLARIS && defined(_KERNEL)
- copyout_mblk(items[i], 0, itemsz[i], s);
-# else
- m_copydata(items[i], 0, itemsz[i], s);
-# endif
+ for (i = 0, ptr = buf + sizeof(*ipl); i < cnt; i++) {
+ if (types[i] == 0) {
+ bcopy(items[i], ptr, itemsz[i]);
+ } else if (types[i] == 1) {
+ COPYDATA(items[i], 0, itemsz[i], ptr);
}
- s += itemsz[i];
+ ptr += itemsz[i];
}
+ SPL_NET(s);
MUTEX_ENTER(&ipl_mutex);
ipll[dev] = ipl;
*iplh[dev] = ipl;
iplh[dev] = &ipl->ipl_next;
+
+ /*
+ * Now that the log record has been completed and added to the queue,
+ * wake up any listeners who may want to read it.
+ */
# if SOLARIS && defined(_KERNEL)
cv_signal(&iplwait);
- mutex_exit(&ipl_mutex);
+ MUTEX_EXIT(&ipl_mutex);
# else
MUTEX_EXIT(&ipl_mutex);
- WAKEUP(&iplh[dev]);
+ WAKEUP(iplh,dev);
+# endif
+ SPL_X(s);
+# ifdef IPL_SELECT
+ iplog_input_ready(dev);
# endif
- return 1;
+ return 0;
}
+/* ------------------------------------------------------------------------ */
+/* Function: ipflog_read */
+/* Returns: int - 0 == success, else error value. */
+/* Parameters: unit(I) - device we are reading from */
+/* uio(O) - pointer to information about where to store data */
+/* */
+/* Called to handle a read on an IPFilter device. Returns only complete */
+/* log messages - will not partially copy a log record out to userland. */
+/* */
+/* NOTE: This function will block and wait for a signal to return data if */
+/* there is none present. Asynchronous I/O is not implemented. */
+/* ------------------------------------------------------------------------ */
int ipflog_read(unit, uio)
minor_t unit;
struct uio *uio;
@@ -413,7 +539,7 @@ struct uio *uio;
size_t dlen, copied;
int error = 0;
iplog_t *ipl;
-# if defined(_KERNEL) && !SOLARIS
+# if defined(_KERNEL) && !defined(MENTAT) && defined(USE_SPL)
int s;
# endif
@@ -423,11 +549,12 @@ struct uio *uio;
*/
if (IPL_LOGMAX < unit)
return ENXIO;
- if (!uio->uio_resid)
+ if (uio->uio_resid == 0)
return 0;
- if (uio->uio_resid < IPLOG_SIZE)
+ if ((uio->uio_resid < sizeof(iplog_t)) ||
+ (uio->uio_resid > ipl_logsize))
return EINVAL;
-
+
/*
* Lock the log so we can snapshot the variables. Wait for a signal
* if the log is empty.
@@ -437,26 +564,48 @@ struct uio *uio;
while (iplt[unit] == NULL) {
# if SOLARIS && defined(_KERNEL)
- if (!cv_wait_sig(&iplwait, &ipl_mutex)) {
+ if (!cv_wait_sig(&iplwait, &ipl_mutex.ipf_lk)) {
MUTEX_EXIT(&ipl_mutex);
return EINTR;
}
# else
+# if defined(__hpux) && defined(_KERNEL)
+ lock_t *l;
+
+# ifdef IPL_SELECT
+ if (uio->uio_fpflags & (FNBLOCK|FNDELAY)) {
+ /* this is no blocking system call */
+ MUTEX_EXIT(&ipl_mutex);
+ return 0;
+ }
+# endif
+
MUTEX_EXIT(&ipl_mutex);
- error = SLEEP(&iplh[unit], "ipl sleep");
- if (error) {
- SPL_X(s);
+ l = get_sleep_lock(&iplh[unit]);
+ error = sleep(&iplh[unit], PZERO+1);
+ spinunlock(l);
+# else
+# if defined(__osf__) && defined(_KERNEL)
+ error = mpsleep(&iplh[unit], PSUSP|PCATCH, "iplread", 0,
+ &ipl_mutex, MS_LOCK_SIMPLE);
+# else
+ MUTEX_EXIT(&ipl_mutex);
+ SPL_X(s);
+ error = SLEEP(unit + iplh, "ipl sleep");
+# endif /* __osf__ */
+# endif /* __hpux */
+ if (error)
return error;
- }
+ SPL_NET(s);
MUTEX_ENTER(&ipl_mutex);
# endif /* SOLARIS */
}
-# if BSD >= 199306 || defined(__FreeBSD__)
+# if (BSD >= 199101) || defined(__FreeBSD__) || defined(__osf__)
uio->uio_rw = UIO_READ;
# endif
- for (copied = 0; (ipl = iplt[unit]); copied += dlen) {
+ for (copied = 0; (ipl = iplt[unit]) != NULL; copied += dlen) {
dlen = ipl->ipl_dsize;
if (dlen > uio->uio_resid)
break;
@@ -466,15 +615,19 @@ struct uio *uio;
iplt[unit] = ipl->ipl_next;
iplused[unit] -= dlen;
MUTEX_EXIT(&ipl_mutex);
+ SPL_X(s);
error = UIOMOVE((caddr_t)ipl, dlen, UIO_READ, uio);
- MUTEX_ENTER(&ipl_mutex);
if (error) {
+ SPL_NET(s);
+ MUTEX_ENTER(&ipl_mutex);
ipl->ipl_next = iplt[unit];
iplt[unit] = ipl;
iplused[unit] += dlen;
break;
}
+ MUTEX_ENTER(&ipl_mutex);
KFREES((caddr_t)ipl, dlen);
+ SPL_NET(s);
}
if (!iplt[unit]) {
iplused[unit] = 0;
@@ -488,14 +641,25 @@ struct uio *uio;
}
+/* ------------------------------------------------------------------------ */
+/* Function: ipflog_clear */
+/* Returns: int - number of log bytes cleared. */
+/* Parameters: unit(I) - device we are reading from */
+/* */
+/* Deletes all queued up log records for a given output device. */
+/* ------------------------------------------------------------------------ */
int ipflog_clear(unit)
minor_t unit;
{
iplog_t *ipl;
int used;
+# if defined(_KERNEL) && !defined(MENTAT) && defined(USE_SPL)
+ int s;
+# endif
+ SPL_NET(s);
MUTEX_ENTER(&ipl_mutex);
- while ((ipl = iplt[unit])) {
+ while ((ipl = iplt[unit]) != NULL) {
iplt[unit] = ipl->ipl_next;
KFREES((caddr_t)ipl, ipl->ipl_dsize);
}
@@ -503,8 +667,9 @@ minor_t unit;
ipll[unit] = NULL;
used = iplused[unit];
iplused[unit] = 0;
- bzero((char *)&iplcrc[unit], FI_LCSIZE);
+ bzero((char *)&iplcrc[unit], FI_CSIZE);
MUTEX_EXIT(&ipl_mutex);
+ SPL_X(s);
return used;
}
#endif /* IPFILTER_LOG */
OpenPOWER on IntegriCloud