X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.h;h=14537c85c6010900b8cb6c096cd8f48606ac648b;hp=508eb59ae68cac1ba029c88caae5f67bbff73000;hb=e1722a5c0341fd541ce57f1eed4dc76cbd3efe07;hpb=6d062eab70fd6528219545846e6c19c1cad35a3d

diff --git a/input.h b/input.h
index 508eb59..14537c8 100644
--- a/input.h
+++ b/input.h
@@ -4,37 +4,66 @@
 #include <vector>
 #include <string>
 
-class Input {
+#include "thread.h"
+
+class InputProto;
+
+class Input : public Thread {
 public:
 	Input(const std::string &stream_id, const std::string &url);
 
-	// Connect to the given URL and start streaming.
-	void run();
+	// Serialization/deserialization.
+	Input(const InputProto &serialized);
+	InputProto serialize() const;
 
-	// Stop streaming. NOTE: Does not currently work!
-	void stop();
+	std::string get_url() const { return url; }
 
 private:
-	// Recovers the this pointer and calls do_work().
-	static void *do_work_thunk(void *arg);
-
 	// Actually does the download.
-	void do_work();
+	virtual void do_work();
+	
+	// Open a socket that connects to the given host and port. Does DNS resolving.
+	int lookup_and_connect(const std::string &host, const std::string &port);
 
-	// Recovers the this pointer and calls curl_callback().
-	static size_t curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata);
+	// Parses a HTTP response. Returns false if it not a 200.
+	bool parse_response(const std::string &response);
 
 	// Stores the given data, looks for Metacube blocks (skipping data if needed),
 	// and calls process_block() for each one.
-	void curl_callback(char *ptr, size_t bytes);
-	void process_block(const char *data, uint32_t size, uint32_t flags);
+	void process_data(char *ptr, size_t bytes);
 
 	// Drops <num_bytes> bytes from the head of <pending_data>,
 	// and outputs a warning.
 	void drop_pending_data(size_t num_bytes);
 
+	enum State {
+		NOT_CONNECTED,
+		SENDING_REQUEST,
+		RECEIVING_HEADER,
+		RECEIVING_DATA,
+		CLOSING_SOCKET,  // Due to error.
+	};
+	State state;
+
 	std::string stream_id;
+
+	// The URL and its parsed components.
 	std::string url;
+	std::string host, port, path;
+
+	// The HTTP request, with headers and all.
+	// Only relevant for SENDING_REQUEST.
+	std::string request;
+
+	// How many bytes we've sent of the request so far.
+	// Only relevant for SENDING_REQUEST.
+	size_t request_bytes_sent;
+
+	// The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
+	std::string response;
+
+	// The HTTP respones headers we want to give clients for this input.
+	std::string http_header;
 
 	// Data we have received but not fully processed yet.
 	std::vector<char> pending_data;
@@ -43,10 +72,8 @@ private:
 	// this is true.
 	bool has_metacube_header;
 
-	pthread_t worker_thread;
-
-	// Whether we should stop or not.
-	volatile bool should_stop;
+	// The socket we are downloading on (or -1).
+	int sock;	
 };
 
 #endif  // !defined(_INPUT_H)