1 files changed, 8 insertions, 7 deletions

diff --git a/ot_udp.c b/ot_udp.c
index 82aa8bd..02467e1 100644
--- a/ot_udp.c
+++ b/ot_udp.c
@@ -12,10 +12,10 @@
 
 /* Libowfat */
 #include "io.h"
-#include "ip6.h"
 #include "socket.h"
 
 /* Opentracker */
+#include "ot_ip.h"
 #include "ot_random.h"
 #include "ot_rijndael.h"
 #include "ot_stats.h"
@@ -71,7 +71,7 @@ static void udp_make_connectionid(uint32_t connid[2], const ot_ip6 remoteip, int
 }
 
 /* UDP implementation according to http://xbtt.sourceforge.net/udp_tracker_protocol.html */
-int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
+int handle_udp6(int64_t serversocket, struct ot_workstruct *ws) {
   ot_ip6    remoteip;
   uint32_t *inpacket  = (uint32_t *)ws->inbuf;
   uint32_t *outpacket = (uint32_t *)ws->outbuf;
@@ -81,9 +81,10 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
   uint16_t  port, remoteport;
   size_t    byte_count, scrape_count;
 
-  byte_count = socket_recv6(serversocket, ws->inbuf, G_INBUF_SIZE, remoteip, &remoteport, &scopeid);
-  if (!byte_count)
+  ssize_t   result = socket_recv6(serversocket, ws->inbuf, G_INBUF_SIZE, remoteip, &remoteport, &scopeid);
+  if (result <= 0)
     return 0;
+  byte_count = (size_t)result;
 
   stats_issue_event(EVENT_ACCEPT, FLAG_UDP, (uintptr_t)remoteip);
   stats_issue_event(EVENT_READ, FLAG_UDP, byte_count);
@@ -176,7 +177,7 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
     } else {
       /* Limit amount of peers to OT_MAX_PEERS_UDP */
       uint32_t numwant   = ntohl(inpacket[92 / 4]);
-      size_t   max_peers = ip6_isv4mapped(remoteip) ? OT_MAX_PEERS_UDP4 : OT_MAX_PEERS_UDP6;
+      size_t   max_peers = ip_is_v4mapped(remoteip) ? OT_MAX_PEERS_UDP4 : OT_MAX_PEERS_UDP6;
       if (numwant > max_peers)
         numwant = max_peers;
 
@@ -203,7 +204,7 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
 }
 
 static void *udp_worker(void *args) {
-  int64                sock = (int64)args;
+  int64_t sock = (int64_t)args;
   struct ot_workstruct ws;
   memset(&ws, 0, sizeof(ws));
 
@@ -229,7 +230,7 @@ static void *udp_worker(void *args) {
   return NULL;
 }
 
-void udp_init(int64 sock, unsigned int worker_count) {
+void udp_init(int64_t sock, unsigned int worker_count) {
   pthread_t thread_id;
   if (!g_rijndael_round_key[0])
     udp_generate_rijndael_round_key();