diff options
| author | Coren[m] <Break@Ocean> | 2013-09-13 19:44:14 +0200 |
|---|---|---|
| committer | Coren[m] <Break@Ocean> | 2013-09-13 19:44:14 +0200 |
| commit | fa576e464e791199b4e9097bc835960f2dba5ea2 (patch) | |
| tree | 205cd87b724b50406f2e44b9831dc834aded8b8c /toxcore/ping.c | |
| parent | e67a11dd04edce395c2d0ac403241ed08a875737 (diff) | |
| parent | 339dcd60707ea7b46f5c450569d32f852a1c0be7 (diff) | |
Merge remote-tracking branch 'upstream/master' into Integration
Diffstat (limited to 'toxcore/ping.c')
| -rw-r--r-- | toxcore/ping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/ping.c b/toxcore/ping.c index 49e0dba9..113702bf 100644 --- a/toxcore/ping.c +++ b/toxcore/ping.c | |||
| @@ -137,7 +137,7 @@ int send_ping_request(void *ping, Net_Crypto *c, IP_Port ipp, uint8_t *client_id | |||
| 137 | 137 | ||
| 138 | pk[0] = NET_PACKET_PING_REQUEST; | 138 | pk[0] = NET_PACKET_PING_REQUEST; |
| 139 | id_cpy(pk + 1, c->self_public_key); // Our pubkey | 139 | id_cpy(pk + 1, c->self_public_key); // Our pubkey |
| 140 | random_nonce(pk + 1 + CLIENT_ID_SIZE); // Generate random nonce | 140 | new_nonce(pk + 1 + CLIENT_ID_SIZE); // Generate new nonce |
| 141 | 141 | ||
| 142 | // Encrypt ping_id using recipient privkey | 142 | // Encrypt ping_id using recipient privkey |
| 143 | rc = encrypt_data(client_id, | 143 | rc = encrypt_data(client_id, |
| @@ -162,7 +162,7 @@ int send_ping_response(Net_Crypto *c, IP_Port ipp, uint8_t *client_id, uint64_t | |||
| 162 | 162 | ||
| 163 | pk[0] = NET_PACKET_PING_RESPONSE; | 163 | pk[0] = NET_PACKET_PING_RESPONSE; |
| 164 | id_cpy(pk + 1, c->self_public_key); // Our pubkey | 164 | id_cpy(pk + 1, c->self_public_key); // Our pubkey |
| 165 | random_nonce(pk + 1 + CLIENT_ID_SIZE); // Generate random nonce | 165 | new_nonce(pk + 1 + CLIENT_ID_SIZE); // Generate new nonce |
| 166 | 166 | ||
| 167 | // Encrypt ping_id using recipient privkey | 167 | // Encrypt ping_id using recipient privkey |
| 168 | rc = encrypt_data(client_id, | 168 | rc = encrypt_data(client_id, |