1 files changed, 19 insertions, 16 deletions

diff --git a/proxy.c b/proxy.c
index 219d926..a5c6bb7 100644
--- a/proxy.c
+++ b/proxy.c
@@ -16,9 +16,10 @@
 
 /* Libowfat */
 #include "io.h"
-#include "iob.h"
 
 /* Opentracker */
+#include "ot_batch.h"
+#include "ot_fdstate.h"
 #include "ot_ip.h"
 #include "ot_mutex.h"
 #include "ot_random.h"
@@ -148,7 +149,7 @@ size_t add_peer_to_torrent_proxy(ot_hash hash, ot_peer *peer, size_t peer_size)
 size_t remove_peer_from_torrent_proxy(ot_hash hash, ot_peer *peer, size_t peer_size) {
   int         exactmatch;
   ot_vector  *torrents_list = mutex_bucket_lock_by_hash(hash);
-  ot_torrent *torrent       = binary_search(hash, torrents_list->data, torrents_list->size, sizeof(ot_torrent), OT_HASH_COMPARE_SIZE, &exactmatch);
+  ot_torrent *torrent       = vector_binary_search(hash, torrents_list->data, torrents_list->size, sizeof(ot_torrent), OT_HASH_COMPARE_SIZE, &exactmatch);
 
   if (exactmatch) {
     ot_peerlist *peer_list = peer_list = peer_size == OT_PEER_SIZE6 ? torrent->peer_list6 : torrent->peer_list4;
@@ -228,7 +229,7 @@ typedef struct {
   size_t   indata_length;     /* Length of unprocessed data */
   uint32_t tracker_id;        /* How the other end greeted */
   int64_t  fd;                /* A file handle, if connected, <= 0 is disconnected (0 initially, -1 else) */
-  io_batch outdata;           /* The iobatch containing our sync data */
+  ot_batch outdata;           /* The batch containing our sync data */
 
   size_t   packet_tcount;     /* Number of unprocessed torrents in packet we currently receive */
   uint8_t  packet_tprefix;    /* Prefix byte for all torrents in current packet */
@@ -243,7 +244,7 @@ void reset_info_block(proxy_peer *peer) {
   peer->tracker_id    = 0;
   peer->fd            = -1;
   peer->packet_tcount = 0;
-  iob_reset(&peer->outdata);
+  batch_reset(&peer->outdata);
   PROXYPEER_SETDISCONNECTED(peer->state);
 }
 
@@ -267,7 +268,7 @@ static void handle_reconnects(void) {
         continue; /* No socket for you */
       io_fd(newfd);
       io_wantwrite(newfd); /* So we will be informed when it is connected */
-      io_setcookie(newfd, g_connections + i);
+      fdstate_open(newfd, g_connections + i, 0);
 
       /* Prepare connection info block */
       reset_info_block(g_connections + i);
@@ -310,7 +311,7 @@ static void handle_accept(int64_t serversocket) {
       g_connections[i].port = port;
       g_connections[i].fd   = newfd;
 
-      io_setcookie(newfd, g_connections + i);
+      fdstate_open(newfd, g_connections + i, 0);
 
       /* We expect the connecting side to begin with its tracker_id */
       io_wantread(newfd);
@@ -325,7 +326,7 @@ static void handle_read(int64_t peersocket) {
   int         i;
   int64_t     datalen;
   uint32_t    tracker_id;
-  proxy_peer *peer = io_getcookie(peersocket);
+  proxy_peer *peer = fdstate_cookie(peersocket);
 
   if (!peer) {
     /* Can't happen ;) */
@@ -391,7 +392,7 @@ static void handle_read(int64_t peersocket) {
 
 /* Can write new sync data to the stream */
 static void handle_write(int64_t peersocket) {
-  proxy_peer *peer = io_getcookie(peersocket);
+  proxy_peer *peer = fdstate_cookie(peersocket);
 
   if (!peer) {
     /* Can't happen ;) */
@@ -424,11 +425,11 @@ static void handle_write(int64_t peersocket) {
     }
     break;
   case FLAG_CONNECTED:
-    switch (iob_send(peersocket, &peer->outdata)) {
-    case 0: /* all data sent */
+    switch (batch_send(peersocket, &peer->outdata)) {
+    case BATCH_DONE:
       io_dontwantwrite(peersocket);
       break;
-    case -3: /* an error occured */
+    case BATCH_FAILED:
       io_close(peersocket);
       reset_info_block(peer);
       break;
@@ -464,7 +465,7 @@ static void server_mainloop() {
 
     /* Loop over readable sockets */
     while ((sock = io_canread()) != -1) {
-      const void *cookie = io_getcookie(sock);
+      const void *cookie = fdstate_cookie(sock);
       if ((uintptr_t)cookie == FLAG_SERVERSOCKET)
         handle_accept(sock);
       else
@@ -493,7 +494,7 @@ static int64_t ot_try_bind(ot_ip6 ip, uint16_t port) {
   if (!io_fd(sock))
     panic("io_fd");
 
-  io_setcookie(sock, (void *)FLAG_SERVERSOCKET);
+  fdstate_open(sock, (void *)FLAG_SERVERSOCKET, 0);
   io_wantread(sock);
   return sock;
 }
@@ -506,7 +507,7 @@ static int scan_ip6_port(const char *src, ot_ip6 ip, uint16_t *port) {
     ++s;
   if (*s == '[')
     ++s, ++bracket; /* for v6 style notation */
-  if (!(off = ip_scan(s, ip)))
+  if (!(off = ip_parse(s, ip)))
     return 0;
   s += off;
   if (*s == 0 || isspace(*s))
@@ -521,7 +522,7 @@ static int scan_ip6_port(const char *src, ot_ip6 ip, uint16_t *port) {
     if (*(s++) != ':')
       return 0;
   }
-  if (!(off = scan_udec(s, &value, 65535)))
+  if (!(off = scan_uint(s, &value, 65535)))
     return 0;
   *port = (uint16_t)value;
   return off + s - src;
@@ -535,6 +536,8 @@ int main(int argc, char **argv) {
   int              scanon = 1, lbound = 0, sbound = 0;
 
   random_init();
+  if (fdstate_init() == -1)
+    panic("fdstate_init");
   g_tracker_id = random_uint32();
 
   while (scanon) {
@@ -728,7 +731,7 @@ static void *streamsync_worker(void *args) {
             void *tmp = malloc(mem);
             if (tmp) {
               memcpy(tmp, ptr, mem);
-              iob_addbuf_free(&g_connections[i].outdata, tmp, mem);
+              batch_add(&g_connections[i].outdata, tmp, mem);
               io_wantwrite(g_connections[i].fd);
             }
           }