From 4f2146c08580e250ec7d28fc8c687e277f104c00 Mon Sep 17 00:00:00 2001 From: Jeffail Date: Thu, 1 Aug 2013 22:53:50 +0100 Subject: [PATCH] Back to old methods, reordered the structs, defines, and global variables to the top, should be no changes to binary --- core/DHT.c | 812 ++++++++++++++++++++--------------------------------- 1 file changed, 303 insertions(+), 509 deletions(-) diff --git a/core/DHT.c b/core/DHT.c index 8dbbe562..c77deaad 100644 --- a/core/DHT.c +++ b/core/DHT.c @@ -62,14 +62,14 @@ /*----------------------------------------------------------------------------------*/ typedef struct { - IP_Port ip_port; uint8_t client_id[CLIENT_ID_SIZE]; + IP_Port ip_port; uint32_t timestamp; uint32_t last_pinged; - uint32_t ret_timestamp; /* Returned by this node. Either our friend or us */ IP_Port ret_ip_port; + uint32_t ret_timestamp; } Client_data; typedef struct { @@ -115,37 +115,30 @@ static Pinged send_nodes[LSEND_NODES_ARRAY]; /*----------------------------------------------------------------------------------*/ /* Compares client_id1 and client_id2 with client_id - * return 0 if both are same distance - * return 1 if client_id1 is closer - * return 2 if client_id2 is closer - */ -int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2) + return 0 if both are same distance + return 1 if client_id1 is closer + return 2 if client_id2 is closer */ +int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2) /* tested */ { uint32_t i; - uint8_t tmp1, tmp2; - for(i = 0; i < CLIENT_ID_SIZE; ++i) { - tmp1 = abs(client_id[i] ^ client_id1[i]); - tmp2 = abs(client_id[i] ^ client_id2[i]); - - if(tmp1 < tmp2) + if(abs(client_id[i] ^ client_id1[i]) < abs(client_id[i] ^ client_id2[i])) return 1; - else if(tmp1 > tmp2) + else if(abs(client_id[i] ^ client_id1[i]) > abs(client_id[i] ^ client_id2[i])) return 2; } return 0; } /* check if client with client_id is already in list of length length. - * if it is then set its corresponding timestamp to current time. - * if the id is already in the list with a different ip_port, update it. - * return True(1) or False(0) - * - * TODO: maybe optimize this. - */ + if it is set it's corresponding timestamp to current time. + if the id is already in the list with a different ip_port, update it. + return True(1) or False(0) + TODO: maybe optimize this. */ int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port) { - uint32_t i, temp_time = unix_time(); + uint32_t i; + uint32_t temp_time = unix_time(); for(i = 0; i < length; ++i) { /*If ip_port is assigned to a different client_id replace it*/ @@ -163,130 +156,83 @@ int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_ } } return 0; + } /* check if client with client_id is already in node format list of length length. - * return True(1) or False(0) - */ + return True(1) or False(0) */ int client_in_nodelist(Node_format * list, uint32_t length, uint8_t * client_id) { uint32_t i; - for(i = 0; i < length; ++i) { + for(i = 0; i < length; ++i) if(memcmp(list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) return 1; - } return 0; } -/* Returns the friend number from the client_id, or -1 if a failure occurs - */ +/*Return the friend number from the client_id + Return -1 if failure, number of friend if success*/ static int friend_number(uint8_t * client_id) { uint32_t i; - for(i = 0; i < num_friends; ++i) { - if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) + for(i = 0; i < num_friends; ++i) + if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) /* Equal */ return i; - } return -1; } /* Find MAX_SENT_NODES nodes closest to the client_id for the send nodes request: - * put them in the nodes_list and return how many were found. - * - * TODO: For the love of based Allah make this function cleaner and much more efficient. - */ + put them in the nodes_list and return how many were found. + TODO: Make this function much more efficient. */ int get_close_nodes(uint8_t * client_id, Node_format * nodes_list) { - uint32_t i, j, k, temp_time = unix_time(); - int num_nodes = 0, closest, tout, inlist; - - for (i = 0; i < LCLIENT_LIST; ++i) { - tout = close_clientlist[i].timestamp <= temp_time - BAD_NODE_TIMEOUT; - inlist = client_in_nodelist(nodes_list, MAX_SENT_NODES, close_clientlist[i].client_id); - - /* if node isn't good or is already in list. */ - if(tout || inlist) - continue; - - if(num_nodes < MAX_SENT_NODES) { - - memcpy( nodes_list[num_nodes].client_id, - close_clientlist[i].client_id, - CLIENT_ID_SIZE ); - - nodes_list[num_nodes].ip_port = close_clientlist[i].ip_port; - num_nodes++; - } else { - for(j = 0; j < MAX_SENT_NODES; ++j) { - closest = id_closest( client_id, - nodes_list[j].client_id, - close_clientlist[i].client_id ); - if(closest == 2) { - memcpy( nodes_list[j].client_id, - close_clientlist[i].client_id, - CLIENT_ID_SIZE); - - nodes_list[j].ip_port = close_clientlist[i].ip_port; - break; - } - } - } - } - - for(i = 0; i < num_friends; ++i) { - for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) { - tout = friends_list[i].client_list[j].timestamp <= temp_time - BAD_NODE_TIMEOUT; - inlist = client_in_nodelist( nodes_list, - MAX_SENT_NODES, - friends_list[i].client_list[j].client_id); - - /* if node isn't good or is already in list. */ - if(tout || inlist) - continue; - + uint32_t i, j, k; + int num_nodes=0; + uint32_t temp_time = unix_time(); + for(i = 0; i < LCLIENT_LIST; ++i) + if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time && + !client_in_nodelist(nodes_list, MAX_SENT_NODES,close_clientlist[i].client_id)) { + /* if node is good and not already in list. */ if(num_nodes < MAX_SENT_NODES) { - - memcpy( nodes_list[num_nodes].client_id, - friends_list[i].client_list[j].client_id, - CLIENT_ID_SIZE); - - nodes_list[num_nodes].ip_port = friends_list[i].client_list[j].ip_port; + memcpy(nodes_list[num_nodes].client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE); + nodes_list[num_nodes].ip_port = close_clientlist[i].ip_port; num_nodes++; - } else { - for(k = 0; k < MAX_SENT_NODES; ++k) { - - closest = id_closest( client_id, - nodes_list[k].client_id, - friends_list[i].client_list[j].client_id ); - if(closest == 2) { - memcpy( nodes_list[k].client_id, - friends_list[i].client_list[j].client_id, - CLIENT_ID_SIZE ); - - nodes_list[k].ip_port = friends_list[i].client_list[j].ip_port; + } else for(j = 0; j < MAX_SENT_NODES; ++j) + if(id_closest(client_id, nodes_list[j].client_id, close_clientlist[i].client_id) == 2) { + memcpy(nodes_list[j].client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE); + nodes_list[j].ip_port = close_clientlist[i].ip_port; break; } - } - } } - } + + for(i = 0; i < num_friends; ++i) + for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) + if(friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time && + !client_in_nodelist(nodes_list, MAX_SENT_NODES,friends_list[i].client_list[j].client_id)) { + /* if node is good and not already in list. */ + if(num_nodes < MAX_SENT_NODES) { + memcpy(nodes_list[num_nodes].client_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE); + nodes_list[num_nodes].ip_port = friends_list[i].client_list[j].ip_port; + num_nodes++; + } else for(k = 0; k < MAX_SENT_NODES; ++k) + if(id_closest(client_id, nodes_list[k].client_id, friends_list[i].client_list[j].client_id) == 2) { + memcpy(nodes_list[k].client_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE); + nodes_list[k].ip_port = friends_list[i].client_list[j].ip_port; + break; + } + } return num_nodes; } /* replace first bad (or empty) node with this one - * return 0 if successful - * return 1 if not (list contains no bad nodes) - */ -int replace_bad( Client_data * list, - uint32_t length, - uint8_t * client_id, - IP_Port ip_port ) + return 0 if successful + return 1 if not (list contains no bad nodes) */ +int replace_bad(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port) /* tested */ { uint32_t i; uint32_t temp_time = unix_time(); - for(i = 0; i < length; ++i) { - /* if node is bad */ - if(list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) { + for(i = 0; i < length; ++i) + if(list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) { /* if node is bad. */ memcpy(list[i].client_id, client_id, CLIENT_ID_SIZE); list[i].ip_port = ip_port; list[i].timestamp = temp_time; @@ -295,17 +241,12 @@ int replace_bad( Client_data * list, list[i].ret_timestamp = 0; return 0; } - } return 1; } /* replace the first good node that is further to the comp_client_id than that of the client_id in the list */ -int replace_good( Client_data * list, - uint32_t length, - uint8_t * client_id, - IP_Port ip_port, - uint8_t * comp_client_id ) +int replace_good(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port, uint8_t * comp_client_id) { uint32_t i; uint32_t temp_time = unix_time(); @@ -324,109 +265,72 @@ int replace_good( Client_data * list, return 1; } -/* Attempt to add client with ip_port and client_id to the friends client list - * and close_clientlist - */ +/* Attempt to add client with ip_port and client_id to the friends client list and close_clientlist */ void addto_lists(IP_Port ip_port, uint8_t * client_id) { uint32_t i; - /* NOTE: current behavior if there are two clients with the same id is - * to replace the first ip by the second. - */ - if (!client_in_list(close_clientlist, LCLIENT_LIST, client_id, ip_port)) { - if (replace_bad(close_clientlist, LCLIENT_LIST, client_id, ip_port)) { + /* NOTE: current behavior if there are two clients with the same id is to replace the first ip by the second. */ + if(!client_in_list(close_clientlist, LCLIENT_LIST, client_id, ip_port)) + if(replace_bad(close_clientlist, LCLIENT_LIST, client_id, ip_port)) /* if we can't replace bad nodes we try replacing good ones */ - replace_good( close_clientlist, - LCLIENT_LIST, - client_id, - ip_port, - self_public_key ); - } - } + replace_good(close_clientlist, LCLIENT_LIST, client_id, ip_port, self_public_key); - for (i = 0; i < num_friends; ++i) { - if (!client_in_list( friends_list[i].client_list, - MAX_FRIEND_CLIENTS, - client_id, - ip_port )) { - - if (replace_bad( friends_list[i].client_list, - MAX_FRIEND_CLIENTS, - client_id, - ip_port )) { + for(i = 0; i < num_friends; ++i) + if(!client_in_list(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port)) + if(replace_bad(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port)) /* if we can't replace bad nodes we try replacing good ones. */ - replace_good( friends_list[i].client_list, - MAX_FRIEND_CLIENTS, - client_id, - ip_port, - friends_list[i].client_id ); - } - } - } + replace_good(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port, friends_list[i].client_id); } /* If client_id is a friend or us, update ret_ip_port - * nodeclient_id is the id of the node that sent us this info - */ + nodeclient_id is the id of the node that sent us this info */ void returnedip_ports(IP_Port ip_port, uint8_t * client_id, uint8_t * nodeclient_id) { - uint32_t i, j, temp_time = unix_time(); - - if (memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) { - for (i = 0; i < LCLIENT_LIST; ++i) { - - if (memcmp( nodeclient_id, - close_clientlist[i].client_id, - CLIENT_ID_SIZE ) == 0) { + uint32_t i, j; + uint32_t temp_time = unix_time(); + if(memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) { + for(i = 0; i < LCLIENT_LIST; ++i) + if(memcmp(nodeclient_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) { close_clientlist[i].ret_ip_port = ip_port; close_clientlist[i].ret_timestamp = temp_time; return; } - } - } else { - for (i = 0; i < num_friends; ++i) { - if (memcmp( client_id, - friends_list[i].client_id, - CLIENT_ID_SIZE ) == 0) { - for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) { - - if (memcmp( nodeclient_id, - friends_list[i].client_list[j].client_id, - CLIENT_ID_SIZE ) == 0) { + } else + for(i = 0; i < num_friends; ++i) + if(memcmp(client_id, friends_list[i].client_id, CLIENT_ID_SIZE) == 0) + for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) + if(memcmp(nodeclient_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE) == 0) { friends_list[i].client_list[j].ret_ip_port = ip_port; friends_list[i].client_list[j].ret_timestamp = temp_time; return; } - } - } - } - } } -/* check if we are currently pinging an ip_port and/or a ping_id variables with - * values of zero will not be checked. If we are already, return 1 else return 0 - * - * TODO: optimize this - */ +/* check if we are currently pinging an ip_port and/or a ping_id + variables with values of zero will not be checked. + if we are already, return 1 + else return 0 +TODO: optimize this */ int is_pinging(IP_Port ip_port, uint64_t ping_id) { - uint32_t i, temp_time = unix_time(); + uint32_t i; uint8_t pinging; + uint32_t temp_time = unix_time(); - for (i = 0; i < LPING_ARRAY; ++i ) { - if ((pings[i].timestamp + PING_TIMEOUT) > temp_time) { + for(i = 0; i < LPING_ARRAY; ++i ) + if((pings[i].timestamp + PING_TIMEOUT) > temp_time) { pinging = 0; - if (ip_port.ip.i != 0 && - pings[i].ip_port.ip.i == ip_port.ip.i && - pings[i].ip_port.port == ip_port.port) + if(ip_port.ip.i != 0) + if(pings[i].ip_port.ip.i == ip_port.ip.i && + pings[i].ip_port.port == ip_port.port) ++pinging; - if (ping_id != 0 && pings[i].ping_id == ping_id) - ++pinging; - if (pinging == ((ping_id != 0) + (ip_port.ip.i != 0))) + if(ping_id != 0) + if(pings[i].ping_id == ping_id) + ++pinging; + if(pinging == (ping_id != 0) + (ip_port.ip.i != 0)) return 1; } - } return 0; } @@ -434,47 +338,46 @@ int is_pinging(IP_Port ip_port, uint64_t ping_id) /* Same as last function but for get_node requests. */ int is_gettingnodes(IP_Port ip_port, uint64_t ping_id) { - uint32_t i, temp_time = unix_time(); + uint32_t i; uint8_t pinging; + uint32_t temp_time = unix_time(); - for(i = 0; i < LSEND_NODES_ARRAY; ++i ) { + for(i = 0; i < LSEND_NODES_ARRAY; ++i ) if((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time) { pinging = 0; - if(ip_port.ip.i != 0 && - send_nodes[i].ip_port.ip.i == ip_port.ip.i && - send_nodes[i].ip_port.port == ip_port.port) + if(ip_port.ip.i != 0) + if(send_nodes[i].ip_port.ip.i == ip_port.ip.i && + send_nodes[i].ip_port.port == ip_port.port) ++pinging; - if(ping_id != 0 && send_nodes[i].ping_id == ping_id) + if(ping_id != 0) + if(send_nodes[i].ping_id == ping_id) ++pinging; if(pinging == (ping_id != 0) + (ip_port.ip.i != 0)) return 1; + } - } return 0; } /* Add a new ping request to the list of ping requests - * returns the ping_id to put in the ping request - * returns 0 if problem. - * - * TODO: optimize this - */ + returns the ping_id to put in the ping request + returns 0 if problem. + TODO: optimize this */ uint64_t add_pinging(IP_Port ip_port) { - uint32_t i, j, temp_time = unix_time(); + uint32_t i, j; uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int(); + uint32_t temp_time = unix_time(); - for(i = 0; i < PING_TIMEOUT; ++i ) { - for(j = 0; j < LPING_ARRAY; ++j ) { + for(i = 0; i < PING_TIMEOUT; ++i ) + for(j = 0; j < LPING_ARRAY; ++j ) if((pings[j].timestamp + PING_TIMEOUT - i) < temp_time) { pings[j].timestamp = temp_time; pings[j].ip_port = ip_port; pings[j].ping_id = ping_id; return ping_id; } - } - } return 0; } @@ -486,28 +389,26 @@ uint64_t add_gettingnodes(IP_Port ip_port) uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int(); uint32_t temp_time = unix_time(); - for(i = 0; i < PING_TIMEOUT; ++i ) { - for(j = 0; j < LSEND_NODES_ARRAY; ++j ) { + for(i = 0; i < PING_TIMEOUT; ++i ) + for(j = 0; j < LSEND_NODES_ARRAY; ++j ) if((send_nodes[j].timestamp + PING_TIMEOUT - i) < temp_time) { send_nodes[j].timestamp = temp_time; send_nodes[j].ip_port = ip_port; send_nodes[j].ping_id = ping_id; return ping_id; } - } - } return 0; } -/* send a ping request, only works if none has been sent to that ip/port - * in the last 5 seconds. - */ +/* send a ping request + Ping request only works if none has been sent to that ip/port in the last 5 seconds. */ static int pingreq(IP_Port ip_port, uint8_t * public_key) -{ - /* check if packet is gonna be sent to ourself */ - if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0 - || is_pinging(ip_port, 0)) +{ + if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */ + return 1; + + if(is_pinging(ip_port, 0)) return 1; uint64_t ping_id = add_pinging(ip_port); @@ -519,16 +420,9 @@ static int pingreq(IP_Port ip_port, uint8_t * public_key) uint8_t nonce[crypto_box_NONCEBYTES]; random_nonce(nonce); - int len = encrypt_data( public_key, - self_secret_key, - nonce, - (uint8_t *)&ping_id, - sizeof(ping_id), - encrypt ); - + int len = encrypt_data(public_key, self_secret_key, nonce, (uint8_t *)&ping_id, sizeof(ping_id), encrypt); if(len != sizeof(ping_id) + ENCRYPTION_PADDING) return -1; - data[0] = 0; memcpy(data + 1, self_public_key, CLIENT_ID_SIZE); memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES); @@ -549,15 +443,9 @@ static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id) uint8_t nonce[crypto_box_NONCEBYTES]; random_nonce(nonce); - int len = encrypt_data( public_key, - self_secret_key, nonce, - (uint8_t *)&ping_id, - sizeof(ping_id), - encrypt ); - + int len = encrypt_data(public_key, self_secret_key, nonce, (uint8_t *)&ping_id, sizeof(ping_id), encrypt); if(len != sizeof(ping_id) + ENCRYPTION_PADDING) return -1; - data[0] = 1; memcpy(data + 1, self_public_key, CLIENT_ID_SIZE); memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES); @@ -570,8 +458,10 @@ static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id) static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id) { /* check if packet is gonna be sent to ourself */ - if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0 - || is_gettingnodes(ip_port, 0)) + if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) + return 1; + + if(is_gettingnodes(ip_port, 0)) return 1; uint64_t ping_id = add_gettingnodes(ip_port); @@ -588,29 +478,21 @@ static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id) memcpy(plain, &ping_id, sizeof(ping_id)); memcpy(plain + sizeof(ping_id), client_id, CLIENT_ID_SIZE); - int len = encrypt_data( public_key, - self_secret_key, - nonce, - plain, - sizeof(ping_id) + CLIENT_ID_SIZE, - encrypt ); + int len = encrypt_data(public_key, self_secret_key, nonce, plain, sizeof(ping_id) + CLIENT_ID_SIZE, encrypt); if(len != sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING) return -1; - data[0] = 2; memcpy(data + 1, self_public_key, CLIENT_ID_SIZE); memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES); memcpy(data + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, encrypt, len); - return sendpacket(ip_port, data, sizeof(data)); } /* send a send nodes response */ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id, uint64_t ping_id) { - /* check if packet is gonna be sent to ourself */ - if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) + if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */ return 1; uint8_t data[1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) @@ -630,12 +512,8 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id, memcpy(plain, &ping_id, sizeof(ping_id)); memcpy(plain + sizeof(ping_id), nodes_list, num_nodes * sizeof(Node_format)); - int len = encrypt_data( public_key, - self_secret_key, - nonce, - plain, - sizeof(ping_id) + num_nodes * sizeof(Node_format), - encrypt ); + int len = encrypt_data(public_key, self_secret_key, nonce, plain, + sizeof(ping_id) + num_nodes * sizeof(Node_format), encrypt); if(len != sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING) return -1; @@ -648,30 +526,26 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id, return sendpacket(ip_port, data, 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + len); } -/* Packet handling functions, one to handle each types of packets we receive - * Returns 0 if handled correctly, 1 if packet is bad. - */ +/* Packet handling functions + One to handle each types of packets we receive + return 0 if handled correctly, 1 if packet is bad. */ int handle_pingreq(uint8_t * packet, uint32_t length, IP_Port source) { uint64_t ping_id; if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING) return 1; - /* check if packet is from ourself. */ if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) return 1; - int len = decrypt_data( packet + 1, - self_secret_key, - packet + 1 + CLIENT_ID_SIZE, - packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, - sizeof(ping_id) + ENCRYPTION_PADDING, - (uint8_t *)&ping_id ); - + int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE, + packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, + sizeof(ping_id) + ENCRYPTION_PADDING, (uint8_t *)&ping_id); if(len != sizeof(ping_id)) return 1; pingres(source, packet + 1, ping_id); + pingreq(source, packet + 1); /* TODO: make this smarter? */ return 0; @@ -682,18 +556,12 @@ int handle_pingres(uint8_t * packet, uint32_t length, IP_Port source) uint64_t ping_id; if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING) return 1; - - /* check if packet is from ourself. */ - if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) + if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is from ourself. */ return 1; - int len = decrypt_data( packet + 1, - self_secret_key, - packet + 1 + CLIENT_ID_SIZE, - packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, - sizeof(ping_id) + ENCRYPTION_PADDING, - (uint8_t *)&ping_id ); - + int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE, + packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, + sizeof(ping_id) + ENCRYPTION_PADDING, (uint8_t *)&ping_id); if(len != sizeof(ping_id)) return 1; @@ -702,30 +570,25 @@ int handle_pingres(uint8_t * packet, uint32_t length, IP_Port source) return 0; } return 1; + } int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source) { uint64_t ping_id; - - if (length != ( 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES - + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING )) + if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING) return 1; - /* check if packet is from ourself. */ - if (memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) + if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) return 1; uint8_t plain[sizeof(ping_id) + CLIENT_ID_SIZE]; - int len = decrypt_data( packet + 1, - self_secret_key, - packet + 1 + CLIENT_ID_SIZE, - packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, - sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING, - plain ); + int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE, + packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING, plain); - if (len != sizeof(ping_id) + CLIENT_ID_SIZE) + if(len != sizeof(ping_id) + CLIENT_ID_SIZE) return 1; memcpy(&ping_id, plain, sizeof(ping_id)); @@ -734,28 +597,29 @@ int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source) pingreq(source, packet + 1); /* TODO: make this smarter? */ return 0; + } int handle_sendnodes(uint8_t * packet, uint32_t length, IP_Port source) { uint64_t ping_id; - uint32_t cid_size = 1 + CLIENT_ID_SIZE; - cid_size += crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING; - - if (length > (cid_size + sizeof(Node_format) * MAX_SENT_NODES) || - ((length - cid_size) % sizeof(Node_format)) != 0 || - (length < cid_size + sizeof(Node_format))) + /* TODO: make this more readable */ + if(length > (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + + sizeof(Node_format) * MAX_SENT_NODES + ENCRYPTION_PADDING) || + (length - (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + + ENCRYPTION_PADDING)) % (sizeof(Node_format)) != 0 || + length < 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + + sizeof(Node_format) + ENCRYPTION_PADDING) { return 1; + } + uint32_t num_nodes = (length - (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + + sizeof(ping_id) + ENCRYPTION_PADDING)) / sizeof(Node_format); - uint32_t num_nodes = (length - cid_size) / sizeof(Node_format); uint8_t plain[sizeof(ping_id) + sizeof(Node_format) * MAX_SENT_NODES]; - int len = decrypt_data( - packet + 1, - self_secret_key, - packet + 1 + CLIENT_ID_SIZE, - packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, - sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING, plain ); + int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE, + packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, + sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING, plain); if(len != sizeof(ping_id) + num_nodes * sizeof(Node_format)) return 1; @@ -785,13 +649,12 @@ int DHT_addfriend(uint8_t * client_id) { Friend * temp; temp = realloc(friends_list, sizeof(Friend) * (num_friends + 1)); - if (temp == NULL) + if(temp == NULL) return 1; friends_list = temp; memset(&friends_list[num_friends], 0, sizeof(Friend)); memcpy(friends_list[num_friends].client_id, client_id, CLIENT_ID_SIZE); - friends_list[num_friends].NATping_id = ((uint64_t)random_int() << 32) + random_int(); ++num_friends; return 0; @@ -801,21 +664,17 @@ int DHT_delfriend(uint8_t * client_id) { uint32_t i; Friend * temp; - for (i = 0; i < num_friends; ++i) { + for(i = 0; i < num_friends; ++i) /* Equal */ - if (memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) { + if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) { --num_friends; - if (num_friends != i) { - memcpy( friends_list[i].client_id, - friends_list[num_friends].client_id, - CLIENT_ID_SIZE ); - } + if(num_friends != i) + memcpy(friends_list[i].client_id, friends_list[num_friends].client_id, CLIENT_ID_SIZE); temp = realloc(friends_list, sizeof(Friend) * (num_friends)); - if (temp != NULL) + if(temp != NULL) friends_list = temp; return 0; } - } return 1; } @@ -823,29 +682,26 @@ int DHT_delfriend(uint8_t * client_id) /* TODO: Optimize this. */ IP_Port DHT_getfriendip(uint8_t * client_id) { - uint32_t i, j, temp_time = unix_time(); + uint32_t i, j; IP_Port empty = {{{0}}, 0}; - - for (i = 0; i < num_friends; ++i) { + uint32_t temp_time = unix_time(); + for(i = 0; i < num_friends; ++i) /* Equal */ - if (memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) { - for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) { - if (memcmp( friends_list[i].client_list[j].client_id, - client_id, - CLIENT_ID_SIZE ) == 0 && + if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) { + for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) + if(memcmp(friends_list[i].client_list[j].client_id, client_id, CLIENT_ID_SIZE) == 0 && friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) return friends_list[i].client_list[j].ip_port; - } + return empty; } - } empty.ip.i = 1; return empty; + } -/* Ping each client in the "friends" list every 60 seconds. Send a get nodes request - * every 20 seconds to a random good node for each "friend" in our "friends" list. - */ +/* Ping each client in the "friends" list every 60 seconds. + Send a get nodes request every 20 seconds to a random good node for each "friend" in our "friends" list. */ void doDHTFriends() { uint32_t i, j; @@ -853,28 +709,24 @@ void doDHTFriends() uint32_t rand_node; uint32_t index[MAX_FRIEND_CLIENTS]; - for (i = 0; i < num_friends; ++i) { + for(i = 0; i < num_friends; ++i) { uint32_t num_nodes = 0; - for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) { - /* if node is not dead. */ - if (friends_list[i].client_list[j].timestamp + Kill_NODE_TIMEOUT > temp_time) { - if ((friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) { - pingreq( friends_list[i].client_list[j].ip_port, - friends_list[i].client_list[j].client_id ); + for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) + if(friends_list[i].client_list[j].timestamp + Kill_NODE_TIMEOUT > temp_time) { /* if node is not dead. */ + if((friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) { + pingreq(friends_list[i].client_list[j].ip_port, friends_list[i].client_list[j].client_id); friends_list[i].client_list[j].last_pinged = temp_time; } - /* if node is good. */ - if (friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) { + if(friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) { /* if node is good. */ index[num_nodes] = j; ++num_nodes; } } - } if(friends_list[i].lastgetnode + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) { rand_node = rand() % num_nodes; - getnodes( friends_list[i].client_list[index[rand_node]].ip_port, - friends_list[i].client_list[index[rand_node]].client_id, - friends_list[i].client_id ); + getnodes(friends_list[i].client_list[index[rand_node]].ip_port, + friends_list[i].client_list[index[rand_node]].client_id, + friends_list[i].client_id); friends_list[i].lastgetnode = temp_time; } } @@ -883,9 +735,8 @@ void doDHTFriends() static uint32_t close_lastgetnodes; /* Ping each client in the close nodes list every 60 seconds. - * Send a get nodes request every 20 seconds to a random good node in the list. - */ -void doClose() + Send a get nodes request every 20 seconds to a random good node in the list. */ +void doClose() /* tested */ { uint32_t i; uint32_t temp_time = unix_time(); @@ -893,27 +744,25 @@ void doClose() uint32_t rand_node; uint32_t index[LCLIENT_LIST]; - for (i = 0; i < LCLIENT_LIST; ++i) { + for(i = 0; i < LCLIENT_LIST; ++i) /* if node is not dead. */ - if (close_clientlist[i].timestamp + Kill_NODE_TIMEOUT > temp_time) { - if ((close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time) { - pingreq( close_clientlist[i].ip_port, - close_clientlist[i].client_id ); + if(close_clientlist[i].timestamp + Kill_NODE_TIMEOUT > temp_time) { + if((close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time) { + pingreq(close_clientlist[i].ip_port, close_clientlist[i].client_id); close_clientlist[i].last_pinged = temp_time; } /* if node is good. */ - if (close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) { + if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) { index[num_nodes] = i; ++num_nodes; } } - } - if (close_lastgetnodes + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) { + if(close_lastgetnodes + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) { rand_node = rand() % num_nodes; - getnodes( close_clientlist[index[rand_node]].ip_port, - close_clientlist[index[rand_node]].client_id, - self_public_key ); + getnodes(close_clientlist[index[rand_node]].ip_port, + close_clientlist[index[rand_node]].client_id, + self_public_key); close_lastgetnodes = temp_time; } } @@ -924,126 +773,100 @@ void DHT_bootstrap(IP_Port ip_port, uint8_t * public_key) } /* send the given packet to node with client_id - * returns -1 if failure - */ + returns -1 if failure */ int route_packet(uint8_t * client_id, uint8_t * packet, uint32_t length) { uint32_t i; - for (i = 0; i < LCLIENT_LIST; ++i) { - if (memcmp(client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) + for(i = 0; i < LCLIENT_LIST; ++i) + if(memcmp(client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) return sendpacket(close_clientlist[i].ip_port, packet, length); - } return -1; } /* Puts all the different ips returned by the nodes for a friend_num into array ip_portlist - * ip_portlist must be at least MAX_FRIEND_CLIENTS big - * returns the number of ips returned - * return 0 if we are connected to friend or if no ips were found. - * returns -1 if no such friend - */ + ip_portlist must be at least MAX_FRIEND_CLIENTS big + returns the number of ips returned + return 0 if we are connected to friend or if no ips were found. + returns -1 if no such friend*/ static int friend_iplist(IP_Port * ip_portlist, uint16_t friend_num) { int num_ips = 0; - uint32_t i, temp_time = unix_time(); - - if (friend_num >= num_friends) + uint32_t i; + uint32_t temp_time = unix_time(); + if(friend_num >= num_friends) return -1; - - Friend * friend = &friends_list[friend_num]; - Client_data * client; - - for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) { - client = &friend->client_list[i]; - + for(i = 0; i < MAX_FRIEND_CLIENTS; ++i) /*If ip is not zero and node is good */ - if (client->ret_ip_port.ip.i != 0 && - client->ret_timestamp + BAD_NODE_TIMEOUT > temp_time) { - - if (memcmp(client->client_id, friend->client_id, CLIENT_ID_SIZE) == 0) + if(friends_list[friend_num].client_list[i].ret_ip_port.ip.i != 0 && + friends_list[friend_num].client_list[i].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) { + if(memcmp(friends_list[friend_num].client_list[i].client_id, friends_list[friend_num].client_id, CLIENT_ID_SIZE) == 0 ) return 0; - - ip_portlist[num_ips] = client->ret_ip_port; + ip_portlist[num_ips] = friends_list[friend_num].client_list[i].ret_ip_port; ++num_ips; } - } return num_ips; } /* Send the following packet to everyone who tells us they are connected to friend_id - * returns the number of nodes it sent the packet to - */ + returns the number of nodes it sent the packet to */ int route_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length) { - int num = friend_number(friend_id); - if (num == -1) - return 0; - - uint32_t i, sent = 0, temp_time = unix_time(); - Friend * friend = &friends_list[num]; - Client_data * client; - - for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) { - client = &friend->client_list[i]; - - /*If ip is not zero and node is good */ - if (client->ret_ip_port.ip.i != 0 && - client->ret_timestamp + BAD_NODE_TIMEOUT > temp_time) { - - if (sendpacket(client->ip_port, packet, length) == length) - ++sent; + uint32_t i, j; + uint32_t sent = 0; + uint32_t temp_time = unix_time(); + for(i = 0; i < num_friends; ++i) + /* Equal */ + if(memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0) { + for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) + /*If ip is not zero and node is good */ + if(friends_list[i].client_list[j].ret_ip_port.ip.i != 0 && + friends_list[i].client_list[j].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) + if(sendpacket(friends_list[i].client_list[j].ip_port, packet, length) == length) + ++sent; + return sent; } - } - return sent; + return 0; } /* Send the following packet to one random person who tells us they are connected to friend_id -* returns the number of nodes it sent the packet to -*/ + returns the number of nodes it sent the packet to */ int routeone_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length) { int num = friend_number(friend_id); - if (num == -1) + if(num == -1) return 0; - Friend * friend = &friends_list[num]; - Client_data * client; - IP_Port ip_list[MAX_FRIEND_CLIENTS]; int n = 0; - uint32_t i, temp_time = unix_time(); - - for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) { - client = &friend->client_list[i]; - + uint32_t i; + uint32_t temp_time = unix_time(); + for(i = 0; i < MAX_FRIEND_CLIENTS; ++i) /*If ip is not zero and node is good */ - if(client->ret_ip_port.ip.i != 0 && - client->ret_timestamp + BAD_NODE_TIMEOUT > temp_time) { - ip_list[n] = client->ip_port; + if(friends_list[num].client_list[i].ret_ip_port.ip.i != 0 && + friends_list[num].client_list[i].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) { + ip_list[n] = friends_list[num].client_list[i].ip_port; ++n; } - } - if (n < 1) + if(n < 1) return 0; - if (sendpacket(ip_list[rand() % n], packet, length) == length) + if(sendpacket(ip_list[rand() % n], packet, length) == length) return 1; return 0; } /* Puts all the different ips returned by the nodes for a friend_id into array ip_portlist - * ip_portlist must be at least MAX_FRIEND_CLIENTS big - * returns the number of ips returned - * return 0 if we are connected to friend or if no ips were found. - * returns -1 if no such friend - */ + ip_portlist must be at least MAX_FRIEND_CLIENTS big + returns the number of ips returned + return 0 if we are connected to friend or if no ips were found. + returns -1 if no such friend*/ int friend_ips(IP_Port * ip_portlist, uint8_t * friend_id) { + uint32_t i; - for (i = 0; i < num_friends; ++i) { + for(i = 0; i < num_friends; ++i) /* Equal */ - if (memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0) + if(memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0) return friend_iplist(ip_portlist, i); - } return -1; } @@ -1053,24 +876,21 @@ 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) { 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; memcpy(data + 1, &ping_id, sizeof(uint64_t)); - if (len == -1) + uint8_t packet[MAX_DATA_SIZE]; + 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; - 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); + int num = 0; - if (num == 0) + if(type == 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 num; } @@ -1078,54 +898,45 @@ int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type) /* Handle a recieved ping request for */ int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source) { - if (length < crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + ENCRYPTION_PADDING - && length > MAX_DATA_SIZE + ENCRYPTION_PADDING) + if(length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING && + length > MAX_DATA_SIZE + ENCRYPTION_PADDING) return 1; - /* 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 data[MAX_DATA_SIZE]; - int len = handle_request(public_key, data, packet, length); - if (len != sizeof(uint64_t) + 1) + if(len != sizeof(uint64_t) + 1) return 1; - uint64_t ping_id; memcpy(&ping_id, data + 1, sizeof(uint64_t)); int friendnumber = friend_number(public_key); - if (friendnumber == -1) + if(friendnumber == -1) return 1; - Friend * friend = &friends_list[friendnumber]; - - if (data[0] == 0) { - /* 1 is reply */ - send_NATping(public_key, ping_id, 1); - friend->recvNATping_timestamp = unix_time(); + if(data[0] == 0) { + send_NATping(public_key, ping_id, 1); /*1 is reply*/ + friends_list[friendnumber].recvNATping_timestamp = unix_time(); return 0; - } else if (data[0] == 1) { - if (friend->NATping_id == ping_id) { - friend->NATping_id = ((uint64_t)random_int() << 32) + random_int(); - friend->hole_punching = 1; + } else if (data[0] == 1) + if(friends_list[friendnumber].NATping_id == ping_id) { + friends_list[friendnumber].NATping_id = ((uint64_t)random_int() << 32) + random_int(); + friends_list[friendnumber].hole_punching = 1; return 0; } - } return 1; } - /* if request is not for us, try routing it. */ - route_packet(packet + 1, packet, length); - + else if(route_packet(packet + 1, packet, length) == length) + return 0; return 0; } -/* Get the most common ip in the ip_portlist - * Only return ip if it appears in list min_num or more - * len must not be bigger than MAX_FRIEND_CLIENTS - * return ip of 0 if failure - */ +/*Get the most common ip in the ip_portlist + Only return ip if it appears in list min_num or more + len must not be bigger than MAX_FRIEND_CLIENTS + return ip of 0 if failure */ static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num) { IP zero = {{0}}; @@ -1134,34 +945,29 @@ static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num) uint32_t i, j; uint16_t numbers[MAX_FRIEND_CLIENTS] = {0}; - 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) ++numbers[i]; - } if(numbers[i] >= min_num) return ip_portlist[i].ip; } return zero; } -/* Return all the ports for one ip in a list - * portlist must be at least len long - * where len is the length of ip_portlist - * returns the number of ports and puts the list of ports in portlist - */ +/*Return all the ports for one ip in a list + portlist must be at least len long + where len is the length of ip_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) { uint32_t i; uint16_t num = 0; - - for(i = 0; i < len; ++i) { + for(i = 0; i < len; ++i) if(ip_portlist[i].ip.i == ip.i) { portlist[num] = ntohs(ip_portlist[i].port); ++num; } - } return num; } @@ -1169,10 +975,8 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t { if(numports > MAX_FRIEND_CLIENTS || numports == 0) return; - uint32_t i; uint32_t top = friends_list[friend_num].punching_index + MAX_PUNCHING_PORTS; - for(i = friends_list[friend_num].punching_index; i != top; i++) { /*TODO: improve port guessing algorithm*/ uint16_t port = port_list[(i/2) % numports] + (i/(2*numports))*((i % 2) ? -1 : 1); @@ -1184,26 +988,25 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t static void doNAT() { - uint32_t i, temp_time = unix_time(); - - for (i = 0; i < num_friends; ++i) { + uint32_t i; + uint32_t temp_time = unix_time(); + for(i = 0; i < num_friends; ++i) { IP_Port ip_list[MAX_FRIEND_CLIENTS]; int num = friend_iplist(ip_list, i); - - /*If already connected or friend is not online don't try to hole punch*/ - if (num < MAX_FRIEND_CLIENTS/2) + /*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) 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*/ 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].recvNATping_timestamp + PUNCH_INTERVAL*2 >= temp_time) { - IP ip = NAT_commonip(ip_list, num, MAX_FRIEND_CLIENTS/2); - if (ip.i == 0) + if(ip.i == 0) continue; uint16_t port_list[MAX_FRIEND_CLIENTS]; @@ -1216,7 +1019,8 @@ static void doNAT() } } -/*END OF NAT PUNCHING FUNCTIONS*/ +/*----------------------------------------------------------------------------------*/ +/*-----------------------END OF NAT PUNCHING FUNCTIONS------------------------------*/ int DHT_handlepacket(uint8_t * packet, uint32_t length, IP_Port source) { @@ -1265,22 +1069,17 @@ void DHT_save(uint8_t * data) } /* load the DHT from data of size size; - * return -1 if failure - * return 0 if success - */ + return -1 if failure + return 0 if success */ int DHT_load(uint8_t * data, uint32_t size) { if(size < sizeof(close_clientlist)) return -1; - if((size - sizeof(close_clientlist)) % sizeof(Friend) != 0) return -1; - uint32_t i, j; - uint16_t temp; /* uint32_t temp_time = unix_time(); */ - - Client_data * client; + uint16_t temp; temp = (size - sizeof(close_clientlist))/sizeof(Friend); @@ -1289,34 +1088,29 @@ int DHT_load(uint8_t * data, uint32_t size) for(i = 0; i < temp; ++i) { DHT_addfriend(tempfriends_list[i].client_id); - - for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) { - client = &tempfriends_list[i].client_list[j]; - if(client->timestamp != 0) - getnodes(client->ip_port, client->client_id, tempfriends_list[i].client_id); - } + for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) + if(tempfriends_list[i].client_list[j].timestamp != 0) { + getnodes(tempfriends_list[i].client_list[j].ip_port, + tempfriends_list[i].client_list[j].client_id, tempfriends_list[i].client_id); + } } } Client_data * tempclose_clientlist = (Client_data *)data; - for(i = 0; i < LCLIENT_LIST; ++i) { + for(i = 0; i < LCLIENT_LIST; ++i) if(tempclose_clientlist[i].timestamp != 0) - DHT_bootstrap( tempclose_clientlist[i].ip_port, - tempclose_clientlist[i].client_id ); - } + DHT_bootstrap(tempclose_clientlist[i].ip_port, tempclose_clientlist[i].client_id); return 0; } /* returns 0 if we are not connected to the DHT - * returns 1 if we are - */ + returns 1 if we are */ int DHT_isconnected() { - uint32_t i, temp_time = unix_time(); - - for(i = 0; i < LCLIENT_LIST; ++i) { + uint32_t i; + uint32_t temp_time = unix_time(); + for(i = 0; i < LCLIENT_LIST; ++i) if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) return 1; - } return 0; }