mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix warnings.

Browse Source
This commit is contained in:
Nick Mathewson 2015-10-02 15:12:04 +02:00
parent 21c201202e
commit 92c436ccbc
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/17004 Normal file
View File

@ -0,0 +1,3 @@
o Testing:
- Unit tests for directory_handle_command_get. Closes ticket 17004.
Patch from Reinaldo de Souza Jr.

17
src/test/test_dir_handle_get.c
View File

@ -402,6 +402,7 @@ NS(router_get_my_routerinfo)(void)
static int static int
NS(hid_serv_responsible_for_desc_id)(const char *id) NS(hid_serv_responsible_for_desc_id)(const char *id)
{ {
(void)id;
return hid_serv_responsible_for_desc_id_response; return hid_serv_responsible_for_desc_id_response;
} }
@ -675,7 +676,7 @@ test_dir_handle_get_networkstatus_bridges_not_found_without_auth(void *data)
/* SETUP */ /* SETUP */
init_mock_options(); init_mock_options();
mock_options->BridgeAuthoritativeDir = 1; mock_options->BridgeAuthoritativeDir = 1;
mock_options->BridgePassword_AuthDigest_ = "digest"; mock_options->BridgePassword_AuthDigest_ = tor_strdup("digest");
conn = dir_connection_new(tor_addr_family(&MOCK_TOR_ADDR)); conn = dir_connection_new(tor_addr_family(&MOCK_TOR_ADDR));
TO_CONN(conn)->linked = 1; TO_CONN(conn)->linked = 1;
@ -925,8 +926,9 @@ test_dir_handle_get_server_descriptors_authority(void* data)
mock_routerinfo->cache_info.send_unencrypted = 1; mock_routerinfo->cache_info.send_unencrypted = 1;
/* Setup descriptor */ /* Setup descriptor */
int annotation_len = strstr(TEST_DESCRIPTOR, "router ") - TEST_DESCRIPTOR; long annotation_len = strstr(TEST_DESCRIPTOR, "router ") - TEST_DESCRIPTOR;
mock_routerinfo->cache_info.signed_descriptor_body = TEST_DESCRIPTOR; mock_routerinfo->cache_info.signed_descriptor_body =
tor_strdup(TEST_DESCRIPTOR);
mock_routerinfo->cache_info.signed_descriptor_len = strlen(TEST_DESCRIPTOR); mock_routerinfo->cache_info.signed_descriptor_len = strlen(TEST_DESCRIPTOR);
mock_routerinfo->cache_info.annotations_len = annotation_len; mock_routerinfo->cache_info.annotations_len = annotation_len;
@ -989,8 +991,9 @@ test_dir_handle_get_server_descriptors_fp(void* data)
mock_routerinfo->cache_info.send_unencrypted = 1; mock_routerinfo->cache_info.send_unencrypted = 1;
/* Setup descriptor */ /* Setup descriptor */
int annotation_len = strstr(TEST_DESCRIPTOR, "router ") - TEST_DESCRIPTOR; long annotation_len = strstr(TEST_DESCRIPTOR, "router ") - TEST_DESCRIPTOR;
mock_routerinfo->cache_info.signed_descriptor_body = TEST_DESCRIPTOR; mock_routerinfo->cache_info.signed_descriptor_body =
tor_strdup(TEST_DESCRIPTOR);
mock_routerinfo->cache_info.signed_descriptor_len = strlen(TEST_DESCRIPTOR); mock_routerinfo->cache_info.signed_descriptor_len = strlen(TEST_DESCRIPTOR);
mock_routerinfo->cache_info.annotations_len = annotation_len; mock_routerinfo->cache_info.annotations_len = annotation_len;
@ -1739,6 +1742,7 @@ NS_DECL(int, geoip_get_country_by_addr, (const tor_addr_t *addr));
int int
NS(geoip_get_country_by_addr)(const tor_addr_t *addr) NS(geoip_get_country_by_addr)(const tor_addr_t *addr)
{ {
(void)addr;
CALLED(geoip_get_country_by_addr)++; CALLED(geoip_get_country_by_addr)++;
return 1; return 1;
} }
@ -1765,7 +1769,7 @@ status_vote_current_consensus_ns_test(char **header, char **body,
tt_str_op("ab", OP_EQ, geoip_get_country_name(1)); tt_str_op("ab", OP_EQ, geoip_get_country_name(1));
conn = dir_connection_new(tor_addr_family(&MOCK_TOR_ADDR)); conn = dir_connection_new(tor_addr_family(&MOCK_TOR_ADDR));
TO_CONN(conn)->address = "127.0.0.1"; TO_CONN(conn)->address = tor_strdup("127.0.0.1");
tt_int_op(0, OP_EQ, directory_handle_command_get(conn, tt_int_op(0, OP_EQ, directory_handle_command_get(conn,
GET("/tor/status-vote/current/consensus-ns"), NULL, 0)); GET("/tor/status-vote/current/consensus-ns"), NULL, 0));
@ -2156,6 +2160,7 @@ dirvote_get_pending_consensus, (consensus_flavor_t flav));
const char* const char*
NS(dirvote_get_pending_consensus)(consensus_flavor_t flav) NS(dirvote_get_pending_consensus)(consensus_flavor_t flav)
{ {
(void)flav;
return "pending consensus"; return "pending consensus";
} }