- tor-commits - lists.torproject.org

[torspec/master] Cleanup: changes introduced on 0.2.3.11-alpha were listed as 0.2.3.2-alpha
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit c4402e05e4d2d8c628ed8d5f7e5acc4d133a266b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 16:52:51 2012 -0500 Cleanup: changes introduced on 0.2.3.11-alpha were listed as 0.2.3.2-alpha --- control-spec.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 60a5bc0..66088f7 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1210,7 +1210,7 @@ The path is provided only when the circuit has been extended at least one hop. - The "BUILD_FLAGS" field is provided only in versions 0.2.3.2-alpha + The "BUILD_FLAGS" field is provided only in versions 0.2.3.11-alpha and later. Clients MUST accept build flags not listed above. Build flags are defined as follows: @@ -1233,7 +1233,7 @@ CONTROLLER (circuit built by a controller) The "HS_STATE" field is provided only for hidden-service circuits, - and only in versions 0.2.3.2-alpha and later. Clients MUST accept + and only in versions 0.2.3.11-alpha and later. Clients MUST accept hidden-service circuit states not listed above. Hidden-service circuit states are defined as follows: @@ -1257,7 +1257,7 @@ HSSR_JOINED (connected to client's RP circuit) The "REND_QUERY" field is provided only for hidden-service-related - circuits, and only in versions 0.2.3.2-alpha and later. Clients + circuits, and only in versions 0.2.3.11-alpha and later. Clients MUST accept hidden service addresses in formats other than that specified above.

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 Jan '12

16 Jan '12

commit 2530324971f7651c200ec8726635f938a143c006 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 21:15:04 2012 +0000 Update translations for gettor --- ru/gettor.po | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 10 deletions(-) diff --git a/ru/gettor.po b/ru/gettor.po index cd0701d..c76d6bf 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-16 20:41+0000\n" +"PO-Revision-Date: 2012-01-16 21:02+0000\n" "Last-Translator: Valerij Ler <lerkru(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Привет, это \"GetTor\" робот." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Спасибо за запрос" #: lib/gettor/i18n.py:31 msgid "" @@ -33,6 +33,9 @@ msgid "" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." msgstr "" +"К сожалению мы не ответин на ваш почтовый запрос. Вам \n" +"необходимо иметь аккаунт GMAIL.COM, YAHOO.COM или YAHOO.CN \n" +"и отправить письмо с одного из них." #: lib/gettor/i18n.py:35 msgid "" @@ -40,9 +43,9 @@ msgid "" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." msgstr "" -"We only process requests from email services that support \"DKIM\",\n" -"which is an email feature that lets us verify that the address in the\n" -"\"From\" line is actually the one who sent the mail." +"Мы обрабатываем запросы с почтовых служб которые поддерживают \n" +"\"DKIM\", это свойство письма, которое позволяет позволяет удос что \n" +"поле \"От кого\" содержит настоящего отправителя письма." #: lib/gettor/i18n.py:39 msgid "" @@ -50,6 +53,10 @@ msgid "" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" msgstr "" +"(Мы просим прощения за то что не отвечаем на это письмо. Т.к. ваше\n" +"письмо пришло с почтового ящика не поддерживающего DKIM, мы \n" +"отошлем короткое объяснение, а в дальнейшем данный почтовый \n" +"адрес будет игнорироваться.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" @@ -69,18 +76,29 @@ msgid "" " linux-x86_64\n" " source" msgstr "" +"Мы пришлем вам пакет Tor, если вы укажете какой хотите получить.\n" +"Пожалуйста выберите один из следующих пакетов:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" #: lib/gettor/i18n.py:56 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "" +msgstr "Пожалуйста ответь на это письмо в котором укажите имя одного пакета." #: lib/gettor/i18n.py:59 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" msgstr "" +"ПОЛУЧЕНИЕ ЛОКАЛИЗОВАННОЙ ВЕРСИИ TOR.\n" +"======================================" #: lib/gettor/i18n.py:62 msgid "" @@ -89,6 +107,10 @@ msgid "" "\n" " gettor+fa(a)torproject.org" msgstr "" +"Чтобы получить версию Tor на вашем родном языке укажите \n" +"нужный язык в адресе письма:\n" +"\n" +" gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" @@ -99,11 +121,11 @@ msgstr "" #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "" +msgstr "Список поддерживаемых локалей:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" -msgstr "" +msgstr "Ниже приведен список доступных языков:" #: lib/gettor/i18n.py:75 msgid "" @@ -119,10 +141,21 @@ msgid "" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" msgstr "" +" gettor+ar(a)torproject.org: Арабский\n" +" gettor+de(a)torproject.org: Немецкий\n" +" gettor+en(a)torproject.org: Английский\n" +" gettor+es(a)torproject.org: Испанский\n" +" gettor+fa(a)torproject.org: Фарси (Иран)\n" +" gettor+fr(a)torproject.org: Французский\n" +" gettor+it(a)torproject.org: Итальянский\n" +" gettor+nl(a)torproject.org: Немецкий\n" +" gettor+pl(a)torproject.org: Польский\n" +" gettor+ru(a)torproject.org: Русский\n" +" gettor+zh(a)torproject.org: Китайский" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." -msgstr "" +msgstr "Если вы не выберите язык, то загрузится английская версия." #: lib/gettor/i18n.py:89 msgid "" @@ -198,6 +231,8 @@ msgid "" "SUPPORT\n" "=======" msgstr "" +"ПОДДЕРЖКА\n" +"=======" #: lib/gettor/i18n.py:133 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 Jan '12

16 Jan '12

commit b332429b96af0c9d01c868f50b63967c2b49891a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:45:04 2012 +0000 Update translations for gettor --- ru/gettor.po | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ru/gettor.po b/ru/gettor.po index 2ac98d0..cd0701d 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -4,13 +4,14 @@ # # Translators: # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# Valerij Ler <lerkru(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2010-11-30 05:01+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-16 20:41+0000\n" +"Last-Translator: Valerij Ler <lerkru(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,6 +40,9 @@ msgid "" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." msgstr "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." #: lib/gettor/i18n.py:39 msgid ""

1 0

[obfsproxy/master] Correctly check the return value of proto_conn_create().
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit f3726bdd5e782fc3c59645f096e337bb19b4608e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jan 16 16:15:44 2012 +0200 Correctly check the return value of proto_conn_create(). --- src/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network.c b/src/network.c index 86d46e7..3e15503 100644 --- a/src/network.c +++ b/src/network.c @@ -516,7 +516,7 @@ open_outbound(conn_t *conn, bufferevent_data_cb readcb) } newconn = proto_conn_create(conn->cfg); - if (!conn) { + if (!newconn) { log_warn("%s: failed to allocate state for outbound connection", conn->peername); bufferevent_free(buf); @@ -570,7 +570,7 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, int port) return NULL; } newconn = proto_conn_create(conn->cfg); - if (!conn) { + if (!newconn) { log_warn("%s: failed to allocate state for outbound connection", conn->peername); bufferevent_free(buf);

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4916'
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit d54f1221faf1da44360a14da50096ce47485a963 Merge: c24f24b f3726bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 15:48:03 2012 -0500 Merge remote-tracking branch 'asn/bug4916' src/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[obfsproxy/master] Fix target of sizeof in pending_socks_cb().
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit c24f24b5647e9816f2ce76e265edd6091dc7abe3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 15:43:24 2012 -0500 Fix target of sizeof in pending_socks_cb(). --- src/network.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/network.c b/src/network.c index bdf64c3..99b40b5 100644 --- a/src/network.c +++ b/src/network.c @@ -941,7 +941,7 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) if (what & BEV_EVENT_CONNECTED) { struct sockaddr_storage ss; struct sockaddr *sa = (struct sockaddr*)&ss; - socklen_t slen = sizeof(&ss); + socklen_t slen = sizeof(ss); obfs_assert(!circ->is_flushing);

1 0

[obfsproxy/master] Set peername in open_outbound_hostname().
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 64af18df7dc39915be9fb9a5f22ad1d8ab76d4ca Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jan 16 19:20:17 2012 +0200 Set peername in open_outbound_hostname(). --- src/network.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/network.c b/src/network.c index 86d46e7..bb9ce83 100644 --- a/src/network.c +++ b/src/network.c @@ -563,6 +563,7 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, int port) struct event_base *base = bufferevent_get_base(conn->buffer); struct bufferevent *buf; conn_t *newconn; + obfs_assert((port >= 0) && (port <= 65535)); buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); if (!buf) { @@ -576,7 +577,29 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, int port) bufferevent_free(buf); return NULL; } + + /* associate bufferevent with the new connection. */ newconn->buffer = buf; + + { /* set up temporary FQDN peername. When we connect to the host, we + will replace this peername with the IP address we connected + to. */ + + /* '6' is strlen(":65535") + '1' is the ending NUL. */ + const size_t peername_len = strlen(addr) + 6 + 1; + newconn->peername = xzalloc(peername_len); + if (obfs_snprintf(newconn->peername, peername_len, "%s:%d", + addr, port) < 0) { + log_warn("Failed while writing peername (%s:%u)! This might be a bug.", + addr, port); + free(newconn->peername); + newconn->peername = NULL; + conn_free(newconn); + return NULL; + } + } + bufferevent_setcb(buf, downstream_read_cb, NULL, pending_socks_cb, newconn); if (bufferevent_socket_connect_hostname(buf, get_evdns_base(), af, addr, port) < 0) { @@ -923,9 +946,20 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) /* Figure out where we actually connected to, and tell the socks client */ if (getpeername(bufferevent_getfd(bev), sa, &slen) == 0) { + char *peername = printable_address(sa, slen); socks_state_set_address(socks, sa); - if (!down->peername) - down->peername = printable_address(sa, slen); + + /* We have to update our connection's peername. If it was an + FQDN SOCKS request, the current peername contains the FQDN + string, and we want to replace it with the actual IP address + we connected to. */ + if (down->peername) { + log_debug("We connected to our SOCKS destination! " + "Replacing peername '%s' with '%s'", + down->peername, peername); + free(down->peername); + } + down->peername = peername; } socks_send_reply(socks, bufferevent_get_output(up->buffer), 0);

