StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed threading issues in toxcore.

Browse Source
This commit is contained in:
irungentoo 2014-11-25 17:23:26 -05:00
parent 6e361a52fb
commit a7a225d1d6
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toxcore/net_crypto.c
View File

@ -1807,7 +1807,11 @@ static int tcp_data_callback(void *object, uint32_t number, uint8_t connection_i
if (conn == 0) if (conn == 0)
return -1; return -1;
if (handle_packet_connection(c, number, data, length) != 0) pthread_mutex_unlock(&c->tcp_mutex);
int ret = handle_packet_connection(c, number, data, length);
pthread_mutex_lock(&c->tcp_mutex);
if (ret != 0)
return -1; return -1;
//TODO detect and kill bad TCP connections. //TODO detect and kill bad TCP connections.
@ -1846,7 +1850,11 @@ static int tcp_oob_callback(void *object, const uint8_t *public_key, const uint8
return 0; return 0;
} }
if (handle_packet_connection(c, crypt_connection_id, data, length) != 0) pthread_mutex_unlock(&c->tcp_mutex);
int ret = handle_packet_connection(c, crypt_connection_id, data, length);
pthread_mutex_lock(&c->tcp_mutex);
if (ret != 0)
return -1; return -1;
return 0; return 0;
@ -2112,7 +2120,9 @@ static void do_tcp(Net_Crypto *c)
if (c->tcp_connections_new[i] == NULL) if (c->tcp_connections_new[i] == NULL)
continue; continue;
pthread_mutex_lock(&c->tcp_mutex);
do_TCP_connection(c->tcp_connections_new[i]); do_TCP_connection(c->tcp_connections_new[i]);
pthread_mutex_unlock(&c->tcp_mutex);
if (c->tcp_connections_new[i]->status == TCP_CLIENT_CONFIRMED) { if (c->tcp_connections_new[i]->status == TCP_CLIENT_CONFIRMED) {
pthread_mutex_lock(&c->tcp_mutex); pthread_mutex_lock(&c->tcp_mutex);