Remove support for mark pools.

[cubemap] / client.cpp

diff --git a/client.cpp b/client.cpp
index d0ab8f8fcdb163129a548f6ef1e9bddd6b88cc33..b226d5e3fb916478f9dd5edb94cadb358d9c0dd1 100644 (file)
--- 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,7 +16,6 @@ using namespace std;
 
 Client::Client(int sock)
        : sock(sock),
-         fwmark(0),
          connect_time(time(NULL)),
          state(Client::READING_REQUEST),
          stream(NULL),
@@ -73,17 +71,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) {
@@ -120,7 +107,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;