1 files changed, 29 insertions, 25 deletions

diff --git a/opentracker.c b/opentracker.c
index bcc075c..af336aa 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -24,17 +24,17 @@
 /* Libowfat */
 #include "io.h"
 #include "iob.h"
-#include "ip6.h"
 #include "socket.h"
 
 /* Opentracker */
 #include "ot_accesslist.h"
 #include "ot_hex.h"
 #include "ot_http.h"
+#include "ot_ip.h"
 #include "ot_livesync.h"
 #include "ot_mutex.h"
-#include "ot_scan.h"
 #include "ot_random.h"
+#include "ot_scan.h"
 #include "ot_stats.h"
 #include "ot_udp.h"
 #include "trackerlogic.h"
@@ -156,14 +156,14 @@ 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;
     for (i = 0; i < cookie->batches; ++i)
       iob_reset(cookie->batch + i);
     free(cookie->batch);
-    array_reset(&cookie->request);
+    buf_reset(&cookie->request);
     if (cookie->flag & (STRUCT_HTTP_FLAG_WAITINGFORTASK | STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER))
       mutex_workqueue_canceltask(sock);
     free(cookie);
@@ -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);
 
@@ -183,26 +183,30 @@ static void handle_read(const int64 sock, struct ot_workstruct *ws) {
   if (byte_count == -1)
     return;
 
+  ws->request      = NULL;
+  ws->request_size = 0;
+  ws->header_size  = 0;
+  ws->keep_alive   = 0;
+
   /* If we get the whole request in one packet, handle it without copying */
-  if (!array_start(&cookie->request)) {
+  if (!cookie->request.data) {
     if ((ws->header_size = header_complete(ws->inbuf, byte_count))) {
       ws->request      = ws->inbuf;
       ws->request_size = byte_count;
       http_handle_request(sock, ws);
-    } else
-      array_catb(&cookie->request, ws->inbuf, (size_t)byte_count);
+    } else if (buf_cat(&cookie->request, ws->inbuf, (size_t)byte_count))
+      handle_dead(sock);
     return;
   }
 
-  array_catb(&cookie->request, ws->inbuf, byte_count);
-  if (array_failed(&cookie->request) || array_bytes(&cookie->request) > 8192) {
+  if (buf_cat(&cookie->request, ws->inbuf, (size_t)byte_count) || cookie->request.size > G_INBUF_SIZE) {
     http_issue_error(sock, ws, CODE_HTTPERROR_500);
     return;
   }
 
-  while ((ws->header_size = header_complete(array_start(&cookie->request), array_bytes(&cookie->request)))) {
-    ws->request      = array_start(&cookie->request);
-    ws->request_size = array_bytes(&cookie->request);
+  while ((ws->header_size = header_complete(cookie->request.data, (ssize_t)cookie->request.size))) {
+    ws->request      = cookie->request.data;
+    ws->request_size = (ssize_t)cookie->request.size;
     http_handle_request(sock, ws);
 #ifdef WANT_KEEPALIVE
     if (!ws->keep_alive)
@@ -211,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;
@@ -223,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);
@@ -246,9 +250,9 @@ 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;
   tai6464           t;
@@ -301,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();
 
@@ -335,14 +339,14 @@ 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 = proto == FLAG_TCP ? socket_tcp6() : socket_udp6();
 
 #ifdef _DEBUG
   {
     char *protos[] = {"TCP", "UDP", "UDP mcast"};
     char  _debug[512];
     int   off  = snprintf(_debug, sizeof(_debug), "Binding socket type %s to address [", protos[proto]);
-    off       += fmt_ip6c(_debug + off, ip);
+    off       += ip_format(_debug + off, ip);
     snprintf(_debug + off, sizeof(_debug) - off, "]:%d...", port);
     fputs(_debug, stderr);
   }
@@ -390,14 +394,14 @@ 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 = scan_ip6(s, ip)))
+  if (!(off = ip_scan(s, ip)))
     return 0;
   s += off;
   if (bracket && *s == ']')
     ++s;
   if (*s == 0 || isspace(*s))
     return s - src;
-  if (!ip6_isv4mapped(ip)) {
+  if (!ip_is_v4mapped(ip)) {
     if (*s != ':' && *s != '.')
       return 0;
     if (!bracket && *(s) == ':')
@@ -419,7 +423,7 @@ static int scan_ip6_net(const char *src, ot_net *net) {
   int         off;
   while (isspace(*s))
     ++s;
-  if (!(off = scan_ip6(s, net->address)))
+  if (!(off = ip_scan(s, net->address)))
     return 0;
   s += off;
   if (*s != '/')
@@ -429,7 +433,7 @@ static int scan_ip6_net(const char *src, ot_net *net) {
     if (!(off = scan_udec(s, &value, 128)))
       return 0;
     net->bits = (int)value;
-    if (ip6_isv4mapped(net->address))
+    if (ip_is_v4mapped(net->address))
       net->bits += 96;
     if (net->bits > 128)
       return 0;
@@ -757,7 +761,7 @@ int main(int argc, char **argv) {
       scanon = 0;
       break;
     case 'i':
-      if (!scan_ip6(optarg, serverip)) {
+      if (!ip_scan(optarg, serverip)) {
         usage(argv[0]);
         exit(1);
       }