July 2013 - tor-commits - lists.torproject.org

[tor/master] A python script to combin gcov output with git blame
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit dd44ff663e074d07a8bf8b94dc5d8b9d8dc3fb32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 15:31:07 2013 -0400 A python script to combin gcov output with git blame --- contrib/cov-blame | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/contrib/cov-blame b/contrib/cov-blame new file mode 100755 index 0000000..601f211 --- /dev/null +++ b/contrib/cov-blame @@ -0,0 +1,48 @@ +#!/usr/bin/python + +import os +import re +import subprocess +import sys + +def handle_file(source_fname, cov_fname): + + lines_blm = subprocess.Popen(["git", "blame", source_fname], stdout=subprocess.PIPE).stdout.readlines() + lines_cov = open(cov_fname).readlines() + + # XXXX expensive! + while re.match(r'\s*-:\s*0:', lines_cov[0]): + del lines_cov[0] + + if len(lines_blm) != len(lines_cov): + print >>sys.stderr, "MISMATCH IN NUMBER OF LINES in",source_fname + + for b,c in zip(lines_blm, lines_cov): + m = re.match(r'\s*([^\s:]+):', c) + if not m: + print >>sys.stderr, "CONFUSING LINE %r"% c + cov = 'X' + elif m.group(1) == '-': + cov = '-' + elif m.group(1)[0] == '#': + cov = '#' + elif m.group(1)[0].isdigit(): + cov = '1' + else: + print >>sys.stderr, "CONFUSING LINE %r"% c + cov = 'X' + + print cov, b, + +COV_DIR = sys.argv[1] +SOURCES = sys.argv[2:] + +for fn in SOURCES: + _, base = os.path.split(fn) + cfn = os.path.join(COV_DIR, base) + cfn += ".gcov" + if os.path.exists(cfn): + handle_file(fn, cfn) + else: + print >>sys.stderr, "NO FILE EXISTS CALLED ",cfn +

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit f797ac465fa474bc530d76dd92e499584be18ca3 Merge: 4824f3a c36bdbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 14:49:41 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9254 | 4 ++++ src/or/circuitlist.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Re-do a cast in order to make old buggy freebsd gcc happy
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 14:48:12 2013 -0400 Re-do a cast in order to make old buggy freebsd gcc happy Fix for #9254. Bugfix on 0.2.4.14-alpha. This is not actually a bug in the Tor code. --- changes/bug9254 | 4 ++++ src/or/circuitlist.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug9254 b/changes/bug9254 new file mode 100644 index 0000000..5179bdc --- /dev/null +++ b/changes/bug9254 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a spurious compilation warning with some older versions of + GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 3dc362f..daeaa37 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1518,8 +1518,10 @@ static size_t n_cells_in_circ_queues(const circuit_t *c) { size_t n = c->n_chan_cells.n; - if (! CIRCUIT_IS_ORIGIN(c)) - n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n; + if (! CIRCUIT_IS_ORIGIN(c)) { + circuit_t *cc = (circuit_t *) c; + n += TO_OR_CIRCUIT(cc)->p_chan_cells.n; + } return n; }

1 0

