PERFORCE change 61514 for review
Peter Wemm
peter at FreeBSD.org
Tue Sep 14 16:27:38 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=61514
Change 61514 by peter at peter_daintree on 2004/09/14 23:26:51
IFC @61510
Affected files ...
.. //depot/projects/hammer/UPDATING#54 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.conf.5#3 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#33 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#28 integrate
.. //depot/projects/hammer/etc/pf.conf#2 integrate
.. //depot/projects/hammer/etc/pf.os#3 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#25 integrate
.. //depot/projects/hammer/etc/rc.d/ntpd#6 integrate
.. //depot/projects/hammer/etc/rc.d/ntpdate#8 delete
.. //depot/projects/hammer/etc/rc.d/rpcbind#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#6 integrate
.. //depot/projects/hammer/lib/libc/db/btree/bt_split.c#4 integrate
.. //depot/projects/hammer/release/Makefile#58 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#77 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#9 integrate
.. //depot/projects/hammer/share/examples/Makefile#6 integrate
.. //depot/projects/hammer/share/examples/pf/Makefile#1 branch
.. //depot/projects/hammer/share/examples/pf/ackpri#1 branch
.. //depot/projects/hammer/share/examples/pf/faq-example1#1 branch
.. //depot/projects/hammer/share/examples/pf/faq-example2#1 branch
.. //depot/projects/hammer/share/examples/pf/faq-example3#1 branch
.. //depot/projects/hammer/share/examples/pf/queue1#1 branch
.. //depot/projects/hammer/share/examples/pf/queue2#1 branch
.. //depot/projects/hammer/share/examples/pf/queue3#1 branch
.. //depot/projects/hammer/share/examples/pf/queue4#1 branch
.. //depot/projects/hammer/share/examples/pf/spamd#1 branch
.. //depot/projects/hammer/share/man/man4/divert.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ng_ubt.4#8 integrate
.. //depot/projects/hammer/share/man/man4/vge.4#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#9 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#10 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#12 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#13 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#15 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#8 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#6 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#5 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#38 integrate
.. //depot/projects/hammer/sys/dev/nge/if_nge.c#21 integrate
.. //depot/projects/hammer/sys/dev/nge/if_ngereg.h#4 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#41 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#27 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#29 integrate
.. //depot/projects/hammer/sys/sys/sched.h#15 integrate
.. //depot/projects/hammer/usr.bin/uniq/uniq.c#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/parser.y#4 integrate
.. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#7 integrate
.. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#7 integrate
.. //depot/projects/hammer/usr.sbin/cron/crontab/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#4 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#54 (text+ko) ====
@@ -23,6 +23,22 @@
developers choose to disable these features on build machines
to maximize performance.
+20040914:
+ /etc/rc.d/ntpdate has been removed in favor of using the -g
+ flag to ntpd(1). By default, if ntpd is enabled, it will sync
+ with the time servers listed in /etc/ntp.conf regardless of the
+ time difference (slew). To prevent this, add
+ ntpd_sync_on_start="NO" to /etc/rc.conf.
+
+ NOTE: Doing a sync (ntpd -g) is noticably slower than ntpdate(1),
+ but is also more accurate (hence ntpdate(1) being depreciated).
+
+20040914:
+ The format of the pflogd(8) logfile "/var/log/pflog" has changed for
+ architectures that have a 64 bit long type to make it compatible to
+ the standard pcap format. In order to prevent corruption move away
+ any old logfile before using a new pflogd(8).
+
20040906:
debug.witness_* has been renamed to debug.witness.*. There are
compatibility tunables left in for a few days. Update loader.conf
@@ -1853,4 +1869,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.356 2004/09/06 23:37:16 jmg Exp $
+$FreeBSD: src/UPDATING,v 1.358 2004/09/14 03:01:38 seanc Exp $
==== //depot/projects/hammer/contrib/pf/man/pf.conf.5#3 (text+ko) ====
@@ -1,3 +1,4 @@
+.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.2 2004/09/14 01:07:19 mlaier Exp $
.\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
@@ -27,7 +28,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd November 19, 2002
+.Dd September 14, 2004
.Dt PF.CONF 5
.Os
.Sh NAME
@@ -2595,7 +2596,7 @@
"(" bandwidth-spec number bandwidth-spec ")" )
.Ed
.Sh FILES
-.Bl -tag -width "/etc/protocols" -compact
+.Bl -tag -width "/usr/share/examples/pf" -compact
.It Pa /etc/hosts
Host name database.
.It Pa /etc/pf.conf
@@ -2606,7 +2607,7 @@
Protocol name database.
.It Pa /etc/services
Service name database.
-.It Pa /usr/share/pf
+.It Pa /usr/share/examples/pf
Example rulesets.
.El
.Sh SEE ALSO
==== //depot/projects/hammer/etc/defaults/rc.conf#33 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.212 2004/07/27 00:28:16 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.213 2004/09/14 03:01:38 seanc Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -219,11 +219,9 @@
### Network Time Services options: ###
timed_enable="NO" # Run the time daemon (or NO).
timed_flags="" # Flags to timed (if enabled).
-ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO).
-ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one.
-ntpdate_flags="-b" # Flags to ntpdate (if enabled).
ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO).
ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one.
+ntpd_sync_on_start="YES" # Sync time on ntpd startup, even if offset is high
ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift"
# Flags to ntpd (if enabled).
==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#28 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.306 2004/08/28 12:52:30 tjr Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.307 2004/09/14 01:07:18 mlaier Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -245,6 +245,8 @@
..
perfmon
..
+ pf
+ ..
portal
..
ppi
==== //depot/projects/hammer/etc/pf.conf#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/etc/pf.conf,v 1.1 2004/03/08 22:03:27 mlaier Exp $
+# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $
# $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $
#
-# See pf.conf(5) and /usr/share/pf for syntax and examples.
+# See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
# Required order: options, normalization, queueing, translation, filtering.
# Macros and tables may be defined and used anywhere.
# Note that translation rules are first match while filter rules are last match.
==== //depot/projects/hammer/etc/pf.os#3 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/etc/pf.os,v 1.2 2004/06/06 11:46:27 schweikh Exp $
-# $OpenBSD: pf.os,v 1.10 2003/09/06 01:37:07 frantzen Exp $
+# $FreeBSD: src/etc/pf.os,v 1.3 2004/09/14 00:30:14 mlaier Exp $
+# $OpenBSD: pf.os,v 1.17 2004/04/28 01:01:27 deraadt Exp $
# passive OS fingerprinting
# -------------------------
#
@@ -22,7 +22,8 @@
#
#
# This fingerprint database is adapted from Michal Zalewski's p0f passive
-# operating system package.
+# operating system package. The last database sync was from a Nov 3 2003
+# p0f.fp.
#
#
# Each line in this file specifies a single fingerprint. Please read the
@@ -141,8 +142,8 @@
# Wnnn - window scaling option, value nnn (or * or %nnn)
# Mnnn - maximum segment size option, value nnn (or * or %nnn)
# S - selective ACK OK
-# T - timestamp
-# T0 - timestamp with a zero value
+# T - timestamp
+# T0 - timestamp with a zero value
#
# To denote no TCP options, use a single '.'.
#
@@ -151,6 +152,10 @@
# frantzen at openbsd.org and bugs at openbsd.org with a tcpdump packet
# capture of the relevant SYN packet(s)
#
+# A test and submission page is available at
+# http://lcamtuf.coredump.cx/p0f-help/
+#
+#
# WARNING WARNING WARNING
# -----------------------
#
@@ -193,6 +198,7 @@
# Linux 2.0, but it uses a fairly rare MSSes, at least sometimes...
# This is a shoddy hack, though.
+45046:64:0:44:M*: AIX:4.3::AIX 4.3
16384:64:0:44:M512: AIX:4.3:2-3:AIX 4.3.2 and earlier
16384:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2
@@ -205,6 +211,7 @@
# ----------------- Linux -------------------
+# S1:64:0:44:M*:A: Linux:1.2::Linux 1.2.x (XXX quirks support)
512:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x
16384:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x
@@ -220,8 +227,10 @@
S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6
S4:64:1:60:M*,S,T,N,W0: Linux:2.6::Linux 2.4/2.6
-S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5
+S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 (sometimes 2.4)
S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6
+S3:64:1:60:M*,S,T,N,W2: Linux:2.5::Linux 2.5 (sometimes 2.4)
+S4:64:1:60:M*,S,T,N,W2: Linux:2.5::Linux 2.5 (sometimes 2.4)
S20:64:1:60:M*,S,T,N,W0: Linux:2.2:20-25:Linux 2.2.20 and newer
S22:64:1:60:M*,S,T,N,W0: Linux:2.2::Linux 2.2
@@ -268,25 +277,32 @@
65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.9::FreeBSD 4.7-5.1
65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.7-5.1
+# XXX need quirks support
+# 65535:64:1:60:M*,N,W0,N,N,T:Z:FreeBSD:5.1-current (1)
+# 65535:64:1:60:M*,N,W1,N,N,T:Z:FreeBSD:5.1-current (2)
+# 65535:64:1:60:M*,N,W2,N,N,T:Z:FreeBSD:5.1-current (3)
+
# 16384:64:1:60:M*,N,N,N,N,N,N,T:FreeBSD:4.4:noTS:FreeBSD 4.4 (w/o timestamps)
# ----------------- NetBSD ------------------
+16384:64:0:60:M*,N,W0,N,N,T: NetBSD:1.3::NetBSD 1.3
65535:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6:opera:NetBSD 1.6 (Opera)
16384:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6::NetBSD 1.6
16384:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6:df:NetBSD 1.6 (DF)
-16384:64:0:60:M*,N,W0,N,N,T: NetBSD:1.3::NetBSD 1.3
65535:64:1:60:M*,N,W1,N,N,T0: NetBSD:1.6::NetBSD 1.6W-current (DF)
+65535:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6::NetBSD 1.6X (DF)
+32768:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6:randomization:NetBSD 1.6ZH-current (w/ ip_id randomization)
# ----------------- OpenBSD -----------------
16384:64:0:60:M*,N,W0,N,N,T: OpenBSD:2.6::NetBSD 1.3 (or OpenBSD 2.6)
-16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4::OpenBSD 3.0-3.4
-16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:no-df:OpenBSD 3.0-3.4 (scrub no-df)
-57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4::OpenBSD 3.3-3.4
-57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4:no-df:OpenBSD 3.3-3.4 (scrub no-df)
+16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5::OpenBSD 3.0-3.5
+16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:no-df:OpenBSD 3.0-3.5 (scrub no-df)
+57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5::OpenBSD 3.3-3.5
+57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5:no-df:OpenBSD 3.3-3.5 (scrub no-df)
-65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:opera:OpenBSD 3.0-3.4 (Opera)
+65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:opera:OpenBSD 3.0-3.5 (Opera)
# ----------------- Solaris -----------------
@@ -299,6 +315,10 @@
S34:64:1:48:M*,N,N,S: Solaris:2.9::Solaris 9
S44:255:1:44:M*: Solaris:2.7::Solaris 7
+4096:64:0:44:M1460: SunOS:4.1::SunOS 4.1.x
+
+S34:64:1:52:M*,N,W0,N,N,S: Solaris:10::Solaris 10 (beta)
+
# ----------------- IRIX --------------------
49152:64:0:44:M*: IRIX:6.4::IRIX 6.4
@@ -311,46 +331,58 @@
# ----------------- Tru64 -------------------
-32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0
+32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 (or OS/2 Warp 4)
32768:64:0:48:M*,N,W0: Tru64:5.0::Tru64 5.0
8192:64:0:44:M1460: Tru64:5.1:noRFC1323:Tru64 6.1 (no RFC1323) (or QNX 6)
-
-# This looks awfully Linuxish :/
-# S22:64:0:60:M*,S,T,N,W0: Tru64:5.0:a:Tru64 5.0a
-
61440:64:0:48:M*,N,W0: Tru64:5.1a:JP4:Tru64 v5.1a JP4 (or OpenVMS 7.x on Compaq 5.x stack)
-
# ----------------- OpenVMS -----------------
6144:64:1:60:M*,N,W0,N,N,T: OpenVMS:7.2::OpenVMS 7.2 (Multinet 4.4 stack)
# ----------------- MacOS -------------------
+# XXX Need EOL tcp opt support
+# S2:255:1:48:M*,W0,E:.:MacOS:8.6 classic
+
+# XXX some of these use EOL too
16616:255:1:48:M*,W0: MacOS:7.3-7.6:OTTCP:MacOS 7.3-8.6 (OTTCP)
16616:255:1:48:M*,W0: MacOS:8.0-8.6:OTTCP:MacOS 7.3-8.6 (OTTCP)
-32768:255:1:48:M*,W0,N: MacOS:9.1-9.2::MacOS 9.1/9.2
-32768:64:0:60:M*,N,W0,N,N,T: MacOS:X:10.2:MacOS X 10.2
+16616:255:1:48:M*,N,N,N: MacOS:8.1-8.6:OTTCP:MacOS 8.1-8.6 (OTTCP)
+32768:255:1:48:M*,W0,N: MacOS:9.0-9.2::MacOS 9.0-9.2
+65535:255:1:48:M*,N,N,N,N: MacOS:9.1::MacOS 9.1 (OT 2.7.4)
+
# ----------------- Windows -----------------
-# Windows 95 - need more:
+# Windows TCP/IP stack is a mess. For most recent XP, 2000 and
+# even 98, the pathlevel, not the actual OS version, is more
+# relevant to the signature. They share the same code, so it would
+# seem. Luckily for us, almost all Windows 9x boxes have an
+# awkward MSS of 536, which I use to tell one from another
+# in most difficult cases.
-8192:32:1:44:M*: Windows:95::Windows 95 (low TTL)
+8192:32:1:44:M*: Windows:3.11::Windows 3.11 (Tucows)
+S44:64:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:95::Windows 95
+8192:128:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:95:b:Windows 95b
-# Windows 98 - plenty of silly signatures:
-S44:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL)
-8192:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL)
+# There were so many tweaking tools and so many stack versions for
+# Windows 98 it is no longer possible to tell them from each other
+# without some very serious research. Until then, there's an insane
+# number of signatures, for your amusement:
-%8192:64:1:48:M*,N,N,S: Windows:98::Windows 98 (or newer XP/2000 with tweaked TTL)
+S44:32:1:48:M*,N,N,S: Windows:98:lowTTL:Windows 98 (low TTL)
+8192:32:1:48:M*,N,N,S: Windows:98:lowTTL:Windows 98 (low TTL)
+%8192:64:1:48:M536,N,N,S: Windows:98::Windows 98
+%8192:128:1:48:M536,N,N,S: Windows:98::Windows 98
S4:64:1:48:M*,N,N,S: Windows:98::Windows 98
S6:64:1:48:M*,N,N,S: Windows:98::Windows 98
S12:64:1:48:M*,N,N,S: Windows:98::Windows 98
+T30:64:1:64:M1460,N,W0,N,N,T0,N,N,S: Windows:98::Windows 98
32767:64:1:48:M*,N,N,S: Windows:98::Windows 98
37300:64:1:48:M*,N,N,S: Windows:98::Windows 98
46080:64:1:52:M*,N,W3,N,N,S: Windows:98:RFC1323:Windows 98 (RFC1323)
-65535:64:1:44:M*: Windows:98:noSACK:Windows 98 (no sack)
-
+65535:64:1:44:M*: Windows:98:noSack:Windows 98 (no sack)
S16:128:1:48:M*,N,N,S: Windows:98::Windows 98
S16:128:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:98::Windows 98
S26:128:1:48:M*,N,N,S: Windows:98::Windows 98
@@ -359,36 +391,46 @@
60352:128:1:48:M*,N,N,S: Windows:98::Windows 98
60352:128:1:64:M*,N,W2,N,N,T0,N,N,S: Windows:98::Windows 98
-# Windows NT 4.0 - need more:
-
+# What's with 1414 on NT?
+T31:128:1:44:M1414: Windows:NT:4.0:Windows NT 4.0 SP6a
64512:128:1:44:M1414: Windows:NT:4.0:Windows NT 4.0 SP6a
8192:128:1:44:M*: Windows:NT:4.0:Windows NT 4.0 (older)
-6144:128:1:52:M*,W0,N,S,N,N: Windows:NT:4.0:Windows NT 4.0 (RFC1323)
# Windows XP and 2000. Most of the signatures that were
# either dubious or non-specific (no service pack data)
# were deleted and replaced with generics at the end.
65535:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1
-%8192:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1
-S45:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4
-S6:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows XP SP1, 2000 SP4
-S44:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows XP Pro SP1, 2000 SP3
+65535:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1
+%8192:128:1:48:M*,N,N,S: Windows:2000:SP2+:Windows 2000 SP2, XP SP1 (seldom 98 4.10.2222)
+%8192:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP2, XP SP1 (seldom 98 4.10.2222)
+S20:128:1:48:M*,N,N,S: Windows:2000::Windows 2000/XP SP3
+S20:128:1:48:M*,N,N,S: Windows:XP:SP3:Windows 2000/XP SP3
+S45:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP 1
+S45:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP 1
+40320:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4
-S6:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1, 2000 SP4
-S44:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP Pro SP1, 2000 SP3
-64512:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1
-32767:128:1:48:M1452,N,N,S: Windows:XP:SP1:Windows XP SP1
-65535:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1
-%8192:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1
+S6:128:1:48:M*,N,N,S: Windows:2000:SP2:Windows XP, 2000 SP2+
+S6:128:1:48:M*,N,N,S: Windows:XP::Windows XP, 2000 SP2+
+S12:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1
+S44:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows Pro SP1, 2000 SP3
+S44:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows Pro SP1, 2000 SP3
+64512:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows SP1, 2000 SP3
+64512:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows SP1, 2000 SP3
+32767:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows SP1, 2000 SP4
+32767:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows SP1, 2000 SP4
# Odds, ends, mods:
-S52:128:1:48:M1260,N,N,S: Windows:XP:Cisco:Windows XP/2000 via Cisco
-S52:128:1:48:M1260,N,N,S: Windows:2000:Cisco:Windows XP/2000 via Cisco
+S52:128:1:48:M1260,N,N,S: Windows:2000:cisco:Windows XP/2000 via Cisco
+S52:128:1:48:M1260,N,N,S: Windows:XP:cisco:Windows XP/2000 via Cisco
+65520:128:1:48:M*,N,N,S: Windows:XP::Windows XP bare-bone
+16384:128:1:52:M536,N,W0,N,N,S: Windows:2000:ZoneAlarm:Windows 2000 w/ZoneAlarm?
+2048:255:0:40:.: Windows:.NET::Windows .NET Enterprise Server
-# HUNT DOWN:
-# *:128:1:48:M*,N,N,S:U:@Windows:XP (leak) (PLEASE REPORT)
+# No need to be more specific, it passes:
+# *:128:1:48:M*,N,N,S:U:-Windows:XP/2000 while downloading (leak!) XXX quirk
+# there is an equiv similar generic sig w/o the quirk
# ----------------- HP/UX -------------------
@@ -405,7 +447,12 @@
# We don't yet support the ?12 TCP option
#16384:64:1:68:M1460,N,W0,N,N,T,N,N,?12: RISCOS:3.70-4.36::RISC OS 3.70-4.36
+12288:32:0:44:M536: RISC OS:3.70:4.10:RISC OS 3.70 inet 4.10
+# XXX quirk
+# 4096:64:1:56:M1460,N,N,T:T: RISC OS:3.70:freenet:RISC OS 3.70 freenet 2.00
+
+
# ----------------- BSD/OS ------------------
# Once again, power of two WSS is also shared by MacOS X with DF set
@@ -432,6 +479,8 @@
8192:64:1:60:M1440,N,W0,N,N,T: OS/400:VR5::OS/400 VR4/R5
4096:64:1:60:M1440,N,W0,N,N,T: OS/400:V4R5:CF67032:OS/400 V4R5 + CF67032
+# XXX quirk
+# 28672:64:0:44:M1460:A:OS/390:?
# ------------------ ULTRIX -----------------
@@ -445,16 +494,42 @@
16384:128:1:44:M1460: Novell:NetWare:5.0:Novel Netware 5.0
6144:128:1:44:M1460: Novell:IntranetWare:4.11:Novell IntranetWare 4.11
+6144:128:1:44:M1368: Novell:BorderManager::Novell BorderManager ?
+
+6144:128:1:52:M*,W0,N,S,N,N: Novell:Netware:6:Novell Netware 6 SP3
+
# ----------------- SCO ------------------
-S17:64:1:44:M1460: SCO:Unixware:7.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06
-S17:64:1:44:M1460: SCO:OpenServer:5.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06
-S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1
+S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1
+S23:64:1:44:M1380: SCO:OpenServer:5.0:SCO OpenServer 5.0
# ------------------- DOS -------------------
2048:255:0:44:M536: DOS:WATTCP:1.05:DOS Arachne via WATTCP/1.05
+# ------------------ OS/2 -------------------
+
+S56:64:0:44:M512: OS/2:4::OS/2 4
+
+# ----------------- TOPS-20 -----------------
+
+# Another hardcore MSS, one of the ACK leakers hunted down.
+# XXX QUIRK 0:64:0:44:M1460:A:TOPS-20:version 7
+0:64:0:44:M1460: TOPS-20:7::TOPS-20 version 7
+
+# ------------------ AMIGA ------------------
+
+# XXX TCP option 12
+# S32:64:1:56:M*,N,N,S,N,N,?12:.:AMIGA:3.9 BB2 with Miami stack
+
+# ------------------ Plan9 ------------------
+
+65535:255:0:48:M1460,W0,N: Plan9:4::Plan9 edition 4
+
+# ----------------- AMIGAOS -----------------
+
+16384:64:1:48:M1560,N,N,S: AMIGAOS:3.9::AMIGAOS 3.9 BB2 MiamiDX
+
###########################################
# Appliance / embedded / other signatures #
###########################################
@@ -466,6 +541,15 @@
4096:32:0:44:M1460: ExtremeWare:4.x::ExtremeWare 4.x
60352:64:0:52:M1460,N,W2,N,N,S: Clavister:7::Clavister firewall 7.x
+# XXX TCP option 12
+# S32:64:0:68:M512,N,W0,N,N,T,N,N,?12:.:Nokia:IPSO w/Checkpoint NG FP3
+# S16:64:0:68:M1024,N,W0,N,N,T,N,N,?12:.:Nokia:IPSO 3.7 build 026
+
+S4:64:1:60:W0,N,S,T,M1460: FortiNet:FortiGate:50:FortiNet FortiGate 50
+
+8192:64:1:44:M1460: Eagle:::Eagle Secure Gateway
+
+
# ------- Switches and other stuff ----------
4128:255:0:44:M*: Cisco:::Cisco Catalyst 3500, 7500 etc
@@ -480,9 +564,13 @@
32850:64:1:64:N,W1,N,N,T,N,N,S,M*: NetApp:5.x::NetApp Data OnTap 5.x
16384:64:1:64:M1460,N,N,S,N,W0,N: NetApp:5.3:1:NetApp 5.3.1
-65535:64:0:64:M1460,N,N,S,N,W3,N,N,T: NetApp:5.3:1:NetApp 5.3.1
+65535:64:0:64:M1460,N,N,S,N,W*,N,N,T: NetApp:5.3-5.5::NetApp 5.3-5.5
65535:64:0:60:M1460,N,W0,N,N,T: NetApp:CacheFlow::NetApp CacheFlow
8192:64:1:64:M1460,N,N,S,N,W0,N,N,T: NetApp:5.2:1:NetApp NetCache 5.2.1
+20480:64:1:64:M1460,N,N,S,N,W0,N,N,T: NetApp:4.1::NetApp NetCache4.1
+
+65535:64:0:60:M1460,N,W0,N,N,T: CacheFlow:4.1::CacheFlow CacheOS 4.1
+8192:64:0:60:M1380,N,N,N,N,N,N,T: CacheFlow:1.1::CacheFlow CacheOS 1.1
S4:64:0:48:M1460,N,N,S: Cisco:Content Engine::Cisco Content Engine
@@ -491,7 +579,6 @@
65535:255:1:48:N,W1,M1460: Inktomi:crawler::Inktomi crawler
S1:255:1:60:M1460,S,T,N,W0: LookSmart:ZyBorg::LookSmart ZyBorg
-
16384:255:0:40:.: Proxyblocker:::Proxyblocker (what's this?)
# ----------- Embedded systems --------------
@@ -501,6 +588,7 @@
S5:255:0:44:M536: PalmOS:4::PalmOS 3/4
S4:255:0:44:M536: PalmOS:3:5:PalmOS 3.5
2948:255:0:44:M536: PalmOS:3:5:PalmOS 3.5.3 (Handera)
+S29:255:0:44:M536: PalmOS:5::PalmOS 5.0
S23:64:1:64:N,W1,N,N,T,N,N,S,M1460: SymbianOS:7::SymbianOS 7
8192:255:0:44:M1460: SymbianOS:6048::SymbianOS 6048 (on Nokia 7650?)
@@ -515,6 +603,8 @@
S1:255:0:44:M346: Contiki:1.1:rc0:Contiki 1.1-rc0
4096:128:0:44:M1460: Sega:Dreamcast:3.0:Sega Dreamcast Dreamkey 3.0
+T5:64:0:44:M536: Sega:Dreamcast:HKT-3020:Sega Dreamcast HKT-3020 (browser disc 51027)
+S22:64:1:44:M1460: Sony:PS2::Sony Playstation 2 (SOCOM?)
S12:64:0:44:M1452: AXIS:5600:v5.64:AXIS Printer Server 5600 v5.64
@@ -546,5 +636,8 @@
*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323)
*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323)
*:128:1:64:M*,N,W*,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP (RFC1323, w+)
+*:128:1:48:M536,N,N,S: @Windows:98::Windows 98
*:128:1:48:M*,N,N,S: @Windows:XP::Windows XP/2000
*:128:1:48:M*,N,N,S: @Windows:2000::Windows XP/2000
+
+
==== //depot/projects/hammer/etc/rc.d/Makefile#25 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.41 2004/05/24 14:17:19 des Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.42 2004/09/14 03:01:38 seanc Exp $
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
@@ -23,7 +23,7 @@
mountd moused mroute6d mrouted msgs \
named natd netif netoptions \
network_ipv6 nfsclient nfsd \
- nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
+ nfslocking nfsserver nisdomain nsswitch ntpd \
othermta \
pccard pcvt pf pflog preseedrandom \
power_profile ppp-user pppoed pwcheck \
==== //depot/projects/hammer/etc/rc.d/ntpd#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ntpd,v 1.8 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/ntpd,v 1.9 2004/09/14 03:01:38 seanc Exp $
#
# PROVIDE: ntpd
@@ -15,10 +15,15 @@
rcvar=`set_rcvar`
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
+start_precmd="ntpd_precmd"
required_files="/etc/ntp.conf"
ntpd_precmd()
{
+ if checkyesno ntpd_sync_on_start; then
+ rc_flags="-g ${ntpd_flags}"
+ fi
+
if [ -z "$ntpd_chrootdir" ]; then
return 0;
fi
==== //depot/projects/hammer/etc/rc.d/rpcbind#5 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $
-# $FreeBSD: src/etc/rc.d/rpcbind,v 1.9 2004/03/05 07:43:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/rpcbind,v 1.10 2004/09/14 03:01:38 seanc Exp $
#
# PROVIDE: rpcbind
-# REQUIRE: NETWORKING ntpdate syslogd named
+# REQUIRE: NETWORKING ntpd syslogd named
# KEYWORD: FreeBSD
. /etc/rc.subr
==== //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#6 (text+ko) ====
@@ -20,7 +20,7 @@
# along with GNU GNATS; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.35 2003/11/12 23:08:23 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.sh,v 1.36 2004/09/14 20:30:35 ceri Exp $
# The version of this send-pr.
VERSION=3.113
@@ -262,7 +262,7 @@
# Catch some signals. ($xs kludge needed by Sun /bin/sh)
xs=0
trap 'rm -f $REF $TEMP; exit $xs' 0
-trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' 1 2 3 13 15
+trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
# If they told us to use a specific file, then do so.
if [ -n "$IN_FILE" ]; then
==== //depot/projects/hammer/lib/libc/db/btree/bt_split.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.6 2004/09/10 14:45:00 kuriyama Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.7 2004/09/13 22:07:24 kuriyama Exp $");
#include <sys/types.h>
@@ -361,8 +361,6 @@
r->nextpg = h->nextpg;
r->prevpg = h->pgno;
r->flags = h->flags & P_TYPE;
- /* XXX: Workaround for broken page data access. */
- r->linp[0] = 0xffff;
/*
* If we're splitting the last page on a level because we're appending
@@ -728,7 +726,7 @@
* the right page.
*/
if (skip <= off) {
- skip = 0;
+ skip = MAX_PAGE_OFFSET;
rval = l;
} else {
rval = r;
@@ -738,7 +736,7 @@
for (off = 0; nxt < top; ++off) {
if (skip == nxt) {
++off;
- skip = 0;
+ skip = MAX_PAGE_OFFSET;
}
switch (h->flags & P_TYPE) {
case P_BINTERNAL:
==== //depot/projects/hammer/release/Makefile#58 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.859 2004/09/08 06:05:19 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.860 2004/09/14 04:01:57 brooks Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -917,6 +917,14 @@
@echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf
@echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf
@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf
+.if exists(${HINTSFILE})
+ # Break the link to device.hints so we can modify it
+ @rm ${CD_DISC2}/boot/device.hints
+ @cp ${HINTSFILE} ${CD_DISC2}/boot/device.hints
+.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
+ @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_DISC2}/boot/device.hints
+.endif
+.endif
.if defined(CD_BOOT)
@cp -Rp ${CD_DISC2}/boot ${CD_BOOT}
.if defined(MINIROOT)
@@ -1149,7 +1157,11 @@
@cp -Rp ${BOOTDIR}/*.4th ${BOOTDIR}/defaults ${BOOTDIR}/loader.help \
${BOOTDIR}/loader.rc ${IMAGEDIR}/boot
.if exists(${HINTSFILE})
- @gzip -9nc ${HINTSFILE} > ${IMAGEDIR}/boot/device.hints.gz
+ @cp ${HINTSFILE} ${IMAGEDIR}/boot/device.hints
+.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
+ @echo 'hint.atkbd.0.flags="0x1"' >> ${IMAGEDIR}/boot/device.hints
+.endif
+ @gzip -9n ${IMAGEDIR}/boot/device.hints
.endif
@gzip -9n ${IMAGEDIR}/boot/*.4th ${IMAGEDIR}/boot/loader.help \
${IMAGEDIR}/boot/defaults/loader.conf
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 (text+ko) ====
@@ -29,7 +29,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.255 2004/09/13 10:48:34 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.256 2004/09/14 01:46:27 brueffer Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -623,6 +623,8 @@
&hwlist.awi;
+ &hwlist.cnw;
+
&hwlist.ath;
</sect2>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#77 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.774 2004/09/12 19:11:49 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.775 2004/09/14 05:35:19 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -1083,7 +1083,11 @@
<para>The &man.sound.4; (formerly &man.pcm.4;) driver has been modified to read
<filename>/boot/device.hints</filename> on startup, to allow setting
- of default values for mixer channels.</para>
+ of default values for mixer channels.
+ Note that currently the device driver's name used in
+ <filename>/boot/device.hints</filename> is still <literal>pcm</literal>.
+ More detailed information and examples can be found in the &man.sound.4;
+ manual page.</para>
</sect3>
<sect3>
==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#9 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.38 2004/09/13 10:44:20 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.39 2004/09/14 01:45:13 brueffer Exp $
#
#
@@ -52,6 +52,7 @@
bt i386,amd64
ciss i386,ia64,amd64
cm i386
+cnw i386,pc98
cp i386,pc98
ct pc98
ctau i386
==== //depot/projects/hammer/share/examples/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/Makefile,v 1.42 2004/07/15 15:37:56 scottl Exp $
+# $FreeBSD: src/share/examples/Makefile,v 1.43 2004/09/14 01:07:18 mlaier Exp $
#
# Doing a make install builds /usr/share/examples
@@ -290,6 +290,9 @@
.if !defined(NO_IPFILTER)
SUBDIR+=ipfilter
.endif
+.if !defined(NO_PF)
+SUBDIR+=pf
+.endif
.endif
.include <bsd.subdir.mk>
==== //depot/projects/hammer/share/man/man4/divert.4#5 (text+ko) ====
@@ -1,6 +1,6 @@
-.\" $FreeBSD: src/share/man/man4/divert.4,v 1.29 2004/07/03 18:29:20 ru Exp $
+.\" $FreeBSD: src/share/man/man4/divert.4,v 1.30 2004/09/14 09:35:10 andre Exp $
.\"
-.Dd June 18, 1996
+.Dd September 14, 2004
.Dt DIVERT 4
.Os
.Sh NAME
@@ -128,6 +128,12 @@
If different fragments divert to different ports,
then which port ultimately gets chosen is unpredictable.
.Pp
+Note that packets arriving on the divert socket by the
+.Xr ipfw 8
+.Cm tee
+action are delivered as-is and packet fragments do not get reassembled
+in this case.
+.Pp
Packets are received and sent unchanged, except that
packets read as outgoing have invalid IP header checksums, and
packets written as outgoing have their IP header checksums overwritten
==== //depot/projects/hammer/share/man/man4/ng_ubt.4#8 (text+ko) ====
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.7 2004/09/13 10:36:44 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.8 2004/09/14 16:46:16 brueffer Exp $
.\"
.Dd September 13, 2004
.Dt NG_UBT 4
@@ -57,7 +57,8 @@
.Sh HARDWARE
The
.Nm
-driver supports the following Bluetooth USB devices:
+driver supports all Bluetooth USB devices that conform with
+the Bluetooth specification v1.1 including:
.Pp
.Bl -bullet -compact
.It
==== //depot/projects/hammer/share/man/man4/vge.4#2 (text+ko) ====
@@ -1,6 +1,5 @@
-.\" Copyright (c) 2001 Wind River Systems
-.\" Copyright (c) 1997, 1998, 1999, 2000, 2001
-.\" Bill Paul <wpaul at bsdi.com>. All rights reserved.
+.\" Copyright (c) 2004
+.\" Bill Paul <wpaul at windriver.com>. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -29,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/vge.4,v 1.4 2004/09/13 17:05:07 wpaul Exp $
+.\" $FreeBSD: src/share/man/man4/vge.4,v 1.5 2004/09/14 16:08:13 wpaul Exp $
.\"
.Dd September 10, 2004
.Dt VGE 4
==== //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.10 2004/09/14 03:12:01 mlaier Exp $ */
/* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */
/*
* The authors of this code are John Ioannidis (ji at tla.org),
@@ -377,6 +377,6 @@
#define PFLOG_MODVER 1
-DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
+DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
MODULE_VERSION(pflog, PFLOG_MODVER);
#endif /* __FreeBSD__ */
==== //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#10 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.11 2004/08/14 15:32:40 dwmalone Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.12 2004/09/14 03:12:01 mlaier Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */
/*
@@ -1662,6 +1662,6 @@
#define PFSYNC_MODVER 1
-DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
+DECLARE_MODULE(pfsync, pfsync_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
MODULE_VERSION(pfsync, PFSYNC_MODVER);
#endif /* __FreeBSD__ */
==== //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.5 2004/08/16 17:58:12 mlaier Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */
/* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */
/* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */
@@ -638,8 +638,16 @@
af = ia->ifa_addr->sa_family;
if (af != AF_INET && af != AF_INET6)
continue;
-#ifdef notyet
- if (!(ia->ifa_flags & IFA_ROUTE))
+#ifdef __FreeBSD__
+ /*
+ * XXX: For point-to-point interfaces, (ifname:0) and IPv4,
+ * jump over addresses without a proper route to work
+ * around a problem with ppp not fully removing the
+ * address used during IPCP.
+ */
+ if ((ifp->if_flags & IFF_POINTOPOINT) &&
+ !(ia->ifa_flags & IFA_ROUTE) &&
+ (flags & PFI_AFLAG_NOALIAS) && (af == AF_INET))
continue;
#endif
if ((flags & PFI_AFLAG_BROADCAST) && af == AF_INET6)
==== //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.13 2004/08/22 15:23:48 mlaier Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.14 2004/09/14 03:12:01 mlaier Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */
/*
@@ -3411,6 +3411,6 @@
0
};
-DECLARE_MODULE(pf, pf_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST);
+DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST);
MODULE_VERSION(pf, PF_MODVER);
#endif /* __FreeBSD__ */
==== //depot/projects/hammer/sys/dev/amr/amr.c#13 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.54 2004/08/16 17:23:09 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.55 2004/09/14 16:36:12 scottl Exp $");
/*
* Driver for the AMI MegaRaid family of controllers.
@@ -708,7 +708,7 @@
if ((result = malloc(bufsize, M_DEVBUF, M_NOWAIT)) == NULL)
goto out;
/* set command flags */
- ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAOUT;
+ ac->ac_flags |= AMR_CMD_PRIORITY | AMR_CMD_DATAIN;
/* point the command at our data */
ac->ac_data = result;
==== //depot/projects/hammer/sys/dev/fdc/fdc.c#15 (text+ko) ====
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.286 2004/08/27 17:08:24 phk Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list