- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b Merge: 0cdd262 02d93ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:13:22 2011 -0400 Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1 changes/bug2402 | 4 --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 11 ++++++++- src/or/router.c | 2 - 5 files changed, 29 insertions(+), 54 deletions(-)

1 0

[tor/master] Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit de1c36ff6062ee4b45e1e1f637a7f168e104d7b1 Merge: 9d2b384 32341ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:15:48 2011 -0400 Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.

1 0

[tor/master] Fix infinite recursion when connect() fails in microdesc consensus fetch
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 22ec4d5426eecf1a8021d9b6b95f9a1518e96110 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 23 12:32:15 2011 -0500 Fix infinite recursion when connect() fails in microdesc consensus fetch The underlying fix is to stop indicating requests "ns" consensuses by putting NULL in their requested_resource field: we already had a specialized meaning for requested_resource==NULL, which was (more or less) "Treat a failure here as a network failure, since it's too early to possibly be a resource or directory failure." Overloading the two meant that very early microdesc consensus download failures would get treated as ns consensus download failures, so the failure count there would get incremented, but the microdesc download would get retried immediately in an infinite loop. Fix for bug2381. Diagnosed by mobmix. --- src/or/directory.c | 18 +++++++++++------- src/or/networkstatus.c | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 7137fe1..a53a0c6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -631,9 +631,8 @@ connection_dir_request_failed(dir_connection_t *conn) connection_dir_bridge_routerdesc_failed(conn); connection_dir_download_routerdesc_failed(conn); } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) { - const char *flavname = - conn->requested_resource ? conn->requested_resource : "ns"; - networkstatus_consensus_download_failed(0, flavname); + if (conn->requested_resource) + networkstatus_consensus_download_failed(0, conn->requested_resource); } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE) { log_info(LD_DIR, "Giving up on certificate fetch from directory server " "at '%s'; retrying", @@ -1004,8 +1003,14 @@ directory_get_consensus_url(int supports_conditional_consensus, const char *resource) { char *url = NULL; - const char *hyphen = resource ? "-" : ""; - const char *flavor = resource ? resource : ""; + const char *hyphen, *flavor; + if (resource==NULL || strcmp(resource, "ns")==0) { + flavor = ""; /* Request ns consensuses as "", so older servers will work*/ + hyphen = ""; + } else { + flavor = resource; + hyphen = "-"; + } if (supports_conditional_consensus) { char *authority_id_list; @@ -1746,8 +1751,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) { int r; - const char *flavname = - conn->requested_resource ? conn->requested_resource : "ns"; + const char *flavname = conn->requested_resource; if (status_code != 200) { int severity = (status_code == 304) ? LOG_INFO : LOG_WARN; log(severity, LD_DIR, diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index cccb1c0..6387126 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1217,7 +1217,7 @@ update_consensus_networkstatus_downloads(time_t now) if (! we_want_to_fetch_flavor(options, i)) continue; - resource = i==FLAV_NS ? NULL : networkstatus_get_flavor_name(i); + resource = networkstatus_get_flavor_name(i); if (!download_status_is_ready(&consensus_dl_status[i], now, CONSENSUS_NETWORKSTATUS_MAX_DL_TRIES))

1 0

[tor/master] Merge remote-tracking branch 'public/bug2381'
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 13f60e16eb8639d812d50012dc364d4c061bcb04 Merge: f6cc8f0 22ec4d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:19:41 2011 -0400 Merge remote-tracking branch 'public/bug2381' src/or/directory.c | 18 +++++++++++------- src/or/networkstatus.c | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.2] Revert "Simplest fix to bug2402: do not include SVN versions"
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 671318c3a84657acc8b97cf59871489065264ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:47:25 2011 -0500 Revert "Simplest fix to bug2402: do not include SVN versions" This reverts commit a1073ee956021ead19d30c2151510dbaced416a8. Apparently, we totally misunderstood how the debian packages were using microrevisions. Better fix that! --- changes/bug2402 | 4 ---- src/or/config.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug2402 b/changes/bug2402 deleted file mode 100644 index f16f677..0000000 --- a/changes/bug2402 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (build) - - Do not include Git version tags as though they were SVN tags when - generating a tarball from inside a repository that has switched between - branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. diff --git a/src/or/config.c b/src/or/config.c index 209a92d..8397b23 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -827,7 +827,16 @@ static char *_version = NULL; const char * get_version(void) { - return VERSION; + if (_version == NULL) { + if (strlen(tor_svn_revision)) { + size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; + _version = tor_malloc(len); + tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); + } else { + _version = tor_strdup(VERSION); + } + } + return _version; } /** Release additional memory allocated in options

1 0

[tor/maint-0.2.2] Backport: Generate version tags using Git, not (broken) svn revisions.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 02d93caa09656b1ef73838608258afad5c090105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 25 14:01:04 2011 -0500 Backport: Generate version tags using Git, not (broken) svn revisions. Partial backport of daa0326aaaa85a760be94ee2360cfa61a9fb5be2 . Resolves bug 2402. Bugfix on 0.2.1.15 (for the part where we switched to git) and on 0.2.1.30 (for the part where we dumped micro-revisions.) --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 4 +- src/or/router.c | 2 - 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/changes/bug2402_redux b/changes/bug2402_redux new file mode 100644 index 0000000..84be04a --- /dev/null +++ b/changes/bug2402_redux @@ -0,0 +1,6 @@ + o Minor bugfixes + - Use micro-revision numbers in 0.2.1.x instead: apparently, they + were more used than we had known. (Bugfix on 0.2.1.30). + - Instead of generating our micro-version numbers using SVN revisions, + use git revisions instead. Bugfix on 0.2.1.15-rc; fixes bug 2402. + diff --git a/src/or/Makefile.am b/src/or/Makefile.am index ad2476f..51c1b0f 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,53 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @svkdir=$$SVKROOT; \ - if test "x$$svkdir" = x ; then \ - svkdir=$$HOME/.svk; \ - fi; \ - if test -d ../../.git && test -x "`which git 2>&1;true`" ; then \ - if test -d ../../.git/svn && test -x "`which git-svn 2>&1;true`" ; then \ - git-svn info ../../README | \ - sed -n 's/^Revision: $[0-9][0-9]*$.*/"\1"/p' \ - > micro-revision.tmp \ - || true; \ - fi; \ - elif test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \ - svn info ../.. | \ - sed -n 's/^Revision: $[0-9][0-9]*$.*/"\1"/p' > micro-revision.tmp \ - || true; \ - elif test -x "`which svk 2>&1;true`" && test -d $$svkdir/local; then \ - location=../..; \ - rev=x; \ - while test x$$rev = xx; do \ - x=`svk info $$location | \ - sed -n 's/^Mirrored From:.*, Rev\. $[0-9][0-9]*$/\1/p'`; \ - if test x$$x != x; then \ - rev=$$x; \ - break; \ - else \ - loc=`svk info $$location | \ - sed -n 's/^Copied From: $.*$, Rev\. [0-9][0-9]*/\1/p' | \ - head -1`; \ - if test x$$loc = x; then \ - break; \ - else \ - location=/$$loc; \ - fi; \ - fi; \ - done; \ - if test x$$rev != xx; then \ - echo \"$$rev\" > micro-revision.tmp; \ - fi; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE: diff --git a/src/or/config.c b/src/or/config.c index 8397b23..9cd8149 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -829,9 +829,9 @@ get_version(void) { if (_version == NULL) { if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; + size_t len = strlen(VERSION)+strlen(tor_svn_revision)+16; _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); + tor_snprintf(_version, len, "%s (git-%s)", VERSION, tor_svn_revision); } else { _version = tor_strdup(VERSION); } diff --git a/src/or/router.c b/src/or/router.c index 75f592d..4ce4f85 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1586,8 +1586,6 @@ router_guess_address_from_dir_headers(uint32_t *guess) return -1; } -extern const char tor_svn_revision[]; /* from tor_main.c */ - /** Set platform (max length len) to a NUL-terminated short * string describing the version of Tor and the operating system we're * currently running on.

1 0

[tor/maint-0.2.2] Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit de1c36ff6062ee4b45e1e1f637a7f168e104d7b1 Merge: 9d2b384 32341ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:15:48 2011 -0400 Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b Merge: 0cdd262 02d93ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:13:22 2011 -0400 Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1 changes/bug2402 | 4 --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 11 ++++++++- src/or/router.c | 2 - 5 files changed, 29 insertions(+), 54 deletions(-)

1 0

[tor/maint-0.2.1] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 32341ac467d5fe51fa674eed4ca20db61ff5486b Merge: 0cdd262 02d93ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 16:13:22 2011 -0400 Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1 changes/bug2402 | 4 --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 11 ++++++++- src/or/router.c | 2 - 5 files changed, 29 insertions(+), 54 deletions(-)

1 0

[tor/maint-0.2.1] Backport: Generate version tags using Git, not (broken) svn revisions.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit 02d93caa09656b1ef73838608258afad5c090105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 25 14:01:04 2011 -0500 Backport: Generate version tags using Git, not (broken) svn revisions. Partial backport of daa0326aaaa85a760be94ee2360cfa61a9fb5be2 . Resolves bug 2402. Bugfix on 0.2.1.15 (for the part where we switched to git) and on 0.2.1.30 (for the part where we dumped micro-revisions.) --- changes/bug2402_redux | 6 +++++ src/or/Makefile.am | 60 ++++++++++-------------------------------------- src/or/config.c | 4 +- src/or/router.c | 2 - 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/changes/bug2402_redux b/changes/bug2402_redux new file mode 100644 index 0000000..84be04a --- /dev/null +++ b/changes/bug2402_redux @@ -0,0 +1,6 @@ + o Minor bugfixes + - Use micro-revision numbers in 0.2.1.x instead: apparently, they + were more used than we had known. (Bugfix on 0.2.1.30). + - Instead of generating our micro-version numbers using SVN revisions, + use git revisions instead. Bugfix on 0.2.1.15-rc; fixes bug 2402. + diff --git a/src/or/Makefile.am b/src/or/Makefile.am index ad2476f..51c1b0f 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -55,53 +55,19 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @svkdir=$$SVKROOT; \ - if test "x$$svkdir" = x ; then \ - svkdir=$$HOME/.svk; \ - fi; \ - if test -d ../../.git && test -x "`which git 2>&1;true`" ; then \ - if test -d ../../.git/svn && test -x "`which git-svn 2>&1;true`" ; then \ - git-svn info ../../README | \ - sed -n 's/^Revision: $[0-9][0-9]*$.*/"\1"/p' \ - > micro-revision.tmp \ - || true; \ - fi; \ - elif test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \ - svn info ../.. | \ - sed -n 's/^Revision: $[0-9][0-9]*$.*/"\1"/p' > micro-revision.tmp \ - || true; \ - elif test -x "`which svk 2>&1;true`" && test -d $$svkdir/local; then \ - location=../..; \ - rev=x; \ - while test x$$rev = xx; do \ - x=`svk info $$location | \ - sed -n 's/^Mirrored From:.*, Rev\. $[0-9][0-9]*$/\1/p'`; \ - if test x$$x != x; then \ - rev=$$x; \ - break; \ - else \ - loc=`svk info $$location | \ - sed -n 's/^Copied From: $.*$, Rev\. [0-9][0-9]*/\1/p' | \ - head -1`; \ - if test x$$loc = x; then \ - break; \ - else \ - location=/$$loc; \ - fi; \ - fi; \ - done; \ - if test x$$rev != xx; then \ - echo \"$$rev\" > micro-revision.tmp; \ - fi; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi; true + @rm -f micro-revision.tmp; \ + if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ + HASH="`git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE: diff --git a/src/or/config.c b/src/or/config.c index 8397b23..9cd8149 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -829,9 +829,9 @@ get_version(void) { if (_version == NULL) { if (strlen(tor_svn_revision)) { - size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8; + size_t len = strlen(VERSION)+strlen(tor_svn_revision)+16; _version = tor_malloc(len); - tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision); + tor_snprintf(_version, len, "%s (git-%s)", VERSION, tor_svn_revision); } else { _version = tor_strdup(VERSION); } diff --git a/src/or/router.c b/src/or/router.c index 75f592d..4ce4f85 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1586,8 +1586,6 @@ router_guess_address_from_dir_headers(uint32_t *guess) return -1; } -extern const char tor_svn_revision[]; /* from tor_main.c */ - /** Set platform (max length len) to a NUL-terminated short * string describing the version of Tor and the operating system we're * currently running on.

1 0