1 files changed, 17 insertions, 18 deletions

diff --git a/proxy.c b/proxy.c
index 9946240..d728e5b 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"
@@ -28,6 +25,7 @@
 
 /* Opentracker */
 #include "ot_mutex.h"
+#include "ot_random.h"
 #include "ot_stats.h"
 #include "ot_vector.h"
 #include "trackerlogic.h"
@@ -142,8 +140,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;
@@ -276,12 +274,12 @@ void reset_info_block(proxy_peer *peer) {
  * Multiple connections to/from the same ip are okay, if tracker_id doesn't match
  * Reconnect attempts occur only twice a minute
  */
-static int        g_connection_count;
+static size_t     g_connection_count;
 static ot_time    g_connection_reconn;
 static proxy_peer g_connections[MAX_PEERS];
 
 static void handle_reconnects(void) {
-  int i;
+  size_t i;
   for (i = 0; i < g_connection_count; ++i)
     if (PROXYPEER_NEEDSCONNECT(g_connections[i].state)) {
       int64 newfd = socket_tcp6();
@@ -473,13 +471,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;
 
@@ -564,12 +564,8 @@ int main(int argc, char **argv) {
   uint16_t         tmpport;
   int              scanon = 1, lbound = 0, sbound = 0;
 
-  srandom(time(NULL));
-#ifdef WANT_ARC4RANDOM
-  g_tracker_id = arc4random();
-#else
-  g_tracker_id = random();
-#endif
+  random_init();
+  g_tracker_id = random_uint32();
 
   while (scanon) {
     switch (getopt(argc, argv, ":l:c:L:h")) {
@@ -625,7 +621,7 @@ int main(int argc, char **argv) {
 static void *streamsync_worker(void *args) {
   (void)args;
   while (1) {
-    int bucket;
+    size_t bucket;
     /* For each bucket... */
     for (bucket = 0; bucket < OT_BUCKET_COUNT; ++bucket) {
       /* Get exclusive access to that bucket */
@@ -871,6 +867,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 +877,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 +887,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;
     }
   }