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

diff --git a/source/http/client.h b/source/http/client.h
index c8b154c..b1f097d 100644
--- a/source/http/client.h
+++ b/source/http/client.h
@@ -1,54 +1,63 @@
 #ifndef MSP_HTTP_CLIENT_H_
 #define MSP_HTTP_CLIENT_H_
 
+#include <memory>
 #include <string>
 #include <sigc++/signal.h>
 #include <msp/io/eventdispatcher.h>
+#include <msp/net/mspnet_api.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;
 
-class Client
+class MSPNET_API 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:
-	Net::StreamSocket *sock;
-	IO::EventDispatcher *event_disp;
-	std::string user_agent;
-	Request *request;
-	Response *response;
+	struct ResolveListener: public sigc::trackable
+	{
+		Client &client;
+
+		ResolveListener(Client &);
+
+		void address_resolved(unsigned, const Net::SockAddr &);
+		void resolve_failed(unsigned, const std::exception &);
+	};
+
+	std::unique_ptr<Net::StreamSocket> sock;
+	IO::EventDispatcher *event_disp = nullptr;
+	Net::Resolver *resolver = nullptr;
+	std::unique_ptr<ResolveListener> resolve_listener;
+	unsigned resolve_tag = 0;
+	std::string user_agent = "libmspnet/1.0";
+	std::unique_ptr<Request> request;
+	std::unique_ptr<Response> response;
 	std::string in_buf;
 
-	Client(const Client &);
-	Client &operator=(const Client &);
 public:
-	Client();
 	~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 &);
 	void tick();
 	void wait_response();
 	void abort();
-	const Request *get_request() const { return request; }
-	const Response *get_response() const { return response; }
+	const Request *get_request() const { return request.get(); }
+	const Response *get_response() const { return response.get(); }
 private:
+	void address_resolved(unsigned, const Net::SockAddr &);
+	void resolve_failed(unsigned, const std::exception &);
 	void connect_finished(const std::exception *);
 	void data_available();
 };