HevSocks5Tunnel: Add support for TCP fastopen.

Author: heiher

README.md

@@ -117,6 +117,8 @@ socks5:
 # password: 'password'
   # Socket mark
 # mark: 0
+  # TCP fastopen
+# tcp-fastopen: false
 
 #mapdns:
   # Mapped DNS address

conf/main.yml

@@ -33,6 +33,8 @@ socks5:
 # password: 'password'
   # Socket mark
 # mark: 0
+  # TCP fastopen
+# tcp-fastopen: false
 
 #mapdns:
   # Mapped DNS address

src/hev-config.c

@@ -181,6 +181,7 @@ hev_config_parse_socks5 (yaml_document_t *doc, yaml_node_t *base)
     const char *pass = NULL;
     const char *mark = NULL;
     const char *pipe = NULL;
+    const char *tfso = NULL;
 
     if (!base || YAML_MAPPING_NODE != base->type)
         return -1;
@@ -219,6 +220,8 @@ hev_config_parse_socks5 (yaml_document_t *doc, yaml_node_t *base)
             pass = value;
         else if (0 == strcmp (key, "mark"))
             mark = value;
+        else if (0 == strcmp (key, "tcp-fastopen"))
+            tfso = value;
     }
 
     if (!port) {
@@ -258,6 +261,9 @@ hev_config_parse_socks5 (yaml_document_t *doc, yaml_node_t *base)
     if (mark)
         srv.mark = strtoul (mark, NULL, 0);
 
+    if (tfso)
+        srv.fastopen = (0 == strcasecmp (tfso, "true")) ? 1 : 0;
+
     return 0;
 }
 

src/hev-config.h

@@ -20,6 +20,7 @@ struct _HevConfigServer
     short udp_in_udp;
     unsigned short port;
     unsigned char pipeline;
+    unsigned char fastopen;
     char udp_addr[256];
     char addr[256];
 };

src/hev-socks5-session-tcp.c

@@ -192,29 +192,6 @@ hev_socks5_session_tcp_new (struct tcp_pcb *pcb, HevTaskMutex *mutex)
     return self;
 }
 
-static int
-hev_socks5_session_tcp_bind (HevSocks5 *self, int fd,
-                             const struct sockaddr *dest)
-{
-    HevConfigServer *srv;
-    unsigned int mark;
-
-    LOG_D ("%p socks5 session tcp bind", self);
-
-    srv = hev_config_get_socks5_server ();
-    mark = srv->mark;
-
-    if (mark) {
-        int res;
-
-        res = set_sock_mark (fd, mark);
-        if (res < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
 static void
 hev_socks5_session_tcp_splice (HevSocks5Session *base)
 {
@@ -369,7 +346,7 @@ hev_socks5_session_tcp_class (void)
         okptr->iface = hev_socks5_session_tcp_iface;
 
         skptr = HEV_SOCKS5_CLASS (kptr);
-        skptr->binder = hev_socks5_session_tcp_bind;
+        skptr->binder = hev_socks5_session_bind;
 
         siptr = &kptr->session;
         siptr->splicer = hev_socks5_session_tcp_splice;

src/hev-socks5-session-udp.c

@@ -224,29 +224,6 @@ hev_socks5_session_udp_new (struct udp_pcb *pcb, HevTaskMutex *mutex)
     return self;
 }
 
-static int
-hev_socks5_session_udp_bind (HevSocks5 *self, int fd,
-                             const struct sockaddr *dest)
-{
-    HevConfigServer *srv;
-    unsigned int mark;
-
-    LOG_D ("%p socks5 session udp bind", self);
-
-    srv = hev_config_get_socks5_server ();
-    mark = srv->mark;
-
-    if (mark) {
-        int res;
-
-        res = set_sock_mark (fd, mark);
-        if (res < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
 static uint16_t
 hev_socks5_addr_get_port (const HevSocks5Addr *addr)
 {
@@ -432,7 +409,7 @@ hev_socks5_session_udp_class (void)
         okptr->iface = hev_socks5_session_udp_iface;
 
         skptr = HEV_SOCKS5_CLASS (kptr);
-        skptr->binder = hev_socks5_session_udp_bind;
+        skptr->binder = hev_socks5_session_bind;
 
         ckptr = HEV_SOCKS5_CLIENT_CLASS (kptr);
         ckptr->set_upstream_addr = hev_socks5_session_udp_set_upstream_addr;

src/hev-socks5-session.c

@@ -9,6 +9,7 @@
 
 #include <string.h>
 
+#include "hev-utils.h"
 #include "hev-logger.h"
 #include "hev-config.h"
 #include "hev-socks5-client.h"
@@ -79,6 +80,30 @@ hev_socks5_session_get_node (HevSocks5Session *self)
     return iface->get_node (self);
 }
 
+int
+hev_socks5_session_bind (HevSocks5 *self, int fd, const struct sockaddr *dest)
+{
+    HevConfigServer *srv;
+    unsigned int mark;
+
+    LOG_D ("%p socks5 session bind", self);
+
+    srv = hev_config_get_socks5_server ();
+    mark = srv->mark;
+
+    if (mark) {
+        int res;
+
+        res = set_sock_mark (fd, mark);
+        if (res < 0)
+            return -1;
+    }
+
+    set_sock_tcp_fastopen (fd, srv->fastopen);
+
+    return 0;
+}
+
 void *
 hev_socks5_session_iface (void)
 {

src/hev-socks5-session.h

@@ -45,4 +45,7 @@ void hev_socks5_session_terminate (HevSocks5Session *self);
 void hev_socks5_session_set_task (HevSocks5Session *self, HevTask *task);
 HevListNode *hev_socks5_session_get_node (HevSocks5Session *self);
 
+int hev_socks5_session_bind (HevSocks5 *self, int fd,
+                             const struct sockaddr *dest);
+
 #endif /* __HEV_SOCKS5_SESSION_H__ */

src/misc/hev-utils.c

@@ -26,6 +26,10 @@
 
 #include "hev-utils.h"
 
+#ifndef TCP_FASTOPEN_CONNECT
+#define TCP_FASTOPEN_CONNECT 30
+#endif
+
 void
 run_as_daemon (const char *pid_file)
 {
@@ -81,6 +85,19 @@ set_sock_mark (int fd, unsigned int mark)
     return 0;
 }
 
+void
+set_sock_tcp_fastopen (int fd, int enable)
+{
+#ifdef __linux__
+    int one = 1;
+
+    if (!enable)
+        return;
+
+    setsockopt (fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, &one, sizeof (one));
+#endif
+}
+
 int
 hev_socks5_addr_from_lwip (HevSocks5Addr *addr, const ip_addr_t *ip, u16_t port)
 {

src/misc/hev-utils.h

@@ -16,6 +16,7 @@
 void run_as_daemon (const char *pid_file);
 int set_limit_nofile (int limit_nofile);
 int set_sock_mark (int fd, unsigned int mark);
+void set_sock_tcp_fastopen (int fd, int enable);
 
 int hev_socks5_addr_from_lwip (HevSocks5Addr *addr, const ip_addr_t *ip,
                                u16_t port);