October 2016 - tor-commits - lists.torproject.org

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 18 Oct '16

18 Oct '16

commit 76fc2886d03bca468414d94b94159ceada8f8e9e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 02:48:25 2016 +0000 Update translations for tor-messenger-ircproperties --- gd/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd/irc.properties b/gd/irc.properties index a086a13..4738d08 100644 --- a/gd/irc.properties +++ b/gd/irc.properties @@ -205,4 +205,4 @@ tooltip.serverValue=%1$S (%2$S) # LOCALIZATION NOTE (yes, no): # These are used to turn true/false values into a yes/no response. yes=Yes -no=No +no=Chan eil

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 18 Oct '16

18 Oct '16

commit 6caf67a0d6b0c5d6243cd344ca8ee238edc1e08a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 02:47:40 2016 +0000 Update translations for tor-messenger-authdtd --- gd/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd/auth.dtd b/gd/auth.dtd index 8df5727..08beb5b 100644 --- a/gd/auth.dtd +++ b/gd/auth.dtd @@ -3,7 +3,7 @@ <!ENTITY authDialog.cancel "Cancel"> <!ENTITY authDialog.help "Help"> <!ENTITY authDialog.yes "Yes"> -<!ENTITY authDialog.no "No"> +<!ENTITY authDialog.no "Chan eil"> <!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> <!ENTITY authDialog.yourFingerprint "Your fingerprint"> <!ENTITY authDialog.theirFingerprint "Their purported fingerprint">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 18 Oct '16

18 Oct '16

commit bfc31cd150f7ddf3e9b71e57a611006ad86ec2f7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 02:46:24 2016 +0000 Update translations for tor-launcher-network-settings --- gd/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd/network-settings.dtd b/gd/network-settings.dtd index 0d2e9dc..cd71b2f 100644 --- a/gd/network-settings.dtd +++ b/gd/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "Chan eil"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 18 Oct '16

18 Oct '16

commit 3a4c6ba3ce0700a5be5600886a6a9de3dfdb5f60 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 02:45:52 2016 +0000 Update translations for tails-greeter --- gd/gd.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gd/gd.po b/gd/gd.po index 2095990..4ca3f22 100644 --- a/gd/gd.po +++ b/gd/gd.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-05 19:35+0200\n" +"POT-Creation-Date: 2016-09-02 14:43+0200\n" "PO-Revision-Date: 2012-10-03 17:36+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n" @@ -43,7 +43,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:7 msgid "No" -msgstr "" +msgstr "Chan eil" #: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" @@ -145,7 +145,7 @@ msgstr "" msgid " " msgstr "" -#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 +#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45 msgid "Language" msgstr "" @@ -180,7 +180,7 @@ msgid "" "%(stderr)s" msgstr "" -#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167 -#: ../tailsgreeter/langpanel.py:200 +#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169 +#: ../tailsgreeter/langpanel.py:202 msgid "Other..." msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Oct '16

18 Oct '16

commit b20b084dc4be92094d322737956d7808d61c3537 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 02:45:30 2016 +0000 Update translations for https_everywhere --- gd/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gd/ssl-observatory.dtd b/gd/ssl-observatory.dtd index 69f1cfd..9498119 100644 --- a/gd/ssl-observatory.dtd +++ b/gd/ssl-observatory.dtd @@ -1,7 +1,7 @@  <!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> <!ENTITY ssl-observatory.popup.later "Ask Me Later"> -<!ENTITY ssl-observatory.popup.no "No"> +<!ENTITY ssl-observatory.popup.no "Chan eil"> <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks against your browser by sending the certificates you receive to the

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Oct '16

18 Oct '16

