Write our own HTTP client instead of using curl. Not finished yet (missing URL parsin...

[cubemap] / input.h

diff --git a/input.h b/input.h
index 508eb59ae68cac1ba029c88caae5f67bbff73000..8a26ce6d1baad5887fe2b7831618c0fb0304ef9c 100644 (file)
--- a/input.h
+++ b/input.h
@@ -11,7 +11,7 @@ public:
        // Connect to the given URL and start streaming.
        void run();
 
-       // Stop streaming. NOTE: Does not currently work!
+       // Stops the streaming, but lets the file descriptor stay open.
        void stop();
 
 private:
@@ -20,21 +20,43 @@ private:
 
        // Actually does the download.
        void do_work();
-
-       // Recovers the this pointer and calls curl_callback().
-       static size_t curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata);
+       
+       // 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);
 
        // 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;
 
        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
@@ -43,6 +65,10 @@ private:
        // this is true.
        bool has_metacube_header;
 
+       // The socket we are downloading on (or -1).
+       int sock;       
+
+       // Handle to the thread that actually does the download.
        pthread_t worker_thread;
 
        // Whether we should stop or not.