From 03d6f9571345cb79e5a2b78d598a928ddea2a5bc Mon Sep 17 00:00:00 2001 From: irungentoo Date: Fri, 26 Sep 2014 21:22:07 -0400 Subject: Remove timestamp from set_connection_dht_public_key(). --- toxcore/Messenger.c | 6 ++---- toxcore/net_crypto.c | 21 +++++++-------------- toxcore/net_crypto.h | 10 +++------- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 9383af68..df736ebe 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -213,8 +213,7 @@ static void dht_pk_callback(void *data, int32_t number, const uint8_t *dht_publi friend_new_connection(m, number, m->friendlist[number].client_id); } - set_connection_dht_public_key(m->net_crypto, m->friendlist[number].crypt_connection_id, dht_public_key, - current_time_monotonic()); + set_connection_dht_public_key(m->net_crypto, m->friendlist[number].crypt_connection_id, dht_public_key); onion_set_friend_DHT_pubkey(m->onion_c, m->friendlist[number].onion_friendnum, dht_public_key); memcpy(m->friendlist[number].dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES); @@ -2415,8 +2414,7 @@ void do_friends(Messenger *m) if (friend_new_connection(m, i, m->friendlist[i].client_id) == 0) { if (m->friendlist[i].dht_lock) - set_connection_dht_public_key(m->net_crypto, m->friendlist[i].crypt_connection_id, m->friendlist[i].dht_temp_pk, - current_time_monotonic()); + set_connection_dht_public_key(m->net_crypto, m->friendlist[i].crypt_connection_id, m->friendlist[i].dht_temp_pk); set_direct_ip_port(m->net_crypto, m->friendlist[i].crypt_connection_id, m->friendlist[i].dht_ip_port); } diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c index 59f6ee9a..63012ce6 100644 --- a/toxcore/net_crypto.c +++ b/toxcore/net_crypto.c @@ -1238,7 +1238,7 @@ static int handle_packet_connection(Net_Crypto *c, int crypt_connection_id, cons conn->status = CRYPTO_CONN_NOT_CONFIRMED; /* Status needs to be CRYPTO_CONN_NOT_CONFIRMED for this to work. */ - set_connection_dht_public_key(c, crypt_connection_id, dht_public_key, current_time_monotonic()); + set_connection_dht_public_key(c, crypt_connection_id, dht_public_key); if (conn->dht_pk_callback) conn->dht_pk_callback(conn->dht_pk_callback_object, conn->dht_pk_callback_number, dht_public_key); @@ -1477,7 +1477,7 @@ static int handle_new_connection_handshake(Net_Crypto *c, IP_Port source, const if (create_send_handshake(c, crypt_connection_id, n_c.cookie, n_c.dht_public_key) == 0) { conn->status = CRYPTO_CONN_NOT_CONFIRMED; /* Status needs to be CRYPTO_CONN_NOT_CONFIRMED for this to work. */ - set_connection_dht_public_key(c, crypt_connection_id, n_c.dht_public_key, current_time_monotonic()); + set_connection_dht_public_key(c, crypt_connection_id, n_c.dht_public_key); if (conn->dht_pk_callback) conn->dht_pk_callback(conn->dht_pk_callback_object, conn->dht_pk_callback_number, n_c.dht_public_key); @@ -1530,7 +1530,7 @@ int accept_crypto_connection(Net_Crypto *c, New_Connection *n_c) conn->status = CRYPTO_CONN_NOT_CONFIRMED; /* Status needs to be CRYPTO_CONN_NOT_CONFIRMED for this to work. */ - set_connection_dht_public_key(c, crypt_connection_id, n_c->dht_public_key, current_time_monotonic()); + set_connection_dht_public_key(c, crypt_connection_id, n_c->dht_public_key); conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE; conn->packets_left = CRYPTO_MIN_QUEUE_LENGTH; crypto_connection_add_source(c, crypt_connection_id, n_c->source); @@ -1626,9 +1626,9 @@ static int connect_peer_tcp(Net_Crypto *c, int crypt_connection_id) /* Copy friends DHT public key into dht_key. * * return 0 on failure (no key copied). - * return timestamp on success (key copied). + * return 1 on success (key copied). */ -uint64_t get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, uint8_t *dht_public_key) +unsigned int get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, uint8_t *dht_public_key) { Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id); @@ -1639,28 +1639,22 @@ uint64_t get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, ui return 0; memcpy(dht_public_key, conn->dht_public_key, crypto_box_PUBLICKEYBYTES); - return conn->dht_public_key_timestamp; + return 1; } /* Set the DHT public key of the crypto connection. - * timestamp is the time (current_time_monotonic()) at which the key was last confirmed belonging to - * the other peer. * * return -1 on failure. * return 0 on success. */ -int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const uint8_t *dht_public_key, - uint64_t timestamp) +int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const uint8_t *dht_public_key) { Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id); if (conn == 0) return -1; - if (timestamp <= conn->dht_public_key_timestamp) - return -1; - if (conn->dht_public_key_set == 1 && memcmp(conn->dht_public_key, dht_public_key, crypto_box_PUBLICKEYBYTES) == 0) return -1; @@ -1670,7 +1664,6 @@ int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const memcpy(conn->dht_public_key, dht_public_key, crypto_box_PUBLICKEYBYTES); conn->dht_public_key_set = 1; - conn->dht_public_key_timestamp = timestamp; if (conn->status == CRYPTO_CONN_COOKIE_REQUESTING) { conn->cookie_request_number = random_64b(); diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h index cfa7c576..3245b6a2 100644 --- a/toxcore/net_crypto.h +++ b/toxcore/net_crypto.h @@ -111,7 +111,6 @@ typedef struct { uint64_t cookie_request_number; /* number used in the cookie request packets for this connection */ uint8_t dht_public_key[crypto_box_PUBLICKEYBYTES]; /* The dht public key of the peer */ uint8_t dht_public_key_set; /* True if the dht public key is set, false if it isn't. */ - uint64_t dht_public_key_timestamp; /* Timestamp of the last time we confirmed the key was correct. */ uint8_t *temp_packet; /* Where the cookie request/handshake packet is stored while it is being sent. */ uint16_t temp_packet_length; @@ -240,19 +239,16 @@ int new_crypto_connection(Net_Crypto *c, const uint8_t *real_public_key); /* Copy friends DHT public key into dht_key. * * return 0 on failure (no key copied). - * return timestamp on success (key copied). + * return 1 on success (key copied). */ -uint64_t get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, uint8_t *dht_public_key); +unsigned int get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, uint8_t *dht_public_key); /* Set the DHT public key of the crypto connection. - * timestamp is the time (current_time_monotonic()) at which the key was last confirmed belonging to - * the other peer. * * return -1 on failure. * return 0 on success. */ -int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const uint8_t *dht_public_key, - uint64_t timestamp); +int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const uint8_t *dht_public_key); /* Set the direct ip of the crypto connection. * -- cgit v1.2.3