Merge 92ba6b439e6aed8557a315ebfcd350016159be52 into 2be5f1221a16ee9eb8f0355bf270f3a9258cee4d

tpws/helpers.c

@@ -19,9 +19,6 @@
 #endif
 
 #include "helpers.h"
-#ifdef __linux__
-#include <linux/tcp.h>
-#endif
 #include "linux_compat.h"
 
 int unique_size_t(size_t *pu, int ct)

tpws/linux_compat.h

@@ -1,14 +1,6 @@
 #ifdef __linux__
 
-#include <linux/types.h>
-
-#ifndef TCP_USER_TIMEOUT
-#define TCP_USER_TIMEOUT 18
-#endif
-
-#ifndef IP6T_SO_ORIGINAL_DST
- #define IP6T_SO_ORIGINAL_DST 80
-#endif
+#include <linux/tcp.h>
 
 // workaround for old headers
 

tpws/redirect.c

@@ -9,10 +9,12 @@
 
 #include "params.h"
 #include "helpers.h"
-#include "linux_compat.h"
 
 #ifdef __linux__
  #include <linux/netfilter_ipv4.h>
+ #ifndef IP6T_SO_ORIGINAL_DST
+  #define IP6T_SO_ORIGINAL_DST 80
+ #endif
 #endif
 
 

tpws/tpws_conn.c

@@ -23,7 +23,6 @@
 #include "socks.h"
 #include "helpers.h"
 #include "hostlist.h"
-#include "linux_compat.h"
 
 // keep separate legs counter. counting every time thousands of legs can consume cpu
 static int legs_local, legs_remote;