diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-04-18 03:36:28 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-04-18 03:36:28 +0000 |
| commit | 0df40a393b8ca087ee6dc9ee3dcf000faeda781e (patch) | |
| tree | 3056050690ee0ed3f7a66f5bb50464f6262a7f51 /src/or/config.c | |
| parent | 6ebd8865119c8044d67259f4397d2c379271ed78 (diff) | |
| download | tor-0df40a393b8ca087ee6dc9ee3dcf000faeda781e.tar tor-0df40a393b8ca087ee6dc9ee3dcf000faeda781e.tar.gz | |
[forward-port] Implement an option, VirtualAddrMask, to set which addresses get handed out in response to mapaddress requests. Needs testing and docs!
svn:r6398
Diffstat (limited to 'src/or/config.c')
| -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 7c33d7fe9..b7e2b41a4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -238,6 +238,7 @@ static config_var_t _option_vars[] = { VAR("User", STRING, User, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), + VAR("VirtualAddrNetwork", STRING, VirtualAddrNetwork, "127.192.0.0/10"), VAR("__LeaveStreamsUnattached", BOOL,LeaveStreamsUnattached, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; @@ -677,6 +678,7 @@ options_act(or_options_t *old_options) size_t len; or_options_t *options = get_options(); int running_tor = options->command == CMD_RUN_TOR; + const char *msg; clear_trusted_dir_servers(); if (options->DirServers) { @@ -745,6 +747,7 @@ options_act(or_options_t *old_options) /* Register addressmap directives */ config_register_addressmaps(options); + parse_virtual_addr_network(options->VirtualAddrNetwork, 0, &msg); /* Update address policies. */ policies_parse_from_options(options); @@ -2404,6 +2407,9 @@ options_validate(or_options_t *old_options, or_options_t *options, if (rend_config_services(options, 1) < 0) REJECT("Failed to configure rendezvous options. See logs for details."); + if (parse_virtual_addr_network(options->VirtualAddrNetwork, 1, msg)<0) + return -1; + return 0; #undef REJECT #undef COMPLAIN |