1 files changed, 51 insertions, 44 deletions

diff --git a/core/ping.c b/core/ping.c
index 10b9b19f..5da3c0ca 100644
--- a/core/ping.c
+++ b/core/ping.c
@@ -23,16 +23,20 @@ typedef struct {
     uint64_t timestamp;
 } pinged_t;
 
-static pinged_t    pings[PING_NUM_MAX];
-static size_t      num_pings;
-static size_t      pos_pings;
+typedef struct {
+    pinged_t    pings[PING_NUM_MAX];
+    size_t      num_pings;
+    size_t      pos_pings;
+} PING;
 
-extern uint8_t self_secret_key[crypto_box_SECRETKEYBYTES]; // DHT.c
+void * new_ping(void)
+{
+    return calloc(1, sizeof(PING));
+}
 
-void init_ping()
+void kill_ping(void * ping)
 {
-    num_pings = 0;
-    pos_pings = 0;
+    free(ping);
 }
 
 static bool is_timeout(uint64_t time)
@@ -40,17 +44,18 @@ static bool is_timeout(uint64_t time)
     return (time + PING_TIMEOUT) < now();
 }
 
-static void remove_timeouts()   // O(n)
+static void remove_timeouts(void * ping)   // O(n)
 {
+    PING * png = ping;
     size_t i, id;
-    size_t new_pos = pos_pings;
-    size_t new_num = num_pings;
+    size_t new_pos = png->pos_pings;
+    size_t new_num = png->num_pings;
 
     // Loop through buffer, oldest first
-    for (i = 0; i < num_pings; i++) {
-        id = (pos_pings + i) % PING_NUM_MAX;
+    for (i = 0; i < png->num_pings; i++) {
+        id = (png->pos_pings + i) % PING_NUM_MAX;
 
-        if (is_timeout(pings[id].timestamp)) {
+        if (is_timeout(png->pings[id].timestamp)) {
             new_pos++;
             new_num--;
         }
@@ -60,47 +65,49 @@ static void remove_timeouts()   // O(n)
         }
     }
 
-    num_pings = new_num;
-    pos_pings = new_pos % PING_NUM_MAX;
+    png->num_pings = new_num;
+    png->pos_pings = new_pos % PING_NUM_MAX;
 }
 
-uint64_t add_ping(IP_Port ipp) // O(n)
+uint64_t add_ping(void * ping, IP_Port ipp) // O(n)
 {
+    PING * png = ping;
     size_t p;
 
-    remove_timeouts();
+    remove_timeouts(ping);
 
     // Remove oldest ping if full buffer
-    if (num_pings == PING_NUM_MAX) {
-        num_pings--;
-        pos_pings = (pos_pings + 1) % PING_NUM_MAX;
+    if (png->num_pings == PING_NUM_MAX) {
+        png->num_pings--;
+        png->pos_pings = (png->pos_pings + 1) % PING_NUM_MAX;
     }
 
     // Insert new ping at end of list
-    p = (pos_pings + num_pings) % PING_NUM_MAX;
+    p = (png->pos_pings + png->num_pings) % PING_NUM_MAX;
 
-    pings[p].ipp       = ipp;
-    pings[p].timestamp = now();
-    pings[p].id        = random_64b();
+    png->pings[p].ipp       = ipp;
+    png->pings[p].timestamp = now();
+    png->pings[p].id        = random_64b();
 
-    num_pings++;
-    return pings[p].id;
+    png->num_pings++;
+    return png->pings[p].id;
 }
 
-bool is_pinging(IP_Port ipp, uint64_t ping_id)   // O(n) TODO: replace this with something else.
+bool is_pinging(void * ping, IP_Port ipp, uint64_t ping_id)   // O(n) TODO: replace this with something else.
 {
+    PING * png = ping;
     if (ipp.ip.i == 0 && ping_id == 0)
         return false;
 
     size_t i, id;
 
-    remove_timeouts();
+    remove_timeouts(ping);
 
-    for (i = 0; i < num_pings; i++) {
-        id = (pos_pings + i) % PING_NUM_MAX;
+    for (i = 0; i < png->num_pings; i++) {
+        id = (png->pos_pings + i) % PING_NUM_MAX;
 
         // ping_id = 0 means match any id
-        if ((ipp_eq(pings[id].ipp, ipp) || ipp.ip.i == 0) && (pings[id].id == ping_id || ping_id == 0)) {
+        if ((ipp_eq(png->pings[id].ipp, ipp) || ipp.ip.i == 0) && (png->pings[id].id == ping_id || ping_id == 0)) {
             return true;
         }
     }
@@ -108,25 +115,25 @@ bool is_pinging(IP_Port ipp, uint64_t ping_id)   // O(n) TODO: replace this with
     return false;
 }
 
-int send_ping_request(IP_Port ipp, clientid_t *client_id)
+int send_ping_request(void * ping, Net_Crypto *c, IP_Port ipp, clientid_t *client_id)
 {
     pingreq_t pk;
     int       rc;
     uint64_t  ping_id;
 
-    if (is_pinging(ipp, 0) || id_eq(client_id, (clientid_t *)temp_net_crypto->self_public_key))
+    if (is_pinging(ping, ipp, 0) || id_eq(client_id, (clientid_t *)c->self_public_key))
         return 1;
 
     // Generate random ping_id
-    ping_id = add_ping(ipp);
+    ping_id = add_ping(ping, ipp);
 
     pk.magic = PACKET_PING_REQ;
-    id_cpy(&pk.client_id, (clientid_t *)temp_net_crypto->self_public_key);     // Our pubkey
+    id_cpy(&pk.client_id, (clientid_t *)c->self_public_key);     // Our pubkey
     random_nonce((uint8_t *) &pk.nonce); // Generate random nonce
 
     // Encrypt ping_id using recipient privkey
     rc = encrypt_data((uint8_t *) client_id,
-                      temp_net_crypto->self_secret_key,
+                      c->self_secret_key,
                       (uint8_t *) &pk.nonce,
                       (uint8_t *) &ping_id, sizeof(ping_id),
                       (uint8_t *) &pk.ping_id);
@@ -134,24 +141,24 @@ int send_ping_request(IP_Port ipp, clientid_t *client_id)
     if (rc != sizeof(ping_id) + ENCRYPTION_PADDING)
         return 1;
 
-    return sendpacket(temp_net_crypto->lossless_udp->net->sock, ipp, (uint8_t *) &pk, sizeof(pk));
+    return sendpacket(c->lossless_udp->net->sock, ipp, (uint8_t *) &pk, sizeof(pk));
 }
 
-int send_ping_response(IP_Port ipp, clientid_t *client_id, uint64_t ping_id)
+int send_ping_response(Net_Crypto *c, IP_Port ipp, clientid_t *client_id, uint64_t ping_id)
 {
     pingres_t pk;
     int       rc;
 
-    if (id_eq(client_id, (clientid_t *)temp_net_crypto->self_public_key))
+    if (id_eq(client_id, (clientid_t *)c->self_public_key))
         return 1;
 
     pk.magic = PACKET_PING_RES;
-    id_cpy(&pk.client_id, (clientid_t *)temp_net_crypto->self_public_key);     // Our pubkey
+    id_cpy(&pk.client_id, (clientid_t *)c->self_public_key);     // Our pubkey
     random_nonce((uint8_t *) &pk.nonce); // Generate random nonce
 
     // Encrypt ping_id using recipient privkey
     rc = encrypt_data((uint8_t *) client_id,
-                      temp_net_crypto->self_secret_key,
+                      c->self_secret_key,
                       (uint8_t *) &pk.nonce,
                       (uint8_t *) &ping_id, sizeof(ping_id),
                       (uint8_t *) &pk.ping_id);
@@ -159,7 +166,7 @@ int send_ping_response(IP_Port ipp, clientid_t *client_id, uint64_t ping_id)
     if (rc != sizeof(ping_id) + ENCRYPTION_PADDING)
         return 1;
 
-    return sendpacket(temp_net_crypto->lossless_udp->net->sock, ipp, (uint8_t *) &pk, sizeof(pk));
+    return sendpacket(c->lossless_udp->net->sock, ipp, (uint8_t *) &pk, sizeof(pk));
 }
 
 int handle_ping_request(void * object, IP_Port source, uint8_t *packet, uint32_t length)
@@ -184,7 +191,7 @@ int handle_ping_request(void * object, IP_Port source, uint8_t *packet, uint32_t
         return 1;
 
     // Send response
-    send_ping_response(source, &p->client_id, ping_id);
+    send_ping_response(dht->c, source, &p->client_id, ping_id);
     add_toping(dht, (uint8_t *) &p->client_id, source);
 
     return 0;
@@ -212,7 +219,7 @@ int handle_ping_response(void * object, IP_Port source, uint8_t *packet, uint32_
         return 1;
 
     // Make sure ping_id is correct
-    if (!is_pinging(source, ping_id))
+    if (!is_pinging(dht->ping, source, ping_id))
         return 1;
 
     // Associate source ip with client_id