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

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-06-03 11:18:03 -04:00
commit 50e4c98a5a
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
changes/bug2748 Normal file
View File

@ -0,0 +1,10 @@
o Minor bugfixes
- Remove dead code from rend_cache_lookup_v2_desc_as_dir. Fixes
part of bug 2748; bugfix on 0.2.0.10-alpha.
- Log malformed requests for rendezvous descriptors as protocol
warnings, not warnings. Also, use a more informative log
message in case someone sees it at log level warning without
prior info-level messages. Fixes the other part of bug 2748;
bugfix on 0.2.0.10-alpha.

11
src/or/rendcommon.c
View File

@ -983,17 +983,12 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc)
tor_assert(rend_cache_v2_dir); tor_assert(rend_cache_v2_dir);
if (base32_decode(desc_id_digest, DIGEST_LEN, if (base32_decode(desc_id_digest, DIGEST_LEN,
desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) { desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) {
log_warn(LD_REND, "Descriptor ID contains illegal characters: %s", log_fn(LOG_PROTOCOL_WARN, LD_REND,
"Rejecting v2 rendezvous descriptor request -- descriptor ID "
"contains illegal characters: %s",
safe_str(desc_id)); safe_str(desc_id));
return -1; return -1;
} }
/* Determine if we are responsible. */
if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) {
log_info(LD_REND, "Could not answer fetch request for v2 descriptor; "
"either we are no hidden service directory, or we are "
"not responsible for the requested ID.");
return -1;
}
/* Lookup descriptor and return. */ /* Lookup descriptor and return. */
e = digestmap_get(rend_cache_v2_dir, desc_id_digest); e = digestmap_get(rend_cache_v2_dir, desc_id_digest);
if (e) { if (e) {