diff options
Diffstat (limited to 'src/socket.cpp')
| -rw-r--r-- | src/socket.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/socket.cpp b/src/socket.cpp index e82052f77..17fa1924d 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -44,8 +44,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <windows.h> #include <winsock2.h> #include <ws2tcpip.h> -typedef SOCKET socket_t; -typedef int socklen_t; + #define LAST_SOCKET_ERR() WSAGetLastError() + typedef SOCKET socket_t; + typedef int socklen_t; #else #include <sys/types.h> #include <sys/socket.h> @@ -54,7 +55,8 @@ typedef int socklen_t; #include <netdb.h> #include <unistd.h> #include <arpa/inet.h> -typedef int socket_t; + #define LAST_SOCKET_ERR() (errno) + typedef int socket_t; #endif // Set to true to enable verbose debug output @@ -339,7 +341,8 @@ bool UDPSocket::init(bool ipv6, bool noExceptions) if (noExceptions) { return false; } else { - throw SocketException("Failed to create socket"); + throw SocketException(std::string("Failed to create socket: error ") + + itos(LAST_SOCKET_ERR())); } } @@ -571,9 +574,8 @@ bool UDPSocket::WaitData(int timeout_ms) int e = WSAGetLastError(); dstream << (int) m_handle << ": WSAGetLastError()=" << e << std::endl; - if(e == 10004 /* = WSAEINTR */ || e == 10009 /*WSAEBADF*/) - { - dstream << "WARNING: Ignoring WSAEINTR/WSAEBADF." << std::endl; + if (e == 10004 /* WSAEINTR */ || e == 10009 /* WSAEBADF */) { + infostream << "Ignoring WSAEINTR/WSAEBADF." << std::endl; return false; } #endif |