X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fclient.h;h=e0b9b64f097b62c563480e0f879b2985cb5523c2;hb=5afa6e0e07b20ef58d262d69d96971df9a4be71f;hp=c8b154c728f56627c96454b42de767835f602246;hpb=add5c00b0b8a184c35473c20a65fa676525cf3f8;p=libs%2Fnet.git

diff --git a/source/http/client.h b/source/http/client.h
index c8b154c..e0b9b64 100644
--- a/source/http/client.h
+++ b/source/http/client.h
@@ -4,18 +4,12 @@
 #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;
 
@@ -23,11 +17,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;
@@ -40,6 +47,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 &);
@@ -49,6 +57,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();
 };