summaryrefslogtreecommitdiff
path: root/toxcore
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2015-04-19 10:34:13 -0400
committerirungentoo <irungentoo@gmail.com>2015-04-19 10:34:13 -0400
commit4a987bf751058f1e82bbb33194512e72f9dda01b (patch)
treee0397ec8f44ba6eb68f5446c3f05c1e870bb8ddb /toxcore
parentef5ef8ef3614f8aa30e8740585b9c5b9064f8a34 (diff)
Removed useless stuff.
Diffstat (limited to 'toxcore')
-rw-r--r--toxcore/TCP_client.h4
-rw-r--r--toxcore/TCP_connection.c1
-rw-r--r--toxcore/net_crypto.c1
3 files changed, 1 insertions, 5 deletions
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index d4d18a4b..722430e0 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -78,10 +78,6 @@ typedef struct {
78 uint64_t ping_response_id; 78 uint64_t ping_response_id;
79 uint64_t ping_request_id; 79 uint64_t ping_request_id;
80 80
81 //TODO: remove
82 void *net_crypto_pointer;
83 uint32_t net_crypto_location;
84
85 struct { 81 struct {
86 uint8_t status; /* 0 if not used, 1 if other is offline, 2 if other is online. */ 82 uint8_t status; /* 0 if not used, 1 if other is offline, 2 if other is online. */
87 uint8_t public_key[crypto_box_PUBLICKEYBYTES]; 83 uint8_t public_key[crypto_box_PUBLICKEYBYTES];
diff --git a/toxcore/TCP_connection.c b/toxcore/TCP_connection.c
index ebf41592..912f4be4 100644
--- a/toxcore/TCP_connection.c
+++ b/toxcore/TCP_connection.c
@@ -1072,7 +1072,6 @@ static void kill_nonused_tcp(TCP_Connections *tcp_c)
1072 1072
1073void do_tcp_connections(TCP_Connections *tcp_c) 1073void do_tcp_connections(TCP_Connections *tcp_c)
1074{ 1074{
1075 //TODO reconnect to TCP relays if disconnects happen.
1076 do_tcp_conns(tcp_c); 1075 do_tcp_conns(tcp_c);
1077 kill_nonused_tcp(tcp_c); 1076 kill_nonused_tcp(tcp_c);
1078} 1077}
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 5d571e12..c7b059cb 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -1566,6 +1566,7 @@ int accept_crypto_connection(Net_Crypto *c, New_Connection *n_c)
1566 pthread_mutex_unlock(&c->tcp_mutex); 1566 pthread_mutex_unlock(&c->tcp_mutex);
1567 return -1; 1567 return -1;
1568 } 1568 }
1569
1569 memcpy(conn->dht_public_key, n_c->dht_public_key, crypto_box_PUBLICKEYBYTES); 1570 memcpy(conn->dht_public_key, n_c->dht_public_key, crypto_box_PUBLICKEYBYTES);
1570 conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE; 1571 conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE;
1571 conn->packets_left = CRYPTO_MIN_QUEUE_LENGTH; 1572 conn->packets_left = CRYPTO_MIN_QUEUE_LENGTH;