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

Added more debugging messages

Browse source
This commit is contained in:
jmjatlanta 2017-09-28 07:58:24 -05:00
parent 350b8460fd
commit 9f55b14f3c
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
peer/peerstore.c
View file

@ -237,6 +237,9 @@ struct Libp2pPeer* libp2p_peerstore_get_or_add_peer_by_id(struct Peerstore* peer
* @param in the peer to search for * @param in the peer to search for
*/ */
struct Libp2pPeer* libp2p_peerstore_get_or_add_peer(struct Peerstore* peerstore, const struct Libp2pPeer* in) { struct Libp2pPeer* libp2p_peerstore_get_or_add_peer(struct Peerstore* peerstore, const struct Libp2pPeer* in) {
if (in == NULL)
return NULL;
struct Libp2pPeer* out = libp2p_peerstore_get_peer(peerstore, (unsigned char*)in->id, in->id_size); struct Libp2pPeer* out = libp2p_peerstore_get_peer(peerstore, (unsigned char*)in->id, in->id_size);
if (out != NULL) if (out != NULL)
return out; return out;

2
peer/providerstore.c
View file

@ -62,7 +62,7 @@ int libp2p_providerstore_add(struct ProviderStore* store, const unsigned char* h
char peer_str[peer_id_size + 1]; char peer_str[peer_id_size + 1];
memcpy(peer_str, peer_id, peer_id_size); memcpy(peer_str, peer_id, peer_id_size);
peer_str[peer_id_size] = 0; peer_str[peer_id_size] = 0;
libp2p_logger_debug("providerstore", "Adding hash %s to providerstore. It can be retrieved from %s\n", hash_str, peer_str); libp2p_logger_debug("providerstore", "Adding hash to providerstore. It can be retrieved from %s\n", peer_str);
struct ProviderEntry* entry = (struct ProviderEntry*)malloc(sizeof(struct ProviderEntry)); struct ProviderEntry* entry = (struct ProviderEntry*)malloc(sizeof(struct ProviderEntry));
entry->hash = malloc(hash_size); entry->hash = malloc(hash_size);
memcpy(entry->hash, hash, hash_size); memcpy(entry->hash, hash, hash_size);

23
routing/dht_protocol.c
View file

@ -35,7 +35,7 @@ int libp2p_routing_dht_shutdown(void* context) {
} }
int libp2p_routing_dht_handle_msg(const uint8_t* incoming, size_t incoming_size, struct SessionContext* session_context, void* context) { int libp2p_routing_dht_handle_msg(const uint8_t* incoming, size_t incoming_size, struct SessionContext* session_context, void* context) {
libp2p_logger_debug("dht_protocol", "Handling incoming dht routing request.\n"); libp2p_logger_debug("dht_protocol", "Handling incoming dht routing request from peer %s.\n", session_context->remote_peer_id);
struct DhtContext* ctx = (struct DhtContext*)context; struct DhtContext* ctx = (struct DhtContext*)context;
if (!libp2p_routing_dht_handshake(session_context)) if (!libp2p_routing_dht_handshake(session_context))
return -1; return -1;
@ -217,7 +217,7 @@ struct MultiAddress* libp2p_routing_dht_find_peer_ip_multiaddress(struct Libp2pL
while (current != NULL) { while (current != NULL) {
out = (struct MultiAddress*)current->item; out = (struct MultiAddress*)current->item;
if (multiaddress_is_ip(out)) { if (multiaddress_is_ip(out)) {
libp2p_logger_debug("dht_protocol", "Found MultiAddress %s\n", out->string); //libp2p_logger_debug("dht_protocol", "Found MultiAddress %s\n", out->string);
break; break;
} }
current = current->next; current = current->next;
@ -243,16 +243,17 @@ int libp2p_routing_dht_handle_add_provider(struct SessionContext* session, struc
struct Libp2pPeer *peer = NULL; struct Libp2pPeer *peer = NULL;
//TODO: verify peer signature //TODO: verify peer signature
/* if (libp2p_logger_watching_class("dht_protocol")) {
if (message->record != NULL && message->record->author != NULL && message->record->author_size > 0 struct Libp2pPeer* first_peer = message->provider_peer_head->item;
&& message->key != NULL && message->key_size > 0) libp2p_logger_debug("dht_protocol", "Peer %s says he can provide a key.\n", libp2p_peer_id_to_string(first_peer));
*/ }
struct Libp2pLinkedList* current = message->provider_peer_head; struct Libp2pLinkedList* current = message->provider_peer_head;
if (current == NULL) { if (current == NULL) {
libp2p_logger_error("dht_protocol", "Provider has no peer.\n"); libp2p_logger_error("dht_protocol", "Provider has no peer.\n");
goto exit; goto exit;
} }
// there should only be 1 when adding a provider // there should only be 1 when adding a provider
if (current != NULL) { if (current != NULL) {
peer = current->item; peer = current->item;
@ -265,6 +266,7 @@ int libp2p_routing_dht_handle_add_provider(struct SessionContext* session, struc
libp2p_logger_error("dht_protocol", "Peer has no IP MultiAddress.\n"); libp2p_logger_error("dht_protocol", "Peer has no IP MultiAddress.\n");
goto exit; goto exit;
} }
// add what we know to be the ip for this peer // add what we know to be the ip for this peer
char *ip; char *ip;
char new_string[255]; char new_string[255];
@ -277,7 +279,7 @@ int libp2p_routing_dht_handle_add_provider(struct SessionContext* session, struc
struct MultiAddress* new_ma = multiaddress_new_from_string(new_string); struct MultiAddress* new_ma = multiaddress_new_from_string(new_string);
if (new_ma == NULL) if (new_ma == NULL)
goto exit; goto exit;
libp2p_logger_debug("dht_protocol", "New MultiAddress made with %s.\n", new_string);
// TODO: See if the sender is who he says he is // TODO: See if the sender is who he says he is
// set it as the first in the list // set it as the first in the list
struct Libp2pLinkedList* new_head = libp2p_utils_linked_list_new(); struct Libp2pLinkedList* new_head = libp2p_utils_linked_list_new();
@ -334,7 +336,12 @@ int libp2p_routing_dht_handle_get_value(struct SessionContext* session, struct K
// We need to get the data from the disk // We need to get the data from the disk
if(!filestore->node_get((unsigned char*)message->key, message->key_size, (void**)&data, &data_size, filestore)) { if(!filestore->node_get((unsigned char*)message->key, message->key_size, (void**)&data, &data_size, filestore)) {
libp2p_logger_debug("dht_protocol", "handle_get_value: Unable to get key from filestore\n"); size_t sz = 100;
unsigned char key[sz];
memset(key, 0, sz);
unsigned char* ptr = &key[0];
libp2p_crypto_encoding_base58_encode((unsigned char*)message->key, message->key_size, &ptr, &sz);
libp2p_logger_debug("dht_protocol", "handle_get_value: Unable to get key %s from filestore.\n", key);
return 0; return 0;
} }