[tor/maint-0.2.4] Re-do a cast in order to make old buggy freebsd gcc happy
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 14:48:12 2013 -0400 Re-do a cast in order to make old buggy freebsd gcc happy Fix for #9254. Bugfix on 0.2.4.14-alpha. This is not actually a bug in the Tor code. --- changes/bug9254 | 4 ++++ src/or/circuitlist.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug9254 b/changes/bug9254 new file mode 100644 index 0000000..5179bdc --- /dev/null +++ b/changes/bug9254 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a spurious compilation warning with some older versions of + GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 3dc362f..daeaa37 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1518,8 +1518,10 @@ static size_t n_cells_in_circ_queues(const circuit_t *c) { size_t n = c->n_chan_cells.n; - if (! CIRCUIT_IS_ORIGIN(c)) - n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n; + if (! CIRCUIT_IS_ORIGIN(c)) { + circuit_t *cc = (circuit_t *) c; + n += TO_OR_CIRCUIT(cc)->p_chan_cells.n; + } return n; }

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit 426380c6e6de5392258bd9cfebb2a3b466640f7a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 16:46:50 2013 +0000 Update translations for tor-launcher-properties_completed --- es/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index c3d2c14..4b95de7 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -4,18 +4,18 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.tor_controlconn_failed=No se puede conectar al puerto de control Tor +torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.\n\n%S torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo "torrc" -torlauncher.datadir_missing=Los Datos del directorio de Tor no existen +torlauncher.datadir_missing=El directorio de datos de Tor no existe. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S -torlauncher.failed_to_save_settings=No es posible guardar los ajustes de Tor.\n\n%S +torlauncher.failed_to_save_settings=No fue posible guardar los ajustes de Tor.\n\n%S torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejecutando. torlauncher.error_proxy_addr_missing=Debe especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit e5ce5077b0ad0ba0d96a270c96cc51a38ed2b4df Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 16:46:47 2013 +0000 Update translations for tor-launcher-properties --- es/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index c3d2c14..4b95de7 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -4,18 +4,18 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.tor_controlconn_failed=No se puede conectar al puerto de control Tor +torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.\n\n%S torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo "torrc" -torlauncher.datadir_missing=Los Datos del directorio de Tor no existen +torlauncher.datadir_missing=El directorio de datos de Tor no existe. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S -torlauncher.failed_to_save_settings=No es posible guardar los ajustes de Tor.\n\n%S +torlauncher.failed_to_save_settings=No fue posible guardar los ajustes de Tor.\n\n%S torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejecutando. torlauncher.error_proxy_addr_missing=Debe especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet.

1 0

[tor/master] Test deeper in test_pt_parsing().
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit 4ccd4b5c51e1c59b921ca4bfcbc010232c076aaa Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 16 14:07:03 2013 +0300 Test deeper in test_pt_parsing(). We used to test parse_{c,s}method_line() without actually testing that the resulting transport_t was well formed. --- src/test/test_pt.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index d4cc0ae..16daa28 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -22,6 +22,8 @@ static void test_pt_parsing(void) { char line[200]; + transport_t *transport = NULL; + tor_addr_t test_addr; managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t)); mp->conf_state = PT_PROTO_INFANT; @@ -48,7 +50,17 @@ test_pt_parsing(void) /* correct line */ strlcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999",sizeof(line)); test_assert(parse_cmethod_line(line, mp) == 0); - test_assert(smartlist_len(mp->transports)); + test_assert(smartlist_len(mp->transports) == 1); + transport = smartlist_get(mp->transports, 0); + /* test registered address of transport */ + tor_addr_parse(&test_addr, "127.0.0.1"); + test_assert(tor_addr_eq(&test_addr, &transport->addr)); + /* test registered port of transport */ + test_assert(transport->port == 1999); + /* test registered SOCKS version of transport */ + test_assert(transport->socks_version == PROXY_SOCKS5); + /* test registered name of transport */ + test_streq(transport->name, "trebuchet"); reset_mp(mp); @@ -65,8 +77,17 @@ test_pt_parsing(void) reset_mp(mp); /* cowwect */ - strlcpy(line,"SMETHOD trebuchy 127.0.0.1:1999",sizeof(line)); + strlcpy(line,"SMETHOD trebuchy 127.0.0.2:2999",sizeof(line)); test_assert(parse_smethod_line(line, mp) == 0); + test_assert(smartlist_len(mp->transports) == 1); + transport = smartlist_get(mp->transports, 0); + /* test registered address of transport */ + tor_addr_parse(&test_addr, "127.0.0.2"); + test_assert(tor_addr_eq(&test_addr, &transport->addr)); + /* test registered port of transport */ + test_assert(transport->port == 2999); + /* test registered name of transport */ + test_streq(transport->name, "trebuchy"); reset_mp(mp);

