X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=client.cpp;h=e7a12f6c8ef395691f3dfa86efc12d2fda228efe;hp=d0ab8f8fcdb163129a548f6ef1e9bddd6b88cc33;hb=b57530552825a13a3cd1924bda99e5e237c722a4;hpb=99b7dfe076577261c3e6093d75714f75425880d5

diff --git a/client.cpp b/client.cpp
index d0ab8f8..e7a12f6 100644
--- a/client.cpp
+++ b/client.cpp
@@ -5,7 +5,6 @@
 
 #include "client.h"
 #include "log.h"
-#include "markpool.h"
 #include "state.pb.h"
 #include "stream.h"
 
@@ -17,8 +16,6 @@ using namespace std;
 
 Client::Client(int sock)
 	: sock(sock),
-	  fwmark(0),
-	  connect_time(time(NULL)),
 	  state(Client::READING_REQUEST),
 	  stream(NULL),
 	  header_or_error_bytes_sent(0),
@@ -29,6 +26,11 @@ Client::Client(int sock)
 {
 	request.reserve(1024);
 
+	if (clock_gettime(CLOCK_MONOTONIC_COARSE, &connect_time) == -1) {
+		log_perror("clock_gettime(CLOCK_MONOTONIC_COARSE)");
+		return;
+	}
+
 	// Find the remote address, and convert it to ASCII.
 	sockaddr_in6 addr;
 	socklen_t addr_len = sizeof(addr);
@@ -61,7 +63,6 @@ Client::Client(int sock)
 Client::Client(const ClientProto &serialized, Stream *stream)
 	: sock(serialized.sock()),
 	  remote_addr(serialized.remote_addr()),
-	  connect_time(serialized.connect_time()),
 	  state(State(serialized.state())),
 	  request(serialized.request()),
 	  url(serialized.url()),
@@ -73,17 +74,6 @@ Client::Client(const ClientProto &serialized, Stream *stream)
 	  bytes_lost(serialized.bytes_lost()),
 	  num_loss_events(serialized.num_loss_events())
 {
-	if (stream != NULL && stream->mark_pool != NULL) {
-		fwmark = stream->mark_pool->get_mark();
-	} else {
-		fwmark = 0;  // No mark.
-	}
-	if (setsockopt(sock, SOL_SOCKET, SO_MARK, &fwmark, sizeof(fwmark)) == -1) {
-		if (fwmark != 0) {
-			log_perror("setsockopt(SO_MARK)");
-		}
-		fwmark = 0;
-	}
 	if (stream != NULL) {
 		if (setsockopt(sock, SOL_SOCKET, SO_MAX_PACING_RATE, &stream->pacing_rate, sizeof(stream->pacing_rate)) == -1) {
 			if (stream->pacing_rate != ~0U) {
@@ -91,6 +81,17 @@ Client::Client(const ClientProto &serialized, Stream *stream)
 			}
 		}
 	}
+	if (serialized.has_connect_time_old()) {
+		// Do a rough conversion from time() to monotonic time.
+		if (clock_gettime(CLOCK_MONOTONIC_COARSE, &connect_time) == -1) {
+			log_perror("clock_gettime(CLOCK_MONOTONIC_COARSE)");
+			return;
+		}
+		connect_time.tv_sec += serialized.connect_time_old() - time(NULL);
+	} else {
+		connect_time.tv_sec = serialized.connect_time_sec();
+		connect_time.tv_nsec = serialized.connect_time_nsec();
+	}
 }
 
 ClientProto Client::serialize() const
@@ -98,7 +99,8 @@ ClientProto Client::serialize() const
 	ClientProto serialized;
 	serialized.set_sock(sock);
 	serialized.set_remote_addr(remote_addr);
-	serialized.set_connect_time(connect_time);
+	serialized.set_connect_time_sec(connect_time.tv_sec);
+	serialized.set_connect_time_nsec(connect_time.tv_nsec);
 	serialized.set_state(state);
 	serialized.set_request(request);
 	serialized.set_url(url);
@@ -120,7 +122,6 @@ ClientStats Client::get_stats() const
 		stats.url = url;
 	}
 	stats.sock = sock;
-	stats.fwmark = fwmark;
 	stats.remote_addr = remote_addr;
 	stats.connect_time = connect_time;
 	stats.bytes_sent = bytes_sent;