- tor-commits - lists.torproject.org

[tor/master] Update the uptime string to include an hours indicator
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit da3256b5aefb4cad706d9f239c9743ca396564c4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon May 16 21:58:01 2011 +0200 Update the uptime string to include an hours indicator Before, it wasn't really obvious if one meant hours:minutes or minutes:seconds etc. --- src/or/status.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/status.c b/src/or/status.c index 34a27b2..c8bc070 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -39,13 +39,15 @@ secs_to_uptime(long secs) switch (days) { case 0: - tor_asprintf(&uptime_string, "%d:%02d", hours, minutes); + tor_asprintf(&uptime_string, "%d:%02d hours", hours, minutes); break; case 1: - tor_asprintf(&uptime_string, "%ld day %d:%02d", days, hours, minutes); + tor_asprintf(&uptime_string, "%ld day %d:%02d hours", + days, hours, minutes); break; default: - tor_asprintf(&uptime_string, "%ld days %d:%02d", days, hours, minutes); + tor_asprintf(&uptime_string, "%ld days %d:%02d hours", + days, hours, minutes); break; }

1 0

[tor/master] Remove a dead variable in the heartbeat code
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 3033f8459b332c934b3098ee15c3aa04e3545484 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:10:43 2011 +0200 Remove a dead variable in the heartbeat code --- changes/coverity_master | 2 ++ src/or/status.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 3b61087..ab174bc 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,4 +1,6 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() fails. Spotted by coverity. Bugfix on 0.2.3.1. + o Code simplifications and refactoring: + - Remove a dead variable in the heartbeat log code. Spotted by coverity. diff --git a/src/or/status.c b/src/or/status.c index c8bc070..64e3022 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -84,7 +84,6 @@ log_heartbeat(time_t now) char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; - const node_t *myself; or_options_t *options = get_options(); (void)now; @@ -94,7 +93,7 @@ log_heartbeat(time_t now) if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */ else - if (!(myself = node_get_by_id(me->cache_info.identity_digest))) + if (!node_get_by_id(me->cache_info.identity_digest)) log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: It seems like we are not " "in the cached consensus."); }

1 0

[tor/master] Fix a memleak in nodelist_assert_ok()
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 82837673655151609462d529986a310e04f1ba50 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:38:42 2011 +0200 Fix a memleak in nodelist_assert_ok() --- changes/coverity_master | 2 ++ src/or/nodelist.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index ab174bc..784dec3 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,6 +1,8 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() fails. Spotted by coverity. Bugfix on 0.2.3.1. + - Fix a rare memory leak when checking the nodelist without it being + present. Found by coverity. Bugfix on 0.2.3.1. o Code simplifications and refactoring: - Remove a dead variable in the heartbeat log code. Spotted by coverity. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 0856b31..8cded8f 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -342,11 +342,13 @@ nodelist_assert_ok(void) { routerlist_t *rl = router_get_routerlist(); networkstatus_t *ns = networkstatus_get_latest_consensus(); - digestmap_t *dm = digestmap_new(); + digestmap_t *dm; if (!the_nodelist) return; + dm = digestmap_new(); + /* every routerinfo in rl->routers should be in the nodelist. */ if (rl) { SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {

1 0

[tor/master] tweak coverity_master changes file
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 2fd56030574730549c7546bd54d1ec94ee308ed0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 20:29:10 2011 -0400 tweak coverity_master changes file --- changes/coverity_master | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 784dec3..43ce1fd 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,8 +1,8 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() - fails. Spotted by coverity. Bugfix on 0.2.3.1. + fails. Spotted by coverity. Bugfix on 0.2.3.1-alppa. - Fix a rare memory leak when checking the nodelist without it being - present. Found by coverity. Bugfix on 0.2.3.1. + present. Found by coverity. Bugfix on 0.2.3.1-alpha. o Code simplifications and refactoring: - Remove a dead variable in the heartbeat log code. Spotted by coverity.

1 0

[flashproxy/master] Fix further syntax error in f23dc0aa, thanks rransom.
by dcf＠torproject.org 08 Jun '11

08 Jun '11

commit f1f8f33074f2d03dced8676dcfb213fb5b9262af Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 8 13:53:33 2011 -0700 Fix further syntax error in f23dc0aa, thanks rransom. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index c2c648e..27fff61 100755 --- a/connector.py +++ b/connector.py @@ -386,7 +386,7 @@ while True: remotes.remove(fd) fd.close() else: - log(u"Data from unconnected remote %s (%d bytes)." % format_addr(fd.getpeername()), len(data)) + log(u"Data from unconnected remote %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) fd.buf += data if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername())))

1 0

[tor/maint-0.2.2] remove some dead code, found by coverity
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit db7dd3ee7a07d9bc121d1c8f353e206327bb72c5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 20:02:16 2011 +0200 remove some dead code, found by coverity --- changes/coverity_maint | 3 +++ src/or/rephist.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint new file mode 100644 index 0000000..ec25d09 --- /dev/null +++ b/changes/coverity_maint @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Remove some dead code as indicated by coverity. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 6be8484..242fe81 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2401,8 +2401,7 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); stat->processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */ - stat->mean_num_cells_in_queue = interval_length == 0 ? 0.0 : - (double) orcirc->total_cell_waiting_time / + stat->mean_num_cells_in_queue = (double) orcirc->total_cell_waiting_time / (double) interval_length / 1000.0 / 2.0; stat->mean_time_cells_in_queue = (double) orcirc->total_cell_waiting_time /

1 0

[tor/maint-0.2.2] Remove a few dead assignments during router parsing
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit e6fff7235e46b794cd77af516a1ecfab9c87de7f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:16:11 2011 +0200 Remove a few dead assignments during router parsing --- changes/coverity_maint | 1 + src/or/routerparse.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index 1bd1c41..fd8c440 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -1,5 +1,6 @@ o Code simplifications and refactoring: - Remove some dead code as indicated by coverity. + - Remove a few dead assignments during router parsing. Found by coverity. o Minor bugfixes: - Add some forgotten return value checks during unit tests. Found by coverity. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f855f9d..42dbcac 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1544,10 +1544,10 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO))) + if (find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO)) router->caches_extra_info = 1; - if ((tok = find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS))) + if (find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS)) router->allow_single_hop_exits = 1; if ((tok = find_opt_by_keyword(tokens, K_EXTRA_INFO_DIGEST))) { @@ -1560,7 +1560,7 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR))) { + if (find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR)) { router->wants_to_be_hs_dir = 1; }

