August 2011 - tor-commits - lists.torproject.org

[tor/master] Clean up geoip_dirreq_stats_write().
by nickm＠torproject.org 04 Aug '11

04 Aug '11

commit abeaabba00a8c8e089b71fe8831f3ee5462ba604 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 4 11:52:52 2011 +0200 Clean up geoip_dirreq_stats_write(). We later want to split this function into one function that generates the dirreq-stats string and one that writes it to disk. --- src/or/geoip.c | 171 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 98 insertions(+), 73 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index d02666b..aff636d 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -974,12 +974,16 @@ time_t geoip_dirreq_stats_write(time_t now) { char *statsdir = NULL, *filename = NULL; - char *data_v2 = NULL, *data_v3 = NULL; - char written[ISO_TIME_LEN+1]; open_file_t *open_file = NULL; + char t[ISO_TIME_LEN+1]; double v2_share = 0.0, v3_share = 0.0; FILE *out; int i; + char *v3_ips_string, *v2_ips_string, *v3_reqs_string, *v2_reqs_string, + *v2_share_string = NULL, *v3_share_string = NULL, + *v3_direct_dl_string, *v2_direct_dl_string, + *v3_tunneled_dl_string, *v2_tunneled_dl_string; + char *result; if (!start_of_dirreq_stats_interval) return 0; /* Not initialized. */ @@ -989,35 +993,13 @@ geoip_dirreq_stats_write(time_t now) /* Discard all items in the client history that are too old. */ geoip_remove_old_clients(start_of_dirreq_stats_interval); - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) - goto done; - filename = get_datadir_fname2("stats", "dirreq-stats"); - data_v2 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); - data_v3 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); - format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, - 0600, &open_file); - if (!out) - goto done; - if (fprintf(out, "dirreq-stats-end %s (%d s)\ndirreq-v3-ips %s\n" - "dirreq-v2-ips %s\n", written, - (unsigned) (now - start_of_dirreq_stats_interval), - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) - goto done; - tor_free(data_v2); - tor_free(data_v3); + format_iso_time(t, now); + v2_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); + v3_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); + v2_reqs_string = geoip_get_request_history( + GEOIP_CLIENT_NETWORKSTATUS_V2); + v3_reqs_string = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS); - data_v2 = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS_V2); - data_v3 = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS); - if (fprintf(out, "dirreq-v3-reqs %s\ndirreq-v2-reqs %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) - goto done; - tor_free(data_v2); - tor_free(data_v3); - SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, { - c->n_v2_ns_requests = c->n_v3_ns_requests = 0; - }); #define RESPONSE_GRANULARITY 8 for (i = 0; i < GEOIP_NS_RESPONSE_NUM; i++) { ns_v2_responses[i] = round_uint32_to_next_multiple_of( @@ -1026,61 +1008,104 @@ geoip_dirreq_stats_write(time_t now) ns_v3_responses[i], RESPONSE_GRANULARITY); } #undef RESPONSE_GRANULARITY - if (fprintf(out, "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," - "not-found=%u,not-modified=%u,busy=%u\n", - ns_v3_responses[GEOIP_SUCCESS], - ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS], - ns_v3_responses[GEOIP_REJECT_UNAVAILABLE], - ns_v3_responses[GEOIP_REJECT_NOT_FOUND], - ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED], - ns_v3_responses[GEOIP_REJECT_BUSY]) < 0) - goto done; - if (fprintf(out, "dirreq-v2-resp ok=%u,unavailable=%u," - "not-found=%u,not-modified=%u,busy=%u\n", - ns_v2_responses[GEOIP_SUCCESS], - ns_v2_responses[GEOIP_REJECT_UNAVAILABLE], - ns_v2_responses[GEOIP_REJECT_NOT_FOUND], - ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED], - ns_v2_responses[GEOIP_REJECT_BUSY]) < 0) - goto done; - memset(ns_v2_responses, 0, sizeof(ns_v2_responses)); - memset(ns_v3_responses, 0, sizeof(ns_v3_responses)); + if (!geoip_get_mean_shares(now, &v2_share, &v3_share)) { - if (fprintf(out, "dirreq-v2-share %0.2lf%%\n", v2_share*100) < 0) - goto done; - if (fprintf(out, "dirreq-v3-share %0.2lf%%\n", v3_share*100) < 0) - goto done; + tor_asprintf(&v2_share_string, "dirreq-v2-share %0.2lf%%\n", + v2_share*100); + tor_asprintf(&v3_share_string, "dirreq-v3-share %0.2lf%%\n", + v3_share*100); } - data_v2 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - DIRREQ_DIRECT); - data_v3 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS, - DIRREQ_DIRECT); - if (fprintf(out, "dirreq-v3-direct-dl %s\ndirreq-v2-direct-dl %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) + v2_direct_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_DIRECT); + v3_direct_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_DIRECT); + + v2_tunneled_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS_V2, DIRREQ_TUNNELED); + v3_tunneled_dl_string = geoip_get_dirreq_history( + GEOIP_CLIENT_NETWORKSTATUS, DIRREQ_TUNNELED); + + /* Put everything together into a single string. */ + tor_asprintf(&result, "dirreq-stats-end %s (%d s)\n" + "dirreq-v3-ips %s\n" + "dirreq-v2-ips %s\n" + "dirreq-v3-reqs %s\n" + "dirreq-v2-reqs %s\n" + "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," + "not-found=%u,not-modified=%u,busy=%u\n" + "dirreq-v2-resp ok=%u,unavailable=%u," + "not-found=%u,not-modified=%u,busy=%u\n" + "%s" + "%s" + "dirreq-v3-direct-dl %s\n" + "dirreq-v2-direct-dl %s\n" + "dirreq-v3-tunneled-dl %s\n" + "dirreq-v2-tunneled-dl %s\n", + t, + (unsigned) (now - start_of_dirreq_stats_interval), + v3_ips_string ? v3_ips_string : "", + v2_ips_string ? v2_ips_string : "", + v3_reqs_string ? v3_reqs_string : "", + v2_reqs_string ? v2_reqs_string : "", + ns_v3_responses[GEOIP_SUCCESS], + ns_v3_responses[GEOIP_REJECT_NOT_ENOUGH_SIGS], + ns_v3_responses[GEOIP_REJECT_UNAVAILABLE], + ns_v3_responses[GEOIP_REJECT_NOT_FOUND], + ns_v3_responses[GEOIP_REJECT_NOT_MODIFIED], + ns_v3_responses[GEOIP_REJECT_BUSY], + ns_v2_responses[GEOIP_SUCCESS], + ns_v2_responses[GEOIP_REJECT_UNAVAILABLE], + ns_v2_responses[GEOIP_REJECT_NOT_FOUND], + ns_v2_responses[GEOIP_REJECT_NOT_MODIFIED], + ns_v2_responses[GEOIP_REJECT_BUSY], + v2_share_string ? v2_share_string : "", + v3_share_string ? v3_share_string : "", + v3_direct_dl_string ? v3_direct_dl_string : "", + v2_direct_dl_string ? v2_direct_dl_string : "", + v3_tunneled_dl_string ? v3_tunneled_dl_string : "", + v2_tunneled_dl_string ? v2_tunneled_dl_string : ""); + + /* Free partial strings. */ + tor_free(v3_ips_string); + tor_free(v2_ips_string); + tor_free(v3_reqs_string); + tor_free(v2_reqs_string); + tor_free(v2_share_string); + tor_free(v3_share_string); + tor_free(v3_direct_dl_string); + tor_free(v2_direct_dl_string); + tor_free(v3_tunneled_dl_string); + tor_free(v2_tunneled_dl_string); + + /* Reset history to prepare for the next measurement interval. */ + SMARTLIST_FOREACH(geoip_countries, geoip_country_t *, c, { + c->n_v2_ns_requests = c->n_v3_ns_requests = 0; + }); + memset(ns_v2_responses, 0, sizeof(ns_v2_responses)); + memset(ns_v3_responses, 0, sizeof(ns_v3_responses)); + start_of_dirreq_stats_interval = now; + + /* Write dirreq-stats string to disk. */ + statsdir = get_datadir_fname("stats"); + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; - tor_free(data_v2); - tor_free(data_v3); - data_v2 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS_V2, - DIRREQ_TUNNELED); - data_v3 = geoip_get_dirreq_history(GEOIP_CLIENT_NETWORKSTATUS, - DIRREQ_TUNNELED); - if (fprintf(out, "dirreq-v3-tunneled-dl %s\ndirreq-v2-tunneled-dl %s\n", - data_v3 ? data_v3 : "", data_v2 ? data_v2 : "") < 0) + filename = get_datadir_fname2("stats", "dirreq-stats"); + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE | O_TEXT, + 0600, &open_file); + if (!out) + goto done; + if (fprintf(out, "%s", result) < 0) goto done; - finish_writing_to_file(open_file); open_file = NULL; - start_of_dirreq_stats_interval = now; - done: if (open_file) abort_writing_to_file(open_file); - tor_free(filename); tor_free(statsdir); - tor_free(data_v2); - tor_free(data_v3); + tor_free(filename); + tor_free(result); return start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL; }

