diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-01-10 16:44:49 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-01-11 11:59:14 +0000 |
commit | 2fbed5b4c55ca92edbd436d4d0fa0a35506855c3 (patch) | |
tree | f9cee9b3eb13d47789ec0340a59ae105dce0a07a /toxcore/onion_announce.c | |
parent | c84daff5413c45fb9e87fa5dbb7ae228564cfd2f (diff) |
Move Networking_Core struct into the .c file.
To make it an abstract type everywhere except in network.c.
Diffstat (limited to 'toxcore/onion_announce.c')
-rw-r--r-- | toxcore/onion_announce.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c index 53759154..c0938007 100644 --- a/toxcore/onion_announce.c +++ b/toxcore/onion_announce.c | |||
@@ -59,7 +59,7 @@ int create_announce_request(uint8_t *packet, uint16_t max_packet_length, const u | |||
59 | } | 59 | } |
60 | 60 | ||
61 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + | 61 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + |
62 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; | 62 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; |
63 | memcpy(plain, ping_id, ONION_PING_ID_SIZE); | 63 | memcpy(plain, ping_id, ONION_PING_ID_SIZE); |
64 | memcpy(plain + ONION_PING_ID_SIZE, client_id, CRYPTO_PUBLIC_KEY_SIZE); | 64 | memcpy(plain + ONION_PING_ID_SIZE, client_id, CRYPTO_PUBLIC_KEY_SIZE); |
65 | memcpy(plain + ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE, data_public_key, CRYPTO_PUBLIC_KEY_SIZE); | 65 | memcpy(plain + ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE, data_public_key, CRYPTO_PUBLIC_KEY_SIZE); |
@@ -347,7 +347,7 @@ static int handle_announce_request(void *object, IP_Port source, const uint8_t * | |||
347 | get_shared_key(&onion_a->shared_keys_recv, shared_key, onion_a->dht->self_secret_key, packet_public_key); | 347 | get_shared_key(&onion_a->shared_keys_recv, shared_key, onion_a->dht->self_secret_key, packet_public_key); |
348 | 348 | ||
349 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + | 349 | uint8_t plain[ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + |
350 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; | 350 | ONION_ANNOUNCE_SENDBACK_DATA_LENGTH]; |
351 | int len = decrypt_data_symmetric(shared_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE, | 351 | int len = decrypt_data_symmetric(shared_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE, |
352 | ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + ONION_ANNOUNCE_SENDBACK_DATA_LENGTH + | 352 | ONION_PING_ID_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_PUBLIC_KEY_SIZE + ONION_ANNOUNCE_SENDBACK_DATA_LENGTH + |
353 | CRYPTO_MAC_SIZE, plain); | 353 | CRYPTO_MAC_SIZE, plain); |