-#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"
return addr;
}
else
-#ifdef WIN32
+#ifdef _WIN32
throw system_error("getaddrinfo", WSAGetLastError());
#else
throw system_error("getaddrinfo", gai_strerror(err));
}
-Resolver::Resolver():
- event_disp(0),
- next_tag(1)
+Resolver::Resolver()
{
thread.get_notify_pipe().signal_data_available.connect(sigc::mem_fun(this, &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();
}
}
-Resolver::Task::Task():
- tag(0),
- family(UNSPEC),
- addr(0),
- error(0)
-{ }
-
-
Resolver::WorkerThread::WorkerThread():
Thread("Resolver"),
- sem(1),
- done(false)
+ sem(1)
{
launch();
}
Task *task = 0;
{
MutexLock lock(queue_mutex);
- for(list<Task>::iterator i=queue.begin(); (!task && i!=queue.end()); ++i)
+ for(auto i=queue.begin(); (!task && i!=queue.end()); ++i)
if(!i->is_complete())
task = &*i;
}
}
}
- /*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