diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
commit | f8a2a865dc32bfa626cc150a509d30d897e1181b (patch) | |
tree | 5bb6b234149cdf2a79422815dc59a0c53cb3cb0e /auto_tests/TCP_test.c | |
parent | a9a7f6a5952d0385904ec9df078ac065a3f5887f (diff) | |
parent | c4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff) |
Resolved conflicts when merging upstream
Diffstat (limited to 'auto_tests/TCP_test.c')
-rw-r--r-- | auto_tests/TCP_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c index ca5afd9a..8e75fae0 100644 --- a/auto_tests/TCP_test.c +++ b/auto_tests/TCP_test.c | |||
@@ -294,7 +294,7 @@ END_TEST | |||
294 | static int response_callback_good; | 294 | static int response_callback_good; |
295 | static uint8_t response_callback_connection_id; | 295 | static uint8_t response_callback_connection_id; |
296 | static uint8_t response_callback_public_key[crypto_box_PUBLICKEYBYTES]; | 296 | static uint8_t response_callback_public_key[crypto_box_PUBLICKEYBYTES]; |
297 | static int response_callback(void *object, uint8_t connection_id, uint8_t *public_key) | 297 | static int response_callback(void *object, uint8_t connection_id, const uint8_t *public_key) |
298 | { | 298 | { |
299 | if (set_tcp_connection_number(object - 2, connection_id, 7) != 0) | 299 | if (set_tcp_connection_number(object - 2, connection_id, 7) != 0) |
300 | return 1; | 300 | return 1; |
@@ -321,7 +321,7 @@ static int status_callback(void *object, uint32_t number, uint8_t connection_id, | |||
321 | return 0; | 321 | return 0; |
322 | } | 322 | } |
323 | static int data_callback_good; | 323 | static int data_callback_good; |
324 | static int data_callback(void *object, uint32_t number, uint8_t connection_id, uint8_t *data, uint16_t length) | 324 | static int data_callback(void *object, uint32_t number, uint8_t connection_id, const uint8_t *data, uint16_t length) |
325 | { | 325 | { |
326 | if (object != (void *)3) | 326 | if (object != (void *)3) |
327 | return 1; | 327 | return 1; |
@@ -342,7 +342,7 @@ static int data_callback(void *object, uint32_t number, uint8_t connection_id, u | |||
342 | 342 | ||
343 | static int oob_data_callback_good; | 343 | static int oob_data_callback_good; |
344 | static uint8_t oob_pubkey[crypto_box_PUBLICKEYBYTES]; | 344 | static uint8_t oob_pubkey[crypto_box_PUBLICKEYBYTES]; |
345 | static int oob_data_callback(void *object, uint8_t *public_key, uint8_t *data, uint16_t length) | 345 | static int oob_data_callback(void *object, const uint8_t *public_key, const uint8_t *data, uint16_t length) |
346 | { | 346 | { |
347 | if (object != (void *)4) | 347 | if (object != (void *)4) |
348 | return 1; | 348 | return 1; |