mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'bug21150_030_01_squashed'
This commit is contained in:
commit
222f2fe469
5
changes/bug21150
Normal file
5
changes/bug21150
Normal file
@ -0,0 +1,5 @@
|
||||
o Minor bugfixes (config, hidden service):
|
||||
- Stop modifying the value of our torrc option HiddenServiceStatistics
|
||||
just because we're not a bridge or relay. Use an internal value for what
|
||||
tor should use and keep the torrc option intact. Fixes bug 21150; bugfix
|
||||
on tor-0.2.6.2-alpha.
|
@ -358,7 +358,7 @@ static config_var_t option_vars_[] = {
|
||||
VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL),
|
||||
VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL),
|
||||
VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL),
|
||||
V(HiddenServiceStatistics, BOOL, "1"),
|
||||
VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"),
|
||||
V(HidServAuth, LINELIST, NULL),
|
||||
V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"),
|
||||
V(CloseHSServiceRendCircuitsImmediatelyOnTimeout, BOOL, "0"),
|
||||
@ -2004,6 +2004,8 @@ options_act(const or_options_t *old_options)
|
||||
/* Only collect directory-request statistics on relays and bridges. */
|
||||
options->DirReqStatistics = options->DirReqStatistics_option &&
|
||||
server_mode(options);
|
||||
options->HiddenServiceStatistics =
|
||||
options->HiddenServiceStatistics_option && server_mode(options);
|
||||
|
||||
if (options->CellStatistics || options->DirReqStatistics ||
|
||||
options->EntryStatistics || options->ExitPortStatistics ||
|
||||
@ -2018,7 +2020,6 @@ options_act(const or_options_t *old_options)
|
||||
options->CellStatistics = 0;
|
||||
options->EntryStatistics = 0;
|
||||
options->ConnDirectionStatistics = 0;
|
||||
options->HiddenServiceStatistics = 0;
|
||||
options->ExitPortStatistics = 0;
|
||||
}
|
||||
|
||||
|
@ -4168,6 +4168,10 @@ typedef struct {
|
||||
|
||||
/** If true, the user wants us to collect statistics as hidden service
|
||||
* directory, introduction point, or rendezvous point. */
|
||||
int HiddenServiceStatistics_option;
|
||||
/** Internal variable to remember whether we're actually acting on
|
||||
* HiddenServiceStatistics_option -- yes if it's set and we're a server,
|
||||
* else no. */
|
||||
int HiddenServiceStatistics;
|
||||
|
||||
/** If true, include statistics file contents in extra-info documents. */
|
||||
|
Loading…
Reference in New Issue
Block a user