From 4afeaeb4b6ab6c56e582436b17f367e216f16de1 Mon Sep 17 00:00:00 2001
From: Dirk Engling <erdgeist@erdgeist.org>
Date: Sun, 25 Oct 2026 02:43:09 +0200
Subject: Use the new ot_socket abstraction for socket creation, read and write

---
 ot_udp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'ot_udp.c')

diff --git a/ot_udp.c b/ot_udp.c
index 02467e1..e80f4e7 100644
--- a/ot_udp.c
+++ b/ot_udp.c
@@ -12,12 +12,12 @@
 
 /* Libowfat */
 #include "io.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"
@@ -75,13 +75,13 @@ 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;
 
-  ssize_t   result = socket_recv6(serversocket, ws->inbuf, G_INBUF_SIZE, remoteip, &remoteport, &scopeid);
+  ssize_t   result = socket_recv(serversocket, ws->inbuf, G_INBUF_SIZE, remoteip, &remoteport);
   if (result <= 0)
     return 0;
   byte_count = (size_t)result;
@@ -118,7 +118,7 @@ int handle_udp6(int64_t 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;
     }
@@ -135,7 +135,7 @@ int handle_udp6(int64_t 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 */
@@ -185,7 +185,7 @@ int handle_udp6(int64_t 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;
 
@@ -196,7 +196,7 @@ int handle_udp6(int64_t 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;
   }
-- 
cgit v1.3