1 files changed, 13 insertions, 8 deletions

diff --git a/ot_livesync.c b/ot_livesync.c
index f620592..b876ef8 100644
--- a/ot_livesync.c
+++ b/ot_livesync.c
@@ -4,15 +4,14 @@
  $id$ */
 
 /* System */
+#include <arpa/inet.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
 /* Libowfat */
-#include "byte.h"
 #include "ip6.h"
 #include "ndelay.h"
 #include "socket.h"
@@ -57,7 +56,9 @@ static sync_buffer g_v6_buf;
 static sync_buffer g_v4_buf;
 
 static pthread_t   thread_id;
-void livesync_init() {
+void livesync_init(void) {
+  uint32_t packet_type6 = htonl(OT_SYNC_PEER6);
+  uint32_t packet_type4 = htonl(OT_SYNC_PEER4);
 
   if (g_socket_in == -1)
     exerr("No socket address for live sync specified.");
@@ -66,8 +67,8 @@ void livesync_init() {
   memcpy(g_v6_buf.data, &g_tracker_id, sizeof(g_tracker_id));
   memcpy(g_v4_buf.data, &g_tracker_id, sizeof(g_tracker_id));
 
-  uint32_pack_big((char *)g_v6_buf.data + sizeof(g_tracker_id), OT_SYNC_PEER6);
-  uint32_pack_big((char *)g_v4_buf.data + sizeof(g_tracker_id), OT_SYNC_PEER4);
+  memcpy(g_v6_buf.data + sizeof(g_tracker_id), &packet_type6, sizeof(packet_type6));
+  memcpy(g_v4_buf.data + sizeof(g_tracker_id), &packet_type4, sizeof(packet_type4));
 
   g_v6_buf.fill             = sizeof(g_tracker_id) + sizeof(uint32_t);
   g_v4_buf.fill             = sizeof(g_tracker_id) + sizeof(uint32_t);
@@ -78,7 +79,7 @@ void livesync_init() {
   pthread_create(&thread_id, NULL, livesync_worker, NULL);
 }
 
-void livesync_deinit() {
+void livesync_deinit(void) {
   if (g_socket_in != -1)
     close(g_socket_in);
   if (g_socket_out != -1)
@@ -167,7 +168,7 @@ static void livesync_handle_peersync(struct ot_workstruct *ws, size_t peer_size)
 /* Tickle the live sync module from time to time, so no events get
    stuck when there's not enough traffic to fill udp packets fast
    enough */
-void livesync_ticker() {
+void livesync_ticker(void) {
   /* livesync_issue_peersync sets g_next_packet_time */
   pthread_mutex_lock(&g_outbuf_mutex);
   if (g_now_seconds > g_v6_buf.next_packet_time && g_v6_buf.fill > sizeof(g_tracker_id) + sizeof(uint32_t))
@@ -216,6 +217,8 @@ static void *livesync_worker(void *args) {
   memcpy(in_ip, V4mappedprefix, sizeof(V4mappedprefix));
 
   while (1) {
+    uint32_t packet_type;
+
     ws.request_size = socket_recv4(g_socket_in, (char *)ws.inbuf, LIVESYNC_INCOMING_BUFFSIZE, 12 + (char *)in_ip, &in_port);
 
     /* Expect at least tracker id and packet type */
@@ -228,7 +231,9 @@ static void *livesync_worker(void *args) {
       continue;
     }
 
-    switch (uint32_read_big(sizeof(g_tracker_id) + (char *)ws.inbuf)) {
+    memcpy(&packet_type, ws.inbuf + sizeof(g_tracker_id), sizeof(packet_type));
+
+    switch (ntohl(packet_type)) {
     case OT_SYNC_PEER6:
       livesync_handle_peersync(&ws, OT_PEER_SIZE6);
       break;