summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/pf.conf5
-rw-r--r--share/man/man5/pf.conf.510
2 files changed, 8 insertions, 7 deletions
diff --git a/etc/pf.conf b/etc/pf.conf
index 58923c97852..88cca416c66 100644
--- a/etc/pf.conf
+++ b/etc/pf.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: pf.conf,v 1.19 2003/03/24 01:47:28 ian Exp $
+# $OpenBSD: pf.conf,v 1.20 2003/06/17 21:48:10 david Exp $
#
# See pf.conf(5) and /usr/share/pf for syntax and examples.
# Required order: options, normalization, queueing, translation, filtering.
@@ -15,12 +15,13 @@
#table <foo> { 10.0.0.0/8, !10.1.0.0/16, 192.168.0.0/24, 192.168.1.18 }
# Options: tune the behavior of pf, default values are given.
-#set timeout { interval 30, frag 10 }
+#set timeout { interval 10, frag 30 }
#set timeout { tcp.first 120, tcp.opening 30, tcp.established 86400 }
#set timeout { tcp.closing 900, tcp.finwait 45, tcp.closed 90 }
#set timeout { udp.first 60, udp.single 30, udp.multiple 60 }
#set timeout { icmp.first 20, icmp.error 10 }
#set timeout { other.first 60, other.single 30, other.multiple 60 }
+#set timeout { adaptive.start 0, adaptive.end 0 }
#set limit { states 10000, frags 5000 }
#set loginterface none
#set optimization normal
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 21e9d8c19ea..e714e6ab48d 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pf.conf.5,v 1.258 2003/06/12 10:05:15 henning Exp $
+.\" $OpenBSD: pf.conf.5,v 1.259 2003/06/17 21:48:11 david Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
.\" All rights reserved.
@@ -2294,7 +2294,7 @@ tos = "tos" ( "lowdelay" | "throughput" | "reliability" |
[ "0x" ] number )
state-opts = state-opt [ [ "," ] state-opts ]
-state-opt = ( "max" number ) | ( timeout seconds )
+state-opt = ( "max" number ) | ( timeout )
fragmentation = [ "fragment reassemble" | "fragment crop" |
"fragment drop-ovl" ]
@@ -2304,9 +2304,9 @@ timeout = ( "tcp.first" | "tcp.opening" | "tcp.established" |
"tcp.closing" | "tcp.finwait" | "tcp.closed" |
"udp.first" | "udp.single" | "udp.multiple" |
"icmp.first" | "icmp.error" |
- "other.first" | "other.single" | "other.multiple" )
- seconds
-seconds = number
+ "other.first" | "other.single" | "other.multiple" |
+ "frag" | "interval" |
+ "adaptive.start" | "adaptive.end" ) number
limit-list = limit-item [ [ "," ] limit-list ]
limit-item = ( "states" | "frags" ) number