1 files changed, 14 insertions, 13 deletions

diff --git a/ot_udp.c b/ot_udp.c
index 82aa8bd..e80f4e7 100644
--- a/ot_udp.c
+++ b/ot_udp.c
@@ -12,12 +12,12 @@
 
 /* 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_socket.h"
 #include "ot_stats.h"
 #include "ot_udp.h"
 #include "trackerlogic.h"
@@ -71,19 +71,20 @@ 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;
-  uint32_t  left, event, scopeid;
+  uint32_t  left, event;
   uint32_t  connid[2];
   uint32_t  action;
   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_recv(serversocket, ws->inbuf, G_INBUF_SIZE, remoteip, &remoteport);
+  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);
@@ -117,7 +118,7 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
       outpacket[0]   = htonl(3);
       outpacket[1]   = inpacket[3];
       memcpy(&outpacket[2], "Connection ID missmatch.", s);
-      socket_send6(serversocket, ws->outbuf, 8 + s, remoteip, remoteport, 0);
+      socket_send(serversocket, ws->outbuf, 8 + s, remoteip, remoteport);
       stats_issue_event(EVENT_CONNID_MISSMATCH, FLAG_UDP, 8 + s);
       return 1;
     }
@@ -134,7 +135,7 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
     outpacket[2] = connid[0];
     outpacket[3] = connid[1];
 
-    socket_send6(serversocket, ws->outbuf, 16, remoteip, remoteport, 0);
+    socket_send(serversocket, ws->outbuf, 16, remoteip, remoteport);
     stats_issue_event(EVENT_CONNECT, FLAG_UDP, 16);
     break;
   case 1: /* This is an announce action */
@@ -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;
 
@@ -184,7 +185,7 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
       ws->reply_size = 8 + add_peer_to_torrent_and_return_peers(FLAG_UDP, ws, numwant);
     }
 
-    socket_send6(serversocket, ws->outbuf, ws->reply_size, remoteip, remoteport, 0);
+    socket_send(serversocket, ws->outbuf, ws->reply_size, remoteip, remoteport);
     stats_issue_event(EVENT_ANNOUNCE, FLAG_UDP, ws->reply_size);
     break;
 
@@ -195,7 +196,7 @@ int handle_udp6(int64 serversocket, struct ot_workstruct *ws) {
     for (scrape_count = 0; (scrape_count * 20 < byte_count - 16) && (scrape_count <= 74); scrape_count++)
       return_udp_scrape_for_torrent(*(ot_hash *)(((char *)inpacket) + 16 + 20 * scrape_count), ((char *)outpacket) + 8 + 12 * scrape_count);
 
-    socket_send6(serversocket, ws->outbuf, 8 + 12 * scrape_count, remoteip, remoteport, 0);
+    socket_send(serversocket, ws->outbuf, 8 + 12 * scrape_count, remoteip, remoteport);
     stats_issue_event(EVENT_SCRAPE, FLAG_UDP, scrape_count);
     break;
   }
@@ -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();