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

Break NoPublish support

Browse Source
This commit is contained in:
Sebastian Hahn 2010-10-30 06:38:50 +02:00
parent 556a1b9e45
commit 5040c855d1
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/config.c
View File

@ -304,7 +304,7 @@ static config_var_t _option_vars[] = {
V(NATDPort, UINT, "0"), V(NATDPort, UINT, "0"),
V(Nickname, STRING, NULL), V(Nickname, STRING, NULL),
V(WarnUnsafeSocks, BOOL, "1"), V(WarnUnsafeSocks, BOOL, "1"),
V(NoPublish, BOOL, "0"), OBSOLETE("NoPublish"),
VAR("NodeFamily", LINELIST, NodeFamilies, NULL), VAR("NodeFamily", LINELIST, NodeFamilies, NULL),
V(NumCPUs, UINT, "1"), V(NumCPUs, UINT, "1"),
V(NumEntryGuards, UINT, "3"), V(NumEntryGuards, UINT, "3"),
@ -2996,14 +2996,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (options_init_logs(options, 1)<0) /* Validate the log(s) */ if (options_init_logs(options, 1)<0) /* Validate the log(s) */
REJECT("Failed to validate Log options. See logs for details."); REJECT("Failed to validate Log options. See logs for details.");
if (options->NoPublish) {
log(LOG_WARN, LD_CONFIG,
"NoPublish is obsolete. Use PublishServerDescriptor instead.");
SMARTLIST_FOREACH(options->PublishServerDescriptor, char *, s,
tor_free(s));
smartlist_clear(options->PublishServerDescriptor);
}
if (authdir_mode(options)) { if (authdir_mode(options)) {
/* confirm that our address isn't broken, so we can complain now */ /* confirm that our address isn't broken, so we can complain now */
uint32_t tmp; uint32_t tmp;
@ -3832,7 +3824,6 @@ options_transition_affects_descriptor(or_options_t *old_options,
old_options->ORPort != new_options->ORPort || old_options->ORPort != new_options->ORPort ||
old_options->DirPort != new_options->DirPort || old_options->DirPort != new_options->DirPort ||
old_options->ClientOnly != new_options->ClientOnly || old_options->ClientOnly != new_options->ClientOnly ||
old_options->NoPublish != new_options->NoPublish ||
old_options->_PublishServerDescriptor != old_options->_PublishServerDescriptor !=
new_options->_PublishServerDescriptor || new_options->_PublishServerDescriptor ||
get_effective_bwrate(old_options) != get_effective_bwrate(new_options) || get_effective_bwrate(old_options) != get_effective_bwrate(new_options) ||

2
src/or/or.h
View File

@ -2447,8 +2447,6 @@ typedef struct {
int AvoidDiskWrites; /**< Boolean: should we never cache things to disk? int AvoidDiskWrites; /**< Boolean: should we never cache things to disk?
* Not used yet. */ * Not used yet. */
int ClientOnly; /**< Boolean: should we never evolve into a server role? */ int ClientOnly; /**< Boolean: should we never evolve into a server role? */
/** Boolean: should we never publish a descriptor? Deprecated. */
int NoPublish;
/** To what authority types do we publish our descriptor? Choices are /** To what authority types do we publish our descriptor? Choices are
* "v1", "v2", "v3", "bridge", or "". */ * "v1", "v2", "v3", "bridge", or "". */
smartlist_t *PublishServerDescriptor; smartlist_t *PublishServerDescriptor;