1 0

[tor/maint-0.2.2] Check some more return values in unit tests
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit ff75e8b02dbf35c2ecc82ffd4d2b2112a144322e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:06:01 2011 +0200 Check some more return values in unit tests --- changes/coverity_maint | 3 +++ src/test/test_addr.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index ec25d09..1bd1c41 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -1,3 +1,6 @@ o Code simplifications and refactoring: - Remove some dead code as indicated by coverity. + o Minor bugfixes: + - Add some forgotten return value checks during unit tests. Found + by coverity. diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 6db4ee2..1dab0e0 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -436,13 +436,16 @@ test_addr_ip6_helpers(void) /* test tor_addr_parse_mask_ports */ test_addr_mask_ports_parse("[::f]/17:47-95", AF_INET6, 0, 0, 0, 0x0000000f, 17, 47, 95); + test_streq(p1, "::f"); //test_addr_parse("[::fefe:4.1.1.7/120]:999-1000"); //test_addr_parse_check("::fefe:401:107", 120, 999, 1000); test_addr_mask_ports_parse("[::ffff:4.1.1.7]/120:443", AF_INET6, 0, 0, 0x0000ffff, 0x04010107, 120, 443, 443); + test_streq(p1, "::ffff:4.1.1.7"); test_addr_mask_ports_parse("[abcd:2::44a:0]:2-65000", AF_INET6, 0xabcd0002, 0, 0, 0x044a0000, 128, 2, 65000); + test_streq(p1, "abcd:2::44a:0"); r=tor_addr_parse_mask_ports("[fefef::]/112", &t1, NULL, NULL, NULL); test_assert(r == -1); r=tor_addr_parse_mask_ports("efef::/112", &t1, NULL, NULL, NULL);

1 0

[tor/maint-0.2.2] Don't use signed 1-bit bitfields
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit 680646e0de29454f92d57bc3a4895d75c95e158c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:27:32 2011 +0200 Don't use signed 1-bit bitfields This was harmless, we never compared it to anything but itself or 0. But Coverity complained, and it had a point. --- changes/coverity_maint | 1 + src/or/policies.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index fd8c440..6d60355 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -4,4 +4,5 @@ o Minor bugfixes: - Add some forgotten return value checks during unit tests. Found by coverity. + - Don't use 1-bit wide signed bit fields. Found by coverity. diff --git a/src/or/policies.c b/src/or/policies.c index e48f420..c870360 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -45,7 +45,7 @@ typedef struct policy_summary_item_t { uint16_t prt_max; /**< Highest port number to accept/reject. */ uint64_t reject_count; /**< Number of IP-Addresses that are rejected to this port range. */ - int accepted:1; /** Has this port already been accepted */ + unsigned int accepted:1; /** Has this port already been accepted */ } policy_summary_item_t; /** Private networks. This list is used in two places, once to expand the

1 0

[tor/maint-0.2.2] Comment out some obviously dead code.
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit 9e56ac27da80969fadaad7eaf64a8384e68a778e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:23:05 2011 +0200 Comment out some obviously dead code. Coverity warned about it, it's harmless to comment out. --- src/or/circuitlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 4ad244d..8534c38 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -775,8 +775,8 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn) return found->circuit; return NULL; - /* The rest of this checks for bugs. Disabled by default. */ + /* We comment it out because coverity complains otherwise. { circuit_t *circ; for (circ=global_circuitlist;circ;circ = circ->next) { @@ -795,7 +795,7 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn) } } return NULL; - } + } */ } /** Return a circ such that:

1 0