- tor-commits - lists.torproject.org

[tor/master] Another memory leak in the tests
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit e019e11e61c2c57c84505aaf2559966bddd4a10d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 16:20:11 2016 -0500 Another memory leak in the tests --- src/test/test_options.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 1814fbf..b2be8a9 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -242,6 +242,7 @@ test_have_enough_mem_for_dircache(void *arg) } tor_free(msg); + config_free_lines(cl); cl = NULL; configuration = "ORPort 8080\nDirCache 1\nBridgeRelay 1"; r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); @@ -264,6 +265,7 @@ test_have_enough_mem_for_dircache(void *arg) } tor_free(msg); + config_free_lines(cl); cl = NULL; configuration = "ORPort 8080\nDirCache 0"; r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); @@ -293,7 +295,7 @@ test_have_enough_mem_for_dircache(void *arg) tor_free(msg); tor_free(dflt); or_options_free(opt); - tor_free(cl); + config_free_lines(cl); return; }

1 0

[tor/master] Small fixup on last fix to test leaks
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 4cc50ee805538635d816e15766f25f5f97b3f180 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 16:16:56 2016 -0500 Small fixup on last fix to test leaks --- src/test/test_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index b87ab57..6be503a 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4295,7 +4295,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0); // Test failure for a SessionGroup argument with invalid value - config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=invalid"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0,

1 0

