Ticket #7870: NetEndpoint.cpp.diff

NetEndpoint.cpp

@@ -294 +294 @@
 void
 BNetEndpoint::SetTimeout(bigtime_t timeout)
 {
-    fTimeout = timeout;
-    // TODO: Map value < 0 to B_INFINITE_TIMEOUT or use -1 by default.
+    fTimeout = timeout < 0 ? B_INFINITE_TIMEOUT : timeout;
 }
 
 
@@ -417 +416 @@
 BNetEndpoint*
 BNetEndpoint::Accept(int32 timeout)
 {
-    // TODO: IsDataPending() expects 0 as special value for infinite timeout,
-    // hence the following call is broken for timeout < 0 and timeout == 0.
     if (!IsDataPending(timeout < 0 ? B_INFINITE_TIMEOUT : 1000LL * timeout))
         return NULL;
 
@@ -465 +462 @@
     FD_ZERO(&fds);
     FD_SET(fSocket, &fds);
 
-    if (timeout > 0) {
+    if (timeout >= 0) {
         tv.tv_sec = timeout / 1000000;
             // TODO: A big value (e.g. B_INFINITE_TIMEOUT) will overflow!
         tv.tv_usec = (timeout % 1000000);
     }
 
-    if (select(fSocket + 1, &fds, NULL, NULL, timeout > 0 ? &tv : NULL) < 0) {
+    if (select(fSocket + 1, &fds, NULL, NULL, timeout >= 0 ? &tv : NULL) < 0) {
         fStatus = errno;
         return false;
     }
@@ -486 +483 @@
     if (fSocket < 0 && _SetupSocket() != B_OK)
         return fStatus;
 
-    // TODO: For fTimeout == 0 this is broken as IsDataPending(0) means wait
-    // without timeout. Furthermore the default fTimeout is B_INFINITE_TIMEOUT.
     if (fTimeout >= 0 && IsDataPending(fTimeout) == false)
         return 0;
 
@@ -516 +511 @@
     if (fSocket < 0 && _SetupSocket() != B_OK)
         return fStatus;
 
-    // TODO: For fTimeout == 0 this is broken as IsDataPending(0) means wait
-    // without timeout. Furthermore the default fTimeout is B_INFINITE_TIMEOUT.
     if (fTimeout >= 0 && IsDataPending(fTimeout) == false)
         return 0;