nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups on karsten's patch

Browse Source 
svn:r16810
This commit is contained in:
Roger Dingledine 2008-09-09 09:21:21 +00:00
parent ef7af1d61e
commit fa64d8041f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -5,12 +5,13 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
relay. Fixes bug 809. Bugfix on 0.2.1.5-alpha. relay. Fixes bug 809. Bugfix on 0.2.1.5-alpha.
- When extending a circuit to a hidden service directory to upload a - When extending a circuit to a hidden service directory to upload a
rendezvous descriptor using a BEGIN_DIR cell, almost 1/6 of all rendezvous descriptor using a BEGIN_DIR cell, almost 1/6 of all
requests failed, because the router descriptor has not been downloaded requests failed, because the router descriptor has not been
before. In these cases, do not attempt to upload the rendezvous downloaded yet. In these cases, do not attempt to upload the
descriptor, but wait until the router descriptor is downloaded and rendezvous descriptor, but wait until the router descriptor is
retry. Likewise, do not attempt to fetch a rendezvous from a hidden downloaded and retry. Likewise, do not attempt to fetch a rendezvous
service directory for which the router descriptor has not been descriptor from a hidden service directory for which the router
downloaded, yet. Fixes bug 767. Bugfix on 0.2.0.10-alpha. descriptor has not yet been downloaded. Fixes bug 767. Bugfix
on 0.2.0.10-alpha.
o Minor bugfixes: o Minor bugfixes:
- Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha. - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.

2
src/or/main.c
View File

@ -1127,8 +1127,8 @@ run_scheduled_events(time_t now)
/** 7. And upload service descriptors if necessary. */ /** 7. And upload service descriptors if necessary. */
if (has_completed_circuit && !we_are_hibernating()) { if (has_completed_circuit && !we_are_hibernating()) {
rend_consider_descriptor_republication();
rend_consider_services_upload(now); rend_consider_services_upload(now);
rend_consider_descriptor_republication();
} }
/** 8. and blow away any connections that need to die. have to do this now, /** 8. and blow away any connections that need to die. have to do this now,

2
src/or/rendservice.c
View File

@ -1420,7 +1420,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
SMARTLIST_FOREACH(renddesc->successful_uploads, char *, c, tor_free(c);); SMARTLIST_FOREACH(renddesc->successful_uploads, char *, c, tor_free(c););
smartlist_free(renddesc->successful_uploads); smartlist_free(renddesc->successful_uploads);
} }
renddesc->all_uploads_performed = -1; renddesc->all_uploads_performed = 1;
} else { } else {
/* Remember which routers worked this time, so that we don't upload the /* Remember which routers worked this time, so that we don't upload the
* descriptor to them again. */ * descriptor to them again. */