X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=udpstream.cpp;h=fc003561ef0bb7c5a75e3a126fc93c559100eca3;hp=5f5d8468e3c19c68ebbe82219d668705f19e9876;hb=5cc8cd703a637e276c2595953878fd9561592bfa;hpb=b9d939606ebaf69e2c5a5d8b3e2d8e9adc0e69ae

diff --git a/udpstream.cpp b/udpstream.cpp
index 5f5d846..fc00356 100644
--- a/udpstream.cpp
+++ b/udpstream.cpp
@@ -2,7 +2,6 @@
 #include <sys/types.h>
 
 #include "log.h"
-#include "markpool.h"
 #include "udpstream.h"
 #include "util.h"
 
@@ -10,10 +9,8 @@
 #define SO_MAX_PACING_RATE 47
 #endif
 
-UDPStream::UDPStream(const sockaddr_in6 &dst, MarkPool *mark_pool, uint32_t pacing_rate)
+UDPStream::UDPStream(const sockaddr_in6 &dst, uint32_t pacing_rate)
 	: dst(dst),
-	  mark_pool(mark_pool),
-	  fwmark(0),
 	  pacing_rate(pacing_rate)
 {
 	sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
@@ -23,14 +20,6 @@ UDPStream::UDPStream(const sockaddr_in6 &dst, MarkPool *mark_pool, uint32_t paci
 		return;
 	}
 
-	if (mark_pool != NULL) {
-		fwmark = mark_pool->get_mark();
-		if (setsockopt(sock, SOL_SOCKET, SO_MARK, &fwmark, sizeof(fwmark)) == -1) {                          
-			if (fwmark != 0) {
-				log_perror("setsockopt(SO_MARK)");
-			}
-		}
-	}
 	if (setsockopt(sock, SOL_SOCKET, SO_MAX_PACING_RATE, &pacing_rate, sizeof(pacing_rate)) == -1) {
 		if (pacing_rate != ~0U) {
 			log_perror("setsockopt(SO_MAX_PACING_RATE)");
@@ -43,9 +32,6 @@ UDPStream::~UDPStream()
 	if (sock != -1) {
 		safe_close(sock);
 	}
-	if (mark_pool != NULL) {
-		mark_pool->release_mark(fwmark);
-	}
 }
 
 void UDPStream::send(const char *data, size_t bytes)