1 0

r24941: {website} revert part of r24939, resizing the image is easy I used the (in website/trunk: css images)
by Damian Johnson 04 Aug '11

04 Aug '11

Author: atagar Date: 2011-08-04 15:18:19 +0000 (Thu, 04 Aug 2011) New Revision: 24941 Added: website/trunk/images/tor-logo_small.jpg Modified: website/trunk/css/layout.css Log: revert part of r24939, resizing the image is easy I used the larger image because it looked fine and didn't alter the layout of the page. If the size is really a concern then that's trivial to fix - this makes it the same size as the low resolution version. As for the other concerns mentioned in ticket 3682... - The file size difference is tiny. If you really care about sizes that much then we should run an optimizer on the site to remove unnecessary whitespace in the html. Btw, the file size of this small version is 4.5 KB (vs 4.9 with the big version and 4.0 with the low resolution). - It's simple to lighten the image if that looks better to you. In Gimp just go to "Colors > Brightness-Contrast..." to make it match the old version. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-04 03:18:37 UTC (rev 24940) +++ website/trunk/css/layout.css 2011-08-04 15:18:19 UTC (rev 24941) @@ -43,7 +43,7 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo_low_resolution.jpg) left top no-repeat; + background: url(../images/tor-logo_small.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; width: 150px; Added: website/trunk/images/tor-logo_small.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tor-logo_small.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

