diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-01 20:41:27 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-01 20:41:27 +0000 |
| commit | 26abac8c4c34ab8b0dae70ca3a5c4460ae6540db (patch) | |
| tree | 9cd34a5fbf6f879846a4ff3725d5100c1addbd33 /src/or/router.c | |
| parent | 979b90001bdc88e438f4d0cd5cc32651b836e0b8 (diff) | |
| download | tor-26abac8c4c34ab8b0dae70ca3a5c4460ae6540db.tar.gz tor-26abac8c4c34ab8b0dae70ca3a5c4460ae6540db.zip | |
r12625@catbus: nickm | 2007-05-01 16:41:23 -0400
Remove the _UploadExtraInfo option, since I tried turning it on and moria[12] seem not to have exploded.
svn:r10089
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/router.c b/src/or/router.c index 47a60b3226..abb183fbb7 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -730,7 +730,6 @@ router_upload_dir_desc_to_dirservers(int force) extrainfo_t *ei; char *msg; size_t desc_len, extra_len = 0, total_len; - int post_extra; ri = router_get_my_routerinfo(); if (!ri) { @@ -738,7 +737,6 @@ router_upload_dir_desc_to_dirservers(int force) return; } ei = router_get_my_extrainfo(); - post_extra = ei && get_options()->_UploadExtraInfo; if (!get_options()->PublishServerDescriptor) return; if (!force && !desc_needs_upload) @@ -746,11 +744,11 @@ router_upload_dir_desc_to_dirservers(int force) desc_needs_upload = 0; desc_len = ri->cache_info.signed_descriptor_len; - extra_len = (ei && post_extra) ? ei->cache_info.signed_descriptor_len : 0; + extra_len = ei ? ei->cache_info.signed_descriptor_len : 0; total_len = desc_len + extra_len + 1; msg = tor_malloc(total_len); memcpy(msg, ri->cache_info.signed_descriptor_body, desc_len); - if (ei && post_extra) { + if (ei) { memcpy(msg+desc_len, ei->cache_info.signed_descriptor_body, extra_len); } msg[desc_len+extra_len] = 0; |