February 2014 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 26 Feb '14

26 Feb '14

commit 8268ae72857aa82520a843e6ee512553cfd68d27 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 26 06:15:23 2014 +0000 Update translations for tails-greeter --- ko/ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index c06fa5d..0df7fd0 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-21 19:40+0100\n" -"PO-Revision-Date: 2014-02-22 09:03+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-26 06:10+0000\n" +"Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +44,7 @@ msgstr "예" #: ../glade/persistencewindow.glade.h:7 msgid "No" -msgstr "아니도" +msgstr "아니오" #: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:"

1 0

r26625: {website} edit george's name (in website/trunk: about/en docs/en)
by George Kadianakis 26 Feb '14

26 Feb '14

Author: asn Date: 2014-02-26 01:06:03 +0000 (Wed, 26 Feb 2014) New Revision: 26625 Modified: website/trunk/about/en/corepeople.wml website/trunk/about/en/volunteers.wml website/trunk/docs/en/pluggable-transports.wml Log: edit george's name Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2014-02-24 21:32:15 UTC (rev 26624) +++ website/trunk/about/en/corepeople.wml 2014-02-26 01:06:03 UTC (rev 26625) @@ -101,7 +101,7 @@ application that provides real-time status information for Tor relays and <a href="https://stem.torproject.org/">Stem</a>, a controller library for interacting with Tor.</dd> - <dt>George Kadianakis, Developer</dt> + <dt>asn, Developer</dt> <dd>Developer of pluggable transports and bridge-scanning resistance.</dd> <dt>Bruce Leidl</dt><dd>Led development of Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2014-02-24 21:32:15 UTC (rev 26624) +++ website/trunk/about/en/volunteers.wml 2014-02-26 01:06:03 UTC (rev 26625) @@ -21,7 +21,7 @@ <dt>Google Summer of Code, 2011</dt><dd> Brandon Wiley - <a href="http://stepthreeprivacy.org/">Blocking-resistant Transport Evaluation Framework</a> -George Kadianakis - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a> +asn - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a> Julien Voisin - <a href="https://mat.boum.org/">Metadata Anonymisation Toolkit</a> Kamran Khan - <a href="http://code.inspirated.com/">GTK+ Frontend and Client Mode Improvements for arm</a> Max - <a href="https://tails.boum.org/todo/TailsGreeter/blog/">Custom GDM3 startup menu, aka. tails-greeter</a> Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2014-02-24 21:32:15 UTC (rev 26624) +++ website/trunk/docs/en/pluggable-transports.wml 2014-02-26 01:06:03 UTC (rev 26625) @@ -43,7 +43,7 @@ <a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/blob/HEAD:…">obfs2</a> and <a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/blob/HEAD:…">obfs3</a> - pluggable transports. Maintained by George Kadianakis. + pluggable transports. Maintained by asn. Status: <a href="../projects/obfsproxy.html.en#download">Deployed</a> </li>

1 0

[check/master] Document /exit-addresses
by arlo＠torproject.org 25 Feb '14

25 Feb '14

