12 files changed, 38 insertions, 49 deletions

diff --git a/Makefile b/Makefile
index 2587b62..9a09e7b 100644
--- a/Makefile
+++ b/Makefile
@@ -87,26 +87,31 @@ CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
 CFLAGS_proxy = $(CFLAGS_production) -DWANT_SYNC_LIVE
 CFLAGS_proxy_debug = $(CFLAGS_debug) -DWANT_SYNC_LIVE
 
-$(BINARY): $(OBJECTS) $(HEADERS)
+$(BINARY): $(OBJECTS)
         $(CC) -o $@ $(OBJECTS) $(LDFLAGS)
         $(STRIP) $@
-$(BINARY).debug: $(OBJECTS_debug) $(HEADERS)
+$(BINARY).debug: $(OBJECTS_debug)
         $(CC) -o $@ $(OBJECTS_debug) $(LDFLAGS)
-proxy: $(OBJECTS_proxy) $(HEADERS)
+proxy: $(OBJECTS_proxy)
         $(CC) -o $@ $(OBJECTS_proxy) $(CFLAGS_production) $(LDFLAGS)
-proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
+proxy.debug: $(OBJECTS_proxy_debug)
         $(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS)
 
-.c.proxy.debug.o : $(HEADERS)
+$(OBJECTS): $(HEADERS)
+$(OBJECTS_debug): $(HEADERS)
+$(OBJECTS_proxy): $(HEADERS)
+$(OBJECTS_proxy_debug): $(HEADERS)
+
+.c.proxy.debug.o :
         $(CC) -c -o $@ $(CFLAGS_proxy_debug) $(<:.proxy.debug.o=.c)
 
-.c.proxy.o : $(HEADERS)
+.c.proxy.o :
         $(CC) -c -o $@ $(CFLAGS_proxy) $(<:.proxy.o=.c)
 
-.c.debug.o : $(HEADERS)
+.c.debug.o :
         $(CC) -c -o $@ $(CFLAGS_debug) $(<:.debug.o=.c)
 
-.c.o : $(HEADERS)
+.c.o :
         $(CC) -c -o $@ $(CFLAGS_production) $<
 
 # Unit tests. The modules under test are compiled straight into the test
diff --git a/ot_clean.h b/ot_clean.h
index e8bcdc1..1484d82 100644
--- a/ot_clean.h
+++ b/ot_clean.h
@@ -6,6 +6,8 @@
 #ifndef OT_CLEAN_H__
 #define OT_CLEAN_H__
 
+#include "trackerlogic.h"
+
 /* The amount of time a clean cycle should take */
 #define OT_CLEAN_INTERVAL_MINUTES 2
 
diff --git a/ot_http.h b/ot_http.h
index 004d710..965820f 100644
--- a/ot_http.h
+++ b/ot_http.h
@@ -6,7 +6,15 @@
 #ifndef OT_HTTP_H__
 #define OT_HTTP_H__
 
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+
+/* Libowfat */
+#include "iob.h"
+
 #include "ot_buf.h"
+#include "trackerlogic.h"
 
 typedef enum {
   STRUCT_HTTP_FLAG_WAITINGFORTASK      = 1,
diff --git a/ot_iovec.c b/ot_iovec.c
index bab19e3..cd5b9f9 100644
--- a/ot_iovec.c
+++ b/ot_iovec.c
@@ -20,6 +20,8 @@ void *iovec_increase(size_t *iovec_entries, struct iovec **iovector, size_t new_
   if (!new_vec)
     return NULL;
 
+  *iovector  = new_vec;
+
   /* Only allocate after we have a place to store the pointer */
   new_data = malloc(new_alloc);
   if (!new_data)
@@ -28,7 +30,6 @@ void *iovec_increase(size_t *iovec_entries, struct iovec **iovector, size_t new_
   new_vec[new_entries - 1].iov_base = new_data;
   new_vec[new_entries - 1].iov_len  = new_alloc;
 
-  *iovector                         = new_vec;
   ++*iovec_entries;
   return new_data;
 }
diff --git a/ot_stats.c b/ot_stats.c
index 7945f4e..f938e91 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -206,10 +206,6 @@ static size_t stats_return_busy_networks(char *reply, stats_network_node *tree,
       r += sprintf(r, "%08zd: ", scores[i - 1]);
       // #ifdef WANT_V6
       r += ip_format(r, networks[i - 1]);
-#if 0
-    // XXX
-      r += fmt_ip4( r, networks[i - 1]);
-#endif
       *r++ = '\n';
     }
   }
@@ -663,10 +659,6 @@ void stats_issue_event(ot_status_event event, PROTO_FLAG proto, uintptr_t event_
       }
 
       ip_readable[ip_format(ip_readable, (char *)&ws->peer)] = 0;
-#if 0
-        /* XXX */
-        ip_readable[ fmt_ip4( ip_readable, (char*)&ws->peer ) ] = 0;
-#endif
       syslog(LOG_INFO, "time=%s event=completed info_hash=%s peer_id=%s ip=%s", timestring, hash_hex, peerid_hex, ip_readable);
     }
 #endif
diff --git a/ot_udp.c b/ot_udp.c
index e80f4e7..dc8267c 100644
--- a/ot_udp.c
+++ b/ot_udp.c
@@ -22,9 +22,6 @@
 #include "ot_udp.h"
 #include "trackerlogic.h"
 
