September 2018 - tor-commits - lists.torproject.org

[tor/master] Document new helper functions in socketpair.c
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit ff7229b32cb2f5a3c384200caac35e0626199087 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 09:43:25 2018 -0400 Document new helper functions in socketpair.c --- src/lib/net/socketpair.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index a12c25cc8..8dd04d048 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -32,6 +32,11 @@ // Avoid warning about call to memcmp. #define raw_memcmp memcmp +/** + * Return a new socket that is bound and listening on the loopback interface + * of family family for a socket of type type. On failure return + * TOR_INVALID_SOCKET. + */ static tor_socket_t get_local_listener(int family, int type) { @@ -72,6 +77,9 @@ get_local_listener(int family, int type) return TOR_INVALID_SOCKET; } +/** + * Return true iff sa1 and sa2 are equivalent AF_INET or AF_INET6 addresses. + */ static int sockaddr_eq(struct sockaddr *sa1, struct sockaddr *sa2) {

1 0

[tor/master] Reindent tor_ersatz_socketpair
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit 1b7b9c7e63848a125c05efc3c1b9a5868946a9cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 09:41:45 2018 -0400 Reindent tor_ersatz_socketpair --- src/lib/net/socketpair.c | 176 +++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index c4e0d1eed..a12c25cc8 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -100,106 +100,106 @@ sockaddr_eq(struct sockaddr *sa1, struct sockaddr *sa2) int tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) { - /* This socketpair does not work when localhost is down. So - * it's really not the same thing at all. But it's close enough - * for now, and really, when localhost is down sometimes, we - * have other problems too. - */ - tor_socket_t listener = TOR_INVALID_SOCKET; - tor_socket_t connector = TOR_INVALID_SOCKET; - tor_socket_t acceptor = TOR_INVALID_SOCKET; - struct sockaddr_storage accepted_addr_ss; - struct sockaddr_storage connect_addr_ss; - struct sockaddr *connect_addr = (struct sockaddr *) &connect_addr_ss; - struct sockaddr *accepted_addr = (struct sockaddr *) &accepted_addr_ss; - socklen_t size; - int saved_errno = -1; - int ersatz_domain = AF_INET; - socklen_t addrlen = sizeof(struct sockaddr_in); - - memset(&accepted_addr_ss, 0, sizeof(accepted_addr_ss)); - memset(&connect_addr_ss, 0, sizeof(connect_addr_ss)); - - if (protocol + /* This socketpair does not work when localhost is down. So + * it's really not the same thing at all. But it's close enough + * for now, and really, when localhost is down sometimes, we + * have other problems too. + */ + tor_socket_t listener = TOR_INVALID_SOCKET; + tor_socket_t connector = TOR_INVALID_SOCKET; + tor_socket_t acceptor = TOR_INVALID_SOCKET; + struct sockaddr_storage accepted_addr_ss; + struct sockaddr_storage connect_addr_ss; + struct sockaddr *connect_addr = (struct sockaddr *) &connect_addr_ss; + struct sockaddr *accepted_addr = (struct sockaddr *) &accepted_addr_ss; + socklen_t size; + int saved_errno = -1; + int ersatz_domain = AF_INET; + socklen_t addrlen = sizeof(struct sockaddr_in); + + memset(&accepted_addr_ss, 0, sizeof(accepted_addr_ss)); + memset(&connect_addr_ss, 0, sizeof(connect_addr_ss)); + + if (protocol #ifdef AF_UNIX - || family != AF_UNIX + || family != AF_UNIX #endif - ) { + ) { #ifdef _WIN32 - return -WSAEAFNOSUPPORT; + return -WSAEAFNOSUPPORT; #else - return -EAFNOSUPPORT; + return -EAFNOSUPPORT; #endif - } - if (!fd) { - return -EINVAL; - } + } + if (!fd) { + return -EINVAL; + } - listener = get_local_listener(ersatz_domain, type); + listener = get_local_listener(ersatz_domain, type); + if (!SOCKET_OK(listener)) { + int first_errno = socket_errno(); + if (first_errno == SOCKET_EPROTONOSUPPORT) { + /* Assume we're on an IPv6-only system */ + ersatz_domain = AF_INET6; + addrlen = sizeof(struct sockaddr_in6); + listener = get_local_listener(ersatz_domain, type); + } if (!SOCKET_OK(listener)) { - int first_errno = socket_errno(); - if (first_errno == SOCKET_EPROTONOSUPPORT) { - /* Assume we're on an IPv6-only system */ - ersatz_domain = AF_INET6; - addrlen = sizeof(struct sockaddr_in6); - listener = get_local_listener(ersatz_domain, type); - } - if (!SOCKET_OK(listener)) { - /* Keep the previous behaviour, which was to return the IPv4 error. - * (This may be less informative on IPv6-only systems.) - * XX/teor - is there a better way to decide which errno to return? - * (I doubt we care much either way, once there is an error.) - */ - return -first_errno; - } + /* Keep the previous behaviour, which was to return the IPv4 error. + * (This may be less informative on IPv6-only systems.) + * XX/teor - is there a better way to decide which errno to return? + * (I doubt we care much either way, once there is an error.) + */ + return -first_errno; } + } - connector = socket(ersatz_domain, type, 0); - if (!SOCKET_OK(connector)) - goto tidy_up_and_fail; - /* We want to find out the port number to connect to. */ - size = sizeof(connect_addr_ss); - if (getsockname(listener, connect_addr, &size) == -1) - goto tidy_up_and_fail; - if (size != addrlen) - goto abort_tidy_up_and_fail; - if (connect(connector, connect_addr, size) == -1) - goto tidy_up_and_fail; - - size = sizeof(accepted_addr_ss); - acceptor = accept(listener, accepted_addr, &size); - if (!SOCKET_OK(acceptor)) - goto tidy_up_and_fail; - if (size != addrlen) - goto abort_tidy_up_and_fail; - /* Now check we are talking to ourself by matching port and host on the - two sockets. */ - if (getsockname(connector, connect_addr, &size) == -1) - goto tidy_up_and_fail; - /* Set *_tor_addr and *_port to the address and port that was used */ - if (!sockaddr_eq(accepted_addr, connect_addr)) - goto abort_tidy_up_and_fail; - closesocket(listener); - fd[0] = connector; - fd[1] = acceptor; - return 0; - - abort_tidy_up_and_fail: + connector = socket(ersatz_domain, type, 0); + if (!SOCKET_OK(connector)) + goto tidy_up_and_fail; + /* We want to find out the port number to connect to. */ + size = sizeof(connect_addr_ss); + if (getsockname(listener, connect_addr, &size) == -1) + goto tidy_up_and_fail; + if (size != addrlen) + goto abort_tidy_up_and_fail; + if (connect(connector, connect_addr, size) == -1) + goto tidy_up_and_fail; + + size = sizeof(accepted_addr_ss); + acceptor = accept(listener, accepted_addr, &size); + if (!SOCKET_OK(acceptor)) + goto tidy_up_and_fail; + if (size != addrlen) + goto abort_tidy_up_and_fail; + /* Now check we are talking to ourself by matching port and host on the + two sockets. */ + if (getsockname(connector, connect_addr, &size) == -1) + goto tidy_up_and_fail; + /* Set *_tor_addr and *_port to the address and port that was used */ + if (!sockaddr_eq(accepted_addr, connect_addr)) + goto abort_tidy_up_and_fail; + closesocket(listener); + fd[0] = connector; + fd[1] = acceptor; + return 0; + + abort_tidy_up_and_fail: #ifdef _WIN32 - saved_errno = WSAECONNABORTED; + saved_errno = WSAECONNABORTED; #else - saved_errno = ECONNABORTED; /* I hope this is portable and appropriate. */ + saved_errno = ECONNABORTED; /* I hope this is portable and appropriate. */ #endif - tidy_up_and_fail: - if (saved_errno < 0) - saved_errno = errno; - if (SOCKET_OK(listener)) - closesocket(listener); - if (SOCKET_OK(connector)) - closesocket(connector); - if (SOCKET_OK(acceptor)) - closesocket(acceptor); - return -saved_errno; + tidy_up_and_fail: + if (saved_errno < 0) + saved_errno = errno; + if (SOCKET_OK(listener)) + closesocket(listener); + if (SOCKET_OK(connector)) + closesocket(connector); + if (SOCKET_OK(acceptor)) + closesocket(acceptor); + return -saved_errno; } #endif /* defined(NEED_ERSATZ_SOCKETPAIR) */

1 0

[tor/master] Refactor tor_ersatz_socketpair() not to need socket.
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit fc0dc5aa9ef526a8ed776fe4896fe4007173c638 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 09:40:02 2018 -0400 Refactor tor_ersatz_socketpair() not to need socket. This change also makes tor_ersatz_socketpair() follow the same interface as socketpair() rather than tor_socketpair(), so it now needs to be wrapped in the same code as socketpair() does. --- src/lib/net/socket.c | 10 ++++++---- src/lib/net/socketpair.c | 34 ++++++++++++++++++++++------------ src/lib/net/socketpair.h | 4 ++-- src/test/test_util.c | 24 +++++++++++++++++------- 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c index 5487b8d9d..06421b080 100644 --- a/src/lib/net/socket.c +++ b/src/lib/net/socket.c @@ -420,9 +420,9 @@ get_n_open_sockets(void) int tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) { + int r; //don't use win32 socketpairs (they are always bad) #if defined(HAVE_SOCKETPAIR) && !defined(_WIN32) - int r; #ifdef SOCK_CLOEXEC r = socketpair(family, type|SOCK_CLOEXEC, protocol, fd); @@ -438,6 +438,11 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) r = socketpair(family, type, protocol, fd); if (r < 0) return -errno; +#else + r = tor_ersatz_socketpair(family, type, protocol, fd); + if (r < 0) + return -r; +#endif #if defined(FD_CLOEXEC) if (SOCKET_OK(fd[0])) { @@ -472,9 +477,6 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) socket_accounting_unlock(); return 0; -#else /* !(defined(HAVE_SOCKETPAIR) && !defined(_WIN32)) */ - return tor_ersatz_socketpair(family, type, protocol, fd); -#endif /* defined(HAVE_SOCKETPAIR) && !defined(_WIN32) */ } /** Mockable wrapper for getsockname(). */ diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c index b656938c4..c4e0d1eed 100644 --- a/src/lib/net/socketpair.c +++ b/src/lib/net/socketpair.c @@ -3,18 +3,28 @@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ #include "lib/net/socketpair.h" -#include "lib/net/socket.h" +#include "lib/net/inaddr_st.h" #include "lib/arch/bytes.h" #include <errno.h> #include <string.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif + #ifdef _WIN32 #include <winsock2.h> #include <windows.h> +#define socket_errno() (WSAGetLastError()) +#define SOCKET_EPROTONOSUPPORT WSAEPROTONOSUPPORT +#else +#define closesocket(x) close(x) +#define socket_errno() (errno) +#define SOCKET_EPROTONOSUPPORT EPROTONOSUPPORT #endif #ifdef NEED_ERSATZ_SOCKETPAIR @@ -34,7 +44,7 @@ get_local_listener(int family, int type) memset(&sin6, 0, sizeof(sin6)); tor_socket_t sock = TOR_INVALID_SOCKET; - sock = tor_open_socket(family, type, 0); + sock = socket(family, type, 0); if (!SOCKET_OK(sock)) { return TOR_INVALID_SOCKET; } @@ -58,7 +68,7 @@ get_local_listener(int family, int type) return sock; err: - tor_close_socket(sock); + closesocket(sock); return TOR_INVALID_SOCKET; } @@ -87,7 +97,7 @@ sockaddr_eq(struct sockaddr *sa1, struct sockaddr *sa2) * Helper used to implement socketpair on systems that lack it, by * making a direct connection to localhost. */ -STATIC int +int tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) { /* This socketpair does not work when localhost is down. So @@ -127,8 +137,8 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) listener = get_local_listener(ersatz_domain, type); if (!SOCKET_OK(listener)) { - int first_errno = tor_socket_errno(-1); - if (first_errno == SOCK_ERRNO(EPROTONOSUPPORT)) { + int first_errno = socket_errno(); + if (first_errno == SOCKET_EPROTONOSUPPORT) { /* Assume we're on an IPv6-only system */ ersatz_domain = AF_INET6; addrlen = sizeof(struct sockaddr_in6); @@ -144,7 +154,7 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) } } - connector = tor_open_socket(ersatz_domain, type, 0); + connector = socket(ersatz_domain, type, 0); if (!SOCKET_OK(connector)) goto tidy_up_and_fail; /* We want to find out the port number to connect to. */ @@ -157,7 +167,7 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) goto tidy_up_and_fail; size = sizeof(accepted_addr_ss); - acceptor = tor_accept_socket(listener, accepted_addr, &size); + acceptor = accept(listener, accepted_addr, &size); if (!SOCKET_OK(acceptor)) goto tidy_up_and_fail; if (size != addrlen) @@ -169,7 +179,7 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) /* Set *_tor_addr and *_port to the address and port that was used */ if (!sockaddr_eq(accepted_addr, connect_addr)) goto abort_tidy_up_and_fail; - tor_close_socket(listener); + closesocket(listener); fd[0] = connector; fd[1] = acceptor; return 0; @@ -184,11 +194,11 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) if (saved_errno < 0) saved_errno = errno; if (SOCKET_OK(listener)) - tor_close_socket(listener); + closesocket(listener); if (SOCKET_OK(connector)) - tor_close_socket(connector); + closesocket(connector); if (SOCKET_OK(acceptor)) - tor_close_socket(acceptor); + closesocket(acceptor); return -saved_errno; } diff --git a/src/lib/net/socketpair.h b/src/lib/net/socketpair.h index 3efa65a67..6eecc0737 100644 --- a/src/lib/net/socketpair.h +++ b/src/lib/net/socketpair.h @@ -12,8 +12,8 @@ #if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS) #define NEED_ERSATZ_SOCKETPAIR -STATIC int tor_ersatz_socketpair(int family, int type, int protocol, - tor_socket_t fd[2]); +int tor_ersatz_socketpair(int family, int type, int protocol, + tor_socket_t fd[2]); #endif #endif diff --git a/src/test/test_util.c b/src/test/test_util.c index 7afe83c69..d8246941e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5540,10 +5540,13 @@ test_util_socketpair(void *arg) tt_assert(SOCKET_OK(fds[0])); tt_assert(SOCKET_OK(fds[1])); - tt_int_op(get_n_open_sockets(), OP_EQ, n + 2); + if (ersatz) + tt_int_op(get_n_open_sockets(), OP_EQ, n); + else + tt_int_op(get_n_open_sockets(), OP_EQ, n + 2); #ifdef CAN_CHECK_CLOEXEC - tt_int_op(fd_is_cloexec(fds[0]), OP_EQ, 1); - tt_int_op(fd_is_cloexec(fds[1]), OP_EQ, 1); + tt_int_op(fd_is_cloexec(fds[0]), OP_EQ, !ersatz); + tt_int_op(fd_is_cloexec(fds[1]), OP_EQ, !ersatz); #endif #ifdef CAN_CHECK_NONBLOCK tt_int_op(fd_is_nonblocking(fds[0]), OP_EQ, 0); @@ -5551,10 +5554,17 @@ test_util_socketpair(void *arg) #endif done: - if (SOCKET_OK(fds[0])) - tor_close_socket(fds[0]); - if (SOCKET_OK(fds[1])) - tor_close_socket(fds[1]); + if (ersatz) { + if (SOCKET_OK(fds[0])) + tor_close_socket_simple(fds[0]); + if (SOCKET_OK(fds[1])) + tor_close_socket_simple(fds[1]); + } else { + if (SOCKET_OK(fds[0])) + tor_close_socket(fds[0]); + if (SOCKET_OK(fds[1])) + tor_close_socket(fds[1]); + } } #undef SOCKET_EPROTO

1 0

[tor/master] Convert __OwningControllerFD to a 64-bit value
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit fe3bacf50a8d6e7fcec5f8bb1d5c0ac32c41a57c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 10:49:08 2018 -0400 Convert __OwningControllerFD to a 64-bit value This lets us potentially use it for internal passing of windows sockets. --- src/app/config/config.c | 15 +++++++-------- src/app/config/confparse.c | 15 +++++++++++++++ src/app/config/confparse.h | 2 ++ src/app/config/or_options_st.h | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1b1889779..463405d19 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -260,6 +260,9 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t); VAR(#member, LINELIST_S, member ## _lines, NULL), \ VAR("__" #member, LINELIST_S, member ## _lines, NULL) +/** UINT64_MAX as a decimal string */ +#define UINT64_MAX_STRING "18446744073709551615" + /** Array of configuration options. Until we disallow nonstandard * abbreviations, order is significant, since the first matching option will * be chosen first. @@ -647,7 +650,7 @@ static config_var_t option_vars_[] = { VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword, NULL), VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), - VAR("__OwningControllerFD",INT,OwningControllerFD, "-1"), + VAR("__OwningControllerFD", UINT64, OwningControllerFD, UINT64_MAX_STRING), V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"), V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"), V(TestingClientDownloadInitialDelay, CSV_INTERVAL, "0"), @@ -1948,12 +1951,8 @@ options_act(const or_options_t *old_options) // LCOV_EXCL_STOP } - if (running_tor && !old_options && options->OwningControllerFD != -1) { -#ifdef _WIN32 - log_warn(LD_CONFIG, "OwningControllerFD is not supported on Windows. " - "If you need it, tell the Tor developers."); - return -1; -#else + if (running_tor && !old_options && + options->OwningControllerFD != UINT64_MAX) { const unsigned ctrl_flags = CC_LOCAL_FD_IS_OWNER | CC_LOCAL_FD_IS_AUTHENTICATED; @@ -1963,7 +1962,6 @@ options_act(const or_options_t *old_options) "given FD."); return -1; } -#endif /* defined(_WIN32) */ } /* Load state */ @@ -8197,6 +8195,7 @@ getinfo_helper_config(control_connection_t *conn, case CONFIG_TYPE_STRING: type = "String"; break; case CONFIG_TYPE_FILENAME: type = "Filename"; break; case CONFIG_TYPE_UINT: type = "Integer"; break; + case CONFIG_TYPE_UINT64: type = "Integer"; break; case CONFIG_TYPE_INT: type = "SignedInteger"; break; case CONFIG_TYPE_PORT: type = "Port"; break; case CONFIG_TYPE_INTERVAL: type = "TimeInterval"; break; diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 6fa4fd1ea..045cbc94f 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -195,6 +195,19 @@ config_assign_value(const config_format_t *fmt, void *options, *(int *)lvalue = i; break; + case CONFIG_TYPE_UINT64: { + uint64_t u64 = tor_parse_uint64(c->value, 10, + 0, UINT64_MAX, &ok, NULL); + if (!ok) { + tor_asprintf(msg, + "uint64 keyword '%s %s' is malformed or out of bounds.", + c->key, c->value); + return -1; + } + *(uint64_t *)lvalue = u64; + break; + } + case CONFIG_TYPE_CSV_INTERVAL: { /* We used to have entire smartlists here. But now that all of our * download schedules use exponential backoff, only the first part @@ -574,6 +587,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options, tor_asprintf(&result->value, "%d", *(int*)value); escape_val = 0; /* Can't need escape. */ break; + case CONFIG_TYPE_UINT64: /* Fall through */ case CONFIG_TYPE_MEMUNIT: tor_asprintf(&result->value, "%"PRIu64, (*(uint64_t*)value)); @@ -781,6 +795,7 @@ config_clear(const config_format_t *fmt, void *options, case CONFIG_TYPE_AUTOBOOL: *(int*)lvalue = -1; break; + case CONFIG_TYPE_UINT64: case CONFIG_TYPE_MEMUNIT: *(uint64_t*)lvalue = 0; break; diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 570428c90..aebd035c5 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -19,6 +19,7 @@ typedef enum config_type_t { CONFIG_TYPE_FILENAME, /**< A filename: some prefixes get expanded. */ CONFIG_TYPE_UINT, /**< A non-negative integer less than MAX_INT */ CONFIG_TYPE_INT, /**< Any integer. */ + CONFIG_TYPE_UINT64, /**< A value in range 0..UINT64_MAX */ CONFIG_TYPE_PORT, /**< A port from 1...65535, 0 for "not set", or * "auto". */ CONFIG_TYPE_INTERVAL, /**< A number of seconds, with optional units*/ @@ -60,6 +61,7 @@ typedef union { * "UINT", it still uses the C int type -- it just enforces that * the values are in range [0,INT_MAX]. */ + uint64_t *UINT64; int *INT; int *PORT; int *INTERVAL; diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 627b39aea..e5a7a01f2 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -514,7 +514,7 @@ struct or_options_t { * instance. Tor will terminate if its owning controller does. */ char *OwningControllerProcess; /** FD specifier for a controller that owns this Tor instance. */ - int OwningControllerFD; + uint64_t OwningControllerFD; int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how * long do we wait before exiting? */

1 0

[tor/master] Add API for creating an owning controller FD and passing it to tor_main
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit c77fe82155c7ed862358f9869e0dcb1ba8772f83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 10:36:10 2018 -0400 Add API for creating an owning controller FD and passing it to tor_main --- src/feature/api/tor_api.c | 49 ++++++++++++++++++++++++++++++++++++-- src/feature/api/tor_api.h | 12 ++++++++++ src/feature/api/tor_api_internal.h | 3 +++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/feature/api/tor_api.c b/src/feature/api/tor_api.c index 755d28aad..664a3a0d8 100644 --- a/src/feature/api/tor_api.c +++ b/src/feature/api/tor_api.c @@ -8,12 +8,19 @@ * \file tor_api.c **/ +#ifdef _WIN32 +#include <winsock2.h> +#include <windows.h> +#endif + #include "feature/api/tor_api.h" -#include "feature/api/tor_api_internal.h" // Include this after the above headers, to insure that they don't // depend on anything else. #include "orconfig.h" +#include "feature/api/tor_api_internal.h" +#include "lib/cc/torint.h" +#include "lib/cc/compat_compiler.h" #include <stdio.h> #include <stdlib.h> @@ -28,6 +35,20 @@ #define raw_realloc realloc #define raw_strdup strdup +#ifdef _WIN32 +#include "lib/net/socketpair.h" +#define raw_socketpair tor_ersatz_socketpair +#define raw_closesocket closesocket +#define snprintf _snprintf +#else +#define raw_socketpair socketpair +#define raw_closesocket close +#endif + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + /** * Helper: Add a copy of arg to the owned arguments of cfg. * Return 0 on success, -1 on failure. @@ -61,6 +82,8 @@ tor_main_configuration_new(void) cfg->argc = 1; cfg->argv = (char **) fake_argv; + cfg->owning_controller_socket = TOR_INVALID_SOCKET; + return cfg; } @@ -75,12 +98,31 @@ tor_main_configuration_set_command_line(tor_main_configuration_t *cfg, return 0; } +tor_control_socket_t +tor_main_configuration_setup_control_socket(tor_main_configuration_t *cfg) +{ + if (SOCKET_OK(cfg->owning_controller_socket)) + return INVALID_TOR_CONTROL_SOCKET; + + tor_socket_t fds[2]; + if (raw_socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) { + return INVALID_TOR_CONTROL_SOCKET; + } + char buf[32]; + snprintf(buf, sizeof(buf), "%"PRIu64, (uint64_t)fds[1]); + + cfg_add_owned_arg(cfg, "__OwningControllerFD"); + cfg_add_owned_arg(cfg, buf); + + cfg->owning_controller_socket = fds[1]; + return fds[0]; +} + void tor_main_configuration_free(tor_main_configuration_t *cfg) { if (cfg == NULL) return; - cfg_add_owned_arg(cfg, "bye");//XXXX if (cfg->argv_owned) { int i; for (i = 0; i < cfg->argc_owned; ++i) { @@ -88,6 +130,9 @@ tor_main_configuration_free(tor_main_configuration_t *cfg) } raw_free(cfg->argv_owned); } + if (SOCKET_OK(cfg->owning_controller_socket)) { + raw_closesocket(cfg->owning_controller_socket); + } raw_free(cfg); } diff --git a/src/feature/api/tor_api.h b/src/feature/api/tor_api.h index 5133e3cec..0e22ced2d 100644 --- a/src/feature/api/tor_api.h +++ b/src/feature/api/tor_api.h @@ -49,6 +49,18 @@ tor_main_configuration_t *tor_main_configuration_new(void); int tor_main_configuration_set_command_line(tor_main_configuration_t *cfg, int argc, char *argv[]); +#ifdef _WIN32 +typedef SOCKET tor_control_socket_t; +#define INVALID_TOR_CONTROL_SOCKET INVALID_SOCKET +#else +typedef int tor_control_socket_t; +#define INVALID_TOR_CONTROL_SOCKET (-1) +#endif + +/** DOCDOC */ +tor_control_socket_t tor_main_configuration_setup_control_socket( + tor_main_configuration_t *cfg); + /** * Release all storage held in cfg. * diff --git a/src/feature/api/tor_api_internal.h b/src/feature/api/tor_api_internal.h index 30924b8b0..1e32012d0 100644 --- a/src/feature/api/tor_api_internal.h +++ b/src/feature/api/tor_api_internal.h @@ -21,6 +21,9 @@ struct tor_main_configuration_t { int argc_owned; /** As argv, but is owned by the tor_main_configuration_t object. */ char **argv_owned; + + /** Socket that Tor will use as an owning control socket. Owned. */ + tor_socket_t owning_controller_socket; }; #endif /* !defined(TOR_API_INTERNAL_H) */

1 0

[tor/master] tor_api: Extend tor_api code so it can pass extra arguments to main.
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit 9a89450b6d1734fb8e015093353a5d0568b41b79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 10:15:44 2018 -0400 tor_api: Extend tor_api code so it can pass extra arguments to main. We need this so that the tor_api user can specify some arguments, while the tor_api implementation adds others. This implementation detail should not be visible to tor_api users. --- src/core/mainloop/main.c | 29 +++++++++++++++++++++-------- src/feature/api/tor_api.c | 31 ++++++++++++++++++++++++++++++- src/feature/api/tor_api.h | 1 - src/feature/api/tor_api_internal.h | 8 +++++++- src/tools/tor_runner.c | 9 ++++++--- 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c index 048397a2d..4bb55c7ba 100644 --- a/src/core/mainloop/main.c +++ b/src/core/mainloop/main.c @@ -4204,9 +4204,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) { int result = 0; - int argc = tor_cfg->argc; - char **argv = tor_cfg->argv; - #ifdef _WIN32 #ifndef HeapEnableTerminationOnCorruption #define HeapEnableTerminationOnCorruption 1 @@ -4242,25 +4239,39 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) tor_compress_init(); init_logging(0); monotime_init(); + + int argc = tor_cfg->argc + tor_cfg->argc_owned; + char **argv = tor_calloc(argc, sizeof(char*)); + memcpy(argv, tor_cfg->argv, tor_cfg->argc*sizeof(char*)); + if (tor_cfg->argc_owned) + memcpy(argv + tor_cfg->argc, tor_cfg->argv_owned, + tor_cfg->argc_owned*sizeof(char*)); + #ifdef NT_SERVICE { int done = 0; result = nt_service_parse_options(argc, argv, &done); - if (done) return result; + if (done) { + goto done; + } } #endif /* defined(NT_SERVICE) */ { int init_rv = tor_init(argc, argv); - if (init_rv < 0) - return -1; - else if (init_rv > 0) - return 0; + if (init_rv < 0) { + result = -1; + goto done; + } else if (init_rv > 0) { + result = 0; + goto done; + } } if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) { sandbox_cfg_t* cfg = sandbox_init_filter(); if (sandbox_init(cfg)) { + tor_free(argv); log_err(LD_BUG,"Failed to create syscall sandbox filter"); return -1; } @@ -4308,5 +4319,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) result = -1; } tor_cleanup(); + done: + tor_free(argv); return result; } diff --git a/src/feature/api/tor_api.c b/src/feature/api/tor_api.c index 2a4458bf6..755d28aad 100644 --- a/src/feature/api/tor_api.c +++ b/src/feature/api/tor_api.c @@ -25,6 +25,28 @@ #define raw_malloc malloc #define raw_free free +#define raw_realloc realloc +#define raw_strdup strdup + +/** + * Helper: Add a copy of arg to the owned arguments of cfg. + * Return 0 on success, -1 on failure. + */ +static int +cfg_add_owned_arg(tor_main_configuration_t *cfg, const char *arg) +{ + /* We aren't using amortized realloc here, because libc should do it for us, + * and because this function is not critical-path. */ + char **new_argv = raw_realloc(cfg->argv_owned, + sizeof(char*) * (cfg->argc_owned+1)); + if (new_argv == NULL) + return -1; + cfg->argv_owned = new_argv; + if (NULL == (cfg->argv_owned[cfg->argc_owned] = raw_strdup(arg))) + return -1; + ++cfg->argc_owned; + return 0; +} tor_main_configuration_t * tor_main_configuration_new(void) @@ -58,6 +80,14 @@ tor_main_configuration_free(tor_main_configuration_t *cfg) { if (cfg == NULL) return; + cfg_add_owned_arg(cfg, "bye");//XXXX + if (cfg->argv_owned) { + int i; + for (i = 0; i < cfg->argc_owned; ++i) { + raw_free(cfg->argv_owned[i]); + } + raw_free(cfg->argv_owned); + } raw_free(cfg); } @@ -85,4 +115,3 @@ tor_main(int argc, char *argv[]) tor_main_configuration_free(cfg); return rv; } - diff --git a/src/feature/api/tor_api.h b/src/feature/api/tor_api.h index ead9493c1..5133e3cec 100644 --- a/src/feature/api/tor_api.h +++ b/src/feature/api/tor_api.h @@ -98,4 +98,3 @@ int tor_run_main(const tor_main_configuration_t *); int tor_main(int argc, char **argv); #endif /* !defined(TOR_API_H) */ - diff --git a/src/feature/api/tor_api_internal.h b/src/feature/api/tor_api_internal.h index 2c392a68d..30924b8b0 100644 --- a/src/feature/api/tor_api_internal.h +++ b/src/feature/api/tor_api_internal.h @@ -7,6 +7,8 @@ #ifndef TOR_API_INTERNAL_H #define TOR_API_INTERNAL_H +#include "lib/net/nettypes.h" + /* The contents of this type are private; don't mess with them from outside * Tor. */ struct tor_main_configuration_t { @@ -14,7 +16,11 @@ struct tor_main_configuration_t { int argc; /** As in main(). This pointer is owned by the caller */ char **argv; + + /** As argc, but describes the number of elements in argv_owned */ + int argc_owned; + /** As argv, but is owned by the tor_main_configuration_t object. */ + char **argv_owned; }; #endif /* !defined(TOR_API_INTERNAL_H) */ - diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index dd90af3df..4b21d7bf9 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -86,9 +86,13 @@ child(const tor_main_configuration_t *cfg) { /* XXXX Close unused file descriptors. */ - char **args = real_calloc(cfg->argc+1, sizeof(char *)); + char **args = real_calloc(cfg->argc + cfg->argc_owned+1, sizeof(char *)); memcpy(args, cfg->argv, cfg->argc * sizeof(char *)); - args[cfg->argc] = NULL; + if (cfg->argc_owned) + memcpy(args + cfg->argc, cfg->argv_owned, + cfg->argc_owned * sizeof(char *)); + + args[cfg->argc + cfg->argc_owned] = NULL; int rv = execv(BINDIR "/tor", args); @@ -98,4 +102,3 @@ child(const tor_main_configuration_t *cfg) abort(); /* Unreachable */ } } -

1 0

[tor/master] Changes file for owningcontrollerfd api
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit 820aba70efcc6f50f23cf676832412852a01141a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 1 11:09:15 2018 -0400 Changes file for owningcontrollerfd api --- changes/ticket24204 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket24204 b/changes/ticket24204 new file mode 100644 index 000000000..835952045 --- /dev/null +++ b/changes/ticket24204 @@ -0,0 +1,5 @@ + o Minor features (embedding API): + - The Tor controller API now supports a function to launch Tor with a + preconstructed owning controller FD, so that embedding applications + don't need to manage controller ports and authentication. Closes + ticket 24204.

1 0

[tor/master] c99 style in loop
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit 1e71e2c1045377b85d38760e257dd9c57c959c9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 11:04:55 2018 -0400 c99 style in loop --- src/feature/api/tor_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/feature/api/tor_api.c b/src/feature/api/tor_api.c index efc4fdf8d..c9f4f8707 100644 --- a/src/feature/api/tor_api.c +++ b/src/feature/api/tor_api.c @@ -124,8 +124,7 @@ tor_main_configuration_free(tor_main_configuration_t *cfg) if (cfg == NULL) return; if (cfg->argv_owned) { - int i; - for (i = 0; i < cfg->argc_owned; ++i) { + for (int i = 0; i < cfg->argc_owned; ++i) { raw_free(cfg->argv_owned[i]); } raw_free(cfg->argv_owned);

1 0

[tor/master] Merge branch 'tor_api_owning_control'
by nickm＠torproject.org 04 Sep '18

04 Sep '18

commit 3507fead10ef4f990c0373f4405bd235c0f0b35c Merge: 94b04d6c6 820aba70e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 11:04:21 2018 -0400 Merge branch 'tor_api_owning_control' changes/ticket24204 | 5 + src/app/config/config.c | 15 ++- src/app/config/confparse.c | 15 +++ src/app/config/confparse.h | 2 + src/app/config/or_options_st.h | 2 +- src/core/mainloop/main.c | 21 +++- src/feature/api/tor_api.c | 77 +++++++++++++- src/feature/api/tor_api.h | 12 +++ src/feature/api/tor_api_internal.h | 11 +- src/lib/net/.may_include | 1 + src/lib/net/include.am | 4 +- src/lib/net/socket.c | 165 ++-------------------------- src/lib/net/socket.h | 8 -- src/lib/net/socketpair.c | 213 +++++++++++++++++++++++++++++++++++++ src/lib/net/socketpair.h | 19 ++++ src/test/test_util.c | 25 +++-- src/tools/tor_runner.c | 8 +- 17 files changed, 411 insertions(+), 192 deletions(-) diff --cc src/core/mainloop/main.c index c648d236b,4bb55c7ba..27c4a9b3b --- a/src/core/mainloop/main.c +++ b/src/core/mainloop/main.c @@@ -4251,9 -4258,12 +4258,10 @@@ tor_run_main(const tor_main_configurati #endif /* defined(NT_SERVICE) */ { int init_rv = tor_init(argc, argv); - if (init_rv < 0) { - result = -1; - goto done; - } else if (init_rv > 0) { - result = 0; + if (init_rv) { + tor_free_all(0); - return (init_rv < 0) ? -1 : 0; ++ result = (init_rv < 0) ? -1 : 0; + goto done; } } @@@ -4261,8 -4271,8 +4269,9 @@@ sandbox_cfg_t* cfg = sandbox_init_filter(); if (sandbox_init(cfg)) { + tor_free(argv); log_err(LD_BUG,"Failed to create syscall sandbox filter"); + tor_free_all(0); return -1; }

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 04 Sep '18

04 Sep '18

commit 8e02c86e1ecd1865367f56fd9bb3b1e5d05e6af9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 4 14:47:28 2018 +0000 Update translations for tails-misc_completed --- tails.pot | 123 ++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 39 deletions(-) diff --git a/tails.pot b/tails.pot index b15aac69b..486e18ff5 100644 --- a/tails.pot +++ b/tails.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-16 07:57+0200\n" -"PO-Revision-Date: 2018-08-16 14:42+0000\n" +"POT-Creation-Date: 2018-09-04 11:37+0200\n" +"PO-Revision-Date: 2018-09-04 14:30+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n" "MIME-Version: 1.0\n" @@ -55,6 +55,7 @@ msgid "" msgstr "The following software is installed automatically from your persistent storage when starting Tails." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:169 msgid "" "To add more, install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " @@ -143,136 +144,136 @@ msgstr "Build information:\n%s" msgid "not available" msgstr "not available" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:142 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:143 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Please check your list of additional software or read the system log to understand the problem." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." msgstr "Please check your list of additional software or read the system log to understand the problem." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:151 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "Show Log" msgstr "Show Log" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:151 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "Configure" msgstr "Configure" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:215 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} and {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:217 msgid ", " msgstr ", " -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:280 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:308 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:281 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:309 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Add {packages} to your additional software?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:282 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:283 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "To install it automatically from your persistent storage when starting Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285 msgid "Install Every Time" msgstr "Install Every Time" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 msgid "Install Only Once" msgstr "Install Only Once" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:355 msgid "The configuration of your additional software failed." msgstr "The configuration of your additional software failed." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:310 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the Additional Software feature." msgstr "To install it automatically when starting Tails, you can create a persistent storage and activate the Additional Software feature." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314 msgid "Create Persistent Storage" msgstr "Create Persistent Storage" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322 msgid "Creating your persistent storage failed." msgstr "Creating your persistent storage failed." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:328 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:329 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "You could install {packages} automatically when starting Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 msgid "" "To do so, you need to run Tails from a USB stick installed using Tails " "Installer." msgstr "To do so, you need to run Tails from a USB stick installed using Tails Installer." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Remove {packages} from your additional software?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:346 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "This will stop installing {packages} automatically." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:348 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:349 msgid "Remove" msgstr "Remove" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:349 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:350 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Cancel" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:517 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:524 msgid "Installing your additional software from persistent storage..." msgstr "Installing your additional software from persistent storage..." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:519 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:526 msgid "This can take several minutes." msgstr "This can take several minutes." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:530 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:538 msgid "The installation of your additional software failed" msgstr "The installation of your additional software failed" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:543 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:553 msgid "Additional software installed successfully" msgstr "Additional software installed successfully" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:563 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:573 msgid "The check for upgrades of your additional software failed" msgstr "The check for upgrades of your additional software failed" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:565 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:573 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:575 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:583 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Please check your network connection, restart Tails, or read the system log to understand the problem." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:572 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582 msgid "The upgrade of your additional software failed" msgstr "The upgrade of your additional software failed" @@ -280,28 +281,56 @@ msgstr "The upgrade of your additional software failed" msgid "Documentation" msgstr "Documentation" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:94 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:95 #, python-brace-format msgid "" "Remove {package} from your additional software? This will stop installing " "the package automatically." msgstr "Remove {package} from your additional software? This will stop installing the package automatically." -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:104 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:105 #, python-brace-format msgid "Failed to remove {pkg}" msgstr "Failed to remove {pkg}" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:121 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122 msgid "Failed to read additional software configuration" msgstr "Failed to read additional software configuration" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:150 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:151 #, python-brace-format msgid "Stop installing {package} automatically" msgstr "Stop installing {package} automatically" -#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:246 +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:176 +msgid "" +"To do so, install some software using <a href=\"synaptic.desktop\">Synaptic " +"Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the " +"command line</a>." +msgstr "To do so, install some software using <a href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:185 +msgid "" +"To do so, unlock your persistent storage when starting Tails and install " +"some software using <a href=\"synaptic.desktop\">Synaptic Package " +"Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command " +"line</a>." +msgstr "To do so, unlock your persistent storage when starting Tails and install some software using <a href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:195 +msgid "" +"To do so, create a persistent storage and install some software using <a " +"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " +"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." +msgstr "To do so, create a persistent storage and install some software using <a href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:203 +msgid "" +"To do so, install Tails on a USB stick using <a href=\"tails-" +"installer.desktop\">Tails Installer</a> and create a persistent storage." +msgstr "To do so, install Tails on a USB stick using <a href=\"tails-installer.desktop\">Tails Installer</a> and create a persistent storage." + +#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:250 msgid "[package not available]" msgstr "[package not available]" @@ -670,6 +699,16 @@ msgstr "Tails specific tools" msgid "To start a Root Terminal, you need to authenticate." msgstr "To start a Root Terminal, you need to authenticate." +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1 +msgid "Remove an additional software package" +msgstr "Remove an additional software package" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2 +msgid "" +"Authentication is required to remove a package from your additional software" +" ($(command_line))" +msgstr "Authentication is required to remove a package from your additional software ($(command_line))" + #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61 msgid "File Containers" msgstr "File Containers" @@ -686,6 +725,12 @@ msgstr "Add a file container" msgid "Partitions and Drives" msgstr "Partitions and Drives" +#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:121 +msgid "" +"This application is not affiliated with or endorsed by the VeraCrypt project" +" or IDRIX." +msgstr "This application is not affiliated with or endorsed by the VeraCrypt project or IDRIX." + #: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38 msgid "Lock this volume" msgstr "Lock this volume"

1 0