From 794217ed6cf56006cb202fca138763da6ba95dc6 Mon Sep 17 00:00:00 2001 From: jmjatlanta Date: Wed, 20 Sep 2017 07:40:28 -0500 Subject: [PATCH] method signature changes --- core/api.c | 6 ++++-- core/ipfs_node.c | 1 + include/ipfs/core/api.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/api.c b/core/api.c index ead3515..16237b8 100644 --- a/core/api.c +++ b/core/api.c @@ -16,6 +16,7 @@ #include "libp2p/net/p2pnet.h" #include "libp2p/utils/logger.h" #include "ipfs/core/api.h" +#include "ipfs/importer/exporter.h" pthread_mutex_t conns_lock; int conns_count; @@ -629,8 +630,9 @@ int api_start (struct IpfsNode* local_node, int max_conns, int timeout) struct MultiAddress* my_address = multiaddress_new_from_string(local_node->repo->config->addresses->api); - char* ip = multiaddress_ip(my_address); - int port = multiaddress_port(my_address); + char* ip = NULL; + multiaddress_get_ip_address(my_address, &ip); + int port = multiaddress_get_ip_port(my_address); api_list.ipv4 = hostname_to_ip(ip); // api is listening only on loopback. api_list.port = port; diff --git a/core/ipfs_node.c b/core/ipfs_node.c index 5dcf8de..e48d8cf 100644 --- a/core/ipfs_node.c +++ b/core/ipfs_node.c @@ -4,6 +4,7 @@ #include "libp2p/utils/vector.h" #include "libp2p/secio/secio.h" #include "libp2p/routing/dht_protocol.h" +#include "ipfs/core/api.h" #include "ipfs/core/ipfs_node.h" #include "ipfs/exchange/bitswap/bitswap.h" #include "ipfs/journal/journal.h" diff --git a/include/ipfs/core/api.h b/include/ipfs/core/api.h index a0afd06..33ac85c 100644 --- a/include/ipfs/core/api.h +++ b/include/ipfs/core/api.h @@ -1,6 +1,7 @@ #pragma once #include +#include "ipfs/core/ipfs_node.h" #ifdef __x86_64__ #define INT_TYPE uint64_t @@ -67,5 +68,5 @@ struct s_request { void *api_connection_thread (void *ptr); void api_connections_cleanup (void); void *api_listen_thread (void *ptr); -int api_start (uint16_t port, int max_conns, int timeout); +int api_start (struct IpfsNode* local_node, int max_conns, int timeout); int api_stop (void);