Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: isislovecruft/tor
base: bug25515
head repository: juga0/tor
compare: bug25515_rmunused_vars
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 2 files changed
  • 0 comments
  • 1 contributor
Commits on Apr 17, 2018
* remove the fixme since clearing the countries should be other issue
* remove unused variables related to it since that cause travis to fail
Showing with 1 addition and 6 deletions.
  1. 0 src/test/geoip_dummy
  2. +1 −6 src/test/test_geoip.c
Empty file.
@@ -511,16 +511,11 @@ test_geoip_load_2nd_file(void *arg)
const char FNAME[] = SRCDIR "/src/config/geoip"; const char FNAME[] = SRCDIR "/src/config/geoip";
tt_int_op(0, OP_EQ, geoip_load_file(AF_INET, FNAME)); tt_int_op(0, OP_EQ, geoip_load_file(AF_INET, FNAME));


int num_countries_geoip = geoip_get_n_countries();

/* Load 2nd geoip (empty) file */ /* Load 2nd geoip (empty) file */
/* It has to be the same IP address family */
const char FNAME2[] = SRCDIR "/src/test/geoip_dummy"; const char FNAME2[] = SRCDIR "/src/test/geoip_dummy";
tt_int_op(0, OP_EQ, geoip_load_file(AF_INET, FNAME2)); tt_int_op(0, OP_EQ, geoip_load_file(AF_INET, FNAME2));


int num_countries_geoip2 = geoip_get_n_countries();
/* FIXME: should not this be different? */
/* tt_int_op(num_countries_geoip, OP_NE, num_countries_geoip2); */

/* Check that there is no geoip information for 8.8.8.8, */ /* Check that there is no geoip information for 8.8.8.8, */
/* since loading the empty 2nd file should have delete it. */ /* since loading the empty 2nd file should have delete it. */
int country = geoip_get_country_by_ipv4(0x08080808); int country = geoip_get_country_by_ipv4(0x08080808);

No commit comments for this range