tor

commit 605f30c4865d8d462e4fd80c4e164862e0573548
parent e699cfc697fd6ac572fab7493cd52aa7d9a71dd9
Author: Alexander Hansen Færøy <ahf@torproject.org>
Date:   Wed, 16 Oct 2024 12:35:57 +0000

Merge branch 'tor-resolve-bugfix' into 'main'

Create socket with correct family as given by sockshost

See merge request tpo/core/tor!836
Diffstat:
A
changes/bug40982
 | 
4
++++
M
src/tools/tor-resolve.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug40982 b/changes/bug40982
@@ -0,0 +1,4 @@
+  o Minor bugfixes (tor-resolve):
+    -  Create socket with correct family as given by sockshost, fixes IPv6.
+       Fixes bug 40982; bugfix on 0.4.9.0-alpha.
+
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
@@ -385,7 +385,7 @@ do_resolve(const char *hostname,
   tor_addr_make_unspec(result_addr);
   *result_hostname = NULL;
 
-  s = tor_open_socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+  s = tor_open_socket(sockshost->family,SOCK_STREAM,IPPROTO_TCP);
   if (s<0) {
     log_sock_error("creating_socket", -1);
     return -1;