mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
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
This commit is contained in:
parent
979b90001b
commit
26abac8c4c
4
doc/TODO
4
doc/TODO
@ -77,8 +77,8 @@ Things we'd like to do in 0.2.0.x:
|
||||
o Implement cache on disk.
|
||||
o Have routers upload extra-info documents to authorities running
|
||||
version 0.2.0.0-alpha-dev (r10070) or later.
|
||||
. Implement, but make it option-controlled.
|
||||
- Make it always-on once it seems to work.
|
||||
o Implement, but make it option-controlled.
|
||||
o Make it always-on once it seems to work.
|
||||
- Implement option to download and cache extra-info documents.
|
||||
- Drop bandwidth history from router-descriptors
|
||||
- 105: Version negotiation for the Tor protocol (finalize by Jun 1)
|
||||
|
@ -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
|
||||
|
@ -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. */
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user