diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-11 11:12:29 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-11 11:12:29 +0000 |
| commit | 62b507fee0913b61c5428bebb52cb9123d0b76ac (patch) | |
| tree | 01cfa0bbe392d45c4f9580eb56ebcecd56388c31 | |
| parent | 89c903d9aa5b02f1b212178cdc3d41430060959e (diff) | |
| download | tor-62b507fee0913b61c5428bebb52cb9123d0b76ac.tar.gz tor-62b507fee0913b61c5428bebb52cb9123d0b76ac.zip | |
forward-port r15129, but also note the real way we should fix it.
svn:r15130
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 43d1ee8e37..12cfe18834 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3444,6 +3444,10 @@ static int options_transition_affects_descriptor(or_options_t *old_options, or_options_t *new_options) { + /* XXX021 We can be smarter here. If your DirPort isn't being + * published and you just turned it off, no need to republish. If + * you changed your bandwidthrate but maxadvertisedbandwidth still + * trumps, no need to republish. Etc. */ if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || !opt_streq(old_options->Nickname,new_options->Nickname) || !opt_streq(old_options->Address,new_options->Address) || @@ -3458,6 +3462,8 @@ options_transition_affects_descriptor(or_options_t *old_options, new_options->_PublishServerDescriptor || old_options->BandwidthRate != new_options->BandwidthRate || old_options->BandwidthBurst != new_options->BandwidthBurst || + old_options->MaxAdvertisedBandwidth != + new_options->MaxAdvertisedBandwidth || !opt_streq(old_options->ContactInfo, new_options->ContactInfo) || !opt_streq(old_options->MyFamily, new_options->MyFamily) || !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || |