post-patch:

	${REINPLACE_CMD} -e 's,(defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__))),defined(__FreeBSD__),' ${WRKSRC}/src/lib/syscall.c

	${REINPLACE_CMD} -e 's,(defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64),defined(badbadbad),' ${WRKSRC}/src/lib/syscall.c

--- configure.ac

+++ configure.ac

@@ -126,6 +126,10 @@ AS_CASE([$host_os],

 			libc_name="libc.so.6"

 		fi

 	],

+	[freebsd*],

+	[

+		libc_name=`ldd /usr/bin/yes | grep 'libc\.' | cut -d ' ' -f 3 | tr -d '\t'`

+	],

 	[libc_name="libc.so"]

 )

 AC_DEFINE_UNQUOTED([LIBC_NAME],["${libc_name}"], [Description])

--- src/common/compat.h.orig	2014-08-11 09:44:46.000000000 -0700

+++ src/common/compat.h	2015-03-24 15:19:54.396135000 -0700

@@ -95,6 +95,10 @@

 #define TSOCKS_NR_CLOSE     SYS_close

 #define TSOCKS_NR_MMAP      SYS_mmap

 #define TSOCKS_NR_MUNMAP    SYS_munmap

+#if defined(__FreeBSD__)

+#define TSOCKS_NR_GETPID    SYS_getpid

+#define TSOCKS_NR_FORK      SYS_fork

+#endif

 #endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */

--- src/lib/syscall.c	2014-08-11 09:44:46.000000000 -0700

+++ src/lib/syscall.c	2015-03-24 15:24:10.695024000 -0700

@@ -156,6 +156,14 @@

 	case TSOCKS_NR_MUNMAP:

 		ret = handle_munmap(args);

 		break;

+#if defined(__FreeBSD__)

+	case TSOCKS_NR_FORK:

+		ret = tsocks_libc_syscall(TSOCKS_NR_FORK);

+		break;

+	case TSOCKS_NR_GETPID:

+		ret = tsocks_libc_syscall(TSOCKS_NR_GETPID);

+		break;

+#endif

 	default:

 		/*

 		 * Deny call since we have no idea if this call can leak or not data

--- src/common/socks5.c

+++ src/common/socks5.c

@@ -466,13 +466,15 @@ error:

  * Return 0 on success or else a negative value.

  */

 ATTR_HIDDEN

-int socks5_recv_connect_reply(struct connection *conn)

