nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix "make check-spaces"

Browse Source
This commit is contained in:
Nick Mathewson 2015-11-20 10:52:56 -05:00
parent e3cf39cefd
commit cbc1b8a4f7
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/compat.c
View File

@ -1568,7 +1568,7 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
tor_addr_to_sockaddr(&listen_tor_addr, tor_addr_to_sockaddr(&listen_tor_addr,
0 /* kernel chooses port. */, 0 /* kernel chooses port. */,
&listen_addr, &listen_addr,
sizeof (listen_addr)); sizeof(listen_addr));
if (bind(listener, &listen_addr, sizeof (listen_addr)) == -1) if (bind(listener, &listen_addr, sizeof (listen_addr)) == -1)
goto tidy_up_and_fail; goto tidy_up_and_fail;
if (listen(listener, 1) == -1) if (listen(listener, 1) == -1)

1
src/or/connection_edge.c
View File

@ -3598,3 +3598,4 @@ connection_edge_free_all(void)
smartlist_free(pending_entry_connections); smartlist_free(pending_entry_connections);
pending_entry_connections = NULL; pending_entry_connections = NULL;
} }

4
src/or/policies.c
View File

@ -901,7 +901,6 @@ addr_policy_append_reject_addr(smartlist_t **dest, const tor_addr_t *addr)
smartlist_add(*dest, add); smartlist_add(*dest, add);
log_debug(LD_CONFIG, "Adding a reject ExitPolicy 'reject %s:*'", log_debug(LD_CONFIG, "Adding a reject ExitPolicy 'reject %s:*'",
fmt_addr(addr)); fmt_addr(addr));
} }
/* Is addr public for the purposes of rejection? */ /* Is addr public for the purposes of rejection? */
@ -1309,7 +1308,6 @@ policies_add_outbound_addresses_to_smartlist(smartlist_t *addr_list,
} }
} }
/** Parse <b>ExitPolicy</b> member of <b>or_options</b> into <b>result</b> /** Parse <b>ExitPolicy</b> member of <b>or_options</b> into <b>result</b>
* smartlist. * smartlist.
* If <b>or_options->IPv6Exit</b> is false, prepend an entry that * If <b>or_options->IPv6Exit</b> is false, prepend an entry that
@ -2103,7 +2101,7 @@ policy_dump_to_string(const smartlist_t *policy_list,
policy_string = smartlist_join_strings(policy_string_list, "\n", 0, NULL); policy_string = smartlist_join_strings(policy_string_list, "\n", 0, NULL);
done: done:
SMARTLIST_FOREACH(policy_string_list, char *, str, tor_free(str)); SMARTLIST_FOREACH(policy_string_list, char *, str, tor_free(str));
smartlist_free(policy_string_list); smartlist_free(policy_string_list);

10
src/test/test_policy.c
View File

@ -681,7 +681,7 @@ test_policies_reject_port_address(void *arg)
addr_policy_list_free(policy); addr_policy_list_free(policy);
policy = NULL; policy = NULL;
done: done:
addr_policy_list_free(policy); addr_policy_list_free(policy);
if (test_configured_ports) { if (test_configured_ports) {
SMARTLIST_FOREACH(test_configured_ports, SMARTLIST_FOREACH(test_configured_ports,
@ -826,7 +826,8 @@ test_dump_exit_policy_to_string(void *arg)
} }
static routerinfo_t *mock_desc_routerinfo = NULL; static routerinfo_t *mock_desc_routerinfo = NULL;
static const routerinfo_t *mock_router_get_my_routerinfo(void) static const routerinfo_t *
mock_router_get_my_routerinfo(void)
{ {
return mock_desc_routerinfo; return mock_desc_routerinfo;
} }
@ -948,7 +949,7 @@ test_policies_getinfo_helper_policies(void *arg)
tt_assert(strlen(answer) == ipv4_len + ipv6_len + 1); tt_assert(strlen(answer) == ipv4_len + ipv6_len + 1);
tor_free(answer); tor_free(answer);
done: done:
tor_free(answer); tor_free(answer);
UNMOCK(get_options); UNMOCK(get_options);
UNMOCK(router_get_my_routerinfo); UNMOCK(router_get_my_routerinfo);
@ -966,7 +967,8 @@ struct testcase_t policy_tests[] = {
{ "getinfo_helper_policies", test_policies_getinfo_helper_policies, 0, NULL, { "getinfo_helper_policies", test_policies_getinfo_helper_policies, 0, NULL,
NULL }, NULL },
{ "reject_exit_address", test_policies_reject_exit_address, 0, NULL, NULL }, { "reject_exit_address", test_policies_reject_exit_address, 0, NULL, NULL },
{ "reject_interface_address", test_policies_reject_interface_address, 0, NULL, NULL }, { "reject_interface_address", test_policies_reject_interface_address, 0,
NULL, NULL },
{ "reject_port_address", test_policies_reject_port_address, 0, NULL, NULL }, { "reject_port_address", test_policies_reject_port_address, 0, NULL, NULL },
END_OF_TESTCASES END_OF_TESTCASES
}; };