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

[tor/master] Look at all of a RESOLVED cell; not just the first answer.
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit c230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 22:24:48 2014 -0400 Look at all of a RESOLVED cell; not just the first answer. Also, stop accepting the old kind of RESOLVED cells with no TTL fields; they haven't been sent since 0.1.1.6-alpha. This patch won't work without the fix to #10468 -- it will break DNSPorts unless they set the proper ipv4/6 flags on entry_connection_t. --- src/or/connection_edge.c | 7 +- src/or/connection_edge.h | 4 + src/or/relay.c | 269 ++++++++++++++++++++++++++++++++++++++-------- src/or/relay.h | 13 +++ 4 files changed, 241 insertions(+), 52 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 630c3b9..1ecc553 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -62,11 +62,6 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); -static void connection_ap_handshake_socks_resolved_addr( - entry_connection_t *conn, - const tor_addr_t *answer, - int ttl, - time_t expires); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set @@ -2065,7 +2060,7 @@ tell_controller_about_resolved_result(entry_connection_t *conn, * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send * as the answer. */ -static void +void connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, const tor_addr_t *answer, int ttl, diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index e3a95ad..cbca31a 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -50,6 +50,10 @@ void connection_ap_handshake_socks_resolved(entry_connection_t *conn, const uint8_t *answer, int ttl, time_t expires); +void connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, + const tor_addr_t *answer, + int ttl, + time_t expires); int connection_exit_begin_conn(cell_t *cell, circuit_t *circ); int connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ); diff --git a/src/or/relay.c b/src/or/relay.c index 3e28077..ed24397 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1009,74 +1009,252 @@ connected_cell_parse(const relay_header_t *rh, const cell_t *cell, return 0; } -/** DOCDOC */ -static void +/** Drop all storage held by addr. */ +STATIC void +address_ttl_free(address_ttl_t *addr) +{ + if (!addr) + return; + tor_free(addr->hostname); + tor_free(addr); +} + +/** Parse a resolved cell in cell, with parsed header in rh. + * Return -1 on parse error. On success, add one or more newly allocated + * address_ttl_t to addresses_out; set *errcode_out to + * one of 0, RESOLVED_TYPE_ERROR, or RESOLVED_TYPE_ERROR_TRANSIENT, and + * return 0. */ +STATIC int +resolved_cell_parse(const cell_t *cell, const relay_header_t *rh, + smartlist_t *addresses_out, int *errcode_out) +{ + const uint8_t *cp; + uint8_t answer_type; + size_t answer_len; + address_ttl_t *addr; + size_t remaining; + int errcode = 0; + smartlist_t *addrs; + + tor_assert(cell); + tor_assert(rh); + tor_assert(addresses_out); + tor_assert(errcode_out); + + *errcode_out = 0; + + if (rh->length > RELAY_PAYLOAD_SIZE) + return -1; + + addrs = smartlist_new(); + + cp = cell->payload + RELAY_HEADER_SIZE; + + remaining = rh->length; + while (remaining) { + const uint8_t *cp_orig = cp; + if (remaining < 2) + goto err; + answer_type = *cp++; + answer_len = *cp++; + if (remaining < 2 + answer_len + 4) { + goto err; + } + if (answer_type == RESOLVED_TYPE_IPV4) { + if (answer_len != 4) { + goto err; + } + addr = tor_malloc_zero(sizeof(*addr)); + tor_addr_from_ipv4n(&addr->addr, get_uint32(cp)); + cp += 4; + addr->ttl = ntohl(get_uint32(cp)); + cp += 4; + smartlist_add(addrs, addr); + } else if (answer_type == RESOLVED_TYPE_IPV6) { + if (answer_len != 16) + goto err; + addr = tor_malloc_zero(sizeof(*addr)); + tor_addr_from_ipv6_bytes(&addr->addr, (const char*) cp); + cp += 16; + addr->ttl = ntohl(get_uint32(cp)); + cp += 4; + smartlist_add(addrs, addr); + } else if (answer_type == RESOLVED_TYPE_HOSTNAME) { + if (answer_len == 0) { + goto err; + } + addr = tor_malloc_zero(sizeof(*addr)); + addr->hostname = tor_memdup_nulterm(cp, answer_len); + cp += answer_len; + addr->ttl = ntohl(get_uint32(cp)); + cp += 4; + smartlist_add(addrs, addr); + } else if (answer_type == RESOLVED_TYPE_ERROR_TRANSIENT || + answer_type == RESOLVED_TYPE_ERROR) { + errcode = answer_type; + /* Ignore the error contents */ + cp += answer_len + 4; + } else { + cp += answer_len + 4; + } + tor_assert(((ssize_t)remaining) >= (cp - cp_orig)); + remaining -= (cp - cp_orig); + } + + if (errcode && smartlist_len(addrs) == 0) { + /* Report an error only if there were no results. */ + *errcode_out = errcode; + } + + smartlist_add_all(addresses_out, addrs); + smartlist_free(addrs); + + return 0; + + err: + /* On parse error, don't report any results */ + SMARTLIST_FOREACH(addrs, address_ttl_t *, a, address_ttl_free(a)); + smartlist_free(addrs); + return -1; +} + +/** Helper for connection_edge_process_resolved_cell: given an error code, + * an entry_connection, and a list of address_ttl_t *, report the best answer + * to the entry_connection. */ +STATIC void +connection_ap_handshake_socks_got_resolve_cell(entry_connection_t *conn, + int error_code, + smartlist_t *results) +{ + address_ttl_t *addr_ipv4 = NULL; + address_ttl_t *addr_ipv6 = NULL; + address_ttl_t *addr_hostname = NULL; + address_ttl_t *addr_best = NULL; + + /* If it's an error code, that's easy. */ + if (error_code) { + tor_assert(error_code == RESOLVED_TYPE_ERROR || + error_code == RESOLVED_TYPE_ERROR_TRANSIENT); + connection_ap_handshake_socks_resolved(conn, + error_code,0,NULL,-1,-1); + return; + } + + /* Get the first answer of each type. */ + SMARTLIST_FOREACH_BEGIN(results, address_ttl_t *, addr) { + if (addr->hostname) { + if (!addr_hostname) { + addr_hostname = addr; + } + } else if (tor_addr_family(&addr->addr) == AF_INET) { + if (!addr_ipv4 && conn->ipv4_traffic_ok) { + addr_ipv4 = addr; + } + } else if (tor_addr_family(&addr->addr) == AF_INET6) { + if (!addr_ipv6 && conn->ipv6_traffic_ok) { + addr_ipv6 = addr; + } + } + } SMARTLIST_FOREACH_END(addr); + + /* Now figure out which type we wanted to deliver. */ + if (conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { + if (addr_hostname) { + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_HOSTNAME, + strlen(addr_hostname->hostname), + (uint8_t*)addr_hostname->hostname, + addr_hostname->ttl,-1); + } else { + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_ERROR,0,NULL,-1,-1); + } + return; + } + + if (conn->prefer_ipv6_traffic) { + addr_best = addr_ipv6 ? addr_ipv6 : addr_ipv4; + } else { + addr_best = addr_ipv4 ? addr_ipv4 : addr_ipv6; + } + + /* Now convert it to the ugly old interface */ + if (! addr_best) { + connection_ap_handshake_socks_resolved(conn, + RESOLVED_TYPE_ERROR,0,NULL,-1,-1); + return; + } + + connection_ap_handshake_socks_resolved_addr(conn, + &addr_best->addr, + addr_best->ttl, + -1); + + remap_event_helper(conn, &addr_best->addr); +} + +/** Handle a RELAY_COMMAND_RESOLVED cell that we received on a non-open AP + * stream. */ +static int connection_edge_process_resolved_cell(edge_connection_t *conn, const cell_t *cell, const relay_header_t *rh) { - int ttl; - int answer_len; - uint8_t answer_type; entry_connection_t *entry_conn = EDGE_TO_ENTRY_CONN(conn); + smartlist_t *resolved_addresses = NULL; + int errcode = 0; + if (conn->base_.state != AP_CONN_STATE_RESOLVE_WAIT) { log_fn(LOG_PROTOCOL_WARN, LD_APP, "Got a 'resolved' cell while " "not in state resolve_wait. Dropping."); - return; + return 0; } tor_assert(SOCKS_COMMAND_IS_RESOLVE(entry_conn->socks_request->command)); - answer_len = cell->payload[RELAY_HEADER_SIZE+1]; - if (rh->length < 2 || answer_len+2>rh->length) { + + resolved_addresses = smartlist_new(); + if (resolved_cell_parse(cell, rh, resolved_addresses, &errcode)) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Dropping malformed 'resolved' cell"); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_TORPROTOCOL); - return; - } - - answer_type = cell->payload[RELAY_HEADER_SIZE]; - if (rh->length >= answer_len+6) - ttl = (int)ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+ - 2+answer_len)); - else - ttl = -1; - if (answer_type == RESOLVED_TYPE_IPV4 || - answer_type == RESOLVED_TYPE_IPV6) { - tor_addr_t addr; - if (decode_address_from_payload(&addr, cell->payload+RELAY_HEADER_SIZE, - rh->length) && - tor_addr_is_internal(&addr, 0) && - get_options()->ClientDNSRejectInternalAddresses) { - log_info(LD_APP,"Got a resolve with answer %s. Rejecting.", - fmt_addr(&addr)); + goto done; + } + + if (get_options()->ClientDNSRejectInternalAddresses) { + int orig_len = smartlist_len(resolved_addresses); + SMARTLIST_FOREACH_BEGIN(resolved_addresses, address_ttl_t *, addr) { + if (addr->hostname == NULL && tor_addr_is_internal(&addr->addr, 0)) { + log_info(LD_APP, "Got a resolved cell with answer %s; dropping that " + "answer.", + safe_str_client(fmt_addr(&addr->addr))); + address_ttl_free(addr); + SMARTLIST_DEL_CURRENT(resolved_addresses, addr); + } + } SMARTLIST_FOREACH_END(addr); + if (orig_len && smartlist_len(resolved_addresses) == 0) { + log_info(LD_APP, "Got a resolved cell with only private addresses; " + "dropping it."); connection_ap_handshake_socks_resolved(entry_conn, RESOLVED_TYPE_ERROR_TRANSIENT, 0, NULL, 0, TIME_MAX); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_TORPROTOCOL); - return; + goto done; } } - connection_ap_handshake_socks_resolved(entry_conn, - answer_type, - cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/ - cell->payload+RELAY_HEADER_SIZE+2, /*answer*/ - ttl, - -1); - if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) { - tor_addr_t addr; - tor_addr_from_ipv4n(&addr, - get_uint32(cell->payload+RELAY_HEADER_SIZE+2)); - remap_event_helper(entry_conn, &addr); - } else if (answer_type == RESOLVED_TYPE_IPV6 && answer_len == 16) { - tor_addr_t addr; - tor_addr_from_ipv6_bytes(&addr, - (char*)(cell->payload+RELAY_HEADER_SIZE+2)); - remap_event_helper(entry_conn, &addr); - } + + connection_ap_handshake_socks_got_resolve_cell(entry_conn, + errcode, + resolved_addresses); + connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + done: + SMARTLIST_FOREACH(resolved_addresses, address_ttl_t *, addr, + address_ttl_free(addr)); + smartlist_free(resolved_addresses); + return 0; } /** An incoming relay cell has arrived from circuit circ to @@ -1203,8 +1381,7 @@ connection_edge_process_relay_cell_not_open( } if (conn->base_.type == CONN_TYPE_AP && rh->command == RELAY_COMMAND_RESOLVED) { - connection_edge_process_resolved_cell(conn, cell, rh); - return 0; + return connection_edge_process_resolved_cell(conn, cell, rh); } log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, diff --git a/src/or/relay.h b/src/or/relay.h index 4e1c7f5..bd5c908 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -83,6 +83,19 @@ int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, #ifdef RELAY_PRIVATE STATIC int connected_cell_parse(const relay_header_t *rh, const cell_t *cell, tor_addr_t *addr_out, int *ttl_out); +/** An address-and-ttl tuple as yielded by resolved_cell_parse */ +typedef struct address_ttl_s { + tor_addr_t addr; + char *hostname; + int ttl; +} address_ttl_t; +STATIC void address_ttl_free(address_ttl_t *addr); +STATIC int resolved_cell_parse(const cell_t *cell, const relay_header_t *rh, + smartlist_t *addresses_out, int *errcode_out); +STATIC void connection_ap_handshake_socks_got_resolve_cell( + entry_connection_t *conn, + int error_code, + smartlist_t *results); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); STATIC size_t cell_queues_get_total_allocation(void);

