Module Name: src
Committed By: snj
Date: Fri Jul 21 03:55:56 UTC 2017
Modified Files:
src/sys/kern [netbsd-6-0]: uipc_socket.c uipc_syscalls.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1453):
sys/kern/uipc_socket.c: revision 1.213
sys/kern/uipc_syscalls.c: revision 1.160
PR/47569: Valery Ushakov: SOCK_NONBLOCK does not work because it does not
set SS_NBIO.
XXX: there are too many flags that mean the same thing in too many places,
and too many flags that mean the same thing and are different.
To generate a diff of this commit:
cvs rdiff -u -r1.209.2.1.4.2 -r1.209.2.1.4.3 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.154.2.1.4.2 -r1.154.2.1.4.3 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/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.209.2.1.4.2 src/sys/kern/uipc_socket.c:1.209.2.1.4.3
--- src/sys/kern/uipc_socket.c:1.209.2.1.4.2 Mon Nov 25 08:27:01 2013
+++ src/sys/kern/uipc_socket.c Fri Jul 21 03:55:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.209.2.1.4.2 2013/11/25 08:27:01 bouyer Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.209.2.1.4.3 2017/07/21 03:55:56 snj Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.1.4.2 2013/11/25 08:27:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.1.4.3 2017/07/21 03:55:56 snj Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -585,6 +585,8 @@ fsocreate(int domain, struct socket **so
fp->f_data = so;
fd_affix(curproc, fp, fd);
*fdout = fd;
+ if (flags & SOCK_NONBLOCK)
+ so->so_state |= SS_NBIO;
}
return error;
}
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.154.2.1.4.2 src/sys/kern/uipc_syscalls.c:1.154.2.1.4.3
--- src/sys/kern/uipc_syscalls.c:1.154.2.1.4.2 Sat Dec 14 19:37:02 2013
+++ src/sys/kern/uipc_syscalls.c Fri Jul 21 03:55:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.154.2.1.4.2 2013/12/14 19:37:02 bouyer Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.154.2.1.4.3 2017/07/21 03:55:56 snj 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.154.2.1.4.2 2013/12/14 19:37:02 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.154.2.1.4.3 2017/07/21 03:55:56 snj Exp $");
#include "opt_pipe.h"
@@ -235,6 +235,8 @@ do_sys_accept(struct lwp *l, int sock, s
((flags & SOCK_NOSIGPIPE) ? FNOSIGPIPE : 0);
fp2->f_ops = &socketops;
fp2->f_data = so2;
+ if (flags & SOCK_NONBLOCK)
+ so2->so_state |= SS_NBIO;
error = soaccept(so2, nam);
so2->so_cred = kauth_cred_dup(so->so_cred);
sounlock(so);
@@ -425,6 +427,8 @@ makesocket(struct lwp *l, file_t **fp, i
(*fp)->f_type = DTYPE_SOCKET;
(*fp)->f_ops = &socketops;
(*fp)->f_data = so;
+ if (flags & SOCK_NONBLOCK)
+ so->so_state |= SS_NBIO;
return 0;
}
