diff options
Diffstat (limited to 'toxcore/net_crypto.c')
-rw-r--r-- | toxcore/net_crypto.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c index 63012ce6..c83c5d54 100644 --- a/toxcore/net_crypto.c +++ b/toxcore/net_crypto.c | |||
@@ -835,8 +835,9 @@ static int64_t send_lossless_packet(Net_Crypto *c, int crypt_connection_id, cons | |||
835 | 835 | ||
836 | if (send_data_packet_helper(c, crypt_connection_id, conn->recv_array.buffer_start, packet_num, data, length) == 0) { | 836 | if (send_data_packet_helper(c, crypt_connection_id, conn->recv_array.buffer_start, packet_num, data, length) == 0) { |
837 | Packet_Data *dt1 = NULL; | 837 | Packet_Data *dt1 = NULL; |
838 | get_data_pointer(&conn->send_array, &dt1, packet_num); | 838 | |
839 | dt1->time = temp_time; | 839 | if (get_data_pointer(&conn->send_array, &dt1, packet_num) == 1) |
840 | dt1->time = temp_time; | ||
840 | } else { | 841 | } else { |
841 | conn->maximum_speed_reached = 1; | 842 | conn->maximum_speed_reached = 1; |
842 | LOGGER_ERROR("send_data_packet failed\n"); | 843 | LOGGER_ERROR("send_data_packet failed\n"); |
@@ -1322,8 +1323,10 @@ static int create_crypto_connection(Net_Crypto *c) | |||
1322 | ++c->crypto_connections_length; | 1323 | ++c->crypto_connections_length; |
1323 | memset(&(c->crypto_connections[id]), 0, sizeof(Crypto_Connection)); | 1324 | memset(&(c->crypto_connections[id]), 0, sizeof(Crypto_Connection)); |
1324 | 1325 | ||
1325 | if (pthread_mutex_init(&c->crypto_connections[id].mutex, NULL) != 0) | 1326 | if (pthread_mutex_init(&c->crypto_connections[id].mutex, NULL) != 0) { |
1327 | pthread_mutex_unlock(&c->connections_mutex); | ||
1326 | return -1; | 1328 | return -1; |
1329 | } | ||
1327 | } | 1330 | } |
1328 | 1331 | ||
1329 | pthread_mutex_unlock(&c->connections_mutex); | 1332 | pthread_mutex_unlock(&c->connections_mutex); |
@@ -1817,6 +1820,7 @@ static int tcp_oob_callback(void *object, const uint8_t *public_key, const uint8 | |||
1817 | 1820 | ||
1818 | if (crypt_connection_id == -1) { | 1821 | if (crypt_connection_id == -1) { |
1819 | IP_Port source; | 1822 | IP_Port source; |
1823 | source.port = 0; | ||
1820 | source.ip.family = TCP_FAMILY; | 1824 | source.ip.family = TCP_FAMILY; |
1821 | source.ip.ip6.uint32[0] = location; | 1825 | source.ip.ip6.uint32[0] = location; |
1822 | 1826 | ||