From owner-trustedbsd-cvs@FreeBSD.ORG  Wed May 31 12:52:32 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CE0BB16A4CD
	for <trustedbsd-cvs@freebsd.org>; Wed, 31 May 2006 12:52:32 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 47FB943D48
	for <trustedbsd-cvs@freebsd.org>; Wed, 31 May 2006 12:52:32 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 1937146D2B
	for <trustedbsd-cvs@trustedbsd.org>;
	Wed, 31 May 2006 08:52:31 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id D9664D0A0E;
	Wed, 31 May 2006 12:36:20 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C89B16A6A7; Wed, 31 May 2006 12:35:51 +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 D0FAC16A605
	for <perforce@freebsd.org>; Wed, 31 May 2006 12:35:50 +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 8D66343D58
	for <perforce@freebsd.org>; Wed, 31 May 2006 12:35:50 +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.6/8.13.6) with ESMTP id k4VCYSYX082259
	for <perforce@freebsd.org>; Wed, 31 May 2006 12:34:28 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VCYSHo082256
	for perforce@freebsd.org; Wed, 31 May 2006 12:34:28 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 31 May 2006 12:34:28 GMT
Message-Id: <200605311234.k4VCYSHo082256@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 98204 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Wed, 31 May 2006 12:52:34 -0000

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

Change 98204 by rwatson@rwatson_zoo on 2006/05/31 12:33:49

	More ipfw MAC support.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#41 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#41 (text+ko) ====

@@ -43,6 +43,7 @@
 #endif
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,6 +53,7 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/jail.h>
+#include <sys/mac.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
@@ -1542,8 +1544,9 @@
 
 #ifdef MAC
 	if (replyto != NULL)
-
-
+		mac_ipfw_tcpreflect(replyto, m);
+	else
+		mac_ipfw_tcpkeepalive(m);
 #endif
 
 	m->m_pkthdr.len = m->m_len = sizeof(struct ip) + sizeof(struct tcphdr);