diff options
| author | Roger Dingledine <arma@torproject.org> | 2016-03-11 10:45:03 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2016-03-11 10:45:03 -0500 |
| commit | 53902963383e1babfccb8a4ffc7ed4e8accf2214 (patch) | |
| tree | fb11ab029e3b215105ca9bcf606328e3b0fcbc6e /src/or/rendcache.c | |
| parent | e167910fce2b83d9de3a252cdf02cabdafced14b (diff) | |
| download | tor-53902963383e1babfccb8a4ffc7ed4e8accf2214.tar.gz tor-53902963383e1babfccb8a4ffc7ed4e8accf2214.zip | |
rip out hid_serv_acting_as_directory()
When we made HidServDirectoryV2 always 1, we removed the situation
where a relay could choose not to be an HSDir. Now simplify the
rest of the code to reflect this decision.
(We have to remove two apparently unrelated free() calls in the unit
tests, since they used to free stuff that we created as a side effect
of calling router_get_my_routerinfo(), and now we no longer call that.)
Diffstat (limited to 'src/or/rendcache.c')
| -rw-r--r-- | src/or/rendcache.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 6c22503e53..dad4b2b5ba 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -641,12 +641,6 @@ rend_cache_store_v2_desc_as_dir(const char *desc) time_t now = time(NULL); tor_assert(rend_cache_v2_dir); tor_assert(desc); - if (!hid_serv_acting_as_directory()) { - /* Cannot store descs, because we are (currently) not acting as - * hidden service directory. */ - log_info(LD_REND, "Cannot store descs: Not acting as hs dir"); - return RCS_NOTDIR; - } while (rend_parse_v2_service_descriptor(&parsed, desc_id, &intro_content, &intro_size, &encoded_size, &next_desc, current_desc, 1) >= 0) { |