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

Implemented timeout to avoid hang due to connection error.

Browse source
This commit is contained in:
Jose Marcial Vieira Bisneto 2017-07-06 23:02:11 -03:00
parent 4af0bedba1
commit 8da685b5cf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing/online.c
View file

@ -292,7 +292,7 @@ int ipfs_routing_online_ping(struct IpfsRouting* routing, struct Libp2pPeer* pee
size_t protobuf_size; size_t protobuf_size;
if (peer->connection_type != CONNECTION_TYPE_CONNECTED) { if (peer->connection_type != CONNECTION_TYPE_CONNECTED) {
if (!libp2p_peer_connect(peer)) if (!libp2p_peer_connect(peer, 5))
return 0; return 0;
} }
if (peer->connection_type == CONNECTION_TYPE_CONNECTED) { if (peer->connection_type == CONNECTION_TYPE_CONNECTED) {
@ -412,7 +412,7 @@ int ipfs_routing_online_get_value (ipfs_routing* routing, const unsigned char *k
if (!libp2p_peer_is_connected(current_peer)) { if (!libp2p_peer_is_connected(current_peer)) {
// attempt to connect. If unsuccessful, continue in the loop. // attempt to connect. If unsuccessful, continue in the loop.
libp2p_logger_debug("online", "Attempting to connect to peer to retrieve file\n"); libp2p_logger_debug("online", "Attempting to connect to peer to retrieve file\n");
if (libp2p_peer_connect(current_peer)) { if (libp2p_peer_connect(current_peer, 5)) {
libp2p_logger_debug("online", "Peer connected\n"); libp2p_logger_debug("online", "Peer connected\n");
if (ipfs_routing_online_get_peer_value(routing, current_peer, key, key_size, buffer, buffer_size)) { if (ipfs_routing_online_get_peer_value(routing, current_peer, key, key_size, buffer, buffer_size)) {
libp2p_logger_debug("online", "Retrieved a value\n"); libp2p_logger_debug("online", "Retrieved a value\n");
@ -485,7 +485,7 @@ int ipfs_routing_online_bootstrap(struct IpfsRouting* routing) {
return -1; // this should never happen return -1; // this should never happen
} }
if (peer->connection == NULL) { // should always be true unless we added it twice (TODO: we should prevent that earlier) if (peer->connection == NULL) { // should always be true unless we added it twice (TODO: we should prevent that earlier)
libp2p_peer_connect(peer); libp2p_peer_connect(peer, 5);
} }
} }
} }

2
test/routing/test_routing.h
View file

@ -230,7 +230,7 @@ int test_routing_find_providers() {
struct Libp2pPeer *remote_peer = NULL; struct Libp2pPeer *remote_peer = NULL;
for(int i = 0; i < result->total; i++) { for(int i = 0; i < result->total; i++) {
remote_peer = libp2p_utils_vector_get(result, i); remote_peer = libp2p_utils_vector_get(result, i);
if (remote_peer->connection_type == CONNECTION_TYPE_CONNECTED || libp2p_peer_connect(remote_peer)) { if (remote_peer->connection_type == CONNECTION_TYPE_CONNECTED || libp2p_peer_connect(remote_peer, 5)) {
break; break;
} }
remote_peer = NULL; remote_peer = NULL;