+int socks5_recv_connect_reply(struct connection *conn,

+		const struct sockaddr *addr)

 {

 	int ret;

 	ssize_t ret_recv;

 	unsigned char buffer[22];	/* Maximum size possible (with IPv6). */

 	struct socks5_reply msg;

 	size_t recv_len;

+	char addr_buf[256];

 	assert(conn);

 	assert(conn->fd >= 0);

@@ -507,47 +509,41 @@ int socks5_recv_connect_reply(struct connection *conn)

 	DBG("Socks5 received connect reply - ver: %d, rep: 0x%02x, atype: 0x%02x",

 			msg.ver, msg.rep, msg.atyp);

-	switch (msg.rep) {

-	case SOCKS5_REPLY_SUCCESS:

+	if (msg.rep == SOCKS5_REPLY_SUCCESS) {

 		DBG("Socks5 connection is successful.");

 		ret = 0;

-		break;

-	case SOCKS5_REPLY_FAIL:

-		ERR("General SOCKS server failure");

-		ret = -ECONNREFUSED;

-		break;

-	case SOCKS5_REPLY_DENY_RULE:

-		ERR("Connection not allowed by ruleset");

-		ret = -ECONNABORTED;

-		break;

-	case SOCKS5_REPLY_NO_NET:

-		ERR("Network unreachable");

-		ret = -ENETUNREACH;

-		break;

-	case SOCKS5_REPLY_NO_HOST:

-		ERR("Host unreachable");

-		ret = -EHOSTUNREACH;

-		break;

-	case SOCKS5_REPLY_REFUSED:

-		ERR("Connection refused to Tor SOCKS");

-		ret = -ECONNREFUSED;

-		break;

-	case SOCKS5_REPLY_TTL_EXP:

-		ERR("Connection timed out");

-		ret = -ETIMEDOUT;

-		break;

-	case SOCKS5_REPLY_CMD_NOTSUP:

-		ERR("Command not supported");

-		ret = -ECONNREFUSED;

-		break;

-	case SOCKS5_REPLY_ADR_NOTSUP:

-		ERR("Address type not supported");

-		ret = -ECONNREFUSED;

-		break;

-	default:

-		ERR("Socks5 server replied an unknown code %d", msg.rep);

-		ret = -ECONNABORTED;

-		break;

+	} else {

+		ERR("%s while connecting to %s",

+			socks5_error_message(msg.rep),

+			inet_ntoa_r(((struct sockaddr_in*)addr)->sin_addr,

+				addr_buf, sizeof(addr_buf)));

+		switch (msg.rep) {

+		case SOCKS5_REPLY_FAIL:

+			ret = -ECONNREFUSED;

+			break;

+		case SOCKS5_REPLY_DENY_RULE:

+			ret = -ECONNABORTED;

+			break;

+		case SOCKS5_REPLY_NO_NET:

+			ret = -ENETUNREACH;

+			break;

+		case SOCKS5_REPLY_NO_HOST:

+			ret = -EHOSTUNREACH;

+			break;

+		case SOCKS5_REPLY_REFUSED:

+			ret = -ECONNREFUSED;

+			break;

+		case SOCKS5_REPLY_TTL_EXP:

+			ret = -ETIMEDOUT;

+			break;

+		case SOCKS5_REPLY_CMD_NOTSUP:

+		case SOCKS5_REPLY_ADR_NOTSUP:

+			ret = -ECONNREFUSED;

+			break;

+		default:

+			ret = -ECONNABORTED;

+			break;

+		}

 	}

 error:

@@ -623,8 +619,8 @@ error:

  * Return 0 on success else a negative value.

  */

 ATTR_HIDDEN

-int socks5_recv_resolve_reply(struct connection *conn, void *addr,

-		size_t addrlen)

+int socks5_recv_resolve_reply(struct connection *conn, const char *hostname,

+		void *addr, size_t addrlen)

 {

 	int ret;

 	size_t recv_len;

@@ -648,13 +644,15 @@ int socks5_recv_resolve_reply(struct connection *conn, void *addr,

 	}

 	if (buffer.msg.ver != SOCKS5_VERSION) {

-		ERR("Bad SOCKS5 version reply");

+		ERR("Bad SOCKS5 version reply: expected %d, receved %d",

+			SOCKS5_VERSION, buffer.msg.ver);

 		ret = -ECONNABORTED;

 		goto error;

 	}

 	if (buffer.msg.rep != SOCKS5_REPLY_SUCCESS) {

-		ERR("Unable to resolve. Status reply: %d", buffer.msg.rep);

+		ERR("Unable to resolve host %s: %s (%d)", hostname,

+			socks5_error_message(buffer.msg.rep), buffer.msg.rep);

 		ret = -ECONNABORTED;

 		goto error;

 	}

@@ -763,7 +761,8 @@ error:

  * Return 0 on success else a negative value.

  */

 ATTR_HIDDEN

-int socks5_recv_resolve_ptr_reply(struct connection *conn, char **_hostname)

+int socks5_recv_resolve_ptr_reply(struct connection *conn, const char *addr,

+		char **_hostname)

 {

 	int ret;

 	ssize_t ret_recv;

@@ -790,7 +789,8 @@ int socks5_recv_resolve_ptr_reply(struct connection *conn, char **_hostname)

 	}

 	if (buffer.msg.rep != SOCKS5_REPLY_SUCCESS) {

-		ERR("Unable to resolve. Status reply: %d", buffer.msg.rep);

+		ERR("Unable to resolve host %s: %s (%d)", addr,

+			socks5_error_message(buffer.msg.rep), buffer.msg.rep);

 		ret = -ECONNABORTED;

 		goto error;

 	}

@@ -815,11 +815,12 @@ int socks5_recv_resolve_ptr_reply(struct connection *conn, char **_hostname)

 	}

 	*_hostname = hostname;

-	DBG("[socks5] Resolve reply received: %s", *_hostname);

+	DBG("[socks5] Resolve reply received: %s (host %s)", *_hostname, addr);

 	return 0;

 error:

-	free(hostname);

+	if (hostname)

+		free(hostname);

 	return ret;

 }

@@ -849,3 +850,29 @@ void socks5_init(ssize_t (*new_send_data)(int, const void *, size_t),

 		recv_data = new_recv_data;

 	}

 }

+

+const char* socks5_error_message(uint8_t code)

+{

+	switch (code) {

+	case SOCKS5_REPLY_SUCCESS:

+		return "Success";

+	case SOCKS5_REPLY_FAIL:

+		return "General server failure";

+	case SOCKS5_REPLY_DENY_RULE:

+		return "Connection not allowed by ruleset";

+	case SOCKS5_REPLY_NO_NET:

+		return "Network unreachable";

+	case SOCKS5_REPLY_NO_HOST:

+		return "Host unreachable";

+	case SOCKS5_REPLY_REFUSED:

+		return "Connection to SOCKS server refused";

+	case SOCKS5_REPLY_TTL_EXP:

+		return "Connection timed out";

+	case SOCKS5_REPLY_CMD_NOTSUP:

+		return "Command not supported";

+	case SOCKS5_REPLY_ADR_NOTSUP:

+		return "Address type not supported";

+	default:

+		return "Unknown error";

+	}

+}

--- src/common/socks5.h

+++ src/common/socks5.h

@@ -145,16 +145,21 @@ int socks5_recv_user_pass_reply(struct connection *conn);

 /* Connect request. */

 int socks5_send_connect_request(struct connection *conn);

-int socks5_recv_connect_reply(struct connection *conn);

+int socks5_recv_connect_reply(struct connection *conn,

+		const struct sockaddr *addr);

 /* Tor DNS resolve. */

 int socks5_send_resolve_request(const char *hostname, struct connection *conn);

-int socks5_recv_resolve_reply(struct connection *conn, void *addr,

-		size_t addrlent);

-int socks5_recv_resolve_ptr_reply(struct connection *conn, char **_hostname);

+int socks5_recv_resolve_reply(struct connection *conn, const char *hostname,

+		void *addr, size_t addrlent);

+int socks5_recv_resolve_ptr_reply(struct connection *conn,

+		const char *addr, char **_hostname);

 int socks5_send_resolve_ptr_request(struct connection *conn, const void *ip, int af);

 void socks5_init(ssize_t (*new_send_data)(int, const void *, size_t),

 		ssize_t (*new_recv_data)(int, void *, size_t));

+/* Print error messages in human readable form. */

+const char* socks5_error_message(uint8_t code);

+

 #endif /* TORSOCKS_SOCKS_H */

--- src/lib/connect.c

+++ src/lib/connect.c

@@ -196,7 +196,7 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG)

 	}

 	/* Connect the socket to the Tor network. */

-	ret = tsocks_connect_to_tor(new_conn);

+	ret = tsocks_connect_to_tor(new_conn, addr);

 	if (ret < 0) {

 		ret_errno = -ret;

 		goto error_free;

--- src/lib/torsocks.c

+++ src/lib/torsocks.c

@@ -397,7 +397,7 @@ error:

  * Return 0 on success or else a negative value being the errno value that

  * needs to be sent back.

  */

-int tsocks_connect_to_tor(struct connection *conn)

+int tsocks_connect_to_tor(struct connection *conn, const struct sockaddr *addr)

 {

 	int ret;

 	uint8_t socks5_method;

@@ -438,7 +438,7 @@ int tsocks_connect_to_tor(struct connection *conn)

 		goto error;

 	}

-	ret = socks5_recv_connect_reply(conn);

+	ret = socks5_recv_connect_reply(conn, addr);

 	if (ret < 0) {

 		goto error;

 	}

@@ -518,7 +518,7 @@ int tsocks_tor_resolve(int af, const char *hostname, void *ip_addr)

 	}

 	/* Force IPv4 resolution for now. */

-	ret = socks5_recv_resolve_reply(&conn, ip_addr, addr_len);

+	ret = socks5_recv_resolve_reply(&conn, hostname, ip_addr, addr_len);

 	if (ret < 0) {

 		goto end_close;

 	}

@@ -566,7 +566,7 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, int af)

 	}

 	/* Force IPv4 resolution for now. */

