X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fhttp%2Fclient.h;h=ebb73216a4eacfbbdfce4cc511e86f1e771395ef;hp=ee10f8c1cb5a0e389d860c6b9c59ee6a45aeb9a4;hb=ebbf753626c9e5dd26743c379741c53f9f11866e;hpb=cf8d2e48581eeb8f1b83e8c48321a0bc2ffa6d83

diff --git a/source/http/client.h b/source/http/client.h
index ee10f8c..ebb7321 100644
--- a/source/http/client.h
+++ b/source/http/client.h
@@ -4,11 +4,19 @@
 #include <string>
 #include <sigc++/signal.h>
 #include <msp/io/eventdispatcher.h>
+#include <msp/net/resolve.h>
 #include <msp/net/streamsocket.h>
 
 namespace Msp {
 namespace Http {
 
+class client_busy: public std::logic_error
+{
+public:
+	client_busy(): std::logic_error(std::string()) { }
+	virtual ~client_busy() throw() { }
+};
+
 class Request;
 class Response;
 
@@ -16,11 +24,24 @@ class Client
 {
 public:
 	sigc::signal<void, const Response &> signal_response_complete;
-	sigc::signal<void, const std::exception *> signal_socket_error;
+	sigc::signal<void, const std::exception &> signal_socket_error;
 
 private:
+	struct ResolveListener: public sigc::trackable
+	{
+		Client &client;
+
+		ResolveListener(Client &);
+
+		void address_resolved(unsigned, const Net::SockAddr &);
+		void resolve_failed(unsigned, const std::exception &);
+	};
+
 	Net::StreamSocket *sock;
 	IO::EventDispatcher *event_disp;
+	Net::Resolver *resolver;
+	ResolveListener *resolve_listener;
+	unsigned resolve_tag;
 	std::string user_agent;
 	Request *request;
 	Response *response;
@@ -33,6 +54,7 @@ public:
 	~Client();
 
 	void use_event_dispatcher(IO::EventDispatcher *);
+	void use_resolver(Net::Resolver *);
 	void set_user_agent(const std::string &);
 	void start_request(const Request &);
 	const Response *get_url(const std::string &);
@@ -42,6 +64,8 @@ public:
 	const Request *get_request() const { return request; }
 	const Response *get_response() const { return response; }
 private:
+	void address_resolved(unsigned, const Net::SockAddr &);
+	void resolve_failed(unsigned, const std::exception &);
 	void connect_finished(const std::exception *);
 	void data_available();
 };