X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=51b4f412582bb94d512b074249d5375f94804bfb;hp=8a3c371a7df88a618caa92227be4b77e50bf110c;hb=340489a8e732519182ecbc92116e7dfa2997143c;hpb=b2a5d0a3b9e6ad819ec7d9b427f94a58177e6dae

diff --git a/httpinput.cpp b/httpinput.cpp
index 8a3c371..51b4f41 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -27,9 +27,8 @@ using namespace std;
 
 extern ServerPool *servers;
 	  
-HTTPInput::HTTPInput(const string &stream_id, const string &url)
+HTTPInput::HTTPInput(const string &url)
 	: state(NOT_CONNECTED),
-	  stream_id(stream_id),
 	  url(url),
 	  has_metacube_header(false),
 	  sock(-1)
@@ -38,7 +37,6 @@ HTTPInput::HTTPInput(const string &stream_id, const string &url)
 
 HTTPInput::HTTPInput(const InputProto &serialized)
 	: state(State(serialized.state())),
-	  stream_id(serialized.stream_id()),
 	  url(serialized.url()),
 	  request(serialized.request()),
 	  request_bytes_sent(serialized.request_bytes_sent()),
@@ -70,7 +68,6 @@ InputProto HTTPInput::serialize() const
 {
 	InputProto serialized;
 	serialized.set_state(state);
-	serialized.set_stream_id(stream_id);
 	serialized.set_url(url);
 	serialized.set_request(request);
 	serialized.set_request_bytes_sent(request_bytes_sent);
@@ -88,11 +85,13 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 	int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
 	if (err == -1) {
 		log(WARNING, "[%s] Lookup of '%s' failed (%s).",
-			stream_id.c_str(), host.c_str(), gai_strerror(err));
+			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) {
 		int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
@@ -106,7 +105,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 		} while (err == -1 && errno == EINTR);
 
 		if (err != -1) {
-			freeaddrinfo(ai);
+			freeaddrinfo(base_ai);
 			return sock;
 		}
 
@@ -124,8 +123,8 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 
 	// Give the last one as error.
 	log(WARNING, "[%s] Connect to '%s' failed (%s)",
-	        stream_id.c_str(), host.c_str(), strerror(errno));
-	freeaddrinfo(ai);
+	        url.c_str(), host.c_str(), strerror(errno));
+	freeaddrinfo(base_ai);
 	return -1;
 }
 	
@@ -133,21 +132,21 @@ bool HTTPInput::parse_response(const std::string &request)
 {
 	vector<string> lines = split_lines(response);
 	if (lines.empty()) {
-		log(WARNING, "[%s] Empty HTTP response from input.", stream_id.c_str());
+		log(WARNING, "[%s] Empty HTTP response from input.", url.c_str());
 		return false;
 	}
 
 	vector<string> first_line_tokens = split_tokens(lines[0]);
 	if (first_line_tokens.size() < 2) {
 		log(WARNING, "[%s] Malformed response line '%s' from input.",
-		        stream_id.c_str(), lines[0].c_str());
+		        url.c_str(), lines[0].c_str());
 		return false;
 	}
 
 	int response = atoi(first_line_tokens[1].c_str());
 	if (response != 200) {
 		log(WARNING, "[%s] Non-200 response '%s' from input.",
-			stream_id.c_str(), lines[0].c_str());
+			url.c_str(), lines[0].c_str());
 		return false;
 	}
 
@@ -156,7 +155,7 @@ bool HTTPInput::parse_response(const std::string &request)
 		size_t split = lines[i].find(":");
 		if (split == string::npos) {
 			log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'",
-			        stream_id.c_str(), lines[i].c_str());
+			        url.c_str(), lines[i].c_str());
 			continue;
 		}
 
@@ -201,8 +200,11 @@ bool HTTPInput::parse_response(const std::string &request)
 	     ++it) {
 		http_header.append(it->first + ": " + it->second + "\r\n");
 	}
-	http_header.append("\r\n");	
-	servers->set_header(stream_id, http_header);
+	http_header.append("\r\n");
+
+	for (size_t i = 0; i < stream_ids.size(); ++i) {
+		servers->set_header(stream_ids[i], http_header);
+	}
 
 	return true;
 }
@@ -234,12 +236,14 @@ void HTTPInput::do_work()
 			request_bytes_sent = 0;
 			response.clear();
 			pending_data.clear();
-			servers->set_header(stream_id, "");
+			for (size_t i = 0; i < stream_ids.size(); ++i) {
+				servers->set_header(stream_ids[i], "");
+			}
 
 			{
 				string protocol;  // Thrown away.
 				if (!parse_url(url, &protocol, &host, &port, &path)) {
-					log(WARNING, "[%s] Failed to parse URL '%s'", stream_id.c_str(), url.c_str());
+					log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
 					break;
 				}
 			}
@@ -297,7 +301,7 @@ void HTTPInput::do_work()
 			if (ret == 0) {
 				// This really shouldn't happen...
 				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
-				           stream_id.c_str());
+				           url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -305,7 +309,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!", stream_id.c_str());
+				log(WARNING, "[%s] Sever sent overlong HTTP response!", url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {
@@ -332,6 +336,8 @@ void HTTPInput::do_work()
 				process_data(&extra_data[0], extra_data.size());
 			}
 
+			log(INFO, "[%s] Connected to '%s', receiving data.",
+				   url.c_str(), url.c_str());
 			state = RECEIVING_DATA;
 			break;
 		}
@@ -352,7 +358,7 @@ void HTTPInput::do_work()
 			if (ret == 0) {
 				// This really shouldn't happen...
 				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
-				           stream_id.c_str());
+				           url.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -381,7 +387,7 @@ void HTTPInput::do_work()
 		// or the connection just got closed.
 		// The earlier steps have already given the error message, if any.
 		if (state == NOT_CONNECTED && !should_stop) {
-			log(INFO, "[%s] Waiting 0.2 second and restarting...", stream_id.c_str());
+			log(INFO, "[%s] Waiting 0.2 second and restarting...", url.c_str());
 			usleep(200000);
 		}
 	}
@@ -437,9 +443,13 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 		char *inner_data = pending_data.data() + sizeof(metacube_block_header);
 		if (flags & METACUBE_FLAGS_HEADER) {
 			string header(inner_data, inner_data + size);
-			servers->set_header(stream_id, http_header + header);
+			for (size_t i = 0; i < stream_ids.size(); ++i) {
+				servers->set_header(stream_ids[i], http_header + header);
+			}
 		} else { 
-			servers->add_data(stream_id, inner_data, size);
+			for (size_t i = 0; i < stream_ids.size(); ++i) {
+				servers->add_data(stream_ids[i], inner_data, size);
+			}
 		}
 
 		// Consume the block. This isn't the most efficient way of dealing with things
@@ -456,7 +466,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 		return;
 	}
 	log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?",
-		stream_id.c_str(), (long long)num_bytes);
+		url.c_str(), (long long)num_bytes);
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }