From owner-p4-projects@FreeBSD.ORG  Sun Feb 24 17:53:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB33E16A40A; Sun, 24 Feb 2008 17:53:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6E14D16A407
	for <perforce@freebsd.org>; Sun, 24 Feb 2008 17:53:11 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 48CC613C45A
	for <perforce@freebsd.org>; Sun, 24 Feb 2008 17:53:11 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHrBJt067163
	for <perforce@freebsd.org>; Sun, 24 Feb 2008 17:53:11 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHrAcs067160
	for perforce@freebsd.org; Sun, 24 Feb 2008 17:53:10 GMT
	(envelope-from csjp@freebsd.org)
Date: Sun, 24 Feb 2008 17:53:10 GMT
Message-Id: <200802241753.m1OHrAcs067160@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136109 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Feb 2008 17:53:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=136109

Change 136109 by csjp@ibm01 on 2008/02/24 17:52:51

	Check to see if the kernel supports AUDITPIPE_SET_BUFMODE, and if so
	use it.  Currently we are not setting any low watermarks

Affected files ...

.. //depot/projects/trustedbsd/netauditd/netauditd.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/netauditd/netauditd.c#7 (text+ko) ====

@@ -25,13 +25,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/ioctl.h>
+
+#include <bsm/audit.h>
+#include <bsm/libbsm.h>
+#include <security/audit/audit_ioctl.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,7 +47,7 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <signal.h>
-#include <bsm/libbsm.h>
+
 #include "netauditd.h"
 
 const struct conf_ent {
@@ -386,6 +391,9 @@
 	struct timeval tv;
 	struct au_cmpnt *au;
 	int ret;
+#ifdef AUDITPIPE_SET_BUFMODE
+	int opt;
+#endif
 
 	FD_ZERO(&srfds);
 	TAILQ_FOREACH(au, &au_srclist, ac_glue) {
@@ -394,6 +402,14 @@
 			au->ac_fd = open(au->ac_path, O_RDONLY);
 			if (au->ac_fd == -1)
 				err(1, "%s", au->ac_path);
+#ifdef AUDITPIPE_SET_BUFMODE
+			opt = AUDITPIPE_BUFMODE_BUFFERED;
+			if (ioctl(au->ac_fd, AUDITPIPE_SET_BUFMODE, &opt) < 0)
+				err(1, "AUDITPIPE_SET_BUFMODE");
+			/*
+			 * We should add support for low watermarks here.
+			 */
+#endif
 			break;
 		case NETAUDIT_SRC_NET:
 			netaudit_socket_listen(au);
@@ -422,6 +438,8 @@
 					case NETAUDIT_SRC_PIPE:
 						netaudit_pipe_read(au);
 						break;
+					case NETAUDIT_SRC_NET:
+						break;
 					default:
 						exit(2);
 					}