-	ret = socks5_recv_resolve_ptr_reply(&conn, ip);

+	ret = socks5_recv_resolve_ptr_reply(&conn, addr, ip);

 	if (ret < 0) {

 		goto end_close;

 	}

--- src/lib/torsocks.h

+++ src/lib/torsocks.h

@@ -416,7 +416,7 @@ extern struct onion_pool tsocks_onion_pool;

 extern unsigned int tsocks_cleaned_up;

-int tsocks_connect_to_tor(struct connection *conn);

+int tsocks_connect_to_tor(struct connection *conn, const struct sockaddr *addr);

 void *tsocks_find_libc_symbol(const char *symbol,

 		enum tsocks_sym_action action);

 int tsocks_tor_resolve(int af, const char *hostname, void *ip_addr);

--- tests/unit/test_socks5.c

+++ tests/unit/test_socks5.c

@@ -36,10 +36,11 @@ static struct socks5_request_domain req_name;

 static struct socks5_request_resolve req_resolve;

 static struct socks5_request_resolve_ptr req_resolve_ptr;

+static struct connection_addr c_addr;

+

 static struct connection *get_connection_stub(void)

 {

 	struct connection *conn = NULL;

-	struct connection_addr c_addr;

 	connection_addr_set(CONNECTION_DOMAIN_INET,

 			DEFAULT_TOR_ADDRESS,

@@ -695,7 +696,7 @@ static void test_socks5_recv_connect_reply_success(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_success_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == 0, "socks5 reply success");

@@ -711,7 +712,7 @@ static void test_socks5_recv_connect_reply_fail(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_fail_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ECONNREFUSED, "socks5 reply fail");

@@ -727,7 +728,7 @@ static void test_socks5_recv_connect_reply_deny_rule(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_deny_rule_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ECONNABORTED, "socks5 reply deny rule");

@@ -743,7 +744,7 @@ static void test_socks5_recv_connect_reply_no_net(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_no_net_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ENETUNREACH, "socks5 reply no net");

@@ -759,7 +760,7 @@ static void test_socks5_recv_connect_reply_no_host(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_no_host_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -EHOSTUNREACH, "socks5 reply no host");

@@ -775,7 +776,7 @@ static void test_socks5_recv_connect_reply_refused(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_refused_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ECONNREFUSED, "socks5 reply refused");

@@ -791,7 +792,7 @@ static void test_socks5_recv_connect_reply_ttl_expired(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_ttl_expired_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ETIMEDOUT, "socks5 reply TTL expired");

@@ -808,7 +809,7 @@ static void test_socks5_recv_connect_reply_cmd_not_supported(void)

 	socks5_init(NULL,

 			socks5_recv_connect_reply_ipv4_cmd_not_supported_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ECONNREFUSED, "socks5 reply command not supported");

@@ -825,7 +826,7 @@ static void test_socks5_recv_connect_reply_addr_not_supported(void)

 	socks5_init(NULL,

 			socks5_recv_connect_reply_ipv4_addr_not_supported_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ECONNREFUSED, "socks5 reply address type not supported");

@@ -841,7 +842,7 @@ static void test_socks5_recv_connect_reply_unkown(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv4_unkown_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == -ECONNABORTED, "socks5 reply unkown code");

@@ -857,7 +858,7 @@ static void test_socks5_recv_connect_reply_ipv6_success(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_connect_reply_ipv6_success_stub);

-	ret = socks5_recv_connect_reply(conn_stub);

+	ret = socks5_recv_connect_reply(conn_stub, (struct sockaddr *) &c_addr.u.sin);

 	ok(ret == 0, "socks5 reply IPv6 success");

@@ -931,7 +932,7 @@ static void test_socks5_recv_resolve_reply_valid(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_ipv4_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &ipv4_addr, sizeof(uint32_t));

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &ipv4_addr, sizeof(uint32_t));

 	inet_ntop(AF_INET, &ipv4_addr, ip_str, INET_ADDRSTRLEN);

@@ -947,7 +948,7 @@ static void test_socks5_recv_resolve_reply_valid(void)

 	conn_stub = get_connection_ipv6_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_ipv6_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &ipv6_addr, sizeof(ipv6_addr));

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &ipv6_addr, sizeof(ipv6_addr));

 	inet_ntop(AF_INET6, &ipv6_addr, ip_str, INET6_ADDRSTRLEN);