commit dc0a3fa8d0ae77b2d2051ba76d4bca29f3d3c97e Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Feb 25 23:24:54 2014 +0000 Document /exit-addresses Link to it from the bulk exporter. --- Readme.md | 6 ++++++ public/bulk.html | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/Readme.md b/Readme.md index 5698fb9..2b2cb71 100644 --- a/Readme.md +++ b/Readme.md @@ -44,6 +44,7 @@ The data that `make start` pulls in will quickly become stale. What you want to Then setup a cron job to run a script like `scripts/cpexits.sh` every hour. Setting up TorDNSEL to get the exit addresses is beyond the scope of this readme. + ## Setup Assuming debian, install the dependencies, @@ -63,6 +64,11 @@ Then you start it up, /etc/init.d/check start +## /exit-addresses + +The production check.tpo symlinks TorDNSEL's state file, `exit-addresses`, +to its `DocumentRoot`. This is to replace what was formerly at exitlist.tpo + ## Capacity planning > 54.7 requests/sec - 47.0 kB/second - 879 B/request diff --git a/public/bulk.html b/public/bulk.html index 70f3f06..0ad4eb6 100644 --- a/public/bulk.html +++ b/public/bulk.html @@ -6,6 +6,9 @@ display: inline; margin-right: 0.4em; } + .exli { + margin-top: 4em; + } {{ end }} {{ define "body" }} <img src="/torcheck/img/tor-on.png" class="onion" /> @@ -26,5 +29,7 @@ </div> </form> + Get the current list of <a href="/exit-addresses">exit addresses</a> outputted by TorDNSEL. Past data can be obtained from the <a href="https://metrics.torproject.org/data.html#exitlist">metrics archive</a>. + {{ end }} {{ define "foot" }}{{ end }} \ No newline at end of file

1 0

[check/master] Display translation names in their language
by arlo＠torproject.org 25 Feb '14

25 Feb '14