commit bbb1471a021deb710dcf34daa3f18ca984037faf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 02:45:04 2016 +0000 Update translations for bridgedb --- gd/LC_MESSAGES/bridgedb.po | 70 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/gd/LC_MESSAGES/bridgedb.po b/gd/LC_MESSAGES/bridgedb.po index 8355c22..84d43a8 100644 --- a/gd/LC_MESSAGES/bridgedb.po +++ b/gd/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-08-24 22:53+0000\n" +"PO-Revision-Date: 2016-10-19 02:32+0000\n" "Last-Translator: Mairi Macleod <mairi_mac9(a)hotmail.com>\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr "Còd Tùsail" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "Clar-atharraich" #: bridgedb/https/templates/base.html:88 msgid "Contact" @@ -56,11 +56,11 @@ msgstr "Tagh e uile" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Seall Còd-QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "Còd-QR airson do loidhnichean-drochaid" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -69,11 +69,11 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Obh obh, brochan lom!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Tha e coltach gu bheil mearachd air a bhith ann a' faighinn do Chòd-QR." #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -83,19 +83,19 @@ msgstr "" #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "'S dòcha gum bu chòir dhut %s dol air ais %s fheuchainn agus drochaid eadar-dhealaichte a thaghadh!" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Ceum %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format @@ -105,22 +105,22 @@ msgstr "" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Ceum %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Faigh %s drochaidean %s" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Ceum %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -137,11 +137,11 @@ msgstr "" #: bridgedb/https/templates/options.html:86 msgid "No" -msgstr "" +msgstr "Chan eil" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "Chan eil gin" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -149,7 +149,7 @@ msgstr "" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sT%sha!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -157,7 +157,7 @@ msgstr "" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sF%saigh Drochaidean" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -165,7 +165,7 @@ msgstr "" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "Seo do dhrochaidean:" #: bridgedb/strings.py:47 #, python-format @@ -182,7 +182,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Failte gu DrochaidDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 @@ -192,15 +192,15 @@ msgstr "" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Hai, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "" +msgstr "Hallo a charaid!" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" -msgstr "" +msgstr "Iuchairichean Poblach" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -250,7 +250,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "De a th' ann an drochaidean?" #: bridgedb/strings.py:102 #, python-format @@ -259,7 +259,7 @@ msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Tha feum agam air dòigh eile drochaidean fhaighinn!" #: bridgedb/strings.py:108 #, python-format @@ -271,13 +271,13 @@ msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Chan eil mo dhrochaidean ag obair! Tha feum agam air cuideachadh!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Mar nach eil an Tor agad ag obair, bu chòir dhut post-dealain a chur %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -291,11 +291,11 @@ msgstr "" #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Seo do loidhnichean-drochaid:" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "Faigh Drochaidean!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" @@ -303,16 +303,16 @@ msgstr "" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "A bheil feum agad air seòlaidhean IPv6?" #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Am feum thu %s?" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dòigh cheart." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." @@ -320,7 +320,7 @@ msgstr "" #: bridgedb/strings.py:144 msgid "How to start using your bridges" -msgstr "" +msgstr "Mar a thòisicheas tu a' cleachdadh do dhrochaidean" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: bridgedb/strings.py:146 @@ -356,18 +356,18 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "Seall an teachdaireachd seo." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "Faighnich airson drochaidean vanilla." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Faighnich airson drochaidean IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174

1 0

[tor/master] Module docs for channel.c and channeltls.c
by nickm＠torproject.org 18 Oct '16

18 Oct '16