@@ -968,7 +969,7 @@ static void test_socks5_recv_resolve_reply_failure(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_data_error_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &dummy_ip_addr,

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &dummy_ip_addr,

 			sizeof(dummy_ip_addr));

 	ok(ret == -1, "socks5 resolve reply returns recv error code");

@@ -986,7 +987,7 @@ static void test_socks5_recv_resolve_reply_incorrect_version(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_incorrect_version_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &dummy_ip_addr,

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &dummy_ip_addr,

 			sizeof(dummy_ip_addr));

 	ok(ret == -ECONNABORTED, "socks5 resolve reply incorrect version");

@@ -1004,7 +1005,7 @@ static void test_socks5_recv_resolve_reply_response_error(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_response_error_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &dummy_ip_addr,

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &dummy_ip_addr,

 			sizeof(dummy_ip_addr));

 	ok(ret == -ECONNABORTED, "socks5 resolve reply response error");

@@ -1022,7 +1023,7 @@ static void test_socks5_recv_resolve_reply_address_type_error(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_address_type_error_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &dummy_ip_addr,

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &dummy_ip_addr,

 			sizeof(dummy_ip_addr));

 	ok(ret == -EINVAL, "socks5 resolve reply address type error");

@@ -1040,7 +1041,7 @@ static void test_socks5_recv_resolve_reply_addrlen_error(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_addrlen_error_stub);

-	ret = socks5_recv_resolve_reply(conn_stub, &dummy_ip_addr, 1);

+	ret = socks5_recv_resolve_reply(conn_stub, "test", &dummy_ip_addr, 1);

 	ok(ret == -EINVAL, "socks5 resolve reply address length error");

@@ -1134,7 +1135,8 @@ static void test_socks5_recv_resolve_ptr_reply_valid(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_ptr_reply_stub);

-	ret = socks5_recv_resolve_ptr_reply(conn_stub, &hostname);

+	ret = socks5_recv_resolve_ptr_reply(conn_stub, CONNECTION_DOMAIN_INET,

+		&hostname);

 	ok(ret == 0 &&

 		strncmp(hostname, "example.org", strlen(hostname)) == 0,

@@ -1154,7 +1156,8 @@ static void test_socks5_recv_resolve_ptr_reply_failure(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_data_error_stub);

-	ret = socks5_recv_resolve_ptr_reply(conn_stub, &hostname);

+	ret = socks5_recv_resolve_ptr_reply(conn_stub, CONNECTION_DOMAIN_INET,

+		&hostname);

 	ok(ret == -1, "socks5 recv resolve ptr reply returns recv error code");

@@ -1172,7 +1175,8 @@ static void test_socks5_recv_resolve_ptr_reply_incorrect_version(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_incorrect_version_stub);

-	ret = socks5_recv_resolve_ptr_reply(conn_stub, &hostname);

+	ret = socks5_recv_resolve_ptr_reply(conn_stub, CONNECTION_DOMAIN_INET,

+		&hostname);

 	ok(ret == -ECONNABORTED, "socks5 recv resolve ptr reply incorrect version");

@@ -1190,7 +1194,8 @@ static void test_socks5_recv_resolve_ptr_reply_response_error(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_reply_response_error_stub);

-	ret = socks5_recv_resolve_ptr_reply(conn_stub, &hostname);

+	ret = socks5_recv_resolve_ptr_reply(conn_stub, CONNECTION_DOMAIN_INET,

+		&hostname);

 	ok(ret == -ECONNABORTED, "socks5 recv resolve ptr reply response error");

@@ -1208,7 +1213,8 @@ static void test_socks5_recv_resolve_ptr_reply_atyp_error(void)

 	conn_stub = get_connection_stub();

 	socks5_init(NULL, socks5_recv_resolve_ptr_reply_atyp_error_stub);

-	ret = socks5_recv_resolve_ptr_reply(conn_stub, &hostname);

+	ret = socks5_recv_resolve_ptr_reply(conn_stub, CONNECTION_DOMAIN_INET,

+		&hostname);

 	ok(ret == -EINVAL, "socks5 recv resolve ptr reply atyp error");