*/
#include "socket.h"
+
+#ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ // Without this some of the network functions are not found on mingw
+ #ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x0501
+ #endif
+ #include <windows.h>
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #ifdef _MSC_VER
+ #pragma comment(lib, "ws2_32.lib")
+ #endif
+typedef SOCKET socket_t;
+typedef int socklen_t;
+#else
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <arpa/inet.h>
+typedef int socket_t;
+#endif
+
+#include "constants.h"
#include "debug.h"
#include <stdio.h>
#include <iostream>
#include <errno.h>
#include "utility.h"
-// Debug printing options
-// Set to 1 for debug output
-#define DP 0
+bool socket_enable_debug_output = false;
+#define DP socket_enable_debug_output
// This is prepended to everything printed here
#define DPS ""
dstream<<", size="<<size<<", data=";
for(int i=0; i<size && i<20; i++){
if(i%2==0) DEBUGPRINT(" ");
- DEBUGPRINT("%.2X", ((int)((const char*)data)[i])&0xff);
+ unsigned int a = ((const unsigned char*)data)[i];
+ DEBUGPRINT("%.2X", a);
}
if(size>20)
dstream<<"...";
dstream<<", size="<<received<<", data=";
for(int i=0; i<received && i<20; i++){
if(i%2==0) DEBUGPRINT(" ");
- DEBUGPRINT("%.2X", ((int)((const char*)data)[i])&0xff);
+ unsigned int a = ((const unsigned char*)data)[i];
+ DEBUGPRINT("%.2X", a);
}
if(received>20)
dstream<<"...";
<<timeout_ms<<")"<<std::endl;*/
return false;
}
+ else if(result < 0 && errno == EINTR){
+ return false;
+ }
else if(result < 0){
// Error
#ifndef DISABLE_ERRNO