diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-28 02:08:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-28 02:08:39 -0400 |
| commit | c3199495503930e33e7370d6c364b2b8b35844f4 (patch) | |
| tree | 5323069e86732df820c3d8318111b4660c56ab62 | |
| parent | a5232e0c4c572cdff85701f698b8b90c9443d7e4 (diff) | |
| parent | ee72557d528a846661d4d1d794c127de8c3ef1eb (diff) | |
| download | tor-c3199495503930e33e7370d6c364b2b8b35844f4.tar tor-c3199495503930e33e7370d6c364b2b8b35844f4.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | changes/bug2574 | 2 | ||||
| -rw-r--r-- | src/or/eventdns.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/bug2574 b/changes/bug2574 new file mode 100644 index 000000000..32f4ae4a9 --- /dev/null +++ b/changes/bug2574 @@ -0,0 +1,2 @@ + o Minor features: + - Allow nameserves with IPv6 address. Fixes bug 2574. diff --git a/src/or/eventdns.c b/src/or/eventdns.c index b7cc2929a..4753429b1 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -2291,7 +2291,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); - ns->socket = socket(PF_INET, SOCK_DGRAM, 0); + ns->socket = socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef WIN32 { |