From owner-svn-src-user@FreeBSD.ORG  Sat Oct 10 17:56:19 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 62B39106568F;
	Sat, 10 Oct 2009 17:56:19 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38CA08FC17;
	Sat, 10 Oct 2009 17:56:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9AHuJw0088653;
	Sat, 10 Oct 2009 17:56:19 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9AHuJov088649;
	Sat, 10 Oct 2009 17:56:19 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910101756.n9AHuJov088649@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Sat, 10 Oct 2009 17:56:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197937 - in user/eri/pf45/head/sys: contrib/pf/net
	modules/pf
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2009 17:56:19 -0000

Author: eri
Date: Sat Oct 10 17:56:18 2009
New Revision: 197937
URL: http://svn.freebsd.org/changeset/base/197937

Log:
  pfsync(4) can be loaded at runtime.
  Remove leftovers notyet defines for pfsync(4).

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf.c
  user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
  user/eri/pf45/head/sys/modules/pf/Makefile

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf.c	Sat Oct 10 17:41:16 2009	(r197936)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf.c	Sat Oct 10 17:56:18 2009	(r197937)
@@ -3497,9 +3497,7 @@ pf_create_state(struct pf_rule *r, struc
 	if (r->rule_flag & PFRULE_PFLOW)
 		s->state_flags |= PFSTATE_PFLOW;
 	s->log = r->log & PF_LOG_ALL;
-#ifdef notyet
 	s->sync_state = PFSYNC_S_NONE;
-#endif
 	if (nr != NULL)
 		s->log |= nr->log & PF_LOG_ALL;
 	switch (pd->proto) {

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Sat Oct 10 17:41:16 2009	(r197936)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Sat Oct 10 17:56:18 2009	(r197937)
@@ -115,13 +115,9 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <net/pfvar.h>
 
-#ifdef __FreeBSD__
-#include <net/if_pfsync.h>
-#else
 #if NPFSYNC > 0 
 #include <net/if_pfsync.h>
 #endif /* NPFSYNC > 0 */
-#endif
 
 #if NPFLOG > 0
 #include <net/if_pflog.h>
@@ -3537,7 +3533,7 @@ pfsync_state_export(struct pfsync_state 
                 state->timeout = PFTM_PURGE;
  #if NPFSYNC
                 /* don't send out individual delete messages */
-                state->state_flags = PFSTATE_NOSYNC;
+                state->sync_state = PFSTATE_NOSYNC;
  #endif
                 pf_unlink_state(state);
         }

Modified: user/eri/pf45/head/sys/modules/pf/Makefile
==============================================================================
--- user/eri/pf45/head/sys/modules/pf/Makefile	Sat Oct 10 17:41:16 2009	(r197936)
+++ user/eri/pf45/head/sys/modules/pf/Makefile	Sat Oct 10 17:56:18 2009	(r197937)
@@ -26,9 +26,12 @@ opt_bpf.h:
 	echo "#define DEV_BPF 1" > ${.TARGET}
 
 # pflog can be loaded as a module, have the additional checks turned on
+# pfsync can be loaded as a module, have the additional checks turned on
 opt_pf.h:
 	echo "#define DEV_PF 1" > ${.TARGET}
 	echo "#define DEV_PFLOG 1" >> ${.TARGET}
+	echo "#define DEV_PFSYNC 1" >> ${.TARGET}
+
 .endif
 
 .include <bsd.kmod.mk>