PERFORCE change 16133 for review
Robert Watson
rwatson at freebsd.org
Fri Aug 16 21:48:26 GMT 2002
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16133
Change 16133 by rwatson at rwatson_tislabs on 2002/08/16 14:47:44
Integ trustedbsd_base to trustedbsd_mac, in particular trickle back
in the MAC_DEBUG change from its commit to the main tree.
Affected files ...
.. //depot/projects/trustedbsd/mac/include/arpa/inet.h#7 integrate
.. //depot/projects/trustedbsd/mac/include/ctype.h#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/disklabel.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#11 integrate
.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#10 integrate
.. //depot/projects/trustedbsd/mac/share/misc/pci_vendors#11 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#15 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/options#25 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#248 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#26 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#25 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/mklocale/lex.l#3 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/include/arpa/inet.h#7 (text+ko) ====
@@ -50,7 +50,7 @@
*
* @(#)inet.h 8.1 (Berkeley) 6/2/93
* From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $
+ * $FreeBSD: src/include/arpa/inet.h,v 1.24 2002/08/16 16:34:26 mike Exp $
*/
#ifndef _ARPA_INET_H_
@@ -77,30 +77,30 @@
#define _UINT32_T_DECLARED
#endif
-#ifndef _IN_ADDR_T_DECLARED
+#ifndef _IN_ADDR_T_DECLARED
typedef uint32_t in_addr_t;
#define _IN_ADDR_T_DECLARED
#endif
-#ifndef _IN_PORT_T_DECLARED
+#ifndef _IN_PORT_T_DECLARED
typedef uint16_t in_port_t;
#define _IN_PORT_T_DECLARED
#endif
-#ifndef _POSIX_SOURCE
-#ifdef _BSD_SIZE_T_
+#if __BSD_VISIBLE
+#ifdef _BSD_SIZE_T_
typedef _BSD_SIZE_T_ size_t;
-#undef _BSD_SIZE_T_
+#undef _BSD_SIZE_T_
+#endif
#endif
-#endif /* !_POSIX_SOURCE */
/*
* XXX socklen_t is used by a POSIX.1-2001 interface, but not required by
* POSIX.1-2001.
*/
-#ifdef _BSD_SOCKLEN_T_
+#ifdef _BSD_SOCKLEN_T_
typedef _BSD_SOCKLEN_T_ socklen_t;
-#undef _BSD_SOCKLEN_T_
+#undef _BSD_SOCKLEN_T_
#endif
#ifndef _STRUCT_IN_ADDR_DECLARED
@@ -139,9 +139,9 @@
in_addr_t inet_addr(const char *);
char *inet_ntoa(struct in_addr);
-const char *inet_ntop(int, const void *__restrict, char *__restrict,
- socklen_t);
-int inet_pton(int, const char *__restrict, void *__restrict);
+const char *inet_ntop(int, const void * __restrict, char * __restrict,
+ socklen_t);
+int inet_pton(int, const char * __restrict, void * __restrict);
#if __BSD_VISIBLE
int ascii2addr(int, const char *, void *);
==== //depot/projects/trustedbsd/mac/include/ctype.h#4 (text+ko) ====
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* @(#)ctype.h 8.4 (Berkeley) 1/21/94
- * $FreeBSD: src/include/ctype.h,v 1.18 2002/03/23 17:24:53 imp Exp $
+ * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $
*/
#ifndef _CTYPE_H_
@@ -65,6 +65,12 @@
#define _CTYPE_I 0x00080000L /* Ideogram */
#define _CTYPE_T 0x00100000L /* Special */
#define _CTYPE_Q 0x00200000L /* Phonogram */
+#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */
+#define _CTYPE_SWS 30 /* Bits to shift to get width */
+#define _CTYPE_SW0 0x20000000L /* 0 width character */
+#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/
+#define _CTYPE_SW2 0x80000000L /* 2 width character */
+#define _CTYPE_SW3 0xc0000000L /* 3 width character */
__BEGIN_DECLS
int isalnum(int);
==== //depot/projects/trustedbsd/mac/lib/libc/gen/disklabel.c#5 (text+ko) ====
@@ -35,10 +35,11 @@
static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.15 2002/05/12 20:49:33 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $");
#include <sys/param.h>
#define DKTYPENAMES
+#define FSTYPENAMES
#include <sys/disklabel.h>
#include <fcntl.h>
==== //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.1 2002/08/05 10:45:23 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.2 2002/08/16 13:45:23 keichii Exp $");
#include <wctype.h>
@@ -211,3 +211,13 @@
{
return (__toupper(wc));
}
+
+#undef wcwidth
+int
+wcwidth(wc)
+ wchar_t wc;
+{
+ int width = (unsigned)__maskrune((wc), _CTYPE_SWM) >> _CTYPE_SWS;
+ return width ? width : iswprint(wc);
+}
+
==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#8 (text+ko) ====
@@ -54,13 +54,14 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.56 2002/07/03 16:43:11 markm Exp $");
+__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.57 2002/08/16 16:08:35 bmilekic Exp $");
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/wait.h>
#define DKTYPENAMES
+#define FSTYPENAMES
#include <sys/disklabel.h>
#ifdef __sparc64__
#include <sys/sun_disklabel.h>
==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#11 (text+ko) ====
@@ -36,11 +36,12 @@
static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.36 2002/08/16 07:34:19 alfred Exp $";
+ "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.37 2002/08/16 16:08:36 bmilekic Exp $";
#endif /* not lint */
#include <sys/param.h>
#include <sys/stat.h>
+#define FSTYPENAMES
#include <sys/disklabel.h>
#include <sys/file.h>
#include <sys/sysctl.h>
==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#10 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.106 2002/08/16 10:31:47 luigi Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.107 2002/08/16 14:27:22 luigi Exp $
.\"
.de NOIPFW
.br
@@ -81,11 +81,33 @@
firewall, which we will call
.Nm ipfw1
when it is necessary to distinguish between the two.
+.Pp
+.Nm ipfw2
+is standard in
+.Fx
+CURRENT, whereas
+.Fx
+STABLE still uses
+.Nm ipfw1
+unless the kernel is compiled with
+.Cm options IPFW2 ,
+and
+.Nm /sbin/ipfw
+and
+.Nm /usr/lib/libalias
+are recompiled with
+.Cm -DIPFW2
+and reinstalled (the same effect can be achieved by adding
+.Cm IPFW2=TRUE
+to
+.Nm /etc/make.conf
+before a buildworld).
+.Pp
See the
.Sx IPFW2 ENHANCEMENTS
Section for a list of features which are not present in
.Nm ipfw1 .
-This list can also be useful to revise your ruleset and
+This list can also be useful to revise your rules and
write them more efficiently.
.Pp
An
@@ -1466,12 +1488,36 @@
.Sh SYSCTL VARIABLES
A set of
.Xr sysctl 8
-variables controls the behaviour of the firewall.
+variables controls the behaviour of the firewall and
+associated modules (
+.Nm dummynet, bridge
+).
These are shown below together with their default value
(but always check with the
.Xr sysctl 8
command what value is actually in use) and meaning:
.Bl -tag -width indent
+.It Em net.inet.ip.dummynet.expire : No 1
+Lazily delete dynamic pipes/queue once they have no pending traffic.
+You can disable this by setting the variable to 0, in which case
+the pipes/queues will only be deleted when the threshold is reached.
+.It Em net.inet.ip.dummynet.hash_size : No 64
+Default size of the hash table used for dynamic pipes/queues.
+This value is used when no
+.Cm buckets
+option is specified when configuring a pipe/queue.
+.It Em net.inet.ip.dummynet.max_chain_len : No 16
+Target value for the maximum number of pipes/queues in a hash bucket.
+The product
+.Cm max_chain_len*hash_size
+is used to determine the threshold over which empty pipes/queues
+will be expired even when
+.Cm net.inet.ip.dummynet.expire=0 .
+.It net.inet.ip.dummynet.red_lookup_depth : No 256
+.It net.inet.ip.dummynet.red_avg_pkt_size : No 512
+.It net.inet.ip.dummynet.red_max_pkt_size : No 1500
+Parameters used in the computations of the drop probability
+for the RED algorithm.
.It Em net.inet.ip.fw.autoinc_step : No 100
Delta beween rule numbers when auto-generating them.
The value must be in the range 1..1000.
@@ -1483,7 +1529,7 @@
.Nm .
.It Em net.inet.ip.fw.dyn_buckets : No 256
The number of buckets in the hash table for dynamic rules.
-Must be a power of 2, up to 1^^20.
+Must be a power of 2, up to 65536.
It only takes effect when all dynamic rules have expired, so you
are advised to use a
.Cm flush
@@ -1559,7 +1605,19 @@
.Nm ipfw1
does not supports address sets (those in the form
.Ar addr/masklen{num,num,...}
-)
+).
+.Pp
+A minor difference between
+.Nm ipfw1
+and
+.Nm ipfw2
+is that the former allows addresses to be specified as
+.Ar ipno:mask
+where the mask can be an arbitrary bitmask instead of
+a countiguous set of bits.
+.Nm ipfw2
+no longer supports this syntax though it would be trivial
+to reintroduce it as it is supported on the kernel side.
.It Port specifications
.Nm ipfw1
only allows one port range when specifying TCP and UDP ports, and
@@ -1576,12 +1634,20 @@
you can put port specifications in rules matching all packets,
and the match will be attempted only on those packets carrying
protocols which include port identifiers.
+.Pp
+Finally,
+.Nm ipfw1
+allowed the first port entry to be specified as
+.Ar port:mask
+where
+.Ar mask
+can be an arbitrary 16-bit mask.
+This syntax is of questionable usefulness and it is not
+supported anymore in
+.Nm ipfw2 .
.It Or-blocks
.Nm ipfw1
-does not support Or-blocks. All match operators are implicitly
-connected by
-.Cm and
-operators.
+does not support Or-blocks.
.It keepalives
.Nm ipfw1
does not generate keepalives for stateful sessions.
@@ -1600,6 +1666,19 @@
The sysctl variable
.Em net.link.ether.ipfw
has no effect there.
+.It Options
+The following options are not supported in
+.Nm ipfw1
+(RELENG_4)
+rules:
+.Pp
+.Cm layer2, ipid, iplen, ipprecedence, iptos, ipttl,
+.Cm ipversion, tcpack, tcpseq, tcpwin .
+.It Dummynet options
+The following option for
+.Nm dummynet
+pipes/queues is not supported:
+.Cm noerror .
.El
.Sh EXAMPLES
There are far too many possible uses of
@@ -1870,9 +1949,11 @@
.%O "RFC 2309"
.Re
.Sh BUGS
-The syntax has grown over the years and it is not very clean.
+The syntax has grown over the years and sometimes it might be confusing.
+Unfortunately, backward compatibility prevents cleaning up mistakes
+done in the definition of the syntax.
.Pp
-.Em WARNING
+.Em !!! WARNING !!!
.Pp
Misconfiguring the firewall can put your computer in an unusable state,
possibly shutting down network services and requiring console access to
@@ -1925,3 +2006,5 @@
.Fx 2.2.8 .
Stateful extensions were introduced in
.Fx 4.0 .
+.Nm ipfw2
+was introduced in Summer 2002.
==== //depot/projects/trustedbsd/mac/share/misc/pci_vendors#11 (text+ko) ====
@@ -1,4 +1,4 @@
-; $FreeBSD: src/share/misc/pci_vendors,v 1.18 2002/07/09 11:50:14 sheldonh Exp $
+; $FreeBSD: src/share/misc/pci_vendors,v 1.19 2002/08/16 14:55:51 sheldonh Exp $
;
; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl
; (with the -l option), using the following source lists:
@@ -118,7 +118,7 @@
0013 53C875A PCI to Ultra SCSI Controller
0020 53C1010-33 PCI to Dual Channel Ultra3 SCSI Ctrlr
0021 53C1000/1010-66 PCI to Ultra160 SCSI Controller
- 0030 53C1030 PCI-X SCSI Controller
+ 0030 53C1020/1030 PCI-X to Ultra320 SCSI Controller
0031 53C1030ZC PCI-X SCSI Controller
0035 53C1035 PCI-X SCSI Controller
0040 53C1035 PCI-X SCSI Controller
@@ -382,7 +382,7 @@
1204 CL-GD7541 Nordic-lite VGA Cntrlr
4400 CL-CD4400 Communications Controller
6001 Crystal CS4610/11 SoundFusion PCI Audio Accelerator
- 6003 Crystal CS4614/22/24 SoundFusion PCI Audio Accelerator
+ 6003 Crystal CS4614/22/24/30 SoundFusion PCI Audio Accelerator
6004 Crystal CS4615 SoundFusion PCI Audio Accelerator
6005 Crystal CS4281 SoundFusion PCI Audio Accelerator
1014 International Business Machines Corp.
@@ -645,6 +645,7 @@
0520 MGA-G200B Eclipse/Calao
0521 MGA-G200B Chipset (AGP)
0525 MGA-G400/450 Chipset
+ 0527 Parhelia AGP
0D10 MGA-I Athena (Ultima/Impression board)
1000 MGA-G100 Chipset PCI
1001 MGA-G100 Twister AGP
@@ -786,6 +787,7 @@
103C Hewlett-Packard Company
1005 A4977A Visialize EG
1008 Donner GFX
+ 100A hpVisualizeFX Hewlett-Packard VisualizeFX Series Video
1028 Tachyon TL Fibre Channel Adapter
1029 HPFC-5200B Tachyon XL2 Fibre Channel Adapter
102A Tach TS Tachyon TS Fibre Channel Host Adapter
@@ -807,6 +809,9 @@
121A NetServer SMIC Controller
121B NetServer Legacy COM Port Decoder
121C NetServer PCI COM Port Decoder
+ 1229 zx1 System Bus Adapter
+ 122A zx1 I/O Controller
+ 122B zx1 Local Bus Adapter
2910 E2910A PCI Bus Exerciser
2920 Fast Host Interface
2924 E2924A PCI Host Interface Adapter
@@ -931,6 +936,7 @@
AC40 PCI4450 PC card CardBus Controller
AC41 PCI4410 PC card CardBus Controller
AC42 PCI4451 PC card CardBus Controller
+ AC44 PC card & Integrated 1394a-2000 OHCI 2 port PHY/Link Layer Ctrlr
AC50 PCI1410 PC card cardBus Controller
AC51 PCI1420 PC card CardBus Controller
AC52 PCI1451 PC card CardBus Controller
@@ -955,14 +961,14 @@
104F Co-Time Computer Ltd.
104F iatca8392 Multi I/O
1050 Winbond Electronics Corp.
- 0000 W6692CF Ethernet Cntrlr
+ 0000 Ethernet Controller (NE2000 compatible)
0001 W83769F Ethernet Adapter
0105 W82C105 Ethernet Adapter
0628 W83628F/629D PCI to ISA Bridge Set
0840 W89C840F 100/10Mbps Ethernet Controller
0940 W89C940 NE2000-Compatible Ethernet Adapter
5A5A W89C940F ELANC-PCI Twisted-pair Ether-LAN Ctrlr
- 6692 W6692A/CF PCI ISDN S/T Controller
+ 6692 W6692/92A/92CF PCI BusISDN S/T-Controller
9922 W9922PF ISDN Controller
9960 W9960CF Video Codec
9961 W9961CF H.263/H.261 Video Codec
@@ -976,7 +982,7 @@
0001 PCI Bridge
0002 PCI Bus Controller
3505 SH7751 SuperH (SH) 32-Bit RISC MCU/MPU Series
-1055 SMSC (Was EFAR Microsystems; bought out in 1996)
+1055 SMSC (Was: EFAR Microsystems; bought out in 1996)
0810 EFAR 486 Host Bridge
0922 Pentium/p54c host Bridge
0926 EFAR PCI to ISA Bridge
@@ -997,6 +1003,7 @@
1801 DSP56301 24-bit Digital Signal Processor
1802 DSP56305 24-Bit Digital Signal Processor
18C0 MPC8265A/66 PowerQUICC II PCI Bridge
+ 3421 56IVMR/Phoenix 56ISMR Modem
4801 Raven PowerPC Chipset
4802 Falcon
4803 Hawk
@@ -1010,15 +1017,15 @@
105A Promise Technology
0D30 PDC20265 FastTrak100 Lite/Ultra100 EIDE Controller
0D38 PDC20263 FastTrak66 EIDE Controller
- 1275 PDC20275 FastTrak TX EIDE Controller
+ 1275 PDC20275 FastTrack TX EIDE Controller
4D30 PDC20267 FastTrack100/Ultra100 EIDE Controller
- 4D33 PDC20246 FastTrak/Ultra33 EIDE Controller
+ 4D33 PDC20246 FastTrak Ultra ATA RAID controller
4D38 PDC20262 FastTrak66/Ultra66 EIDE Controller
4D68 PDC20268 Ultra100 TX2 EIDE Controller
4D69 PDC20269 Ultra133 TX2 EIDE Controller
5275 PDC20276 Ultra133 TX2/FastTrak TX Lite EIDE Controller
5300 DC5300 EIDE Controller
- 6268 PDC20268R FastTrak100 TX2/TX4/LP EIDE Controller
+ 6268 PDC20268R FastTrak100 TX2/TX4/LP EIDE controller
6269 PDC20271 FastTrak TX2000 EIDE controller
7275 PDC20277 FastTrak TX/SBFastTrak133 Lite EIDE Controller
105B Foxconn International
@@ -1220,9 +1227,10 @@
1087 Cache Computer
1088 Microcomputer Systems (M) Son
1089 Data General Corporation
-108A Bit3 Computer
+108A SBS Technologie (Was: Bit3 Computer)
0001 Model 617 PCI-VME Bus Adapter
0010 Model 618 VME Bridge
+ 0040 dataBLIZZARD
3000 Model 2106 VME Bridge
108C Elonex PLC c/o Oakleigh Systems Inc.
108D Olicom
@@ -1646,6 +1654,7 @@
2002 MB86606 Fast Wide SCSI Controller
2005 MB86974 10/100 Fast Ethernet Adapter
200C MB86974 IEEE1394 OpenHCI Controller
+ 2010 OHCI FireWire Controller
2011 MPEG2 R-Engine (MPEG2 Hardware Encoder)
10D0 Fujitsu Limited
10D1 FuturePlus Systems
@@ -1721,7 +1730,7 @@
0179 NV17M GeForce4 440 Go 64M
017A Quadro4 200/400NVS [[NV17GL.2]
017B Quadro4 550XGL [[NV17GL.3]
- 017C NV17M-GL
+ 017C NV17M-GL Quadro4 500 GoGL
01A0 GeForce2 [Crush11] Integrated Graphics
01A4 nForce AGP Controller
01A5 nForce AGP Controller
@@ -1899,7 +1908,7 @@
8938 EV1938 Sound
1103 HighPoint Technologies Inc.
0003 HPT343/5/6,HPT363 UDMA EIDE Controller
- 0004 HPT366/8/70 UDMA66/100 EIDE Controller
+ 0004 HPT366/368/370/372 UDMA66/100 EIDE Controller
0005 HPT370 UDMA/ATA 100 EIDE Controller
0006 HPT302 UDMA/ATA133 EIDE Controller
0007 HPT371 UDMA/ATA133 EIDE Controller
@@ -1907,9 +1916,9 @@
1104 Rasterops
1105 Sigma Designs Inc.
5000 Multimedia
- 8300 REALmagic Hollywood Plus MPEG2 DVD Decoder
+ 8300 EM8300 MPEG-2 Decoder (REALmagic Hollywood Plus)
8400 EM8400 MPEG-2 Decoder
- 8475 em8475 ISO MPEG 1/2/4 Decoder Card for Video & Audio
+ 8475 EM8475 MPEG-1/2/4 Decoder Card for Video & Audio
1106 VIA Technologies Inc
0130 VT6305 VIA Fire 1394.A OHCI Link Layer Ctrlr
0305 VT8363/5 KT133/KM133 System Controller
@@ -1959,7 +1968,7 @@
3109 VT8233C PCI to ISA Bridge
3112 VT8361 Apollo KLE133 System Controller
3113 PCI to PCI Bridge
- 3116 CPU-to-PCI Bridge
+ 3116 Apollo KM266 System Controller
3128 VT8753 Apollo P4X266 System Controller
3133 VT3133 CPU to PCI Bridge
3147 VT8233 PCI to ISA Bridge
@@ -2378,6 +2387,7 @@
0211 OSB4 PCI EIDE Controller
0212 CSB5 PCI EIDE Controller
0220 OSB4 OpenHCI Compliant USB Controller
+ 0225 CSB5 PCI Bridge
0230 PCI to ISA Bridge
1167 Mutoh Industries Inc
1168 Thine Electronics Inc
@@ -2438,6 +2448,7 @@
0476 RL5C476 II CardBus controller
0477 RL5c477 CardBus Controller
0478 RL5c478 CardBus Controller
+ 0521 R5C521 1394 Host Controller
0551 IEEE1394 Controller
0552 RL5c552 IEEE-1394 Controller
1181 Telmatics International
@@ -2446,10 +2457,10 @@
1185 Dataworld International Ltd
8929 EIDE Controller
1186 D-Link System Inc
- 0100 DC21041 Ethernet Adapter
+ 0100 DEC DC21041-Based Ethernet Adapter
1002 DFE-550TX Fast Ethernet Adapter
- 1100 Fast Ethernet Adapter
- 1300 DFE-530TX+ Fast Ethernet Adapter (DL 10038C Chipset)
+ 1100 DFE-??? Fast Ethernet Adapter
+ 1300 DFE-530TX+/538TX Fast Ethernet Adapter (DL 10038C Chipset)
1340 DFE-690TXD CardBus PC Card
1561 DRP-32TXD CardBus PC Card
4000 DL2K Ethernet
@@ -2594,7 +2605,7 @@
11BE International Microcircuits Inc
11BF Astrodesign Inc.
11C0 Hewlett-Packard
-11C1 Lucent/Agere Systems (Was AT&T MicroElectronics)
+11C1 Lucent/Agere Systems (Was: AT&T MicroElectronics)
0440 LT Winmodem 56k Data+Fax+Voice+DSVD
0441 LT Winmodem 56k Data+Fax
0442 1646T00 V.90 Lucent Modem
@@ -2609,10 +2620,10 @@
044B LT Winmodem
044C LT Winmodem
044D LT Winmodem
- 044E lucent 1646T00
+ 044E lucent 1646T00 LT WinModem 56k Data+Fax
044F 90094-1 LT V.90+DSL WildFire Modem
0450 1456VQH19R-1(INT) LT Winmodem 56K
- 0451 LT Winmodem
+ 0451 LT Winmodem LT WinModem 56k Data+Fax+Voice+DSVD
0452 LT Winmodem
0453 LT Winmodem
0454 LT Winmodem
@@ -2834,7 +2845,7 @@
122D Aztech System Ltd
1206 368DSP
4201 MR2800W AMR 56K modem
- 50DC 3328 Audio
+ 50DC PCI168/3328 Audio Device
80DA 3328 Audio
122E Xyratex
122F Andrew Corp.
@@ -2931,10 +2942,12 @@
199B ES1983 Maestro-3.COMM ES56CVM-PI PCI oice+Fax Modem
2808 ES336H PCI Fax Modem (later model)
2838 ES2838/2839 SuperLink Modem
- 2898 ES2898 ES56-PI Family V.90 PCI Modem
+ 2843 ES2838/2839 SuperLink-MLP Voice Modem
+ 2847 ES2838/2839 SuperLink-MLP 10 Voice Modem
+ 2898 ES2898S TelDrive ES56T-PI family V.90 PCI modem
125E Specialvideo Engineering SRL
125F Concurrent Technologies Inc.
-1260 Intersil Americas Inc (Was Harris Semiconductor)
+1260 Intersil Americas Inc (Was: Harris Semiconductor)
3873 ISL3874A PRISMII.5 IEE802.11B Wireless LAN
8130 HMP8130 NTSC/PAL Video Decoder
8131 HMP8131 NTSC/PAL Video Decoder
@@ -2974,6 +2987,7 @@
1274 Ensoniq (Creative)
1274 5880 multimedia audio device
1371 ES1371, ES1373 AudioPCI
+ 1373 ES1373 Sound Blaster Audio(PCI)
5000 ES1370 AudioPCI
5880 5880 AudioPCI
1275 Network Appliance Corp
@@ -3755,7 +3769,7 @@
1449 TUT Systems Inc
144A ADLINK Technology Inc
7248 PCI-7248
- 7250 PCI-7250
+ 7250 PCI-7250 PLX PCI9052
7296 PCI-7296
7432 PCI-7432
7433 PCI-7433
@@ -3934,6 +3948,7 @@
E001 VScom PCI-010HV2 1 x Printer Controler
E010 VScom PCI-100HV2 1 x RS-232 Controller
E020 VScom PCI-200HV2 2 x RS-232 Controller
+ FFFF VScom Dummy Controller
14D3 Cirtech (UK) Ltd
14D4 Panacom Technology Corporation
0400 Panacom 7 Interface chip
@@ -4018,7 +4033,7 @@
14F1 Conexant Systems, Inc.
1002 3251 HCF 56k Modem
1003 HCF 56k Modem
- 1004 11242-11 HCF 56k Modem
+ 1004 11242-11 HCF 56k Modem FCCID=H4TFM-PIB3PC
1005 HCF 56k Modem
1006 HCF 56k Modem
1022 HCF 56k Modem
@@ -4591,6 +4606,7 @@
1678 INH Semiconductor
1679 Tokyo Electron Device Ltd.
168A Utimaco Safeware AG
+168F KDS Innotech Corp.
16AE SafeNet Inc.
16CA Cenatek Inc.
0001 Rocket Drive Solid State Disk
@@ -4891,14 +4907,15 @@
0962 80960RM/RN i960RM/RN Microprocessor/Bridge
0964 80960RP i960 RP Microprocessor Bridge
1000 82542 PRO/1000 Gigabit Server Adapter
- 1001 82543GC 10/100/1000 Ethernet Controller
+ 1001 82543 PRO/1000 F Gigabit Ethernet Adapter
1002 Pro 100 LAN+Modem 56 CardBus II
- 1004 82543 PRO/1000 Gigabit Server Adapter
- 1008 82544 PRO/1000 Gigabit Ethernet Controller
- 1009 82544 PRO/1000 Gigabit Ethernet Controller
- 100C 82544GC Gigabit Ethernet Controller
+ 1004 82543 PRO/1000 T Gigabit Server Adapter
+ 1008 82544 PRO/1000 XT Gigabit Ethernet Controller
+ 1009 82544 PRO/1000 XF Gigabit Ethernet Controller
+ 100C 82544 T Desktop Gigabit Ethernet Controller
100D 82544GC based Gigabit Ethernet Controller
- 100E 82544XT PRO/1000 MT Desktop Adapter
+ 100E 82540EM Gigabit Ethernet Controller
+ 1010 82546EB Dual Gigabit Ethernet Controller
1015 82540EM PRO/1000 MT Mobile Connection
1029 82559 Fast Ethernet PCI/CardBus Controller
1030 82559 PCI Networking device
@@ -4913,6 +4930,7 @@
103A 82801DB (ICH4) LAN Controller with 82562ET/EZ (CNR) PHY
103B 82801DB (ICH4) LAN Controller with 82562EM/EX PHY
103C 82801DB (ICH4) LAN Controller with 82562EM/EX (CNR) PHY
+ 1040 536EP V.92 PCI Modem
1100 82815 815/E (Solano) Host to I/O Hub Bridge with 100MHz DRAM Controller
1101 82815 815/E (Solano) PCI to AGP Bridge
1102 82815 815/E (Solano) Internal GUI Accelerator
@@ -5057,6 +5075,7 @@
3580 Montara GM Chipset
3584 Montara GM Chipset
3585 Montara GM Chipset
+ 4000 Creatix V.90 HaM Modem
5001 PRO/DSL 2100 Modem - PPP
5005 PRO/DSL 2200 Modem - PPPoA
5200 EtherExpress PRO/100 Server PCI to PCI Bridge
@@ -5109,11 +5128,13 @@
84C5 82453KX/GX 450KX/GX Memory Controller (Orion)
84CA 82451NX 450NX PCIset Memory & I/O Controller
84CB 82454NX/82467GX 450NX PCI Expander Bridge
- 84E0 82461GX System Address controller
- 84E1 82462GX System Data Controller
- 84E2 82465GX Graphics Expander Bridge
- 84E3 82463GX Memory Address Controller
- 84E4 82464GX Memory Data Controller
+ 84E0 82460GX 460GX System Address Controller
+ 84E1 82460GX 460GX System Data Controller
+ 84E2 82460GX 460GX AGP Bridge (GXB Function 2)
+ 84E3 82460GX 460GX Memory Address Controller
+ 84E4 82460GX 460GX Memory Data Controller
+ 84E6 82466GX 460GX Wide and fast PCI eXpander Bridge
+ 84EA 82460GX 460GX AGP Bridge (GXB Function 1)
9620 I2O RAID PCI to PCI Bridge
9621 SRCU21 I2O 1.5 RAID Controller (F/W<6.0)
9622 SRCUxx I2O 1.5 RAID Controller (F/W<6.0)
@@ -5272,6 +5293,9 @@
031C Gunboat x4 Pro Quad PCI Serial Port Controller (High speed)
041C Ironcad x8 Octal PCI Serial Port Controller (Standard speed)
051C Ironcad x8 Pro Octal PCI Serial Port Controller (High speed)
+ 061C IC 138 PCI
+ 081C Dreadnought x16 Pro
+ 091C Dreadnought x16 Lite
B1B3 Shiva Europe Ltd.
B894 Brown & Sharpe Mfg. Co.
C001 TSI Telsys
@@ -5325,8 +5349,9 @@
A0B1 ARK2000MI+ GUI Accelerator
F5F5 F5 Networks Inc.
FA57 Fast Search & Transfer ASA
+ 0001 PMC Pattern Matching Chip
FEBD Ultraview Corp.
-FEDA Epigram Inc
+FEDA Broadcom (Was: Epigram Inc; Bought out in 1999)
A0FA BCM4210 OEM Chip for 10meg/s over phone line
FFFE VMWare Inc (Older Product Versions)
0710 Virtual SVGA
==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#15 (text+ko) ====
@@ -14,7 +14,7 @@
# This file contains machine independent kernel configuration notes. For
# machine dependent notes, look in /sys/<arch>/conf/NOTES.
#
-# $FreeBSD: src/sys/conf/NOTES,v 1.1063 2002/08/12 21:25:06 joe Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1064 2002/08/16 14:21:37 rwatson Exp $
#
#
==== //depot/projects/trustedbsd/mac/sys/conf/options#25 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.342 2002/08/09 20:54:06 sos Exp $
+# $FreeBSD: src/sys/conf/options,v 1.343 2002/08/16 14:21:38 rwatson Exp $
#
# On the handling of kernel options
#
==== //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#12 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/kern/kern_event.c,v 1.43 2002/08/16 12:51:57 rwatson Exp $
+ * $FreeBSD: src/sys/kern/kern_event.c,v 1.44 2002/08/16 14:12:40 rwatson Exp $
*/
#include <sys/param.h>
==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#248 (text+ko) ====
@@ -36,7 +36,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/kern/kern_mac.c,v 1.7 2002/08/15 18:51:26 rwatson Exp $
+ * $FreeBSD: src/sys/kern/kern_mac.c,v 1.8 2002/08/16 14:21:37 rwatson Exp $
*/
/*
* Developed by the TrustedBSD Project.
==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#26 (text+ko) ====
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.114 2002/08/16 12:51:57 rwatson Exp $
+ * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.115 2002/08/16 14:12:40 rwatson Exp $
*/
/*
==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#25 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.102 2002/08/16 05:08:46 dg Exp $
+ * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.103 2002/08/16 18:41:48 dg Exp $
*/
#include "opt_mac.h"
@@ -66,7 +66,9 @@
* Primitive routines for operating on sockets and socket buffers
*/
-u_long sb_max = SB_MAX; /* XXX should be static */
+u_long sb_max = SB_MAX;
+u_long sb_max_adj =
+ SB_MAX * MCLBYTES / (MSIZE + MCLBYTES); /* adjusted sb_max */
static u_long sb_efficiency = 8; /* parameter for sbreserve() */
@@ -375,6 +377,26 @@
return (ENOBUFS);
}
+static int
+sysctl_handle_sb_max(SYSCTL_HANDLER_ARGS)
+{
+ int error = 0;
+ u_long old_sb_max = sb_max;
+
+ error = SYSCTL_OUT(req, arg1, sizeof(int));
+ if (error || !req->newptr)
+ return (error);
+ error = SYSCTL_IN(req, arg1, sizeof(int));
+ if (error)
+ return (error);
+ if (sb_max < MSIZE + MCLBYTES) {
+ sb_max = old_sb_max;
+ return (EINVAL);
+ }
+ sb_max_adj = (u_quad_t)sb_max * MCLBYTES / (MSIZE + MCLBYTES);
+ return (0);
+}
+
/*
* Allot mbufs to a sockbuf.
* Attempt to scale mbmax so that mbcnt doesn't become limiting
@@ -392,7 +414,7 @@
* td will only be NULL when we're in an interrupt
* (e.g. in tcp_input())
*/
- if (cc > sb_max / (MSIZE + MCLBYTES) * MCLBYTES)
+ if (cc > sb_max_adj)
return (0);
if (!chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, cc,
td ? td->td_proc->p_rlimit[RLIMIT_SBSIZE].rlim_cur : RLIM_INFINITY)) {
@@ -971,9 +993,8 @@
/* This takes the place of kern.maxsockbuf, which moved to kern.ipc. */
static int dummy;
SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0, "");
-
-SYSCTL_INT(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW,
- &sb_max, 0, "Maximum socket buffer size");
+SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLTYPE_INT|CTLFLAG_RW,
+ &sb_max, 0, sysctl_handle_sb_max, "I", "Maximum socket buffer size");
SYSCTL_INT(_kern_ipc, OID_AUTO, maxsockets, CTLFLAG_RD,
&maxsockets, 0, "Maximum number of sockets avaliable");
SYSCTL_INT(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW,
==== //depot/projects/trustedbsd/mac/usr.bin/mklocale/lex.l#3 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.6 2002/04/28 12:34:54 markm Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.7 2002/08/16 13:46:43 keichii Exp $");
#include <ctype.h>
#include <stdio.h>
@@ -118,6 +118,10 @@
return(LIST); }
PHONOGRAM { yylval.i = _CTYPE_Q|_CTYPE_R|_CTYPE_G;
return(LIST); }
+SWIDTH0 { yylval.i = _CTYPE_SW0; return(LIST); }
+SWIDTH1 { yylval.i = _CTYPE_SW1; return(LIST); }
+SWIDTH2 { yylval.i = _CTYPE_SW2; return(LIST); }
+SWIDTH3 { yylval.i = _CTYPE_SW3; return(LIST); }
VARIABLE[\t ] { static char vbuf[1024];
char *v = vbuf;
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list