From 071ac463082646189ade6e31bb3f6051516f81b2 Mon Sep 17 00:00:00 2001
From: plutooo <tfy12vbr@student.lu.se>
Date: Mon, 5 Aug 2013 12:51:58 -0700
Subject: core: Rewrote ping-module, better performance and cleaner code.

---
 core/util.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 core/util.c

(limited to 'core/util.c')

diff --git a/core/util.c b/core/util.c
new file mode 100644
index 00000000..6b40dad7
--- /dev/null
+++ b/core/util.c
@@ -0,0 +1,31 @@
+/*
+ * util.c -- Utilities.
+ *
+ * This file is donated to the Tox Project.
+ * Copyright 2013  plutooo
+ */
+
+#include <time.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "network.h"
+
+uint64_t now() {
+  return time(NULL);
+}
+
+uint64_t random_64b() {
+  uint64_t r;
+
+  // This is probably not random enough?
+  r = random_int();
+  r <<= 32;
+  r |= random_int();
+
+  return r;
+}
+
+bool ipp_eq(IP_Port a, IP_Port b) {
+  return (a.ip.i == b.ip.i) && (a.port == b.port);
+}
-- 
cgit v1.2.3


From 524cf1895413026f528d9c59d16755a066c56f1c Mon Sep 17 00:00:00 2001
From: irungentoo <irungentoo@gmail.com>
Date: Mon, 5 Aug 2013 20:35:47 -0400
Subject: Fixed style and is_pinging().

---
 core/ping.c | 110 ++++++++++++++++++++++++++++++++----------------------------
 core/util.c |  25 ++++++++------
 2 files changed, 73 insertions(+), 62 deletions(-)

(limited to 'core/util.c')

diff --git a/core/ping.c b/core/ping.c
index 8a7d534f..ffabe221 100644
--- a/core/ping.c
+++ b/core/ping.c
@@ -15,9 +15,9 @@
 #define PING_TIMEOUT 5 // 5s
 
 typedef struct {
-  IP_Port  ipp;
-  uint64_t id;
-  uint64_t timestamp;
+    IP_Port  ipp;
+    uint64_t id;
+    uint64_t timestamp;
 } pinged_t;
 
 static pinged_t pings[PING_NUM_MAX];
@@ -25,71 +25,79 @@ static size_t   num_pings;
 static size_t   pos_pings;
 
 
-void init_ping() {
-  num_pings = 0;
-  pos_pings = 0;
+void init_ping()
+{
+    num_pings = 0;
+    pos_pings = 0;
 }
 
-static bool is_timeout(uint64_t time) {
-  return (time + PING_TIMEOUT) < now();
+static bool is_timeout(uint64_t time)
+{
+    return (time + PING_TIMEOUT) < now();
 }
 
-static void remove_timeouts() { // O(n)
-  size_t i, id;
-  size_t new_pos = pos_pings;
-  size_t new_num = num_pings;
-
-  // Loop through buffer, oldest first
-  for(i=0; i<num_pings; i++) {
-    id = (pos_pings + i) % PING_NUM_MAX;
-
-    if(is_timeout(pings[id].timestamp)) {
-      new_pos++;
-      new_num--;
+static void remove_timeouts()   // O(n)
+{
+    size_t i, id;
+    size_t new_pos = pos_pings;
+    size_t new_num = num_pings;
+
+    // Loop through buffer, oldest first
+    for (i=0; i<num_pings; i++) {
+        id = (pos_pings + i) % PING_NUM_MAX;
+
+        if(is_timeout(pings[id].timestamp)) {
+            new_pos++;
+            new_num--;
+        }
+        // Break here because list is sorted.
+        else
+            break;
     }
-    // Break here because list is sorted.
-    else
-      break;
-  }
 
-  num_pings = new_num;
-  pos_pings = new_pos % PING_NUM_MAX;
+    num_pings = new_num;
+    pos_pings = new_pos % PING_NUM_MAX;
 }
 
-uint64_t add_ping(IP_Port ipp) { // O(n)
-  size_t p;
-  
-  remove_timeouts();
+uint64_t add_ping(IP_Port ipp)   // O(n)
+{
+    size_t p;
 
-  // Remove oldest ping if full buffer
-  if(num_pings == PING_NUM_MAX) {
-    num_pings--;
-    pos_pings = (pos_pings + 1) % PING_NUM_MAX;
-  }
+    remove_timeouts();
+
+    // Remove oldest ping if full buffer
+    if (num_pings == PING_NUM_MAX) {
+        num_pings--;
+        pos_pings = (pos_pings + 1) % PING_NUM_MAX;
+    }
 
-  // Insert new ping at end of list
-  p = (pos_pings + num_pings) % PING_NUM_MAX;
+    // Insert new ping at end of list
+    p = (pos_pings + num_pings) % PING_NUM_MAX;
 
-  pings[p].ipp       = ipp;
-  pings[p].timestamp = now();
-  pings[p].id        = random_64b();
+    pings[p].ipp       = ipp;
+    pings[p].timestamp = now();
+    pings[p].id        = random_64b();
 
-  num_pings++;
-  return pings[p].id;
+    num_pings++;
+    return pings[p].id;
 }
 
-bool is_pinging(IP_Port ipp, uint64_t ping_id) { // O(n)
-  size_t i, id;
+bool is_pinging(IP_Port ipp, uint64_t ping_id)   // O(n) TODO: replace this with something else.
+{
+    if (ipp.ip.i == 0 && ping_id == 0)
+        return false;
+    
+    size_t i, id;
 
-  remove_timeouts();
+    remove_timeouts();
 
-  for(i=0; i<num_pings; i++) {
-    id = (pos_pings + i) % PING_NUM_MAX;
+    for (i=0; i<num_pings; i++) {
+        id = (pos_pings + i) % PING_NUM_MAX;
 
-    if(ipp_eq(pings[id].ipp, ipp) && pings[id].id == ping_id) {
-      return true;
+        if ((ipp_eq(pings[id].ipp, ipp) || ipp.ip.i == 0) && (pings[id].id == ping_id || ping_id == 0)) {
+            return true;
+        }
     }
-  }
 
-  return false;
+    return false;
 }
diff --git a/core/util.c b/core/util.c
index 6b40dad7..4ce9271e 100644
--- a/core/util.c
+++ b/core/util.c
@@ -11,21 +11,24 @@
 
 #include "network.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);
 }
-- 
cgit v1.2.3