Module Name: src
Committed By: martin
Date: Mon Nov 12 09:43:19 UTC 2018
Modified Files:
src/external/bsd/nsd/include [netbsd-8]: config.h
src/sys/kern [netbsd-8]: uipc_socket.c uipc_syscalls.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1089):
external/bsd/nsd/include/config.h: revision 1.5
sys/kern/uipc_syscalls.c: revision 1.198
sys/kern/uipc_syscalls.c: revision 1.199
sys/kern/uipc_socket.c: revision 1.267
Update getsockopt(SO_ERROR) to behave like soreceive() and
return and clear so->so_rerror if so->so_error is zero.
Ok: christos@
-
Don't defer errors from sendmmsg(). This matches the linux manpage.
Defer errors from recvmmsg() through so_rerror and
tests and return a deferred error on entry.
Ok: christos@
-
sys_recvmmsg: don't defer an error that already gets returned.
-
Re-enable {send,recv}mmsg now they are working.
To generate a diff of this commit:
cvs rdiff -u -r1.1.8.2 -r1.1.8.3 src/external/bsd/nsd/include/config.h
cvs rdiff -u -r1.255.2.3 -r1.255.2.4 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.186.6.1 -r1.186.6.2 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/external/bsd/nsd/include/config.h
diff -u src/external/bsd/nsd/include/config.h:1.1.8.2 src/external/bsd/nsd/include/config.h:1.1.8.3
--- src/external/bsd/nsd/include/config.h:1.1.8.2 Sat Nov 3 17:15:58 2018
+++ src/external/bsd/nsd/include/config.h Mon Nov 12 09:43:19 2018
@@ -233,13 +233,11 @@
/* Define to 1 if you have the `reallocarray' function. */
#define HAVE_REALLOCARRAY 1
-#ifdef notyet
/* Define if recvmmsg is implemented */
#define HAVE_RECVMMSG 1
/* Define if sendmmsg is implemented */
#define HAVE_SENDMMSG 1
-#endif
/* Define to 1 if you have the `setregid' function. */
#define HAVE_SETREGID 1
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.255.2.3 src/sys/kern/uipc_socket.c:1.255.2.4
--- src/sys/kern/uipc_socket.c:1.255.2.3 Sat Jun 9 15:16:30 2018
+++ src/sys/kern/uipc_socket.c Mon Nov 12 09:43:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.255.2.3 2018/06/09 15:16:30 martin Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.255.2.4 2018/11/12 09:43:19 martin Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.3 2018/06/09 15:16:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.4 2018/11/12 09:43:19 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1970,6 +1970,10 @@ sogetopt1(struct socket *so, struct sock
break;
case SO_ERROR:
+ if (so->so_error == 0) {
+ so->so_error = so->so_rerror;
+ so->so_rerror = 0;
+ }
error = sockopt_setint(sopt, so->so_error);
so->so_error = 0;
break;
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.186.6.1 src/sys/kern/uipc_syscalls.c:1.186.6.2
--- src/sys/kern/uipc_syscalls.c:1.186.6.1 Sun Mar 18 10:57:01 2018
+++ src/sys/kern/uipc_syscalls.c Mon Nov 12 09:43:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.186.6.1 2018/03/18 10:57:01 martin Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.186.6.2 2018/11/12 09:43:19 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.186.6.1 2018/03/18 10:57:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.186.6.2 2018/11/12 09:43:19 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pipe.h"
@@ -809,14 +809,11 @@ sys_sendmmsg(struct lwp *l, const struct
}
*retval = dg;
- if (error)
- so->so_error = error;
fd_putfile(s);
/*
- * If we succeeded at least once, return 0, hopefully so->so_error
- * will catch it next time.
+ * If we succeeded at least once, return 0.
*/
if (dg)
return 0;
@@ -1062,6 +1059,16 @@ sys_recvmmsg(struct lwp *l, const struct
if ((error = fd_getsock(s, &so)) != 0)
return error;
+ /*
+ * If so->so_rerror holds a deferred error return it now.
+ */
+ if (so->so_rerror) {
+ error = so->so_rerror;
+ so->so_rerror = 0;
+ fd_putfile(s);
+ return error;
+ }
+
vlen = SCARG(uap, vlen);
if (vlen > 1024)
vlen = 1024;
@@ -1126,17 +1133,17 @@ sys_recvmmsg(struct lwp *l, const struct
m_free(from);
*retval = dg;
- if (error)
- so->so_error = error;
-
- fd_putfile(s);
/*
- * If we succeeded at least once, return 0, hopefully so->so_error
+ * If we succeeded at least once, return 0, hopefully so->so_rerror
* will catch it next time.
*/
- if (dg)
- return 0;
+ if (error && dg > 0) {
+ so->so_rerror = error;
+ error = 0;
+ }
+
+ fd_putfile(s);
return error;
}
