1 files changed, 11 insertions, 9 deletions

diff --git a/proxy.c b/proxy.c
index 6bf45df..cec985e 100644
--- a/proxy.c
+++ b/proxy.c
@@ -8,8 +8,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <pthread.h>
-#include <pwd.h>
-#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,7 +16,6 @@
 #include <unistd.h>
 
 /* Libowfat */
-#include "byte.h"
 #include "io.h"
 #include "iob.h"
 #include "ip6.h"
@@ -142,8 +139,8 @@ size_t add_peer_to_torrent_proxy(ot_hash hash, ot_peer *peer, size_t peer_size)
       return -1;
     }
 
-    byte_zero(torrent->peer_list6, sizeof(ot_peerlist));
-    byte_zero(torrent->peer_list4, sizeof(ot_peerlist));
+    memset(torrent->peer_list6, 0, sizeof(ot_peerlist));
+    memset(torrent->peer_list4, 0, sizeof(ot_peerlist));
   }
 
   peer_list = peer_size == OT_PEER_SIZE6 ? torrent->peer_list6 : torrent->peer_list4;
@@ -473,13 +470,15 @@ static void handle_write(int64 peersocket) {
 }
 
 static void server_mainloop() {
-  int64 sock;
+  int64    sock;
+  uint32_t packet_type;
 
   /* inlined livesync_init() */
   memset(g_peerbuffer_start, 0, sizeof(g_peerbuffer_start));
   g_peerbuffer_pos = g_peerbuffer_start;
   memcpy(g_peerbuffer_pos, &g_tracker_id, sizeof(g_tracker_id));
-  uint32_pack_big((char *)g_peerbuffer_pos + sizeof(g_tracker_id), OT_SYNC_PEER);
+  packet_type         = htonl(OT_SYNC_PEER);
+  memcpy(g_peerbuffer_pos + sizeof(g_tracker_id), &packet_type, sizeof(packet_type));
   g_peerbuffer_pos   += sizeof(g_tracker_id) + sizeof(uint32_t);
   g_next_packet_time  = time(NULL) + LIVESYNC_MAXDELAY;
 
@@ -871,6 +870,7 @@ static void *livesync_worker(void *args) {
   while (1) {
     ot_ip6   in_ip;
     uint16_t in_port;
+    uint32_t packet_type;
     size_t   datalen = socket_recv4(g_socket_in, (char *)g_inbuffer, LIVESYNC_INCOMING_BUFFSIZE, 12 + (char *)in_ip, &in_port);
 
     /* Expect at least tracker id and packet type */
@@ -880,7 +880,9 @@ static void *livesync_worker(void *args) {
       /* drop packet coming from ourselves */
       continue;
     }
-    switch (uint32_read_big((char *)g_inbuffer + sizeof(g_tracker_id))) {
+    memcpy(&packet_type, g_inbuffer + sizeof(g_tracker_id), sizeof(packet_type));
+
+    switch (ntohl(packet_type)) {
     case OT_SYNC_PEER4:
       livesync_handle_peersync(datalen, OT_PEER_SIZE4);
       break;
@@ -888,7 +890,7 @@ static void *livesync_worker(void *args) {
       livesync_handle_peersync(datalen, OT_PEER_SIZE6);
       break;
     default:
-      // fprintf( stderr, "Received an unknown live sync packet type %u.\n", uint32_read_big( sizeof( g_tracker_id ) + (char*)g_inbuffer ) );
+      // fprintf( stderr, "Received an unknown live sync packet type %u.\n", ntohl( packet_type ) );
       break;
     }
   }