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

Adding a new connection while a lossy packet is being sent could

Browse Source 
also cause thread related issues.
This commit is contained in:
irungentoo 2014-07-31 13:11:21 -04:00
parent d270cf550a
commit 946a09f57b
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
toxcore/net_crypto.c
View File

@ -1268,13 +1268,26 @@ static int create_crypto_connection(Net_Crypto *c)
return i; return i;
} }
if (realloc_cryptoconnection(c, c->crypto_connections_length + 1) == -1) while (1) { /* TODO: is this really the best way to do this? */
return -1; pthread_mutex_lock(&c->connections_mutex);
memset(&(c->crypto_connections[c->crypto_connections_length]), 0, sizeof(Crypto_Connection)); if (!c->connection_use_counter) {
int id = c->crypto_connections_length; break;
pthread_mutex_init(&c->crypto_connections[id].mutex, NULL); }
++c->crypto_connections_length;
pthread_mutex_unlock(&c->connections_mutex);
}
int id = -1;
if (realloc_cryptoconnection(c, c->crypto_connections_length + 1) == 0) {
memset(&(c->crypto_connections[c->crypto_connections_length]), 0, sizeof(Crypto_Connection));
id = c->crypto_connections_length;
pthread_mutex_init(&c->crypto_connections[id].mutex, NULL);
++c->crypto_connections_length;
}
pthread_mutex_unlock(&c->connections_mutex);
return id; return id;
} }