X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=374441c32b30e604ec436f8cd62b8f058ed761d8;hp=c9231453e1e919062024073d1d73efa1dc1fd487;hb=b757a4a2ce9d24835b52a185134835762af2f50c;hpb=22cd7233eabd1d012f29e890ec67c6b70a0d6753

diff --git a/httpinput.cpp b/httpinput.cpp
index c923145..374441c 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #include <map>
@@ -22,6 +23,7 @@
 #include "parse.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "stream.h"
 #include "util.h"
 #include "version.h"
 
@@ -74,15 +76,8 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	pending_data.resize(serialized.pending_data().size());
 	memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
 
-	string protocol;
-	parse_url(url, &protocol, &host, &port, &path);  // Don't care if it fails.
-
-	// Older versions stored the extra \r\n in the HTTP header.
-	// Strip it if we find it.
-	if (http_header.size() >= 4 &&
-	    memcmp(http_header.data() + http_header.size() - 4, "\r\n\r\n", 4) == 0) {
-		http_header.resize(http_header.size() - 2);
-	}
+	string protocol, user;
+	parse_url(url, &protocol, &user, &host, &port, &path);  // Don't care if it fails.
 
 	pthread_mutex_init(&stats_mutex, NULL);
 	stats.url = url;
@@ -99,6 +94,7 @@ void HTTPInput::close_socket()
 {
 	if (sock != -1) {
 		safe_close(sock);
+		sock = -1;
 	}
 
 	MutexLock lock(&stats_mutex);
@@ -204,7 +200,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 	return -1;
 }
 	
-bool HTTPInput::parse_response(const std::string &request)
+bool HTTPInput::parse_response(const string &request)
 {
 	vector<string> lines = split_lines(response);
 	if (lines.empty()) {
@@ -226,31 +222,14 @@ bool HTTPInput::parse_response(const std::string &request)
 		return false;
 	}
 
-	multimap<string, string> parameters;
-	for (size_t i = 1; i < lines.size(); ++i) {
-		size_t split = lines[i].find(":");
-		if (split == string::npos) {
-			log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'",
-			        url.c_str(), lines[i].c_str());
-			continue;
-		}
-
-		string key(lines[i].begin(), lines[i].begin() + split);
-
-		// Skip any spaces after the colon.
-		do {
-			++split;
-		} while (split < lines[i].size() && lines[i][split] == ' ');
-
-		string value(lines[i].begin() + split, lines[i].end());
-
-		// Remove “Content-encoding: metacube”.
-		// TODO: Make case-insensitive.
-		if (key == "Content-encoding" && value == "metacube") {
-			continue;
-		}
+	multimap<string, string> parameters = extract_headers(lines, url);
 
-		parameters.insert(make_pair(key, value));
+	// Remove “Content-encoding: metacube”.
+	// TODO: Make case-insensitive.
+	multimap<string, string>::iterator encoding_it =
+		parameters.find("Content-encoding");
+	if (encoding_it != parameters.end() && encoding_it->second == "metacube") {
+		parameters.erase(encoding_it);
 	}
 
 	// Change “Server: foo” to “Server: metacube/0.1 (reflecting: foo)”
@@ -295,7 +274,7 @@ void HTTPInput::do_work()
 
 	// TODO: Make the timeout persist across restarts.
 	if (state == SENDING_REQUEST || state == RECEIVING_HEADER || state == RECEIVING_DATA) {
-		int err = clock_gettime(CLOCK_MONOTONIC, &last_activity);
+		int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity);
 		assert(err != -1);
 	}
 
@@ -305,7 +284,7 @@ void HTTPInput::do_work()
 			static const int timeout_secs = 30;
 
 			timespec now;
-			int err = clock_gettime(CLOCK_MONOTONIC, &now);
+			int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &now);
 			assert(err != -1);
 
 			timespec elapsed = clock_diff(last_activity, now);
@@ -324,7 +303,7 @@ void HTTPInput::do_work()
 
 			bool activity = wait_for_activity(sock, (state == SENDING_REQUEST) ? POLLOUT : POLLIN, &timeout);
 			if (activity) {
-				err = clock_gettime(CLOCK_MONOTONIC, &last_activity);
+				err = clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity);
 				assert(err != -1);
 			} else {
 				// OK. Most likely, should_stop was set, or we have timed out.
@@ -344,8 +323,8 @@ void HTTPInput::do_work()
 			}
 
 			{
-				string protocol;  // Thrown away.
-				if (!parse_url(url, &protocol, &host, &port, &path)) {
+				string protocol, user;  // Thrown away.
+				if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
 					log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
 					break;
 				}
@@ -366,7 +345,7 @@ void HTTPInput::do_work()
 
 				MutexLock lock(&stats_mutex);
 				stats.connect_time = time(NULL);
-				clock_gettime(CLOCK_MONOTONIC, &last_activity);
+				clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity);
 			}
 			break;
 		case SENDING_REQUEST: {
@@ -416,7 +395,7 @@ void HTTPInput::do_work()
 			RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
 			
 			if (status == RP_OUT_OF_SPACE) {
-				log(WARNING, "[%s] Sever sent overlong HTTP response!", url.c_str());
+				log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {
@@ -553,7 +532,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 			has_metacube_header = false;
 			continue;
 		}
-		if (size > 262144) {
+		if (size > 1048576) {
 			log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
 				url.c_str(), size, flags);
 		}
@@ -599,7 +578,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 	if (num_bytes == 0) {
 		return;
 	}
-	log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube2 stream?",
+	log(WARNING, "[%s] Dropping %lld junk bytes; not a Metacube2 stream, or data was dropped from the middle of the stream.",
 		url.c_str(), (long long)num_bytes);
 	assert(pending_data.size() >= num_bytes);
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);