* http://www.pulse-eight.net/
*/
-#include "../os.h"
-#include "../util/timeutils.h"
+#include "lib/platform/os.h"
+#include "lib/platform/util/timeutils.h"
#include <ws2spi.h>
#include <ws2ipdef.h>
ssize_t iReturn = send(socket, (char*)data, (int)len, 0);
if (iReturn < (ssize_t)len)
- *iError = errno;
+ *iError = GetSocketError();
return iReturn;
}
tv.tv_usec = 1000 * (long)(iTimeoutMs % 1000);
FD_ZERO(&fd_read);
+ #pragma warning(disable:4127) /* disable 'conditional expression is constant' */
FD_SET(socket, &fd_read);
+ #pragma warning(default:4127)
if (select((int)socket + 1, &fd_read, NULL, NULL, &tv) == 0)
+ {
+ *iError = ETIMEDOUT;
return ETIMEDOUT;
+ }
TcpSocketSetBlocking(socket, false);
}
ssize_t iReadResult = (iTimeoutMs > 0) ?
- recv(socket, (char*)data + iBytesRead, (int)(len - iBytesRead), MSG_WAITALL) :
+ recv(socket, (char*)data + iBytesRead, (int)(len - iBytesRead), 0) :
recv(socket, (char*)data, (int)len, MSG_WAITALL);
*iError = GetSocketError();
+
+ if (iTimeoutMs > 0)
+ {
+ TcpSocketSetBlocking(socket, true);
+ iNow = GetTimeMs();
+ }
+
if (iReadResult < 0)
{
- if (errno == EAGAIN && iTimeoutMs > 0)
+ if (*iError == EAGAIN && iTimeoutMs > 0)
continue;
- *iError = errno;
return -1;
}
else if (iReadResult == 0 || (iReadResult != (ssize_t)len && iTimeoutMs == 0))
}
iBytesRead += iReadResult;
-
- if (iTimeoutMs > 0)
- {
- TcpSocketSetBlocking(socket, true);
- iNow = GetTimeMs();
- }
}
- return 0;
+
+ if (iBytesRead < (ssize_t)len && *iError == 0)
+ *iError = ETIMEDOUT;
+
+ return iBytesRead;
}
inline bool TcpResolveAddress(const char *strHost, uint16_t iPort, int *iError, struct addrinfo **info)
FD_ZERO(&fd_write);
FD_ZERO(&fd_except);
+ #pragma warning(disable:4127) /* disable 'conditional expression is constant' */
FD_SET(socket, &fd_write);
FD_SET(socket, &fd_except);
+ #pragma warning(default:4127)
int iPollResult = select(sizeof(socket)*8, NULL, &fd_write, &fd_except, &tv);
if (iPollResult == 0)
}
else
{
- *iError = errno;
+ *iError = GetSocketError();
}
}