diff options
author | David Goulet <dgoulet@torproject.org> | 2021-02-12 12:57:18 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2021-02-12 12:57:18 -0500 |
commit | c1b5e7fa1bfb7a64c148f098c86b08f4f3167213 (patch) | |
tree | 4d365c43ed8132ade4cf9f5e9709d62e735f35ea /src/test | |
parent | e6caf7d8c76660dbbaf68ee56c7ebf31a2ac9605 (diff) | |
parent | bdca475518ca3036f1df7e78fef93bfa988cb01f (diff) | |
download | tor-c1b5e7fa1bfb7a64c148f098c86b08f4f3167213.tar.gz tor-c1b5e7fa1bfb7a64c148f098c86b08f4f3167213.zip |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/test_config.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index 4eb4ac9cf5..eacf12a25f 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1460,6 +1460,7 @@ test_config_find_my_address(void *arg) options = options_new(); options_init(options); + options->PublishServerDescriptor_ = V3_DIRINFO; /* * Case 0: @@ -1782,6 +1783,22 @@ test_config_find_my_address(void *arg) VALIDATE_FOUND_ADDRESS(true, RESOLVED_ADDR_INTERFACE, NULL); CLEANUP_FOUND_ADDRESS; + /* + * Case 15: Address is a local address (internal) but we unset + * PublishServerDescriptor_ so we are allowed to hold it. + */ + options->PublishServerDescriptor_ = NO_DIRINFO; + if (p->family == AF_INET) { + options->AssumeReachable = 1; + } + config_line_append(&options->Address, "Address", p->internal_ip); + + tor_addr_parse(&test_addr, p->internal_ip); + retval = find_my_address(options, p->family, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, RESOLVED_ADDR_CONFIGURED, NULL); + CLEANUP_FOUND_ADDRESS; + UNMOCK(get_interface_address6); UNMOCK(tor_gethostname); UNMOCK(tor_addr_lookup); |