diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 3 | ||||
| -rw-r--r-- | src/or/or.h | 2 | ||||
| -rw-r--r-- | src/or/router.c | 6 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/or/config.c b/src/or/config.c index 9983b676d..998e34e00 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -262,9 +262,6 @@ static config_var_t _option_vars[] = { VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits,"0"), VAR("__LeaveStreamsUnattached", BOOL,LeaveStreamsUnattached, "0"), - /* XXXX020 Testing only. This will become "always on" once we confirm - * that it works. */ - VAR("_UploadExtraInfo", BOOL, _UploadExtraInfo, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; #undef VAR diff --git a/src/or/or.h b/src/or/or.h index f2f4eac68..24fd76474 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1881,8 +1881,6 @@ typedef struct { /** If true, we try resolving hostnames with weird characters. */ int ServerDNSAllowNonRFC953Hostnames; - /*XXXX020 remove me once no longer needed */ - int _UploadExtraInfo; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/router.c b/src/or/router.c index 47a60b322..abb183fbb 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; |