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 connection issue.

Browse Source
This commit is contained in:
irungentoo 2014-05-18 12:15:57 -04:00
parent e87929e869
commit d573271f03
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toxcore/net_crypto.c
View File

@ -406,6 +406,8 @@ static int send_packet_to(Net_Crypto *c, int crypt_connection_id, uint8_t *data,
if (conn == 0) if (conn == 0)
return -1; return -1;
int direct_send_attempt = 0;
//TODO: on bad networks, direct connections might not last indefinitely. //TODO: on bad networks, direct connections might not last indefinitely.
if (conn->ip_port.ip.family != 0) { if (conn->ip_port.ip.family != 0) {
uint8_t direct_connected = 0; uint8_t direct_connected = 0;
@ -415,8 +417,10 @@ static int send_packet_to(Net_Crypto *c, int crypt_connection_id, uint8_t *data,
return 0; return 0;
//TODO: a better way of sending packets directly to confirm the others ip. //TODO: a better way of sending packets directly to confirm the others ip.
if (length < 96 || data[0] == NET_PACKET_COOKIE_REQUEST || data[0] == NET_PACKET_CRYPTO_HS) if (length < 96 || data[0] == NET_PACKET_COOKIE_REQUEST || data[0] == NET_PACKET_CRYPTO_HS) {
sendpacket(c->dht->net, conn->ip_port, data, length); if ((uint32_t)sendpacket(c->dht->net, conn->ip_port, data, length) == length)
direct_send_attempt = 1;
}
} }
@ -436,6 +440,11 @@ static int send_packet_to(Net_Crypto *c, int crypt_connection_id, uint8_t *data,
return 0; return 0;
} }
} }
if (direct_send_attempt) {
return 0;
}
return -1; return -1;
} }