commit dcd2a0e506d6350f2989c50f0797a5ed0a0adcee Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Feb 25 22:36:41 2014 +0000 Display translation names in their language Part of trac 10171. --- public/index.html | 2 +- utils.go | 68 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/public/index.html b/public/index.html index eb81799..dec740a 100644 --- a/public/index.html +++ b/public/index.html @@ -90,7 +90,7 @@ {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." | UnEscaped }} {{ end }} - <a id="donate" href="https://www.torproject.org/donate/donate.html">Donate to Support Tor</a> + <a id="donate" href="https://www.torproject.org/donate/donate.html">{{ GetText .Lang "Donate to Support Tor" }}</a> <ul id="links"> <li> <a href="https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml">{{ GetText .Lang "Short User Manual" }}</a> diff --git a/utils.go b/utils.go index d4912e7..1c85b28 100644 --- a/utils.go +++ b/utils.go @@ -125,34 +125,48 @@ type locale struct { } func GetLocaleList(base string) map[string]string { - // TODO: This should be it's own translation file + // populated from https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes haveTranslatedNames := map[string]string{ - "ar": "عربية (Arabiya)", - "bms": "Burmese", - "cs": "česky", - "da": "Dansk", - "de": "Deutsch", - "el": "Ελληνικά (Ellinika)", - "en_US": "English", - "es": "Español", - "et": "Estonian", - "fa_IR": "فارسی (Fārsī)", - "fr": "Français", - "it_IT": "Italiano", - "ja": "日本語 (Nihongo)", - "nb": "Norsk (Bokmål)", - "nl": "Nederlands", - "pl": "Polski", - "pt": "Português", - "pt_BR": "Português do Brasil", - "ro": "Română", - "fi": "Suomi", - "ru": "Русский (Russkij)", - "th": "Thai", - "tr": "Türkçe", - "uk": "українська (Ukrajins\"ka)", - "vi": "Vietnamese", - "zh_CN": "中文(简)", + "ar": "العربية", + "bs": "Bosanski jezik", + "ca": "Català", + "cs": "čeština", + "cy": "Cymraeg", + "da": "Dansk", + "de": "Deutsch", + "el": "ελληνικά", + "es": "Español", + "et": "Eesti", + "eu": "Euskara", + "fa": "فارسی", + "fi": "Suomi", + "fr": "Français", + "gl": "Galego", + "he": "עברית", + "hi": "हिन्दी, हिंदी", + "hr": "Hrvatski jezik", + "hu": "Magyar", + "id": "Bahasa Indonesia", + "it": "Italiano", + "ja": "日本語", + "km": "មែរ", + "kn": "ಕನ್ನಡ", + "ko": "한국어", + "lv": "Latviešu valoda", + "my": "ဗမာစာ", + "nb": "Norsk bokmål", + "nl": "Nederlands", + "pa": "ਪੰਜਾਬੀ", + "pl": "Język polski", + "pt": "Português", + "ru": "русский язык", + "sk": "Slovenčina", + "sl": "Slovenski jezik", + "sr": "српски језик", + "sv": "Svenska", + "th": "ไทย", + "tr": "Türkçe", + "uk": "українська мова", } // for all folders in locale which match a locale from https://www.transifex.com/api/2/languages/

1 0

[tor/release-0.2.4] fold in the next changes entry
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit 8ab7e151dd7d4e09dc67d18748be2b8217236c20 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 25 16:47:52 2014 -0500 fold in the next changes entry --- ChangeLog | 6 ++++++ changes/bug10870 | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index eab2307..ab4e1b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,12 @@ Changes in version 0.2.4.21 - 2014-02-2? since it could also indicate an ENETUNREACH connection error. Fixes part of bug 10777; bugfix on 0.2.4.8-alpha. + o Code simplification and refactoring: + - Remove data structures which were introduced to implement the + CellStatistics option: they are now redundant with the new timestamp + field in the regular packed_cell_t data structure, which we did + in 0.2.4.18-rc in order to resolve bug 9093. Resolves ticket 10870. + o Minor features: - Always clear OpenSSL bignums before freeing them -- even bignums that don't contain secrets. Resolves ticket 10793. Patch by diff --git a/changes/bug10870 b/changes/bug10870 deleted file mode 100644 index d8a00f4..0000000 --- a/changes/bug10870 +++ /dev/null @@ -1,6 +0,0 @@ - o Code simplification and refactoring: - - Remove data structures which were introduced to implement the - CellStatistics option: they are now redundant with the addition - of timestamp to the regular packed_cell_t data structure, which - we did in 0.2.4.18-rc in order to resolve #9093. Fixes bug - 10870. \ No newline at end of file

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Feb '14

25 Feb '14

commit 3b44d2ce28559b5e00148dc8e492b3d1858b3a21 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 25 21:45:32 2014 +0000 Update translations for tor-launcher-network-settings --- lv/network-settings.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lv/network-settings.dtd b/lv/network-settings.dtd index d31d0a4..1fe4e38 100644 --- a/lv/network-settings.dtd +++ b/lv/network-settings.dtd @@ -9,10 +9,10 @@ <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> <!ENTITY torSettings.configurePrompt1 "Šī datora interneta savienojums tiek vai nu cenzēts, vai filtrēts, vai arī realizēts caur starpnieku."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Man jākonfigurē tilta, ugunsmūra vai starpniekservera iestatījumi."> <!ENTITY torSettings.configure "Konfigurēt"> <!ENTITY torSettings.connectPrompt2 "Es vēlos tieši pieslēgties tīklam Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> <!ENTITY torSettings.proxyQuestion "Vai šim datoram ir jālieto starpnieks, lai piekļūtu internetam?"> @@ -50,10 +50,10 @@ <!ENTITY torsettings.copyLog "Kopēt Tor žurnālu starpliktuvē"> <!ENTITY torsettings.bridgeHelpTitle "Palīdzība par tiltu retranslatoriem"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp1B "Šeit ir trīs veidi kā iegūt tilta adreses:"> +<!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> +<!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu lai apmeklētu https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request.">

1 0

[tor/release-0.2.4] bump to 0.2.4.21 since we're getting close
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit 168da9129d3190f396a21ce8dea7e789222c69f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 25 16:38:07 2014 -0500 bump to 0.2.4.21 since we're getting close --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c61af3f..c514eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.20]) +AC_INIT([tor],[0.2.4.21]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index c1f0db8..3d4d4b3 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.20" +!define VERSION "0.2.4.21" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9d108f5..ac355a7 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.20" +#define VERSION "0.2.4.21"

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit c3800f631b7fb837d8eb03cc0edc4d8a6454aef9 Merge: d7950ed 3133cde Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 25 15:58:53 2014 -0500 Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4 changes/bug10870 | 6 ++++ src/or/or.h | 19 ------------- src/or/relay.c | 83 +++++------------------------------------------------- 3 files changed, 13 insertions(+), 95 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit ed960eaa16b23e42e7d959139e0001ef60aaee79 Merge: dab4656 c3800f6 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 25 16:37:44 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10870 | 6 ++++ src/or/or.h | 19 ------------- src/or/relay.c | 83 +++++------------------------------------------------- 3 files changed, 13 insertions(+), 95 deletions(-)

1 0

[tor/release-0.2.4] Excise the insertion_time_elem_t logic
by arma＠torproject.org 25 Feb '14

25 Feb '14

commit 3133cde3c12a814fab4c83ba59d5dfeace397ebc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 13:55:27 2014 -0500 Excise the insertion_time_elem_t logic It's now redundant with the inserted_time field in packed_cell_t Fixes bug 10870. --- changes/bug10870 | 6 ++++ src/or/or.h | 19 ------------- src/or/relay.c | 83 +++++------------------------------------------------- 3 files changed, 13 insertions(+), 95 deletions(-) diff --git a/changes/bug10870 b/changes/bug10870 new file mode 100644 index 0000000..d8a00f4 --- /dev/null +++ b/changes/bug10870 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Remove data structures which were introduced to implement the + CellStatistics option: they are now redundant with the addition + of timestamp to the regular packed_cell_t data structure, which + we did in 0.2.4.18-rc in order to resolve #9093. Fixes bug + 10870. \ No newline at end of file diff --git a/src/or/or.h b/src/or/or.h index 5318b0f..3eaf344 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1081,31 +1081,12 @@ typedef struct packed_cell_t { * bits truncated) when this cell was inserted. */ } packed_cell_t; -/* XXXX This next structure may be obsoleted by inserted_time in - * packed_cell_t */ - -/** Number of cells added to a circuit queue including their insertion - * time on 10 millisecond detail; used for buffer statistics. */ -typedef struct insertion_time_elem_t { - struct insertion_time_elem_t *next; /**< Next element in queue. */ - uint32_t insertion_time; /**< When were cells inserted (in 10 ms steps - * starting at 0:00 of the current day)? */ - unsigned counter; /**< How many cells were inserted? */ -} insertion_time_elem_t; - -/** Queue of insertion times. */ -typedef struct insertion_time_queue_t { - struct insertion_time_elem_t *first; /**< First element in queue. */ - struct insertion_time_elem_t *last; /**< Last element in queue. */ -} insertion_time_queue_t; - /** A queue of cells on a circuit, waiting to be added to the * or_connection_t's outbuf. */ typedef struct cell_queue_t { packed_cell_t *head; /**< The first cell, or NULL if the queue is empty. */ packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty. */ int n; /**< The number of cells in the queue. */ - insertion_time_queue_t *insertion_times; /**< Insertion times of cells. */ } cell_queue_t; /** Beginning of a RELAY cell payload. */ diff --git a/src/or/relay.c b/src/or/relay.c index 63119cb..6e5b12e 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2040,10 +2040,6 @@ static size_t total_cells_allocated = 0; /** A memory pool to allocate packed_cell_t objects. */ static mp_pool_t *cell_pool = NULL; -/** Memory pool to allocate insertion_time_elem_t objects used for cell - * statistics. */ -static mp_pool_t *it_pool = NULL; - /** Allocate structures to hold cells. */ void init_cell_pool(void) @@ -2062,10 +2058,6 @@ free_cell_pool(void) mp_pool_destroy(cell_pool); cell_pool = NULL; } - if (it_pool) { - mp_pool_destroy(it_pool); - it_pool = NULL; - } } /** Free excess storage in cell pool. */ @@ -2154,36 +2146,6 @@ cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell, tor_gettimeofday_cached(&now); copy->inserted_time = (uint32_t)tv_to_msec(&now); - /* Remember the time when this cell was put in the queue. */ - /*XXXX This may be obsoleted by inserted_time */ - if (get_options()->CellStatistics) { - uint32_t added; - insertion_time_queue_t *it_queue = queue->insertion_times; - if (!it_pool) - it_pool = mp_pool_new(sizeof(insertion_time_elem_t), 1024); - -#define SECONDS_IN_A_DAY 86400L - added = (uint32_t)(((now.tv_sec % SECONDS_IN_A_DAY) * 100L) - + ((uint32_t)now.tv_usec / (uint32_t)10000L)); - if (!it_queue) { - it_queue = tor_malloc_zero(sizeof(insertion_time_queue_t)); - queue->insertion_times = it_queue; - } - if (it_queue->last && it_queue->last->insertion_time == added) { - it_queue->last->counter++; - } else { - insertion_time_elem_t *elem = mp_pool_get(it_pool); - elem->next = NULL; - elem->insertion_time = added; - elem->counter = 1; - if (it_queue->last) { - it_queue->last->next = elem; - it_queue->last = elem; - } else { - it_queue->first = it_queue->last = elem; - } - } - } cell_queue_append(queue, copy); } @@ -2200,14 +2162,6 @@ cell_queue_clear(cell_queue_t *queue) } queue->head = queue->tail = NULL; queue->n = 0; - if (queue->insertion_times) { - while (queue->insertion_times->first) { - insertion_time_elem_t *elem = queue->insertion_times->first; - queue->insertion_times->first = elem->next; - mp_pool_release(elem); - } - tor_free(queue->insertion_times); - } } /** Extract and return the cell at the head of queue; return NULL if @@ -2232,9 +2186,7 @@ cell_queue_pop(cell_queue_t *queue) size_t packed_cell_mem_cost(void) { - return sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD + - get_options()->CellStatistics ? - (sizeof(insertion_time_elem_t)+MP_POOL_ITEM_OVERHEAD) : 0; + return sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD; } /** Check whether we've got too much space used for cells. If so, @@ -2413,35 +2365,14 @@ channel_flush_from_first_active_circuit(channel_t *chan, int max) /* Calculate the exact time that this cell has spent in the queue. */ if (get_options()->CellStatistics && !CIRCUIT_IS_ORIGIN(circ)) { + uint32_t msec_waiting; struct timeval tvnow; - uint32_t flushed; - uint32_t cell_waiting_time; - insertion_time_queue_t *it_queue = queue->insertion_times; + or_circ = TO_OR_CIRCUIT(circ); tor_gettimeofday_cached(&tvnow); - flushed = (uint32_t)((tvnow.tv_sec % SECONDS_IN_A_DAY) * 100L + - (uint32_t)tvnow.tv_usec / (uint32_t)10000L); - if (!it_queue || !it_queue->first) { - log_info(LD_GENERAL, "Cannot determine insertion time of cell. " - "Looks like the CellStatistics option was " - "recently enabled."); - } else { - insertion_time_elem_t *elem = it_queue->first; - or_circ = TO_OR_CIRCUIT(circ); - cell_waiting_time = - (uint32_t)((flushed * 10L + SECONDS_IN_A_DAY * 1000L - - elem->insertion_time * 10L) % - (SECONDS_IN_A_DAY * 1000L)); -#undef SECONDS_IN_A_DAY - elem->counter--; - if (elem->counter < 1) { - it_queue->first = elem->next; - if (elem == it_queue->last) - it_queue->last = NULL; - mp_pool_release(elem); - } - or_circ->total_cell_waiting_time += cell_waiting_time; - or_circ->processed_cells++; - } + msec_waiting = ((uint32_t)tv_to_msec(&tvnow)) - cell->inserted_time; + + or_circ->total_cell_waiting_time += msec_waiting; + or_circ->processed_cells++; } /* If we just flushed our queue and this circuit is used for a

1 0