1 0

[tor/master] Unit tests for connection_edge_process_resolved_cell
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit da908a593fded0c4774c6cdfb6b5e51c87f65d88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 2 13:38:50 2014 -0400 Unit tests for connection_edge_process_resolved_cell Also rename a function to be more accurate (resolve->resolved) --- src/or/connection_edge.c | 12 +-- src/or/connection_edge.h | 24 +++-- src/or/relay.c | 16 +-- src/or/relay.h | 7 +- src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_relaycell.c | 249 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 282 insertions(+), 29 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1ecc553..41ca611 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -67,9 +67,9 @@ static int connection_ap_supports_optimistic_data(const entry_connection_t *); * a socks reply, send one now (based on endreason). Also set * has_sent_end to 1, and mark the conn. */ -void -connection_mark_unattached_ap_(entry_connection_t *conn, int endreason, - int line, const char *file) +MOCK_IMPL(void, +connection_mark_unattached_ap_,(entry_connection_t *conn, int endreason, + int line, const char *file)) { connection_t *base_conn = ENTRY_TO_CONN(conn); edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn); @@ -2093,13 +2093,13 @@ connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, **/ /* XXXX the use of the ttl and expires fields is nutty. Let's make this * interface and those that use it less ugly. */ -void -connection_ap_handshake_socks_resolved(entry_connection_t *conn, +MOCK_IMPL(void, +connection_ap_handshake_socks_resolved,(entry_connection_t *conn, int answer_type, size_t answer_len, const uint8_t *answer, int ttl, - time_t expires) + time_t expires)) { char buf[384]; size_t replylen; diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index cbca31a..3c0e30a 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -17,8 +17,9 @@ #define connection_mark_unattached_ap(conn, endreason) \ connection_mark_unattached_ap_((conn), (endreason), __LINE__, SHORT_FILE__) -void connection_mark_unattached_ap_(entry_connection_t *conn, int endreason, - int line, const char *file); +MOCK_DECL(void,connection_mark_unattached_ap_, + (entry_connection_t *conn, int endreason, + int line, const char *file)); int connection_edge_reached_eof(edge_connection_t *conn); int connection_edge_process_inbuf(edge_connection_t *conn, int package_partial); @@ -44,16 +45,17 @@ entry_connection_t *connection_ap_make_link(connection_t *partner, void connection_ap_handshake_socks_reply(entry_connection_t *conn, char *reply, size_t replylen, int endreason); -void connection_ap_handshake_socks_resolved(entry_connection_t *conn, - int answer_type, - size_t answer_len, - const uint8_t *answer, - int ttl, - time_t expires); +MOCK_DECL(void,connection_ap_handshake_socks_resolved, + (entry_connection_t *conn, + int answer_type, + size_t answer_len, + const uint8_t *answer, + int ttl, + time_t expires)); void connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, - const tor_addr_t *answer, - int ttl, - time_t expires); + const tor_addr_t *answer, + int ttl, + time_t expires); int connection_exit_begin_conn(cell_t *cell, circuit_t *circ); int connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ); diff --git a/src/or/relay.c b/src/or/relay.c index ed24397..f8b0dee 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1121,10 +1121,10 @@ resolved_cell_parse(const cell_t *cell, const relay_header_t *rh, /** Helper for connection_edge_process_resolved_cell: given an error code, * an entry_connection, and a list of address_ttl_t *, report the best answer * to the entry_connection. */ -STATIC void -connection_ap_handshake_socks_got_resolve_cell(entry_connection_t *conn, - int error_code, - smartlist_t *results) +static void +connection_ap_handshake_socks_got_resolved_cell(entry_connection_t *conn, + int error_code, + smartlist_t *results) { address_ttl_t *addr_ipv4 = NULL; address_ttl_t *addr_ipv6 = NULL; @@ -1195,7 +1195,7 @@ connection_ap_handshake_socks_got_resolve_cell(entry_connection_t *conn, /** Handle a RELAY_COMMAND_RESOLVED cell that we received on a non-open AP * stream. */ -static int +STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn, const cell_t *cell, const relay_header_t *rh) @@ -1242,9 +1242,9 @@ connection_edge_process_resolved_cell(edge_connection_t *conn, } } - connection_ap_handshake_socks_got_resolve_cell(entry_conn, - errcode, - resolved_addresses); + connection_ap_handshake_socks_got_resolved_cell(entry_conn, + errcode, + resolved_addresses); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_DONE | diff --git a/src/or/relay.h b/src/or/relay.h index bd5c908..9c0e21c 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -92,10 +92,9 @@ typedef struct address_ttl_s { STATIC void address_ttl_free(address_ttl_t *addr); STATIC int resolved_cell_parse(const cell_t *cell, const relay_header_t *rh, smartlist_t *addresses_out, int *errcode_out); -STATIC void connection_ap_handshake_socks_got_resolve_cell( - entry_connection_t *conn, - int error_code, - smartlist_t *results); +STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn, + const cell_t *cell, + const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); STATIC size_t cell_queues_get_total_allocation(void); diff --git a/src/test/include.am b/src/test/include.am index c6743a1..c59ebb2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -35,6 +35,7 @@ src_test_test_SOURCES = \ src/test/test_oom.c \ src/test/test_options.c \ src/test/test_pt.c \ + src/test/test_relaycell.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ src/test/test_socks.c \ diff --git a/src/test/test.c b/src/test/test.c index 0ba5da3..0e0fc6a 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1623,6 +1623,7 @@ extern struct testcase_t pt_tests[]; extern struct testcase_t config_tests[]; extern struct testcase_t introduce_tests[]; extern struct testcase_t replaycache_tests[]; +extern struct testcase_t relaycell_tests[]; extern struct testcase_t cell_format_tests[]; extern struct testcase_t circuitlist_tests[]; extern struct testcase_t circuitmux_tests[]; @@ -1654,6 +1655,7 @@ static struct testgroup_t testgroups[] = { { "pt/", pt_tests }, { "config/", config_tests }, { "replaycache/", replaycache_tests }, + { "relaycell/", relaycell_tests }, { "introduce/", introduce_tests }, { "circuitlist/", circuitlist_tests }, { "circuitmux/", circuitmux_tests }, diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c new file mode 100644 index 0000000..5deb362 --- /dev/null +++ b/src/test/test_relaycell.c @@ -0,0 +1,249 @@ +/* Copyright (c) 2014, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/* Unit tests for handling different kinds of relay cell */ + +#define RELAY_PRIVATE +#include "or.h" +#include "config.h" +#include "connection.h" +#include "connection_edge.h" +#include "relay.h" +#include "test.h" + +static int srm_ncalls; +static entry_connection_t *srm_conn; +static int srm_atype; +static size_t srm_alen; +static int srm_answer_is_set; +static uint8_t srm_answer[512]; +static int srm_ttl; +static time_t srm_expires; + +/* Mock replacement for connection_ap_hannshake_socks_resolved() */ +static void +socks_resolved_mock(entry_connection_t *conn, + int answer_type, + size_t answer_len, + const uint8_t *answer, + int ttl, + time_t expires) +{ + srm_ncalls++; + srm_conn = conn; + srm_atype = answer_type; + srm_alen = answer_len; + if (answer) { + memset(srm_answer, 0, sizeof(srm_answer)); + memcpy(srm_answer, answer, answer_len < 512 ? answer_len : 512); + srm_answer_is_set = 1; + } else { + srm_answer_is_set = 0; + } + srm_ttl = ttl; + srm_expires = expires; +} + +static int mum_ncalls; +static entry_connection_t *mum_conn; +static int mum_endreason; + +/* Mock replacement for connection_mark_unattached_ap_() */ +static void +mark_unattached_mock(entry_connection_t *conn, int endreason, + int line, const char *file) +{ + ++mum_ncalls; + mum_conn = conn; + mum_endreason = endreason; + (void) line; + (void) file; +} + +/* Tests for connection_edge_process_resolved_cell(). + + The point of ..process_resolved_cell() is to handle an incoming cell + on an entry connection, and call connection_mark_unattached_ap() and/or + connection_ap_handshake_socks_resolved(). + */ +static void +test_relaycell_resolved(void *arg) +{ + entry_connection_t *entryconn; + edge_connection_t *edgeconn; + cell_t cell; + relay_header_t rh; + int r; + or_options_t *options = get_options_mutable(); + +#define SET_CELL(s) do { \ + memset(&cell, 0, sizeof(cell)); \ + memset(&rh, 0, sizeof(rh)); \ + memcpy(cell.payload + RELAY_HEADER_SIZE, (s), sizeof((s))-1); \ + rh.length = sizeof((s))-1; \ + rh.command = RELAY_COMMAND_RESOLVED; \ + } while (0) +#define MOCK_RESET() do { \ + srm_ncalls = mum_ncalls = 0; \ + } while (0) +#define ASSERT_MARK_CALLED(reason) do { \ + tt_int_op(mum_ncalls, ==, 1); \ + tt_ptr_op(mum_conn, ==, entryconn); \ + tt_int_op(mum_endreason, ==, (reason)); \ + } while (0) +#define ASSERT_RESOLVED_CALLED(atype, answer, ttl, expires) do { \ + tt_int_op(srm_ncalls, ==, 1); \ + tt_ptr_op(srm_conn, ==, entryconn); \ + tt_int_op(srm_atype, ==, (atype)); \ + if (answer) { \ + tt_int_op(srm_alen, ==, sizeof(answer)-1); \ + tt_int_op(srm_alen, <, 512); \ + tt_int_op(srm_answer_is_set, ==, 1); \ + tt_mem_op(srm_answer, ==, answer, sizeof(answer)-1); \ + } else { \ + tt_int_op(srm_answer_is_set, ==, 0); \ + } \ + tt_int_op(srm_ttl, ==, ttl); \ + tt_int_op(srm_expires, ==, expires); \ + } while (0) + + (void)arg; + + MOCK(connection_mark_unattached_ap_, mark_unattached_mock); + MOCK(connection_ap_handshake_socks_resolved, socks_resolved_mock); + + options->ClientDNSRejectInternalAddresses = 0; + + SET_CELL(/* IPv4: 127.0.1.2, ttl 256 */ + "\x04\x04\x7f\x00\x01\x02\x00\x00\x01\x00" + /* IPv4: 18.0.0.1, ttl 512 */ + "\x04\x04\x12\x00\x00\x01\x00\x00\x02\x00" + /* IPv6: 2003::3, ttl 1024 */ + "\x06\x10" + "\x20\x02\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x03" + "\x00\x00\x04\x00"); + + entryconn = entry_connection_new(CONN_TYPE_AP, AF_INET); + edgeconn = ENTRY_TO_EDGE_CONN(entryconn); + + /* Try with connection in non-RESOLVE_WAIT state: cell gets ignored */ + MOCK_RESET(); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + tt_int_op(srm_ncalls, ==, 0); + tt_int_op(mum_ncalls, ==, 0); + + /* Now put it in the right state. */ + ENTRY_TO_CONN(entryconn)->state = AP_CONN_STATE_RESOLVE_WAIT; + entryconn->socks_request->command = SOCKS_COMMAND_RESOLVE; + entryconn->ipv4_traffic_ok = 1; + entryconn->ipv6_traffic_ok = 1; + entryconn->prefer_ipv6_traffic = 0; + + /* We prefer ipv4, so we should get the first ipv4 answer */ + MOCK_RESET(); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_IPV4, "\x7f\x00\x01\x02", 256, -1); + + /* But we may be discarding private answers. */ + MOCK_RESET(); + options->ClientDNSRejectInternalAddresses = 1; + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_IPV4, "\x12\x00\x00\x01", 512, -1); + + /* now prefer ipv6, and get the first ipv6 answer */ + entryconn->prefer_ipv6_traffic = 1; + MOCK_RESET(); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_IPV6, + "\x20\x02\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x03", + 1024, -1); + + /* With a cell that only has IPv4, we report IPv4 even if we prefer IPv6 */ + MOCK_RESET(); + SET_CELL("\x04\x04\x12\x00\x00\x01\x00\x00\x02\x00"); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_IPV4, "\x12\x00\x00\x01", 512, -1); + + /* But if we don't allow IPv4, we report nothing if the cell contains only + * ipv4 */ + MOCK_RESET(); + entryconn->ipv4_traffic_ok = 0; + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_ERROR, NULL, -1, -1); + + /* If we wanted hostnames, we report nothing, since we only had IPs. */ + MOCK_RESET(); + entryconn->ipv4_traffic_ok = 1; + entryconn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_ERROR, NULL, -1, -1); + + /* A hostname cell is fine though. */ + MOCK_RESET(); + SET_CELL("\x00\x0fwww.example.com\x00\x01\x00\x00"); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_HOSTNAME, "www.example.com", 65536, -1); + + /* error on malformed cell */ + MOCK_RESET(); + entryconn->socks_request->command = SOCKS_COMMAND_RESOLVE; + SET_CELL("\x04\x04\x01\x02\x03\x04"); /* no ttl */ + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_TORPROTOCOL); + tt_int_op(srm_ncalls, ==, 0); + + /* error on all addresses private */ + MOCK_RESET(); + SET_CELL(/* IPv4: 127.0.1.2, ttl 256 */ + "\x04\x04\x7f\x00\x01\x02\x00\x00\x01\x00" + /* IPv4: 192.168.1.1, ttl 256 */ + "\x04\x04\xc0\xa8\x01\x01\x00\x00\x01\x00"); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_TORPROTOCOL); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_ERROR_TRANSIENT, NULL, 0, TIME_MAX); + + /* Legit error code */ + MOCK_RESET(); + SET_CELL("\xf0\x15" "quiet and meaningless" "\x00\x00\x0f\xff"); + r = connection_edge_process_resolved_cell(edgeconn, &cell, &rh); + tt_int_op(r, ==, 0); + ASSERT_MARK_CALLED(END_STREAM_REASON_DONE| + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); + ASSERT_RESOLVED_CALLED(RESOLVED_TYPE_ERROR_TRANSIENT, NULL, -1, -1); + + done: + UNMOCK(connection_mark_unattached_ap_); + UNMOCK(connection_ap_handshake_socks_resolved); +} + +struct testcase_t relaycell_tests[] = { + { "resolved", test_relaycell_resolved, TT_FORK, NULL, NULL }, + END_OF_TESTCASES +}; +

1 0

[tor/master] Tests for resolved_cell_parse
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 4215c801ffc11f19949be3da2d46158664f0bf97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 2 11:49:18 2014 -0400 Tests for resolved_cell_parse --- src/test/test_cell_formats.c | 341 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 341 insertions(+) diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c index 55d8d0f..b0eb2fc 100644 --- a/src/test/test_cell_formats.c +++ b/src/test/test_cell_formats.c @@ -872,6 +872,346 @@ test_cfmt_extended_cells(void *arg) tor_free(mem_op_hex_tmp); } +static void +test_cfmt_resolved_cells(void *arg) +{ + smartlist_t *addrs = smartlist_new(); + relay_header_t rh; + cell_t cell; + int r, errcode; + address_ttl_t *a; + + (void)arg; +#define CLEAR_CELL() do { \ + memset(&cell, 0, sizeof(cell)); \ + memset(&rh, 0, sizeof(rh)); \ + } while (0) +#define CLEAR_ADDRS() do { \ + SMARTLIST_FOREACH(addrs, address_ttl_t *, a, \ + address_ttl_free(a); ); \ + smartlist_clear(addrs); \ + } while (0) +#define SET_CELL(s) do { \ + CLEAR_CELL(); \ + memcpy(cell.payload + RELAY_HEADER_SIZE, (s), sizeof((s))-1); \ + rh.length = sizeof((s))-1; \ + rh.command = RELAY_COMMAND_RESOLVED; \ + errcode = -1; \ + } while (0) + + /* The cell format is one or more answers; each of the form + * type [1 byte---0:hostname, 4:ipv4, 6:ipv6, f0:err-transient, f1:err] + * length [1 byte] + * body [length bytes] + * ttl [4 bytes] + */ + + /* Let's try an empty cell */ + SET_CELL(""); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 0); + CLEAR_ADDRS(); /* redundant but let's be consistent */ + + /* Cell with one ipv4 addr */ + SET_CELL("\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00"); + tt_int_op(rh.length, ==, 10); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 1); + a = smartlist_get(addrs, 0); + tt_str_op(fmt_addr(&a->addr), ==, "127.0.2.10"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 256); + CLEAR_ADDRS(); + + /* Cell with one ipv6 addr */ + SET_CELL("\x06\x10" + "\x20\x02\x90\x90\x00\x00\x00\x00" + "\x00\x00\x00\x00\xf0\xf0\xab\xcd" + "\x02\00\x00\x01"); + tt_int_op(rh.length, ==, 22); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 1); + a = smartlist_get(addrs, 0); + tt_str_op(fmt_addr(&a->addr), ==, "2002:9090::f0f0:abcd"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 0x2000001); + CLEAR_ADDRS(); + + /* Cell with one hostname */ + SET_CELL("\x00\x11" + "motherbrain.zebes" + "\x00\00\x00\x00"); + tt_int_op(rh.length, ==, 23); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 1); + a = smartlist_get(addrs, 0); + tt_assert(tor_addr_is_null(&a->addr)); + tt_str_op(a->hostname, ==, "motherbrain.zebes"); + tt_int_op(a->ttl, ==, 0); + CLEAR_ADDRS(); + +#define LONG_NAME \ + "this-hostname-has-255-characters.in-order-to-test-whether-very-long.ho" \ + "stnames-are-accepted.i-am-putting-it-in-a-macro-because-although.this-" \ + "function-is-already-very-full.of-copy-and-pasted-stuff.having-this-app" \ + "ear-more-than-once-would-bother-me-somehow.is" + + tt_int_op(strlen(LONG_NAME), ==, 255); + SET_CELL("\x00\xff" + LONG_NAME + "\x00\01\x00\x00"); + tt_int_op(rh.length, ==, 261); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 1); + a = smartlist_get(addrs, 0); + tt_assert(tor_addr_is_null(&a->addr)); + tt_str_op(a->hostname, ==, LONG_NAME); + tt_int_op(a->ttl, ==, 65536); + CLEAR_ADDRS(); + + /* Cells with an error */ + SET_CELL("\xf0\x2b" + "I'm sorry, Dave. I'm afraid I can't do that" + "\x00\x11\x22\x33"); + tt_int_op(rh.length, ==, 49); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, RESOLVED_TYPE_ERROR_TRANSIENT); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 0); + CLEAR_ADDRS(); + + SET_CELL("\xf1\x40" + "This hostname is too important for me to allow you to resolve it" + "\x00\x00\x00\x00"); + tt_int_op(rh.length, ==, 70); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, RESOLVED_TYPE_ERROR); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 0); + CLEAR_ADDRS(); + + /* Cell with an unrecognized type */ + SET_CELL("\xee\x16" + "fault in the AE35 unit" + "\x09\x09\x01\x01"); + tt_int_op(rh.length, ==, 28); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 0); + CLEAR_ADDRS(); + + /* Cell with one of each */ + SET_CELL(/* unrecognized: */ + "\xee\x16" + "fault in the AE35 unit" + "\x09\x09\x01\x01" + /* error: */ + "\xf0\x2b" + "I'm sorry, Dave. I'm afraid I can't do that" + "\x00\x11\x22\x33" + /* IPv6: */ + "\x06\x10" + "\x20\x02\x90\x90\x00\x00\x00\x00" + "\x00\x00\x00\x00\xf0\xf0\xab\xcd" + "\x02\00\x00\x01" + /* IPv4: */ + "\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00" + /* Hostname: */ + "\x00\x11" + "motherbrain.zebes" + "\x00\00\x00\x00" + ); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); /* no error reported; we got answers */ + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 3); + a = smartlist_get(addrs, 0); + tt_str_op(fmt_addr(&a->addr), ==, "2002:9090::f0f0:abcd"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 0x2000001); + a = smartlist_get(addrs, 1); + tt_str_op(fmt_addr(&a->addr), ==, "127.0.2.10"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 256); + a = smartlist_get(addrs, 2); + tt_assert(tor_addr_is_null(&a->addr)); + tt_str_op(a->hostname, ==, "motherbrain.zebes"); + tt_int_op(a->ttl, ==, 0); + CLEAR_ADDRS(); + + /* Cell with several of similar type */ + SET_CELL(/* IPv4 */ + "\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00" + "\x04\x04" "\x08\x08\x08\x08" "\x00\00\x01\x05" + "\x04\x04" "\x7f\xb0\x02\xb0" "\x00\01\xff\xff" + /* IPv6 */ + "\x06\x10" + "\x20\x02\x90\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\xca\xfe\xf0\x0d" + "\x00\00\x00\x01" + "\x06\x10" + "\x20\x02\x90\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\xfa\xca\xde" + "\x00\00\x00\x03"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 5); + a = smartlist_get(addrs, 0); + tt_str_op(fmt_addr(&a->addr), ==, "127.0.2.10"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 256); + a = smartlist_get(addrs, 1); + tt_str_op(fmt_addr(&a->addr), ==, "8.8.8.8"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 261); + a = smartlist_get(addrs, 2); + tt_str_op(fmt_addr(&a->addr), ==, "127.176.2.176"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 131071); + a = smartlist_get(addrs, 3); + tt_str_op(fmt_addr(&a->addr), ==, "2002:9000::cafe:f00d"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 1); + a = smartlist_get(addrs, 4); + tt_str_op(fmt_addr(&a->addr), ==, "2002:9001::fa:cade"); + tt_ptr_op(a->hostname, ==, NULL); + tt_int_op(a->ttl, ==, 3); + CLEAR_ADDRS(); + + /* Full cell */ +#define LONG_NAME2 \ + "this-name-has-231-characters.so-that-it-plus-LONG_NAME-can-completely-" \ + "fill-up-the-payload-of-a-cell.its-important-to-check-for-the-full-thin" \ + "g-case.to-avoid-off-by-one-errors.where-full-things-are-misreported-as" \ + ".overflowing-by-one.z" + + tt_int_op(strlen(LONG_NAME2), ==, 231); + SET_CELL("\x00\xff" + LONG_NAME + "\x00\01\x00\x00" + "\x00\xe7" + LONG_NAME2 + "\x00\01\x00\x00"); + tt_int_op(rh.length, ==, RELAY_PAYLOAD_SIZE); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, 0); + tt_int_op(smartlist_len(addrs), ==, 2); + a = smartlist_get(addrs, 0); + tt_str_op(a->hostname, ==, LONG_NAME); + a = smartlist_get(addrs, 1); + tt_str_op(a->hostname, ==, LONG_NAME2); + CLEAR_ADDRS(); + + /* BAD CELLS */ + + /* Invalid length on an IPv4 */ + SET_CELL("\x04\x03zzz1234"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + SET_CELL("\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00" + "\x04\x05zzzzz1234"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + /* Invalid length on an IPv6 */ + SET_CELL("\x06\x03zzz1234"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + SET_CELL("\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00" + "\x06\x17wwwwwwwwwwwwwwwww1234"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + SET_CELL("\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00" + "\x06\x10xxxx"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + /* Empty hostname */ + SET_CELL("\x00\x00xxxx"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + /* rh.length out of range */ + CLEAR_CELL(); + rh.length = 499; + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(errcode, ==, 0); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + /* Item length extends beyond rh.length */ + CLEAR_CELL(); + SET_CELL("\x00\xff" + LONG_NAME + "\x00\01\x00\x00"); + rh.length -= 1; + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + rh.length -= 5; + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + SET_CELL("\x04\x04" "\x7f\x00\x02\x0a" "\x00\00\x01\x00"); + rh.length -= 1; + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + SET_CELL("\xee\x10" + "\x20\x02\x90\x01\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\xfa\xca\xde" + "\x00\00\x00\x03"); + rh.length -= 1; + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + /* Truncated item after first character */ + SET_CELL("\x04"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + SET_CELL("\xee"); + r = resolved_cell_parse(&cell, &rh, addrs, &errcode); + tt_int_op(r, ==, -1); + tt_int_op(smartlist_len(addrs), ==, 0); + + done: + CLEAR_ADDRS(); + CLEAR_CELL(); + smartlist_free(addrs); +#undef CLEAR_ADDRS +#undef CLEAR_CELL +} + #define TEST(name, flags) \ { #name, test_cfmt_ ## name, flags, 0, NULL } @@ -883,6 +1223,7 @@ struct testcase_t cell_format_tests[] = { TEST(created_cells, 0), TEST(extend_cells, 0), TEST(extended_cells, 0), + TEST(resolved_cells, 0), END_OF_TESTCASES };

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit 206902f10574aa82bd441d68e646d972b79a0a78 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 18:45:39 2014 +0000 Update translations for torbutton-brandproperties_completed --- en_GB/brand.properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/en_GB/brand.properties b/en_GB/brand.properties new file mode 100644 index 0000000..9ae168e --- /dev/null +++ b/en_GB/brand.properties @@ -0,0 +1,15 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShortName=TorBrowser +brandFullName=Tor Browser +vendorShortName=Tor Project + +homePageSingleStartMain=Firefox Start, a fast home page with built-in search +homePageImport=Import your home page from %S + +homePageMigrationPageTitle=Home Page Selection +homePageMigrationDescription=Please select the home page you wish to use: + +syncBrandShortName=Sync

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit 94f5892ca4e1c16977b6ae9ed5056dd24d7924c9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 16:45:49 2014 +0000 Update translations for tails-iuk --- el.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/el.po b/el.po index 516626b..dc299d9 100644 --- a/el.po +++ b/el.po @@ -4,14 +4,15 @@ # # Translators: # firespin <dartworldgr(a)hotmail.com>, 2014 +# stratosgl <stratos_gl(a)yahoo.com>, 2014 # Teogramm <theodorewii121(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-24 18:50+0000\n" -"Last-Translator: firespin <dartworldgr(a)hotmail.com>\n" +"PO-Revision-Date: 2014-04-02 16:31+0000\n" +"Last-Translator: stratosgl <stratos_gl(a)yahoo.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -202,7 +203,7 @@ msgstr "Πρόβλημα κατά την επανεκκίνηση" #: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to restart the system" -msgstr "" +msgstr "Αποτυχία επανεκκίνησης του συστήματος" #: ../lib/Tails/IUK/Frontend.pm:610 msgid "Error while shutting down the network" @@ -214,7 +215,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:623 msgid "Upgrading the system" -msgstr "" +msgstr "Αναβάθμιση του συστήματος" #: ../lib/Tails/IUK/Frontend.pm:625 msgid ""

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit 0cf1b4ea92cd5cd419d8f6ef4aa74491afdb5eca Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 16:16:03 2014 +0000 Update translations for tails-perl5lib_completed --- sk.po | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sk.po b/sk.po new file mode 100644 index 0000000..05e6683 --- /dev/null +++ b/sk.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2013-11-28 11:56+0100\n" +"PO-Revision-Date: 2014-04-02 16:00+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../lib/Tails/RunningSystem.pm:139 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Zariadenie, z ktorého je Tails spustený, nie je možné nájsť. Nepoužili ste náhodou voľbu `toram'?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit a958a517bc92d9b10352b5bee038c4f879fedb06 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 16:16:01 2014 +0000 Update translations for tails-perl5lib --- sk.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sk.po b/sk.po index 984c544..05e6683 100644 --- a/sk.po +++ b/sk.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:38+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" +"PO-Revision-Date: 2014-04-02 16:00+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,4 +22,4 @@ msgstr "" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "" +msgstr "Zariadenie, z ktorého je Tails spustený, nie je možné nájsť. Nepoužili ste náhodou voľbu `toram'?"

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit 43c9f0fdc3d0cb48c6def6fc74897e0bbd0e9fcf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 16:15:58 2014 +0000 Update translations for tails-iuk_completed --- sk.po | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) diff --git a/sk.po b/sk.po new file mode 100644 index 0000000..7243c22 --- /dev/null +++ b/sk.po @@ -0,0 +1,235 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-03-05 15:11+0100\n" +"PO-Revision-Date: 2014-04-02 16:00+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 +#: ../lib/Tails/IUK/Frontend.pm:667 +msgid "For debugging information, see /home/amnesia/.xsession-errors" +msgstr "Pre získanie informácii relevantných pre ladenie si pozrite /home/amnesia/.xsession-errors" + +#: ../lib/Tails/IUK/Frontend.pm:216 +msgid "Error while checking for upgrades" +msgstr "Chyba pri kontrole aktualizácii" + +#: ../lib/Tails/IUK/Frontend.pm:219 +msgid "" +"Could not determine whether an upgrade is available from our website.\n" +"\n" +"Check your network connection, and restart Tails to try upgrading again.\n" +"\n" +"If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Nebolo možné zistiť, či je na našej webovej stránke dostupná aktualizácia.\n\nSkontrolujte si vaše internetové pripojenie a reštartujte Tails za účelom ďalšieho pokusu o aktualizáciu.\n\nAk bude problém pretrvávať, navštívte stránku file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:234 +msgid "no automatic upgrade is available from our website for this version" +msgstr "pre túto verziu nie je z našej webovej stránky dostupná žiadna automatická aktualizácia" + +#: ../lib/Tails/IUK/Frontend.pm:240 +msgid "your device was not created using Tails Installer" +msgstr "vaše zariadenie nebolo vytvorené pomocou inštalátora Tails" + +#: ../lib/Tails/IUK/Frontend.pm:245 +msgid "Tails was started from a DVD or a read-only device" +msgstr "Tails bolo spustené z DVD alebo z read-only zariadenia" + +#: ../lib/Tails/IUK/Frontend.pm:250 +msgid "there is not enough free space on the Tails system partition" +msgstr "nie je dostatok voľného miesta na systémovej partícii Tails" + +#: ../lib/Tails/IUK/Frontend.pm:255 +msgid "not enough memory is available on this system" +msgstr "nie je dostatok dostupnej pamäte na tomto systéme" + +#: ../lib/Tails/IUK/Frontend.pm:261 +#, perl-brace-format +msgid "No explanation available for reason '%{reason}s'." +msgstr "Pre dôvod '%{reason}' nie je dostupný žiadny vysvetľovací text." + +#: ../lib/Tails/IUK/Frontend.pm:281 +msgid "The system is up-to-date" +msgstr "Systém je aktualizovaný" + +#: ../lib/Tails/IUK/Frontend.pm:286 +msgid "This version of Tails is outdated, and may have security issues." +msgstr "Táto verzia Tails je zastaralá a môže obsahovať bezpečnostné diery" + +#: ../lib/Tails/IUK/Frontend.pm:318 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{space_needed}s of free space on" +" Tails system partition, but only %{free_space}s is available." +msgstr "Dostupná rozširujúca aktualizácia vyžaduje %{space_needed} voľného miesta na systémovej partícii Tails, zatiaľ čo k dispozícii je iba %{free_space}." + +#: ../lib/Tails/IUK/Frontend.pm:334 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{memory_needed}s of free memory," +" but only %{free_memory}s is available." +msgstr "Dostupná rozširujúca aktualizácia vyžaduje %{space_needed} voľnej pamäte, zatiaľ čo k dispozícii je iba %{free_space}." + +#: ../lib/Tails/IUK/Frontend.pm:356 +msgid "" +"An incremental upgrade is available, but no full upgrade is.\n" +"This should not happen. Please report a bug." +msgstr "Je dostupná rozširujúca aktualizácia, ale zato žiadna úplná.\nToto by sa nemalo stávať. Prosíme, tento bug nahláste." + +#: ../lib/Tails/IUK/Frontend.pm:360 +msgid "Error while detecting available upgrades" +msgstr "Chyba pri zisťovaní dostupných aktualizácii" + +#: ../lib/Tails/IUK/Frontend.pm:370 +#, perl-brace-format +msgid "" +"You should upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is recommended to close all the open applications during the upgrade.\n" +"Downloading the upgrade might take a long time, from several minutes to a few hours.\n" +"The networking will be disabled after downloading the upgrade.\n" +"\n" +"Download size: %{size}s\n" +"\n" +"Do you want to upgrade now?" +msgstr "Mali by ste vykonať aktualizáciu na %{name} %{version}.\n\nPre viac informácii o novej verzii navštívte stránku %{details_url}\n\nPočas aktualizácie sa odporúča mať zavreté všetky aplikácie.\nSťahovanie môže zabrať dlhší čas, od niekoľkých minút až po pár hodín.\nPo stiahnutí budú vypnuté všetky sieťové funkcie.\n\nVeľkosť sťahovania: %{size}\n\nChcete aktualizovať hneď teraz?" + +#: ../lib/Tails/IUK/Frontend.pm:385 +msgid "Upgrade available" +msgstr "Je dostupná aktualizácia" + +#: ../lib/Tails/IUK/Frontend.pm:386 +msgid "Upgrade now" +msgstr "Aktualizovať teraz" + +#: ../lib/Tails/IUK/Frontend.pm:387 +msgid "Upgrade later" +msgstr "Aktualizovať neskôr" + +#: ../lib/Tails/IUK/Frontend.pm:395 +#, perl-brace-format +msgid "" +"You should do a manual upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" +"\n" +"To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "Mali by ste vykonať manuálnu aktualizáciu na %{name} %{version}.\n\nPre viac informácii o tejto novej verzii navštívte stránku %{details_url}\n\nNie je možné automaticky aktualizovať vaše zariadenie na túto novú verziu: %{explanation}\n\nAk sa chcete dozvedieť ako manuálne aktualizovať systém, navštívte stránku https://tails.boum.org/doc/first_steps/upgrade/#manual" + +#: ../lib/Tails/IUK/Frontend.pm:411 +msgid "New version available" +msgstr "Je dostupná nová verzia" + +#: ../lib/Tails/IUK/Frontend.pm:468 +msgid "Downloading upgrade" +msgstr "Aktualizácia sa sťahuje" + +#: ../lib/Tails/IUK/Frontend.pm:471 +#, perl-brace-format +msgid "Downloading the upgrade to %{name}s %{version}s..." +msgstr "Sťahuje sa aktualizácia %{name} %{version}..." + +#: ../lib/Tails/IUK/Frontend.pm:512 +msgid "" +"The upgrade could not be downloaded.\\n\\nCheck your network " +"connection, and restart Tails to try upgrading again.\\n\\nIf the problem " +"persists, go to " +"file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "Aktualizáciu sa nepodarilo stiahnuť.\\n\\nSkontrolujte si vaše internetové pripojenie a reštartujte Tails za účelom ďalšieho pokusu o aktualizáciu.\\n\\nAk bude problém pretrvávať, navštívte stránku file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +msgid "Error while downloading the upgrade" +msgstr "Chyba pri sťahovaní aktualizácie" + +#: ../lib/Tails/IUK/Frontend.pm:540 +#, perl-brace-format +msgid "" +"Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " +"did not complain. Please report a bug." +msgstr "Výstupný súbor '%{output_file}' neexistuje, ale tails-iuk-get-target-file nevydal žiadnu správu o chybe. Prosíme, tento bug nahláste." + +#: ../lib/Tails/IUK/Frontend.pm:559 +msgid "Error while creating temporary downloading directory" +msgstr "Chyba pri vytváraní dočasného priečinka na sťahovanie" + +#: ../lib/Tails/IUK/Frontend.pm:562 +msgid "Failed to create temporary download directory" +msgstr "Nepodarilo sa vytvoriť dočasný priečinok na sťahovanie" + +#: ../lib/Tails/IUK/Frontend.pm:574 +msgid "" +"Your Tails device was successfully upgraded.\n" +"\n" +"Some security features were temporarily disabled.\n" +"You should restart Tails on the new version as soon as possible.\n" +"\n" +"Do you want to restart now?" +msgstr "Vaše Tails zariadenie bolo úspešne aktualizované.\n\nNiektoré bezpečnostné funkcie boli dočasne vypnuté.\nMali by ste reštartovať Tails na novú verziu tak skoro, ako to len bude možné.\n\nChcete reštartovať hneď teraz?" + +#: ../lib/Tails/IUK/Frontend.pm:579 +msgid "Restart Tails" +msgstr "Reštartovať Tails" + +#: ../lib/Tails/IUK/Frontend.pm:580 +msgid "Restart now" +msgstr "Reštartovať teraz" + +#: ../lib/Tails/IUK/Frontend.pm:581 +msgid "Restart later" +msgstr "Reštartovať neskôr" + +#: ../lib/Tails/IUK/Frontend.pm:592 +msgid "Error while restarting the system" +msgstr "Chyba pri reštartovaní systému" + +#: ../lib/Tails/IUK/Frontend.pm:595 +msgid "Failed to restart the system" +msgstr "Nepodarilo sa reštartovať systém" + +#: ../lib/Tails/IUK/Frontend.pm:610 +msgid "Error while shutting down the network" +msgstr "Chyba pri odpájaní sa zo siete" + +#: ../lib/Tails/IUK/Frontend.pm:613 +msgid "Failed to shutdown network" +msgstr "Nepodarilo sa odpojiť zo siete" + +#: ../lib/Tails/IUK/Frontend.pm:623 +msgid "Upgrading the system" +msgstr "Aktualizuje sa systém" + +#: ../lib/Tails/IUK/Frontend.pm:625 +msgid "" +"Your Tails device is being upgraded...\n" +"\n" +"For security reasons, the networking is now disabled." +msgstr "Vaše Tails zariadenie sa práve aktualizuje...\n\nZ bezpečnostných dôvodov sú všetky sieťové funkcie teraz vypnuté." + +#: ../lib/Tails/IUK/Frontend.pm:662 +msgid "" +"An error occured while installing the upgrade.\\n\\nYour Tails device" +" needs to be repaired and might be unable to restart.\\n\\nPlease follow the" +" instructions at " +"file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Pri inštalácii aktualizácii sa objavila chyba.\\n\\nVaše Tails zariadenie potrebuje opravu a je možné, že nezvládne reštart.\\n\\nProsíme nasledujte inštrukcie na stránke file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:672 +msgid "Error while installing the upgrade" +msgstr "Chyba pri inštalácii aktualizácie"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit debebb05164445a90383279b2205598e0629359a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 16:15:56 2014 +0000 Update translations for tails-iuk --- sk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sk.po b/sk.po index 60b2f6c..7243c22 100644 --- a/sk.po +++ b/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-04-02 15:45+0000\n" +"PO-Revision-Date: 2014-04-02 16:00+0000\n" "Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -107,7 +107,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Mali by ste vykonať aktualizáciu na %{name} %{version}.\n\nPre viac informácii o novej verzii navštívte stránku %{details_url}\n\nPočas aktualizácie sa odporúča mať zavreté všetky aplikácie.\nSťahovanie môže zabrať dlhší čas, od niekoľkých minút až po pár hodín.\nPo stiahnutí budú vypnuté všetky sieťové funkcie.\n\nVeľkosť sťahovania: %{size}\n\nChcete aktualizovať hneď teraz?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" @@ -131,7 +131,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "Mali by ste vykonať manuálnu aktualizáciu na %{name} %{version}.\n\nPre viac informácii o tejto novej verzii navštívte stránku %{details_url}\n\nNie je možné automaticky aktualizovať vaše zariadenie na túto novú verziu: %{explanation}\n\nAk sa chcete dozvedieť ako manuálne aktualizovať systém, navštívte stránku https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 02 Apr '14

