i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When creating a socket file descriptor fetch the SO_NONBLOCK value from

Browse Source 
the socket first, so the FD open flags are in sync with that. Fixes
situations where a socket accept()ed from a non-blocking listener socket
wouldn't have O_NONBLOCK set.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25288 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-05-02 02:30:16 +00:00
parent 3dba513f4c
commit 6f57d9d066
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/socket.cpp
+10 -1
View File
@@ -326,6 +326,15 @@ static struct fd_ops sSocketFDOps = {
static int static int
create_socket_fd(net_socket* socket, bool kernel) create_socket_fd(net_socket* socket, bool kernel)
{ {
// Get the socket's non-blocking flag, so we can set the respective
// open mode flag.
int32 nonBlock;
socklen_t nonBlockLen = sizeof(int32);
status_t error = sStackInterface->getsockopt(socket, SOL_SOCKET,
SO_NONBLOCK, &nonBlock, &nonBlockLen);
if (error != B_OK)
return error;
// allocate a file descriptor // allocate a file descriptor
file_descriptor* descriptor = alloc_fd(); file_descriptor* descriptor = alloc_fd();
if (descriptor == NULL) if (descriptor == NULL)
@@ -335,7 +344,7 @@ create_socket_fd(net_socket* socket, bool kernel)
descriptor->type = FDTYPE_SOCKET; descriptor->type = FDTYPE_SOCKET;
descriptor->ops = &sSocketFDOps; descriptor->ops = &sSocketFDOps;
descriptor->u.socket = socket; descriptor->u.socket = socket;
descriptor->open_mode = O_RDWR; descriptor->open_mode = O_RDWR | (nonBlock ? O_NONBLOCK : 0);
// publish it // publish it
int fd = new_fd(get_current_io_context(kernel), descriptor); int fd = new_fd(get_current_io_context(kernel), descriptor);