X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=a3a950b03a9876c33fbd1de794e25549eea0b7c9;hp=2a101bd31dd94fecd9fa7cd9021e31867131163e;hb=c73067960fde76968fc7b460064277d93be2c05f;hpb=562cf44b96b5c0260d1a1ab18b2dd2408b6d1fc8

diff --git a/httpinput.cpp b/httpinput.cpp
index 2a101bd..a3a950b 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -62,7 +62,9 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 
 void HTTPInput::close_socket()
 {
-	safe_close(sock);
+	if (sock != -1) {
+		safe_close(sock);
+	}
 }
 
 InputProto HTTPInput::serialize() const
@@ -84,17 +86,16 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 {
 	addrinfo *ai;
 	int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
-	if (err == -1) {
+	if (err != 0) {
 		log(WARNING, "[%s] Lookup of '%s' failed (%s).",
 			url.c_str(), host.c_str(), gai_strerror(err));
-		freeaddrinfo(ai);
 		return -1;
 	}
 
 	addrinfo *base_ai = ai;
 
 	// Connect to everything in turn until we have a socket.
-	while (ai && !should_stop()) {
+	for ( ; ai && !should_stop(); ai = ai->ai_next) {
 		int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 		if (sock == -1) {
 			// Could be e.g. EPROTONOSUPPORT. The show must go on.
@@ -152,7 +153,6 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 		}
 
 		safe_close(sock);
-		ai = ai->ai_next;
 	}
 
 	// Give the last one as error.
@@ -264,6 +264,7 @@ void HTTPInput::do_work()
 			request_bytes_sent = 0;
 			response.clear();
 			pending_data.clear();
+			has_metacube_header = false;
 			for (size_t i = 0; i < stream_indices.size(); ++i) {
 				servers->set_header(stream_indices[i], "", "");
 			}
@@ -351,7 +352,7 @@ void HTTPInput::do_work()
 				char *ptr = static_cast<char *>(
 					memmem(response.data(), response.size(), "\r\n\r\n", 4));
 				assert(ptr != NULL);
-				extra_data = string(ptr, &response[0] + response.size());
+				extra_data = string(ptr + 4, &response[0] + response.size());
 				response.resize(ptr - response.data());
 			}
 
@@ -385,7 +386,7 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				log(ERROR, "[%s] Socket unexpectedly closed while reading data",
 				           url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
@@ -457,6 +458,11 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 		uint32_t size = ntohl(hdr->size);
 		uint32_t flags = ntohl(hdr->flags);
 
+		if (size > 65535) {
+			log(WARNING, "[%s] Metacube block of %x bytes (flags=%x); corrupted header?",
+				url.c_str(), size, flags);
+		}
+
 		// See if we have the entire block. If not, wait for more data.
 		if (pending_data.size() < sizeof(metacube_block_header) + size) {
 			return;
@@ -490,6 +496,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 	}
 	log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube 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);
 }