1 files changed, 19 insertions, 17 deletions

diff --git a/opentracker.c b/opentracker.c
index 50fff29..7de6c6a 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -34,6 +34,7 @@
 #include "ot_mutex.h"
 #include "ot_random.h"
 #include "ot_scan.h"
+#include "ot_fdstate.h"
 #include "ot_socket.h"
 #include "ot_stats.h"
 #include "ot_udp.h"
@@ -117,7 +118,7 @@ static ssize_t header_complete(char *request, ssize_t byte_count) {
 }
 
 static void handle_dead(const int64_t sock) {
-  struct http_data *cookie = io_getcookie(sock);
+  struct http_data *cookie = fdstate_cookie(sock);
   if (cookie) {
     if (cookie->batch)
       batch_reset(cookie->batch);
@@ -127,11 +128,13 @@ static void handle_dead(const int64_t sock) {
       mutex_workqueue_canceltask(sock);
     free(cookie);
   }
+  /* The generation has to move before the kernel can reissue the number */
+  fdstate_close(sock);
   io_close(sock);
 }
 
 static void handle_read(const int64_t sock, struct ot_workstruct *ws) {
-  struct http_data *cookie     = io_getcookie(sock);
+  struct http_data *cookie     = fdstate_cookie(sock);
   ssize_t           byte_count = io_tryread(sock, ws->inbuf, G_INBUF_SIZE);
 
   if (byte_count == 0 || byte_count == -3) {
@@ -175,7 +178,7 @@ static void handle_read(const int64_t sock, struct ot_workstruct *ws) {
 }
 
 static void handle_write(const int64_t sock) {
-  struct http_data *cookie = io_getcookie(sock);
+  struct http_data *cookie = fdstate_cookie(sock);
   int               chunked = 0;
 
   if (cookie) {
@@ -204,7 +207,6 @@ static void handle_accept(const int64_t serversocket) {
   int64_t           sock;
   ot_ip6            ip;
   uint16_t          port;
-  tai6464           t;
 
   while ((sock = socket_accept(serversocket, ip, &port)) != -1) {
 
@@ -218,16 +220,11 @@ static void handle_accept(const int64_t serversocket) {
     memset(cookie, 0, sizeof(struct http_data));
     memcpy(cookie->ip, ip, sizeof(ot_ip6));
 
-    io_setcookie(sock, cookie);
+    fdstate_open(sock, cookie, g_now_seconds + OT_CLIENT_TIMEOUT);
     io_wantread(sock);
 
     stats_issue_event(EVENT_ACCEPT, FLAG_TCP, (uintptr_t)ip);
 
-    /* That breaks taia encapsulation. But there is no way to take system
-       time this often in FreeBSD and libowfat does not allow to set unix time */
-    taia_uint(&t, 0); /* Clear t */
-    tai_unix(&(t.sec), (g_now_seconds + OT_CLIENT_TIMEOUT));
-    io_timeout(sock, t);
   }
   io_eagain(serversocket);
 }
@@ -259,7 +256,7 @@ static void *server_mainloop(void *args) {
     io_wait();
 
     while ((sock = io_canread()) != -1) {
-      const void *cookie = io_getcookie(sock);
+      const void *cookie = fdstate_cookie(sock);
       if ((intptr_t)cookie == FLAG_TCP)
         handle_accept(sock);
       else if ((intptr_t)cookie == FLAG_UDP)
@@ -277,7 +274,9 @@ static void *server_mainloop(void *args) {
       handle_write(sock);
 
     if (g_now_seconds > next_timeout_check) {
-      while ((sock = io_timeouted()) != -1)
+      int cursor = 0;
+
+      while ((sock = fdstate_next_expired(g_now_seconds, &cursor)) != -1)
         handle_dead(sock);
       next_timeout_check = g_now_seconds + OT_CLIENT_TIMEOUT_CHECKINTERVAL;
     }
@@ -323,7 +322,7 @@ static void listen_bind_one(ot_listen *entry) {
   if (!io_fd(entry->sock))
     panic("io_fd");
 
-  io_setcookie(entry->sock, (void *)entry->proto);
+  fdstate_open(entry->sock, (void *)entry->proto, 0);
   io_wantread(entry->sock);
 
 #ifdef _DEBUG
@@ -376,14 +375,14 @@ void load_state(const char *const state_filename) {
   while (fgets(inbuf, sizeof(inbuf), state_filehandle)) {
     size_t i;
 
-    if (!hex_tohash(infohash, inbuf))
+    if (!hex_to_hash(infohash, inbuf))
       continue;
     i = 2 * sizeof(ot_hash);
 
-    if (inbuf[i++] != ':' || !(consumed = scan_udec(inbuf + i, &base, UINT64_MAX)))
+    if (inbuf[i++] != ':' || !(consumed = scan_uint(inbuf + i, &base, UINT64_MAX)))
       continue;
     i += consumed;
-    if (inbuf[i++] != ':' || !(consumed = scan_udec(inbuf + i, &downcount, UINT64_MAX)))
+    if (inbuf[i++] != ':' || !(consumed = scan_uint(inbuf + i, &downcount, UINT64_MAX)))
       continue;
     add_torrent_from_saved_state(infohash, base, downcount);
   }
@@ -452,6 +451,8 @@ int main(int argc, char **argv) {
   pthread_t thread_id; /* time cacher */
 
   random_init();
+  if (fdstate_init() == -1)
+    panic("fdstate_init");
   config_parse(argc, argv);
 
   listen_bind_all();
@@ -477,7 +478,7 @@ int main(int argc, char **argv) {
     panic("selfpipe io_fd failed: ");
   if (!io_fd(g_self_pipe[1]))
     panic("selfpipe io_fd failed: ");
-  io_setcookie(g_self_pipe[0], (void *)FLAG_SELFPIPE);
+  fdstate_open(g_self_pipe[0], (void *)FLAG_SELFPIPE, 0);
   io_wantread(g_self_pipe[0]);
 
   /* Init all sub systems. This call may fail with an exit() */
@@ -498,5 +499,6 @@ int main(int argc, char **argv) {
 
   server_mainloop(0);
 
+  fdstate_deinit();
   return 0;
 }