Module Name: src
Committed By: martin
Date: Sat May 12 10:42:22 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: uipc_usrreq.c
src/sys/net [netbsd-8]: raw_cb.h
src/sys/netinet6 [netbsd-8]: in6_proto.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #821):
sys/netinet6/in6_proto.c: revision 1.125
sys/net/raw_cb.h: revision 1.29
sys/kern/uipc_usrreq.c: revision 1.186
Increase the default size of some receive buffers from 8k to 16k.
This mitigates recent reports of socket overflow errors
and fixes PR bin/53247.
To generate a diff of this commit:
cvs rdiff -u -r1.181.8.1 -r1.181.8.2 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.27.4.1 -r1.27.4.2 src/sys/net/raw_cb.h
cvs rdiff -u -r1.117.4.4 -r1.117.4.5 src/sys/netinet6/in6_proto.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/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.181.8.1 src/sys/kern/uipc_usrreq.c:1.181.8.2
--- src/sys/kern/uipc_usrreq.c:1.181.8.1 Mon Apr 9 13:34:10 2018
+++ src/sys/kern/uipc_usrreq.c Sat May 12 10:42:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.181.8.1 2018/04/09 13:34:10 bouyer Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.181.8.2 2018/05/12 10:42:22 martin Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.181.8.1 2018/04/09 13:34:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.181.8.2 2018/05/12 10:42:22 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -665,7 +665,7 @@ uipc_ctloutput(int op, struct socket *so
u_long unpst_sendspace = PIPSIZ;
u_long unpst_recvspace = PIPSIZ;
u_long unpdg_sendspace = 2*1024; /* really max datagram size */
-u_long unpdg_recvspace = 4*1024;
+u_long unpdg_recvspace = 16*1024;
u_int unp_rights; /* files in flight */
u_int unp_rights_ratio = 2; /* limit, fraction of maxfiles */
Index: src/sys/net/raw_cb.h
diff -u src/sys/net/raw_cb.h:1.27.4.1 src/sys/net/raw_cb.h:1.27.4.2
--- src/sys/net/raw_cb.h:1.27.4.1 Sat Oct 21 19:43:54 2017
+++ src/sys/net/raw_cb.h Sat May 12 10:42:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_cb.h,v 1.27.4.1 2017/10/21 19:43:54 snj Exp $ */
+/* $NetBSD: raw_cb.h,v 1.27.4.2 2018/05/12 10:42:22 martin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -57,7 +57,7 @@ struct rawcb {
* Nominal space allocated to a raw socket.
*/
#define RAWSNDQ 8192
-#define RAWRCVQ 8192
+#define RAWRCVQ 16384
LIST_HEAD(rawcbhead, rawcb);
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.117.4.4 src/sys/netinet6/in6_proto.c:1.117.4.5
--- src/sys/netinet6/in6_proto.c:1.117.4.4 Sat Mar 31 10:41:06 2018
+++ src/sys/netinet6/in6_proto.c Sat May 12 10:42:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.117.4.4 2018/03/31 10:41:06 martin Exp $ */
+/* $NetBSD: in6_proto.c,v 1.117.4.5 2018/05/12 10:42:22 martin Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.117.4.4 2018/03/31 10:41:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.117.4.5 2018/05/12 10:42:22 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -605,7 +605,7 @@ int pmtu_expire = 60*10;
* Nominal space allocated to a raw ip socket.
*/
#define RIPV6SNDQ 8192
-#define RIPV6RCVQ 8192
+#define RIPV6RCVQ 16384
u_long rip6_sendspace = RIPV6SNDQ;
u_long rip6_recvspace = RIPV6RCVQ;
