diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-28 02:07:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-28 02:07:48 -0400 |
| commit | ee72557d528a846661d4d1d794c127de8c3ef1eb (patch) | |
| tree | 73d345be5442b3022ab31863c4956269646eceaa | |
| parent | 0d94f78705d5376059cd2b1bdfe96e84067e212f (diff) | |
| parent | be76850995f337337dd94be66a9f03b35d8b1412 (diff) | |
| download | tor-ee72557d528a846661d4d1d794c127de8c3ef1eb.tar.gz tor-ee72557d528a846661d4d1d794c127de8c3ef1eb.zip | |
Merge branch 'bug2574' into maint-0.2.1
| -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 0000000000..32f4ae4a92 --- /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 bef6062681..1d93ae048e 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -2320,7 +2320,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, memset(ns, 0, sizeof(struct nameserver)); ns->timeout_event_deleted = __LINE__; - 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 { |