X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fresolve.h;h=3071b771f569aa57f196c41cc4f8f9520c715130;hb=HEAD;hp=21737ff4794bb0def530bd364cae00a2291ec1c2;hpb=fa637ffb18421300e401a782d28dd729a3960ac4;p=libs%2Fnet.git

diff --git a/source/net/resolve.h b/source/net/resolve.h
index 21737ff..3071b77 100644
--- a/source/net/resolve.h
+++ b/source/net/resolve.h
@@ -1,48 +1,47 @@
 #ifndef MSP_NET_RESOLVE_H_
 #define MSP_NET_RESOLVE_H_
 
+#include <deque>
+#include <memory>
 #include <string>
 #include <msp/core/mutex.h>
 #include <msp/core/semaphore.h>
 #include <msp/core/thread.h>
 #include <msp/io/eventdispatcher.h>
 #include <msp/io/pipe.h>
-#include "constants.h"
+#include "mspnet_api.h"
+#include "sockaddr.h"
 
 namespace Msp {
 namespace Net {
 
-class SockAddr;
-
 /** Resolves host and service names into a socket address.  If host is empty,
 the loopback address will be used.  If host is "*", the wildcard address will
 be used.  If service is empty, a socket address with a null service will be
 returned.  With the IP families, these are not very useful. */
-SockAddr *resolve(const std::string &, const std::string &, Family = UNSPEC);
+MSPNET_API SockAddr *resolve(const std::string &, const std::string &, Family = UNSPEC);
 
 /** And overload of resolve() that takes host and service as a single string,
 separated by a colon.  If the host part contains colons, such as is the case
 with a numeric IPv6 address, it must be enclosed in brackets. */
-SockAddr *resolve(const std::string &, Family = UNSPEC);
+MSPNET_API SockAddr *resolve(const std::string &, Family = UNSPEC);
 
 
 /**
 An asynchronous name resolver.  Blocking calls are performed in a thread and
 completion is notified with one of the two signals.
 */
-class Resolver
+class MSPNET_API Resolver
 {
 private:
 	struct Task
 	{
-		unsigned tag;
+		unsigned tag = 0;
 		std::string host;
 		std::string serv;
-		Family family;
-		SockAddr *addr;
-		std::runtime_error *error;
-
-		Task();
+		Family family = UNSPEC;
+		std::unique_ptr<SockAddr> addr;
+		std::unique_ptr<std::runtime_error> error;
 
 		bool is_complete() const { return addr || error; }
 	};
@@ -50,24 +49,24 @@ private:
 	class WorkerThread: public Thread
 	{
 	private:
-		std::list<Task> queue;
+		std::deque<Task> queue;
 		Mutex queue_mutex;
 		Semaphore sem;
 		IO::Pipe notify_pipe;
-		bool done;
+		bool done = false;
 
 	public:
 		WorkerThread();
 		~WorkerThread();
 
-		void add_task(const Task &);
+		void add_task(Task &&);
 		Task *get_complete_task();
 		void pop_complete_task();
 
 		IO::Pipe &get_notify_pipe() { return notify_pipe; }
 
 	private:
-		virtual void main();
+		void main() override;
 	};
 
 public:
@@ -75,9 +74,9 @@ public:
 	sigc::signal<void, unsigned, const std::exception &> signal_resolve_failed;
 
 private:
-	IO::EventDispatcher *event_disp;
+	IO::EventDispatcher *event_disp = nullptr;
 	WorkerThread thread;
-	unsigned next_tag;
+	unsigned next_tag = 1;
 
 public:
 	Resolver();