1 files changed, 27 insertions, 16 deletions

diff --git a/opentracker.c b/opentracker.c
index 8a39bde..5b197d1 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -24,7 +24,6 @@
 /* Libowfat */
 #include "io.h"
 #include "iob.h"
-#include "socket.h"
 
 /* Opentracker */
 #include "ot_accesslist.h"
@@ -35,6 +34,7 @@
 #include "ot_mutex.h"
 #include "ot_random.h"
 #include "ot_scan.h"
+#include "ot_socket.h"
 #include "ot_stats.h"
 #include "ot_udp.h"
 #include "trackerlogic.h"
@@ -156,7 +156,7 @@ static ssize_t header_complete(char *request, ssize_t byte_count) {
   return 0;
 }
 
-static void handle_dead(const int64 sock) {
+static void handle_dead(const int64_t sock) {
   struct http_data *cookie = io_getcookie(sock);
   if (cookie) {
     size_t i;
@@ -171,7 +171,7 @@ static void handle_dead(const int64 sock) {
   io_close(sock);
 }
 
-static void handle_read(const int64 sock, struct ot_workstruct *ws) {
+static void handle_read(const int64_t sock, struct ot_workstruct *ws) {
   struct http_data *cookie     = io_getcookie(sock);
   ssize_t           byte_count = io_tryread(sock, ws->inbuf, G_INBUF_SIZE);
 
@@ -215,7 +215,7 @@ static void handle_read(const int64 sock, struct ot_workstruct *ws) {
   }
 }
 
-static void handle_write(const int64 sock) {
+static void handle_write(const int64_t sock) {
   struct http_data *cookie = io_getcookie(sock);
   size_t            i;
   int               chunked = 0;
@@ -227,7 +227,7 @@ static void handle_write(const int64 sock) {
 
     for (i = 0; i < cookie->batches; ++i) {
       if (cookie->batch[i].bytesleft) {
-        int64 res = iob_send(sock, cookie->batch + i);
+        int64_t res = iob_send(sock, cookie->batch + i);
 
         if (res == -3) {
           handle_dead(sock);
@@ -250,14 +250,14 @@ static void handle_write(const int64 sock) {
     handle_dead(sock);
 }
 
-static void handle_accept(const int64 serversocket) {
+static void handle_accept(const int64_t serversocket) {
   struct http_data *cookie;
-  int64             sock;
+  int64_t           sock;
   ot_ip6            ip;
-  uint16            port;
+  uint16_t          port;
   tai6464           t;
 
-  while ((sock = socket_accept6(serversocket, ip, &port, NULL)) != -1) {
+  while ((sock = socket_accept(serversocket, ip, &port)) != -1) {
 
     /* Put fd into a non-blocking mode */
     io_nonblock(sock);
@@ -305,7 +305,7 @@ static void *server_mainloop(void *args) {
   random_bytes(ws.rand48_state, sizeof(ws.rand48_state));
 
   for (;;) {
-    int64 sock;
+    int64_t sock;
 
     io_wait();
 
@@ -339,7 +339,7 @@ static void *server_mainloop(void *args) {
 }
 
 static int64_t ot_try_bind(ot_ip6 ip, uint16_t port, PROTO_FLAG proto) {
-  int64 sock = proto == FLAG_TCP ? socket_tcp6() : socket_udp6();
+  int64_t sock;
 
 #ifdef _DEBUG
   {
@@ -352,11 +352,13 @@ static int64_t ot_try_bind(ot_ip6 ip, uint16_t port, PROTO_FLAG proto) {
   }
 #endif
 
-  if (socket_bind6_reuse(sock, ip, port, 0) == -1)
-    panic("socket_bind6_reuse");
-
-  if ((proto == FLAG_TCP) && (socket_listen(sock, SOMAXCONN) == -1))
-    panic("socket_listen");
+  if (proto == FLAG_TCP) {
+    if ((sock = socket_tcp_listen(ip, port)) == -1)
+      panic("socket_tcp_listen");
+  } else {
+    if ((sock = socket_udp_bind(ip, port)) == -1)
+      panic("socket_udp_bind");
+  }
 
   if (!io_fd(sock))
     panic("io_fd");
@@ -450,6 +452,7 @@ typedef enum {
     CONFIG_LISTEN_TCP,
     CONFIG_LISTEN_UDP,
     CONFIG_LISTEN_UDP_WORKERS,
+    CONFIG_LISTEN_REUSEPORT,
     CONFIG_ACCESS_WHITELIST,
     CONFIG_ACCESS_BLACKLIST,
     CONFIG_ACCESS_FIFO_ADD,
@@ -477,6 +480,7 @@ static const config_key config_keys[] = {
     CONFIG_KEY("listen.tcp",               CONFIG_LISTEN_TCP),
     CONFIG_KEY("listen.udp",               CONFIG_LISTEN_UDP),
     CONFIG_KEY("listen.udp.workers",       CONFIG_LISTEN_UDP_WORKERS),
+    CONFIG_KEY("listen.reuseport",         CONFIG_LISTEN_REUSEPORT),
 #ifdef WANT_ACCESSLIST_WHITE
     CONFIG_KEY("access.whitelist",         CONFIG_ACCESS_WHITELIST),
 #elif defined(WANT_ACCESSLIST_BLACK)
@@ -582,6 +586,13 @@ int parse_configfile(char *config_filename) {
         if (scan_udec(p, &value, UINT_MAX))
           g_udp_workers = (unsigned int)value;
         break;
+      case CONFIG_LISTEN_REUSEPORT:
+        /* Like listen.udp.workers this is read when a socket is bound, so it
+           has to come before the listen lines it should apply to. */
+        if (!scan_udec(p, &value, 1))
+          goto parse_error;
+        g_socket_reuseport = (int)value;
+        break;
 #ifdef WANT_ACCESSLIST_WHITE
       case CONFIG_ACCESS_WHITELIST:
         set_config_option(&g_accesslist_filename, p);