Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DatagramSocket: don't use absolute timeout 0.

Browse Source 
* Use relative instead, or else the return value will be B_TIMED_OUT instead
  of B_WOULD_BLOCK.
* This fixes bug #9734.
This commit is contained in:
Axel Dörfler 2013-05-03 21:03:54 +02:00
parent e5d65858f2
commit 4e78098e7c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/private/net/ProtocolUtilities.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2007-2010, Haiku, Inc. All Rights Reserved.
* Copyright 2007-2013, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -37,6 +37,7 @@ public:
extern net_buffer_module_info* gBufferModule;
extern net_stack_module_info* gStackModule;
class NetModuleBundleGetter {
public:
static net_stack_module_info* Stack() { return gStackModule; }
@ -294,7 +295,7 @@ DECL_DATAGRAM_SOCKET(inline status_t)::SocketStatus(bool peek) const
{
if (peek)
return fSocket->error;
status_t status = fSocket->error;
fSocket->error = B_OK;
@ -345,7 +346,7 @@ DECL_DATAGRAM_SOCKET(inline status_t)::_Wait(bigtime_t timeout)
{
LockingBase::Unlock(&fLock);
status_t status = acquire_sem_etc(fNotify, 1, B_CAN_INTERRUPT
| B_ABSOLUTE_TIMEOUT, timeout);
| (timeout != 0 ? B_ABSOLUTE_TIMEOUT : B_RELATIVE_TIMEOUT), timeout);
LockingBase::Lock(&fLock);
return status;