commit 35df48b189f513a456c90b5418ddab027079d507 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 17 14:23:53 2016 -0400 Module docs for channel.c and channeltls.c --- src/or/channel.c | 26 ++++++++++++++++++++++++++ src/or/channeltls.c | 22 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/src/or/channel.c b/src/or/channel.c index 6a78b21..f547aea 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -8,6 +8,32 @@ * transfer cells from Tor instance to Tor instance. * Currently, there is only one implementation of the channel abstraction: in * channeltls.c. + * + * Channels are a higher-level abstraction than or_connection_t: In general, + * any means that two Tor relays use to exchange cells, or any means that a + * relay and a client use to exchange cells, is a channel. + * + * Channels differ from pluggable transports in that they do not wrap an + * underlying protocol over which cells are transmitted: they are the + * underlying protocol. + * + * This module defines the generic parts of the channel_t interface, and + * provides the machinery necessary for specialized implementations to be + * created. At present, there is one specialized implementation in + * channeltls.c, which uses connection_or.c to send cells over a TLS + * connection. + * + * Every channel implementation is responsible for being able to transmit + * cells that are added to it with channel_write_cell() and related functions, + * and to receive incoming cells with the channel_queue_cell() and related + * functions. See the channel_t documentation for more information. + * + * When new cells arrive on a channel, they are passed to cell handler + * functions, which can be set by channel_set_cell_handlers() + * functions. (Tor's cell handlers are in command.c.) + * + * Tor flushes cells to channels from relay.c in + * channel_flush_from_first_active_circuit(). **/ /* diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 9c2411e..09cca95 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -6,6 +6,28 @@ * * \brief A concrete subclass of channel_t using or_connection_t to transfer * cells between Tor instances. + * + * This module fills in the various function pointers in channel_t, to + * implement the channel_tls_t channels as used in Tor today. These channels + * are created from channel_tls_connect() and + * channel_tls_handle_incoming(). Each corresponds 1:1 to or_connection_t + * object, as implemented in connection_or.c. These channels transmit cells + * to the underlying or_connection_t by calling + * connection_or_write_*_cell_to_buf(), and receive cells from the underlying + * or_connection_t when connection_or_process_cells_from_inbuf() calls + * channel_tls_handle_*_cell(). + * + * Here we also implement the server (responder) side of the v3+ Tor link + * handshake, which uses CERTS and AUTHENTICATE cell to negotiate versions, + * exchange expected and observed IP and time information, and bootstrap a + * level of authentication higher than we have gotten on the raw TLS + * handshake. + * + * NOTE: Since there is currently only one type of channel, there are probably + * more than a few cases where functionality that is currently in + * channeltls.c, connection_or.c, and channel.c ought to be divided up + * differently. The right time to do this is probably whenever we introduce + * our next channel type. **/ /*

1 0

[tor/master] Turn circuitmux.c comments into module docs.
by nickm＠torproject.org 18 Oct '16

18 Oct '16

commit 56933787d55f74c667f364ae58cd277d79d9fc27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 18 11:17:34 2016 -0400 Turn circuitmux.c comments into module docs. --- src/or/circuitmux.c | 89 ++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 038904e..96a3647 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -4,49 +4,20 @@ /** * \file circuitmux.c * \brief Circuit mux/cell selection abstraction - **/ - -#include "or.h" -#include "channel.h" -#include "circuitlist.h" -#include "circuitmux.h" -#include "relay.h" - -/* - * Private typedefs for circuitmux.c - */ - -/* - * Map of muxinfos for circuitmux_t to use; struct is defined below (name - * of struct must match HT_HEAD line). - */ -typedef struct chanid_circid_muxinfo_map chanid_circid_muxinfo_map_t; - -/* - * Hash table entry (yeah, calling it chanid_circid_muxinfo_s seems to - * break the hash table code). - */ -typedef struct chanid_circid_muxinfo_t chanid_circid_muxinfo_t; - -/* - * Anything the mux wants to store per-circuit in the map; right now just - * a count of queued cells. - */ - -typedef struct circuit_muxinfo_s circuit_muxinfo_t; - -/* - * Structures for circuitmux.c - */ - -/* - * A circuitmux is a collection of circuits; it tracks which subset - * of the attached circuits are 'active' (i.e., have cells available - * to transmit) and how many cells on each. It expoes three distinct + * + * A circuitmux is responsible for MUltipleXing all of the + * circuits that are writing on a single channel. It keeps track of which of + * these circuits has something to write (aka, "active" circuits), and which + * one should write next. A circuitmux corresponds 1:1 with a channel. + * + * There can be different implementations of the circuitmux's rules (which + * decide which circuit is next to write). + * + * A circuitmux exposes three distinct * interfaces to other components: * * To channels, which each have a circuitmux_t, the supported operations - * are: + * (invoked from relay.c) are: * * circuitmux_get_first_active_circuit(): * @@ -74,7 +45,9 @@ typedef struct circuit_muxinfo_s circuit_muxinfo_t; * * circuitmux_set_num_cells(): * - * Set the circuitmux's cell counter for this circuit. + * Set the circuitmux's cell counter for this circuit. One of + * circuitmuc_clear_num_cells() or circuitmux_set_num_cells() MUST be + * called when the number of cells queued on a circuit changes. * * See circuitmux.h for the circuitmux_policy_t data structure, which contains * a table of function pointers implementing a circuit selection policy, and @@ -94,7 +67,39 @@ typedef struct circuit_muxinfo_s circuit_muxinfo_t; * * Install a policy on a circuitmux_t; the appropriate callbacks will be * made to attach all existing circuits to the new policy. - * + **/ + +#include "or.h" +#include "channel.h" +#include "circuitlist.h" +#include "circuitmux.h" +#include "relay.h" + +/* + * Private typedefs for circuitmux.c + */ + +/* + * Map of muxinfos for circuitmux_t to use; struct is defined below (name + * of struct must match HT_HEAD line). + */ +typedef struct chanid_circid_muxinfo_map chanid_circid_muxinfo_map_t; + +/* + * Hash table entry (yeah, calling it chanid_circid_muxinfo_s seems to + * break the hash table code). + */ +typedef struct chanid_circid_muxinfo_t chanid_circid_muxinfo_t; + +/* + * Anything the mux wants to store per-circuit in the map; right now just + * a count of queued cells. + */ + +typedef struct circuit_muxinfo_s circuit_muxinfo_t; + +/* + * Structures for circuitmux.c */ struct circuitmux_s {

1 0

[tor/master] Turn replaycache.c module doc into doxygen
by nickm＠torproject.org 18 Oct '16

18 Oct '16

commit 439654012964fa8cd4e2dac926e2dddd45295c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 18 12:31:50 2016 -0400 Turn replaycache.c module doc into doxygen --- src/or/replaycache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/replaycache.c b/src/or/replaycache.c index c17cba5..8290fa6 100644 --- a/src/or/replaycache.c +++ b/src/or/replaycache.c @@ -1,7 +1,7 @@ /* Copyright (c) 2012-2016, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -/* +/** * \file replaycache.c * * \brief Self-scrubbing replay cache for rendservice.c

1 0

[tor/master] Module documentation for circuitmux_ewma.c
by nickm＠torproject.org 18 Oct '16

18 Oct '16

commit 84829e336c3f72e4926e90d6f2e58eed0a538bce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 18 11:28:40 2016 -0400 Module documentation for circuitmux_ewma.c --- src/or/circuitmux_ewma.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index 13836cd..5c2ebde 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -4,6 +4,28 @@ /** * \file circuitmux_ewma.c * \brief EWMA circuit selection as a circuitmux_t policy + * + * The "EWMA" in this module stands for the "exponentially weighted moving + * average" of the number of cells sent on each circuit. The goal is to + * prioritize cells on circuits that have been quiet recently, by looking at + * those that have sent few cells over time, prioritizing recent times + * more than older ones. + * + * Specifically, a cell sent at time "now" has weight 1, but a time X ticks + * before now has weight ewma_scale_factor ^ X , where ewma_scale_factor is + * between 0.0 and 1.0. + * + * For efficiency, we do not re-scale these averages every time we send a + * cell: that would be horribly inefficient. Instead, we we keep the cell + * count on all circuits on the same circuitmux scaled relative to a single + * tick. When we add a new cell, we scale its weight depending on the time + * that has elapsed since the tick. We do re-scale the circuits on the + * circuitmux periodically, so that we don't overflow double. + * + * + * This module should be used through the interfaces in circuitmux.c, which it + * implements. + * **/ #define TOR_CIRCUITMUX_EWMA_C_ @@ -28,9 +50,10 @@ /*** Some useful constant #defines ***/ -/*DOCDOC*/ +/** Any halflife smaller than this number of seconds is considered to be + * "disabled". */ #define EPSILON 0.00001 -/*DOCDOC*/ +/** The natural logarithm of 0.5. */ #define LOG_ONEHALF -0.69314718055994529 /*** EWMA structures ***/

1 0