|
@@ -101,14 +101,6 @@ bool TCPSocket::open(uint16_t port)
|
|
|
|
|
|
|
|
m_active_socket = asd;
|
|
m_active_socket = asd;
|
|
|
|
|
|
|
|
- if (fcntl(m_active_socket, F_SETFL, O_NONBLOCK, 1) == -1)
|
|
|
|
|
- {
|
|
|
|
|
- os::printf("Failed to set non-blocking socket\n");
|
|
|
|
|
- close();
|
|
|
|
|
-
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -192,7 +184,7 @@ size_t TCPSocket::receive(void* data, size_t size)
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- ssize_t received_bytes = ::recv(m_active_socket, (char*) data, size, 0);
|
|
|
|
|
|
|
+ ssize_t received_bytes = ::read(m_active_socket, (char*) data, size);
|
|
|
if (received_bytes <= 0)
|
|
if (received_bytes <= 0)
|
|
|
{
|
|
{
|
|
|
return 0;
|
|
return 0;
|