[tor/master] Fix a bunch of memory leaks in the unit tests
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 041d6482db225f1bddb150393006da61b6ed6bcb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 16:14:03 2016 -0500 Fix a bunch of memory leaks in the unit tests --- src/test/test_config.c | 111 ++++++++++++++++++++++----------------------- src/test/test_options.c | 2 +- src/test/test_routerlist.c | 22 ++++----- 3 files changed, 63 insertions(+), 72 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 85bedd6..b87ab57 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3860,7 +3860,6 @@ test_config_parse_port_config__ports__no_ports_given(void *data) int ret; smartlist_t *slout = NULL; port_cfg_t *port_cfg = NULL; - config_line_t *config_port_invalid = NULL, *config_port_valid = NULL; slout = smartlist_new(); @@ -3918,8 +3917,6 @@ test_config_parse_port_config__ports__no_ports_given(void *data) done: smartlist_free(slout); - tor_free(config_port_invalid); - tor_free(config_port_valid); } static void @@ -3941,7 +3938,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test error when encounters an empty unix domain specification - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("DNSPort", "unix:"); ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, NULL, 0, 0); @@ -3971,7 +3968,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure if we have no ipv4 and no ipv6 (for unix domain sockets, // this makes no sense - it should be fixed) - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("DNSPort", "unix:/tmp/foo/bar NoIPv4Traffic"); ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", @@ -3981,7 +3978,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with no ipv4 but take ipv6 (for unix domain sockets, this // makes no sense - it should be fixed) - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "unix:/tmp/foo/bar " "NoIPv4Traffic IPv6Traffic"); @@ -4000,7 +3997,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test success with both ipv4 and ipv6 (for unix domain sockets, // this makes no sense - it should be fixed) - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "unix:/tmp/foo/bar " "IPv4Traffic IPv6Traffic"); @@ -4018,28 +4015,28 @@ test_config_parse_port_config__ports__ports_given(void *data) #endif // Test failure if we specify world writable for an IP Port - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("DNSPort", "42 WorldWritable"); ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, "127.0.0.3", 0, 0); tt_int_op(ret, OP_EQ, -1); // Test failure if we specify group writable for an IP Port - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("DNSPort", "42 GroupWritable"); ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, "127.0.0.3", 0, 0); tt_int_op(ret, OP_EQ, -1); // Test success with only a port (this will fail without a default address) - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; config_port_valid = mock_config_line("DNSPort", "42"); ret = parse_port_config(NULL, config_port_valid, NULL, "DNS", 0, "127.0.0.3", 0, 0); tt_int_op(ret, OP_EQ, 0); // Test success with only a port and isolate destination port - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateDestPort"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4051,7 +4048,7 @@ test_config_parse_port_config__ports__ports_given(void *data) ISO_DEFAULT | ISO_DESTPORT); // Test success with a negative isolate destination port, and plural - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoIsolateDestPorts"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4063,7 +4060,7 @@ test_config_parse_port_config__ports__ports_given(void *data) ISO_DEFAULT & ~ISO_DESTPORT); // Test success with isolate destination address - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateDestAddr"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4075,7 +4072,7 @@ test_config_parse_port_config__ports__ports_given(void *data) ISO_DEFAULT | ISO_DESTADDR); // Test success with isolate socks AUTH - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateSOCKSAuth"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4087,7 +4084,7 @@ test_config_parse_port_config__ports__ports_given(void *data) ISO_DEFAULT | ISO_SOCKSAUTH); // Test success with isolate client protocol - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateClientProtocol"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4099,7 +4096,7 @@ test_config_parse_port_config__ports__ports_given(void *data) ISO_DEFAULT | ISO_CLIENTPROTO); // Test success with isolate client address - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IsolateClientAddr"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4111,14 +4108,14 @@ test_config_parse_port_config__ports__ports_given(void *data) ISO_DEFAULT | ISO_CLIENTADDR); // Test success with ignored unknown options - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; config_port_valid = mock_config_line("DNSPort", "42 ThisOptionDoesntExist"); ret = parse_port_config(NULL, config_port_valid, NULL, "DNS", 0, "127.0.0.3", 0, 0); tt_int_op(ret, OP_EQ, 0); // Test success with no isolate socks AUTH - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoIsolateSOCKSAuth"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4129,7 +4126,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.socks_prefer_no_auth, OP_EQ, 1); // Test success with prefer ipv6 - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IPv6Traffic PreferIPv6"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", @@ -4141,7 +4138,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.prefer_ipv6, OP_EQ, 1); // Test success with cache ipv4 DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 CacheIPv4DNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4153,7 +4150,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 0); // Test success with cache ipv6 DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 CacheIPv6DNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4165,7 +4162,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1); // Test success with no cache ipv4 DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoCacheIPv4DNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4177,7 +4174,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 0); // Test success with cache DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 CacheDNS"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4189,7 +4186,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1); // Test success with use cached ipv4 DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 UseIPv4Cache"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4201,7 +4198,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.use_cached_ipv6_answers, OP_EQ, 0); // Test success with use cached ipv6 DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 UseIPv6Cache"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4213,7 +4210,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.use_cached_ipv6_answers, OP_EQ, 1); // Test success with use cached DNS - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 UseDNSCache"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4225,7 +4222,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.use_cached_ipv6_answers, OP_EQ, 1); // Test success with not preferring ipv6 automap - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 NoPreferIPv6Automap"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4236,7 +4233,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 0); // Test success with prefer SOCKS no auth - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 PreferSOCKSNoAuth"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4247,8 +4244,8 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.socks_prefer_no_auth, OP_EQ, 1); // Test failure with both a zero port and a non-zero port - tor_free(config_port_invalid); - tor_free(config_port_valid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "0"); config_port_valid = mock_config_line("DNSPort", "42"); @@ -4283,7 +4280,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, 0); // Test success with both ipv4 and ipv6 but without stream options - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 IPv4Traffic " "IPv6Traffic"); @@ -4298,7 +4295,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0); // Test failure for a SessionGroup argument with invalid value - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=invalid"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4309,7 +4306,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Potential bug. // Test failure for a SessionGroup argument with valid value but with stream // options allowed - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4317,7 +4314,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test failure for more than one SessionGroup argument - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 " "SessionGroup=321"); @@ -4326,7 +4323,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test success with a sessiongroup options - tor_free(config_port_valid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=1111122"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4337,7 +4334,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.session_group, OP_EQ, 1111122); // Test success with a zero unix domain socket, and doesnt add it to out - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "0"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4346,7 +4343,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(smartlist_len(slout), OP_EQ, 0); // Test success with a one unix domain socket, and doesnt add it to out - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "something"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4358,7 +4355,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_str_op(port_cfg->unix_addr, OP_EQ, "something"); // Test success with a port of auto - it uses the default address - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "auto"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4371,7 +4368,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) // Test success with parsing both an address and an auto port - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.122:auto"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4384,14 +4381,14 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) // Test failure when asked to parse an invalid address followed by auto - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("DNSPort", "invalidstuff!!:auto"); ret = parse_port_config(NULL, config_port_invalid, NULL, "DNS", 0, "127.0.0.46", 0, 0); tt_int_op(ret, OP_EQ, -1); // Test success with parsing both an address and a real port - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.123:656"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, @@ -4404,7 +4401,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) // Test failure if we can't parse anything at all - tor_free(config_port_invalid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "something wrong"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4412,7 +4409,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(ret, OP_EQ, -1); // Test failure if we find both an address, a port and an auto - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.1.0:123:auto"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, @@ -4421,7 +4418,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test that default to group writeable default sets group writeable for // domain socket - tor_free(config_port_valid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "unix:/tmp/somewhere"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", @@ -4438,8 +4435,8 @@ test_config_parse_port_config__ports__ports_given(void *data) done: smartlist_free(slout); - tor_free(config_port_invalid); - tor_free(config_port_valid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_free_lines(config_port_valid); config_port_valid = NULL; } static void @@ -4454,7 +4451,7 @@ test_config_parse_port_config__ports__server_options(void *data) slout = smartlist_new(); // Test success with NoAdvertise option - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 NoAdvertise"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4466,7 +4463,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(port_cfg->server_cfg.no_listen, OP_EQ, 0); // Test success with NoListen option - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 NoListen"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4478,7 +4475,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(port_cfg->server_cfg.no_listen, OP_EQ, 1); // Test failure with both NoAdvertise and NoListen option - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 NoListen " "NoAdvertise"); @@ -4487,7 +4484,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(ret, OP_EQ, -1); // Test success with IPv4Only - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 IPv4Only"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4499,7 +4496,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(port_cfg->server_cfg.bind_ipv6_only, OP_EQ, 0); // Test success with IPv6Only - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "[::1]:656 IPv6Only"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4511,7 +4508,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(port_cfg->server_cfg.bind_ipv6_only, OP_EQ, 1); // Test failure with both IPv4Only and IPv6Only - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 IPv6Only " "IPv4Only"); @@ -4520,7 +4517,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(ret, OP_EQ, -1); // Test success with invalid parameter - tor_free(config_port_valid); + config_free_lines(config_port_valid); config_port_valid = NULL; smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.124:656 unknown"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", 0, NULL, 0, @@ -4529,7 +4526,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(smartlist_len(slout), OP_EQ, 1); // Test failure when asked to bind only to ipv6 but gets an ipv4 address - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "127.0.0.124:656 IPv6Only"); @@ -4538,7 +4535,7 @@ test_config_parse_port_config__ports__server_options(void *data) tt_int_op(ret, OP_EQ, -1); // Test failure when asked to bind only to ipv4 but gets an ipv6 address - tor_free(config_port_invalid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "[::1]:656 IPv4Only"); ret = parse_port_config(slout, config_port_invalid, NULL, "DNS", 0, NULL, @@ -4547,8 +4544,8 @@ test_config_parse_port_config__ports__server_options(void *data) done: smartlist_free(slout); - tor_free(config_port_invalid); - tor_free(config_port_valid); + config_free_lines(config_port_invalid); config_port_invalid = NULL; + config_free_lines(config_port_valid); config_port_valid = NULL; } #define CONFIG_TEST(name, flags) \ diff --git a/src/test/test_options.c b/src/test/test_options.c index 10ee1f9..1814fbf 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -292,7 +292,7 @@ test_have_enough_mem_for_dircache(void *arg) if (msg) tor_free(msg); tor_free(dflt); - tor_free(opt); + or_options_free(opt); tor_free(cl); return; } diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index eaf8a55..010dfd6 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -130,7 +130,6 @@ construct_consensus(const char **consensus_text_md) crypto_pk_t *sign_skey_leg=NULL; time_t now = time(NULL); smartlist_t *votes = NULL; - addr_policy_t *pol1 = NULL, *pol2 = NULL, *pol3 = NULL; int n_vrs; tt_assert(!dir_common_authority_pk_init(&cert1, &cert2, &cert3, @@ -141,15 +140,16 @@ construct_consensus(const char **consensus_text_md) dir_common_construct_vote_1(&vote, cert1, sign_skey_1, &dir_common_gen_routerstatus_for_v3ns, &v1, &n_vrs, now, 1); - + networkstatus_vote_free(vote); tt_assert(v1); tt_int_op(n_vrs, ==, 4); tt_int_op(smartlist_len(v1->routerstatus_list), ==, 4); + dir_common_construct_vote_2(&vote, cert2, sign_skey_2, &dir_common_gen_routerstatus_for_v3ns, &v2, &n_vrs, now, 1); - + networkstatus_vote_free(vote); tt_assert(v2); tt_int_op(n_vrs, ==, 4); tt_int_op(smartlist_len(v2->routerstatus_list), ==, 4); @@ -161,7 +161,7 @@ construct_consensus(const char **consensus_text_md) tt_assert(v3); tt_int_op(n_vrs, ==, 4); tt_int_op(smartlist_len(v3->routerstatus_list), ==, 4); - + networkstatus_vote_free(vote); votes = smartlist_new(); smartlist_add(votes, v1); smartlist_add(votes, v2); @@ -177,16 +177,10 @@ construct_consensus(const char **consensus_text_md) tt_assert(*consensus_text_md); done: - if (vote) - tor_free(vote); - if (voter) - tor_free(voter); - if (pol1) - tor_free(pol1); - if (pol2) - tor_free(pol2); - if (pol3) - tor_free(pol3); + tor_free(voter); + networkstatus_vote_free(v1); + networkstatus_vote_free(v2); + networkstatus_vote_free(v3); } static void

1 0

[orbot/master] set this to Android 16 SDK for PIE executable
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit f9f33a171c41ec7bafa14d1cf672b6a44bfa2b91 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 15:59:35 2016 -0500 set this to Android 16 SDK for PIE executable We'll use a different build for non-PIE < Android-16 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7d42a95..77ea774 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ android:installLocation="auto" > - <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="23"/> + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description"

1 0

[orbot/master] 15.1.1 PIE Android 16+
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit 44dae6bc1d823a0e374d77ee907651ec07b1b3c6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 16:02:56 2016 -0500 15.1.1 PIE Android 16+ --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 77ea774..4b3cd03 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.0-RC-7" - android:versionCode="15100027" + android:versionName="15.1.1" + android:versionCode="15110000" android:installLocation="auto" >

1 0

[orbot/master] reset minSDK to 10
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit e1d46c49b94313a5c34b81f1f6a5b469bd45fadb Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 2 11:35:02 2016 -0500 reset minSDK to 10 --- AndroidManifest.xml | 2 +- jni/Application.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 77ea774..7d42a95 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ android:installLocation="auto" > - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/> + <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="23"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" diff --git a/jni/Application.mk b/jni/Application.mk index 554a462..32e48c2 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi x86 -APP_PLATFORM := android-16 +APP_PLATFORM := android-10 APP_STL := stlport_static NDK_TOOLCHAIN_VERSION := 4.8

1 0

[orbot/master] enable backwards compat to Android SDK 10 (Android 2.3.*)
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit bac16a57fc5ec3eb71cc33b82f7fd9ba35149a81 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 2 12:22:24 2016 -0500 enable backwards compat to Android SDK 10 (Android 2.3.*) --- external/superuser-commands | 2 +- src/org/torproject/android/OrbotMainActivity.java | 82 ++++++++++++---------- .../torproject/android/vpn/VPNEnableActivity.java | 2 +- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/external/superuser-commands b/external/superuser-commands index be997be..834a501 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit be997be8fff6dc00cd249fdfd128d6820461db99 +Subproject commit 834a50146a2dc07c57f02d37ecd7f2d521b52c2b diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e71d6c1..0a4c25a 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -3,6 +3,8 @@ package org.torproject.android; +import static org.torproject.android.OrbotConstants.TAG; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; @@ -25,8 +27,7 @@ import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; import org.torproject.android.vpn.VPNEnableActivity; -import android.app.ActionBar; -import android.app.Activity; +import android.annotation.SuppressLint; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; import android.app.AlertDialog; @@ -49,10 +50,10 @@ import android.os.Message; import android.os.RemoteException; import android.support.v4.content.LocalBroadcastManager; import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.util.AttributeSet; import android.util.Log; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; @@ -114,7 +115,7 @@ public class OrbotMainActivity extends AppCompatActivity public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT"; public final static String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR"; - + // for bridge loading from the assets default bridges.txt file class Bridge { @@ -124,7 +125,15 @@ public class OrbotMainActivity extends AppCompatActivity private ArrayList<Bridge> alBridges = null; - + //this is needed for backwards compat back to Android 2.3.* + @SuppressLint("NewApi") + public View onCreateView(View parent, String name, Context context, AttributeSet attrs) + { + if(Build.VERSION.SDK_INT >= 11) + return super.onCreateView(parent, name, context, attrs); + return null; + } + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -261,29 +270,39 @@ public class OrbotMainActivity extends AppCompatActivity mBtnVPN = (ToggleButton)findViewById(R.id.btnVPN); - boolean useVPN = Prefs.useVpn(); - mBtnVPN.setChecked(useVPN); - - //auto start VPN if VPN is enabled - if (useVPN) + boolean canDoVPN = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH; + + if (!canDoVPN) { - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + //if not SDK 14 or higher, we can't use the VPN feature + mBtnVPN.setVisibility(View.GONE); } - - mBtnVPN.setOnClickListener(new View.OnClickListener () + else { - - @Override - public void onClick(View v) { - - if (mBtnVPN.isChecked()) - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); - else - stopVpnService(); - + boolean useVPN = Prefs.useVpn(); + mBtnVPN.setChecked(useVPN); + + //auto start VPN if VPN is enabled + if (useVPN) + { + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); } - - }); + + mBtnVPN.setOnClickListener(new View.OnClickListener () + { + + @Override + public void onClick(View v) { + + if (mBtnVPN.isChecked()) + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + else + stopVpnService(); + + } + + }); + } mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges); @@ -1018,21 +1037,6 @@ public class OrbotMainActivity extends AppCompatActivity private void requestTorRereadConfig() { sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); } - - - /** - @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) - public void startVpnService () - { - Intent intent = VpnService.prepare(getApplicationContext()); - if (intent != null) { - startActivityForResult(intent,REQUEST_VPN); - } - else - { - sendIntentToService(TorServiceConstants.CMD_VPN); - } - }*/ public void stopVpnService () { diff --git a/src/org/torproject/android/vpn/VPNEnableActivity.java b/src/org/torproject/android/vpn/VPNEnableActivity.java index 8d254f1..8b7dbc6 100644 --- a/src/org/torproject/android/vpn/VPNEnableActivity.java +++ b/src/org/torproject/android/vpn/VPNEnableActivity.java @@ -161,4 +161,4 @@ public class VPNEnableActivity extends Activity { startService(torService); } -} \ No newline at end of file +}

1 0

[orbot/master] update superuser commands library
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit c8584f6ec97140146ab58ea5cb1dc85b77a11ce2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 2 12:23:58 2016 -0500 update superuser commands library --- external/superuser-commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/superuser-commands b/external/superuser-commands index 834a501..63b4783 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit 834a50146a2dc07c57f02d37ecd7f2d521b52c2b +Subproject commit 63b4783c7d4873690cf39989d9c9f8399c073ddb

1 0

[orbot/master] bridges dedicated to GeorgeTorwell
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit 5eb628b03a22d188990873fcf199518e69db3db1 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Feb 9 22:16:52 2016 +0000 bridges dedicated to GeorgeTorwell --- assets/bridges.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/bridges.txt b/assets/bridges.txt index 86ebae2..679f811 100644 --- a/assets/bridges.txt +++ b/assets/bridges.txt @@ -13,6 +13,10 @@ obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 +obfs4 154.35.22.10:1984 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 +obfs4 154.35.22.11:1984 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 +obfs4 154.35.22.12:1984 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 +obfs4 154.35.22.13:1984 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] peg to last ant compat release
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit 80e8c47e627e5b6d3ca4339e6b5af209f4feb7cc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 12:09:37 2016 -0500 peg to last ant compat release --- external/superuser-commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/superuser-commands b/external/superuser-commands index 63b4783..be997be 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit 63b4783c7d4873690cf39989d9c9f8399c073ddb +Subproject commit be997be8fff6dc00cd249fdfd128d6820461db99

1 0