1 0

[obfsproxy/master] Don't use 'int' to store TCP ports. 'uint16_t' is nicer.
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 4599120dd5e6ebba4fda2b1d4a9e912a638e7e8e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jan 16 19:21:48 2012 +0200 Don't use 'int' to store TCP ports. 'uint16_t' is nicer. 'uint16_t' also makes our asserts look more reasonable. --- src/network.c | 7 ++++--- src/socks.c | 5 +++-- src/socks.h | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/network.c b/src/network.c index 4cdd059..a28f7b8 100644 --- a/src/network.c +++ b/src/network.c @@ -559,7 +559,7 @@ open_outbound(conn_t *conn, bufferevent_data_cb readcb) rather than bufferevent_socket_connect. */ static conn_t * -open_outbound_hostname(conn_t *conn, int af, const char *addr, int port) +open_outbound_hostname(conn_t *conn, int af, const char *addr, uint16_t port) { struct event_base *base = bufferevent_get_base(conn->buffer); struct bufferevent *buf; @@ -604,7 +604,7 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, int port) bufferevent_setcb(buf, downstream_read_cb, NULL, pending_socks_cb, newconn); if (bufferevent_socket_connect_hostname(buf, get_evdns_base(), af, addr, port) < 0) { - log_warn("%s: outbound connection to %s:%d failed: %s", + log_warn("%s: outbound connection to %s:%u failed: %s", conn->peername, addr, port, evutil_socket_error_to_string(EVUTIL_SOCKET_ERROR())); conn_free(newconn); @@ -638,7 +638,8 @@ socks_read_cb(struct bufferevent *bev, void *arg) /* We shouldn't be here. */ obfs_abort(); } else if (status == ST_HAVE_ADDR) { - int af, r, port; + int af, r; + uint16_t port; const char *addr=NULL; r = socks_state_get_address(socks, &af, &addr, &port); obfs_assert(r==0); diff --git a/src/socks.c b/src/socks.c index 98cb678..e76a24e 100644 --- a/src/socks.c +++ b/src/socks.c @@ -569,7 +569,7 @@ int socks_state_get_address(const socks_state_t *state, int *af_out, const char **addr_out, - int *port_out) + uint16_t *port_out) { if (state->state != ST_HAVE_ADDR && state->state != ST_SENT_REPLY) return -1; @@ -586,9 +586,10 @@ socks_state_get_address(const socks_state_t *state, int socks_state_set_address(socks_state_t *state, const struct sockaddr *sa) { - int port; + uint16_t port; if (sa->sa_family == AF_INET) { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; + obfs_assert((sin->sin_port >= 0) && (sin->sin_port <= 65535)); port = sin->sin_port; if (evutil_inet_ntop(AF_INET, &sin->sin_addr, state->parsereq.addr, sizeof(state->parsereq.addr)) == NULL) diff --git a/src/socks.h b/src/socks.h index 4e0bdfa..384838f 100644 --- a/src/socks.h +++ b/src/socks.h @@ -38,7 +38,7 @@ enum socks_status_t socks_state_get_status(const socks_state_t *state); int socks_state_get_address(const socks_state_t *state, int *af_out, const char **addr_out, - int *port_out); + uint16_t *port_out); int socks_state_set_address(socks_state_t *state, const struct sockaddr *sa); void socks_send_reply(socks_state_t *state, struct evbuffer *dest, int error); void socks5_send_reply(struct evbuffer *reply_dest, @@ -91,7 +91,7 @@ void socks5_send_reply(struct evbuffer *reply_dest, struct parsereq { int af; /* Address family */ char addr[255+1]; /* Address as string */ - int port; + uint16_t port; }; struct socks_state_t { enum socks_status_t state;

1 0

[obfsproxy/master] Remove some now-always-true asserts. GCC errors about them
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 80b6ad804d8a7fe4a3369f2dc08b73f8b6d62da9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 15:39:04 2012 -0500 Remove some now-always-true asserts. GCC errors about them --- src/network.c | 1 - src/socks.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/network.c b/src/network.c index a28f7b8..bdf64c3 100644 --- a/src/network.c +++ b/src/network.c @@ -564,7 +564,6 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, uint16_t port) struct event_base *base = bufferevent_get_base(conn->buffer); struct bufferevent *buf; conn_t *newconn; - obfs_assert((port >= 0) && (port <= 65535)); buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); if (!buf) { diff --git a/src/socks.c b/src/socks.c index e76a24e..71494ba 100644 --- a/src/socks.c +++ b/src/socks.c @@ -589,7 +589,6 @@ socks_state_set_address(socks_state_t *state, const struct sockaddr *sa) uint16_t port; if (sa->sa_family == AF_INET) { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; - obfs_assert((sin->sin_port >= 0) && (sin->sin_port <= 65535)); port = sin->sin_port; if (evutil_inet_ntop(AF_INET, &sin->sin_addr, state->parsereq.addr, sizeof(state->parsereq.addr)) == NULL)

1 0

[obfsproxy/master] Handle NULL peername in conn_free().
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 679fc24d909141df855936dd989a4b9dc3e16a7b Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jan 16 19:20:59 2012 +0200 Handle NULL peername in conn_free(). --- src/network.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/network.c b/src/network.c index bb9ce83..4cdd059 100644 --- a/src/network.c +++ b/src/network.c @@ -403,7 +403,8 @@ conn_free(conn_t *conn) if (connections) { smartlist_remove(connections, conn); log_debug("Closing connection with %s; %d remaining", - conn->peername, smartlist_len(connections)); + conn->peername ? conn->peername : "'unknown'", + smartlist_len(connections)); } if (conn->peername) free(conn->peername);

1 0