1 0

[tor/master] Merge remote-tracking branch 'asn/bug9265'
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit 4824f3ad9383f111901ab7e37fc70ec60b9d7a4c Merge: 74356aa 4ccd4b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 09:55:51 2013 -0400 Merge remote-tracking branch 'asn/bug9265' src/test/test_pt.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)

1 0

[tor/master] Add more replaycache.c unit tests, bringing coverage to 100% for that file
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit 459d82719348d860d856b8753e07cb4057f692ed Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Jul 16 06:02:22 2013 -0700 Add more replaycache.c unit tests, bringing coverage to 100% for that file --- src/test/test_replay.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/src/test/test_replay.c b/src/test/test_replay.c index de841ad..9230081 100644 --- a/src/test/test_replay.c +++ b/src/test/test_replay.c @@ -32,6 +32,40 @@ test_replaycache_alloc(void) } static void +test_replaycache_badalloc(void) +{ + replaycache_t *r = NULL; + + /* Negative horizon should fail */ + r = replaycache_new(-600, 300); + test_assert(r == NULL); + /* Negative interval should get adjusted to zero */ + r = replaycache_new(600, -300); + test_assert(r != NULL); + test_eq(r->scrub_interval, 0); + replaycache_free(r); + /* Negative horizon and negative interval should still fail */ + r = replaycache_new(-600, -300); + test_assert(r == NULL); + + done: + if (r) replaycache_free(r); + + return; +} + +static void +test_replaycache_free_null(void) +{ + replaycache_free(NULL); + /* Assert that we're here without horrible death */ + test_assert(1); + + done: + return; +} + +static void test_replaycache_miss(void) { replaycache_t *r = NULL; @@ -45,6 +79,12 @@ test_replaycache_miss(void) (int)strlen(test_buffer), NULL); test_eq(result, 0); + /* poke the bad-parameter error case too */ + result = + replaycache_add_and_test_internal(1200, NULL, test_buffer, + (int)strlen(test_buffer), NULL); + test_eq(result, 0); + done: if (r) replaycache_free(r); @@ -163,16 +203,147 @@ test_replaycache_noexpire(void) return; } +static void +test_replaycache_scrub(void) +{ + replaycache_t *r = NULL; + int result; + char digest[DIGEST_LEN]; + + r = replaycache_new(600, 300); + test_assert(r != NULL); + + /* Set up like in test_replaycache_hit() */ + result = + replaycache_add_and_test_internal(100, r, test_buffer, + (int)strlen(test_buffer), NULL); + test_eq(result, 0); + + result = + replaycache_add_and_test_internal(200, r, test_buffer, + (int)strlen(test_buffer), NULL); + test_eq(result, 1); + + /* + * Poke a few replaycache_scrub_if_needed_internal() error cases that + * can't happen through replaycache_add_and_test_internal() + */ + + /* Null cache */ + replaycache_scrub_if_needed_internal(300, NULL); + /* Assert we're still here */ + test_assert(1); + + /* Make sure we hit the aging-out case too */ + replaycache_scrub_if_needed_internal(1500, r); + /* Assert that we aged it */ + test_eq(digestmap_size(r->digests_seen), 0); + + done: + if (r) replaycache_free(r); + + return; +} + +static void +test_replaycache_future(void) +{ + replaycache_t *r = NULL; + int result; + time_t elapsed = 0; + + r = replaycache_new(600, 300); + test_assert(r != NULL); + + /* Set up like in test_replaycache_hit() */ + result = + replaycache_add_and_test_internal(100, r, test_buffer, + (int)strlen(test_buffer), &elapsed); + test_eq(result, 0); + /* elapsed should still be 0, since it wasn't written */ + test_eq(elapsed, 0); + + result = + replaycache_add_and_test_internal(200, r, test_buffer, + (int)strlen(test_buffer), &elapsed); + test_eq(result, 1); + /* elapsed should be the time since the last hit */ + test_eq(elapsed, 100); + + /* + * Now let's turn the clock back to get coverage on the cache entry from the + * future not-supposed-to-happen case. + */ + result = + replaycache_add_and_test_internal(150, r, test_buffer, + (int)strlen(test_buffer), &elapsed); + /* We should still get a hit */ + test_eq(result, 1); + /* ...but it shouldn't let us see a negative elapsed time */ + test_eq(elapsed, 0); + + done: + if (r) replaycache_free(r); + + return; +} + +static void +test_replaycache_realtime(void) +{ + replaycache_t *r = NULL; + /* + * Negative so we fail if replaycache_add_test_and_elapsed() doesn't + * write to elapsed. + */ + time_t elapsed = -1; + int result; + + /* Test the realtime as well as *_internal() entry points */ + r = replaycache_new(600, 300); + test_assert(r != NULL); + + /* This should miss */ + result = + replaycache_add_and_test(r, test_buffer, (int)strlen(test_buffer)); + test_eq(result, 0); + + /* This should hit */ + result = + replaycache_add_and_test(r, test_buffer, (int)strlen(test_buffer)); + test_eq(result, 1); + + /* This should hit and return a small elapsed time */ + result = + replaycache_add_test_and_elapsed(r, test_buffer, + (int)strlen(test_buffer), &elapsed); + test_eq(result, 1); + test_assert(elapsed >= 0); + test_assert(elapsed <= 5); + + /* Scrub it to exercise that entry point too */ + replaycache_scrub_if_needed(r); + + done: + if (r) replaycache_free(r); + return; +} + #define REPLAYCACHE_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_replaycache_ ## name } struct testcase_t replaycache_tests[] = { REPLAYCACHE_LEGACY(alloc), + REPLAYCACHE_LEGACY(badalloc), + REPLAYCACHE_LEGACY(free_null), REPLAYCACHE_LEGACY(miss), REPLAYCACHE_LEGACY(hit), REPLAYCACHE_LEGACY(age), REPLAYCACHE_LEGACY(elapsed), REPLAYCACHE_LEGACY(noexpire), + REPLAYCACHE_LEGACY(scrub), + REPLAYCACHE_LEGACY(future), + REPLAYCACHE_LEGACY(realtime), END_OF_TESTCASES };