02 Apr '14

commit e963e28a0909df5dd0ab521b055d5d33da6f5d25 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 2 16:15:10 2014 +0000 Update translations for gettor_completed --- el/gettor.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/el/gettor.po b/el/gettor.po index ffae0ca..5949700 100644 --- a/el/gettor.po +++ b/el/gettor.po @@ -6,16 +6,17 @@ # anvo <fragos.george(a)hotmail.com>, 2012 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Nisok Kosin <nikos.efthimiou(a)gmail.com>, 2012 -# anestv <varsamidis7-etc(a)yahoo.gr>, 2011 -# Wasilis <m.wasilis(a)yahoo.de>, 2013 +# anestv, 2011 +# Wasilis <inactive+Wasilis(a)transifex.com>, 2013 +# gioypi <gioypi(a)hotmail.gr>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2014-04-02 16:10+0000\n" +"Last-Translator: gioypi <gioypi(a)hotmail.gr>\n" +"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,7 +29,7 @@ msgstr "Χαίρεται, Αυτό είναι το robot \"GetTor\"" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "Σας ευχαριστούμε για το αίτημά σας" +msgstr "Σας ευχαριστούμε για το αίτημά σας." #: lib/gettor/i18n.py:31 msgid "" @@ -49,7 +50,7 @@ msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "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 "(Σας ζητούμε συγγνώμη εάν δεν ζήτησε για αυτό το mail. Από το email σας από μια υπηρεσία που δεν χρησιμοποιεί DKIM, θα στείλουμε μία σύντομη εξήγηση, και στη συνέχεια θα αγνοήσουμε αυτό το e-mail για την επόμενη ημέρα ή έτσι.)" +msgstr "(Σας ζητούμε συγγνώμη εάν δε ζητήσατε αυτό το μήνυμα. Αφού το email σας είναι από μια υπηρεσία που δεν χρησιμοποιεί DKIM, θα στείλουμε μία σύντομη εξήγηση, και στη συνέχεια θα αγνοήσουμε αυτή τη διεύθυνση e-mail στην την επόμενη ημέρα περίπου.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" @@ -79,7 +80,7 @@ msgstr "Θα σας στειλω με mail ενα Tor πακετο, αν μου msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "Παρακαλούμε απαντήστε σε αυτό το μήνυμα και γράψτε μας ένα όνομα πακέτου\nμέσα στο σώμα του μηνύματος." +msgstr "Παρακαλούμε απαντήστε σε αυτό το μήνυμα και γράψτε μας ένα όνομα πακέτου\nοπουδήποτε μέσα στο σώμα του μηνύματος." #: lib/gettor/i18n.py:64 msgid "" @@ -93,7 +94,7 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "Για να λάβετε μια μεταφρασμένη στην γλώσσα σας έκδοση Tor, προσδιορίστε την\nγλώσσα που επιθυμείτε μέσα στην διεύθυνση προς την οποία θα αποστείλετε το μήνυμα:\n\ngettor+fa@torproject.org" +msgstr "Για να λάβετε μια έκδοση Tor μεταφρασμένη στην γλώσσα σας , προσδιορίστε την\nγλώσσα που επιθυμείτε μέσα στην διεύθυνση προς την οποία θα αποστείλετε το μήνυμα:\n\ngettor+fa@torproject.org" #: lib/gettor/i18n.py:72 msgid "" @@ -155,13 +156,13 @@ msgstr "Απλώς γράψτε την λέξη 'split' μόνη της σε μ msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Αν στείλετε αυτό το κείμενο σε ένα email στο GetTor θα το αναγκάσει να σας στείλει το Tor Browser Bundle σε πολλά μηνύματα με 1,4 MB συνημμένα." +msgstr "Στέλνοντας αυτό το κείμενο, χρησιμοποιώντας ένα email, προς το GetTor θα σας σταλεί το Tor Browser Bundle σε μία σειρά από συνημμένα χωρητικότητας 1,4 MB." #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Μετά την παραλαβή όλων των μερών, θα πρέπει να τα ξανά-συναρμολογήσετε το πακέτο και πάλι. Αυτό γίνεται ως εξής:" +msgstr "Μετά την παραλαβή όλων των κομματιών, θα πρέπει να τα ξανά-συναρμολογήσετε σε ένα πακέτο και πάλι. Αυτό γίνεται ως εξής:" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." @@ -192,11 +193,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Όταν ολοκληρωθεί η αποσυμπίεση, θα βρείτε ένα καινούριο\nαρχείο \".exe\" στον φάκελο προορισμού. Απλώς διπλοπατήστε\nτο και το Πακέτο Περιηγητή θα ξεκινήσει σε λίγο." +msgstr "5.) Όταν ολοκληρωθεί η αποσυμπίεση, θα βρείτε ένα καινούριο\nαρχείο \".exe\" στον φάκελο προορισμού. Απλώς διπλοπατήστε\nτο και το Πακέτο Περιηγητή - Tor Browser Bundle θα ξεκινήσει σε λίγο." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6) Ολοκληρώθηκε η διαδικασία. Σας ευχαριστούμε που χρησιμοποιείτε το TOR και καλή διασκέδαση!" +msgstr "6)Αυτό ήταν. Τελειώσατε. Σας ευχαριστούμε που χρησιμοποιείτε το TOR και καλή διασκέδαση!" #: lib/gettor/i18n.py:132 msgid "" @@ -249,7 +250,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Αν η σύνδεσή σας στο Διαδίκτυο εμποδίζει την πρόσβαση στο δίκτυο Tor\nίσως χρειάζεστε κάποια αναμετάδοση γέφυρας. Οι γέφυρες αναμετάδοσης (ή \"γέφυρες\", εν συντομία)\nείναι αναμεταδότες Tor οι οποίες δεν καταγράφονται στον κύριο κατάλογο. Εφόσον\nδεν υπάρχει δημόσια πλήρης λίστα των γεφυρών αυτών, ακόμη κι αν η Εταιρία Παροχής Ιντερνέτ φιλτράρει\nτις συνδέσεις προς όλους τους αναμεταδότες Tor, πιθανόν δεν είναι σε θέση\nνα εμποδίσει όλες τις γέφυρες." +msgstr "Αν η σύνδεσή σας στο Διαδίκτυο εμποδίζει την πρόσβαση στο δίκτυο Tor\nίσως χρειάζεστε κάποια αναμετάδοση γέφυρας. Οι γέφυρες αναμετάδοσης (ή \"γέφυρες\", εν συντομία)\nείναι αναμεταδότες Tor οι οποίες δεν καταγράφονται στον κύριο κατάλογο. Εφόσον\nδεν υπάρχει δημόσια πλήρης λίστα των γεφυρών αυτών, ακόμη κι αν η Εταιρία Παροχής Διαδικτύου σας φιλτράρει\nτις συνδέσεις προς όλους τους αναμεταδότες Tor, πιθανόν δεν είναι σε θέση να εμποδίσει όλες τις γέφυρες.\nνα εμποδίσει όλες τις γέφυρες." #: lib/gettor/i18n.py:167 msgid "" @@ -279,7 +280,7 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "ΣΗΜΑΝΤΙΚΗ ΣΗΜΕΙΩΣΗ:\nΕφόσον η διαδικασία αυτή είναι μέρος ενός αιτήματος μεμονωμένων αρχείων, θα πρέπει να περιμένετε να παραλάβετε\nόλα τα μεμονωμένα αρχεία πριν τα αποθηκεύσετε όλα\nμέσα στον ίδιο κατάλογο και τα αποσυμπιέσετε διπλοπατώντας το\nπρώτο αρχείο." +msgstr "ΣΗΜΑΝΤΙΚΗ ΣΗΜΕΙΩΣΗ:\nΕφόσον η διαδικασία αυτή είναι μέρος ενός αιτήματος μεμονωμένων αρχείων, θα πρέπει να περιμένετε\n να παραλάβετε όλα τα μεμονωμένα αρχεία πριν τα αποθηκεύσετε όλα\nμέσα στον ίδιο κατάλογο και τα αποσυμπιέσετε διπλοπατώντας \nτο πρώτο αρχείο.\nπρώτο αρχείο." #: lib/gettor/i18n.py:185 msgid ""

1 0