mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-26 15:42:34 +01:00
Merge branch 'maint-0.3.1'
This commit is contained in:
commit
5f0fa480dd
1 changed files with 2 additions and 1 deletions
|
@ -661,6 +661,7 @@ test_single_onion_poisoning(void *arg)
|
||||||
char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2"));
|
char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2"));
|
||||||
smartlist_t *services = smartlist_new();
|
smartlist_t *services = smartlist_new();
|
||||||
char *poison_path = NULL;
|
char *poison_path = NULL;
|
||||||
|
char *err_msg = NULL;
|
||||||
|
|
||||||
mock_options->HiddenServiceSingleHopMode = 1;
|
mock_options->HiddenServiceSingleHopMode = 1;
|
||||||
mock_options->HiddenServiceNonAnonymousMode = 1;
|
mock_options->HiddenServiceNonAnonymousMode = 1;
|
||||||
|
@ -687,7 +688,6 @@ test_single_onion_poisoning(void *arg)
|
||||||
/* Add port to service 1 */
|
/* Add port to service 1 */
|
||||||
service_1->ports = smartlist_new();
|
service_1->ports = smartlist_new();
|
||||||
service_2->ports = smartlist_new();
|
service_2->ports = smartlist_new();
|
||||||
char *err_msg = NULL;
|
|
||||||
rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ",
|
rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ",
|
||||||
&err_msg);
|
&err_msg);
|
||||||
tt_assert(port1);
|
tt_assert(port1);
|
||||||
|
@ -890,6 +890,7 @@ test_single_onion_poisoning(void *arg)
|
||||||
rend_service_free(service_2);
|
rend_service_free(service_2);
|
||||||
UNMOCK(get_options);
|
UNMOCK(get_options);
|
||||||
tor_free(mock_options->DataDirectory);
|
tor_free(mock_options->DataDirectory);
|
||||||
|
tor_free(err_msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static rend_service_t *
|
static rend_service_t *
|
||||||
|
|
Loading…
Add table
Reference in a new issue