2 2

r24945: {} too many tor-logo's floating around. (website/trunk/images)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:48:07 +0000 (Thu, 04 Aug 2011) New Revision: 24945 Removed: website/trunk/images/tor-logo_low_resolution.jpg website/trunk/images/tor-logo_small.jpg Log: too many tor-logo's floating around. Deleted: website/trunk/images/tor-logo_low_resolution.jpg =================================================================== (Binary files differ) Deleted: website/trunk/images/tor-logo_small.jpg =================================================================== (Binary files differ)

1 0

r24944: {} delete the stupid sitemap that google screws up anyway. (website/trunk)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:46:46 +0000 (Thu, 04 Aug 2011) New Revision: 24944 Removed: website/trunk/sitemap.xml Log: delete the stupid sitemap that google screws up anyway. Deleted: website/trunk/sitemap.xml =================================================================== --- website/trunk/sitemap.xml 2011-08-04 17:46:15 UTC (rev 24943) +++ website/trunk/sitemap.xml 2011-08-04 17:46:46 UTC (rev 24944) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<urlset xmlns="http://www.google.com/schemas/sitemap/0.9"> -<url> -<loc>http://www.torproject.org/</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/overview.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/download/download.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/documentation.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/getinvolved/volunteer.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/corepeople.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/donate/donate.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/torusers.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/tor-doc-relay.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/contact.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/trademark-faq.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/press/inthemedia.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/press/press.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -</urlset>

1 0

r24943: {website} use the new tor-logo. (website/trunk/css)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:46:15 +0000 (Thu, 04 Aug 2011) New Revision: 24943 Modified: website/trunk/css/layout.css Log: use the new tor-logo. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-04 17:45:26 UTC (rev 24942) +++ website/trunk/css/layout.css 2011-08-04 17:46:15 UTC (rev 24943) @@ -43,7 +43,7 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo_small.jpg) left top no-repeat; + background: url(../images/tor-logo.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; width: 150px;

1 0

r24942: {website} update the tor logo from #3682. (website/trunk/images)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:45:26 +0000 (Thu, 04 Aug 2011) New Revision: 24942 Modified: website/trunk/images/tor-logo.jpg Log: update the tor logo from #3682. Modified: website/trunk/images/tor-logo.jpg =================================================================== (Binary files differ)

1 0

r24940: {website} make orbot use its own logo, based on feedback from randoms. (website/trunk/en)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 03:18:37 +0000 (Thu, 04 Aug 2011) New Revision: 24940 Modified: website/trunk/en/index.wml Log: make orbot use its own logo, based on feedback from randoms. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-08-04 03:13:52 UTC (rev 24939) +++ website/trunk/en/index.wml 2011-08-04 03:18:37 UTC (rev 24940) @@ -62,18 +62,9 @@ <h3><a href="http://tails.boum.org/">Tails</a></h3> <p>Live CD/USB distribution preconfigured to use Tor safely.</p> </td> -  <td> <a href="https://guardianproject.info/apps/orbot/"><img - src="$(IMGROOT)/icon-Orbot_andoidLogo.jpg" alt="Orbot Icon"></a> + src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> <p>Tor for <a href="https://code.google.com/android/">Google Android</a> devices.</p>

1 0

r24939: {website} revert part of r24933, the new size logo doesn't look right (website/trunk/css)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 03:13:52 +0000 (Thu, 04 Aug 2011) New Revision: 24939 Modified: website/trunk/css/layout.css Log: revert part of r24933, the new size logo doesn't look right compared to the rest of the images. jeremy will look into keeping the image tiny and sized correctly. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-03 00:27:48 UTC (rev 24938) +++ website/trunk/css/layout.css 2011-08-04 03:13:52 UTC (rev 24939) @@ -43,10 +43,10 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo.jpg) left top no-repeat; + background: url(../images/tor-logo_low_resolution.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; - width: 160px; + width: 150px; height: 97px; display: block; }

