X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=2e6e617bad9905c78e1b3b7427cd53f2e5a6bb3f;hp=1bd14dee87c7d022de1bea1d128059f43428aa8c;hb=cbdce14899459aca2e5331b6e1a969c359d28880;hpb=d4bc12548cd825607e257cbe01f3136ed524cb10

diff --git a/httpinput.cpp b/httpinput.cpp
index 1bd14de..2e6e617 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -39,6 +39,7 @@ HTTPInput::HTTPInput(const string &url)
 	stats.url = url;
 	stats.bytes_received = 0;
 	stats.data_bytes_received = 0;
+	stats.connect_time = -1;
 }
 
 HTTPInput::HTTPInput(const InputProto &serialized)
@@ -48,6 +49,7 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	  request_bytes_sent(serialized.request_bytes_sent()),
 	  response(serialized.response()),
 	  http_header(serialized.http_header()),
+	  stream_header(serialized.stream_header()),
 	  has_metacube_header(serialized.has_metacube_header()),
 	  sock(serialized.sock())
 {
@@ -68,6 +70,11 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	stats.url = url;
 	stats.bytes_received = serialized.bytes_received();
 	stats.data_bytes_received = serialized.data_bytes_received();
+	if (serialized.has_connect_time()) {
+		stats.connect_time = serialized.connect_time();
+	} else {
+		stats.connect_time = time(NULL);
+	}
 }
 
 void HTTPInput::close_socket()
@@ -75,6 +82,9 @@ void HTTPInput::close_socket()
 	if (sock != -1) {
 		safe_close(sock);
 	}
+
+	MutexLock lock(&stats_mutex);
+	stats.connect_time = -1;
 }
 
 InputProto HTTPInput::serialize() const
@@ -86,11 +96,13 @@ InputProto HTTPInput::serialize() const
 	serialized.set_request_bytes_sent(request_bytes_sent);
 	serialized.set_response(response);
 	serialized.set_http_header(http_header);
+	serialized.set_stream_header(stream_header);
 	serialized.set_pending_data(string(pending_data.begin(), pending_data.end()));
 	serialized.set_has_metacube_header(has_metacube_header);
 	serialized.set_sock(sock);
 	serialized.set_bytes_received(stats.bytes_received);
 	serialized.set_data_bytes_received(stats.data_bytes_received);
+	serialized.set_connect_time(stats.connect_time);
 	return serialized;
 }
 
@@ -253,7 +265,7 @@ bool HTTPInput::parse_response(const std::string &request)
 	}
 
 	for (size_t i = 0; i < stream_indices.size(); ++i) {
-		servers->set_header(stream_indices[i], http_header, "");
+		servers->set_header(stream_indices[i], http_header, stream_header);
 	}
 
 	return true;
@@ -301,6 +313,9 @@ void HTTPInput::do_work()
 					request = "GET " + path + " HTTP/1.0\r\nUser-Agent: cubemap\r\n\r\n";
 					request_bytes_sent = 0;
 				}
+
+				MutexLock lock(&stats_mutex);
+				stats.connect_time = time(NULL);
 			}
 			break;
 		case SENDING_REQUEST: {
@@ -491,9 +506,9 @@ 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);
+			stream_header = string(inner_data, inner_data + size);
 			for (size_t i = 0; i < stream_indices.size(); ++i) {
-				servers->set_header(stream_indices[i], http_header, header);
+				servers->set_header(stream_indices[i], http_header, stream_header);
 			}
 		} else {
 			StreamStartSuitability suitable_for_stream_start;
@@ -526,6 +541,12 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }
 
+void HTTPInput::add_destination(int stream_index)
+{
+	stream_indices.push_back(stream_index);
+	servers->set_header(stream_index, http_header, stream_header);
+}
+
 InputStats HTTPInput::get_stats() const
 {
 	MutexLock lock(&stats_mutex);