-#if 0
-static const uint8_t g_static_connid[8] = { 0x23, 0x42, 0x05, 0x17, 0xde, 0x41, 0x50, 0xff };
-#endif
 static uint32_t g_rijndael_round_key[44] = {0};
 static volatile uint32_t g_key_of_the_hour[2] = {0};
 static volatile ot_time  g_hour_of_the_key;
diff --git a/ot_udp.h b/ot_udp.h
index c670175..87d99a9 100644
--- a/ot_udp.h
+++ b/ot_udp.h
@@ -8,6 +8,8 @@
 
 #include <stdint.h>
 
+#include "trackerlogic.h"
+
 void udp_init(int64_t sock, unsigned int worker_count);
 void udp_kickoff(void);
 int  handle_udp6(int64_t serversocket, struct ot_workstruct *ws);
diff --git a/ot_vector.h b/ot_vector.h
index 2618363..fbc75f4 100644
--- a/ot_vector.h
+++ b/ot_vector.h
@@ -6,6 +6,8 @@
 #ifndef OT_VECTOR_H__
 #define OT_VECTOR_H__
 
+#include <stddef.h>
+
 /* These defines control vectors behaviour */
 #define OT_VECTOR_MIN_MEMBERS   2
 #define OT_VECTOR_GROW_RATIO    2
@@ -21,6 +23,9 @@ typedef struct {
   size_t space;
 } ot_vector;
 
+/* trackerlogic.h needs ot_vector, break circular dependency here */
+#include "trackerlogic.h"
+
 void    *binary_search(const void *const key, const void *base, const size_t member_count, const size_t member_size, size_t compare_size, int *exactmatch);
 void    *vector_find_or_insert(ot_vector *vector, void *key, size_t member_size, size_t compare_size, int *exactmatch);
 ot_peer *vector_find_or_insert_peer(ot_vector *vector, ot_peer const *peer, size_t peer_size, int *exactmatch);
diff --git a/scan_urlencoded_query.c b/scan_urlencoded_query.c
index cf0c5b1..4825a4a 100644
--- a/scan_urlencoded_query.c
+++ b/scan_urlencoded_query.c
@@ -170,16 +170,12 @@ size_t fmt_urlencoded(char *dest, const uint8_t *src, size_t len) {
 
     /* strchr would find the terminator, so a zero byte never counts as safe */
     if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c && strchr(safe, c))) {
-      if (dest)
-        dest[written] = (char)c;
-      ++written;
+      dest[written++] = (char)c;
     } else {
-      if (dest) {
-        dest[written]     = '%';
-        dest[written + 1] = hexdigit[c >> 4];
-        dest[written + 2] = hexdigit[c & 15];
-      }
-      written += 3;
+      dest[written]     = '%';
+      dest[written + 1] = hexdigit[c >> 4];
+      dest[written + 2] = hexdigit[c & 15];
+      written          += 3;
     }
   }
 
diff --git a/scan_urlencoded_query.h b/scan_urlencoded_query.h
index 6f12c03..d0929cf 100644
--- a/scan_urlencoded_query.h
+++ b/scan_urlencoded_query.h
@@ -55,9 +55,7 @@ void    scan_urlencoded_skipvalue(char **string);
 ssize_t scan_fixed_int(char *data, size_t len, int *number);
 
 /* The other direction: percent encode len bytes from src into dest and return
-   how many characters were written, or how many would be needed when dest is
-   NULL. dest needs room for three times len.
- */
+   how many characters were written. dest needs room for three times len. */
 size_t  fmt_urlencoded(char *dest, const uint8_t *src, size_t len);
 
 #endif
diff --git a/tests/t_scan_urlencoded_query.c b/tests/t_scan_urlencoded_query.c
index 6fa34e0..f660ea3 100644
--- a/tests/t_scan_urlencoded_query.c
+++ b/tests/t_scan_urlencoded_query.c
@@ -295,14 +295,6 @@ static void case_fmt_hex_is_lower_case(void) {
   CHECK_STR(dest, "%00%ab%ff");
 }
 
-static void case_fmt_length_only(void) {
-  const uint8_t src[] = {'a', 0xff, 'b'};
-
-  test_case("a null destination reports the length without writing");
-  CHECK_INT(fmt_urlencoded(NULL, src, sizeof(src)), 5);
-  CHECK_INT(fmt_urlencoded(NULL, src, 0), 0);
-}
-
 static void case_fmt_zero_length(void) {
   char dest[4];
 
@@ -374,7 +366,6 @@ void test_scan_urlencoded_query(void) {
   case_fmt_passes_safe_bytes();
   case_fmt_escapes_the_rest();
   case_fmt_hex_is_lower_case();
-  case_fmt_length_only();
   case_fmt_zero_length();
   case_fmt_worst_case_fits();
   case_fmt_decoder_disagrees_on_dollar();
diff --git a/tests/t_socket.c b/tests/t_socket.c
index cf7d291..bbc9e5e 100644
--- a/tests/t_socket.c
+++ b/tests/t_socket.c
@@ -58,14 +58,6 @@ static void bound_address(int s, char ip[16], uint16_t *port) {
   }
 }
 
-static uint16_t bound_port(int s) {
-  char     ip[16];
-  uint16_t port;
-
-  bound_address(s, ip, &port);
-  return port;
-}
-
 static int is_nonblocking(int s) {
   int flags = fcntl(s, F_GETFL, 0);
   return flags != -1 && (flags & O_NONBLOCK) != 0;