From owner-p4-projects@FreeBSD.ORG  Sun Mar 19 14:45:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E2AE16A422; Sun, 19 Mar 2006 14:45:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AEC2616A420
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 14:45:36 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5B22A43D45
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 14:45:36 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JEjaxU002650
	for <perforce@freebsd.org>; Sun, 19 Mar 2006 14:45:36 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JEjaxW002647
	for perforce@freebsd.org; Sun, 19 Mar 2006 14:45:36 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 19 Mar 2006 14:45:36 GMT
Message-Id: <200603191445.k2JEjaxW002647@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93570 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, 19 Mar 2006 14:45:37 -0000

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

Change 93570 by rwatson@rwatson_peppercorn on 2006/03/19 14:45:26

	Add audit pipe ioctls to query minimum and maximum audit queue
	lengths.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 (text+ko) ====

@@ -36,16 +36,18 @@
 /*
  * Ioctls to read and control the behavior of individual audit pipe devices.
  */
-#define	AUDITPIPE_GET_QLEN	_IOR(AUDITPIPE_IOBASE, 1, u_int)
-#define	AUDITPIPE_GET_QLIMIT	_IOR(AUDITPIPE_IOBASE, 2, u_int)
-#define	AUDITPIPE_SET_QLIMIT	_IOW(AUDITPIPE_IOBASE, 3, u_int)
+#define	AUDITPIPE_GET_QLEN		_IOR(AUDITPIPE_IOBASE, 1, u_int)
+#define	AUDITPIPE_GET_QLIMIT		_IOR(AUDITPIPE_IOBASE, 2, u_int)
+#define	AUDITPIPE_SET_QLIMIT		_IOW(AUDITPIPE_IOBASE, 3, u_int)
+#define	AUDITPIPE_GET_QLIMIT_MIN	_IOR(AUDITPIPE_IOBASE, 4, u_int)
+#define	AUDITPIPE_GET_QLIMIT_MAX	_IOR(AUDITPIPE_IOBASE, 5, u_int)
 
 /*
  * Ioctls to retrieve audit pipe statistics.
  */
-#define	AUDITPIPE_GET_INSERTS	_IOR(AUDITPIPE_IOBASE, 100, u_int64_t)
-#define	AUDITPIPE_GET_READS	_IOR(AUDITPIPE_IOBASE, 101, u_int64_t)
-#define	AUDITPIPE_GET_DROPS	_IOR(AUDITPIPE_IOBASE, 102, u_int64_t)
-#define	AUDITPIPE_GET_TRUNCATES	_IOR(AUDITPIPE_IOBASE, 103, u_int64_t)
+#define	AUDITPIPE_GET_INSERTS		_IOR(AUDITPIPE_IOBASE, 100, u_int64_t)
+#define	AUDITPIPE_GET_READS		_IOR(AUDITPIPE_IOBASE, 101, u_int64_t)
+#define	AUDITPIPE_GET_DROPS		_IOR(AUDITPIPE_IOBASE, 102, u_int64_t)
+#define	AUDITPIPE_GET_TRUNCATES		_IOR(AUDITPIPE_IOBASE, 103, u_int64_t)
 
 #endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 (text+ko) ====

@@ -457,6 +457,16 @@
 			error = EINVAL;
 		break;
 
+	case AUDITPIPE_GET_QLIMIT_MIN:
+		*(u_int *)data = AUDIT_PIPE_QLIMIT_MIN;
+		error = 0;
+		break;
+
+	case AUDITPIPE_GET_QLIMIT_MAX:
+		*(u_int *)data = AUDIT_PIPE_QLIMIT_MAX;
+		error = 0;
+		break;
+
 	case AUDITPIPE_GET_INSERTS:
 		*(u_int *)data = ap->ap_inserts;
 		error = 0;