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

Couple fixes.

Browse Source
This commit is contained in:
irungentoo 2013-06-26 07:40:07 -04:00
parent 68d2995bce
commit d1837342e0
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/DHT.c
View File

@ -214,7 +214,7 @@ int replace_bad(Client_data * list, uint32_t length, char * client_id, IP_Port i
} }
//replace the first good node further to the comp_client_id than that of the client_id //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, char * client_id, IP_Port ip_port, char * comp_client_id) int replace_good(Client_data * list, uint32_t length, char * client_id, IP_Port ip_port, char * comp_client_id)
{ {
uint32_t i; uint32_t i;
@ -266,7 +266,7 @@ void addto_lists(IP_Port ip_port, char * client_id)
//ping timeout in seconds //ping timeout in seconds
#define PING_TIMEOUT 10 #define PING_TIMEOUT 5
//check if we are currently pinging an ip_port and/or a ping_id //check if we are currently pinging an ip_port and/or a ping_id
//Variables with values of zero will not be checked. //Variables with values of zero will not be checked.
//if we are already, return 1 //if we are already, return 1
@ -282,24 +282,23 @@ int is_pinging(IP_Port ip_port, uint32_t ping_id)
{ {
if((pings[i].timestamp + PING_TIMEOUT) > temp_time) if((pings[i].timestamp + PING_TIMEOUT) > temp_time)
{ {
pinging = 0;
if(ip_port.ip.i != 0) if(ip_port.ip.i != 0)
{ {
pinging = 0;
if(pings[i].ip_port.ip.i == ip_port.ip.i && if(pings[i].ip_port.ip.i == ip_port.ip.i &&
pings[i].ip_port.port == ip_port.port) pings[i].ip_port.port == ip_port.port)
{ {
pinging = 1; pinging++;
} }
} }
if(ping_id != 0) if(ping_id != 0)
{ {
pinging = 0;
if(pings[i].ping_id == ping_id) if(pings[i].ping_id == ping_id)
{ {
pinging = 1; pinging++;
} }
} }
if(pinging == 1) if(pinging == (ping_id != 0) + (ip_port.ip.i != 0))
{ {
return 1; return 1;
} }
@ -323,24 +322,23 @@ int is_gettingnodes(IP_Port ip_port, uint32_t ping_id)
{ {
if((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time) if((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time)
{ {
pinging = 0;
if(ip_port.ip.i != 0) if(ip_port.ip.i != 0)
{ {
pinging = 0;
if(send_nodes[i].ip_port.ip.i == ip_port.ip.i && if(send_nodes[i].ip_port.ip.i == ip_port.ip.i &&
send_nodes[i].ip_port.port == ip_port.port) send_nodes[i].ip_port.port == ip_port.port)
{ {
pinging = 1; pinging++;
} }
} }
if(ping_id != 0) if(ping_id != 0)
{ {
pinging = 0;
if(send_nodes[i].ping_id == ping_id) if(send_nodes[i].ping_id == ping_id)
{ {
pinging = 1; pinging++;
} }
} }
if(pinging == 1) if(pinging == (ping_id != 0) + (ip_port.ip.i != 0))
{ {
return 1; return 1;
} }
@ -407,7 +405,7 @@ int add_gettingnodes(IP_Port ip_port)
//send a ping request //send a ping request
//Ping request only works if there is none hos been sent to that ip/port in the last 5 seconds. //Ping request only works if none has been sent to that ip/port in the last 5 seconds.
int pingreq(IP_Port ip_port) int pingreq(IP_Port ip_port)
{ {
if(is_pinging(ip_port, 0)) if(is_pinging(ip_port, 0))
@ -474,7 +472,7 @@ int getnodes(IP_Port ip_port, char * client_id)
//send a send nodes response //send a send nodes response
int sendnodes(IP_Port ip_port, char * client_id, uint32_t ping_id) int sendnodes(IP_Port ip_port, char * client_id, uint32_t ping_id)
{ {
char data[5 + (CLIENT_ID_SIZE + sizeof(IP_Port))*MAX_SENT_NODES]; char data[5 + CLIENT_ID_SIZE + (CLIENT_ID_SIZE + sizeof(IP_Port))*MAX_SENT_NODES];
Node_format nodes_list[MAX_SENT_NODES]; Node_format nodes_list[MAX_SENT_NODES];
int num_nodes = get_close_nodes(client_id, nodes_list); int num_nodes = get_close_nodes(client_id, nodes_list);
@ -703,7 +701,7 @@ int DHT_recvpacket(char * packet, uint32_t length, IP_Port source)
//Ping each client in the "friends" list every 60 seconds. //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. //Send a get nodes request every 20 seconds to a random good node for each "friend" in our "friends" list.
uint32_t friend_lastgetnode[MAX_FRIENDS]; static uint32_t friend_lastgetnode[MAX_FRIENDS];
void doFriends() void doFriends()
@ -742,7 +740,7 @@ void doFriends()
} }
} }
uint32_t close_lastgetnodes; static uint32_t close_lastgetnodes;
//Ping each client in the close nodes list every 60 seconds. //Ping each client in the close nodes list every 60 seconds.
//Send a get nodes request every 20 seconds to a random good node int the list. //Send a get nodes request every 20 seconds to a random good node int the list.

4
core/DHT.h
View File

@ -117,8 +117,8 @@ IP_Port getfriendip(char * client_id);
void doDHT(); void doDHT();
//if we recieve a DHT packet we call this function so it can be handled. //if we recieve a DHT packet we call this function so it can be handled.
//Return 0 if packet is handled correctly or if the packet was shit. //Return 0 if packet is handled correctly.
//return 1 if it didn't handle the packet. //return 1 if it didn't handle the packet or if the packet was shit.
int DHT_recvpacket(char * packet, uint32_t length, IP_Port source); int DHT_recvpacket(char * packet, uint32_t length, IP_Port source);
//Use this function to bootstrap the client //Use this function to bootstrap the client

11
testing/DHT_test.c
View File

@ -3,7 +3,7 @@
* *
* Compile with: gcc -Wall -o test ../core/DHT.c DHT_test.c * Compile with: gcc -Wall -o test ../core/DHT.c DHT_test.c
* *
* Command line arguments are the ip and port of a node and the client_id of the friend you want to find the ip_port of * Command line arguments are the ip and port of a node and the client_id (32 bytes) of the friend you want to find the ip_port of
* EX: ./test 127.0.0.1 33445 ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef * EX: ./test 127.0.0.1 33445 ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef
*/ */
@ -60,14 +60,16 @@ void print_friendlist()
p_ip = getfriendip(friends_list[k].client_id); p_ip = getfriendip(friends_list[k].client_id);
printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port)); printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
printf("\nCLIENTS IN LIST:\n\n "); printf("\nCLIENTS IN LIST:\n\n");
for(i = 0; i < 4; i++) for(i = 0; i < 4; i++)
{ {
printf("ClientID: "); printf("ClientID: ");
for(j = 0; j < 32; j++) for(j = 0; j < 32; j++)
{ {
printf("%X", friends_list[k].client_list[i].client_id[j]); if(0 <= friends_list[k].client_list[i].client_id[j] && friends_list[k].client_list[i].client_id[j] < 16)
printf("0");
printf("%hhX", friends_list[k].client_list[i].client_id[j]);
} }
p_ip = friends_list[k].client_list[i].ip_port; p_ip = friends_list[k].client_list[i].ip_port;
printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port)); printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
@ -83,6 +85,7 @@ int main(int argc, char *argv[])
srand(time(NULL)); srand(time(NULL));
int randdomnum = rand(); int randdomnum = rand();
memcpy(self_client_id, &randdomnum, 4); memcpy(self_client_id, &randdomnum, 4);
//memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
#ifdef WIN32 #ifdef WIN32
WSADATA wsaData; WSADATA wsaData;
@ -144,7 +147,7 @@ int main(int argc, char *argv[])
{ {
if(data[i] < 16) if(data[i] < 16)
printf("0"); printf("0");
printf("%X",data[i]); printf("%hhX",data[i]);
} }
printf("\n--------------------END-----------------------------\n\n\n"); printf("\n--------------------END-----------------------------\n\n\n");
} }