X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ldk-net%2Fldk_net.c;h=fcc0e527e214b89f05e7ad7c40519d053a495967;hb=cb19ca611be3e5a3c366718c17f075872bf0016d;hp=97521368fc7c94f20a14942a9f40d8fb0e1b6def;hpb=da34358617f52371cbafa7ebe429ce8c8b1b32c4;p=ldk-c-bindings

diff --git a/ldk-net/ldk_net.c b/ldk-net/ldk_net.c
index 9752136..fcc0e52 100644
--- a/ldk-net/ldk_net.c
+++ b/ldk-net/ldk_net.c
@@ -168,11 +168,11 @@ static inline LDKSocketDescriptor get_descriptor(struct SocketHandler *handler,
 	return ret;
 }
 
-static LDKCOption_NetAddressZ get_remote_network_address(int fd) {
+static LDKCOption_SocketAddressZ get_remote_network_address(int fd) {
 	struct sockaddr_storage sockaddr;
 	socklen_t remote_addr_len = sizeof(sockaddr);
 	if (getpeername(fd, (struct sockaddr*)&sockaddr, &remote_addr_len) == -1) {
-		return COption_NetAddressZ_none();
+		return COption_SocketAddressZ_none();
 	}
 
 	switch (sockaddr.ss_family) {
@@ -180,16 +180,16 @@ static LDKCOption_NetAddressZ get_remote_network_address(int fd) {
 		const struct sockaddr_in *remote_addr = (struct sockaddr_in*)&sockaddr;
 		LDKFourBytes addr;
 		memcpy(&addr, &remote_addr->sin_addr.s_addr, 4);
-		return COption_NetAddressZ_some(NetAddress_ipv4(addr, ntohs(remote_addr->sin_port)));
+		return COption_SocketAddressZ_some(SocketAddress_tcp_ip_v4(addr, ntohs(remote_addr->sin_port)));
 	}
 	case AF_INET6: {
 		const struct sockaddr_in6 *remote_addr = (struct sockaddr_in6*)&sockaddr;
 		LDKSixteenBytes addr;
 		memcpy(&addr, &remote_addr->sin6_addr.s6_addr, 16);
-		return COption_NetAddressZ_some(NetAddress_ipv6(addr, ntohs(remote_addr->sin6_port)));
+		return COption_SocketAddressZ_some(SocketAddress_tcp_ip_v6(addr, ntohs(remote_addr->sin6_port)));
 	}
 	default:
-		return COption_NetAddressZ_none();
+		return COption_SocketAddressZ_none();
 	}
 }
 
@@ -266,8 +266,8 @@ static void *sock_thread_fn(void* arg) {
 								if (*res.contents.result) {
 									lockres = pthread_mutex_lock(&handler->sockets_mutex);
 									assert(lockres == 0);
-									assert(handler->pollfds[i - 1].fd == pollfds[i].fd); // Only we change fd order!
-									handler->pollfds[i - 1].events = POLLOUT;
+									assert(handler->pollfds[i].fd == pollfds[i].fd); // Only we change fd order!
+									handler->pollfds[i].events = POLLOUT;
 									lockres = pthread_mutex_unlock(&handler->sockets_mutex);
 									assert(lockres == 0);
 								}