CVS commit: src/share/man/man4
Module Name:src Committed By: sevan Date: Wed Aug 1 00:07:27 UTC 2018 Modified Files: src/share/man/man4: gif.4 Log Message: Drop ISO references as it's no longer supported. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/share/man/man4/gif.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/gif.4 diff -u src/share/man/man4/gif.4:1.31 src/share/man/man4/gif.4:1.32 --- src/share/man/man4/gif.4:1.31 Sun Feb 18 21:31:32 2018 +++ src/share/man/man4/gif.4 Wed Aug 1 00:07:27 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: gif.4,v 1.31 2018/02/18 21:31:32 pgoyette Exp $ +.\" $NetBSD: gif.4,v 1.32 2018/08/01 00:07:27 sevan Exp $ .\" $KAME: gif.4,v 1.24 2001/02/20 12:54:01 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 19, 2018 +.Dd August 1, 2018 .Dt GIF 4 .Os .Sh NAME @@ -45,8 +45,6 @@ Therefore, there can be four possible co The behavior of .Nm is mainly based on RFC 2893 IPv6-over-IPv4 configured tunnel. -.Nm -can also tunnel ISO traffic over IPv[46] using EON encapsulation. .Pp To use .Nm gif , @@ -131,7 +129,7 @@ Note that the ECN friendly behavior viol This should be used in mutual agreement with the peer. .Ss Packet format Every inner packet is encapsulated in an outer packet. -The inner packet may be IPv4, IPv6, or ISO CLNP. +The inner packet may be IPv4 or IPv6. The outer packet may be IPv4 or IPv6, and has all the usual IP headers, including a protocol field that identifies the type of inner packet. @@ -142,9 +140,6 @@ is 4 When the inner packet is IPv6, the protocol field of the outer packet is 41 .Dv ( IPPROTO_IPV6 ) . -When the inner packet is ISO CNLP, the protocol field of the outer packet -is 80 -.Dv ( IPPROTO_EON ) . .Ss Security Malicious party may try to circumvent security filters by using tunneled packets.
CVS commit: src/external/bsd/nvi/dist/common
Module Name:src Committed By: rin Date: Wed Aug 1 02:48:47 UTC 2018 Modified Files: src/external/bsd/nvi/dist/common: conv.h Log Message: As described in comments, we treat non-spacing chars as single-width ones. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/common/conv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nvi/dist/common/conv.h diff -u src/external/bsd/nvi/dist/common/conv.h:1.3 src/external/bsd/nvi/dist/common/conv.h:1.4 --- src/external/bsd/nvi/dist/common/conv.h:1.3 Sun Jun 3 08:08:36 2018 +++ src/external/bsd/nvi/dist/common/conv.h Wed Aug 1 02:48:47 2018 @@ -1,11 +1,11 @@ -/* $NetBSD: conv.h,v 1.3 2018/06/03 08:08:36 rin Exp $ */ +/* $NetBSD: conv.h,v 1.4 2018/08/01 02:48:47 rin Exp $ */ /* * We ensure that every wide char occupies at least one display width. * See vs_line.c for more details. */ #define WIDE_COL(sp, ch) \ - (CHAR_WIDTH(sp, ch) >= 0 ? CHAR_WIDTH(sp, ch) : 1) + (CHAR_WIDTH(sp, ch) > 0 ? CHAR_WIDTH(sp, ch) : 1) #define KEY_COL(sp, ch) \ (INTISWIDE(ch) ? (size_t)WIDE_COL(sp, ch) : KEY_LEN(sp, ch))
CVS commit: src/lib/libc/sys
Module Name:src Committed By: sevan Date: Tue Jul 31 22:28:26 UTC 2018 Modified Files: src/lib/libc/sys: getsockopt.2 Log Message: Remove ISO references To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/lib/libc/sys/getsockopt.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/getsockopt.2 diff -u src/lib/libc/sys/getsockopt.2:1.36 src/lib/libc/sys/getsockopt.2:1.37 --- src/lib/libc/sys/getsockopt.2:1.36 Tue Jul 31 13:04:10 2018 +++ src/lib/libc/sys/getsockopt.2 Tue Jul 31 22:28:26 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: getsockopt.2,v 1.36 2018/07/31 13:04:10 rjs Exp $ +.\" $NetBSD: getsockopt.2,v 1.37 2018/07/31 22:28:26 sevan Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\" -.Dd January 23, 2012 +.Dd July 31, 2018 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -120,7 +120,6 @@ Options at other protocol levels vary in name; consult the appropriate entries in section 4 of the manual, including: -.Xr clnp 4 , .Xr faith 4 , .Xr icmp6 4 , .Xr ip 4 , @@ -130,7 +129,6 @@ section .Xr pim 4 , .Xr route 4 , .Xr tcp 4 , -.Xr tp 4 , and .Xr unix 4 . .Pp @@ -441,7 +439,6 @@ is a file, not a socket. .Xr select 2 , .Xr socket 2 , .Xr getprotoent 3 , -.Xr clnp 4 , .Xr faith 4 , .Xr icmp6 4 , .Xr ip 4 , @@ -451,7 +448,6 @@ is a file, not a socket. .Xr pim 4 , .Xr route 4 , .Xr tcp 4 , -.Xr tp 4 , .Xr unix 4 , .Xr protocols 5 , .Xr accept_filter 9
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: kre Date: Tue Jul 31 22:29:55 UTC 2018 Modified Files: src/distrib/sets/lists/debug: shl.mi Log Message: debug versions of libraries need minor version bump to match the non-debug versions (bump for getsockopt2().) Arguably this dependency ought to be handled by automation rather than relying upon developers "just knowing" when the debug sets need updating. To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.201 src/distrib/sets/lists/debug/shl.mi:1.202 --- src/distrib/sets/lists/debug/shl.mi:1.201 Thu Jun 28 10:14:01 2018 +++ src/distrib/sets/lists/debug/shl.mi Tue Jul 31 22:29:55 2018 @@ -1,8 +1,8 @@ -# $NetBSD: shl.mi,v 1.201 2018/06/28 10:14:01 christos Exp $ +# $NetBSD: shl.mi,v 1.202 2018/07/31 22:29:55 kre Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libc.so.12.209.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libc.so.12.210.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypto.so.12.0.debug comp-sys-debug debug,dynamicroot,openssl=10 ./usr/libdata/debug/lib/libcrypto.so.13.0.debug comp-sys-debug debug,dynamicroot,openssl=11 @@ -72,7 +72,7 @@ ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libc++.so.1.0.debug comp-sys-debug debug,compatfile,libcxx -./usr/libdata/debug/usr/lib/libc.so.12.209.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libc.so.12.210.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcom_err.so.8.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcrypto.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10
CVS commit: src/sbin/route
Module Name:src Committed By: sevan Date: Tue Jul 31 21:22:09 UTC 2018 Modified Files: src/sbin/route: route.8 Log Message: Remove references to XNS To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sbin/route/route.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/route/route.8 diff -u src/sbin/route/route.8:1.60 src/sbin/route/route.8:1.61 --- src/sbin/route/route.8:1.60 Tue Jul 4 06:54:20 2017 +++ src/sbin/route/route.8 Tue Jul 31 21:22:09 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: route.8,v 1.60 2017/07/04 06:54:20 wiz Exp $ +.\" $NetBSD: route.8,v 1.61 2018/07/31 21:22:09 sevan Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)route.8 8.4 (Berkeley) 6/1/94 .\" -.Dd June 16, 2017 +.Dd July 31, 2018 .Dt ROUTE 8 .Os .Sh NAME @@ -164,7 +164,6 @@ command is specified, .Nm will ``flush'' the routing tables of all gateway entries. When the address family is specified by any of the -.Fl xns , .Fl atalk , .Fl inet , .Fl inet6 , @@ -244,15 +243,12 @@ the gateway given is the address of this indicating the interface to be used for transmission. .Pp The optional modifiers -.Fl xns , .Fl atalk , and .Fl link specify that all subsequent addresses are in the -.Tn XNS , -or .Tn AppleTalk -address families, +address family, or are specified as link-level addresses in the form described in .Xr link_addr 3 , and the names must be numeric specifications rather than @@ -429,7 +425,6 @@ These privileges are enforced by the ker .Xr route 4 , .Xr routed 8 , .Xr sysctl 8 -.\" .Xr XNSrouted 8 .Sh HISTORY The .Nm
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rjs
Date: Tue Jul 31 21:02:01 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.135 -r1.136 src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.134 -r1.135 src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.133 -r1.134 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/netbsd32/netbsd32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.136 src/sys/compat/netbsd32/netbsd32_syscall.h:1.137
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.136 Thu Jul 12 10:46:48 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Jul 31 21:02:00 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.136 2018/07/12 10:46:48 maxv Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.137 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -518,6 +518,9 @@
/* syscall: "netbsd32_fpathconf" ret: "netbsd32_long" args: "int" "int" */
#define NETBSD32_SYS_netbsd32_fpathconf 192
+/* syscall: "netbsd32_getsockopt2" ret: "int" args: "int" "int" "int" "netbsd32_voidp" "netbsd32_intp" */
+#define NETBSD32_SYS_netbsd32_getsockopt2 193
+
/* syscall: "netbsd32_getrlimit" ret: "int" args: "int" "netbsd32_rlimitp_t" */
#define NETBSD32_SYS_netbsd32_getrlimit 194
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.135 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.136
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.135 Thu May 10 02:36:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Jul 31 21:02:00 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.135 2018/05/10 02:36:26 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.136 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -967,6 +967,15 @@ struct netbsd32_fpathconf_args {
};
check_syscall_args(netbsd32_fpathconf)
+struct netbsd32_getsockopt2_args {
+ syscallarg(int) s;
+ syscallarg(int) level;
+ syscallarg(int) name;
+ syscallarg(netbsd32_voidp) val;
+ syscallarg(netbsd32_intp) avalsize;
+};
+check_syscall_args(netbsd32_getsockopt2)
+
struct netbsd32_getrlimit_args {
syscallarg(int) which;
syscallarg(netbsd32_rlimitp_t) rlp;
@@ -2941,6 +2950,8 @@ int netbsd32_pathconf(struct lwp *, cons
int netbsd32_fpathconf(struct lwp *, const struct netbsd32_fpathconf_args *, register_t *);
+int netbsd32_getsockopt2(struct lwp *, const struct netbsd32_getsockopt2_args *, register_t *);
+
int netbsd32_getrlimit(struct lwp *, const struct netbsd32_getrlimit_args *, register_t *);
int netbsd32_setrlimit(struct lwp *, const struct netbsd32_setrlimit_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.134 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.135
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.134 Thu Jul 12 10:46:48 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Jul 31 21:02:00 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.134 2018/07/12 10:46:48 maxv Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.135 2018/07/31 21:02:00 rjs Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.121 2018/05/10 02:36:07 christos Exp
+ * created from NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.134 2018/07/12 10:46:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.135 2018/07/31 21:02:00 rjs Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -226,7 +226,7 @@ const char *const netbsd32_syscallnames[
/* 190 */ "compat_12_netbsd32_lstat12",
/* 191 */ "netbsd32_pathconf",
/* 192 */ "netbsd32_fpathconf",
- /* 193 */ "#193 (unimplemented)",
+ /* 193 */ "
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rjs
Date: Tue Jul 31 21:00:02 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c syscalls.master
Log Message:
Add getsockopt2().
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.122 -r1.123 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.216 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.217
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.216 Sun May 6 13:40:51 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Jul 31 21:00:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.216 2018/05/06 13:40:51 kamil Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.217 2018/07/31 21:00:02 rjs Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.216 2018/05/06 13:40:51 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.217 2018/07/31 21:00:02 rjs Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -1040,6 +1040,26 @@ netbsd32_getsockopt(struct lwp *l, const
}
int
+netbsd32_getsockopt2(struct lwp *l, const struct netbsd32_getsockopt2_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(int) s;
+ syscallarg(int) level;
+ syscallarg(int) name;
+ syscallarg(netbsd32_voidp) val;
+ syscallarg(netbsd32_intp) avalsize;
+ } */
+ struct sys_getsockopt2_args ua;
+
+ NETBSD32TO64_UAP(s);
+ NETBSD32TO64_UAP(level);
+ NETBSD32TO64_UAP(name);
+ NETBSD32TOP_UAP(val, void);
+ NETBSD32TOP_UAP(avalsize, socklen_t);
+ return (sys_getsockopt2(l, &ua, retval));
+}
+
+int
netbsd32_rename(struct lwp *l, const struct netbsd32_rename_args *uap, register_t *retval)
{
/* {
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.122 src/sys/compat/netbsd32/syscalls.master:1.123
--- src/sys/compat/netbsd32/syscalls.master:1.122 Thu Jul 12 10:46:48 2018
+++ src/sys/compat/netbsd32/syscalls.master Tue Jul 31 21:00:02 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.122 2018/07/12 10:46:48 maxv Exp $
+ $NetBSD: syscalls.master,v 1.123 2018/07/31 21:00:02 rjs Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -384,7 +384,8 @@
191 STD { netbsd32_long|netbsd32||pathconf(netbsd32_charp path, \
int name); }
192 STD { netbsd32_long|netbsd32||fpathconf(int fd, int name); }
-193 UNIMPL
+193 STD { int|netbsd32||getsockopt2(int s, int level, int name, \
+ netbsd32_voidp val, netbsd32_intp avalsize); }
194 STD { int|netbsd32||getrlimit(int which, \
netbsd32_rlimitp_t rlp); }
195 STD { int|netbsd32||setrlimit(int which, \
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: sevan Date: Tue Jul 31 20:54:18 UTC 2018 Modified Files: src/sbin/ifconfig: ifconfig.8 Log Message: Remove ISO & XNS references which are now long gone. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sbin/ifconfig/ifconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/ifconfig/ifconfig.8 diff -u src/sbin/ifconfig/ifconfig.8:1.114 src/sbin/ifconfig/ifconfig.8:1.115 --- src/sbin/ifconfig/ifconfig.8:1.114 Thu Feb 16 13:51:08 2017 +++ src/sbin/ifconfig/ifconfig.8 Tue Jul 31 20:54:18 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: ifconfig.8,v 1.114 2017/02/16 13:51:08 wiz Exp $ +.\" $NetBSD: ifconfig.8,v 1.115 2018/07/31 20:54:18 sevan Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94 .\" -.Dd January 19, 2017 +.Dd July 31, 2018 .Dt IFCONFIG 8 .Os .Sh NAME @@ -89,29 +89,6 @@ or a .Tn DARPA Internet address expressed in the Internet standard .Dq dot notation . -For the Xerox Network Systems(tm) family, -addresses are -.Ar net:a.b.c.d.e.f , -where -.Ar net -is the assigned network number -.Pq in decimal , -and each of the six bytes of the host number, -.Ar a -through -.Ar f , -are specified in hexadecimal. -The host number may be omitted on Ethernet interfaces, -which use the hardware physical address, -and on interfaces other than the first. -For the -.Tn ISO -family, addresses are specified as a long hexadecimal string, -as in the Xerox family. -However, two consecutive dots imply a zero -byte, and the dots are optional, if the user wishes to -.Pq carefully -count out long strings of digits in network byte order. .It Ar address_family Specifies the .Ar address_family @@ -123,7 +100,6 @@ supported are .Dq inet , .Dq inet6 , .Dq atalk , -.Dq iso , and .Dq link . .It Ar interface @@ -237,15 +213,6 @@ marked ``down'', the system will not att transmit messages through that interface. If possible, the interface will be reset to disable reception as well. This action does not automatically disable routes using the interface. -.It Cm ipdst -This is used to specify an Internet host who is willing to receive -ip packets encapsulating NS packets bound for a remote network. -An apparent point to point link is constructed, and -the address specified will be taken as the NS address and network -of the destination. -IP encapsulation of -.Tn CLNP -packets is done differently. .It Cm media Ar type Set the media type of the interface to .Ar type . @@ -318,7 +285,7 @@ Set the maximum transmission unit of the .Ar n . Most interfaces do not support this option. .It Cm netmask Ar mask -.Pq inet, inet6, and ISO +.Pq inet and inet6 Specify how much of the address to reserve for subdividing networks into sub-networks. The mask includes the network part of the local address @@ -339,31 +306,6 @@ slash-notation after the address .Pq e.g 192.168.17.3/24 . .\" see .\" Xr eon 5 . -.It Cm nsellength Ar n -.Pf ( Tn ISO -only) -This specifies a trailing number of bytes for a received -.Tn NSAP -used for local identification, the remaining leading part of which is -taken to be the -.Tn NET -.Pq Network Entity Title . -The default value is 1, which is conformant to US -.Tn GOSIP . -When an ISO address is set in an ifconfig command, -it is really the -.Tn NSAP -which is being specified. -For example, in -.Tn US GOSIP , -20 hex digits should be -specified in the -.Tn ISO NSAP -to be assigned to the interface. -There is some evidence that a number different from 1 may be useful -for -.Tn AFI -37 type addresses. .It Cm state Ar state Explicitly force the .Xr carp 4
CVS commit: src/doc
Module Name:src Committed By: darcy Date: Tue Jul 31 20:33:06 UTC 2018 Modified Files: src/doc: TODO.npf Log Message: Suggest command line variables. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/doc/TODO.npf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.npf diff -u src/doc/TODO.npf:1.3 src/doc/TODO.npf:1.4 --- src/doc/TODO.npf:1.3 Tue Jul 31 19:43:24 2018 +++ src/doc/TODO.npf Tue Jul 31 20:33:06 2018 @@ -53,3 +53,5 @@ Another TODO list is available here: -- support large IPv6 options, as explained here: http://mail-index.netbsd.org/tech-net/2018/04/08/msg006786.html But it's not a big problem - perhaps we don't care at all. + +-- add command line variables. See -D option in pf.
CVS commit: src/doc
Module Name:src Committed By: maxv Date: Tue Jul 31 19:43:24 UTC 2018 Modified Files: src/doc: TODO.npf Log Message: Add new item, about deprecating IPF/PF; I thought it was there, but realized it wasn't. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/doc/TODO.npf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.npf diff -u src/doc/TODO.npf:1.2 src/doc/TODO.npf:1.3 --- src/doc/TODO.npf:1.2 Tue Apr 10 06:32:23 2018 +++ src/doc/TODO.npf Tue Jul 31 19:43:24 2018 @@ -8,6 +8,9 @@ Another TODO list is available here: -- add more examples +-- modify the doc of IPF and PF to indicate they are deprecated, and that + NPF should be used instead + == NPFCTL == -- npfctl start does not load the configuration if not loaded.
CVS commit: src
Module Name:src Committed By: rjs Date: Tue Jul 31 19:30:19 UTC 2018 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Added Files: src/share/man/man4: sctp.4 Log Message: Add man page for sctp(4). To generate a diff of this commit: cvs rdiff -u -r1.1603 -r1.1604 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.661 -r1.662 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/sctp.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1603 src/distrib/sets/lists/man/mi:1.1604 --- src/distrib/sets/lists/man/mi:1.1603 Tue Jul 31 16:44:29 2018 +++ src/distrib/sets/lists/man/mi Tue Jul 31 19:30:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1603 2018/07/31 16:44:29 khorben Exp $ +# $NetBSD: mi,v 1.1604 2018/07/31 19:30:18 rjs Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4724,6 +4724,7 @@ ./usr/share/man/html4/schide.html man-sys-htmlman html ./usr/share/man/html4/scsi.html man-sys-htmlman html ./usr/share/man/html4/scsibus.html man-sys-htmlman html +./usr/share/man/html4/sctp.html man-sys-htmlman html ./usr/share/man/html4/sd.html man-sys-htmlman html ./usr/share/man/html4/sdhc.html man-sys-htmlman html ./usr/share/man/html4/sdmmc.html man-sys-htmlman html @@ -7712,6 +7713,7 @@ ./usr/share/man/man4/schide.4 man-sys-man .man ./usr/share/man/man4/scsi.4 man-sys-man .man ./usr/share/man/man4/scsibus.4 man-sys-man .man +./usr/share/man/man4/sctp.4 man-sys-man .man ./usr/share/man/man4/sd.4 man-sys-man .man ./usr/share/man/man4/sdhc.4 man-sys-man .man ./usr/share/man/man4/sdmmc.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.661 src/share/man/man4/Makefile:1.662 --- src/share/man/man4/Makefile:1.661 Tue Jul 31 16:44:29 2018 +++ src/share/man/man4/Makefile Tue Jul 31 19:30:19 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.661 2018/07/31 16:44:29 khorben Exp $ +# $NetBSD: Makefile,v 1.662 2018/07/31 19:30:19 rjs Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -55,7 +55,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a raid.4 ral.4 ray.4 rcons.4 rdcphy.4 re.4 rgephy.4 rlphy.4 \ rnd.4 route.4 rs5c372rtc.4 rtk.4 rtsx.4 rtw.4 rtwn.4 rum.4 run.4 \ s390rtc.4 satalink.4 sbus.4 schide.4 \ - scsi.4 sd.4 se.4 seeprom.4 sem.4 \ + scsi.4 sctp.4 sd.4 se.4 seeprom.4 sem.4 \ ses.4 sf.4 sfb.4 sgsmix.4 shb.4 shmif.4 shpcic.4 si70xxtemp.4 \ siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \ sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \ Added files: Index: src/share/man/man4/sctp.4 diff -u /dev/null src/share/man/man4/sctp.4:1.1 --- /dev/null Tue Jul 31 19:30:19 2018 +++ src/share/man/man4/sctp.4 Tue Jul 31 19:30:19 2018 @@ -0,0 +1,436 @@ +.\" $NetBSD: sctp.4,v 1.1 2018/07/31 19:30:19 rjs Exp $ +.\" +.\" Copyright (c) 2006, Randall Stewart. +.\" +.\" 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. +.\" 3. All advertising materials mentioning features or use of this software +.\"must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\"may be used to endorse or promote products derived from this software +.\"without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +.\" +.Dd July 31, 2018 +.Dt SCTP 4 +.Os +.Sh NAME +.Nm sctp +.Nd Internet Stream Control Transmission P
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 17:09:45 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #951, #952, #954, #955, #957 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.5 src/doc/CHANGES-8.1:1.1.2.6 --- src/doc/CHANGES-8.1:1.1.2.5 Tue Jul 31 16:11:46 2018 +++ src/doc/CHANGES-8.1 Tue Jul 31 17:09:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.5 2018/07/31 16:11:46 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.6 2018/07/31 17:09:45 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -265,3 +265,33 @@ sys/arch/sun3/dev/if_ie.c 1.64 Remove bpf_tap() in iexmit() because ie_start() does bpf_mtap(). [msaitoh, ticket #948] +sys/dev/ic/rt2661.c1.38 + + bpf_mtap*() before ieee80211_encap() should be bpf_mtap() rather than + bpf_mtap3(). + [msaitoh, ticket #951] + +sys/dev/ic/malo.c1.11 + + bpf_mtap*() after ieee80211_encap() should be bpf_mtap3() rather than + bpf_mtap(). + [msaitoh, ticket #952] + +share/man/man4/ddb.41.180,1.181 +sys/ddb/db_command.c1.154 +sys/kern/uipc_socket2.c1.131 +sys/sys/socketvar.h1.157 + + Add "show socket" command to ddb(4). + [msaitoh, ticket #954] + +sys/dev/ppbus/if_plip.c1.29 + + KNF & fix typo. No functional change. + [msaitoh, ticket #955] + +usr.sbin/arp/arp.c1.63 + + arp(8): Fix the host output with -dav argument. + [nonaka, ticket #957] +
CVS commit: [netbsd-8] src/usr.sbin/arp
Module Name:src
Committed By: martin
Date: Tue Jul 31 17:08:00 UTC 2018
Modified Files:
src/usr.sbin/arp [netbsd-8]: arp.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #957):
usr.sbin/arp/arp.c: revision 1.63
arp(8): Fix the host output when arp -dav.
To generate a diff of this commit:
cvs rdiff -u -r1.55.8.3 -r1.55.8.4 src/usr.sbin/arp/arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/arp/arp.c
diff -u src/usr.sbin/arp/arp.c:1.55.8.3 src/usr.sbin/arp/arp.c:1.55.8.4
--- src/usr.sbin/arp/arp.c:1.55.8.3 Fri Jul 27 09:55:50 2018
+++ src/usr.sbin/arp/arp.c Tue Jul 31 17:08:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.c,v 1.55.8.3 2018/07/27 09:55:50 martin Exp $ */
+/* $NetBSD: arp.c,v 1.55.8.4 2018/07/31 17:08:00 martin Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 19
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: arp.c,v 1.55.8.3 2018/07/27 09:55:50 martin Exp $");
+__RCSID("$NetBSD: arp.c,v 1.55.8.4 2018/07/31 17:08:00 martin Exp $");
#endif
#endif /* not lint */
@@ -493,6 +493,7 @@ void
delete(const char *host, const char *info)
{
int mib[6];
+ char addr[sizeof("000.000.000.000\0")];
size_t needed;
char *lim, *buf, *next;
struct rt_msghdr *rtm;
@@ -539,8 +540,10 @@ retry:
found = true;
ret = delete_one(rtm);
if (vflag && ret == 0) {
- (void)printf("%s (%s) deleted\n", host,
+ snprintf(addr, sizeof(addr), "%s",
inet_ntoa(sina->sin_addr));
+ (void)printf("%s (%s) deleted\n",
+ host != NULL ? host : addr, addr);
}
}
if (host != NULL && !found)
CVS commit: [netbsd-8] src/sys/dev/ppbus
Module Name:src
Committed By: martin
Date: Tue Jul 31 17:03:50 UTC 2018
Modified Files:
src/sys/dev/ppbus [netbsd-8]: if_plip.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #955):
sys/dev/ppbus/if_plip.c: revision 1.29
KNF & fix typo. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.27.10.1 -r1.27.10.2 src/sys/dev/ppbus/if_plip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ppbus/if_plip.c
diff -u src/sys/dev/ppbus/if_plip.c:1.27.10.1 src/sys/dev/ppbus/if_plip.c:1.27.10.2
--- src/sys/dev/ppbus/if_plip.c:1.27.10.1 Thu Mar 8 14:35:53 2018
+++ src/sys/dev/ppbus/if_plip.c Tue Jul 31 17:03:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.27.10.1 2018/03/08 14:35:53 martin Exp $ */
+/* $NetBSD: if_plip.c,v 1.27.10.2 2018/07/31 17:03:50 martin Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.27.10.1 2018/03/08 14:35:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.27.10.2 2018/07/31 17:03:50 martin Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_plip.c,v
* This driver sends two bytes (0x08, 0x00) in front of each packet,
* to allow us to distinguish another format later.
*
- * Now added an Linux/Crynwr compatibility mode which is enabled using
+ * Now added a Linux/Crynwr compatibility mode which is enabled using
* IF_LINK0 - Tim Wilkinson.
*
* TODO:
@@ -194,7 +194,7 @@ static void lpinittables(void);
static void lpfreetables(void);
static int lpioctl(struct ifnet *, u_long, void *);
static int lpoutput(struct ifnet *, struct mbuf *, const struct sockaddr *,
- const struct rtentry *);
+const struct rtentry *);
static void lpstart(struct ifnet *);
static void lp_intr(void *);
@@ -205,7 +205,7 @@ lp_probe(device_t parent, cfdata_t match
struct ppbus_attach_args * args = aux;
/* Fail if ppbus is not interrupt capable */
- if(args->capabilities & PPBUS_HAS_INTR)
+ if (args->capabilities & PPBUS_HAS_INTR)
return 1;
printf("%s(%s): not an interrupt-driven port.\n", __func__,
@@ -243,7 +243,7 @@ lp_attach(device_t parent, device_t self
bpf_attach(ifp, DLT_NULL, sizeof(u_int32_t));
- if(lp_count++ == 0)
+ if (lp_count++ == 0)
lpinittables();
printf("\n");
}
@@ -255,8 +255,8 @@ lp_detach(device_t self, int flags)
struct lp_softc * lp = device_private(self);
device_t ppbus = device_parent(self);
- if(lp->sc_dev_ok) {
- if(!(flags & DETACH_QUIET))
+ if (lp->sc_dev_ok) {
+ if (!(flags & DETACH_QUIET))
LP_PRINTF("%s(%s): device not properly attached! "
"Skipping detach\n", __func__,
device_xname(self));
@@ -264,33 +264,33 @@ lp_detach(device_t self, int flags)
}
/* If interface is up, bring it down and release ppbus */
- if(lp->sc_if.if_flags & IFF_RUNNING) {
+ if (lp->sc_if.if_flags & IFF_RUNNING) {
ppbus_wctr(ppbus, 0x00);
if_detach(&lp->sc_if);
error = ppbus_remove_handler(ppbus, lp_intr);
- if(error) {
- if(!(flags & DETACH_QUIET))
+ if (error) {
+ if (!(flags & DETACH_QUIET))
LP_PRINTF("%s(%s): unable to remove interrupt "
"callback.\n", __func__,
device_xname(self));
- if(!(flags & DETACH_FORCE))
+ if (!(flags & DETACH_FORCE))
return error;
}
error = ppbus_release_bus(ppbus, self, 0, 0);
- if(error) {
- if(!(flags & DETACH_QUIET))
+ if (error) {
+ if (!(flags & DETACH_QUIET))
LP_PRINTF("%s(%s): error releasing bus %s.\n",
__func__, device_xname(self),
device_xname(ppbus));
- if(!(flags & DETACH_FORCE))
+ if (!(flags & DETACH_FORCE))
return error;
}
}
- if(lp->sc_ifbuf)
+ if (lp->sc_ifbuf)
free(lp->sc_ifbuf, M_DEVBUF);
- if(--lp_count == 0)
+ if (--lp_count == 0)
lpfreetables();
return error;
}
@@ -301,7 +301,7 @@ lp_detach(device_t self, int flags)
* precalculate them when we initialize.
*/
static void
-lpinittables (void)
+lpinittables(void)
{
int i;
@@ -311,14 +311,14 @@ lpinittables (void)
if (!ctxmith)
ctxmith = malloc(4*LPIPTBLSIZE, M_DEVBUF, M_WAITOK);
- for(i = 0; i < LPIPTBLSIZE; i++) {
+ for (i = 0; i < LPIPTBLSIZE; i++) {
ctxmith[i] = (i & 0xF0) >> 4;
ctxmitl[i] = 0x10 | (i & 0x0F);
ctrecvh[i] = (i & 0x78) << 1;
ctrecvl[i] = (i & 0x78) >> 3;
}
- for(i = 0; i < LPIPTBLSIZE; i++) {
+ for (i = 0; i < LPIPTBLSIZE; i++) {
txmith[i] = ((i & 0x80) >> 3) | ((i & 0x70) >> 4) | 0x08;
txmitl[i] = ((i & 0x08) << 1) | (i & 0x07);
trecvh[i] = ((~i) & 0x80) | ((i & 0x38) << 1);
@@ -328,7 +328,7 @@ lpinittables (void)
/* Free translation tables */
static void
-lpfreetables (void)
+lpfreetables(void)
{
if (txmith)
free(txmith, M_DEVBUF);
@@ -353,7 +353,7 @@ lpioctl(struct ifnet *ifp, u_long cmd, v
error = 0;
s = spln
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Tue Jul 31 17:01:20 UTC 2018
Modified Files:
src/share/man/man4 [netbsd-8]: ddb.4
src/sys/ddb [netbsd-8]: db_command.c
src/sys/kern [netbsd-8]: uipc_socket2.c
src/sys/sys [netbsd-8]: socketvar.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #954):
sys/sys/socketvar.h: revision 1.157
share/man/man4/ddb.4: revision 1.180
share/man/man4/ddb.4: revision 1.181
sys/kern/uipc_socket2.c: revision 1.131
sys/ddb/db_command.c: revision 1.154
Add "show socket" command written by Hiroki SUENAGA. It prints usage of
system's socket buffers.
Improve wording.
To generate a diff of this commit:
cvs rdiff -u -r1.166.6.1 -r1.166.6.2 src/share/man/man4/ddb.4
cvs rdiff -u -r1.148.8.1 -r1.148.8.2 src/sys/ddb/db_command.c
cvs rdiff -u -r1.124.8.2 -r1.124.8.3 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.144.6.3 -r1.144.6.4 src/sys/sys/socketvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/ddb.4
diff -u src/share/man/man4/ddb.4:1.166.6.1 src/share/man/man4/ddb.4:1.166.6.2
--- src/share/man/man4/ddb.4:1.166.6.1 Mon Apr 2 09:07:52 2018
+++ src/share/man/man4/ddb.4 Tue Jul 31 17:01:20 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ddb.4,v 1.166.6.1 2018/04/02 09:07:52 martin Exp $
+.\" $NetBSD: ddb.4,v 1.166.6.2 2018/07/31 17:01:20 martin Exp $
.\"
.\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -56,7 +56,7 @@
.\" any improvements or extensions that they make and grant Carnegie Mellon
.\" the rights to redistribute these changes.
.\"
-.Dd March 19, 2018
+.Dd July 31, 2018
.Dt DDB 4
.Os
.Sh NAME
@@ -750,6 +750,25 @@ of LWPs will be shown.
If the run queue has LWPs, but the sched_whichqs bit is not set for that
queue, the queue index will be prefixed with a
.Sq \&! .
+.It Ic show socket Ns Oo Cm /ampv Oc
+Print usage of system's socket buffers.
+By default, empty sockets aren't printed.
+.Bl -tag -width 4n -compact
+.It Cm /a
+Print all processes which use the socket.
+.It Cm /m
+Print mbuf chain in the socket buffer.
+.It Cm /p
+By default, a process which uses the socket is printed (only one socket).
+If
+.Cm /p
+is specified, the process isn't printed.
+.It Cm /v
+Verbose mode.
+If
+.Cm /v
+is specified, all sockets are printed.
+.El
.It Ic show uvmexp
Print a selection of UVM counters and statistics.
.It Ic show kernhist Oo Ar addr Oc
Index: src/sys/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.148.8.1 src/sys/ddb/db_command.c:1.148.8.2
--- src/sys/ddb/db_command.c:1.148.8.1 Mon Apr 2 09:07:52 2018
+++ src/sys/ddb/db_command.c Tue Jul 31 17:01:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.148.8.1 2018/04/02 09:07:52 martin Exp $ */
+/* $NetBSD: db_command.c,v 1.148.8.2 2018/07/31 17:01:20 martin Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.148.8.1 2018/04/02 09:07:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.148.8.2 2018/07/31 17:01:20 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -89,6 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_command.c
#include
#include
#include
+#include
/*include queue macros*/
#include
@@ -203,6 +204,7 @@ static void db_show_all_pages(db_expr_t,
static void db_pool_print_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_reboot_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_sifting_cmd(db_expr_t, bool, db_expr_t, const char *);
+static void db_socket_print_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_stack_trace_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_sync_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_whatis_cmd(db_expr_t, bool, db_expr_t, const char *);
@@ -256,6 +258,7 @@ static const struct db_command db_show_c
"Print statistics of locks", NULL, NULL) },
{ DDB_ADD_CMD("map", db_map_print_cmd, 0,
"Print the vm_map at address.", "[/f] address",NULL) },
+ { DDB_ADD_CMD("socket", db_socket_print_cmd, 0,NULL,NULL,NULL) },
{ DDB_ADD_CMD("module", db_show_module_cmd, 0,
"Print kernel modules", NULL, NULL) },
{ DDB_ADD_CMD("mount", db_mount_print_cmd, 0,
@@ -1210,6 +1213,17 @@ db_uvmexp_print_cmd(db_expr_t addr, bool
#endif
}
+/*ARGSUSED */
+static void
+db_socket_print_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
+const char *modif)
+{
+
+#ifdef _KERNEL /* XXX CRASH(8) */
+ socket_print(modif, db_printf);
+#endif
+}
+
#ifdef KERNHIST
/*ARGSUSED*/
static void
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.124.8.2 src/sys/kern/uipc_socket2.c:1.124.8.3
--- src/sys/kern/uipc_socket2.c:1.124.8.2 Sat Jun 9 15:16:30 2018
+++ src/sys/kern/uipc_socket2.c Tue Jul
CVS commit: src/sys/netinet
Module Name:src
Committed By: rjs
Date: Tue Jul 31 16:28:56 UTC 2018
Modified Files:
src/sys/netinet: sctp_usrreq.c
Log Message:
Enable SCTP sysctl nodes.
Rename auto asconf one to match FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/sctp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/sctp_usrreq.c
diff -u src/sys/netinet/sctp_usrreq.c:1.11 src/sys/netinet/sctp_usrreq.c:1.12
--- src/sys/netinet/sctp_usrreq.c:1.11 Tue Jul 31 13:36:31 2018
+++ src/sys/netinet/sctp_usrreq.c Tue Jul 31 16:28:56 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp_usrreq.c,v 1.50 2005/06/16 20:45:29 jinmei Exp $ */
-/* $NetBSD: sctp_usrreq.c,v 1.11 2018/07/31 13:36:31 rjs Exp $ */
+/* $NetBSD: sctp_usrreq.c,v 1.12 2018/07/31 16:28:56 rjs Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.11 2018/07/31 13:36:31 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.12 2018/07/31 16:28:56 rjs Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -131,12 +131,16 @@ unsigned int sctp_assoc_rtx_max_default
unsigned int sctp_path_rtx_max_default = SCTP_DEF_MAX_SEND/2;
unsigned int sctp_nr_outgoing_streams_default = SCTP_OSTREAM_INITIAL;
+static void sysctl_net_inet_sctp_setup(struct sysctllog **);
+
void
sctp_init(void)
{
/* Init the SCTP pcb in sctp_pcb.c */
u_long sb_max_adj;
+ sysctl_net_inet_sctp_setup(NULL);
+
sctp_pcb_init();
if (nmbclusters > SCTP_ASOC_MAX_CHUNKS_ON_QUEUE)
@@ -3882,7 +3886,8 @@ sctp_purgeif(struct socket *so, struct i
/*
* Sysctl for sctp variables.
*/
-SYSCTL_SETUP(sysctl_net_inet_sctp_setup, "sysctl net.inet.sctp subtree setup")
+static void
+sysctl_net_inet_sctp_setup(struct sysctllog **clog)
{
sysctl_createv(clog, 0, NULL, NULL,
@@ -3920,7 +3925,7 @@ SYSCTL_SETUP(sysctl_net_inet_sctp_setup,
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
- CTLTYPE_INT, "autoasconf",
+ CTLTYPE_INT, "auto_asconf",
SYSCTL_DESCR("Enable SCTP Auto-ASCONF"),
NULL, 0, &sctp_auto_asconf, 0,
CTL_NET, PF_INET, IPPROTO_SCTP, SCTPCTL_AUTOASCONF,
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Jul 31 16:22:51 UTC 2018
Modified Files:
src/sys/dev/ic [netbsd-8]: malo.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #952):
sys/dev/ic/malo.c: revision 1.11
bpf_mtap*() after ieee80211_encap() should be bpf_mtap3() rather than
bpf_mtap(). bpf_mtap3() is for raw bpf.
To generate a diff of this commit:
cvs rdiff -u -r1.9.6.1 -r1.9.6.2 src/sys/dev/ic/malo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/malo.c
diff -u src/sys/dev/ic/malo.c:1.9.6.1 src/sys/dev/ic/malo.c:1.9.6.2
--- src/sys/dev/ic/malo.c:1.9.6.1 Sun Dec 10 10:10:23 2017
+++ src/sys/dev/ic/malo.c Tue Jul 31 16:22:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: malo.c,v 1.9.6.1 2017/12/10 10:10:23 snj Exp $ */
+/* $NetBSD: malo.c,v 1.9.6.2 2018/07/31 16:22:51 martin Exp $ */
/* $OpenBSD: malo.c,v 1.92 2010/08/27 17:08:00 jsg Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.9.6.1 2017/12/10 10:10:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.9.6.2 2018/07/31 16:22:51 martin Exp $");
#include
#include
@@ -1074,7 +1074,7 @@ malo_start(struct ifnet *ifp)
m0 = ieee80211_encap(ic, m0, ni);
if (m0 == NULL)
continue;
- bpf_mtap(ifp, m0);
+ bpf_mtap3(ic->ic_rawbpf, m0);
if (malo_tx_data(sc, m0, ni) != 0) {
ieee80211_free_node(ni);
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Jul 31 16:20:33 UTC 2018
Modified Files:
src/sys/dev/ic [netbsd-8]: rt2661.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #951):
sys/dev/ic/rt2661.c: revision 1.38
bpf_mtap*() before ieee80211_encap() should be bpf_mtap() rather than
bpf_mtap3(). bpf_mtap3() is for raw bpf and be used after ieee80211_encap().
To generate a diff of this commit:
cvs rdiff -u -r1.35.2.1 -r1.35.2.2 src/sys/dev/ic/rt2661.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rt2661.c
diff -u src/sys/dev/ic/rt2661.c:1.35.2.1 src/sys/dev/ic/rt2661.c:1.35.2.2
--- src/sys/dev/ic/rt2661.c:1.35.2.1 Sun Dec 10 10:10:23 2017
+++ src/sys/dev/ic/rt2661.c Tue Jul 31 16:20:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661.c,v 1.35.2.1 2017/12/10 10:10:23 snj Exp $ */
+/* $NetBSD: rt2661.c,v 1.35.2.2 2018/07/31 16:20:33 martin Exp $ */
/* $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $ */
/* $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.35.2.1 2017/12/10 10:10:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.35.2.2 2018/07/31 16:20:33 martin Exp $");
#include
@@ -1890,7 +1890,7 @@ rt2661_start(struct ifnet *ifp)
continue;
}
- bpf_mtap3(ifp->if_bpf, m0);
+ bpf_mtap(ifp, m0);
m0 = ieee80211_encap(ic, m0, ni);
if (m0 == NULL) {
ieee80211_free_node(ni);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 16:11:46 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #945 - #948 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.4 src/doc/CHANGES-8.1:1.1.2.5 --- src/doc/CHANGES-8.1:1.1.2.4 Fri Jul 27 10:55:40 2018 +++ src/doc/CHANGES-8.1 Tue Jul 31 16:11:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.4 2018/07/27 10:55:40 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.5 2018/07/31 16:11:46 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -240,3 +240,28 @@ share/mk/bsd.own.mk1.1066 Fix groff reproducibility and font directories in X builds. [christos, ticket #944] +sys/arch/i386/i386/trap.c 1.290 + + Don't use a const variable as an array size, because it is not a + constant expression and will cause the array to needlessly become a + variable-size one. + [taca, ticket #945] + +sbin/cgdconfig/cgdconfig.8 1.37,1.38 +sbin/cgdconfig/cgdconfig.c 1.42-1.45 + + Check whether the cgd device selected is available to be + configured,that is, not already in use, before requesting + passwords. + [kre, ticket #946] + +sys/dev/pci/if_de.c1.153 + + Remove bpf_tap() call in rx. It's done in if_percpuq_softint(). + [msaitoh, ticket #947] + +sys/arch/sun3/dev/if_ie.c 1.64 + + Remove bpf_tap() in iexmit() because ie_start() does bpf_mtap(). + [msaitoh, ticket #948] +
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: khorben
Date: Tue Jul 31 16:07:46 UTC 2018
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Re-generate
To generate a diff of this commit:
cvs rdiff -u -r1.749 -r1.750 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.749 src/sys/dev/usb/usbdevs.h:1.750
--- src/sys/dev/usb/usbdevs.h:1.749 Wed Jul 25 05:29:58 2018
+++ src/sys/dev/usb/usbdevs.h Tue Jul 31 16:07:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.749 2018/07/25 05:29:58 msaitoh Exp $ */
+/* $NetBSD: usbdevs.h,v 1.750 2018/07/31 16:07:46 khorben Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -3030,6 +3030,8 @@
#define USB_PRODUCT_SIERRA_AC885U 0x6880 /* Sierra Wireless AirCard 885U */
#define USB_PRODUCT_SIERRA_C01SW 0x6890 /* C01SW */
#define USB_PRODUCT_SIERRA_USB305 0x68a3 /* Sierra Wireless AirCard USB 305 */
+#define USB_PRODUCT_SIERRA_MC7304 0x68c0 /* MC7304 */
+#define USB_PRODUCT_SIERRA_EM7455 0x9079 /* EM7455 */
/* Sigmatel products */
#define USB_PRODUCT_SIGMATEL_SIR4116 0x4116 /* StIR4116 SIR */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.749 src/sys/dev/usb/usbdevs_data.h:1.750
--- src/sys/dev/usb/usbdevs_data.h:1.749 Wed Jul 25 05:29:58 2018
+++ src/sys/dev/usb/usbdevs_data.h Tue Jul 31 16:07:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.749 2018/07/25 05:29:58 msaitoh Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.750 2018/07/31 16:07:46 khorben Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -4136,284 +4136,288 @@ static const uint16_t usb_products[] = {
17752, 0,
USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_USB305,
3954, 651, 17595, 4871, 10581, 0,
+ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC7304,
+ 17758, 0,
+ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM7455,
+ 17765, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_SIR4116,
- 17758, 17767, 0,
+ 17772, 17781, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
9843, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_FIR4210,
- 17771, 5533, 0,
+ 17785, 5533, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_VFIR4220,
- 17780, 17789, 0,
+ 17794, 17803, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_I_BEAD100,
- 17794, 12111, 8358, 10620, 0,
+ 17808, 12111, 8358, 10620, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_I_BEAD150,
- 17794, 15841, 8358, 10620, 0,
+ 17808, 15841, 8358, 10620, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X,
- 17801, 1402, 17807, 17814, 17820, 0,
+ 17815, 1402, 17821, 17828, 17834, 0,
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_MUSICSTICK,
- 17828, 17837, 0,
+ 17842, 17851, 0,
USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
- 17848, 10438, 0,
+ 17862, 10438, 0,
USB_VENDOR_SIIG, USB_PRODUCT_SIIG_UISDMC2S,
- 17863, 0,
+ 17877, 0,
USB_VENDOR_SIIG, USB_PRODUCT_SIIG_MULTICARDREADER,
- 17863, 0,
+ 17877, 0,
USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER,
- 4871, 17879, 4901, 0,
+ 4871, 17893, 4901, 0,
USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
6875, 0,
USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E,
- 17882, 0,
+ 17896, 0,
USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE,
- 17886, 17210, 8543, 4901, 0,
+ 17900, 17210, 8543, 4901, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU,
- 17892, 6875, 0,
+ 17906, 6875, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP,
- 17899, 17909, 0,
+ 17913, 17923, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128,
- 17913, 0,
+ 17927, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREECONT,
- 17922, 17929, 0,
+ 17936, 17943, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUNNTO,
- 17938, 17945, 0,
+ 17952, 17959, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DESKTOPMOBILE,
- 17952, 13289, 17961, 0,
+ 17966, 13289, 17975, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IPLINK1220,
- 17968, 17976, 0,
+ 17982, 17990, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG,
- 17981, 17990, 0,
+ 17995, 18004, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_LIN,
- 17981, 18000, 0,
+ 17995, 18014, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP,
- 17981, 18009, 0,
+ 17995, 18023, 0,
USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE,
- 18016, 18023, 0,
+ 18030, 18037, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_1,
- 18029, 6875, 0,
+ 18043, 6875, 0,
USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2,
- 18029, 6875, 0,
+ 18043, 6875, 0,
USB_VENDO
CVS commit: src/sys/dev/usb
Module Name:src Committed By: khorben Date: Tue Jul 31 16:07:26 UTC 2018 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add the Sierra Wireless MC7304 and EM7455 USB modems To generate a diff of this commit: cvs rdiff -u -r1.756 -r1.757 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.756 src/sys/dev/usb/usbdevs:1.757 --- src/sys/dev/usb/usbdevs:1.756 Wed Jul 25 05:29:33 2018 +++ src/sys/dev/usb/usbdevs Tue Jul 31 16:07:26 2018 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.756 2018/07/25 05:29:33 msaitoh Exp $ +$NetBSD: usbdevs,v 1.757 2018/07/31 16:07:26 khorben Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3023,6 +3023,8 @@ product SIERRA AC881U 0x6856 Sierra Wir product SIERRA AC885U 0x6880 Sierra Wireless AirCard 885U product SIERRA C01SW 0x6890 C01SW product SIERRA USB305 0x68a3 Sierra Wireless AirCard USB 305 +product SIERRA MC7304 0x68c0 MC7304 +product SIERRA EM7455 0x9079 EM7455 /* Sigmatel products */ product SIGMATEL SIR4116 0x4116 StIR4116 SIR
CVS commit: [netbsd-8] src/sys/arch/sun3/dev
Module Name:src Committed By: martin Date: Tue Jul 31 16:05:42 UTC 2018 Modified Files: src/sys/arch/sun3/dev [netbsd-8]: if_ie.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #948): sys/arch/sun3/dev/if_ie.c: revision 1.64 Remove bpf_tap() in iexmit() because ie_start() does bpf_mtap(). To generate a diff of this commit: cvs rdiff -u -r1.62.6.1 -r1.62.6.2 src/sys/arch/sun3/dev/if_ie.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sun3/dev/if_ie.c diff -u src/sys/arch/sun3/dev/if_ie.c:1.62.6.1 src/sys/arch/sun3/dev/if_ie.c:1.62.6.2 --- src/sys/arch/sun3/dev/if_ie.c:1.62.6.1 Thu Jul 26 23:55:29 2018 +++ src/sys/arch/sun3/dev/if_ie.c Tue Jul 31 16:05:42 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie.c,v 1.62.6.1 2018/07/26 23:55:29 snj Exp $ */ +/* $NetBSD: if_ie.c,v 1.62.6.2 2018/07/31 16:05:42 martin Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.62.6.1 2018/07/26 23:55:29 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.62.6.2 2018/07/31 16:05:42 martin Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -725,13 +725,6 @@ iexmit(struct ie_softc *sc) sc->xctail); #endif - /* - * If BPF is listening on this interface, let it see the packet before - * we push it on the wire. - */ - bpf_tap(ifp, sc->xmit_cbuffs[sc->xctail], - SWAP(sc->xmit_buffs[sc->xctail]->ie_xmit_flags)); - sc->xmit_buffs[sc->xctail]->ie_xmit_flags |= IE_XMIT_LAST; sc->xmit_buffs[sc->xctail]->ie_xmit_next = SWAP(0x); sc->xmit_buffs[sc->xctail]->ie_xmit_buf =
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Jul 31 16:03:37 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: if_de.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #947):
sys/dev/pci/if_de.c: revision 1.153
Remove bpf_tap() call in rx. It's done in if_percpuq_softint().
To generate a diff of this commit:
cvs rdiff -u -r1.150.8.1 -r1.150.8.2 src/sys/dev/pci/if_de.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.150.8.1 src/sys/dev/pci/if_de.c:1.150.8.2
--- src/sys/dev/pci/if_de.c:1.150.8.1 Thu Jul 26 23:55:30 2018
+++ src/sys/dev/pci/if_de.c Tue Jul 31 16:03:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.150.8.1 2018/07/26 23:55:30 snj Exp $ */
+/* $NetBSD: if_de.c,v 1.150.8.2 2018/07/31 16:03:37 martin Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.150.8.1 2018/07/26 23:55:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.150.8.2 2018/07/31 16:03:37 martin Exp $");
#define TULIP_HDR_DATA
@@ -3639,10 +3639,6 @@ tulip_rx_intr(
#endif /* TULIP_BUS_DMA */
eh = *mtod(ms, struct ether_header *);
- if (sc->tulip_bpf != NULL) {
- if (me == ms)
- bpf_tap(ifp, mtod(ms, void *), total_len);
- }
sc->tulip_flags |= TULIP_RXACT;
if ((sc->tulip_flags & (TULIP_PROMISC|TULIP_HASHONLY))
&& (eh.ether_dhost[0] & 1) == 0
CVS commit: [netbsd-8] src/sbin/cgdconfig
Module Name:src
Committed By: martin
Date: Tue Jul 31 16:01:12 UTC 2018
Modified Files:
src/sbin/cgdconfig [netbsd-8]: cgdconfig.8 cgdconfig.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #946):
sbin/cgdconfig/cgdconfig.c: revision 1.42
sbin/cgdconfig/cgdconfig.c: revision 1.43
sbin/cgdconfig/cgdconfig.c: revision 1.44
sbin/cgdconfig/cgdconfig.c: revision 1.45
sbin/cgdconfig/cgdconfig.8: revision 1.37
sbin/cgdconfig/cgdconfig.8: revision 1.38
Check whether the cgd device selected is available to be
configured,that is, not already in use, before requesting
passwords from the user (or elsewhere).
Fix usage for rump. Fixes test breakage caused by previous commit.
Check arg count in configure() at entry, rather than later.
This avoids the stupid null deref I added a couple of commits
ago (on bad usage) and also simplifies the rest of the routine
which no longer needs to check the arg count nearly as much.
Thanks to Alexander Nasonov for finding the null deref bug.
Fix missing -p in usage message (noted by Christoph Badura, thanks),
and update -l usage as well.
While here fix man page synopses and a few other odds and ends.
Add commas in enumeration.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.6.1 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.41 -r1.41.6.1 src/sbin/cgdconfig/cgdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.36 src/sbin/cgdconfig/cgdconfig.8:1.36.6.1
--- src/sbin/cgdconfig/cgdconfig.8:1.36 Sun Sep 11 01:09:34 2016
+++ src/sbin/cgdconfig/cgdconfig.8 Tue Jul 31 16:01:12 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.36 2016/09/11 01:09:34 sevan Exp $
+.\" $NetBSD: cgdconfig.8,v 1.36.6.1 2018/07/31 16:01:12 martin Exp $
.\"
.\" Copyright (c) 2002, The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 11, 2016
+.Dd May 9, 2018
.Dt CGDCONFIG 8
.Os
.Sh NAME
@@ -41,11 +41,11 @@
.Op Ar paramsfile
.Nm
.Fl C
-.Op Fl nv
+.Op Fl npv
.Op Fl f Ar configfile
.Nm
.Fl G
-.Op Fl nv
+.Op Fl npv
.Op Fl i Ar ivmeth
.Op Fl k Ar kgmeth
.Op Fl o Ar outfile
@@ -60,7 +60,8 @@
.Op Ar keylen
.Nm
.Fl l
-.Op Fl cgd
+.Op Fl v Ns Op Cm v
+.Op Ar cgd
.Nm
.Fl s
.Op Fl nv
@@ -96,7 +97,7 @@ configuration file
Generate a new paramsfile (to stdout) using the values from
.Ar paramsfile
which will generate the same key.
-This may need to prompt for multiple passphrases.
+This may need to obtain multiple passphrases.
.It Fl g
Generate a paramsfile (to stdout).
.It Fl i Ar ivmeth
@@ -116,6 +117,9 @@ When generating a
.Ar paramsfile ,
store it in
.Ar outfile .
+If
+.Fl o
+is not given, any paramsfile content is written to standard output.
.It Fl p
Read all passphrases from stdin rather than
.Pa /dev/tty .
@@ -126,7 +130,7 @@ If this flag is specified then verificat
in question to be unconfigured rather than prompting for the passphrase
again.
.It Fl s
-Read the key from stdin.
+Read the key (nb: not the passphrase) from stdin.
.It Fl U
Unconfigure all the devices listed in the cgd configuration file.
.It Fl u
@@ -421,7 +425,7 @@ And use the entered passphrase to genera
.Pp
Although not required, the partition type
.Ar cgd
-should be used in the disklabel for the cgd partition.
+should be used in the disklabel or GPT type field for the cgd partition.
.Sh DIAGNOSTICS
.Bl -diag
.It "cgdconfig: could not calibrate pkcs5_pbkdf2"
@@ -431,7 +435,9 @@ Ensure that the processor clock frequenc
program's execution.
.El
.Sh SEE ALSO
-.Xr cgd 4
+.Xr cgd 4 ,
+.Xr disklabel 8 ,
+.Xr gpt 8
.Pp
.Dq PKCS #5 v2.0: Password-Based Cryptography Standard ,
RSA Laboratories, March 25, 1999.
@@ -443,6 +449,12 @@ utility appeared in
.Sh BUGS
Since
.Nm
+without
+.Fl p
uses
.Xr getpass 3
-to read in the passphrase, it is limited to 128 characters.
+to read in the passphrase,
+it is limited to sysconf(_SC_PASS_MAX) (128) characters.
+With
+.Fl p
+the limit is 1023 characters.
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.41 src/sbin/cgdconfig/cgdconfig.c:1.41.6.1
--- src/sbin/cgdconfig/cgdconfig.c:1.41 Tue Jan 10 20:45:19 2017
+++ src/sbin/cgdconfig/cgdconfig.c Tue Jul 31 16:01:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.41 2017/01/10 20:45:19 christos Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.41.6.1 2018/07/31 16:01:12 martin Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.41 2017/01/10 20:45:19 christos Exp $");
+__RCSID("$NetBSD: cgdcon
CVS commit: [netbsd-8] src/sys/arch/i386/i386
Module Name:src
Committed By: martin
Date: Tue Jul 31 15:57:11 UTC 2018
Modified Files:
src/sys/arch/i386/i386 [netbsd-8]: trap.c
Log Message:
Pull up following revision(s) (requested by taca in ticket #945):
sys/arch/i386/i386/trap.c: revision 1.290
Don't use a const variable as an array size, because it is not a
constant expression and will cause the array to needlessly become a
variable-size one. Fixes "error: stack protector not protecting local
variables: variable length buffer [-Werror=stack-protector]" when
building i386 with MKDEBUG=YES -V COPTS="-g".
To generate a diff of this commit:
cvs rdiff -u -r1.287.6.1 -r1.287.6.2 src/sys/arch/i386/i386/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.287.6.1 src/sys/arch/i386/i386/trap.c:1.287.6.2
--- src/sys/arch/i386/i386/trap.c:1.287.6.1 Wed Jul 5 19:59:29 2017
+++ src/sys/arch/i386/i386/trap.c Tue Jul 31 15:57:11 2018
@@ -1,5 +1,5 @@
-/* $NetBSD: trap.c,v 1.287.6.1 2017/07/05 19:59:29 snj Exp $ */
+/* $NetBSD: trap.c,v 1.287.6.2 2018/07/31 15:57:11 martin Exp $ */
/*-
* Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.287.6.1 2017/07/05 19:59:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.287.6.2 2018/07/31 15:57:11 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -422,7 +422,7 @@ kernelfault:
{
static const char lcall[7] = { 0x9a, 0, 0, 0, 0, 7, 0 };
const size_t sz = sizeof(lcall);
- char tmp[sz];
+ char tmp[sizeof(lcall)];
/* Check for the osyscall lcall instruction. */
if (frame->tf_eip < VM_MAXUSER_ADDRESS - sz &&
CVS commit: src/sys/netinet
Module Name:src
Committed By: rjs
Date: Tue Jul 31 13:36:31 UTC 2018
Modified Files:
src/sys/netinet: sctp_uio.h sctp_usrreq.c
Log Message:
Change implementation of sctp_connectx() to use ioctl(2).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctp_uio.h
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet/sctp_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/sctp_uio.h
diff -u src/sys/netinet/sctp_uio.h:1.3 src/sys/netinet/sctp_uio.h:1.4
--- src/sys/netinet/sctp_uio.h:1.3 Sun Dec 10 11:52:14 2017
+++ src/sys/netinet/sctp_uio.h Tue Jul 31 13:36:31 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp_uio.h,v 1.11 2005/03/06 16:04:18 itojun Exp $ */
-/* $NetBSD: sctp_uio.h,v 1.3 2017/12/10 11:52:14 rjs Exp $ */
+/* $NetBSD: sctp_uio.h,v 1.4 2018/07/31 13:36:31 rjs Exp $ */
#ifndef __SCTP_UIO_H__
#define __SCTP_UIO_H__
@@ -584,6 +584,14 @@ struct sctp_recvv_rn {
#define SCTP_RECVV_NXTINFO 0x0002
#define SCTP_RECVV_RN 0x0003
+struct sctp_connectx_addrs {
+ int cx_num;
+ int cx_len;
+ void *cx_addrs;
+} __packed;
+
+#define SIOCCONNECTX _IOWR('s', 11, struct sctp_connectx_addrs)
+#define SIOCCONNECTXDEL _IOWR('s', 12, struct sctp_connectx_addrs)
/*
* API system calls
Index: src/sys/netinet/sctp_usrreq.c
diff -u src/sys/netinet/sctp_usrreq.c:1.10 src/sys/netinet/sctp_usrreq.c:1.11
--- src/sys/netinet/sctp_usrreq.c:1.10 Tue May 1 07:21:39 2018
+++ src/sys/netinet/sctp_usrreq.c Tue Jul 31 13:36:31 2018
@@ -1,5 +1,5 @@
/* $KAME: sctp_usrreq.c,v 1.50 2005/06/16 20:45:29 jinmei Exp $ */
-/* $NetBSD: sctp_usrreq.c,v 1.10 2018/05/01 07:21:39 maxv Exp $ */
+/* $NetBSD: sctp_usrreq.c,v 1.11 2018/07/31 13:36:31 rjs Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.10 2018/05/01 07:21:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_usrreq.c,v 1.11 2018/07/31 13:36:31 rjs Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1134,19 +1134,27 @@ sctp_count_max_addresses(struct sctp_inp
}
static int
-sctp_do_connect_x(struct socket *so, struct sctp_inpcb *inp, struct mbuf *m,
- struct lwp *l, int delay)
+sctp_do_connect_x(struct socket *so, struct sctp_connectx_addrs *sca,
+struct lwp *l, int delay)
{
int error = 0;
+ struct sctp_inpcb *inp;
struct sctp_tcb *stcb = NULL;
struct sockaddr *sa;
- int num_v6=0, num_v4=0, *totaddrp, totaddr, i, incr, at;
+ int num_v6=0, num_v4=0, totaddr, i, incr, at;
+ char buf[2048];
+ size_t len;
+ sctp_assoc_t id;
#ifdef SCTP_DEBUG
if (sctp_debug_on & SCTP_DEBUG_PCB1) {
printf("Connectx called\n");
}
#endif /* SCTP_DEBUG */
+ inp = (struct sctp_inpcb *)so->so_pcb;
+ if (inp == 0)
+ return EINVAL;
+
if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) &&
(inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED)) {
/* We are already connected AND the TCP model */
@@ -1168,9 +1176,16 @@ sctp_do_connect_x(struct socket *so, str
return (EFAULT);
}
- totaddrp = mtod(m, int *);
- totaddr = *totaddrp;
- sa = (struct sockaddr *)(totaddrp + 1);
+ len = sca->cx_len;
+ totaddr = sca->cx_num;
+ if (len > sizeof(buf)) {
+ return E2BIG;
+ }
+ error = copyin(sca->cx_addrs, buf, len);
+ if (error) {
+ return error;
+ }
+ sa = (struct sockaddr *)buf;
at = incr = 0;
/* account and validate addresses */
SCTP_INP_WLOCK(inp);
@@ -1201,13 +1216,13 @@ sctp_do_connect_x(struct socket *so, str
SCTP_TCB_UNLOCK(stcb);
return (EALREADY);
}
- if ((at + incr) > m->m_len) {
+ if ((at + incr) > len) {
totaddr = i;
break;
}
sa = (struct sockaddr *)((vaddr_t)sa + incr);
}
- sa = (struct sockaddr *)(totaddrp + 1);
+ sa = (struct sockaddr *)buf;
SCTP_INP_WLOCK(inp);
SCTP_INP_DECR_REF(inp);
SCTP_INP_WUNLOCK(inp);
@@ -1252,6 +1267,7 @@ sctp_do_connect_x(struct socket *so, str
SCTP_ASOC_CREATE_UNLOCK(inp);
return (error);
}
+
/* move to second address */
if (sa->sa_family == AF_INET)
sa = (struct sockaddr *)((vaddr_t)sa + sizeof(struct sockaddr_in));
@@ -1280,6 +1296,10 @@ sctp_do_connect_x(struct socket *so, str
sa = (struct sockaddr *)((vaddr_t)sa + incr);
}
stcb->asoc.state = SCTP_STATE_COOKIE_WAIT;
+
+ id = sctp_get_associd(stcb);
+ memcpy(&sca->cx_num, &id, sizeof(sctp_assoc_t));
+
if (delay) {
/* doing delayed connection */
stcb->asoc.delayed_connection = 1;
@@ -1922,7 +1942,7 @@ sctp_optsget(struct socket *so, struct s
break;
}
}
- if ( (stcb == NULL) &&
+ if ((stcb == NULL) &&
struct sockaddr *)&paddrp->spp_address)->sa_family == AF_INET) ||
(((struct sockaddr *)&paddrp->spp_address)->sa_family == AF_INET6))) {
/* Lookup via address */
@@ -2099,6 +2119,7 @@ sctp_optsget(struct socket *so, struct s
stcb = sctp_findassociation_ep_asocid(inp, sstat->sstat_assoc_id);
if (stcb == NULL) {
+ prin
CVS commit: src/sys/sys
Module Name:src Committed By: rjs Date: Tue Jul 31 13:20:34 UTC 2018 Modified Files: src/sys/sys: socket.h Log Message: Add declaration of getsockopt2(). To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/sys/socket.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/socket.h diff -u src/sys/sys/socket.h:1.125 src/sys/sys/socket.h:1.126 --- src/sys/sys/socket.h:1.125 Tue Jul 17 05:52:07 2018 +++ src/sys/sys/socket.h Tue Jul 31 13:20:34 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.125 2018/07/17 05:52:07 msaitoh Exp $ */ +/* $NetBSD: socket.h,v 1.126 2018/07/31 13:20:34 rjs Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -655,6 +655,7 @@ int connect(int, const struct sockaddr * int getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict); int getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict); int getsockopt(int, int, int, void *__restrict, socklen_t * __restrict); +int getsockopt2(int, int, int, void *__restrict, socklen_t * __restrict); int listen(int, int); int paccept(int, struct sockaddr * __restrict, socklen_t * __restrict, const sigset_t * __restrict, int);
CVS commit: src/sys/sys
Module Name:src Committed By: rjs Date: Tue Jul 31 13:06:33 UTC 2018 Modified Files: src/sys/sys: param.h Log Message: Bump version for addition of getsockopt2() syscall. Welcome to NetBSD 8.99.23 ! To generate a diff of this commit: cvs rdiff -u -r1.567 -r1.568 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.567 src/sys/sys/param.h:1.568 --- src/sys/sys/param.h:1.567 Mon Jul 16 07:08:40 2018 +++ src/sys/sys/param.h Tue Jul 31 13:06:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.567 2018/07/16 07:08:40 pgoyette Exp $ */ +/* $NetBSD: param.h,v 1.568 2018/07/31 13:06:32 rjs Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899002200 /* NetBSD 8.99.22 */ +#define __NetBSD_Version__ 899002300 /* NetBSD 8.99.23 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src
Module Name:src Committed By: rjs Date: Tue Jul 31 13:04:10 UTC 2018 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi src/lib/libc: shlib_version src/lib/libc/sys: Makefile.inc getsockopt.2 Log Message: Userland changes for getsockopt2(). To generate a diff of this commit: cvs rdiff -u -r1.842 -r1.843 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2212 -r1.2213 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.279 -r1.280 src/lib/libc/shlib_version cvs rdiff -u -r1.239 -r1.240 src/lib/libc/sys/Makefile.inc cvs rdiff -u -r1.35 -r1.36 src/lib/libc/sys/getsockopt.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.842 src/distrib/sets/lists/base/shl.mi:1.843 --- src/distrib/sets/lists/base/shl.mi:1.842 Thu Jun 28 10:14:01 2018 +++ src/distrib/sets/lists/base/shl.mi Tue Jul 31 13:04:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.842 2018/06/28 10:14:01 christos Exp $ +# $NetBSD: shl.mi,v 1.843 2018/07/31 13:04:09 rjs Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -18,7 +18,7 @@ ./lib/libblacklist.so.0.0 base-sys-shlib dynamicroot ./lib/libc.so base-sys-shlib dynamicroot ./lib/libc.so.12base-sys-shlib dynamicroot -./lib/libc.so.12.209base-sys-shlib dynamicroot +./lib/libc.so.12.210base-sys-shlib dynamicroot ./lib/libcrypt.sobase-sys-shlib dynamicroot ./lib/libcrypt.so.1base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot @@ -221,7 +221,7 @@ ./usr/lib/libc++.so.1.0base-sys-shlib compatfile,libcxx ./usr/lib/libc.sobase-sys-shlib compatfile ./usr/lib/libc.so.12base-sys-shlib compatfile -./usr/lib/libc.so.12.209 base-sys-shlib compatfile +./usr/lib/libc.so.12.210 base-sys-shlib compatfile ./usr/lib/libcdk.sobase-obsolete compatfile,obsolete ./usr/lib/libcom_err.sobase-krb5-shlib compatfile,kerberos ./usr/lib/libcom_err.so.8 base-krb5-shlib compatfile,kerberos Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2212 src/distrib/sets/lists/comp/mi:1.2213 --- src/distrib/sets/lists/comp/mi:1.2212 Tue Jul 17 18:55:24 2018 +++ src/distrib/sets/lists/comp/mi Tue Jul 31 13:04:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2212 2018/07/17 18:55:24 joerg Exp $ +# $NetBSD: mi,v 1.2213 2018/07/31 13:04:10 rjs Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -4272,6 +4272,7 @@ ./usr/share/man/cat2/getsid.0 comp-c-catman .cat ./usr/share/man/cat2/getsockname.0 comp-c-catman .cat ./usr/share/man/cat2/getsockopt.0 comp-c-catman .cat +./usr/share/man/cat2/getsockopt2.0 comp-c-catman .cat ./usr/share/man/cat2/gettimeofday.0 comp-c-catman .cat ./usr/share/man/cat2/getuid.0 comp-c-catman .cat ./usr/share/man/cat2/getvfsstat.0 comp-c-catman .cat @@ -12121,6 +12122,7 @@ ./usr/share/man/html2/getsid.html comp-c-htmlman html ./usr/share/man/html2/getsockname.html comp-c-htmlman html ./usr/share/man/html2/getsockopt.html comp-c-htmlman html +./usr/share/man/html2/getsockopt2.html comp-c-htmlman html ./usr/share/man/html2/gettimeofday.html comp-c-htmlman html ./usr/share/man/html2/getuid.html comp-c-htmlman html ./usr/share/man/html2/getvfsstat.html comp-c-htmlman html @@ -19793,6 +19795,7 @@ ./usr/share/man/man2/getsid.2 comp-c-man .man ./usr/share/man/man2/getsockname.2 comp-c-man .man ./usr/share/man/man2/getsockopt.2 comp-c-man .man +./usr/share/man/man2/getsockopt2.2 comp-c-man .man ./usr/share/man/man2/gettimeofday.2 comp-c-man .man ./usr/share/man/man2/getuid.2 comp-c-man .man ./usr/share/man/man2/getvfsstat.2 comp-c-man .man Index: src/lib/libc/shlib_version diff -u src/lib/libc/shlib_version:1.279 src/lib/libc/shlib_version:1.280 --- src/lib/libc/shlib_version:1.279 Fri Apr 6 17:03:59 2018 +++ src/lib/libc/shlib_version Tue Jul 31 13:04:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.279 2018/04/06 17:03:59 dholland Exp $ +# $NetBSD: shlib_version,v 1.280 2018/07/31 13:04:10 rjs Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # # things we wish to do on next major version bump: @@ -53,4 +53,4 @@ # - move environ and __ps_strings from crt0.o into libc. # - move statfs() to libcompat since we have statvfs() major=12 -minor=209 +minor=210 Index: src/lib/libc/sys/Makefile.inc diff -u src/lib/libc/sys/Makefile.inc:1.239 src/lib/libc/sys/Makefile.inc:1.240 --- src/lib/libc/sys/Makefile.inc:1.239 Thu Jul 12 10:46:41 2018 +++ src/lib/libc/sys/Makefile.inc Tue Jul 31 13:04:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.239 2018/07/12 10:46:41 maxv Exp $ +# $NetBSD: Makefile.inc,v 1.240 2018/07/31 13:04:10
CVS commit: src/sys
Module Name:src
Committed By: rjs
Date: Tue Jul 31 13:02:15 UTC 2018
Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.311 -r1.312 src/sys/kern/syscalls.c
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.30 -r1.31 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.109 -r1.110 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.138 -r1.139 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.305 -r1.306 src/sys/sys/syscall.h
cvs rdiff -u -r1.289 -r1.290 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.320 src/sys/kern/init_sysent.c:1.321
--- src/sys/kern/init_sysent.c:1.320 Thu Jul 12 10:46:48 2018
+++ src/sys/kern/init_sysent.c Tue Jul 31 13:02:15 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.320 2018/07/12 10:46:48 maxv Exp $ */
+/* $NetBSD: init_sysent.c,v 1.321 2018/07/31 13:02:15 rjs Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.291 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.320 2018/07/12 10:46:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.321 2018/07/31 13:02:15 rjs Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
@@ -979,8 +979,10 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_fpathconf
}, /* 192 = fpathconf */
{
- .sy_call = sys_nosys,
- }, /* 193 = filler */
+ ns(struct sys_getsockopt2_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)sys_getsockopt2
+ }, /* 193 = getsockopt2 */
{
ns(struct sys_getrlimit_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.311 src/sys/kern/syscalls.c:1.312
--- src/sys/kern/syscalls.c:1.311 Thu Jul 12 10:46:48 2018
+++ src/sys/kern/syscalls.c Tue Jul 31 13:02:15 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.311 2018/07/12 10:46:48 maxv Exp $ */
+/* $NetBSD: syscalls.c,v 1.312 2018/07/31 13:02:15 rjs Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.291 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.311 2018/07/12 10:46:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.312 2018/07/31 13:02:15 rjs Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
@@ -236,7 +236,7 @@ const char *const syscallnames[] = {
/* 190 */ "compat_12_lstat12",
/* 191 */ "pathconf",
/* 192 */ "fpathconf",
- /* 193 */ "#193 (unimplemented)",
+ /* 193 */ "getsockopt2",
/* 194 */ "getrlimit",
/* 195 */ "setrlimit",
/* 196 */ "compat_12_getdirentries",
@@ -773,7 +773,7 @@ const char *const altsyscallnames[] = {
/* 190 */ NULL, /* compat_12_lstat12 */
/* 191 */ NULL, /* pathconf */
/* 192 */ NULL, /* fpathconf */
- /* 193 */ NULL, /* unimplemented */
+ /* 193 */ NULL, /* getsockopt2 */
/* 194 */ NULL, /* getrlimit */
/* 195 */ NULL, /* setrlimit */
/* 196 */ NULL, /* compat_12_getdirentries */
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.27 src/sys/kern/syscalls_autoload.c:1.28
--- src/sys/kern/syscalls_autoload.c:1.27 Sat Jan 6 16:41:23 2018
+++ src/sys/kern/syscalls_autoload.c Tue Jul 31 13:02:15 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.27 2018/01/06 16:41:23 kamil Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.28 2018/07/31 13:02:15 rjs Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.287 2017/12/08 01:19:29 christos Exp
+ * created from NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.27 2018/01/06 16:41:23 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.28 2018/07/31 13:02:15 rjs Exp $");
#include
static struct sc_autoload netbsd_syscalls_autoload[] = {
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.30 src/sys/kern/systrace_args.c:1.31
--- src/sys/kern/systrace_args.c:1.30 Thu Jul 12 10:46:48 2018
+++ src/sys/kern/systrace_args.c Tue Jul 31 13:02:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.30 2018/07/12 10
CVS commit: src/sys/kern
Module Name:src
Committed By: rjs
Date: Tue Jul 31 13:00:14 UTC 2018
Modified Files:
src/sys/kern: syscalls.master uipc_syscalls.c
Log Message:
Add getsockopt2() syscall.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/kern/syscalls.master
cvs rdiff -u -r1.194 -r1.195 src/sys/kern/uipc_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.292 src/sys/kern/syscalls.master:1.293
--- src/sys/kern/syscalls.master:1.292 Thu Jul 12 10:46:48 2018
+++ src/sys/kern/syscalls.master Tue Jul 31 13:00:13 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.292 2018/07/12 10:46:48 maxv Exp $
+ $NetBSD: syscalls.master,v 1.293 2018/07/31 13:00:13 rjs Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -411,7 +411,8 @@
struct stat12 *ub); } lstat12
191 STD RUMP { long|sys||pathconf(const char *path, int name); }
192 STD RUMP { long|sys||fpathconf(int fd, int name); }
-193 UNIMPL
+193 STD RUMP { int|sys||getsockopt2(int s, int level, int name, \
+ void *val, socklen_t *avalsize); }
194 STD RUMP { int|sys||getrlimit(int which, \
struct rlimit *rlp); }
195 STD RUMP { int|sys||setrlimit(int which, \
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.194 src/sys/kern/uipc_syscalls.c:1.195
--- src/sys/kern/uipc_syscalls.c:1.194 Fri May 4 08:47:55 2018
+++ src/sys/kern/uipc_syscalls.c Tue Jul 31 13:00:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.194 2018/05/04 08:47:55 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.195 2018/07/31 13:00:13 rjs Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.194 2018/05/04 08:47:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.195 2018/07/31 13:00:13 rjs Exp $");
#ifdef _KERNEL_OPT
#include "opt_pipe.h"
@@ -1192,17 +1192,10 @@ sys_setsockopt(struct lwp *l, const stru
return error;
}
-int
-sys_getsockopt(struct lwp *l, const struct sys_getsockopt_args *uap,
-register_t *retval)
+static int
+getsockopt(struct lwp *l, const struct sys_getsockopt_args *uap,
+register_t *retval, bool copyarg)
{
- /* {
- syscallarg(int) s;
- syscallarg(int) level;
- syscallarg(int) name;
- syscallarg(void *) val;
- syscallarg(unsigned int *) avalsize;
- } */
struct sockopt sopt;
struct socket *so;
file_t *fp;
@@ -1216,39 +1209,68 @@ sys_getsockopt(struct lwp *l, const stru
} else
valsize = 0;
- if ((error = fd_getsock1(SCARG(uap, s), &so, &fp)) != 0)
- return (error);
-
if (valsize > MCLBYTES)
return EINVAL;
+ if ((error = fd_getsock1(SCARG(uap, s), &so, &fp)) != 0)
+ return error;
+
sockopt_init(&sopt, SCARG(uap, level), SCARG(uap, name), valsize);
+ if (copyarg && valsize > 0) {
+ error = copyin(SCARG(uap, val), sopt.sopt_data, valsize);
+ if (error)
+ goto out;
+ }
if (fp->f_flag & FNOSIGPIPE)
so->so_options |= SO_NOSIGPIPE;
else
so->so_options &= ~SO_NOSIGPIPE;
+
error = sogetopt(so, &sopt);
- if (error)
+ if (error || valsize == 0)
goto out;
- if (valsize > 0) {
- len = min(valsize, sopt.sopt_retsize);
- error = copyout(sopt.sopt_data, SCARG(uap, val), len);
- if (error)
- goto out;
-
- error = copyout(&len, SCARG(uap, avalsize), sizeof(len));
- if (error)
- goto out;
- }
+ len = min(valsize, sopt.sopt_retsize);
+ error = copyout(sopt.sopt_data, SCARG(uap, val), len);
+ if (error)
+ goto out;
+ error = copyout(&len, SCARG(uap, avalsize), sizeof(len));
out:
sockopt_destroy(&sopt);
fd_putfile(SCARG(uap, s));
return error;
}
+int
+sys_getsockopt(struct lwp *l, const struct sys_getsockopt_args *uap,
+register_t *retval)
+{
+ /* {
+ syscallarg(int) s;
+ syscallarg(int) level;
+ syscallarg(int) name;
+ syscallarg(void *) val;
+ syscallarg(unsigned int *) avalsize;
+ } */
+ return getsockopt(l, uap, retval, false);
+}
+
+int
+sys_getsockopt2(struct lwp *l, const struct sys_getsockopt2_args *uap,
+register_t *retval)
+{
+ /* {
+ syscallarg(int) s;
+ syscallarg(int) level;
+ syscallarg(int) name;
+ syscallarg(void *) val;
+ syscallarg(unsigned int *) avalsize;
+ } */
+ return getsockopt(l, (const struct sys_getsockopt_args *) uap, retval, true);
+}
+
#ifdef PIPE_SOCKETPAIR
int
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: martin
Date: Tue Jul 31 10:31:02 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: arm32_kvminit.c
Log Message:
#ifdef VERBOSE_INIT_ARM some format strings only used in that case.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/arm32/arm32_kvminit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.42 src/sys/arch/arm/arm32/arm32_kvminit.c:1.43
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.42 Tue Jul 31 07:00:48 2018
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Tue Jul 31 10:31:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.42 2018/07/31 07:00:48 skrll Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.43 2018/07/31 10:31:02 martin Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -126,7 +126,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.42 2018/07/31 07:00:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.43 2018/07/31 10:31:02 martin Exp $");
#include
#include
@@ -834,10 +834,12 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
VPRINTF("%22s Physical VirtualNum\n", " ");
VPRINTF("%22s StartingEndingStartingEnding Pages\n", " ");
+#ifdef VERBOSE_INIT_ARM
static const char mem_fmt[] =
"%20s: 0x%08lx 0x%08lx 0x%08lx 0x%08lx %u\n";
static const char mem_fmt_nov[] =
"%20s: 0x%08lx 0x%08lx %zu\n";
+#endif
VPRINTF(mem_fmt, "SDRAM", bmi->bmi_start, bmi->bmi_end - 1,
KERN_PHYSTOV(bmi, bmi->bmi_start), KERN_PHYSTOV(bmi, bmi->bmi_end - 1),
CVS commit: src/usr.sbin/arp
Module Name:src
Committed By: nonaka
Date: Tue Jul 31 09:45:52 UTC 2018
Modified Files:
src/usr.sbin/arp: arp.c
Log Message:
arp(8): Fix the host output when arp -dav.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/arp/arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/arp/arp.c
diff -u src/usr.sbin/arp/arp.c:1.62 src/usr.sbin/arp/arp.c:1.63
--- src/usr.sbin/arp/arp.c:1.62 Wed Jul 11 03:10:48 2018
+++ src/usr.sbin/arp/arp.c Tue Jul 31 09:45:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.c,v 1.62 2018/07/11 03:10:48 ozaki-r Exp $ */
+/* $NetBSD: arp.c,v 1.63 2018/07/31 09:45:52 nonaka Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 19
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: arp.c,v 1.62 2018/07/11 03:10:48 ozaki-r Exp $");
+__RCSID("$NetBSD: arp.c,v 1.63 2018/07/31 09:45:52 nonaka Exp $");
#endif
#endif /* not lint */
@@ -497,6 +497,7 @@ void
delete(const char *host, const char *info)
{
int mib[6];
+ char addr[sizeof("000.000.000.000\0")];
size_t needed;
char *lim, *buf, *next;
struct rt_msghdr *rtm;
@@ -543,8 +544,10 @@ retry:
found = true;
ret = delete_one(rtm);
if (vflag && ret == 0) {
- (void)printf("%s (%s) deleted\n", host,
+ snprintf(addr, sizeof(addr), "%s",
inet_ntoa(sina->sin_addr));
+ (void)printf("%s (%s) deleted\n",
+ host != NULL ? host : addr, addr);
}
}
if (host != NULL && !found)
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Tue Jul 31 09:33:50 UTC 2018 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c Log Message: Initialize z_lockf for new znodes. Ok: Chuck Silvers To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.20 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.21 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.20 Mon May 28 21:05:07 2018 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Tue Jul 31 09:33:50 2018 @@ -1309,6 +1309,7 @@ skip_lookup: zp->z_blksz = blksz; zp->z_seq = 0x7A4653; zp->z_sync_cnt = 0; + zp->z_lockf = NULL; zfs_znode_sa_init(zfsvfs, zp, db, obj_type, hdl);
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Jul 31 09:19:34 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h ixgbe_netbsd.c ixgbe_osdep.h
Log Message:
Make jcl allocation per queue to reduce mutex spin. Tested by me and
knakahara.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.48 src/sys/dev/pci/ixgbe/ix_txrx.c:1.49
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.48 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Tue Jul 31 09:19:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.48 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.49 2018/07/31 09:19:34 msaitoh Exp $ */
/**
@@ -1343,7 +1343,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
while (j != limit) {
rxbuf = &rxr->rx_buffers[i];
if (rxbuf->buf == NULL) {
- mp = ixgbe_getjcl(&adapter->jcl_head, M_NOWAIT,
+ mp = ixgbe_getjcl(&rxr->jcl_head, M_NOWAIT,
MT_DATA, M_PKTHDR, rxr->mbuf_sz);
if (mp == NULL) {
rxr->no_jmbuf.ev_count++;
@@ -1505,6 +1505,17 @@ ixgbe_setup_receive_ring(struct rx_ring
/* Free current RX buffer structs and their mbufs */
ixgbe_free_receive_ring(rxr);
+ IXGBE_RX_UNLOCK(rxr);
+ /*
+ * Now reinitialize our supply of jumbo mbufs. The number
+ * or size of jumbo mbufs may have changed.
+ * Assume all of rxr->ptag are the same.
+ */
+ ixgbe_jcl_reinit(adapter, rxr->ptag->dt_dmat, rxr,
+ (2 * adapter->num_rx_desc), adapter->rx_mbuf_sz);
+
+ IXGBE_RX_LOCK(rxr);
+
/* Now replenish the mbufs */
for (int j = 0; j != rxr->num_desc; ++j) {
struct mbuf *mp;
@@ -1534,7 +1545,7 @@ ixgbe_setup_receive_ring(struct rx_ring
#endif /* DEV_NETMAP */
rxbuf->flags = 0;
- rxbuf->buf = ixgbe_getjcl(&adapter->jcl_head, M_NOWAIT,
+ rxbuf->buf = ixgbe_getjcl(&rxr->jcl_head, M_NOWAIT,
MT_DATA, M_PKTHDR, adapter->rx_mbuf_sz);
if (rxbuf->buf == NULL) {
error = ENOBUFS;
@@ -1611,15 +1622,6 @@ ixgbe_setup_receive_structures(struct ad
struct rx_ring *rxr = adapter->rx_rings;
intj;
- /*
- * Now reinitialize our supply of jumbo mbufs. The number
- * or size of jumbo mbufs may have changed.
- * Assume all of rxr->ptag are the same.
- */
- ixgbe_jcl_reinit(adapter, rxr->ptag->dt_dmat,
- (2 * adapter->num_rx_desc) * adapter->num_queues,
- adapter->rx_mbuf_sz);
-
for (j = 0; j < adapter->num_queues; j++, rxr++)
if (ixgbe_setup_receive_ring(rxr))
goto fail;
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.50 src/sys/dev/pci/ixgbe/ixgbe.h:1.51
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.50 Mon Jun 25 05:06:10 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.h Tue Jul 31 09:19:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.50 2018/06/25 05:06:10 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.51 2018/07/31 09:19:34 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -417,6 +417,9 @@ struct rx_ring {
#endif
struct ixgbe_rx_buf *rx_buffers;
ixgbe_dma_tag_t *ptag;
+ u16 last_rx_mbuf_sz;
+ u32 last_num_rx_desc;
+ ixgbe_extmem_head_t jcl_head;
u64 bytes; /* Used for AIM calc */
u64 packets;
@@ -602,7 +605,6 @@ struct adapter {
struct sysctllog *sysctllog;
const struct sysctlnode *sysctltop;
- ixgbe_extmem_head_t jcl_head;
};
/* Precision Time Sync (IEEE 1588) defines */
@@ -752,7 +754,8 @@ bool ixgbe_rxeof(struct ix_queue *);
const struct sysctlnode *ixgbe_sysctl_instance(struct adapter *);
/* For NetBSD */
-void ixgbe_jcl_reinit(struct adapter *, bus_dma_tag_t, int, size_t);
+void ixgbe_jcl_reinit(struct adapter *, bus_dma_tag_t, struct rx_ring *,
+int, size_t);
#include "ixgbe_bypass.h"
#include "ixgbe_fdir.h"
Index: src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.7 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.8
--- src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.7 Wed Apr 25 08:46:19 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_netbsd.c Tue Jul 31 09:19:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_netbsd.c,v 1.7 2018/04/25 08:46:19 msaitoh Exp $ */
+/* $NetBSD: ixgbe_netbsd.c,v 1.8 2018/07/31 09:19:34 msaitoh Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -162,10 +162,10 @@ post_zalloc_err:
}
void
-ixgbe_jcl_reinit(struct adapter *adapter, bus_dma_tag_t dmat, int nbuf,
-size_t size)
+ixgbe_jcl_reinit(struct adapter *adapter, bus_dma_tag_t dmat,
+struct rx_
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Tue Jul 31 07:00:48 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c pmap.c
src/sys/arch/arm/arm32: arm32_boot.c arm32_kvminit.c arm32_machdep.c
pmap.c
Log Message:
Define and use VPRINTF
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/arm32/arm32_kvminit.c
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.365 -r1.366 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.3 src/sys/arch/aarch64/aarch64/cpu.c:1.4
--- src/sys/arch/aarch64/aarch64/cpu.c:1.3 Tue Jul 17 00:29:55 2018
+++ src/sys/arch/aarch64/aarch64/cpu.c Tue Jul 31 07:00:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.3 2018/07/17 00:29:55 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.4 2018/07/31 07:00:48 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.3 2018/07/17 00:29:55 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.4 2018/07/31 07:00:48 skrll Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -50,6 +50,12 @@ __KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.3
#include
#endif
+#ifdef VERBOSE_INIT_ARM
+#define VPRINTF(...) printf(__VA_ARGS__)
+#else
+#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#endif
+
void cpu_attach(device_t, cpuid_t);
static void identify_aarch64_model(uint32_t, char *, size_t);
static void cpu_identify(device_t self, struct cpu_info *, uint32_t, uint64_t);
@@ -495,9 +501,7 @@ cpu_boot_secondary_processors(void)
{
mutex_init(&cpu_hatch_lock, MUTEX_DEFAULT, IPL_NONE);
-#ifdef VERBOSE_INIT_ARM
- printf("%s: writing mbox with %#x\n", __func__, arm_cpu_hatched);
-#endif
+ VPRINTF("%s: writing mbox with %#x\n", __func__, arm_cpu_hatched);
/* send mbox to have secondary processors do cpu_hatch() */
atomic_or_32(&arm_cpu_mbox, arm_cpu_hatched);
@@ -508,9 +512,7 @@ cpu_boot_secondary_processors(void)
__asm __volatile ("wfe");
}
-#ifdef VERBOSE_INIT_ARM
- printf("%s: secondary processors hatched\n", __func__);
-#endif
+ VPRINTF("%s: secondary processors hatched\n", __func__);
/* add available processors to kcpuset */
uint32_t mbox = arm_cpu_hatched;
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.15 src/sys/arch/aarch64/aarch64/pmap.c:1.16
--- src/sys/arch/aarch64/aarch64/pmap.c:1.15 Fri Jul 27 07:04:04 2018
+++ src/sys/arch/aarch64/aarch64/pmap.c Tue Jul 31 07:00:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.15 2018/07/27 07:04:04 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.16 2018/07/31 07:00:48 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.15 2018/07/27 07:04:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.16 2018/07/31 07:00:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -50,6 +50,11 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1
//#define PMAP_DEBUG
//#define PMAP_PV_DEBUG
+#ifdef VERBOSE_INIT_ARM
+#define VPRINTF(...) printf(__VA_ARGS__)
+#else
+#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#endif
UVMHIST_DEFINE(pmaphist);
#ifdef UVMHIST
@@ -289,16 +294,12 @@ pmap_devmap_bootstrap(const struct pmap_
l0 = (void *)AARCH64_PA_TO_KVA(reg_ttbr1_el1_read());
-#ifdef VERBOSE_INIT_ARM
- printf("%s:\n", __func__);
-#endif
+ VPRINTF("%s:\n", __func__);
for (i = 0; table[i].pd_size != 0; i++) {
-#ifdef VERBOSE_INIT_ARM
- printf(" devmap: pa %08lx-%08lx = va %016lx\n",
+ VPRINTF(" devmap: pa %08lx-%08lx = va %016lx\n",
table[i].pd_pa,
table[i].pd_pa + table[i].pd_size - 1,
table[i].pd_va);
-#endif
va = table[i].pd_va;
/* update and check virtual_devmap_addr */
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.19 src/sys/arch/arm/arm32/arm32_boot.c:1.20
--- src/sys/arch/arm/arm32/arm32_boot.c:1.19 Sun Jul 2 16:16:44 2017
+++ src/sys/arch/arm/arm32/arm32_boot.c Tue Jul 31 07:00:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.19 2017/07/02 16:16:44 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.20 2018/07/31 07:00:48 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -123,8 +123,9 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.19 2017/07/02 16:16:44 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.20 2018/07/31 07:00:48 skrll Exp $");
+#include "opt_arm_debug.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_multiprocessor.h"
