agorise/c-libp2p
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/kenCode-de/c-libp2p

Browse source
This commit is contained in:
John Jones 2017-03-08 05:54:14 -05:00
commit f182fb8857
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
routing/kademlia.c
View file

@ -28,6 +28,7 @@ int net_family = 0;
volatile int searching = 0; // search lock, -1 to busy, 0 to free, 1 to running. volatile int searching = 0; // search lock, -1 to busy, 0 to free, 1 to running.
volatile char hash[20]; // hash to be search or announce. volatile char hash[20]; // hash to be search or announce.
volatile int announce_port = 0; volatile int announce_port = 0;
volatile int closing = 0;
struct bs_list { struct bs_list {
char *ip; char *ip;
@ -109,14 +110,19 @@ void *kademlia_thread (void *ptr)
Since peers expire announced data after 30 minutes, it's a good Since peers expire announced data after 30 minutes, it's a good
idea to reannounce every 28 minutes or so. */ idea to reannounce every 28 minutes or so. */
if(searching > 0) { if(searching > 0) {
char h[sizeof hash]; unsigned char h[sizeof hash];
int i; int i;
for (i = 0 ; i < sizeof hash ; i++) { for (i = 0 ; i < sizeof hash ; i++) {
h[i] = hash[i]; h[i] = hash[i]; // Copy hash array to new array so can call
// dht_search without volatile variable.
} }
dht_search(h, announce_port, net_family, callback, NULL); dht_search(h, announce_port, net_family, callback, NULL);
searching = 0; searching = 0;
} }
if(closing) {
// TODO: Create a routine to save the cache nodes in the file sometimes and before closing.
return 0; // end thread.
}
} }
} }
@ -173,6 +179,8 @@ int bootstrap_kademlia(int sock, int family, char* peer_id, int timeout)
usleep(random() % 100000); usleep(random() % 100000);
} }
// TODO: Read cache nodes from file and load using dht_insert_node.
ksock = sock; ksock = sock;
net_family = family; net_family = family;
tosleep = timeout; tosleep = timeout;
@ -180,6 +188,18 @@ int bootstrap_kademlia(int sock, int family, char* peer_id, int timeout)
return pthread_create(&pth, NULL, kademlia_thread, NULL); return pthread_create(&pth, NULL, kademlia_thread, NULL);
} }
void stop_kademlia (void)
{
closing = 1;
// Wait kademlia_thread finish.
(void) pthread_join(pth, NULL);
dht_uninit();
close (ksock);
}
/* Functions called by the DHT. */ /* Functions called by the DHT. */
int dht_blacklisted (const struct sockaddr *sa, int salen) int dht_blacklisted (const struct sockaddr *sa, int salen)
@ -195,7 +215,7 @@ void dht_hash (void *hash_return, int hash_size,
const void *v3, int len3) const void *v3, int len3)
{ {
int len = len1 + len2 + len3; int len = len1 + len2 + len3;
char *in, out[32]; unsigned char *in, out[32];
if (!hash_return || hash_size==0 || len==0) { if (!hash_return || hash_size==0 || len==0) {
return; // invalid param. return; // invalid param.