Probable outgoing IPv6 support

1 files changed, 8 insertions, 6 deletions

diff --git a/networks/plaintext.c b/networks/plaintext.c
index 0bc17a6..b3554ab 100644
--- a/networks/plaintext.c
+++ b/networks/plaintext.c
@@ -89,10 +89,12 @@ size_t plaintext_recv(void *fd, char *data, size_t len, char *err) {
 
 int plaintext_connect(void **handle, struct string address, struct string port, struct string *addr_out) {
 	struct sockaddr sockaddr;
-	if (resolve(address, port, &sockaddr) != 0)
+	socklen_t sockaddr_len;
+	int family;
+	if (resolve(address, port, &sockaddr, &sockaddr_len, &family) != 0)
 		return -1;
 
-	int fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	int fd = socket(family, SOCK_STREAM, IPPROTO_TCP);
 	if (fd == -1)
 		return -1;
 
@@ -107,7 +109,7 @@ int plaintext_connect(void **handle, struct string address, struct string port,
 
 	int res;
 	do {
-		res = connect(fd, &sockaddr, sizeof(sockaddr));
+		res = connect(fd, &sockaddr, sockaddr_len);
 	} while (res < 0 && errno == EINTR);
 	if (res < 0) {
 		close(fd);
@@ -121,14 +123,14 @@ int plaintext_connect(void **handle, struct string address, struct string port,
 	}
 	*((int*)*handle) = fd;
 
-	addr_out->data = malloc(sizeof(sockaddr));
+	addr_out->data = malloc(sockaddr_len);
 	if (!addr_out->data) {
 		free(handle);
 		close(fd);
 		return -1;
 	}
-	memcpy(addr_out->data, &sockaddr, sizeof(sockaddr));
-	addr_out->len = sizeof(sockaddr);
+	memcpy(addr_out->data, &sockaddr, sockaddr_len);
+	addr_out->len = sockaddr_len;
 
 	return fd;
 }