Improve error handling

[libs/net.git] / source / net / resolve.cpp

diff --git a/source/net/resolve.cpp b/source/net/resolve.cpp
index 992973a01dea4f73c51b54600748b0015ce0542b..006f210d777eb2aa38d7e5df91ecc1c25ca20c0d 100644 (file)
--- a/source/net/resolve.cpp
+++ b/source/net/resolve.cpp
@@ -1,9 +1,4 @@
-#ifdef WIN32
-#define _WIN32_WINNT 0x0501
-#include <ws2tcpip.h>
-#else
-#include <netdb.h>
-#endif
+#include "platform_api.h"
 #include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
 #include "sockaddr_private.h"
@@ -70,7 +65,7 @@ SockAddr *resolve(const string &host, const string &serv, Family family)
                return addr;
        }
        else
-#ifdef WIN32
+#ifdef _WIN32
                throw system_error("getaddrinfo", WSAGetLastError());
 #else
                throw system_error("getaddrinfo", gai_strerror(err));
@@ -137,7 +132,16 @@ void Resolver::task_done()
                if(task->addr)
                        signal_address_resolved.emit(task->tag, *task->addr);
                else if(task->error)
+               {
+                       if(signal_resolve_failed.empty())
+                       {
+                               RefPtr<runtime_error> err = task->error;
+                               task->error = 0;
+                               thread.pop_complete_task();
+                               throw *err;
+                       }
                        signal_resolve_failed.emit(task->tag, *task->error);
+               }
                thread.pop_complete_task();
        }
 }
@@ -234,16 +238,5 @@ void Resolver::WorkerThread::main()
        }
 }
 
-               /*sockaddr sa;
-               unsigned size = fill_sockaddr(sa);
-               char hst[128];
-               char srv[128];
-               int err = getnameinfo(&sa, size, hst, 128, srv, 128, 0);
-               if(err==0)
-               {
-                       host = hst;
-                       serv = srv;
-               }*/
-
 } // namespace Net
 } // namespace Msp