1 0

[tor/master] Make contrib/coverage smarter about check file-existence edge cases
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit e5d3efd892f63744be8867fb69e2eb1cb5236438 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Jul 16 06:40:08 2013 -0700 Make contrib/coverage smarter about check file-existence edge cases --- contrib/coverage | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/contrib/coverage b/contrib/coverage index 8d97166..f4ae475 100755 --- a/contrib/coverage +++ b/contrib/coverage @@ -12,9 +12,35 @@ for fn in src/or/*.c src/common/*.c; do DN=`dirname $fn` F=`echo $BN | sed -e 's/\.c$//;'` GC="${BN}.gcov" - gcov -o $DN/src_*$F.o $fn - if [ -n $dst ] + # Figure out the object file names + ONS=`echo ${DN}/src_*-${F}.o` + ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + # If the wildcard didn't expand, no files + if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then - mv $GC $dst/$GC + for on in $ONS; do + # We should have a gcno file + GCNO=`echo $on | sed -e 's/\.o$/\.gcno/;'` + if [ -e $GCNO ] + then + # No need to test for gcda, since gcov assumes no execution + # if it's absent + rm -f $GC + gcov -o $on $fn + if [ -e $GC ] + then + if [ -n $dst ] + then + mv $GC $dst/$GC + fi + else + echo "gcov -o $on $fn didn't make a .gcov file" + fi + else + echo "Couldn't find gcno file for $on" + fi + done + else + echo "No object file found matching source file $fn" fi done

1 0