Merge branch 'dev'

Conflicts:
	core/packets.h
	core/ping.c

1 files changed, 20 insertions, 15 deletions

diff --git a/core/util.c b/core/util.c
index 5b560171..d201bcb4 100644
--- a/core/util.c
+++ b/core/util.c
@@ -12,29 +12,34 @@
 #include "DHT.h"
 #include "packets.h"
 
-uint64_t now() {
-  return time(NULL);
+uint64_t now()
+{
+    return time(NULL);
 }
 
-uint64_t random_64b() {
-  uint64_t r;
+uint64_t random_64b()
+{
+    uint64_t r;
 
-  // This is probably not random enough?
-  r = random_int();
-  r <<= 32;
-  r |= random_int();
+    // This is probably not random enough?
+    r = random_int();
+    r <<= 32;
+    r |= random_int();
 
-  return r;
+    return r;
 }
 
-bool ipp_eq(IP_Port a, IP_Port b) {
-  return (a.ip.i == b.ip.i) && (a.port == b.port);
+bool ipp_eq(IP_Port a, IP_Port b)
+{
+    return (a.ip.i == b.ip.i) && (a.port == b.port);
 }
 
-bool id_eq(clientid_t* dest, clientid_t* src) {
-  return memcmp(dest, src, sizeof(clientid_t)) == 0;
+bool id_eq(clientid_t* dest, clientid_t* src)
+{
+    return memcmp(dest, src, sizeof(clientid_t)) == 0;
 }
 
-void id_cpy(clientid_t* dest, clientid_t* src) {
-  memcpy(dest, src, sizeof(clientid_t));
+void id_cpy(clientid_t* dest, clientid_t* src)
+{
+    memcpy(dest, src, sizeof(clientid_t));
 }