two pieces of r12607 for karsten to look at closer

svn:r12609
This commit is contained in:
Roger Dingledine 2007-11-29 15:37:17 +00:00
parent 8ac5f24c33
commit fea55c7c2d
2 changed files with 4 additions and 0 deletions

View File

@ -290,6 +290,7 @@ static config_var_t _option_vars[] = {
VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"),
VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
VAR("__LeaveStreamsUnattached",BOOL, LeaveStreamsUnattached, "0"),
/* XXX020 Karsten: this still needs a man page entry -RD */
V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
};

View File

@ -324,6 +324,9 @@ rend_config_services(or_options_t *options, int validate_only)
version = atoi(version_str);
versions_bitmask |= 1 << version;
}
/* XXX020 Karsten: do you really want to overwrite the
* descriptor_version in the second line? Perhaps if both bits
* are set you want to leave it at -1? -RD */
if (versions_bitmask == 1 << 0) service->descriptor_version = 0;
if (versions_bitmask == 1 << 2) service->descriptor_version = 2;
}