1 0

[arm/master] fix: dropping nonexistent ORCONN attributes
by atagar＠torproject.org 03 Aug '11

03 Aug '11

commit eb4d0007a65a7cd10d50545dee90c56f6e998c31 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 2 07:39:03 2011 -0700 fix: dropping nonexistent ORCONN attributes The AGE, READ, and WRITTEN attributes of ORCONN don't exist so dropping them from the log panel. --- src/cli/logPanel.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 0b4ab9c..bb47517 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -515,9 +515,6 @@ class TorEventObserver(TorCtl.PostEventListener): def or_conn_status_event(self, event): msg = "STATUS: %-10s ENDPOINT: %-20s" % (event.status, event.endpoint) - if event.age: msg += " AGE: %-3s" % event.age - if event.read_bytes: msg += " READ: %-4i" % event.read_bytes - if event.wrote_bytes: msg += " WRITTEN: %-4i" % event.wrote_bytes if event.reason: msg += " REASON: %-6s" % event.reason if event.ncircs: msg += " NCIRCS: %i" % event.ncircs self._notify(event, msg)

1 0

[arm/master] fix: pausing interface could cause crash
by atagar＠torproject.org 03 Aug '11

03 Aug '11

commit 86325e6d124f0b2e5a4826938f2f493495fed9b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 28 11:25:07 2011 -0700 fix: pausing interface could cause crash Creating the pause buffer for the bandwidth graph could trigger a panel redraw, which in turn attempted to use the uninitialized pause value. --- src/cli/graphing/bandwidthStats.py | 11 ++++++++--- src/util/panel.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index f1891f9..654443c 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -35,7 +35,7 @@ class BandwidthStats(graphPanel.GraphStats): Uses tor BW events to generate bandwidth usage graph. """ - def __init__(self, config=None): + def __init__(self, config=None, isPauseBuffer=False): graphPanel.GraphStats.__init__(self) self.inputConfig = config @@ -56,7 +56,7 @@ class BandwidthStats(graphPanel.GraphStats): # rate/burst and if tor's using accounting conn = torTools.getConn() self._titleStats, self.isAccounting = [], False - self.resetListener(conn, torTools.State.INIT) # initializes values + if not isPauseBuffer: self.resetListener(conn, torTools.State.INIT) # initializes values conn.addStatusListener(self.resetListener) # Initialized the bandwidth totals to the values reported by Tor. This @@ -78,9 +78,14 @@ class BandwidthStats(graphPanel.GraphStats): self.initialSecondaryTotal = int(writeTotal) / 1024 # Bytes -> KB def clone(self, newCopy=None): - if not newCopy: newCopy = BandwidthStats(self.inputConfig) + if not newCopy: newCopy = BandwidthStats(self.inputConfig, True) newCopy.accountingLastUpdated = self.accountingLastUpdated newCopy.accountingInfo = self.accountingInfo + + # attributes that would have been initialized from calling the resetListener + newCopy.isAccounting = self.isAccounting + newCopy._titleStats = self._titleStats + return graphPanel.GraphStats.clone(self, newCopy) def resetListener(self, conn, eventType): diff --git a/src/util/panel.py b/src/util/panel.py index bb47726..732610c 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -186,7 +186,7 @@ class Panel(): """ if not attr in self.pauseAttr: return None - elif self.isPaused(): return self.pauseBuffer[attr] + elif self.paused: return self.pauseBuffer[attr] else: return self.__dict__.get(attr) def copyAttr(self, attr):

1 0