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

Refactored DHT.c, all of NAT punching functions (line 1217

Browse Source
This commit is contained in:
Jeffail 2013-08-02 10:56:10 +01:00
parent 1708dc1a88
commit bcf36e8115
1 changed files with 62 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
core/DHT.c
View File

@ -1053,21 +1053,24 @@ int friend_ips(IP_Port * ip_portlist, uint8_t * friend_id)
int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type) int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type)
{ {
uint8_t data[sizeof(uint64_t) + 1]; uint8_t data[sizeof(uint64_t) + 1];
uint8_t packet[MAX_DATA_SIZE];
/* 254 is NAT ping request packet id */
int len = create_request(packet, public_key, data, sizeof(uint64_t) + 1, 254);
int num = 0;
data[0] = type; data[0] = type;
memcpy(data + 1, &ping_id, sizeof(uint64_t)); memcpy(data + 1, &ping_id, sizeof(uint64_t));
uint8_t packet[MAX_DATA_SIZE]; if (len == -1)
int len = create_request(packet, public_key, data, sizeof(uint64_t) + 1, 254); /* 254 is NAT ping request packet id */
if(len == -1)
return -1; return -1;
int num = 0; if (type == 0) /*If packet is request use many people to route it*/
num = route_tofriend(public_key, packet, len);
else if (type == 1) /*If packet is response use only one person to route it*/
num = routeone_tofriend(public_key, packet, len);
if(type == 0) if (num == 0)
num = route_tofriend(public_key, packet, len);/*If packet is request use many people to route it*/
else if(type == 1)
num = routeone_tofriend(public_key, packet, len);/*If packet is response use only one person to route it*/
if(num == 0)
return -1; return -1;
return num; return num;
} }
@ -1075,45 +1078,54 @@ int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type)
/* Handle a recieved ping request for */ /* Handle a recieved ping request for */
int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source) int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source)
{ {
if(length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING && if (length < crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + ENCRYPTION_PADDING
length > MAX_DATA_SIZE + ENCRYPTION_PADDING) && length > MAX_DATA_SIZE + ENCRYPTION_PADDING)
return 1; return 1;
/* check if request is for us. */ /* check if request is for us. */
if(memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) { if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) {
uint8_t public_key[crypto_box_PUBLICKEYBYTES]; uint8_t public_key[crypto_box_PUBLICKEYBYTES];
uint8_t data[MAX_DATA_SIZE]; uint8_t data[MAX_DATA_SIZE];
int len = handle_request(public_key, data, packet, length); int len = handle_request(public_key, data, packet, length);
if(len != sizeof(uint64_t) + 1) if (len != sizeof(uint64_t) + 1)
return 1; return 1;
uint64_t ping_id; uint64_t ping_id;
memcpy(&ping_id, data + 1, sizeof(uint64_t)); memcpy(&ping_id, data + 1, sizeof(uint64_t));
int friendnumber = friend_number(public_key); int friendnumber = friend_number(public_key);
if(friendnumber == -1) if (friendnumber == -1)
return 1; return 1;
if(data[0] == 0) { Friend * friend = &friends_list[friendnumber];
send_NATping(public_key, ping_id, 1); /*1 is reply*/
friends_list[friendnumber].recvNATping_timestamp = unix_time(); if (data[0] == 0) {
/* 1 is reply */
send_NATping(public_key, ping_id, 1);
friend->recvNATping_timestamp = unix_time();
return 0; return 0;
} else if (data[0] == 1) } else if (data[0] == 1) {
if(friends_list[friendnumber].NATping_id == ping_id) { if (friend->NATping_id == ping_id) {
friends_list[friendnumber].NATping_id = ((uint64_t)random_int() << 32) + random_int(); friend->NATping_id = ((uint64_t)random_int() << 32) + random_int();
friends_list[friendnumber].hole_punching = 1; friend->hole_punching = 1;
return 0; return 0;
} }
}
return 1; return 1;
} }
/* if request is not for us, try routing it. */ /* if request is not for us, try routing it. */
else if(route_packet(packet + 1, packet, length) == length) route_packet(packet + 1, packet, length);
return 0;
return 0; return 0;
} }
/*Get the most common ip in the ip_portlist /* Get the most common ip in the ip_portlist
Only return ip if it appears in list min_num or more * Only return ip if it appears in list min_num or more
len must not be bigger than MAX_FRIEND_CLIENTS * len must not be bigger than MAX_FRIEND_CLIENTS
return ip of 0 if failure */ * return ip of 0 if failure
*/
static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num) static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num)
{ {
IP zero = {{0}}; IP zero = {{0}};
@ -1122,29 +1134,34 @@ static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num)
uint32_t i, j; uint32_t i, j;
uint16_t numbers[MAX_FRIEND_CLIENTS] = {0}; uint16_t numbers[MAX_FRIEND_CLIENTS] = {0};
for(i = 0; i < len; ++i) { for(i = 0; i < len; ++i) {
for(j = 0; j < len; ++j) for(j = 0; j < len; ++j) {
if(ip_portlist[i].ip.i == ip_portlist[j].ip.i) if(ip_portlist[i].ip.i == ip_portlist[j].ip.i)
++numbers[i]; ++numbers[i];
}
if(numbers[i] >= min_num) if(numbers[i] >= min_num)
return ip_portlist[i].ip; return ip_portlist[i].ip;
} }
return zero; return zero;
} }
/*Return all the ports for one ip in a list /* Return all the ports for one ip in a list
portlist must be at least len long * portlist must be at least len long
where len is the length of ip_portlist * where len is the length of ip_portlist
returns the number of ports and puts the list of ports in portlist*/ * returns the number of ports and puts the list of ports in portlist
*/
static uint16_t NAT_getports(uint16_t * portlist, IP_Port * ip_portlist, uint16_t len, IP ip) static uint16_t NAT_getports(uint16_t * portlist, IP_Port * ip_portlist, uint16_t len, IP ip)
{ {
uint32_t i; uint32_t i;
uint16_t num = 0; uint16_t num = 0;
for(i = 0; i < len; ++i)
for(i = 0; i < len; ++i) {
if(ip_portlist[i].ip.i == ip.i) { if(ip_portlist[i].ip.i == ip.i) {
portlist[num] = ntohs(ip_portlist[i].port); portlist[num] = ntohs(ip_portlist[i].port);
++num; ++num;
} }
}
return num; return num;
} }
@ -1152,8 +1169,10 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t
{ {
if(numports > MAX_FRIEND_CLIENTS || numports == 0) if(numports > MAX_FRIEND_CLIENTS || numports == 0)
return; return;
uint32_t i; uint32_t i;
uint32_t top = friends_list[friend_num].punching_index + MAX_PUNCHING_PORTS; uint32_t top = friends_list[friend_num].punching_index + MAX_PUNCHING_PORTS;
for(i = friends_list[friend_num].punching_index; i != top; i++) { for(i = friends_list[friend_num].punching_index; i != top; i++) {
/*TODO: improve port guessing algorithm*/ /*TODO: improve port guessing algorithm*/
uint16_t port = port_list[(i/2) % numports] + (i/(2*numports))*((i % 2) ? -1 : 1); uint16_t port = port_list[(i/2) % numports] + (i/(2*numports))*((i % 2) ? -1 : 1);
@ -1165,25 +1184,26 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t
static void doNAT() static void doNAT()
{ {
uint32_t i; uint32_t i, temp_time = unix_time();
uint32_t temp_time = unix_time();
for(i = 0; i < num_friends; ++i) { for (i = 0; i < num_friends; ++i) {
IP_Port ip_list[MAX_FRIEND_CLIENTS]; IP_Port ip_list[MAX_FRIEND_CLIENTS];
int num = friend_iplist(ip_list, i); int num = friend_iplist(ip_list, i);
/*If we are connected to friend or if friend is not online don't try to hole punch with him*/
if(num < MAX_FRIEND_CLIENTS/2) /*If already connected or friend is not online don't try to hole punch*/
if (num < MAX_FRIEND_CLIENTS/2)
continue; continue;
if (friends_list[i].NATping_timestamp + PUNCH_INTERVAL < temp_time) {
if(friends_list[i].NATping_timestamp + PUNCH_INTERVAL < temp_time) {
send_NATping(friends_list[i].client_id, friends_list[i].NATping_id, 0); /*0 is request*/ send_NATping(friends_list[i].client_id, friends_list[i].NATping_id, 0); /*0 is request*/
friends_list[i].NATping_timestamp = temp_time; friends_list[i].NATping_timestamp = temp_time;
} }
if(friends_list[i].hole_punching == 1 && if (friends_list[i].hole_punching == 1 &&
friends_list[i].punching_timestamp + PUNCH_INTERVAL < temp_time && friends_list[i].punching_timestamp + PUNCH_INTERVAL < temp_time &&
friends_list[i].recvNATping_timestamp + PUNCH_INTERVAL*2 >= temp_time) { friends_list[i].recvNATping_timestamp + PUNCH_INTERVAL*2 >= temp_time) {
IP ip = NAT_commonip(ip_list, num, MAX_FRIEND_CLIENTS/2); IP ip = NAT_commonip(ip_list, num, MAX_FRIEND_CLIENTS/2);
if(ip.i == 0) if (ip.i == 0)
continue; continue;
uint16_t port_list[MAX_FRIEND_CLIENTS]; uint16_t port_list[MAX_FRIEND_CLIENTS];