Commit 5c7c5e59 authored by Sebastian Hahn's avatar Sebastian Hahn
Browse files

Tweak the bug2250 fix slightly 

Rename the _UsingTestingTorNetwork hidden option to
_UsingTestNetworkDefaults (thanks Nick for the suggestion) and added a
changes file.
parent 34e47d10

changes/bug2250

0 → 100644
+5 −0
Changes for changes/bug2250: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Fix an assert that got triggered when using the TestingTorNetwork

      configuration option and then issuing a GETINFO config-text control

      command. Fixes bug 2250; bugfix on 0.2.1.2-alpha.

src/or/config.c

+7 −7
Changes for src/or/config.c: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static config_var_t _option_vars[] = { 
  VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword,

      NULL),

  V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),

  V(_UsingTestingTorNetwork,    BOOL,     "0"),

  V(_UsingTestNetworkDefaults,   BOOL,     "0"),



  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }

};
@@ -419,7 +419,7 @@ static config_var_t testing_tor_network_defaults[] = { 
  V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"),

  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),

  V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"),

  V(_UsingTestingTorNetwork,    BOOL,     "1"),

  V(_UsingTestNetworkDefaults,   BOOL,     "1"),

  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }

};

#undef VAR
@@ -3657,7 +3657,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
  /* Keep changes to hard-coded values synchronous to man page and default

   * values table. */

  if (options->TestingV3AuthInitialVotingInterval != 30*60 &&

      !options->TestingTorNetwork && !options->_UsingTestingTorNetwork) {

      !options->TestingTorNetwork && !options->_UsingTestNetworkDefaults) {

    REJECT("TestingV3AuthInitialVotingInterval may only be changed in testing "

           "Tor networks!");

  } else if (options->TestingV3AuthInitialVotingInterval < MIN_VOTE_INTERVAL) {
@@ -3668,7 +3668,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
  }



  if (options->TestingV3AuthInitialVoteDelay != 5*60 &&

      !options->TestingTorNetwork && !options->_UsingTestingTorNetwork) {

      !options->TestingTorNetwork && !options->_UsingTestNetworkDefaults) {



    REJECT("TestingV3AuthInitialVoteDelay may only be changed in testing "

           "Tor networks!");
@@ -3677,7 +3677,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
  }



  if (options->TestingV3AuthInitialDistDelay != 5*60 &&

      !options->TestingTorNetwork && !options->_UsingTestingTorNetwork) {

      !options->TestingTorNetwork && !options->_UsingTestNetworkDefaults) {

    REJECT("TestingV3AuthInitialDistDelay may only be changed in testing "

           "Tor networks!");

  } else if (options->TestingV3AuthInitialDistDelay < MIN_DIST_SECONDS) {
@@ -3692,7 +3692,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
  }



  if (options->TestingAuthDirTimeToLearnReachability != 30*60 &&

      !options->TestingTorNetwork && !options->_UsingTestingTorNetwork) {

      !options->TestingTorNetwork && !options->_UsingTestNetworkDefaults) {

    REJECT("TestingAuthDirTimeToLearnReachability may only be changed in "

           "testing Tor networks!");

  } else if (options->TestingAuthDirTimeToLearnReachability < 0) {
@@ -3702,7 +3702,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
  }



  if (options->TestingEstimatedDescriptorPropagationTime != 10*60 &&

      !options->TestingTorNetwork && !options->_UsingTestingTorNetwork) {

      !options->TestingTorNetwork && !options->_UsingTestNetworkDefaults) {

    REJECT("TestingEstimatedDescriptorPropagationTime may only be changed in "

           "testing Tor networks!");

  } else if (options->TestingEstimatedDescriptorPropagationTime < 0) {

src/or/or.h

+1 −1
Changes for src/or/or.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2844,7 +2844,7 @@ typedef struct { 
  /** Set to true if the TestingTorNetwork configuration option is set.

   * This is used so that options_validate() has a chance to realize that

   * the defaults have changed. */

  int _UsingTestingTorNetwork;

  int _UsingTestNetworkDefaults;



} or_options_t;