From owner-p4-projects@FreeBSD.ORG Sun Nov 30 00:57:42 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 626721065672; Sun, 30 Nov 2008 00:57:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 28120106564A
for ; Sun, 30 Nov 2008 00:57:42 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id F1DE88FC08
for ; Sun, 30 Nov 2008 00:57:41 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU0vfFN040416
for ; Sun, 30 Nov 2008 00:57:41 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU0vfin040414
for perforce@freebsd.org; Sun, 30 Nov 2008 00:57:41 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 30 Nov 2008 00:57:41 GMT
Message-Id: <200811300057.mAU0vfin040414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153804 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 00:57:42 -0000
http://perforce.freebsd.org/chv.cgi?CH=153804
Change 153804 by sam@sam_ebb on 2008/11/30 00:57:00
this branch has an experimental clone api, deal with it
Affected files ...
.. //depot/projects/vap/sys/contrib/pf/net/if_pfsync.c#6 edit
Differences ...
==== //depot/projects/vap/sys/contrib/pf/net/if_pfsync.c#6 (text+ko) ====
@@ -200,7 +200,8 @@
int
#ifdef __FreeBSD__
-pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param)
+pfsync_clone_create(struct if_clone *ifc, int unit,
+ enum uio_seg as, caddr_t param)
#else
pfsync_clone_create(struct if_clone *ifc, int unit)
#endif
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 00:59:44 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CC0361065675; Sun, 30 Nov 2008 00:59:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 775DD1065670
for ; Sun, 30 Nov 2008 00:59:44 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 657A38FC1B
for ; Sun, 30 Nov 2008 00:59:44 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU0xiHN040543
for ; Sun, 30 Nov 2008 00:59:44 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU0xiNL040541
for perforce@freebsd.org; Sun, 30 Nov 2008 00:59:44 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 30 Nov 2008 00:59:44 GMT
Message-Id: <200811300059.mAU0xiNL040541@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153805 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 00:59:45 -0000
http://perforce.freebsd.org/chv.cgi?CH=153805
Change 153805 by sam@sam_ebb on 2008/11/30 00:59:43
add MODULE_OVERRIDE since modules are enabled in the branch
and there are many that don't build
Affected files ...
.. //depot/projects/vap/sys/arm/conf/BWCT#8 edit
.. //depot/projects/vap/sys/arm/conf/CRB#7 edit
.. //depot/projects/vap/sys/arm/conf/DB-78XXX#4 edit
.. //depot/projects/vap/sys/arm/conf/DB-88F5XXX#4 edit
.. //depot/projects/vap/sys/arm/conf/DB-88F6XXX#4 edit
.. //depot/projects/vap/sys/arm/conf/GUMSTIX#3 edit
.. //depot/projects/vap/sys/arm/conf/KB920X#11 edit
.. //depot/projects/vap/sys/arm/conf/NSLU#4 edit
.. //depot/projects/vap/sys/arm/conf/SIMICS#9 edit
.. //depot/projects/vap/sys/arm/conf/SKYEYE#7 edit
Differences ...
==== //depot/projects/vap/sys/arm/conf/BWCT#8 (text+ko) ====
@@ -27,6 +27,7 @@
#To statically compile in device wiring instead of /boot/device.hints
#hints "hints.at91rm9200"
hints "BWCT.hints"
+makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options DDB
==== //depot/projects/vap/sys/arm/conf/CRB#7 (text+ko) ====
@@ -28,6 +28,7 @@
include "../xscale/i8134x/std.crb"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
+makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
==== //depot/projects/vap/sys/arm/conf/DB-78XXX#4 (text+ko) ====
@@ -8,6 +8,7 @@
include "../mv/discovery/std.db78xxx"
options SOC_MV_DISCOVERY
+makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions WERROR="-Werror"
==== //depot/projects/vap/sys/arm/conf/DB-88F5XXX#4 (text+ko) ====
@@ -8,6 +8,7 @@
include "../mv/orion/std.db88f5xxx"
options SOC_MV_ORION
+makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions WERROR="-Werror"
==== //depot/projects/vap/sys/arm/conf/DB-88F6XXX#4 (text+ko) ====
@@ -8,6 +8,7 @@
include "../mv/kirkwood/std.db88f6xxx"
options SOC_MV_KIRKWOOD
+makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions WERROR="-Werror"
==== //depot/projects/vap/sys/arm/conf/GUMSTIX#3 (text+ko) ====
@@ -34,6 +34,7 @@
include "../xscale/pxa/std.pxa"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
+makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options HZ=100
==== //depot/projects/vap/sys/arm/conf/KB920X#11 (text) ====
@@ -24,6 +24,7 @@
# The AT91 platform doesn't use /boot/loader, so we have to statically wire
# hints.
hints "KB920X.hints"
+makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options DDB
==== //depot/projects/vap/sys/arm/conf/NSLU#4 (text+ko) ====
@@ -29,6 +29,7 @@
include "../xscale/ixp425/std.avila"
#To statically compile in device wiring instead of /boot/device.hints
hints "NSLU.hints" #Default places to look for devices.
+makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
==== //depot/projects/vap/sys/arm/conf/SIMICS#9 (text+ko) ====
@@ -25,6 +25,7 @@
include "../sa11x0/std.sa11x0"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
+makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=strongarm
==== //depot/projects/vap/sys/arm/conf/SKYEYE#7 (text) ====
@@ -26,6 +26,7 @@
include "../at91/std.kb920x"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
+makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=arm9
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 05:46:51 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 01DE51065677; Sun, 30 Nov 2008 05:46:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BA5571065673
for ; Sun, 30 Nov 2008 05:46:50 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B24878FC14
for ; Sun, 30 Nov 2008 05:46:50 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU5koxC077411
for ; Sun, 30 Nov 2008 05:46:50 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU5koN5077409
for perforce@freebsd.org; Sun, 30 Nov 2008 05:46:50 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 30 Nov 2008 05:46:50 GMT
Message-Id: <200811300546.mAU5koN5077409@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153813 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 05:46:51 -0000
http://perforce.freebsd.org/chv.cgi?CH=153813
Change 153813 by sam@sam_ebb on 2008/11/30 05:45:54
define HAL_BUS_TAG and HAL_BUS_HANDLE directly now that
we build with source
Affected files ...
.. //depot/projects/vap/sys/dev/ath/ah_osdep.c#9 edit
.. //depot/projects/vap/sys/dev/ath/ah_osdep.h#9 edit
Differences ...
==== //depot/projects/vap/sys/dev/ath/ah_osdep.c#9 (text+ko) ====
@@ -56,7 +56,7 @@
#define BUSTAG(ah) \
((bus_space_tag_t) ((struct ar531x_config *)((ah)->ah_st))->tag)
#else
-#define BUSTAG(ah) ((bus_space_tag_t) (ah)->ah_st)
+#define BUSTAG(ah) ((ah)->ah_st)
#endif
extern void ath_hal_printf(struct ath_hal *, const char*, ...)
@@ -270,7 +270,7 @@
ath_hal_reg_write(struct ath_hal *ah, u_int32_t reg, u_int32_t val)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
if (ath_hal_alq) {
struct ale *ale = ath_hal_alq_get(ah);
@@ -294,7 +294,7 @@
ath_hal_reg_read(struct ath_hal *ah, u_int32_t reg)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
u_int32_t val;
#if _BYTE_ORDER == _BIG_ENDIAN
@@ -346,7 +346,7 @@
ath_hal_reg_write(struct ath_hal *ah, u_int32_t reg, u_int32_t val)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
#if _BYTE_ORDER == _BIG_ENDIAN
if (reg >= 0x4000 && reg < 0x5000)
@@ -360,7 +360,7 @@
ath_hal_reg_read(struct ath_hal *ah, u_int32_t reg)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
u_int32_t val;
#if _BYTE_ORDER == _BIG_ENDIAN
==== //depot/projects/vap/sys/dev/ath/ah_osdep.h#9 (text+ko) ====
@@ -42,6 +42,13 @@
#include
/*
+ * Bus i/o type definitions.
+ */
+typedef void *HAL_SOFTC;
+typedef bus_space_tag_t HAL_BUS_TAG;
+typedef bus_space_handle_t HAL_BUS_HANDLE;
+
+/*
* Linker set writearounds for chip and RF backend registration.
*/
#define OS_DATA_SET(set, item) DATA_SET(set, item)
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 06:11:15 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C610B1065675; Sun, 30 Nov 2008 06:11:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8A9EE1065672
for ; Sun, 30 Nov 2008 06:11:15 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 841A08FC08
for ; Sun, 30 Nov 2008 06:11:15 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU6BF4Z080506
for ; Sun, 30 Nov 2008 06:11:15 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU6BFJg080504
for perforce@freebsd.org; Sun, 30 Nov 2008 06:11:15 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 30 Nov 2008 06:11:15 GMT
Message-Id: <200811300611.mAU6BFJg080504@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153814 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 06:11:16 -0000
http://perforce.freebsd.org/chv.cgi?CH=153814
Change 153814 by sam@sam_ebb on 2008/11/30 06:10:43
really really fixed
Affected files ...
.. //depot/projects/vap/sys/contrib/pf/net/if_pfsync.c#7 edit
Differences ...
==== //depot/projects/vap/sys/contrib/pf/net/if_pfsync.c#7 (text+ko) ====
@@ -81,6 +81,7 @@
#include
#ifdef __FreeBSD__
+#include
#include
#endif
#include
@@ -138,7 +139,7 @@
void pfsyncattach(int);
#ifdef __FreeBSD__
-int pfsync_clone_create(struct if_clone *, int, caddr_t);
+int pfsync_clone_create(struct if_clone *, int, enum uio_seg, caddr_t);
void pfsync_clone_destroy(struct ifnet *);
#else
int pfsync_clone_create(struct if_clone *, int);
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 06:12:17 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EE7B41065675; Sun, 30 Nov 2008 06:12:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B2BBB1065670
for ; Sun, 30 Nov 2008 06:12:16 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id AC5048FC0A
for ; Sun, 30 Nov 2008 06:12:16 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU6CGZ9080589
for ; Sun, 30 Nov 2008 06:12:16 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU6CGhv080587
for perforce@freebsd.org; Sun, 30 Nov 2008 06:12:16 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 30 Nov 2008 06:12:16 GMT
Message-Id: <200811300612.mAU6CGhv080587@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153815 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 06:12:17 -0000
http://perforce.freebsd.org/chv.cgi?CH=153815
Change 153815 by sam@sam_ebb on 2008/11/30 06:11:58
o looks like vimage grew a dependency on opt_route.h; yech
o always force AH_SUPPORT_AR5416 to be set as we require it
to compile 5416 support
o remove explicit null file creation logic; make glue does that for us
Affected files ...
.. //depot/projects/vap/sys/modules/ath/Makefile#6 edit
Differences ...
==== //depot/projects/vap/sys/modules/ath/Makefile#6 (text+ko) ====
@@ -66,12 +66,10 @@
SRCS+= ${AR5212_SRCS}
SRCS+= ${AR5416_SRCS}
SRCS+= ${AR9160_SRCS}
-SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h
+SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ath.h opt_ah.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-opt_ath.h:
- :> $@
opt_ah.h:
echo '#define AH_SUPPORT_AR5416 1' > $@
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 06:23:28 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9E8541065672; Sun, 30 Nov 2008 06:23:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 62DBF106564A
for ; Sun, 30 Nov 2008 06:23:28 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 5CBF48FC14
for ; Sun, 30 Nov 2008 06:23:28 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAU6NSwN081583
for ; Sun, 30 Nov 2008 06:23:28 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU6NSwx081581
for perforce@freebsd.org; Sun, 30 Nov 2008 06:23:28 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 30 Nov 2008 06:23:28 GMT
Message-Id: <200811300623.mAU6NSwx081581@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153816 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 06:23:28 -0000
http://perforce.freebsd.org/chv.cgi?CH=153816
Change 153816 by sam@sam_ebb on 2008/11/30 06:22:38
o add opt_route.h
o kill opt_ah.h setup; it doesn't matter what's in the file so
fallback to the empty file automagic
Affected files ...
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#10 edit
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#10 edit
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#11 edit
Differences ...
==== //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#10 (text+ko) ====
@@ -33,16 +33,8 @@
KMOD= ath_rate
SRCS= amrr.c
-SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
+SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-.if !defined(KERNBUILDDIR)
-opt_ah.h:
- echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET}
-opt_wlan.h:
-# echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
- echo > ${.TARGET}
-.endif
-
.include
==== //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#10 (text+ko) ====
@@ -33,16 +33,8 @@
KMOD= ath_rate
SRCS= onoe.c
-SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
+SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-.if !defined(KERNBUILDDIR)
-opt_ah.h:
- echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET}
-opt_wlan.h:
- echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-# echo > ${.TARGET}
-.endif
-
.include
==== //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#11 (text+ko) ====
@@ -33,16 +33,8 @@
KMOD= ath_rate
SRCS= sample.c
-SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
+SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-.if !defined(KERNBUILDDIR)
-opt_ah.h:
- echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET}
-opt_wlan.h:
-# echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
- :> ${.TARGET}
-.endif
-
.include
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:28:51 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id F229A1065672; Sun, 30 Nov 2008 16:28:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9E510106564A
for ; Sun, 30 Nov 2008 16:28:50 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 8A7398FC17
for ; Sun, 30 Nov 2008 16:28:50 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGSo38062947
for ; Sun, 30 Nov 2008 16:28:50 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAUGSojI062945
for perforce@freebsd.org; Sun, 30 Nov 2008 16:28:50 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 30 Nov 2008 16:28:50 GMT
Message-Id: <200811301628.mAUGSojI062945@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153831 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:28:51 -0000
http://perforce.freebsd.org/chv.cgi?CH=153831
Change 153831 by rene@rene_self on 2008/11/30 16:28:02
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#13 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/tabthorpe.key#2 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#6 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#5 integrate
.. //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/Makefile#3 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/announce.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-alpha.html#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-amd64.html#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-i386.html#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-pc98.html#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-sparc64.html#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#9 integrate
.. //depot/projects/docproj_nl/www/en/releases/index.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/cvsweb.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/man.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/markmail.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/message-id.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/ports.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/query-pr.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/rambler.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/web-all.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/web.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/security/security.sgml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#8 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#19 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#6 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#11 (text+ko) ====
@@ -1,4 +1,4 @@
-
+
@@ -176,7 +176,7 @@
the /boot/loader.conf file and the system
restarted:
- vm.kmem_slze="330M"
+ vm.kmem_size="330M"
vm.kmem_size_max="330M"
vfs.zfs.arc_max="40M"
vfs.zfs.vdev.cache.size="5M"
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#5 (text+ko) ====
@@ -1,6 +1,6 @@
@@ -30,7 +30,7 @@
This chapter covers the use of disks under the GEOM
framework in &os;. This includes the major RAID
+ role="Redundant Array of Inexpensive Disks">RAID
control utilities which use the framework for configuration.
This chapter will not go into in depth discussion on how GEOM
handles or controls I/O, the underlying subsystem, or code.
@@ -50,12 +50,11 @@
How to use the base utilities to configure, maintain,
- and manipulate the various RAID
- levels.
+ and manipulate the various RAID levels.
- How to mirror, stripe, encrypt, and remotely connect disk
+ How to mirror, stripe, encrypt, and remotely connect disk
devices through GEOM.
@@ -93,19 +92,19 @@
-
-
-
- Tom
- Rhodes
- Written by
-
-
- Murray
- Stokely
-
-
-
+
+
+
+ Tom
+ Rhodes
+ Written by
+
+
+ Murray
+ Stokely
+
+
+
RAID0 - Striping
@@ -134,90 +133,92 @@
the same size, since I/O requests are interleaved to read or
write to multiple disks in parallel.
-
-
-
-
+
+
+
+
-
- Disk Striping Illustration
-
-
+
+ Disk Striping Illustration
+
+
Creating a stripe of unformatted ATA disks
- Load the geom_stripe.ko
- module:
+
+ Load the geom_stripe.ko
+ module:
- &prompt.root; kldload geom_stripe
-
+ &prompt.root; kldload geom_stripe
+
- Ensure that a suitable mount point exists. If this
- volume will become a root partition, then temporarily use
- another mount point such as /mnt:
+
+ Ensure that a suitable mount point exists. If this
+ volume will become a root partition, then temporarily use
+ another mount point such as /mnt:
- &prompt.root; mkdir /mnt
+ &prompt.root; mkdir /mnt
- Determine the device names for the disks which will
- be striped, and create the new stripe device. For example,
- to stripe two unused and unpartitioned ATA disks,
- for example /dev/ad2 and
- /dev/ad3:
+
+ Determine the device names for the disks which will
+ be striped, and create the new stripe device. For example,
+ to stripe two unused and unpartitioned ATA disks,
+ for example /dev/ad2 and
+ /dev/ad3:
- &prompt.root; gstripe label -v st0 /dev/ad2 /dev/ad3
+ &prompt.root; gstripe label -v st0 /dev/ad2 /dev/ad3
Metadata value stored on /dev/ad2.
Metadata value stored on /dev/ad3.
Done.
-
- Write a standard label, also known as a partition
- table, on the new volume and install the default
- bootstrap code:
+
+ Write a standard label, also known as a partition
+ table, on the new volume and install the default
+ bootstrap code:
- &prompt.root; bsdlabel -wB /dev/stripe/st0
-
+ &prompt.root; bsdlabel -wB /dev/stripe/st0
- This process should have created two other devices
- in the /dev/stripe
- directory in addition to the st0 device.
- Those include st0a and
- st0c. At this point a file system may be created
- on the st0a device with the
- newfs utility:
+
+ This process should have created two other devices
+ in the /dev/stripe
+ directory in addition to the st0 device.
+ Those include st0a and
+ st0c. At this point a file system may be
+ created on the st0a device with the
+ newfs utility:
- &prompt.root; newfs -U /dev/stripe/st0a
+ &prompt.root; newfs -U /dev/stripe/st0a
- Many numbers will glide across the screen, and after a few
- seconds, the process will be complete. The volume has been
- created and is ready to be mounted.
-
-
+ Many numbers will glide across the screen, and after a few
+ seconds, the process will be complete. The volume has been
+ created and is ready to be mounted.
+
+
- To manually mount the created disk stripe:
+ To manually mount the created disk stripe:
- &prompt.root; mount /dev/stripe/st0a /mnt
+ &prompt.root; mount /dev/stripe/st0a /mnt
- To mount this striped file system automatically during the boot
- process, place the volume information in
- /etc/fstab file. For this purpose, a permanent mount
- point, named stripe, is
- created:
+ To mount this striped file system automatically during the boot
+ process, place the volume information in
+ /etc/fstab file. For this purpose, a permanent
+ mount point, named stripe, is
+ created:
- &prompt.root; mkdir /stripe
+ &prompt.root; mkdir /stripe
&prompt.root; echo "/dev/stripe/st0a /stripe ufs rw 2 2" \
>> /etc/fstab
- The geom_stripe.ko module must also be automatically loaded during
- system initialization, by adding a line to
- /boot/loader.conf:
+ The geom_stripe.ko module must also be
+ automatically loaded during system initialization, by adding a line to
+ /boot/loader.conf:
- &prompt.root; echo 'geom_stripe_load="YES"' >> /boot/loader.conf
-
+ &prompt.root; echo 'geom_stripe_load="YES"' >> /boot/loader.conf
@@ -237,8 +238,7 @@
important aspect is that information on one disk or partition is
being replicated. Later, that information could be more easily
restored, backed up without causing service or access
- interruption, and even be physically stored in a data
- safe.
+ interruption, and even be physically stored in a data safe.
To begin, ensure the system has two disk drives of equal size,
these exercises assume they are direct access (&man.da.4;)
@@ -291,20 +291,21 @@
Edit the /etc/fstab file, replacing
references to the old da0 with the
- new device nodes of the gm0 mirror device.
+ new device nodes of the gm0 mirror
+ device.
If &man.vi.1; is your preferred editor, the following is
an easy way to accomplish this task:
- &prompt.root; vi /etc/fstab
+ &prompt.root; vi /etc/fstab
- In &man.vi.1; back up the current contents of
- fstab by typing
- :w /etc/fstab.bak. Then
- replace all old da0 references
- with gm0 by typing
- :%s/da/mirror\/gm/g.
+ In &man.vi.1; back up the current contents of
+ fstab by typing
+ :w /etc/fstab.bak. Then
+ replace all old da0 references
+ with gm0 by typing
+ :%s/da/mirror\/gm/g.
The resulting fstab file should look
@@ -314,10 +315,12 @@
gm regardless.
# Device Mountpoint FStype Options Dump Pass#
-/dev/mirror/gm0s2b none swap sw 0 0
-/dev/mirror/gm0s2a / ufs rw 1 1
-#/dev/mirror/gm0s2d /store ufs rw 2 2
-/dev/mirror/gm0s2e /usr ufs rw 2 2
+/dev/mirror/gm0s1b none swap sw 0 0
+/dev/mirror/gm0s1a / ufs rw 1 1
+/dev/mirror/gm0s1d /usr ufs rw 0 0
+/dev/mirror/gm0s1f /home ufs rw 2 2
+#/dev/mirror/gm0s2d /store ufs rw 2 2
+/dev/mirror/gm0s1e /var ufs rw 2 2
/dev/acd0 /cdrom cd9660 ro,noauto 0 0
Reboot the system:
@@ -366,6 +369,7 @@
Troubleshooting
+
System refuses to boot
@@ -537,7 +541,7 @@
specific, and will be created in the /dev/label directory.
- A temporary label will go away with the next reboot. These
+ A temporary label will go away with the next reboot. These
labels will be created in the
/dev/label directory and
are perfect for experimentation. A temporary label can be
@@ -655,7 +659,7 @@
UFS Journaling Through GEOM
-
+
GEOM
@@ -672,7 +676,7 @@
What is journaling? Journaling capability stores a log of
file system transactions, i.e.: changes that make up a complete
disk write operation, before meta-data and file writes are
- committed to the disk proper. This transaction log can later
+ committed to the disk proper. This transaction log can later
be replayed to redo file system transactions, preventing file
system inconsistencies.
@@ -680,9 +684,8 @@
loss and inconsistencies of the file system. Unlike Soft Updates
which tracks and enforces meta-data updates and Snapshots which
is an image of the file system, an actual log is stored in disk
- space specifically reserved for this task,
- and in some cases may be stored on another disk
- entirely.
+ space specifically reserved for this task, and in some cases may be
+ stored on another disk entirely.
Unlike other file system journaling implementations, the
gjournal method is block based and not
@@ -718,8 +721,8 @@
At this point, there should be a
/dev/da4 device node and a
- /dev/da4.journal device node. A
- file system may now be created on this device:
+ /dev/da4.journal device node.
+ A file system may now be created on this device:
&prompt.root; newfs -O 2 -J /dev/da4.journal
@@ -734,11 +737,12 @@
In the case of several slices, a journal will be created
- for each individual slice. For instance, if ad4s1 and ad4s2
+ for each individual slice. For instance, if
+ ad4s1 and ad4s2
are both slices, then gjournal will create
- ad4s1.journal and ad4s2.journal. In the case of the command
- being run twice, the result will be
- journals
.
+ ad4s1.journal and
+ ad4s2.journal. In the case of the command
+ being run twice, the result will be journals
.
Under some circumstances, keeping the journal on another disk
@@ -749,8 +753,7 @@
before attempting to alter a file system. In most cases, the
gjournal will fail if it is unable to create
the actual journal but this does not protect against data loss
- incurred as a result of misusing
- tunefs.
+ incurred as a result of misusing tunefs.
It is also possible to journal the boot disk of a &os; system.
Please refer to the article
@@ -231,9 +231,9 @@
page:
Alternatively, to load the driver as a module at boot time, place the
- following line in &man.loader.conf.5:
+following line in &man.loader.conf.5:
- if_ath_load="YES"
+ if_ath_load="YES"
As instructed, adding the if_ath_load="YES"
line to the /boot/loader.conf file will
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -2441,6 +2441,15 @@
+ RELENG_6_4
+
+
+ The release branch for FreeBSD-6.4, used only for
+ security advisories and other critical fixes.
+
+
+
+
RELENG_6_3
@@ -2678,6 +2687,14 @@
+ RELENG_6_4_0_RELEASE
+
+
+ FreeBSD 6.4
+
+
+
+
RELENG_6_3_0_RELEASE
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#13 (text+ko) ====
@@ -1,7 +1,7 @@
800053
+
+ 8.0-CURRENT after the addition of Intel™
+ Core, Core2, and Atom support to &man.hwpmc.4;.
+ 800055
+
+
+ 8.0-CURRENT after the introduction of
+ multi-/no-IPv4/v6 jails.
+ 800056
+
==== //depot/projects/docproj_nl/share/pgpkeys/tabthorpe.key#2 (text+ko) ====
@@ -1,4 +1,4 @@
-
+
@@ -6,13 +6,13 @@
pub 1024D/D069F2A0 2005-07-06
Key fingerprint = 62EB 68F5 C1A4 8FCE 5A87 BE22 E469 BF8C D069 F2A0
uid Thomas Abthorpe (FreeBSD Committer)
-uid Thomas Abthorpe
+uid Thomas Abthorpe
uid Thomas Abthorpe
uid Thomas Abthorpe
+uid Thomas Abthorpe
+uid Thomas Abthorpe
+uid Thomas Abthorpe
uid Thomas Abthorpe
-uid Thomas Abthorpe
-uid Thomas Abthorpe
-uid Thomas Abthorpe
sub 2048g/16752D82 2005-07-06
]]>
==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#6 (text+ko) ====
@@ -1,7 +1,7 @@
-
-
+
+
==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#5 (text+ko) ====
@@ -34,7 +34,7 @@
# Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995
#
# $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $
-# $FreeBSD: www/en/cgi/man.cgi,v 1.224 2008/11/09 18:29:53 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.225 2008/11/29 14:47:06 wosch Exp $
############################################################################
# !!! man.cgi is stale perl4 code !!!
@@ -164,8 +164,8 @@
%manPath = (
'FreeBSD 7.0-RELEASE and Ports',
"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
- 'FreeBSD 6.3-RELEASE and Ports',
-"$manLocalDir/FreeBSD-6.3-RELEASE/man:$manLocalDir/FreeBSD-6.3-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
+ 'FreeBSD 6.4-RELEASE and Ports',
+"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current",
@@ -174,7 +174,9 @@
"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man",
'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE",
- 'FreeBSD 6.3-stable', "$manLocalDir/FreeBSD-6.3-stable",
+ 'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable",
+ 'FreeBSD 6.4-RELEASE',
+"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man",
'FreeBSD 6.3-RELEASE',
"$manLocalDir/FreeBSD-6.3-RELEASE/man:$manLocalDir/FreeBSD-6.3-RELEASE/openssl/man",
@@ -464,7 +466,7 @@
'freebsd-stable', 'FreeBSD 7.0-stable',
'freebsd-stable7', 'FreeBSD 7.0-stable',
- 'freebsd-stable6', 'FreeBSD 6.3-stable',
+ 'freebsd-stable6', 'FreeBSD 6.4-stable',
'freebsd-current', 'FreeBSD 8-current',
'freebsd-release-ports', 'FreeBSD 7.0-RELEASE and Ports',
@@ -1373,7 +1375,7 @@
}
local $id =
- '$FreeBSD: www/en/cgi/man.cgi,v 1.224 2008/11/09 18:29:53 wosch Exp $';
+ '$FreeBSD: www/en/cgi/man.cgi,v 1.225 2008/11/29 14:47:06 wosch Exp $';
return qq{\
Copyright (c) 1996-2008 Wolfram Schneider
==== //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#3 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
@@ -15,8 +15,10 @@
know about it. Please submit new entries or correction of existing
entries using
send-pr(1)
- or web form. Please set category
- to www.
+ or web form. Please give details
+ on which peripherals have been tested (network, sound etc), provide
+ the output of pciconf -lv and dmesg, and set the
+ PR category to www.
@@ -632,6 +634,27 @@
Gigabyte |
+ GA-MA790X-DS4 |
+ AMD 790X / Socket AM2 |
+ Terry R. Friedrichsen
+ (dmesg) |
+ 7.0-RELEASE |
+ Tested with Quad-core AMD Phenom (9750), 4Gb RAM. SATA and IDE works,
+ on-board Ethernet flaky but additional PCI network card works fine.
+ Sound, serial, USB, Firewire and RAID untested. |
+
+
+ Gigabyte |
+ GA-P35-DS3L |
+ Intel P35 / Socket 775 |
+ Ben Kaduk
+ (dmesg, pciconf) |
+ 7.0-STABLE (May 2008) |
+ Tested with 4Gb RAM and Intel Q6600 Core 2 quad core CPU.
+ SATA/PATA and onboard network card work well, sound untested. |
+
+
+ Gigabyte |
GA-P35-DS4 |
Intel P35 / Socket 775 |
Torsten Hantzsche
@@ -970,6 +993,16 @@
|
Sun |
+ Fire X2100 M2 |
+ nVidia nForce 4 / Socket 939 |
+ Markus Fröhlich
+ (dmesg, pciconf) |
+ 7.0-RELEASE |
+ No problems reported. hw.bge.allow_asf=1 needs to be added to
+ /boot/loader.conf for the eLOM to work. |
+
+
+ Sun |
Fire X4100 |
AMD 8111/8131 / Socket 940 - 2x Opteron |
Vivek Khera |
@@ -1133,6 +1166,16 @@
Tyan |
+ Tiger K9HE (S3970) |
+ ServerWorks BCM5785 (HT1000) / AMD Socket F (1207) |
+ Chris Shenton
+ (dmesg, pciconf) |
+ 7.0-RELEASE and 7-STABLE (June 2008) |
+ On board NICs, video and SATA work well. Tested in a Tyan Transport GT20
+ (B3970-U) server. |
+
+
+ Tyan |
Tomcat h1000S (S3950) |
Broadcom HT-1000 / Socket AM2 |
Philipp Wuensche
@@ -1214,6 +1257,17 @@
supported under ndis. Modem and flash card reader not supported. |
+ Sony |
+ Vaio VGN-TZ31WN/B |
+ Gavin Atkinson
+ (dmesg, pciconf) |
+ 7.0-STABLE-200807 |
+ Wired network, sound and video work fine, Xorg works nicely. Camera,
+ bluetooth, fingerprint reader and built in modems untested. Wireless
+ network card works with iwn(4) driver from CURRENT so should work in
+ 7.x when the driver is MFC'd. |
+
+
Toshiba |
A135-S4517 |
Jeff Palmer |
==== //depot/projects/docproj_nl/www/en/releases/6.4R/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.2 2008/11/06 15:47:57 hrs Exp $
+# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.5 2008/11/28 18:08:16 hrs Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -7,13 +7,13 @@
.include "../Makefile.inc"
.endif
-#DOCS= announce.sgml
-DOCS= relnotes.sgml
+DOCS= announce.sgml
+DOCS+= relnotes.sgml
DOCS+= hardware.sgml
DOCS+= installation.sgml
DOCS+= schedule.sgml
-DATA+= errata.html
+DATA= errata.html
DATA+= hardware-alpha.html
DATA+= hardware-amd64.html
DATA+= hardware-i386.html
@@ -34,6 +34,6 @@
DATA+= relnotes-powerpc.html
DATA+= relnotes-sparc64.html
-DATA= docbook.css
+DATA+= docbook.css
.include "${WEB_PREFIX}/share/mk/web.site.mk"
==== //depot/projects/docproj_nl/www/en/releases/6.4R/announce.sgml#2 (text+ko) ====
@@ -1,13 +1,327 @@
-
+
]>
&header;
-Not yet announced.
+ The FreeBSD Release Engineering Team is pleased to announce the availability
+ of FreeBSD 6.4-RELEASE. At this time 6.4-RELEASE is expected to be the
+ last of the 6-STABLE releases. Some of the highlights:
+
+
+ New and much-improved NFS Lock Manager (NLM)
+ client
+ Support for the Camellia cipher
+ boot loader changes allow, among other things, booting
+ from USB devices and booting from GPT-labeled devices with
+ GPT-enabled BIOSes
+ DVD install ISO images for amd64/i386
+ KDE updated to 3.5.10, GNOME updated to 2.22.3
+ Updates for BIND, sendmail, OpenPAM, and others
+
+
+ For a complete list of new features and known problems, please see the
+ online release notes and errata list, available at:
+
+
+
+ For more information about FreeBSD release engineering activities,
+ please see:
+
+ http://www.FreeBSD.org/releng/
+
+ The FreeBSD Security Team intends to support 6.4-RELEASE until
+ November 30th, 2010.
+
+ Availability
+
+ FreeBSD 6.4-RELEASE is now available for the amd64, i386, pc98, and sparc64
+ architectures. The builds for the alpha architecture have not completed
+ yet and will be announced later. FreeBSD 6.4-RELEASE can be installed
+ from bootable ISO images or over the network; the required files can be
+ downloaded via FTP or BitTorrent as described in the sections below.
+ While some of the smaller FTP mirrors may not carry all architectures,
+ they will all generally contain the more common ones, such as i386 and
+ amd64.
+
+ MD5 and SHA256 hashes for the release ISO images are included at the
+ bottom of this message.
+
+ The contents of the ISO images provided as part of the release has changed
+ for most of the architectures. Using the i386 architecture as an example,
+ there are ISO images named "bootonly", "disc1", "disc2", "disc3", "docs",
+ and "dvd1". The "bootonly" image is suitable for booting a machine to do
+ a network based installation using FTP or NFS. The "disc1", "disc2", and
+ "disc3" images are CDROM-sized (700MB media) and are used to do a full
+ installation that includes a basic set of packages and does not require
+ network access to an FTP or NFS server during the installation. In addition,
+ "disc1" supports booting into a "live CD-based filesystem" and system rescue
+ mode. The "docs" image has all of the documentation for all supported
+ languages. The "dvd1" image is DVD-sized and includes everything that is
+ on the CDROM discs. So "dvd1" can be used to do a full installation that
+ includes a basic set of packages, it has all of the documentation for all
+ supported languages, and it can be used for booting into a "live CD-based
+ filesystem" and system rescue mode. Most people will find that "disc1",
+ "disc2" and "disc3" are all that are needed if their machine does not have
+ a DVD-capable drive. For people with machines that do have a DVD-capable
+ drive "dvd1" should be all that is required. If you intend to install ports
+ from source instead of using the pre-built packages included with the release
+ only "disc1" is needed.
+
+ FreeBSD 6.4-RELEASE can also be purchased on CD-ROM from several
+ vendors. One of the vendors that will be offering FreeBSD 6.4-based
+ products is:
+
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:51 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AEDC91065676; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 739CB1065670
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 601198FC18
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Jm062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAU1ZKdT044225
for perforce@freebsd.org; Sun, 30 Nov 2008 01:35:20 GMT
(envelope-from zec@tel.fer.hr)
Date: Sun, 30 Nov 2008 01:35:20 GMT
Message-Id: <200811300135.mAU1ZKdT044225@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153806 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:52 -0000
http://perforce.freebsd.org/chv.cgi?CH=153806
Change 153806 by zec@zec_tpx32 on 2008/11/30 01:34:59
Instantiate vnet_* container structures, make VIMAGE_GLOBALS
a compile-time option defaulting to off, and switch the VSYM()
macro to resolve to struct vnet_ fields instead of globals,
unless VIMAGE_GLOBALS is set.
So far both GENERIC and LINT with nooptions SCTP build fine,
though I have no clue yet whether either of them boots at all.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/conf/options#16 edit
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#7 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#6 edit
.. //depot/projects/vimage-commit2/src/sys/net/route.c#21 edit
.. //depot/projects/vimage-commit2/src/sys/net/vnet.h#8 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#17 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#18 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#26 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#21 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#33 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#19 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#19 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#18 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#15 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#20 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#14 edit
.. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#11 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#23 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/conf/options#16 (text+ko) ====
@@ -415,6 +415,7 @@
TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading
TCP_SIGNATURE opt_inet.h
VLAN_ARRAY opt_vlan.h
+VIMAGE_GLOBALS opt_global.h
XBONEHACK
#
==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#7 (text+ko) ====
@@ -115,10 +115,13 @@
#define ISN_STATIC_INCREMENT 4096
#define ISN_RANDOM_INCREMENT (4096 - 1)
+#ifdef VIMAGE_GLOBALS
+/* XXX WARNING WARNING clash with netinet/tcp_subr.c - REVISIT !!! */
static u_char isn_secret[32];
static int isn_last_reseed;
static u_int32_t isn_offset;
static MD5_CTX isn_ctx;
+#endif
u_int32_t
pf_new_isn(struct pf_state *s)
==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#14 (text+ko) ====
@@ -425,7 +425,7 @@
ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst,
struct ip_fw **rule, int shared)
{
- INIT_VNET_IPFW(dst->if_vnet);
+ INIT_VNET_NET(dst->if_vnet);
struct ether_header *eh;
struct ether_header save_eh;
struct mbuf *m;
==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#14 (text+ko) ====
@@ -95,6 +95,10 @@
static struct mtx gif_mtx;
static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface");
+#ifndef VIMAGE_GLOBALS
+struct vnet_gif vnet_gif_0;
+#endif
+
#ifdef VIMAGE_GLOBALS
static LIST_HEAD(, gif_softc) gif_softc_list;
static int max_gif_nesting;
==== //depot/projects/vimage-commit2/src/sys/net/if_gif.h#6 (text+ko) ====
@@ -113,7 +113,7 @@
/*
* Virtualization support
*/
-#ifdef VIMAGE
+
struct vnet_gif {
LIST_HEAD(, gif_softc) _gif_softc_list;
int _max_gif_nesting;
@@ -121,6 +121,9 @@
int _ip_gif_ttl;
int _ip6_gif_hlim;
};
+
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_gif vnet_gif_0;
#endif
#define INIT_VNET_GIF(vnet) \
==== //depot/projects/vimage-commit2/src/sys/net/route.c#21 (text+ko) ====
@@ -63,6 +63,10 @@
#include
+#ifndef VIMAGE_GLOBALS
+struct vnet_net vnet_net_0;
+#endif
+
u_int rt_numfibs = RT_NUMFIBS;
SYSCTL_INT(_net, OID_AUTO, fibs, CTLFLAG_RD, &rt_numfibs, 0, "");
/*
==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#8 (text+ko) ====
@@ -67,6 +67,10 @@
int _ether_ipfw;
};
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_net vnet_net_0;
+#endif
+
/*
* Symbol translation macros
*/
==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#17 (text+ko) ====
@@ -1205,6 +1205,10 @@
struct unrhdr *_ng_wormhole_unit;
};
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_netgraph vnet_netgraph_0;
+#endif
+
/* Symbol translation macros */
#define V_nextID VNET_NETGRAPH(nextID)
#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash)
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#17 (text+ko) ====
@@ -72,6 +72,10 @@
MODULE_VERSION(netgraph, NG_ABI_VERSION);
+#ifndef VIMAGE_GLOBALS
+struct vnet_netgraph vnet_netgraph_0;
+#endif
+
/* Mutex to protect topology events. */
static struct mtx ng_topo_mtx;
@@ -167,7 +171,9 @@
/* Hash related definitions */
/* XXX Don't need to initialise them because it's a LIST */
+#ifdef VIMAGE_GLOBALS
static LIST_HEAD(, ng_node) ng_ID_hash[NG_ID_HASH_SIZE];
+#endif
static struct mtx ng_idhash_mtx;
/* Method to find a node.. used twice so do it here */
#define NG_IDHASH_FN(ID) ((ID) % (NG_ID_HASH_SIZE))
@@ -183,7 +189,9 @@
} \
} while (0)
+#ifdef VIMAGE_GLOBALS
static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE];
+#endif
static struct mtx ng_namehash_mtx;
#define NG_NAMEHASH(NAME, HASH) \
do { \
@@ -348,7 +356,9 @@
#define TRAP_ERROR()
#endif
+#ifdef VIMAGE_GLOBALS
static ng_ID_t nextID = 1;
+#endif
#ifdef INVARIANTS
#define CHECK_DATA_MBUF(m) do { \
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#14 (text+ko) ====
@@ -112,7 +112,9 @@
};
NETGRAPH_INIT(eiface, &typestruct);
+#ifdef VIMAGE_GLOBALS
static struct unrhdr *ng_eiface_unit;
+#endif
/************************************************************************
INTERFACE STUFF
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#12 (text+ko) ====
@@ -208,7 +208,9 @@
};
NETGRAPH_INIT(iface, &typestruct);
+#ifdef VIMAGE_GLOBALS
static struct unrhdr *ng_iface_unit;
+#endif
/************************************************************************
HELPER STUFF
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#18 (text+ko) ====
@@ -166,7 +166,7 @@
V_divcbinfo.ipi_zone = uma_zcreate("divcb", sizeof(struct inpcb),
NULL, NULL, div_inpcb_init, div_inpcb_fini, UMA_ALIGN_PTR,
UMA_ZONE_NOFREE);
- uma_zone_set_max(divcbinfo.ipi_zone, maxsockets);
+ uma_zone_set_max(V_divcbinfo.ipi_zone, maxsockets);
EVENTHANDLER_REGISTER(maxsockets_change, div_zone_change,
NULL, EVENTHANDLER_PRI_ANY);
}
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#12 (text+ko) ====
@@ -650,8 +650,6 @@
extern ip_fw_chk_t *ip_fw_chk_ptr;
#define IPFW_LOADED (ip_fw_chk_ptr != NULL)
-#ifdef IPFW_INTERNAL
-
struct ip_fw_chain {
struct ip_fw *rules; /* list of rules */
struct ip_fw *reap; /* list of rules to reap */
@@ -659,6 +657,9 @@
struct radix_node_head *tables[IPFW_TABLES_MAX];
struct rwlock rwmtx;
};
+
+#ifdef IPFW_INTERNAL
+
#define IPFW_LOCK_INIT(_chain) \
rw_init(&(_chain)->rwmtx, "IPFW static rules")
#define IPFW_LOCK_DESTROY(_chain) rw_destroy(&(_chain)->rwmtx)
@@ -684,9 +685,7 @@
/*
* Stack virtualization support.
*/
-#ifdef VIMAGE
struct vnet_ipfw {
- int _fw_one_pass;
int _fw_enable;
int _fw6_enable;
u_int32_t _set_disable;
@@ -716,6 +715,9 @@
struct callout _ipfw_timeout;
eventhandler_tag _ifaddr_event_tag;
};
+
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_ipfw vnet_ipfw_0;
#endif
/*
@@ -726,7 +728,6 @@
#define VNET_IPFW(sym) VSYM(vnet_ipfw, sym)
-#define V_fw_one_pass VNET_IPFW(fw_one_pass)
#define V_fw_enable VNET_IPFW(fw_enable)
#define V_fw6_enable VNET_IPFW(fw6_enable)
#define V_set_disable VNET_IPFW(set_disable)
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#26 (text+ko) ====
@@ -107,6 +107,10 @@
#include
+#ifndef VIMAGE_GLOBALS
+struct vnet_ipfw vnet_ipfw_0;
+#endif
+
/*
* set_disable contains one bit per set value (0..31).
* If the bit is set, all rules with the corresponding set
@@ -115,12 +119,13 @@
* and CANNOT be disabled.
* Rules in set RESVD_SET can only be deleted explicitly.
*/
+#ifdef VIMAGE_GLOBALS
static u_int32_t set_disable;
-
static int fw_verbose;
+static struct callout ipfw_timeout;
+#endif
static int verbose_limit;
-static struct callout ipfw_timeout;
static uma_zone_t ipfw_dyn_rule_zone;
/*
@@ -156,8 +161,11 @@
u_int32_t value;
};
+#ifdef VIMAGE_GLOBALS
+/* XXX revisit init on instantiation !!! */
static int fw_debug = 1;
static int autoinc_step = 100; /* bounded to 1..1000 in add_rule() */
+#endif
extern int ipfw_chg_hook(SYSCTL_HANDLER_ARGS);
@@ -168,7 +176,7 @@
ipfw_chg_hook, "I", "Enable ipfw");
SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, autoinc_step,
CTLFLAG_RW, autoinc_step, 0, "Rule number autincrement step");
-SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, one_pass,
+SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip_fw, OID_AUTO, one_pass,
CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0,
"Only do a single pass through ipfw when using dummynet(4)");
SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW,
@@ -219,9 +227,12 @@
* obey the 'randomized match', and we do not do multiple
* passes through the firewall. XXX check the latter!!!
*/
+#ifdef VIMAGE_GLOBALS
+/* XXX revisit init on instantiation !!! */
static ipfw_dyn_rule **ipfw_dyn_v = NULL;
static u_int32_t dyn_buckets = 256; /* must be power of 2 */
static u_int32_t curr_dyn_buckets = 256; /* must be power of 2 */
+#endif
static struct mtx ipfw_dyn_mtx; /* mutex guarding dynamic rules */
#define IPFW_DYN_LOCK_INIT() \
@@ -234,6 +245,8 @@
/*
* Timeouts for various events in handing dynamic rules.
*/
+#ifdef VIMAGE_GLOBALS
+/* XXX revisit init on instantiation !!! */
static u_int32_t dyn_ack_lifetime = 300;
static u_int32_t dyn_syn_lifetime = 20;
static u_int32_t dyn_fin_lifetime = 1;
@@ -257,6 +270,7 @@
static u_int32_t static_len; /* size in bytes of static rules */
static u_int32_t dyn_count; /* # of dynamic rules */
static u_int32_t dyn_max = 4096; /* max # of dynamic rules */
+#endif /* VIMAGE_GLOBALS */
SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_buckets,
CTLFLAG_RW, dyn_buckets, 0, "Number of dyn. buckets");
@@ -296,9 +310,11 @@
#endif /* INET6 */
#endif /* SYSCTL_NODE */
+#ifdef VIMAGE_GLOBALS
+/* XXX revisit init on instantiation !!! */
static int fw_deny_unknown_exthdrs = 1;
+#endif
-
/*
* L3HDR maps an ipv4 pointer into a layer3 header pointer of type T
* Other macros just cast void * into the appropriate type
@@ -745,7 +761,9 @@
#endif /* INET6 */
+#ifdef VIMAGE_GLOBALS
static u_int64_t norule_counter; /* counter for ipfw_log(NULL...) */
+#endif
#define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0
#define SNP(buf) buf, sizeof(buf)
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#8 (text+ko) ====
@@ -71,7 +71,9 @@
extern struct ip_fw_chain layer3_chain;
+#ifdef VIMAGE_GLOBALS
static eventhandler_tag ifaddr_event_tag;
+#endif
extern ipfw_nat_t *ipfw_nat_ptr;
extern ipfw_nat_cfg_t *ipfw_nat_cfg_ptr;
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#10 (text+ko) ====
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#21 (text+ko) ====
@@ -89,6 +89,10 @@
CTASSERT(sizeof(struct ip) == 20);
#endif
+#ifndef VIMAGE_GLOBALS
+struct vnet_inet vnet_inet_0;
+#endif
+
#ifdef VIMAGE_GLOBALS
static int ipsendredirects;
static int ip_checkinterface;
@@ -168,7 +172,9 @@
SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_ip, IPCTL_STATS, stats, CTLFLAG_RW,
ipstat, ipstat, "IP statistics (struct ipstat, netinet/ip_var.h)");
+#ifdef VIMAGE_GLOBALS
static uma_zone_t ipq_zone;
+#endif
static struct mtx ipqlock;
#define IPQ_LOCK() mtx_lock(&ipqlock)
@@ -205,7 +211,9 @@
*/
ip_fw_chk_t *ip_fw_chk_ptr = NULL;
ip_dn_io_t *ip_dn_io_ptr = NULL;
-int fw_one_pass = 1;
+#ifdef VIMAGE_GLOBALS
+int fw_one_pass;
+#endif
static void ip_freef(struct ipqhead *, struct ipq *);
@@ -244,6 +252,8 @@
V_ipport_randomtime = 45; /* user controlled via sysctl */
V_ipport_stoprandom = 0; /* toggled by ipport_tick */
+ V_fw_one_pass = 1;
+
#ifdef NOTYET
/* XXX global static but not instantiated in this file */
V_ipfastforward_active = 0;
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#14 (text+ko) ====
@@ -134,7 +134,10 @@
SYSCTL_NODE(_net_inet_tcp, OID_AUTO, sack, CTLFLAG_RW, 0, "TCP SACK");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, enable,
CTLFLAG_RW, tcp_do_sack, 0, "Enable/Disable TCP SACK support");
+#ifdef VIMAGE_GLOBALS
+/* XXX REVISIT THIS !!! */
TUNABLE_INT("net.inet.tcp.sack.enable", &tcp_do_sack);
+#endif
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, maxholes,
CTLFLAG_RW, tcp_sack_maxholes, 0,
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#33 (text+ko) ====
@@ -1479,6 +1479,7 @@
#define ISN_RANDOM_INCREMENT (4096 - 1)
#ifdef VIMAGE_GLOBALS
+/* XXX WARNING WARNING clash with contrib/pf/net/pf_subr.c - REVISIT !!! */
static u_char isn_secret[32];
static int isn_last_reseed;
static u_int32_t isn_offset, isn_offset_old;
==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#19 (text+ko) ====
@@ -196,8 +196,14 @@
int _icmp_rfi;
int _icmp_quotelen;
int _icmpbmcastecho;
+
+ int _fw_one_pass;
};
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_inet vnet_inet_0;
+#endif
+
/*
* Symbol translation macros
*/
@@ -214,6 +220,7 @@
#define V_divcbinfo VNET_INET(divcbinfo)
#define V_drop_redirect VNET_INET(drop_redirect)
#define V_drop_synfin VNET_INET(drop_synfin)
+#define V_fw_one_pass VNET_INET(fw_one_pass)
#define V_icmp_may_rst VNET_INET(icmp_may_rst)
#define V_icmp_quotelen VNET_INET(icmp_quotelen)
#define V_icmp_rfi VNET_INET(icmp_rfi)
==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#19 (text+ko) ====
==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#14 (text+ko) ====
@@ -517,7 +517,8 @@
sysctl_ip6_tempvltime, "I", "");
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_V6ONLY,
v6only, CTLFLAG_RW, ip6_v6only, 0, "");
-#ifndef VIMAGE
+#ifdef VIMAGE_GLOBALS
+/* XXX REVISIT THIS ! */
TUNABLE_INT("net.inet6.ip6.auto_linklocal", &ip6_auto_linklocal);
#endif
SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_AUTO_LINKLOCAL,
==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#14 (text+ko) ====
@@ -117,6 +117,10 @@
u_char ip6_protox[IPPROTO_MAX];
static struct ifqueue ip6intrq;
+#ifndef VIMAGE_GLOBALS
+struct vnet_inet6 vnet_inet6_0;
+#endif
+
#ifdef VIMAGE_GLOBALS
static int ip6qmaxlen;
struct in6_ifaddr *in6_ifaddr;
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#18 (text+ko) ====
@@ -164,10 +164,10 @@
V_llinfo_nd6.ln_prev = &V_llinfo_nd6;
LIST_INIT(&V_nd_prefix);
- ip6_use_tempaddr = 0;
- ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME;
- ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME;
- ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE;
+ V_ip6_use_tempaddr = 0;
+ V_ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME;
+ V_ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME;
+ V_ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE;
all1_sa.sin6_family = AF_INET6;
all1_sa.sin6_len = sizeof(struct sockaddr_in6);
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#16 (text+ko) ====
==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#15 (text+ko) ====
@@ -87,7 +87,7 @@
int _dad_init;
int _icmp6errpps_count;
- int _icmp6errppslim_last;
+ struct timeval _icmp6errppslim_last;
int _ip6_forwarding;
int _ip6_sendredirects;
@@ -154,6 +154,10 @@
struct ip6_pktopts _ip6_opts;
};
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_inet6 vnet_inet6_0;
+#endif
+
#define INIT_VNET_INET6(vnet) \
INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6)
==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#20 (text+ko) ====
@@ -97,6 +97,10 @@
#include
+#ifndef VIMAGE_GLOBALS
+struct vnet_ipsec vnet_ipsec_0;
+#endif
+
#ifdef VIMAGE_GLOBALS
/* NB: name changed so netstat doesn't use it */
struct ipsecstat ipsec4stat;
==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#14 (text+ko) ====
@@ -112,6 +112,10 @@
LIST_HEAD(, secspacq) _spacqtree;
};
+#ifndef VIMAGE_GLOBALS
+extern struct vnet_ipsec vnet_ipsec_0;
+#endif
+
/*
* Symbol translation macros
*/
==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#11 (text+ko) ====
@@ -234,9 +234,16 @@
handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \
DATA_SET(sysctl_set, sysctl__##parent##_##name)
#else
+#ifdef VIMAGE_GLOBALS
#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \
handler, fmt, descr) \
SYSCTL_OID(parent, nbr, name, kind, &a1, a2, handler, fmt, descr)
+#else
+#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \
+ handler, fmt, descr) \
+ SYSCTL_OID(parent, nbr, name, kind, & mod ## _0._ ## a1, a2, \
+ handler, fmt, descr)
+#endif
#endif
#define SYSCTL_ADD_OID(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
@@ -262,9 +269,15 @@
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_STRING|(access), \
sym, len, sysctl_handle_v_string, "A", descr)
#else
+#ifdef VIMAGE_GLOBALS
#define SYSCTL_V_STRING(subs, mod, parent, nbr, name, access, sym, len, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING|(access), \
&sym, len, sysctl_handle_string, "A", descr)
+#else
+#define SYSCTL_V_STRING(subs, mod, parent, nbr, name, access, sym, len, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING|(access), \
+ & mod ## _0._ ## sym, len, sysctl_handle_string, "A", descr)
+#endif
#endif
#define SYSCTL_ADD_STRING(ctx, parent, nbr, name, access, arg, len, descr) \
@@ -281,9 +294,15 @@
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_INT|(access), \
sym, val, sysctl_handle_v_int, "I", descr)
#else
+#ifdef VIMAGE_GLOBALS
#define SYSCTL_V_INT(subs, mod, parent, nbr, name, access, sym, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|(access), \
&sym, val, sysctl_handle_int, "I", descr)
+#else
+#define SYSCTL_V_INT(subs, mod, parent, nbr, name, access, sym, val, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|(access), \
+ & mod ## _0._ ## sym, val, sysctl_handle_int, "I", descr)
+#endif
#endif
#define SYSCTL_ADD_INT(ctx, parent, nbr, name, access, ptr, val, descr) \
@@ -300,9 +319,15 @@
SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_UINT|(access), \
sym, val, sysctl_handle_v_int, "IU", descr)
#else
+#ifdef VIMAGE_GLOBALS
#define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_UINT|(access), \
&sym, val, sysctl_handle_int, "IU", descr)
+#else
+#define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_UINT|(access), \
+ & mod ## _0._ ## sym, val, sysctl_handle_int, "IU", descr)
+#endif
#endif
#define SYSCTL_ADD_UINT(ctx, parent, nbr, name, access, ptr, val, descr) \
@@ -374,11 +399,19 @@
sym, sizeof(struct type), sysctl_handle_v_opaque, \
"S," #type, descr)
#else
+#ifdef VIMAGE_GLOBALS
#define SYSCTL_V_STRUCT(subs, mod, parent, nbr, name, access, sym, \
type, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \
&sym, sizeof(struct type), sysctl_handle_opaque, \
"S," #type, descr)
+#else
+#define SYSCTL_V_STRUCT(subs, mod, parent, nbr, name, access, sym, \
+ type, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \
+ & mod ## _0._ ## sym, sizeof(struct type), \
+ sysctl_handle_opaque, "S," #type, descr)
+#endif
#endif
#define SYSCTL_ADD_STRUCT(ctx, parent, nbr, name, access, ptr, type, descr) \
==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#23 (text+ko) ====
@@ -33,14 +33,17 @@
#ifndef _SYS_VIMAGE_H_
#define _SYS_VIMAGE_H_
-#define VIMAGE_GLOBALS 1
+#ifdef VIMAGE_GLOBALS
+#define VSYM(base, sym) (sym)
+#else
+#define VSYM(base, sym) (base ## _0._ ## sym)
+#endif
/* Non-VIMAGE null-macros */
#define CURVNET_SET(arg)
#define CURVNET_SET_QUIET(arg)
#define CURVNET_RESTORE()
#define VNET_ASSERT(condition)
-#define VSYM(base, sym) (sym)
#define INIT_FROM_VNET(vnet, modindex, modtype, sym)
#define VNET_ITERATOR_DECL(arg)
#define VNET_FOREACH(arg)
@@ -58,11 +61,11 @@
#define P_TO_VCPU(p)
/* XXX those defines bellow should probably go into vprocg.h and vcpu.h */
-#define VPROCG(sym) VSYM(vprocg, sym)
-#define VCPU(sym) VSYM(vcpu, sym)
+#define VPROCG(sym) (sym)
+#define VCPU(sym) (sym)
#define V_hostname VPROCG(hostname)
-#define G_hostname VSYM(basevprocg, hostname) /* global hostname */
+#define G_hostname VPROCG(hostname) /* global hostname */
#define V_domainname VPROCG(domainname)
#endif /* !_SYS_VIMAGE_H_ */
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:52 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 99015106574C; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 92C941065672
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 80CF98FC1E
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Jo062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIDOac079873
for perforce@freebsd.org; Sat, 29 Nov 2008 18:13:24 GMT
(envelope-from zec@tel.fer.hr)
Date: Sat, 29 Nov 2008 18:13:24 GMT
Message-Id: <200811291813.mATIDOac079873@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153773 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:53 -0000
http://perforce.freebsd.org/chv.cgi?CH=153773
Change 153773 by zec@zec_tpx32 on 2008/11/29 18:13:08
Fix misintegrations / unbreak build.
Affected files ...
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#24 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#66 edit
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#43 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#39 edit
Differences ...
==== //depot/projects/vimage/src/sys/netinet/ip_output.c#24 (text+ko) ====
@@ -791,7 +791,6 @@
void
in_delayed_cksum(struct mbuf *m)
{
- INIT_VNET_INET(curvnet);
struct ip *ip;
u_short csum, offset;
==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#66 (text+ko) ====
@@ -201,7 +201,7 @@
"Enable tcp_drain routine for extra help when low on mbufs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount,
- CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs");
+ CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst,
CTLFLAG_RW, icmp_may_rst, 0,
==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#43 (text+ko) ====
@@ -1222,7 +1222,7 @@
sin = (struct sockaddr_in *)nam;
if (prison_remote_ip4(td->td_ucred, &sin->sin_addr) != 0) {
INP_WUNLOCK(inp);
- INP_INFO_WUNLOCK(&udbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (EAFNOSUPPORT);
}
error = in_pcbconnect(inp, nam, td->td_ucred);
==== //depot/projects/vimage/src/sys/netinet/vinet.h#39 (text+ko) ====
@@ -332,16 +332,6 @@
#define V_udpstat VNET_INET(udpstat)
#define V_useloopback VNET_INET(useloopback)
-static __inline uint16_t ip_newid(void);
-extern int ip_do_randomid;
-
-static __inline uint16_t
-ip_newid(void)
-{
- if (V_ip_do_randomid)
- return ip_randomid();
-
- return htons(V_ip_id++);
-}
+#define ip_newid() (V_ip_do_randomid != 0 ? ip_randomid() : htons(V_ip_id++))
#endif /* !_NETINET_VINET_H_ */
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:53 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C069D1065752; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B1B111065677
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 9F6648FC1F
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Jq062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIGb6O080155
for perforce@freebsd.org; Sat, 29 Nov 2008 18:16:37 GMT
(envelope-from zec@tel.fer.hr)
Date: Sat, 29 Nov 2008 18:16:37 GMT
Message-Id: <200811291816.mATIGb6O080155@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153774 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:53 -0000
http://perforce.freebsd.org/chv.cgi?CH=153774
Change 153774 by zec@zec_tpx32 on 2008/11/29 18:16:13
Merge fixes from vimage branch.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#32 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#27 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#18 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#15 (text+ko) ====
@@ -791,7 +791,6 @@
void
in_delayed_cksum(struct mbuf *m)
{
- INIT_VNET_INET(curvnet);
struct ip *ip;
u_short csum, offset;
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#32 (text+ko) ====
@@ -201,7 +201,7 @@
"Enable tcp_drain routine for extra help when low on mbufs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount,
- CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs");
+ CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst,
CTLFLAG_RW, icmp_may_rst, 0,
==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#27 (text+ko) ====
@@ -1197,7 +1197,7 @@
sin = (struct sockaddr_in *)nam;
if (prison_remote_ip4(td->td_ucred, &sin->sin_addr) != 0) {
INP_WUNLOCK(inp);
- INP_INFO_WUNLOCK(&udbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (EAFNOSUPPORT);
}
error = in_pcbconnect(inp, nam, td->td_ucred);
==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#18 (text+ko) ====
@@ -332,16 +332,6 @@
#define V_udpstat VNET_INET(udpstat)
#define V_useloopback VNET_INET(useloopback)
-static __inline uint16_t ip_newid(void);
-extern int ip_do_randomid;
-
-static __inline uint16_t
-ip_newid(void)
-{
- if (V_ip_do_randomid)
- return ip_randomid();
-
- return htons(V_ip_id++);
-}
+#define ip_newid() (V_ip_do_randomid != 0 ? ip_randomid() : htons(V_ip_id++))
#endif /* !_NETINET_VINET_H_ */
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:54 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 164EA10658A4; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7A9A31065719
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id C31CE8FC20
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Js062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATHbiFW076234
for perforce@freebsd.org; Sat, 29 Nov 2008 17:37:44 GMT
(envelope-from zec@tel.fer.hr)
Date: Sat, 29 Nov 2008 17:37:44 GMT
Message-Id: <200811291737.mATHbiFW076234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153770 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=153770
Change 153770 by zec@zec_tpx32 on 2008/11/29 17:37:06
IFC @ 153769
Affected files ...
.. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#9 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#15 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#9 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_syscall.h#9 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#9 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/syscalls.master#9 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#18 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#15 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/asmc/asmc.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/k8temp/k8temp.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/mii/truephy.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux.h#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_cpuset.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_socket.c#28 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#18 integrate
.. //depot/projects/vimage/src/sys/mips/include/atomic.h#2 integrate
.. //depot/projects/vimage/src/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/net/if.c#53 integrate
.. //depot/projects/vimage/src/sys/net/rtsock.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#34 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#42 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_src.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#36 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#13 integrate
.. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#15 integrate
.. //depot/projects/vimage/src/sys/sys/cpuset.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/mount.h#15 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#35 integrate
Differences ...
==== //depot/projects/vimage/src/sys/amd64/linux32/linux.h#9 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.20 2008/11/16 15:45:41 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.22 2008/11/29 17:14:06 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -717,6 +717,22 @@
char sa_data[14];
} __packed;
+struct l_msghdr {
+ l_uintptr_t msg_name;
+ l_int msg_namelen;
+ l_uintptr_t msg_iov;
+ l_size_t msg_iovlen;
+ l_uintptr_t msg_control;
+ l_size_t msg_controllen;
+ l_uint msg_flags;
+};
+
+struct l_cmsghdr {
+ l_size_t cmsg_len;
+ l_int cmsg_level;
+ l_int cmsg_type;
+};
+
struct l_ifmap {
l_ulong mem_start;
l_ulong mem_end;
@@ -885,6 +901,16 @@
(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \
LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
+struct iovec;
+
+struct l_iovec32 {
+ uint32_t iov_base;
+ l_size_t iov_len;
+};
+
+int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt,
+ struct iovec **iovp, int error);
+
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#15 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.50 2008/11/11 14:55:59 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.51 2008/11/29 14:55:24 kib Exp $");
#include
#include
@@ -232,20 +232,15 @@
return (error);
}
-struct iovec32 {
- u_int32_t iov_base;
- int iov_len;
-};
-
-CTASSERT(sizeof(struct iovec32) == 8);
+CTASSERT(sizeof(struct l_iovec32) == 8);
static int
-linux32_copyinuio(struct iovec32 *iovp, u_int iovcnt, struct uio **uiop)
+linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, struct uio **uiop)
{
- struct iovec32 iov32;
+ struct l_iovec32 iov32;
struct iovec *iov;
struct uio *uio;
- u_int iovlen;
+ uint32_t iovlen;
int error, i;
*uiop = NULL;
@@ -255,7 +250,7 @@
uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK);
iov = (struct iovec *)(uio + 1);
for (i = 0; i < iovcnt; i++) {
- error = copyin(&iovp[i], &iov32, sizeof(struct iovec32));
+ error = copyin(&iovp[i], &iov32, sizeof(struct l_iovec32));
if (error) {
free(uio, M_IOV);
return (error);
@@ -281,6 +276,34 @@
}
int
+linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, struct iovec **iovp,
+ int error)
+{
+ struct l_iovec32 iov32;
+ struct iovec *iov;
+ uint32_t iovlen;
+ int i;
+
+ *iovp = NULL;
+ if (iovcnt > UIO_MAXIOV)
+ return (error);
+ iovlen = iovcnt * sizeof(struct iovec);
+ iov = malloc(iovlen, M_IOV, M_WAITOK);
+ for (i = 0; i < iovcnt; i++) {
+ error = copyin(&iovp32[i], &iov32, sizeof(struct l_iovec32));
+ if (error) {
+ free(iov, M_IOV);
+ return (error);
+ }
+ iov[i].iov_base = PTRIN(iov32.iov_base);
+ iov[i].iov_len = iov32.iov_len;
+ }
+ *iovp = iov;
+ return(0);
+
+}
+
+int
linux_readv(struct thread *td, struct linux_readv_args *uap)
{
struct uio *auio;
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -455,14 +455,14 @@
char fl_l_[PADL_(l_int)]; l_int fl; char fl_r_[PADR_(l_int)];
};
struct linux_readv_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
- char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
+ char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)];
+ char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)];
};
struct linux_writev_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
- char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
+ char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)];
+ char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)];
};
struct linux_getsid_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_syscall.h#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#define LINUX_SYS_exit 1
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#include "opt_compat.h"
==== //depot/projects/vimage/src/sys/amd64/linux32/syscalls.master#9 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.35 2008/11/09 10:45:13 ed Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -252,10 +252,10 @@
143 AUE_FLOCK NOPROTO { int flock(int fd, int how); }
144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \
l_size_t len, l_int fl); }
-145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \
- u_int iovcnt); }
-146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \
- u_int iovcnt); }
+145 AUE_READV STD { int linux_readv(l_ulong fd, struct l_iovec32 *iovp, \
+ l_ulong iovcnt); }
+146 AUE_WRITEV STD { int linux_writev(l_ulong fd, struct l_iovec32 *iovp, \
+ l_ulong iovcnt); }
147 AUE_GETSID STD { int linux_getsid(l_pid_t pid); }
148 AUE_NULL STD { int linux_fdatasync(l_uint fd); }
149 AUE_SYSCTL STD { int linux_sysctl( \
==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 (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/cddl/compat/opensolaris/sys/vnode.h,v 1.8 2008/11/25 21:14:00 pjd Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.9 2008/11/29 12:32:42 pjd Exp $
*/
#ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -257,7 +257,6 @@
{
int error, vfslocked;
- ASSERT(flag == (FWRITE | FCREAT | FTRUNC | FOFFMAX));
ASSERT(count == 1);
ASSERT(offset == 0);
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32.h#3 (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/compat/freebsd32/freebsd32.h,v 1.7 2007/12/06 23:11:27 jhb Exp $
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.8 2008/11/29 14:32:14 bz Exp $
*/
#ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
@@ -153,6 +153,24 @@
unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
};
+struct jail32_v0 {
+ u_int32_t version;
+ uint32_t path;
+ uint32_t hostname;
+ u_int32_t ip_number;
+};
+
+struct jail32 {
+ uint32_t version;
+ uint32_t path;
+ uint32_t hostname;
+ uint32_t jailname;
+ uint32_t ip4s;
+ uint32_t ip6s;
+ uint32_t ip4;
+ uint32_t ip6;
+};
+
struct sigaction32 {
u_int32_t sa_u;
int sa_flags;
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.83 2008/11/10 23:36:20 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.84 2008/11/29 14:32:14 bz Exp $");
#include "opt_compat.h"
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2036,6 +2037,66 @@
}
int
+freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap)
+{
+ uint32_t version;
+ int error;
+ struct jail j;
+
+ error = copyin(uap->jail, &version, sizeof(uint32_t));
+ if (error)
+ return (error);
+ switch (version) {
+ case 0:
+ {
+ /* FreeBSD single IPv4 jails. */
+ struct jail32_v0 j32_v0;
+
+ bzero(&j, sizeof(struct jail));
+ error = copyin(uap->jail, &j32_v0, sizeof(struct jail32_v0));
+ if (error)
+ return (error);
+ CP(j32_v0, j, version);
+ PTRIN_CP(j32_v0, j, path);
+ PTRIN_CP(j32_v0, j, hostname);
+ j.ip4s = j32_v0.ip_number;
+ break;
+ }
+
+ case 1:
+ /*
+ * Version 1 was used by multi-IPv4 jail implementations
+ * that never made it into the official kernel.
+ */
+ return (EINVAL);
+
+ case 2: /* JAIL_API_VERSION */
+ {
+ /* FreeBSD multi-IPv4/IPv6,noIP jails. */
+ struct jail32 j32;
+
+ error = copyin(uap->jail, &j32, sizeof(struct jail32));
+ if (error)
+ return (error);
+ CP(j32, j, version);
+ PTRIN_CP(j32, j, path);
+ PTRIN_CP(j32, j, hostname);
+ PTRIN_CP(j32, j, jailname);
+ CP(j32, j, ip4s);
+ CP(j32, j, ip6s);
+ PTRIN_CP(j32, j, ip4);
+ PTRIN_CP(j32, j, ip6);
+ break;
+ }
+
+ default:
+ /* Sci-Fi jails are not supported, sorry. */
+ return (EINVAL);
+ }
+ return (kern_jail(td, &j));
+}
+
+int
freebsd32_sigaction(struct thread *td, struct freebsd32_sigaction_args *uap)
{
struct sigaction32 s32;
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#17 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.96 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.97 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -235,6 +235,9 @@
char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)];
};
+struct freebsd32_jail_args {
+ char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)];
+};
struct freebsd32_sigtimedwait_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
@@ -428,6 +431,7 @@
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *);
+int freebsd32_jail(struct thread *, struct freebsd32_jail_args *);
int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *);
int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *);
int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
@@ -641,6 +645,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL
#define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT
#define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#17 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.95 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.96 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#define FREEBSD32_SYS_syscall 0
@@ -254,7 +254,7 @@
#define FREEBSD32_SYS_utrace 335
#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336
#define FREEBSD32_SYS_kldsym 337
-#define FREEBSD32_SYS_jail 338
+#define FREEBSD32_SYS_freebsd32_jail 338
#define FREEBSD32_SYS_sigprocmask 340
#define FREEBSD32_SYS_sigsuspend 341
#define FREEBSD32_SYS_freebsd4_freebsd32_sigaction 342
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.86 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.87 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
const char *freebsd32_syscallnames[] = {
@@ -345,7 +345,7 @@
"utrace", /* 335 = utrace */
"compat4.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */
"kldsym", /* 337 = kldsym */
- "jail", /* 338 = jail */
+ "freebsd32_jail", /* 338 = freebsd32_jail */
"#339", /* 339 = pioctl */
"sigprocmask", /* 340 = sigprocmask */
"sigsuspend", /* 341 = sigsuspend */
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#17 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.96 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.97 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#include "opt_compat.h"
@@ -376,7 +376,7 @@
{ AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */
{ compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */
{ AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */
- { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */
+ { AS(freebsd32_jail_args), (sy_call_t *)freebsd32_jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = freebsd32_jail */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */
{ AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */
{ AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */
==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#18 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.111 2008/11/09 10:45:13 ed Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.112 2008/11/29 14:32:14 bz Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -572,7 +572,7 @@
off_t *sbytes, int flags); }
337 AUE_NULL NOPROTO { int kldsym(int fileid, int cmd, \
void *data); }
-338 AUE_JAIL NOPROTO { int jail(struct jail *jail); }
+338 AUE_JAIL STD { int freebsd32_jail(struct jail32 *jail); }
339 AUE_NULL UNIMPL pioctl
340 AUE_SIGPROCMASK NOPROTO { int sigprocmask(int how, \
const sigset_t *set, sigset_t *oset); }
==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#15 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.79 2008/11/29 17:14:06 kib Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -421,10 +421,62 @@
}
static int
+linux_to_bsd_cmsg_type(int cmsg_type)
+{
+
+ switch (cmsg_type) {
+ case LINUX_SCM_RIGHTS:
+ return (SCM_RIGHTS);
+ }
+ return (-1);
+}
+
+static int
+bsd_to_linux_cmsg_type(int cmsg_type)
+{
+
+ switch (cmsg_type) {
+ case SCM_RIGHTS:
+ return (LINUX_SCM_RIGHTS);
+ }
+ return (-1);
+}
+
+
+
+static int
+linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr)
+{
+ if (lhdr->msg_controllen > INT_MAX)
+ return (ENOBUFS);
+
+ bhdr->msg_name = PTRIN(lhdr->msg_name);
+ bhdr->msg_namelen = lhdr->msg_namelen;
+ bhdr->msg_iov = PTRIN(lhdr->msg_iov);
+ bhdr->msg_iovlen = lhdr->msg_iovlen;
+ bhdr->msg_control = PTRIN(lhdr->msg_control);
+ bhdr->msg_controllen = lhdr->msg_controllen;
+ bhdr->msg_flags = linux_to_bsd_msg_flags(lhdr->msg_flags);
+ return (0);
+}
+
+static int
+bsd_to_linux_msghdr(const struct msghdr *bhdr, struct l_msghdr *lhdr)
+{
+ lhdr->msg_name = PTROUT(bhdr->msg_name);
+ lhdr->msg_namelen = bhdr->msg_namelen;
+ lhdr->msg_iov = PTROUT(bhdr->msg_iov);
+ lhdr->msg_iovlen = bhdr->msg_iovlen;
+ lhdr->msg_control = PTROUT(bhdr->msg_control);
+ lhdr->msg_controllen = bhdr->msg_controllen;
+ /* msg_flags skipped */
+ return (0);
+}
+
+static int
linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags,
- enum uio_seg segflg)
+ struct mbuf *control, enum uio_seg segflg)
{
- struct mbuf *control;
struct sockaddr *to;
int error;
@@ -436,27 +488,9 @@
} else
to = NULL;
- if (mp->msg_control != NULL) {
- struct cmsghdr *cmsg;
-
- if (mp->msg_controllen < sizeof(struct cmsghdr)) {
- error = EINVAL;
- goto bad;
- }
- error = sockargs(&control, mp->msg_control,
- mp->msg_controllen, MT_CONTROL);
- if (error)
- goto bad;
-
- cmsg = mtod(control, struct cmsghdr *);
- cmsg->cmsg_level = linux_to_bsd_sockopt_level(cmsg->cmsg_level);
- } else
- control = NULL;
-
error = kern_sendit(td, s, mp, linux_to_bsd_msg_flags(flags), control,
segflg);
-bad:
if (to)
free(to, M_SONAME);
return (error);
@@ -531,7 +565,7 @@
aiov[0].iov_base = (char *)packet;
aiov[0].iov_len = linux_args->len;
error = linux_sendit(td, linux_args->s, &msg, linux_args->flags,
- UIO_SYSSPACE);
+ NULL, UIO_SYSSPACE);
goout:
free(packet, M_TEMP);
return (error);
@@ -900,7 +934,8 @@
msg.msg_flags = 0;
aiov.iov_base = PTRIN(args->msg);
aiov.iov_len = args->len;
- error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE);
+ error = linux_sendit(td, args->s, &msg, args->flags, NULL,
+ UIO_USERSPACE);
return (error);
}
@@ -962,13 +997,21 @@
static int
linux_sendmsg(struct thread *td, struct linux_sendmsg_args *args)
{
+ struct cmsghdr *cmsg;
+ struct mbuf *control;
struct msghdr msg;
+ struct l_cmsghdr linux_cmsg;
+ struct l_cmsghdr *ptr_cmsg;
+ struct l_msghdr linux_msg;
struct iovec *iov;
+ socklen_t datalen;
+ void *data;
int error;
- /* XXXTJR sendmsg is broken on amd64 */
-
- error = copyin(PTRIN(args->msg), &msg, sizeof(msg));
+ error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
+ if (error)
+ return (error);
+ error = linux_to_bsd_msghdr(&msg, &linux_msg);
if (error)
return (error);
@@ -981,13 +1024,68 @@
*/
if (msg.msg_control != NULL && msg.msg_controllen == 0)
msg.msg_control = NULL;
+
+#ifdef COMPAT_LINUX32
+ error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
+ &iov, EMSGSIZE);
+#else
error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE);
+#endif
if (error)
return (error);
+
+ if (msg.msg_control != NULL) {
+ error = ENOBUFS;
+ cmsg = malloc(CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
+ control = m_get(M_WAIT, MT_CONTROL);
+ if (control == NULL)
+ goto bad;
+ ptr_cmsg = LINUX_CMSG_FIRSTHDR(&msg);
+
+ do {
+ error = copyin(ptr_cmsg, &linux_cmsg,
+ sizeof(struct l_cmsghdr));
+ if (error)
+ goto bad;
+
+ error = EINVAL;
+ if (linux_cmsg.cmsg_len < sizeof(struct l_cmsghdr))
+ goto bad;
+
+ /*
+ * Now we support only SCM_RIGHTS, so return EINVAL
+ * in any other cmsg_type
+ */
+ if ((cmsg->cmsg_type =
+ linux_to_bsd_cmsg_type(linux_cmsg.cmsg_type)) == -1)
+ goto bad;
+ cmsg->cmsg_level =
+ linux_to_bsd_sockopt_level(linux_cmsg.cmsg_level);
+
+ datalen = linux_cmsg.cmsg_len - L_CMSG_HDRSZ;
+ cmsg->cmsg_len = CMSG_LEN(datalen);
+ data = LINUX_CMSG_DATA(ptr_cmsg);
+
+ error = ENOBUFS;
+ if (!m_append(control, CMSG_HDRSZ, (c_caddr_t) cmsg))
+ goto bad;
+ if (!m_append(control, datalen, (c_caddr_t) data))
+ goto bad;
+ } while ((ptr_cmsg = LINUX_CMSG_NXTHDR(&msg, ptr_cmsg)));
+ } else {
+ control = NULL;
+ cmsg = NULL;
+ }
+
msg.msg_iov = iov;
msg.msg_flags = 0;
- error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE);
+ error = linux_sendit(td, args->s, &msg, args->flags, control,
+ UIO_USERSPACE);
+
+bad:
free(iov, M_IOV);
+ if (cmsg)
+ free(cmsg, M_TEMP);
return (error);
}
@@ -1000,44 +1098,132 @@
static int
linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args)
{
- struct recvmsg_args /* {
- int s;
- struct msghdr *msg;
- int flags;
- } */ bsd_args;
+ struct cmsghdr *cm;
struct msghdr msg;
- struct cmsghdr *cmsg;
+ struct l_cmsghdr *linux_cmsg = NULL;
+ socklen_t datalen, outlen, clen;
+ struct l_msghdr linux_msg;
+ struct iovec *iov, *uiov;
+ struct mbuf *control = NULL;
+ struct mbuf **controlp;
+ caddr_t outbuf;
+ void *data;
int error;
- /* XXXTJR recvmsg is broken on amd64 */
+ error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
+ if (error)
+ return (error);
- if ((error = copyin(PTRIN(args->msg), &msg, sizeof (msg))))
+ error = linux_to_bsd_msghdr(&msg, &linux_msg);
+ if (error)
return (error);
- bsd_args.s = args->s;
- bsd_args.msg = PTRIN(args->msg);
- bsd_args.flags = linux_to_bsd_msg_flags(args->flags);
- if (msg.msg_name) {
- linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name,
- msg.msg_namelen);
- error = recvmsg(td, &bsd_args);
- bsd_to_linux_sockaddr((struct sockaddr *)msg.msg_name);
- } else
- error = recvmsg(td, &bsd_args);
+#ifdef COMPAT_LINUX32
+ error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
+ &iov, EMSGSIZE);
+#else
+ error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE);
+#endif
if (error)
return (error);
- if (bsd_args.msg->msg_control != NULL &&
- bsd_args.msg->msg_controllen > 0) {
- cmsg = (struct cmsghdr*)bsd_args.msg->msg_control;
- cmsg->cmsg_level = bsd_to_linux_sockopt_level(cmsg->cmsg_level);
+ if (msg.msg_name) {
+ error = linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name,
+ msg.msg_namelen);
+ if (error)
+ goto bad;
}
- error = copyin(PTRIN(args->msg), &msg, sizeof(msg));
+ uiov = msg.msg_iov;
+ msg.msg_iov = iov;
+ controlp = (msg.msg_control != NULL) ? &control : NULL;
+ error = kern_recvit(td, args->s, &msg, UIO_USERSPACE, controlp);
+ msg.msg_iov = uiov;
+ if (error)
+ goto bad;
+
+ error = bsd_to_linux_msghdr(&msg, &linux_msg);
if (error)
- return (error);
- if (msg.msg_name && msg.msg_namelen > 2)
- error = linux_sa_put(msg.msg_name);
+ goto bad;
+
+ if (linux_msg.msg_name) {
+ error = bsd_to_linux_sockaddr((struct sockaddr *)
+ PTRIN(linux_msg.msg_name));
+ if (error)
+ goto bad;
+ }
+ if (linux_msg.msg_name && linux_msg.msg_namelen > 2) {
+ error = linux_sa_put(PTRIN(linux_msg.msg_name));
+ if (error)
+ goto bad;
+ }
+
+ if (control) {
+
+ linux_cmsg = malloc(L_CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
+ outbuf = PTRIN(linux_msg.msg_control);
+ cm = mtod(control, struct cmsghdr *);
+ outlen = 0;
+ clen = control->m_len;
+
+ while (cm != NULL) {
+
+ if ((linux_cmsg->cmsg_type =
+ bsd_to_linux_cmsg_type(cm->cmsg_type)) == -1)
+ {
+ error = EINVAL;
+ goto bad;
+ }
+ data = CMSG_DATA(cm);
+ datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data;
+
+ if (outlen + LINUX_CMSG_LEN(datalen) >
+ linux_msg.msg_controllen) {
+ if (outlen == 0) {
+ error = EMSGSIZE;
+ goto bad;
+ } else {
+ linux_msg.msg_flags |= LINUX_MSG_CTRUNC;
+ goto out;
+ }
+ }
+
+ linux_cmsg->cmsg_len = LINUX_CMSG_LEN(datalen);
+ linux_cmsg->cmsg_level =
+ bsd_to_linux_sockopt_level(cm->cmsg_level);
+
+ error = copyout(linux_cmsg, outbuf, L_CMSG_HDRSZ);
+ if (error)
+ goto bad;
+ outbuf += L_CMSG_HDRSZ;
+
+ error = copyout(data, outbuf, datalen);
+ if (error)
+ goto bad;
+
+ outbuf += LINUX_CMSG_ALIGN(datalen);
+ outlen += LINUX_CMSG_LEN(datalen);
+ linux_msg.msg_controllen = outlen;
+
+ if (CMSG_SPACE(datalen) < clen) {
+ clen -= CMSG_SPACE(datalen);
+ cm = (struct cmsghdr *)
+ ((caddr_t)cm + CMSG_SPACE(datalen));
+ } else
+ cm = NULL;
+ }
+ }
+
+out:
+ error = copyout(&linux_msg, PTRIN(args->msg), sizeof(linux_msg));
+
+bad:
+ free(iov, M_IOV);
+ if (control != NULL)
+ m_freem(control);
+ if (linux_cmsg != NULL)
+ free(linux_cmsg, M_TEMP);
+
return (error);
}
==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.3 2008/11/29 17:14:06 kib Exp $
*/
#ifndef _LINUX_SOCKET_H_
@@ -49,4 +49,35 @@
#define LINUX_MSG_ERRQUEUE 0x2000
#define LINUX_MSG_NOSIGNAL 0x4000
+/* Socket-level control message types */
+
+#define LINUX_SCM_RIGHTS 0x01
+
+/* Ancilliary data object information macros */
+
+#define LINUX_CMSG_ALIGN(len) roundup2(len, sizeof(l_ulong))
+#define LINUX_CMSG_DATA(cmsg) ((void *)((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr))))
+#define LINUX_CMSG_SPACE(len) (LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr)) + \
+ LINUX_CMSG_ALIGN(len))
+#define LINUX_CMSG_LEN(len) (LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr)) + \
+ (len))
+#define LINUX_CMSG_FIRSTHDR(msg) \
+ ((msg)->msg_controllen >= \
+ sizeof(struct l_cmsghdr) ? \
+ (struct l_cmsghdr *)((msg)->msg_control) : \
+ (struct l_cmsghdr *)(NULL))
+#define LINUX_CMSG_NXTHDR(msg, cmsg) \
+ ((((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \
+ sizeof(*(cmsg))) > \
+ (((char *)(msg)->msg_control) + \
+ (msg)->msg_controllen)) ? \
+ (struct l_cmsghdr *) NULL : \
+ (struct l_cmsghdr *)((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN((cmsg)->cmsg_len)))
+
+#define CMSG_HDRSZ CMSG_LEN(0)
+#define L_CMSG_HDRSZ LINUX_CMSG_LEN(0)
+
#endif /* _LINUX_SOCKET_H_ */
==== //depot/projects/vimage/src/sys/dev/asmc/asmc.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.10 2008/09/07 18:15:34 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.11 2008/11/29 14:20:36 rpaulo Exp $");
#include
#include
@@ -254,6 +254,9 @@
char *model;
model = getenv("smbios.system.product");
+ if (model == NULL)
+ return (NULL);
+
for (i = 0; asmc_models[i].smc_model; i++) {
if (!strncmp(model, asmc_models[i].smc_model, strlen(model))) {
freeenv(model);
==== //depot/projects/vimage/src/sys/dev/k8temp/k8temp.c#5 (text) ====
@@ -30,7 +30,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:54 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1CFD110658A6; Sun, 30 Nov 2008 16:29:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 98313106574B
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id D5B098FC21
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Ju062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATHenEK076484
for perforce@freebsd.org; Sat, 29 Nov 2008 17:40:49 GMT
(envelope-from zec@tel.fer.hr)
Date: Sat, 29 Nov 2008 17:40:49 GMT
Message-Id: <200811291740.mATHenEK076484@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153771 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=153771
Change 153771 by zec@zec_tpx32 on 2008/11/29 17:39:12
IFC @ 153769
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/truephy.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_cpuset.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/atomic.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/cpuset.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/jail.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/mount.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#22 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#5 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.20 2008/11/16 15:45:41 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.22 2008/11/29 17:14:06 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -717,6 +717,22 @@
char sa_data[14];
} __packed;
+struct l_msghdr {
+ l_uintptr_t msg_name;
+ l_int msg_namelen;
+ l_uintptr_t msg_iov;
+ l_size_t msg_iovlen;
+ l_uintptr_t msg_control;
+ l_size_t msg_controllen;
+ l_uint msg_flags;
+};
+
+struct l_cmsghdr {
+ l_size_t cmsg_len;
+ l_int cmsg_level;
+ l_int cmsg_type;
+};
+
struct l_ifmap {
l_ulong mem_start;
l_ulong mem_end;
@@ -885,6 +901,16 @@
(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \
LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
+struct iovec;
+
+struct l_iovec32 {
+ uint32_t iov_base;
+ l_size_t iov_len;
+};
+
+int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt,
+ struct iovec **iovp, int error);
+
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.50 2008/11/11 14:55:59 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.51 2008/11/29 14:55:24 kib Exp $");
#include
#include
@@ -232,20 +232,15 @@
return (error);
}
-struct iovec32 {
- u_int32_t iov_base;
- int iov_len;
-};
-
-CTASSERT(sizeof(struct iovec32) == 8);
+CTASSERT(sizeof(struct l_iovec32) == 8);
static int
-linux32_copyinuio(struct iovec32 *iovp, u_int iovcnt, struct uio **uiop)
+linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, struct uio **uiop)
{
- struct iovec32 iov32;
+ struct l_iovec32 iov32;
struct iovec *iov;
struct uio *uio;
- u_int iovlen;
+ uint32_t iovlen;
int error, i;
*uiop = NULL;
@@ -255,7 +250,7 @@
uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK);
iov = (struct iovec *)(uio + 1);
for (i = 0; i < iovcnt; i++) {
- error = copyin(&iovp[i], &iov32, sizeof(struct iovec32));
+ error = copyin(&iovp[i], &iov32, sizeof(struct l_iovec32));
if (error) {
free(uio, M_IOV);
return (error);
@@ -281,6 +276,34 @@
}
int
+linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, struct iovec **iovp,
+ int error)
+{
+ struct l_iovec32 iov32;
+ struct iovec *iov;
+ uint32_t iovlen;
+ int i;
+
+ *iovp = NULL;
+ if (iovcnt > UIO_MAXIOV)
+ return (error);
+ iovlen = iovcnt * sizeof(struct iovec);
+ iov = malloc(iovlen, M_IOV, M_WAITOK);
+ for (i = 0; i < iovcnt; i++) {
+ error = copyin(&iovp32[i], &iov32, sizeof(struct l_iovec32));
+ if (error) {
+ free(iov, M_IOV);
+ return (error);
+ }
+ iov[i].iov_base = PTRIN(iov32.iov_base);
+ iov[i].iov_len = iov32.iov_len;
+ }
+ *iovp = iov;
+ return(0);
+
+}
+
+int
linux_readv(struct thread *td, struct linux_readv_args *uap)
{
struct uio *auio;
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -455,14 +455,14 @@
char fl_l_[PADL_(l_int)]; l_int fl; char fl_r_[PADR_(l_int)];
};
struct linux_readv_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
- char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
+ char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)];
+ char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)];
};
struct linux_writev_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
- char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
+ char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)];
+ char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)];
};
struct linux_getsid_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#define LINUX_SYS_exit 1
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#include "opt_compat.h"
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.35 2008/11/09 10:45:13 ed Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -252,10 +252,10 @@
143 AUE_FLOCK NOPROTO { int flock(int fd, int how); }
144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \
l_size_t len, l_int fl); }
-145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \
- u_int iovcnt); }
-146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \
- u_int iovcnt); }
+145 AUE_READV STD { int linux_readv(l_ulong fd, struct l_iovec32 *iovp, \
+ l_ulong iovcnt); }
+146 AUE_WRITEV STD { int linux_writev(l_ulong fd, struct l_iovec32 *iovp, \
+ l_ulong iovcnt); }
147 AUE_GETSID STD { int linux_getsid(l_pid_t pid); }
148 AUE_NULL STD { int linux_fdatasync(l_uint fd); }
149 AUE_SYSCTL STD { int linux_sysctl( \
==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 (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/cddl/compat/opensolaris/sys/vnode.h,v 1.8 2008/11/25 21:14:00 pjd Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.9 2008/11/29 12:32:42 pjd Exp $
*/
#ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -257,7 +257,6 @@
{
int error, vfslocked;
- ASSERT(flag == (FWRITE | FCREAT | FTRUNC | FOFFMAX));
ASSERT(count == 1);
ASSERT(offset == 0);
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32.h#2 (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/compat/freebsd32/freebsd32.h,v 1.7 2007/12/06 23:11:27 jhb Exp $
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.8 2008/11/29 14:32:14 bz Exp $
*/
#ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
@@ -153,6 +153,24 @@
unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
};
+struct jail32_v0 {
+ u_int32_t version;
+ uint32_t path;
+ uint32_t hostname;
+ u_int32_t ip_number;
+};
+
+struct jail32 {
+ uint32_t version;
+ uint32_t path;
+ uint32_t hostname;
+ uint32_t jailname;
+ uint32_t ip4s;
+ uint32_t ip6s;
+ uint32_t ip4;
+ uint32_t ip6;
+};
+
struct sigaction32 {
u_int32_t sa_u;
int sa_flags;
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.83 2008/11/10 23:36:20 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.84 2008/11/29 14:32:14 bz Exp $");
#include "opt_compat.h"
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2036,6 +2037,66 @@
}
int
+freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap)
+{
+ uint32_t version;
+ int error;
+ struct jail j;
+
+ error = copyin(uap->jail, &version, sizeof(uint32_t));
+ if (error)
+ return (error);
+ switch (version) {
+ case 0:
+ {
+ /* FreeBSD single IPv4 jails. */
+ struct jail32_v0 j32_v0;
+
+ bzero(&j, sizeof(struct jail));
+ error = copyin(uap->jail, &j32_v0, sizeof(struct jail32_v0));
+ if (error)
+ return (error);
+ CP(j32_v0, j, version);
+ PTRIN_CP(j32_v0, j, path);
+ PTRIN_CP(j32_v0, j, hostname);
+ j.ip4s = j32_v0.ip_number;
+ break;
+ }
+
+ case 1:
+ /*
+ * Version 1 was used by multi-IPv4 jail implementations
+ * that never made it into the official kernel.
+ */
+ return (EINVAL);
+
+ case 2: /* JAIL_API_VERSION */
+ {
+ /* FreeBSD multi-IPv4/IPv6,noIP jails. */
+ struct jail32 j32;
+
+ error = copyin(uap->jail, &j32, sizeof(struct jail32));
+ if (error)
+ return (error);
+ CP(j32, j, version);
+ PTRIN_CP(j32, j, path);
+ PTRIN_CP(j32, j, hostname);
+ PTRIN_CP(j32, j, jailname);
+ CP(j32, j, ip4s);
+ CP(j32, j, ip6s);
+ PTRIN_CP(j32, j, ip4);
+ PTRIN_CP(j32, j, ip6);
+ break;
+ }
+
+ default:
+ /* Sci-Fi jails are not supported, sorry. */
+ return (EINVAL);
+ }
+ return (kern_jail(td, &j));
+}
+
+int
freebsd32_sigaction(struct thread *td, struct freebsd32_sigaction_args *uap)
{
struct sigaction32 s32;
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.96 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.97 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -235,6 +235,9 @@
char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)];
};
+struct freebsd32_jail_args {
+ char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)];
+};
struct freebsd32_sigtimedwait_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
@@ -428,6 +431,7 @@
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *);
+int freebsd32_jail(struct thread *, struct freebsd32_jail_args *);
int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *);
int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *);
int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
@@ -641,6 +645,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL
#define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT
#define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.95 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.96 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#define FREEBSD32_SYS_syscall 0
@@ -254,7 +254,7 @@
#define FREEBSD32_SYS_utrace 335
#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336
#define FREEBSD32_SYS_kldsym 337
-#define FREEBSD32_SYS_jail 338
+#define FREEBSD32_SYS_freebsd32_jail 338
#define FREEBSD32_SYS_sigprocmask 340
#define FREEBSD32_SYS_sigsuspend 341
#define FREEBSD32_SYS_freebsd4_freebsd32_sigaction 342
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.86 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.87 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
const char *freebsd32_syscallnames[] = {
@@ -345,7 +345,7 @@
"utrace", /* 335 = utrace */
"compat4.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */
"kldsym", /* 337 = kldsym */
- "jail", /* 338 = jail */
+ "freebsd32_jail", /* 338 = freebsd32_jail */
"#339", /* 339 = pioctl */
"sigprocmask", /* 340 = sigprocmask */
"sigsuspend", /* 341 = sigsuspend */
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.96 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.97 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#include "opt_compat.h"
@@ -376,7 +376,7 @@
{ AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */
{ compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */
{ AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */
- { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */
+ { AS(freebsd32_jail_args), (sy_call_t *)freebsd32_jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = freebsd32_jail */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */
{ AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */
{ AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#10 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.111 2008/11/09 10:45:13 ed Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.112 2008/11/29 14:32:14 bz Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -572,7 +572,7 @@
off_t *sbytes, int flags); }
337 AUE_NULL NOPROTO { int kldsym(int fileid, int cmd, \
void *data); }
-338 AUE_JAIL NOPROTO { int jail(struct jail *jail); }
+338 AUE_JAIL STD { int freebsd32_jail(struct jail32 *jail); }
339 AUE_NULL UNIMPL pioctl
340 AUE_SIGPROCMASK NOPROTO { int sigprocmask(int how, \
const sigset_t *set, sigset_t *oset); }
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.79 2008/11/29 17:14:06 kib Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -421,10 +421,62 @@
}
static int
+linux_to_bsd_cmsg_type(int cmsg_type)
+{
+
+ switch (cmsg_type) {
+ case LINUX_SCM_RIGHTS:
+ return (SCM_RIGHTS);
+ }
+ return (-1);
+}
+
+static int
+bsd_to_linux_cmsg_type(int cmsg_type)
+{
+
+ switch (cmsg_type) {
+ case SCM_RIGHTS:
+ return (LINUX_SCM_RIGHTS);
+ }
+ return (-1);
+}
+
+
+
+static int
+linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr)
+{
+ if (lhdr->msg_controllen > INT_MAX)
+ return (ENOBUFS);
+
+ bhdr->msg_name = PTRIN(lhdr->msg_name);
+ bhdr->msg_namelen = lhdr->msg_namelen;
+ bhdr->msg_iov = PTRIN(lhdr->msg_iov);
+ bhdr->msg_iovlen = lhdr->msg_iovlen;
+ bhdr->msg_control = PTRIN(lhdr->msg_control);
+ bhdr->msg_controllen = lhdr->msg_controllen;
+ bhdr->msg_flags = linux_to_bsd_msg_flags(lhdr->msg_flags);
+ return (0);
+}
+
+static int
+bsd_to_linux_msghdr(const struct msghdr *bhdr, struct l_msghdr *lhdr)
+{
+ lhdr->msg_name = PTROUT(bhdr->msg_name);
+ lhdr->msg_namelen = bhdr->msg_namelen;
+ lhdr->msg_iov = PTROUT(bhdr->msg_iov);
+ lhdr->msg_iovlen = bhdr->msg_iovlen;
+ lhdr->msg_control = PTROUT(bhdr->msg_control);
+ lhdr->msg_controllen = bhdr->msg_controllen;
+ /* msg_flags skipped */
+ return (0);
+}
+
+static int
linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags,
- enum uio_seg segflg)
+ struct mbuf *control, enum uio_seg segflg)
{
- struct mbuf *control;
struct sockaddr *to;
int error;
@@ -436,27 +488,9 @@
} else
to = NULL;
- if (mp->msg_control != NULL) {
- struct cmsghdr *cmsg;
-
- if (mp->msg_controllen < sizeof(struct cmsghdr)) {
- error = EINVAL;
- goto bad;
- }
- error = sockargs(&control, mp->msg_control,
- mp->msg_controllen, MT_CONTROL);
- if (error)
- goto bad;
-
- cmsg = mtod(control, struct cmsghdr *);
- cmsg->cmsg_level = linux_to_bsd_sockopt_level(cmsg->cmsg_level);
- } else
- control = NULL;
-
error = kern_sendit(td, s, mp, linux_to_bsd_msg_flags(flags), control,
segflg);
-bad:
if (to)
free(to, M_SONAME);
return (error);
@@ -531,7 +565,7 @@
aiov[0].iov_base = (char *)packet;
aiov[0].iov_len = linux_args->len;
error = linux_sendit(td, linux_args->s, &msg, linux_args->flags,
- UIO_SYSSPACE);
+ NULL, UIO_SYSSPACE);
goout:
free(packet, M_TEMP);
return (error);
@@ -900,7 +934,8 @@
msg.msg_flags = 0;
aiov.iov_base = PTRIN(args->msg);
aiov.iov_len = args->len;
- error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE);
+ error = linux_sendit(td, args->s, &msg, args->flags, NULL,
+ UIO_USERSPACE);
return (error);
}
@@ -962,13 +997,21 @@
static int
linux_sendmsg(struct thread *td, struct linux_sendmsg_args *args)
{
+ struct cmsghdr *cmsg;
+ struct mbuf *control;
struct msghdr msg;
+ struct l_cmsghdr linux_cmsg;
+ struct l_cmsghdr *ptr_cmsg;
+ struct l_msghdr linux_msg;
struct iovec *iov;
+ socklen_t datalen;
+ void *data;
int error;
- /* XXXTJR sendmsg is broken on amd64 */
-
- error = copyin(PTRIN(args->msg), &msg, sizeof(msg));
+ error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
+ if (error)
+ return (error);
+ error = linux_to_bsd_msghdr(&msg, &linux_msg);
if (error)
return (error);
@@ -981,13 +1024,68 @@
*/
if (msg.msg_control != NULL && msg.msg_controllen == 0)
msg.msg_control = NULL;
+
+#ifdef COMPAT_LINUX32
+ error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
+ &iov, EMSGSIZE);
+#else
error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE);
+#endif
if (error)
return (error);
+
+ if (msg.msg_control != NULL) {
+ error = ENOBUFS;
+ cmsg = malloc(CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
+ control = m_get(M_WAIT, MT_CONTROL);
+ if (control == NULL)
+ goto bad;
+ ptr_cmsg = LINUX_CMSG_FIRSTHDR(&msg);
+
+ do {
+ error = copyin(ptr_cmsg, &linux_cmsg,
+ sizeof(struct l_cmsghdr));
+ if (error)
+ goto bad;
+
+ error = EINVAL;
+ if (linux_cmsg.cmsg_len < sizeof(struct l_cmsghdr))
+ goto bad;
+
+ /*
+ * Now we support only SCM_RIGHTS, so return EINVAL
+ * in any other cmsg_type
+ */
+ if ((cmsg->cmsg_type =
+ linux_to_bsd_cmsg_type(linux_cmsg.cmsg_type)) == -1)
+ goto bad;
+ cmsg->cmsg_level =
+ linux_to_bsd_sockopt_level(linux_cmsg.cmsg_level);
+
+ datalen = linux_cmsg.cmsg_len - L_CMSG_HDRSZ;
+ cmsg->cmsg_len = CMSG_LEN(datalen);
+ data = LINUX_CMSG_DATA(ptr_cmsg);
+
+ error = ENOBUFS;
+ if (!m_append(control, CMSG_HDRSZ, (c_caddr_t) cmsg))
+ goto bad;
+ if (!m_append(control, datalen, (c_caddr_t) data))
+ goto bad;
+ } while ((ptr_cmsg = LINUX_CMSG_NXTHDR(&msg, ptr_cmsg)));
+ } else {
+ control = NULL;
+ cmsg = NULL;
+ }
+
msg.msg_iov = iov;
msg.msg_flags = 0;
- error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE);
+ error = linux_sendit(td, args->s, &msg, args->flags, control,
+ UIO_USERSPACE);
+
+bad:
free(iov, M_IOV);
+ if (cmsg)
+ free(cmsg, M_TEMP);
return (error);
}
@@ -1000,44 +1098,132 @@
static int
linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args)
{
- struct recvmsg_args /* {
- int s;
- struct msghdr *msg;
- int flags;
- } */ bsd_args;
+ struct cmsghdr *cm;
struct msghdr msg;
- struct cmsghdr *cmsg;
+ struct l_cmsghdr *linux_cmsg = NULL;
+ socklen_t datalen, outlen, clen;
+ struct l_msghdr linux_msg;
+ struct iovec *iov, *uiov;
+ struct mbuf *control = NULL;
+ struct mbuf **controlp;
+ caddr_t outbuf;
+ void *data;
int error;
- /* XXXTJR recvmsg is broken on amd64 */
+ error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
+ if (error)
+ return (error);
- if ((error = copyin(PTRIN(args->msg), &msg, sizeof (msg))))
+ error = linux_to_bsd_msghdr(&msg, &linux_msg);
+ if (error)
return (error);
- bsd_args.s = args->s;
- bsd_args.msg = PTRIN(args->msg);
- bsd_args.flags = linux_to_bsd_msg_flags(args->flags);
- if (msg.msg_name) {
- linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name,
- msg.msg_namelen);
- error = recvmsg(td, &bsd_args);
- bsd_to_linux_sockaddr((struct sockaddr *)msg.msg_name);
- } else
- error = recvmsg(td, &bsd_args);
+#ifdef COMPAT_LINUX32
+ error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
+ &iov, EMSGSIZE);
+#else
+ error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE);
+#endif
if (error)
return (error);
- if (bsd_args.msg->msg_control != NULL &&
- bsd_args.msg->msg_controllen > 0) {
- cmsg = (struct cmsghdr*)bsd_args.msg->msg_control;
- cmsg->cmsg_level = bsd_to_linux_sockopt_level(cmsg->cmsg_level);
+ if (msg.msg_name) {
+ error = linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name,
+ msg.msg_namelen);
+ if (error)
+ goto bad;
}
- error = copyin(PTRIN(args->msg), &msg, sizeof(msg));
+ uiov = msg.msg_iov;
+ msg.msg_iov = iov;
+ controlp = (msg.msg_control != NULL) ? &control : NULL;
+ error = kern_recvit(td, args->s, &msg, UIO_USERSPACE, controlp);
+ msg.msg_iov = uiov;
+ if (error)
+ goto bad;
+
+ error = bsd_to_linux_msghdr(&msg, &linux_msg);
if (error)
- return (error);
- if (msg.msg_name && msg.msg_namelen > 2)
- error = linux_sa_put(msg.msg_name);
+ goto bad;
+
+ if (linux_msg.msg_name) {
+ error = bsd_to_linux_sockaddr((struct sockaddr *)
+ PTRIN(linux_msg.msg_name));
+ if (error)
+ goto bad;
+ }
+ if (linux_msg.msg_name && linux_msg.msg_namelen > 2) {
+ error = linux_sa_put(PTRIN(linux_msg.msg_name));
+ if (error)
+ goto bad;
+ }
+
+ if (control) {
+
+ linux_cmsg = malloc(L_CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
+ outbuf = PTRIN(linux_msg.msg_control);
+ cm = mtod(control, struct cmsghdr *);
+ outlen = 0;
+ clen = control->m_len;
+
+ while (cm != NULL) {
+
+ if ((linux_cmsg->cmsg_type =
+ bsd_to_linux_cmsg_type(cm->cmsg_type)) == -1)
+ {
+ error = EINVAL;
+ goto bad;
+ }
+ data = CMSG_DATA(cm);
+ datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data;
+
+ if (outlen + LINUX_CMSG_LEN(datalen) >
+ linux_msg.msg_controllen) {
+ if (outlen == 0) {
+ error = EMSGSIZE;
+ goto bad;
+ } else {
+ linux_msg.msg_flags |= LINUX_MSG_CTRUNC;
+ goto out;
+ }
+ }
+
+ linux_cmsg->cmsg_len = LINUX_CMSG_LEN(datalen);
+ linux_cmsg->cmsg_level =
+ bsd_to_linux_sockopt_level(cm->cmsg_level);
+
+ error = copyout(linux_cmsg, outbuf, L_CMSG_HDRSZ);
+ if (error)
+ goto bad;
+ outbuf += L_CMSG_HDRSZ;
+
+ error = copyout(data, outbuf, datalen);
+ if (error)
+ goto bad;
+
+ outbuf += LINUX_CMSG_ALIGN(datalen);
+ outlen += LINUX_CMSG_LEN(datalen);
+ linux_msg.msg_controllen = outlen;
+
+ if (CMSG_SPACE(datalen) < clen) {
+ clen -= CMSG_SPACE(datalen);
+ cm = (struct cmsghdr *)
+ ((caddr_t)cm + CMSG_SPACE(datalen));
+ } else
+ cm = NULL;
+ }
+ }
+
+out:
+ error = copyout(&linux_msg, PTRIN(args->msg), sizeof(linux_msg));
+
+bad:
+ free(iov, M_IOV);
+ if (control != NULL)
+ m_freem(control);
+ if (linux_cmsg != NULL)
+ free(linux_cmsg, M_TEMP);
+
return (error);
}
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.3 2008/11/29 17:14:06 kib Exp $
*/
#ifndef _LINUX_SOCKET_H_
@@ -49,4 +49,35 @@
#define LINUX_MSG_ERRQUEUE 0x2000
#define LINUX_MSG_NOSIGNAL 0x4000
+/* Socket-level control message types */
+
+#define LINUX_SCM_RIGHTS 0x01
+
+/* Ancilliary data object information macros */
+
+#define LINUX_CMSG_ALIGN(len) roundup2(len, sizeof(l_ulong))
+#define LINUX_CMSG_DATA(cmsg) ((void *)((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr))))
+#define LINUX_CMSG_SPACE(len) (LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr)) + \
+ LINUX_CMSG_ALIGN(len))
+#define LINUX_CMSG_LEN(len) (LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr)) + \
+ (len))
+#define LINUX_CMSG_FIRSTHDR(msg) \
+ ((msg)->msg_controllen >= \
+ sizeof(struct l_cmsghdr) ? \
+ (struct l_cmsghdr *)((msg)->msg_control) : \
+ (struct l_cmsghdr *)(NULL))
+#define LINUX_CMSG_NXTHDR(msg, cmsg) \
+ ((((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \
+ sizeof(*(cmsg))) > \
+ (((char *)(msg)->msg_control) + \
+ (msg)->msg_controllen)) ? \
+ (struct l_cmsghdr *) NULL : \
+ (struct l_cmsghdr *)((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN((cmsg)->cmsg_len)))
+
+#define CMSG_HDRSZ CMSG_LEN(0)
+#define L_CMSG_HDRSZ LINUX_CMSG_LEN(0)
+
#endif /* _LINUX_SOCKET_H_ */
==== //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.10 2008/09/07 18:15:34 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.11 2008/11/29 14:20:36 rpaulo Exp $");
#include
#include
@@ -254,6 +254,9 @@
char *model;
model = getenv("smbios.system.product");
+ if (model == NULL)
+ return (NULL);
+
for (i = 0; asmc_models[i].smc_model; i++) {
if (!strncmp(model, asmc_models[i].smc_model, strlen(model))) {
freeenv(model);
==== //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#4 (text) ====
@@ -30,7 +30,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:54 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 27BDA10658AE; Sun, 30 Nov 2008 16:29:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B80901065750
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 065DE8FC23
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2K0062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNwG9O014532
for perforce@freebsd.org; Fri, 28 Nov 2008 23:58:16 GMT
(envelope-from zec@tel.fer.hr)
Date: Fri, 28 Nov 2008 23:58:16 GMT
Message-Id: <200811282358.mASNwG9O014532@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153730 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=153730
Change 153730 by zec@zec_tpx32 on 2008/11/28 23:57:36
IFC @ 153726
Affected files ...
.. //depot/projects/vimage/src/sys/conf/files.pc98#14 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#12 integrate
.. //depot/projects/vimage/src/sys/net/vnet.h#16 integrate
.. //depot/projects/vimage/src/sys/netgraph/netgraph.h#17 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#44 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/in.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_id.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#42 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_var.h#13 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#64 integrate
.. //depot/projects/vimage/src/sys/netinet/vinet.h#37 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet6/vinet6.h#27 integrate
.. //depot/projects/vimage/src/sys/netipsec/keysock.c#23 integrate
.. //depot/projects/vimage/src/sys/netipsec/keysock.h#5 integrate
.. //depot/projects/vimage/src/sys/netipsec/vipsec.h#20 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#34 integrate
Differences ...
==== //depot/projects/vimage/src/sys/conf/files.pc98#14 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.368 2008/11/09 17:37:54 jkoshy Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.369 2008/11/28 12:23:02 bz Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -111,6 +111,7 @@
dev/fe/if_fe_cbus.c optional fe isa
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
+dev/hwpmc/hwpmc_core.c optional hwpmc
dev/hwpmc/hwpmc_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_ppro.c optional hwpmc
==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */
+/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.12 2008/11/28 23:30:51 zec Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -121,8 +121,8 @@
#endif
extern int ip_optcopy __P((struct ip *, struct ip *));
-#if __FreeBSD_version > 800000
-# include
+#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800055)
+extern int path_mtu_discovery;
#endif
# ifdef IPFILTER_M_IPFILTER
==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 (text+ko) ====
@@ -1,9 +1,9 @@
-/* $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.20 2007/10/18 21:52:14 darrenr Exp $ */
+/* $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.21 2008/11/28 23:30:51 zec Exp $ */
/*
* Copyright (C) 2000 by Darren Reed.
*
- * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.20 2007/10/18 21:52:14 darrenr Exp $
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.21 2008/11/28 23:30:51 zec Exp $
* See the IPFILTER.LICENCE file for details on licencing.
*/
@@ -43,6 +43,9 @@
static int ipf_modload(void);
static int ipf_modunload(void);
+#if __FreeBSD_version < 800055
+SYSCTL_DECL(_net_inet);
+#endif
#define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
ptr, val, sysctl_ipf_int, "I", descr);
==== //depot/projects/vimage/src/sys/kern/kern_jail.c#18 (text+ko) ====
@@ -1,14 +1,30 @@
/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- * ----------------------------------------------------------------------------
+ * Copyright (c) 1999 Poul-Henning Kamp. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.84 2008/11/17 20:49:29 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.85 2008/11/28 19:23:46 bz Exp $");
#include "opt_mac.h"
==== //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#12 (text+ko) ====
@@ -43,7 +43,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.38 2008/10/28 13:44:11 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.39 2008/11/28 14:53:18 ed Exp $");
#include
#include
@@ -793,7 +793,8 @@
sx_assert(&pd->mn_info->mi_lock, SX_LOCKED);
LIST_FOREACH(pn, &pd->mn_children, mn_sibling) {
- if (strncmp(pn->mn_name, name, len) == 0)
+ if (strncmp(pn->mn_name, name, len) == 0 &&
+ pn->mn_name[len] == '\0')
return (pn);
}
return (NULL);
==== //depot/projects/vimage/src/sys/net/vnet.h#16 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $
+ * $FreeBSD: src/sys/net/vnet.h,v 1.2 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NET_VNET_H_
@@ -35,6 +35,8 @@
#include "opt_route.h"
+#include
+#include
#include
#include
#include
@@ -67,8 +69,6 @@
int _ether_ipfw;
};
-#endif
-
/*
* Symbol translation macros
*/
==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#17 (text+ko) ====
@@ -37,7 +37,7 @@
*
* Author: Julian Elischer
*
- * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.77 2008/10/23 15:53:51 des Exp $
+ * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.78 2008/11/28 23:30:51 zec Exp $
* $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
*/
@@ -1188,7 +1188,7 @@
/* Hash related definitions */
#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */
-#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */
+#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */
/* Virtualization macros */
#define INIT_VNET_NETGRAPH(vnet) \
@@ -1197,17 +1197,15 @@
#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym)
-#ifdef VIMAGE
struct vnet_netgraph {
- LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE];
- LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE];
- LIST_HEAD(, ng_node) _ng_nodelist;
- ng_ID_t _nextID;
- struct unrhdr *_ng_iface_unit;
- struct unrhdr *_ng_eiface_unit;
- struct unrhdr *_ng_wormhole_unit;
+ LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE];
+ LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE];
+ LIST_HEAD(, ng_node) _ng_nodelist;
+ ng_ID_t _nextID;
+ struct unrhdr *_ng_iface_unit;
+ struct unrhdr *_ng_eiface_unit;
+ struct unrhdr *_ng_wormhole_unit;
};
-#endif
/* Symbol translation macros */
#define V_nextID VNET_NETGRAPH(nextID)
==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#44 (text+ko) ====
@@ -38,7 +38,7 @@
* Authors: Julian Elischer
* Archie Cobbs
*
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.167 2008/11/22 16:03:18 mav Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.168 2008/11/28 23:30:51 zec Exp $
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
*/
==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#19 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.42 2008/10/23 15:53:51 des Exp $
+ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.43 2008/11/28 23:30:51 zec Exp $
*/
#include
@@ -486,7 +486,6 @@
buflen -= len;
}
break;
-#undef SA_SIZE
}
default:
==== //depot/projects/vimage/src/sys/netinet/in.c#23 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.108 2008/11/19 09:39:34 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.109 2008/11/28 23:30:51 zec Exp $");
#include "opt_carp.h"
==== //depot/projects/vimage/src/sys/netinet/ip_id.c#8 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.10 2008/02/06 15:40:30 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.11 2008/11/28 23:30:51 zec Exp $");
/*
* IP ID generation is a fascinating topic.
==== //depot/projects/vimage/src/sys/netinet/ip_input.c#42 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.345 2008/11/19 09:39:34 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.346 2008/11/28 23:30:51 zec Exp $");
#include "opt_bootp.h"
#include "opt_ipfw.h"
@@ -104,7 +104,7 @@
static int ip_rsvp_on;
struct socket *ip_rsvpd;
int rsvp_on;
-static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH];
+static struct ipqhead ipq[IPREASS_NHASH];
static int maxnipq; /* Administrative limit on # reass queues. */
static int maxfragsperpacket;
int ipstealth;
==== //depot/projects/vimage/src/sys/netinet/ip_var.h#13 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)ip_var.h 8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/ip_var.h,v 1.104 2008/08/25 05:49:16 julian Exp $
+ * $FreeBSD: src/sys/netinet/ip_var.h,v 1.105 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETINET_IP_VAR_H_
@@ -240,19 +240,6 @@
void in_delayed_cksum(struct mbuf *m);
-#if 0
-static __inline uint16_t
-ip_newid(void)
-{
- if (V_ip_do_randomid)
- return ip_randomid();
-
- return htons(V_ip_id++);
-}
-#else
-#define ip_newid() (V_ip_do_randomid ? ip_randomid() : V_ip_id++)
-#endif
-
#endif /* _KERNEL */
#endif /* !_NETINET_IP_VAR_H_ */
==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#32 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.24 2008/11/19 09:39:34 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.25 2008/11/28 23:30:51 zec Exp $");
#include "opt_inet6.h"
@@ -98,7 +98,6 @@
#include
-
/* Arbitrary values */
#define TCP_HOSTCACHE_HASHSIZE 512
#define TCP_HOSTCACHE_BUCKETLIMIT 30
==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#4 (text+ko) ====
==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#64 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.323 2008/11/26 22:32:07 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.324 2008/11/28 13:13:44 des Exp $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -201,7 +201,7 @@
"Enable tcp_drain routine for extra help when low on mbufs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount,
- CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs");
+ CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst,
CTLFLAG_RW, icmp_may_rst, 0,
==== //depot/projects/vimage/src/sys/netinet/vinet.h#37 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/vinet.h,v 1.3 2008/11/26 22:32:07 zec Exp $
+ * $FreeBSD: src/sys/netinet/vinet.h,v 1.4 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETINET_VINET_H_
@@ -37,7 +37,7 @@
#include
#include
-#include /* XXX revisit this! */
+#include
#include
#include
@@ -199,9 +199,7 @@
int _icmp_quotelen;
int _icmpbmcastecho;
};
-#endif
-
/*
* Symbol translation macros
*/
@@ -336,4 +334,16 @@
#define V_udpstat VNET_INET(udpstat)
#define V_useloopback VNET_INET(useloopback)
+static __inline uint16_t ip_newid(void);
+extern int ip_do_randomid;
+
+static __inline uint16_t
+ip_newid(void)
+{
+ if (V_ip_do_randomid)
+ return ip_randomid();
+
+ return htons(V_ip_id++);
+}
+
#endif /* !_NETINET_VINET_H_ */
==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#30 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.49 2008/11/26 22:32:07 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.50 2008/11/28 23:30:51 zec Exp $");
#include
#include
==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#27 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.2 2008/11/19 09:39:34 zec Exp $
+ * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.3 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETINET6_VINET6_H_
@@ -144,9 +144,15 @@
int _ip6_use_defzone;
struct ip6_pktopts _ip6_opts;
};
-#endif
+
+#define INIT_VNET_INET6(vnet) \
+ INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6)
+
+#define VNET_INET6(sym) VSYM(vnet_inet6, sym)
-/* Symbol translation macros */
+/*
+ * Symbol translation macros
+ */
#define V_addrsel_policytab VNET_INET6(addrsel_policytab)
#define V_dad_ignore_ns VNET_INET6(dad_ignore_ns)
#define V_dad_init VNET_INET6(dad_init)
==== //depot/projects/vimage/src/sys/netipsec/keysock.c#23 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.26 2008/11/26 22:32:07 zec Exp $ */
+/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.27 2008/11/28 23:30:51 zec Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
/*-
==== //depot/projects/vimage/src/sys/netipsec/keysock.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.3 2006/01/21 10:44:34 bz Exp $ */
+/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.4 2008/11/28 23:30:51 zec Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*-
==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#20 (text+ko) ====
@@ -27,13 +27,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.2 2008/11/26 22:32:07 zec Exp $
+ * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.3 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETIPSEC_VIPSEC_H_
#define _NETIPSEC_VIPSEC_H_
-#ifdef VIMAGE
#include
#include
#include
@@ -109,7 +108,6 @@
LIST_HEAD(, secacq) _acqtree;
LIST_HEAD(, secspacq) _spacqtree;
};
-#endif
/*
* Symbol translation macros
==== //depot/projects/vimage/src/sys/sys/param.h#34 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.374 2008/11/27 09:00:47 jkoshy Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.375 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _SYS_PARAM_H_
@@ -92,9 +92,13 @@
#include
#endif
+#ifndef FALSE
#define FALSE 0
+#endif
+#ifndef TRUE
#define TRUE 1
#endif
+#endif
#ifndef _KERNEL
/* Signals. */
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:54 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 49E9A10658CC; Sun, 30 Nov 2008 16:29:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9E6F4106574E
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E9B6F8FC22
for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Jw062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT0xSVB031008
for perforce@freebsd.org; Sat, 29 Nov 2008 00:59:28 GMT
(envelope-from zec@tel.fer.hr)
Date: Sat, 29 Nov 2008 00:59:28 GMT
Message-Id: <200811290059.mAT0xSVB031008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153731 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=153731
Change 153731 by zec@zec_tpx32 on 2008/11/29 00:58:47
Attempt at fixing misintegrations and reducing the diff
against head by visual inspection.
Affected files ...
.. //depot/projects/vimage/src/sys/net/vnet.h#17 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#45 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#5 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#65 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#38 edit
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#36 edit
.. //depot/projects/vimage/src/sys/netinet6/vinet6.h#28 edit
.. //depot/projects/vimage/src/sys/netipsec/vipsec.h#21 edit
Differences ...
==== //depot/projects/vimage/src/sys/net/vnet.h#17 (text+ko) ====
@@ -46,8 +46,6 @@
#include
#include
-#ifdef VIMAGE
-
struct vnet_net {
int _if_index;
struct ifindex_entry *_ifindex_table;
==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#45 (text+ko) ====
@@ -63,7 +63,6 @@
#include
#include
#include
-#include
#include
==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#5 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * XXX RCS ID
+ * $FreeBSD: src/sys/netinet/tcp_hostcache.h,v 1.1 2008/11/28 23:39:25 zec Exp $
*/
/*
==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#65 (text+ko) ====
@@ -121,10 +121,10 @@
static int icmp_may_rst;
static int tcp_isn_reseed_interval;
static int tcp_inflight_enable;
+static int tcp_inflight_rttthresh;
static int tcp_inflight_min;
static int tcp_inflight_max;
static int tcp_inflight_stab;
-static int tcp_inflight_rttthresh;
#endif
static int
==== //depot/projects/vimage/src/sys/netinet/vinet.h#38 (text+ko) ====
@@ -55,8 +55,6 @@
#include
#include
-#ifdef VIMAGE
-
struct vnet_inet {
struct in_ifaddrhashhead *_in_ifaddrhashtbl;
struct in_ifaddrhead _in_ifaddrhead;
==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#36 (text+ko) ====
@@ -114,6 +114,7 @@
extern struct inpcbhead ripcb;
extern int icmp6errppslim;
extern int icmp6_nodeinfo;
+
struct icmp6stat icmp6stat;
static int icmp6errpps_count;
static struct timeval icmp6errppslim_last;
==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#28 (text+ko) ====
@@ -44,18 +44,15 @@
#include
#include
-#define INIT_VNET_INET6(vnet) \
- INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6)
-
-#define VNET_INET6(sym) VSYM(vnet_inet6, sym)
-
-#ifdef VIMAGE
struct vnet_inet6 {
struct in6_ifaddr * _in6_ifaddr;
+
u_int _frag6_nfragpackets;
u_int _frag6_nfrags;
struct ip6q _ip6q;
+
struct route_in6 _ip6_forward_rt;
+
struct in6_addrpolicy _defaultaddrpolicy;
TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab;
u_int _in6_maxmtu;
@@ -63,15 +60,18 @@
int _rtq_minreallyold6;
int _rtq_reallyold6;
int _rtq_toomany6;
+
struct ip6stat _ip6stat;
struct rip6stat _rip6stat;
struct icmp6stat _icmp6stat;
+
int _rtq_timeout6;
struct callout _rtq_timer6;
struct callout _rtq_mtutimer;
struct callout _nd6_slowtimo_ch;
struct callout _nd6_timer_ch;
struct callout _in6_tmpaddrtimer_ch;
+
int _nd6_inuse;
int _nd6_allocated;
int _nd6_onlink_ns_rfc4861;
@@ -80,11 +80,15 @@
struct nd_prhead _nd_prefix;
struct ifnet * _nd6_defifp;
int _nd6_defifindex;
+
struct scope6_id _sid_default;
+
TAILQ_HEAD(, dadq) _dadq;
int _dad_init;
+
int _icmp6errpps_count;
struct timeval _icmp6errppslim_last;
+
int _ip6_forwarding;
int _ip6_sendredirects;
int _ip6_defhlim;
@@ -120,6 +124,7 @@
int _ip6_sourcecheck;
int _ip6_sourcecheck_interval;
int _ip6_ours_check_algorithm;
+
int _nd6_prune;
int _nd6_delay;
int _nd6_umaxtries;
@@ -137,11 +142,14 @@
int _ip6_desync_factor;
u_int32_t _ip6_temp_preferred_lifetime;
u_int32_t _ip6_temp_valid_lifetime;
+
int _ip6_mrouter_ver;
int _pim6;
u_int _mrt6debug;
+
int _ip6_temp_regen_advance;
int _ip6_use_defzone;
+
struct ip6_pktopts _ip6_opts;
};
==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#21 (text+ko) ====
@@ -54,6 +54,7 @@
int _ipsec_debug;
struct ipsecstat _ipsec4stat;
struct secpolicy _ip4_def_policy;
+
int _ip4_esp_trans_deflev;
int _ip4_esp_net_deflev;
int _ip4_ah_trans_deflev;
@@ -98,8 +99,10 @@
int _ah_enable;
int _ah_cleartos;
struct ahstat _ahstat;
+
int _ipcomp_enable;
struct ipcompstat _ipcompstat;
+
struct pfkeystat _pfkeystat;
struct key_cb _key_cb;
LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX];
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:57 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EA93B10659EB; Sun, 30 Nov 2008 16:29:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 035D610657A8
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 194BD8FC24
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2K2062967
for ; Sun, 30 Nov 2008 16:29:51 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNowiv013909
for perforce@freebsd.org; Fri, 28 Nov 2008 23:50:58 GMT
(envelope-from zec@tel.fer.hr)
Date: Fri, 28 Nov 2008 23:50:58 GMT
Message-Id: <200811282350.mASNowiv013909@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153729 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:57 -0000
http://perforce.freebsd.org/chv.cgi?CH=153729
Change 153729 by zec@zec_tpx32 on 2008/11/28 23:50:24
Fix a misintegration.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#3 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: $
+ * $FreeBSD: src/sys/netinet/tcp_hostcache.h,v 1.1 2008/11/28 23:39:25 zec Exp $
*/
/*
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:57 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6EC9D1065A98; Sun, 30 Nov 2008 16:29:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1C3CA10657C6
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 432AE8FC17
for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC)
(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2K4062967
for ; Sun, 30 Nov 2008 16:29:52 GMT
(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNkofU013578
for perforce@freebsd.org; Fri, 28 Nov 2008 23:46:50 GMT
(envelope-from zec@tel.fer.hr)
Date: Fri, 28 Nov 2008 23:46:50 GMT
Message-Id: <200811282346.mASNkofU013578@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@tel.fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153728 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:29:57 -0000
http://perforce.freebsd.org/chv.cgi?CH=153728
Change 153728 by zec@zec_tpx32 on 2008/11/28 23:46:00
IFC @ 153726
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net/vnet.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#31 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#13 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#21 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */
+/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.12 2008/11/28 23:30:51 zec Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 (text+ko) ====
@@ -1,9 +1,9 @@
-/* $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.20 2007/10/18 21:52:14 darrenr Exp $ */
+/* $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.21 2008/11/28 23:30:51 zec Exp $ */
/*
* Copyright (C) 2000 by Darren Reed.
*
- * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.20 2007/10/18 21:52:14 darrenr Exp $
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.21 2008/11/28 23:30:51 zec Exp $
* See the IPFILTER.LICENCE file for details on licencing.
*/
==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#13 (text+ko) ====
@@ -1,14 +1,30 @@
/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
- * ----------------------------------------------------------------------------
+ * Copyright (c) 1999 Poul-Henning Kamp. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.84 2008/11/17 20:49:29 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.85 2008/11/28 19:23:46 bz Exp $");
#include "opt_mac.h"
==== //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#6 (text+ko) ====
@@ -43,7 +43,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.38 2008/10/28 13:44:11 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.39 2008/11/28 14:53:18 ed Exp $");
#include
#include
@@ -793,7 +793,8 @@
sx_assert(&pd->mn_info->mi_lock, SX_LOCKED);
LIST_FOREACH(pn, &pd->mn_children, mn_sibling) {
- if (strncmp(pn->mn_name, name, len) == 0)
+ if (strncmp(pn->mn_name, name, len) == 0 &&
+ pn->mn_name[len] == '\0')
return (pn);
}
return (NULL);
==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#7 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $
+ * $FreeBSD: src/sys/net/vnet.h,v 1.2 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NET_VNET_H_
==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#16 (text+ko) ====
@@ -37,7 +37,7 @@
*
* Author: Julian Elischer
*
- * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.77 2008/10/23 15:53:51 des Exp $
+ * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.78 2008/11/28 23:30:51 zec Exp $
* $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
*/
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#16 (text+ko) ====
@@ -38,7 +38,7 @@
* Authors: Julian Elischer
* Archie Cobbs
*
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.167 2008/11/22 16:03:18 mav Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.168 2008/11/28 23:30:51 zec Exp $
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
*/
==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.42 2008/10/23 15:53:51 des Exp $
+ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.43 2008/11/28 23:30:51 zec Exp $
*/
#include
==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#15 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.108 2008/11/19 09:39:34 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.109 2008/11/28 23:30:51 zec Exp $");
#include "opt_carp.h"
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#9 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.10 2008/02/06 15:40:30 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.11 2008/11/28 23:30:51 zec Exp $");
/*
* IP ID generation is a fascinating topic.
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#20 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.345 2008/11/19 09:39:34 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.346 2008/11/28 23:30:51 zec Exp $");
#include "opt_bootp.h"
#include "opt_ipfw.h"
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)ip_var.h 8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/ip_var.h,v 1.104 2008/08/25 05:49:16 julian Exp $
+ * $FreeBSD: src/sys/netinet/ip_var.h,v 1.105 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETINET_IP_VAR_H_
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#15 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.24 2008/11/19 09:39:34 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.25 2008/11/28 23:30:51 zec Exp $");
#include "opt_inet6.h"
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#2 (text+ko) ====
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#31 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.323 2008/11/26 22:32:07 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.324 2008/11/28 13:13:44 des Exp $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -201,7 +201,7 @@
"Enable tcp_drain routine for extra help when low on mbufs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount,
- CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs");
+ CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs");
SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst,
CTLFLAG_RW, icmp_may_rst, 0,
==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#17 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/vinet.h,v 1.3 2008/11/26 22:32:07 zec Exp $
+ * $FreeBSD: src/sys/netinet/vinet.h,v 1.4 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETINET_VINET_H_
==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#17 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.49 2008/11/26 22:32:07 zec Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.50 2008/11/28 23:30:51 zec Exp $");
#include
#include
==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#14 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.2 2008/11/19 09:39:34 zec Exp $
+ * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.3 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETINET6_VINET6_H_
==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#18 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.26 2008/11/26 22:32:07 zec Exp $ */
+/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.27 2008/11/28 23:30:51 zec Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
/*-
==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.3 2006/01/21 10:44:34 bz Exp $ */
+/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.4 2008/11/28 23:30:51 zec Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*-
==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#13 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.2 2008/11/26 22:32:07 zec Exp $
+ * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.3 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _NETIPSEC_VIPSEC_H_
==== //depot/projects/vimage-commit2/src/sys/sys/param.h#21 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.374 2008/11/27 09:00:47 jkoshy Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.375 2008/11/28 23:30:51 zec Exp $
*/
#ifndef _SYS_PARAM_H_
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:41:03 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 562E21065680; Sun, 30 Nov 2008 16:41:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 191B9106567C
for ; Sun, 30 Nov 2008 16:41:03 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 0786D8FC17
for ; Sun, 30 Nov 2008 16:41:03 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGf2lQ064005
for ; Sun, 30 Nov 2008 16:41:02 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAUGf2ZL064003
for perforce@freebsd.org; Sun, 30 Nov 2008 16:41:02 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 30 Nov 2008 16:41:02 GMT
Message-Id: <200811301641.mAUGf2ZL064003@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153832 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 30 Nov 2008 16:41:03 -0000
http://perforce.freebsd.org/chv.cgi?CH=153832
Change 153832 by rene@rene_self on 2008/11/30 16:40:32
MFen handbook/mirrors 1.451 -> 1.453
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 edit
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 (text+ko) ====
@@ -6,7 +6,7 @@
Vertaald door: Siebrand Mazeland
%SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
- %SRCID% 1.451
+ %SRCID% 1.453
-->
@@ -2563,6 +2563,15 @@
+ RELENG_6_4
+
+
+ De uitgavetak voor &os;-6.4, alleen gebruikt voor
+ beveiligingsadviezen en andere kritieke reparaties.
+
+
+
+
RELENG_6_3
@@ -2819,6 +2828,14 @@
+ RELENG_6_4_0_RELEASE
+
+
+ &os; 6.4
+
+
+
+
RELENG_6_3_0_RELEASE
From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:50:13 2008
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0B5CB106568A; Sun, 30 Nov 2008 16:50:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C40561065688
for ; Sun, 30 Nov 2008 16:50:12 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B2A1F8FC14
for ; Sun, 30 Nov 2008 16:50:12 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGoCpZ074211
for ; Sun, 30 Nov 2008 16:50:12 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAUGoCRN074209
for perforce@freebsd.org; Sun, 30 Nov 2008 16:50:12 GMT
(envelope-from rene@FreeBSD.org)
Date: Sun, 30 Nov 2008 16:50:12 GMT
Message-Id: <200811301650.mAUGoCRN074209@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Cc:
Subject: PERFORCE change 153833 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: