1 files changed, 14 insertions, 7 deletions

diff --git a/ot_mutex.c b/ot_mutex.c
index be3ddf9..9aa476d 100644
--- a/ot_mutex.c
+++ b/ot_mutex.c
@@ -4,16 +4,15 @@
    $id$ */
 
 /* System */
+#include <arpa/inet.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/mman.h>
+#include <string.h>
 #include <sys/uio.h>
 
 /* Libowfat */
-#include "byte.h"
 #include "io.h"
-#include "uint32.h"
 
 /* Opentracker */
 #include "ot_iovec.h"
@@ -37,7 +36,15 @@ ot_vector *mutex_bucket_lock(int bucket) {
   return all_torrents + bucket;
 }
 
-ot_vector *mutex_bucket_lock_by_hash(ot_hash const hash) { return mutex_bucket_lock(uint32_read_big((const char *)hash) >> OT_BUCKET_COUNT_SHIFT); }
+/* Torrents are spread over buckets by the first four bytes of their info_hash,
+   which may sit at any alignment, hence the memcpy */
+static int bucket_from_hash(ot_hash const hash) {
+  uint32_t bucket;
+  memcpy(&bucket, hash, sizeof(bucket));
+  return ntohl(bucket) >> OT_BUCKET_COUNT_SHIFT;
+}
+
+ot_vector *mutex_bucket_lock_by_hash(ot_hash const hash) { return mutex_bucket_lock(bucket_from_hash(hash)); }
 
 void mutex_bucket_unlock(int bucket, int delta_torrentcount) {
   pthread_mutex_unlock(bucket_mutex + bucket);
@@ -45,7 +52,7 @@ void mutex_bucket_unlock(int bucket, int delta_torrentcount) {
 }
 
 void mutex_bucket_unlock_by_hash(ot_hash const hash, int delta_torrentcount) {
-  mutex_bucket_unlock(uint32_read_big((char *)hash) >> OT_BUCKET_COUNT_SHIFT, delta_torrentcount);
+  mutex_bucket_unlock(bucket_from_hash(hash), delta_torrentcount);
 }
 
 size_t mutex_get_torrent_count(void) { return g_torrent_count; }
@@ -259,7 +266,7 @@ void mutex_init(void) {
   pthread_cond_init(&tasklist_being_filled, NULL);
   for (i = 0; i < OT_BUCKET_COUNT; ++i)
     pthread_mutex_init(bucket_mutex + i, NULL);
-  byte_zero(all_torrents, sizeof(all_torrents));
+  memset(all_torrents, 0, sizeof(all_torrents));
 }
 
 void mutex_deinit(void) {
@@ -268,5 +275,5 @@ void mutex_deinit(void) {
     pthread_mutex_destroy(bucket_mutex + i);
   pthread_mutex_destroy(&tasklist_mutex);
   pthread_cond_destroy(&tasklist_being_filled);
-  byte_zero(all_torrents, sizeof(all_torrents));
+  memset(all_torrents, 0, sizeof(all_torrents));
 }