From owner-svn-src-all@FreeBSD.ORG Tue Dec 20 13:32:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64A88106564A; Tue, 20 Dec 2011 13:32:57 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 390718FC17; Tue, 20 Dec 2011 13:32:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBKDWv4j018045; Tue, 20 Dec 2011 13:32:57 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBKDWvc4018043; Tue, 20 Dec 2011 13:32:57 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201112201332.pBKDWvc4018043@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 20 Dec 2011 13:32:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228734 - head/contrib/pf/man X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2011 13:32:57 -0000 Author: glebius Date: Tue Dec 20 13:32:56 2011 New Revision: 228734 URL: http://svn.freebsd.org/changeset/base/228734 Log: - Fix examples to show new CARP style. - Remove OpenBSDisms, add FreeBSDisms. Modified: head/contrib/pf/man/pfsync.4 Modified: head/contrib/pf/man/pfsync.4 ============================================================================== --- head/contrib/pf/man/pfsync.4 Tue Dec 20 12:34:17 2011 (r228733) +++ head/contrib/pf/man/pfsync.4 Tue Dec 20 13:32:56 2011 (r228734) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 17 2009 +.Dd December 20 2011 .Dt PFSYNC 4 .Os .Sh NAME @@ -141,12 +141,11 @@ Interfaces configuration in .Pa /etc/rc.conf : .Bd -literal -offset indent network_interfaces="lo0 sis0 sis1 sis2" -cloned_interfaces="carp0 carp1" ifconfig_sis0="10.0.0.254/24" +ifconfig_sis0_alias0="inet 10.0.0.1/24 vhid 1 pass foo" ifconfig_sis1="192.168.0.254/24" +ifconfig_sis1_alias0="inet 192.168.0.1/24 vhid 2 pass bar" ifconfig_sis2="192.168.254.254/24" -ifconfig_carp0="vhid 1 pass foo 10.0.0.1/24" -ifconfig_carp1="vhid 2 pass bar 192.168.0.1/24" pfsync_enable="YES" pfsync_syncdev="sis2" .Ed @@ -169,13 +168,13 @@ therefore the .Ar advskew on the backup firewall's .Xr carp 4 -interfaces should be set to something higher than +vhids should be set to something higher than the primary's. For example, if firewall B is the backup, its carp1 configuration would look like this: would look like this: .Bd -literal -offset indent -ifconfig_carp1="vhid 2 pass bar advskew 100 192.168.0.1/24" +ifconfig_sis1_alias0="inet 192.168.0.1/24 vhid 2 pass bar advskew 100" .Ed .Pp The following must also be added to @@ -196,18 +195,18 @@ net.inet.carp.preempt=1 .Xr protocols 5 , .Xr rc.conf 5 , .Xr ifconfig 8 , -.Xr ifstated 8 , .Xr tcpdump 1 .Sh HISTORY The .Nm device first appeared in .Ox 3.3 . +It was first imported to +.Fx 5.3 . .Pp The .Nm -protocol and kernel implementation were significantly modified between -.Ox 4.4 -and -.Ox 4.5 . -The two protocols are incompatible and will not interoperate. +protocol and kernel implementation were significantly modified in +.Fx 9.0 . +The newer protocol is not compatible with older one and will not interoperate +with it.