summaryrefslogtreecommitdiff
path: root/toxcore
diff options
context:
space:
mode:
Diffstat (limited to 'toxcore')
-rw-r--r--toxcore/DHT.c4
-rw-r--r--toxcore/TCP_server.h2
-rw-r--r--toxcore/network.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 9ebe11cf..8cd8852c 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -145,7 +145,7 @@ void get_shared_key(Shared_Keys *shared_keys, uint8_t *shared_key, const uint8_t
145 */ 145 */
146void DHT_get_shared_key_recv(DHT *dht, uint8_t *shared_key, const uint8_t *client_id) 146void DHT_get_shared_key_recv(DHT *dht, uint8_t *shared_key, const uint8_t *client_id)
147{ 147{
148 return get_shared_key(&dht->shared_keys_recv, shared_key, dht->self_secret_key, client_id); 148 get_shared_key(&dht->shared_keys_recv, shared_key, dht->self_secret_key, client_id);
149} 149}
150 150
151/* Copy shared_key to encrypt/decrypt DHT packet from client_id into shared_key 151/* Copy shared_key to encrypt/decrypt DHT packet from client_id into shared_key
@@ -153,7 +153,7 @@ void DHT_get_shared_key_recv(DHT *dht, uint8_t *shared_key, const uint8_t *clien
153 */ 153 */
154void DHT_get_shared_key_sent(DHT *dht, uint8_t *shared_key, const uint8_t *client_id) 154void DHT_get_shared_key_sent(DHT *dht, uint8_t *shared_key, const uint8_t *client_id)
155{ 155{
156 return get_shared_key(&dht->shared_keys_sent, shared_key, dht->self_secret_key, client_id); 156 get_shared_key(&dht->shared_keys_sent, shared_key, dht->self_secret_key, client_id);
157} 157}
158 158
159void to_net_family(IP *ip) 159void to_net_family(IP *ip)
diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h
index 727c4b4e..ba3e7308 100644
--- a/toxcore/TCP_server.h
+++ b/toxcore/TCP_server.h
@@ -85,7 +85,7 @@ typedef struct TCP_Priority_List TCP_Priority_List;
85struct TCP_Priority_List { 85struct TCP_Priority_List {
86 TCP_Priority_List *next; 86 TCP_Priority_List *next;
87 uint16_t size, sent; 87 uint16_t size, sent;
88 uint8_t data[0]; 88 uint8_t data[];
89}; 89};
90 90
91typedef struct TCP_Secure_Connection { 91typedef struct TCP_Secure_Connection {
diff --git a/toxcore/network.c b/toxcore/network.c
index e8787127..22ee4202 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -813,7 +813,7 @@ void ipport_copy(IP_Port *target, const IP_Port *source)
813 return; 813 return;
814 814
815 memcpy(target, source, sizeof(IP_Port)); 815 memcpy(target, source, sizeof(IP_Port));
816}; 816}
817 817
818/* ip_ntoa 818/* ip_ntoa
819 * converts ip into a string 819 * converts ip into a string