summaryrefslogtreecommitdiff
path: root/toxcore
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2014-09-11 12:39:28 -0400
committerirungentoo <irungentoo@gmail.com>2014-09-11 12:39:28 -0400
commitd0448d3e7bb3e376fc6459b3f252ee663cdfbe9a (patch)
treeb6d9472edce2226270625a919c4cb7b59bdadf9c /toxcore
parent820a32702f27373456fa496e8dffed2e329a7664 (diff)
parent4b2aed74ec467adeeb6259eea67f517d65b48325 (diff)
Merge branch 'tux3-TCPSNHAPPEN27TCPSNHAPPEN27TCPSNHAPPEN27'
Diffstat (limited to 'toxcore')
-rw-r--r--toxcore/net_crypto.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 172e439b..0b31d22f 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -31,6 +31,7 @@
31#include "net_crypto.h" 31#include "net_crypto.h"
32#include "util.h" 32#include "util.h"
33#include "math.h" 33#include "math.h"
34#include "logger.h"
34 35
35static uint8_t crypt_connection_id_not_valid(const Net_Crypto *c, int crypt_connection_id) 36static uint8_t crypt_connection_id_not_valid(const Net_Crypto *c, int crypt_connection_id)
36{ 37{
@@ -838,7 +839,7 @@ static int64_t send_lossless_packet(Net_Crypto *c, int crypt_connection_id, cons
838 dt1->time = temp_time; 839 dt1->time = temp_time;
839 } else { 840 } else {
840 conn->maximum_speed_reached = 1; 841 conn->maximum_speed_reached = 1;
841 fprintf(stderr, "send_data_packet failed\n"); 842 LOGGER_ERROR("send_data_packet failed\n");
842 } 843 }
843 844
844 return packet_num; 845 return packet_num;
@@ -1814,7 +1815,7 @@ static int tcp_oob_callback(void *object, const uint8_t *public_key, const uint8
1814 source.ip.ip6.uint32[0] = location; 1815 source.ip.ip6.uint32[0] = location;
1815 1816
1816 if (data[0] != NET_PACKET_CRYPTO_HS) { 1817 if (data[0] != NET_PACKET_CRYPTO_HS) {
1817 fprintf(stderr, "tcp snhappen %u\n", data[0]); 1818 LOGGER_DEBUG("tcp snhappen %u\n", data[0]);
1818 return -1; 1819 return -1;
1819 } 1820 }
1820 1821