Module Name: src
Committed By: martin
Date: Sat Jun 9 15:16:30 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: uipc_socket.c uipc_socket2.c
src/sys/sys [netbsd-8]: socketvar.h
Log Message:
Pull up following revision(s) (requested by roy in ticket #868):
sys/sys/socketvar.h: revision 1.156
sys/kern/uipc_socket2.c: revision 1.130
sys/kern/uipc_socket.c: revision 1.264
Separate receive socket errors from general socket errors.
To generate a diff of this commit:
cvs rdiff -u -r1.255.2.2 -r1.255.2.3 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.124.8.1 -r1.124.8.2 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.144.6.2 -r1.144.6.3 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/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.255.2.2 src/sys/kern/uipc_socket.c:1.255.2.3
--- src/sys/kern/uipc_socket.c:1.255.2.2 Mon Apr 9 13:34:10 2018
+++ src/sys/kern/uipc_socket.c Sat Jun 9 15:16:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.255.2.2 2018/04/09 13:34:10 bouyer Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.255.2.3 2018/06/09 15:16:30 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.2 2018/04/09 13:34:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.3 2018/06/09 15:16:30 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1240,11 +1240,16 @@ soreceive(struct socket *so, struct mbuf
if (m == NULL && so->so_rcv.sb_cc)
panic("receive 1");
#endif
- if (so->so_error) {
+ if (so->so_error || so->so_rerror) {
if (m != NULL)
goto dontblock;
- error = so->so_error;
- so->so_error = 0;
+ if (so->so_error) {
+ error = so->so_error;
+ so->so_error = 0;
+ } else {
+ error = so->so_rerror;
+ so->so_rerror = 0;
+ }
goto release;
}
if (so->so_state & SS_CANTRCVMORE) {
@@ -1564,7 +1569,8 @@ soreceive(struct socket *so, struct mbuf
*/
while (flags & MSG_WAITALL && m == NULL && uio->uio_resid > 0 &&
!sosendallatonce(so) && !nextrecord) {
- if (so->so_error || so->so_state & SS_CANTRCVMORE)
+ if (so->so_error || so->so_rerror ||
+ so->so_state & SS_CANTRCVMORE)
break;
/*
* If we are peeking and the socket receive buffer is
@@ -2250,7 +2256,7 @@ filt_soread(struct knote *kn, long hint)
kn->kn_flags |= EV_EOF;
kn->kn_fflags = so->so_error;
rv = 1;
- } else if (so->so_error)
+ } else if (so->so_error || so->so_rerror)
rv = 1;
else if (kn->kn_sfflags & NOTE_LOWAT)
rv = (kn->kn_data >= kn->kn_sdata);
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.124.8.1 src/sys/kern/uipc_socket2.c:1.124.8.2
--- src/sys/kern/uipc_socket2.c:1.124.8.1 Mon Apr 9 13:34:10 2018
+++ src/sys/kern/uipc_socket2.c Sat Jun 9 15:16:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.124.8.1 2018/04/09 13:34:10 bouyer Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.124.8.2 2018/06/09 15:16:30 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.124.8.1 2018/04/09 13:34:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.124.8.2 2018/06/09 15:16:30 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -504,7 +504,7 @@ soroverflow(struct socket *so)
KASSERT(solocked(so));
so->so_rcv.sb_overflowed++;
- so->so_error = ENOBUFS;
+ so->so_rerror = ENOBUFS;
sorwakeup(so);
}
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.144.6.2 src/sys/sys/socketvar.h:1.144.6.3
--- src/sys/sys/socketvar.h:1.144.6.2 Mon Apr 9 13:34:10 2018
+++ src/sys/sys/socketvar.h Sat Jun 9 15:16:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.144.6.2 2018/04/09 13:34:10 bouyer Exp $ */
+/* $NetBSD: socketvar.h,v 1.144.6.3 2018/06/09 15:16:30 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -160,6 +160,7 @@ struct socket {
short so_qlimit; /* max number queued connections */
short so_timeo; /* connection timeout */
u_short so_error; /* error affecting connection */
+ u_short so_rerror; /* error affecting receiving */
u_short so_aborting; /* references from soabort() */
pid_t so_pgid; /* pgid for signals */
u_long so_oobmark; /* chars to oob mark */
