- tor-commits - lists.torproject.org

[tor/maint-0.2.1] Fix typo in changes/bug2574. Thanks, rransom
by nickm＠torproject.org 28 May '11

28 May '11

commit f43aceb0f1b10d71d2e99e323668ac35327e286b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:13:04 2011 -0400 Fix typo in changes/bug2574. Thanks, rransom --- changes/bug2574 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug2574 b/changes/bug2574 index 32f4ae4..5cf2dae 100644 --- a/changes/bug2574 +++ b/changes/bug2574 @@ -1,2 +1,3 @@ o Minor features: - - Allow nameserves with IPv6 address. Fixes bug 2574. + - Allow nameservers with IPv6 address. Fixes bug 2574. +

1 0

[tor/master] Merge branch 'bug2574' into maint-0.2.1
by nickm＠torproject.org 28 May '11

28 May '11

commit ee72557d528a846661d4d1d794c127de8c3ef1eb Merge: 0d94f78 be76850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:07:48 2011 -0400 Merge branch 'bug2574' into maint-0.2.1 changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)

1 0

[tor/master] Work correctly if your nameserver is ::1
by nickm＠torproject.org 28 May '11

28 May '11

commit be76850995f337337dd94be66a9f03b35d8b1412 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 17:42:38 2011 -0400 Work correctly if your nameserver is ::1 We had all the code in place to handle this right... except that we were unconditionally opening a PF_INET socket instead of looking at sa_family. Ow. Fixes bug 2574; not a bugfix on any particular version, since this never worked before. --- changes/bug2574 | 2 ++ 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 0000000..32f4ae4 --- /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 2777f90..adab22b 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 {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 28 May '11

28 May '11

commit c3199495503930e33e7370d6c364b2b8b35844f4 Merge: a5232e0 ee72557 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:08:39 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --cc src/or/eventdns.c index b7cc292,1d93ae0..4753429 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@@ -2288,10 -2318,9 +2288,10 @@@ _evdns_nameserver_add_impl(const struc if (!ns) return -1; memset(ns, 0, sizeof(struct nameserver)); - ns->timeout_event_deleted = __LINE__; + + 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 {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 28 May '11

28 May '11

commit 285cf998bcb5b228d82e7ff2aa13a532eee837a9 Merge: 8e09f7c c319949 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:09:48 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/eventdns.c changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --cc src/or/eventdns.c index 725b59a,4753429..0a0fef4 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@@ -2291,7 -2291,7 +2291,7 @@@ _evdns_nameserver_add_impl(const struc evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); - ns->socket = tor_open_socket(PF_INET, SOCK_DGRAM, 0); - ns->socket = socket(address->sa_family, SOCK_DGRAM, 0); ++ ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef WIN32 {

1 0

[tor/maint-0.2.2] Work correctly if your nameserver is ::1
by nickm＠torproject.org 28 May '11

28 May '11

commit be76850995f337337dd94be66a9f03b35d8b1412 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 17:42:38 2011 -0400 Work correctly if your nameserver is ::1 We had all the code in place to handle this right... except that we were unconditionally opening a PF_INET socket instead of looking at sa_family. Ow. Fixes bug 2574; not a bugfix on any particular version, since this never worked before. --- changes/bug2574 | 2 ++ 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 0000000..32f4ae4 --- /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 2777f90..adab22b 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 {

1 0

[tor/maint-0.2.2] Merge branch 'bug2574' into maint-0.2.1
by nickm＠torproject.org 28 May '11

28 May '11

commit ee72557d528a846661d4d1d794c127de8c3ef1eb Merge: 0d94f78 be76850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:07:48 2011 -0400 Merge branch 'bug2574' into maint-0.2.1 changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 28 May '11

28 May '11

commit c3199495503930e33e7370d6c364b2b8b35844f4 Merge: a5232e0 ee72557 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:08:39 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --cc src/or/eventdns.c index b7cc292,1d93ae0..4753429 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@@ -2288,10 -2318,9 +2288,10 @@@ _evdns_nameserver_add_impl(const struc if (!ns) return -1; memset(ns, 0, sizeof(struct nameserver)); - ns->timeout_event_deleted = __LINE__; + + 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 {

1 0

[tor/maint-0.2.1] Work correctly if your nameserver is ::1
by nickm＠torproject.org 28 May '11

28 May '11

commit be76850995f337337dd94be66a9f03b35d8b1412 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 17:42:38 2011 -0400 Work correctly if your nameserver is ::1 We had all the code in place to handle this right... except that we were unconditionally opening a PF_INET socket instead of looking at sa_family. Ow. Fixes bug 2574; not a bugfix on any particular version, since this never worked before. --- changes/bug2574 | 2 ++ 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 0000000..32f4ae4 --- /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 2777f90..adab22b 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 {

1 0

[tor/maint-0.2.1] Merge branch 'bug2574' into maint-0.2.1
by nickm＠torproject.org 28 May '11

28 May '11

commit ee72557d528a846661d4d1d794c127de8c3ef1eb Merge: 0d94f78 be76850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 02:07:48 2011 -0400 Merge branch 'bug2574' into maint-0.2.1 changes/bug2574 | 2 ++ src/or/eventdns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)

1 0