From owner-p4-projects@FreeBSD.ORG  Tue Jul 29 01:55:44 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B73BC1065679; Tue, 29 Jul 2008 01:55:44 +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 7B1AE106564A
	for <perforce@FreeBSD.org>; Tue, 29 Jul 2008 01:55:44 +0000 (UTC)
	(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B6228FC0A
	for <perforce@FreeBSD.org>; Tue, 29 Jul 2008 01:55:44 +0000 (UTC)
	(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6T1tisr027418
	for <perforce@FreeBSD.org>; Tue, 29 Jul 2008 01:55:44 GMT
	(envelope-from diego@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6T1ti7b027416
	for perforce@freebsd.org; Tue, 29 Jul 2008 01:55:44 GMT
	(envelope-from diego@FreeBSD.org)
Date: Tue, 29 Jul 2008 01:55:44 GMT
Message-Id: <200807290155.m6T1ti7b027416@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	diego@FreeBSD.org using -f
From: Diego Giagio <diego@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146175 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: Tue, 29 Jul 2008 01:55:45 -0000

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

Change 146175 by diego@diego_black on 2008/07/29 01:55:16

	Add support for connection events.

Affected files ...

.. //depot/projects/soc2008/diego-audit/src/sys/bsm/audit_kevents.h#5 edit
.. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_bsm.c#4 edit

Differences ...

==== //depot/projects/soc2008/diego-audit/src/sys/bsm/audit_kevents.h#5 (text) ====

@@ -556,6 +556,8 @@
 #define	AUE_PFIL_POLICY_ADDTABLE	43158	/* FreeBSD. */
 #define	AUE_PFIL_POLICY_DELTABLE	43159	/* FreeBSD. */
 #define	AUE_PFIL_POLICY_FLUSHTABLE	43160	/* FreeBSD. */
+#define	AUE_PFIL_FLOW_BEGIN	43161	/* FreeBSD. */
+#define	AUE_PFIL_FLOW_END	43162	/* FreeBSD. */
 
 /*
  * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the

==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_bsm.c#4 (text) ====

@@ -1427,6 +1427,37 @@
 		}
 		break;
 
+	case AUE_PFIL_FLOW_BEGIN:
+	case AUE_PFIL_FLOW_END:
+		if (ARG_IS_VALID(kar, ARG_TEXT)) {
+			tok = au_to_text(ar->ar_arg_text);
+			kau_write(rec, tok);
+		}
+		if (ARG_IS_VALID(kar, ARG_SOCKCONN)) {
+			struct sockaddr *laddr;
+			struct sockaddr *raddr;
+
+			laddr = (struct sockaddr*)&ar->ar_arg_sockconn.sc_laddr;
+			raddr = (struct sockaddr*)&ar->ar_arg_sockconn.sc_raddr;
+
+			if (ar->ar_arg_sockconn.sc_domain == PF_INET) {
+				tok = au_to_socket_ex_32(
+				    ar->ar_arg_sockconn.sc_domain,
+				    ar->ar_arg_sockconn.sc_type,
+				    ar->ar_arg_sockconn.sc_lport,
+				    ar->ar_arg_sockconn.sc_rport,
+				    laddr, raddr);
+			} else {
+				tok = au_to_socket_ex_128(
+				    ar->ar_arg_sockconn.sc_domain,
+				    ar->ar_arg_sockconn.sc_type,
+				    ar->ar_arg_sockconn.sc_lport,
+				    ar->ar_arg_sockconn.sc_rport,
+				    laddr, raddr);
+			}
+			kau_write(rec, tok);
+		}
+
 	case AUE_NULL:
 	default:
 		printf("BSM conversion requested for unknown event %d\n",