tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[torsocks/master] Update TODO
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 0c7ad6d90811af29ac8ed893578bf3ec83013341 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Aug 7 08:55:53 2013 -0400 Update TODO Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- TODO | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/TODO b/TODO index 0132c79..ad99fc2 100644 --- a/TODO +++ b/TODO @@ -1,12 +1,9 @@ Version 2.0 ----------- -* sendmsg()/sendto() --> Deny UDP packet since it might be a DNS request. -* Complete gethostby* family function * Support res_* API * Get sendmsg FD passing on Unix socket and for TCP socket, clean exit -* Support getpeername() since some programs use that to check if a socket -is already connected. * Deny ICMP +* Support the complete list of dangerous syscall number with syscall() Version 1.0 -----------

1 0

[torsocks/master] Don't compile test/
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit c4c515b661993f5a6d117dd98462c5b183f5d6fd Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Aug 6 10:59:00 2013 -0400 Don't compile test/ The configure.ac is changed to remove all libc/libresolv signatures thus making the test fail to compile. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- Makefile.am | 2 +- configure.ac | 296 ++-------------------------------------------------------- 2 files changed, 7 insertions(+), 291 deletions(-) diff --git a/Makefile.am b/Makefile.am index 912a8f4..cf49cc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I config -SUBDIRS = src doc test +SUBDIRS = src doc diff --git a/configure.ac b/configure.ac index 517155b..4cd3b14 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ ############################################################################## # Process this file with autoconf to produce a configure script. -AC_INIT([torsocks], [2.0.0-rc1],[jacob@appelbaum.net],[],[https://torproject.org]) +AC_INIT([torsocks], [2.0.0-rc1],[dgoulet@ev0ke.net],[],[https://torproject.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET # Get hostname and other information. @@ -60,12 +60,6 @@ AC_CHECK_HEADER(arpa/inet.h,,AC_MSG_ERROR("arpa/inet.h not found")) dnl Check for the fcntl header AC_CHECK_HEADER(fcntl.h,,AC_MSG_ERROR("fcntl.h not found")) -dnl Check for the poll header -AC_CHECK_HEADER(sys/poll.h,,AC_MSG_ERROR("sys/poll.h not found")) - -dnl Check for the mmap header -AC_CHECK_HEADER(sys/mman.h,,AC_MSG_ERROR("sys/mman.h not found")) - dnl Other headers we're interested in AC_CHECK_HEADERS(unistd.h) @@ -121,12 +115,11 @@ AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ dnl Our main libs to link against are -dl and -lresolv. -AC_SEARCH_LIBS(dlopen, [c dl]) -# Required to compile on machines that export res_query with a double underscore. -# Sourced from gnupg configure via cvsnt. -AC_SEARCH_LIBS(res_query,resolv bind,,AC_SEARCH_LIBS(__res_query,resolv bind)) -AC_DEFINE([SUPPORT_RES_API],[],[Support the res_query family of calls]) - +AC_CHECK_LIB([dl], [dlopen], +[ + AC_DEFINE_UNQUOTED([TORSOCKS_HAVE_DL], 1, [Has libdl support.]) + have_libdl=yes +]) dnl OpenBSD needs -lpthread. It also doesn't support AI_V4MAPPED. case $host in @@ -269,283 +262,6 @@ if test "${oldmethod}" = "yes"; then fi ############################################################################## -# 4. Get the signatures for each of the functions we are going -# to override in torsocks. These are: -# connect, poll, select, close, getpeername, res_query, -# res_init, res_send, res_querydomain, gethostbyname, -# gethostbyaddr, getaddrinfo, getipnodebyname, sendto, -# sendmsg -############################################################################## - -dnl Find the correct select prototype on this machine -AC_MSG_CHECKING(for correct select prototype) -PROTO= -NAMES='n, readfds, writefds, exceptfds, timeout' -for testproto in 'int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout' -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/time.h> - #include <sys/types.h> - #include <unistd.h> - int select($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([select(${PROTO})]) -AC_DEFINE_UNQUOTED([SELECT_SIGNATURE],[${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([SELECT_ARGNAMES],[${NAMES}],[Argument names]) - - -dnl Find the correct connect prototype on this machine -AC_MSG_CHECKING(for correct connect prototype) -PROTO= -NAMES='__fd, __addr, __len' -PROTO1='int __fd, const struct sockaddr * __addr, int __len' -PROTO2='int __fd, const struct sockaddr_in * __addr, socklen_t __len' -PROTO3='int __fd, struct sockaddr * __addr, int __len' -PROTO4='int __fd, const struct sockaddr * __addr, socklen_t __len' -for testproto in "${PROTO1}" \ - "${PROTO2}" \ - "${PROTO3}" \ - "${PROTO4}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - int connect($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([connect(${PROTO})]) -AC_DEFINE_UNQUOTED([CONNECT_SIGNATURE],[${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([CONNECT_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Pick which of the sockaddr type arguments we need for -dnl connect(), we need to cast one of ours to it later -SOCKETARG="struct sockaddr *" -case "${PROTO}" in - *sockaddr_in*) - SOCKETARG="struct sockaddr_in *" - ;; -esac -AC_DEFINE_UNQUOTED([CONNECT_SOCKARG],[${SOCKETARG}],[Description]) - -dnl Find the correct close prototype on this machine -AC_MSG_CHECKING(for correct close prototype) -PROTO= -NAMES='fd' -PROTO1='int fd' -for testproto in "${PROTO1}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <stdlib.h> - int close($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([close(${PROTO})]) -AC_DEFINE_UNQUOTED([CLOSE_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([CLOSE_ARGNAMES],[${NAMES}],[Argument names]) - - -dnl Find the correct res_querydomain prototype on this machine -AC_MSG_CHECKING(for correct res_querydomain prototype) -PROTO= -NAMES='name, domain, class, type, answer, anslen' -PROTO1='const char *name, const char *domain, int class, int type, unsigned char *answer, int anslen' -for testproto in "${PROTO1}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <netinet/in.h> - #include <resolv.h> - int res_querydomain($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([res_querydomain(${PROTO})]) -AC_DEFINE_UNQUOTED([RES_QUERYDOMAIN_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([RES_QUERYDOMAIN_ARGNAMES],[${NAMES}],[Argument names]) - - -dnl Find the correct res_send prototype on this machine -AC_MSG_CHECKING(for correct res_send prototype) -PROTO= -NAMES='msg, msglen, answer, anslen' -PROTO1='const char *msg, int msglen, char *answer, int anslen' -PROTO2='const unsigned char *msg, int msglen, unsigned char *answer, int anslen' -for testproto in "${PROTO1}" \ - "${PROTO2}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <netinet/in.h> - #include <resolv.h> - int res_send($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([res_send(${PROTO})]) -AC_DEFINE_UNQUOTED([RES_SEND_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([RES_SEND_ARGNAMES],[${NAMES}],[Argument names]) - - -dnl Find the correct res_search prototype on this machine -AC_MSG_CHECKING(for correct res_search prototype) -PROTO= -NAMES='dname, class, type, answer, anslen' -PROTO1='const char *dname, int class, int type, unsigned char *answer, int anslen' -for testproto in "${PROTO1}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <netinet/in.h> - #include <resolv.h> - int res_search($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([res_search(${PROTO})]) -AC_DEFINE_UNQUOTED([RES_SEARCH_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([RES_SEARCH_ARGNAMES],[${NAMES}],[Argument names]) - - -dnl Find the correct res_query prototype on this machine -AC_MSG_CHECKING(for correct res_query prototype) -PROTO= -NAMES='dname, class, type, answer, anslen' -PROTO1='const char *dname, int class, int type, unsigned char *answer, int anslen' -for testproto in "${PROTO1}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <netinet/in.h> - #include <resolv.h> - int res_query($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([res_query(${PROTO})]) -AC_DEFINE_UNQUOTED([RES_QUERY_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([RES_QUERY_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Find the correct getpeername prototype on this machine -AC_MSG_CHECKING(for correct getpeername prototype) -PROTO= -NAMES='__fd, __name, __namelen' -PROTO1='int __fd, const struct sockaddr * __name, int *__namelen' -PROTO2='int __fd, const struct sockaddr_in * __name, socklen_t *__namelen' -PROTO3='int __fd, struct sockaddr * __name, socklen_t *__namelen' -PROTO4='int __fd, const struct sockaddr * __name, socklen_t *__namelen' -for testproto in "${PROTO1}" \ - "${PROTO2}" \ - "${PROTO3}" \ - "${PROTO4}" -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/socket.h> - int getpeername($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([getpeername(${PROTO})]) -AC_DEFINE_UNQUOTED(GETPEERNAME_SIGNATURE, [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([GETPEERNAME_ARGNAMES],[${NAMES}],[Argument names]) - - -dnl Find the correct poll prototype on this machine -AC_MSG_CHECKING(for correct poll prototype) -PROTO= -NAMES='ufds, nfds, timeout' -for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' \ - 'struct pollfd *ufds, nfds_t nfds, int timeout' \ - 'struct pollfd *ufds, unsigned int nfds, int timeout' -do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ - #include <sys/poll.h> - int poll($testproto); - ],,[PROTO="$testproto";],) - fi -done -if test "${PROTO}" = ""; then - AC_MSG_ERROR("no match found!") -fi -AC_MSG_RESULT([poll(${PROTO})]) -AC_DEFINE_UNQUOTED([POLL_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([POLL_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Emit signature for gethostbyname -PROTO="const char *name" -NAMES='name' -AC_DEFINE_UNQUOTED([GETHOSTBYNAME_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([GETHOSTBYNAME_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Emit signature for getaddrinfo -PROTO="const char *node, const char *service, void *hints, void *res" -NAMES='node, service, hints, res' -AC_DEFINE_UNQUOTED([GETADDRINFO_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([GETADDRINFO_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Emit signature for getipnodebyname -PROTO="const char *name, int af, int flags, int *error_num" -NAMES='name, af, flags, error_num' -AC_DEFINE_UNQUOTED([GETIPNODEBYNAME_SIGNATURE], [${PROTO}],[Description]) -AC_DEFINE_UNQUOTED([GETIPNODEBYNAME_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Emit signature for gethostbyaddr -PROTO="const void *addr, socklen_t len, int type" -NAMES='addr, len, type' -AC_DEFINE_UNQUOTED(GETHOSTBYADDR_SIGNATURE, [${PROTO}], [Description]) -AC_DEFINE_UNQUOTED([GETHOSTBYADDR_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Emit signature for sendto -PROTO="int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen" -NAMES='s, buf, len, flags, to, tolen' -AC_DEFINE_UNQUOTED(SENDTO_SIGNATURE, [${PROTO}], [Description]) -AC_DEFINE_UNQUOTED([SENDTO_ARGNAMES],[${NAMES}],[Argument names]) - -dnl Emit signature for sendmsg -PROTO="int s, const struct msghdr *msg, int flags" -NAMES='s, msg, flags' -AC_DEFINE_UNQUOTED(SENDMSG_SIGNATURE, [${PROTO}], [Description]) -AC_DEFINE_UNQUOTED([SENDMSG_ARGNAMES],[${NAMES}],[Argument names]) - - -############################################################################## # 5. Determine how to preload libtorsocks.so on this system. # On Linux this is with the LD_PRELOAD variable, on OSX # we need to use DYLD_INSERT_LIBRARIES.

1 0

[torsocks/master] Add recvmsg() FD passing check
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit eecc1152a9c86459081711240991991de2b24204 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Aug 7 11:17:54 2013 -0400 Add recvmsg() FD passing check Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- TODO | 2 +- src/lib/Makefile.am | 2 +- src/lib/recv.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.h | 13 +++++++ 4 files changed, 115 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index ad99fc2..fdd2365 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,7 @@ Version 2.0 ----------- * Support res_* API -* Get sendmsg FD passing on Unix socket and for TCP socket, clean exit +* Check recvmmsg() FD passing on Unix socket and for TCP socket, clean exit * Deny ICMP * Support the complete list of dangerous syscall number with syscall() diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0fe0233..f445c01 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ connect.c gethostbyname.c getaddrinfo.c close.c \ - getpeername.c socket.c syscall.c socketpair.c + getpeername.c socket.c syscall.c socketpair.c recv.c libtorsocks_la_LIBADD = \ $(top_builddir)/src/common/libcommon.la \ diff --git a/src/lib/recv.c b/src/lib/recv.c new file mode 100644 index 0000000..9a70dd3 --- /dev/null +++ b/src/lib/recv.c @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <assert.h> +#include <stdlib.h> + +#include <common/log.h> + +#include "torsocks.h" + +/* + * Torsocks call for recvmsg(2) + * + * We only hijack this call to handle the FD passing between process on Unix + * socket. If an INET/INET6 socket is recevied, we stop everything because at + * that point we can't guarantee traffic going through Tor. + */ +LIBC_RECVMSG_RET_TYPE tsocks_recvmsg(LIBC_RECVMSG_SIG) +{ + int fd; + ssize_t ret = 0; + char dummy, recv_fd[CMSG_SPACE(sizeof(fd))]; + struct iovec iov[1]; + struct cmsghdr *cmsg; + struct msghdr msg; + + memset(&msg, 0, sizeof(msg)); + + /* Prepare to receive the structures */ + iov[0].iov_base = &dummy; + iov[0].iov_len = 1; + msg.msg_iov = iov; + msg.msg_iovlen = 1; + msg.msg_control = recv_fd; + msg.msg_controllen = sizeof(recv_fd); + + do { + /* Just peek the data to inspect the payload for fd. */ + ret = tsocks_libc_recvmsg(__sockfd, &msg, MSG_PEEK); + } while (ret < 0 && errno == EINTR); + + cmsg = CMSG_FIRSTHDR(&msg); + if (!cmsg) { + goto end; + } + + /* + * Detecting FD passing, the next snippet of code will check if we get a + * inet/inet6 socket. If so, everything stops immediately before going + * further. + */ + if (cmsg->cmsg_type == SCM_RIGHTS || cmsg->cmsg_level == SOL_SOCKET) { + socklen_t optlen; + int sock_dom; + + memcpy(&fd, CMSG_DATA(cmsg), sizeof(fd)); + + /* Get socket domain. */ + optlen = sizeof(sock_dom); + ret = getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &sock_dom, &optlen); + if (ret < 0) { + /* Use the getsockopt() errno value. */ + goto end; + } + + if (sock_dom == AF_INET || sock_dom == AF_INET6) { + ERR("[recvmsg] Inet socket passing detected. Aborting everything! " + "A non Tor socket could be used thus leaking information."); + exit(EXIT_FAILURE); + } + } + +end: + return tsocks_libc_recvmsg(LIBC_RECVMSG_ARGS); +} + +/* + * Libc hijacked symbol recvmsg(2). + */ +LIBC_RECVMSG_DECL +{ + /* Find symbol if not already set. Exit if not found. */ + tsocks_libc_recvmsg = tsocks_find_libc_symbol(LIBC_RECVMSG_NAME_STR, + TSOCKS_SYM_EXIT_NOT_FOUND); + return tsocks_recvmsg(LIBC_RECVMSG_ARGS); +} diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 953446b..65edeba 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -161,6 +161,14 @@ struct hostent **__result, int *__h_errnop int __sockfd, struct sockaddr *__addr, socklen_t *__addrlen #define LIBC_GETPEERNAME_ARGS __sockfd, __addr, __addrlen +#define LIBC_RECVMSG_NAME recvmsg +#define LIBC_RECVMSG_NAME_STR XSTR(LIBC_RECVMSG_NAME) +#define LIBC_RECVMSG_RET_TYPE ssize_t +#define LIBC_RECVMSG_SIG \ + int __sockfd, struct msghdr *__msg, int __flags +#define LIBC_RECVMSG_ARGS \ + __sockfd, __msg, __flags + #else #error "OS not supported." #endif /* __linux__ , __FreeBSD__, __darwin__ */ @@ -191,6 +199,11 @@ TSOCKS_DECL(connect, LIBC_CONNECT_RET_TYPE, LIBC_CONNECT_SIG) #define LIBC_CONNECT_DECL \ LIBC_CONNECT_RET_TYPE LIBC_CONNECT_NAME(LIBC_CONNECT_SIG) +/* recvmsg(2) */ +TSOCKS_LIBC_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) +#define LIBC_RECVMSG_DECL \ + LIBC_RECVMSG_RET_TYPE LIBC_RECVMSG_NAME(LIBC_RECVMSG_SIG) + /* socket(2) */ TSOCKS_LIBC_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) TSOCKS_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG)

1 0

[torsocks/master] Add getpeername(2) support
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit fb388753632387f0c25d7be91f8d132418915d4c Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Aug 5 12:00:15 2013 -0400 Add getpeername(2) support Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/Makefile.am | 3 ++- src/lib/getpeername.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.h | 16 ++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index ec9ef0f..f27db5c 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -11,7 +11,8 @@ EXTRA_DIST = torsocks.in usewithtor.in lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ - connect.c gethostbyname.c getaddrinfo.c close.c + connect.c gethostbyname.c getaddrinfo.c close.c \ + getpeername.c libtorsocks_la_LIBADD = \ $(top_builddir)/src/common/libcommon.la \ diff --git a/src/lib/getpeername.c b/src/lib/getpeername.c new file mode 100644 index 0000000..8e4b671 --- /dev/null +++ b/src/lib/getpeername.c @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <arpa/inet.h> +#include <assert.h> + +#include <common/log.h> + +#include "torsocks.h" + +/* + * Torsocks call for getpeername(2). + */ +LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) +{ + int ret = 0; + struct connection *conn; + + DBG("[getpeername] Requesting address on socket %d", __sockfd); + + connection_registry_lock(); + conn = connection_find(__sockfd); + if (!conn) { + errno = ENOTCONN; + ret = -1; + goto end; + } + connection_registry_unlock(); + + errno = 0; +end: + return ret; +} + +/* + * Libc hijacked symbol getpeername(2). + */ +LIBC_GETPEERNAME_DECL +{ + int ret; + + tsocks_libc_getpeername = tsocks_find_libc_symbol(LIBC_GETPEERNAME_NAME_STR, + TSOCKS_SYM_EXIT_NOT_FOUND); + + ret = tsocks_libc_getpeername(LIBC_GETPEERNAME_ARGS); + if (ret < 0) { + /* errno is populated by the previous call at this point. */ + return ret; + } + + return tsocks_getpeername(LIBC_GETPEERNAME_ARGS); +} diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 3cd51d0..55d46d6 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -111,6 +111,16 @@ char tsocks_he_name[255]; struct addrinfo **__res #define LIBC_GETADDRINFO_ARGS __node, __service, __hints, __res +/* getpeername(2) */ +#include <sys/socket.h> + +#define LIBC_GETPEERNAME_NAME getpeername +#define LIBC_GETPEERNAME_NAME_STR XSTR(LIBC_GETPEERNAME_NAME) +#define LIBC_GETPEERNAME_RET_TYPE int +#define LIBC_GETPEERNAME_SIG \ + int __sockfd, struct sockaddr *__addr, socklen_t *__addrlen +#define LIBC_GETPEERNAME_ARGS __sockfd, __addr, __addrlen + #else #error "OS not supported." #endif /* __linux__ , __FreeBSD__, __darwin__ */ @@ -160,6 +170,12 @@ TSOCKS_LIBC_DECL(getaddrinfo, LIBC_GETADDRINFO_RET_TYPE, #define LIBC_GETADDRINFO_DECL LIBC_GETADDRINFO_RET_TYPE \ LIBC_GETADDRINFO_NAME(LIBC_GETADDRINFO_SIG) +/* getpeername(2) */ +TSOCKS_LIBC_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, + LIBC_GETPEERNAME_SIG) +#define LIBC_GETPEERNAME_DECL LIBC_GETPEERNAME_RET_TYPE \ + LIBC_GETPEERNAME_NAME(LIBC_GETPEERNAME_SIG) + /* * Those are actions to do during the lookup process of libc symbols. For * instance the connect(2) syscall is essential to Torsocks so the function

1 0

[torsocks/master] Fix: support non blocking socket
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit bea4e0b1a0815f384d963b184aaaea3dce6e59f3 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 17 20:07:34 2013 -0400 Fix: support non blocking socket Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/socks5.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/socks5.c b/src/common/socks5.c index d24f191..f1683c9 100644 --- a/src/common/socks5.c +++ b/src/common/socks5.c @@ -53,7 +53,7 @@ static ssize_t recv_data(int fd, void *buf, size_t len) /* Return the number of bytes received up to this point. */ ret = index; } - goto error; + continue; } else { PERROR("recv socks5 data"); goto error; @@ -97,7 +97,7 @@ static ssize_t send_data(int fd, const void *buf, size_t len) /* Return the number of bytes sent up to this point. */ ret = index; } - goto error; + continue; } else { PERROR("send socks5 data"); goto error; @@ -142,10 +142,13 @@ int socks5_connect(struct connection *conn) goto error; } - /* Use the original libc connect() to the Tor. */ - ret = tsocks_libc_connect(conn->fd, socks5_addr, sizeof(*socks5_addr)); + do { + /* Use the original libc connect() to the Tor. */ + ret = tsocks_libc_connect(conn->fd, socks5_addr, sizeof(*socks5_addr)); + } while (ret < 0 && (errno == EINTR || errno == EINPROGRESS)); if (ret < 0) { ret = -errno; + PERROR("socks5 libc connect"); } error:

1 0

[torsocks/master] Add socketpair(2) support
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 4a634b959a84442069b32e830e1110f0e253c8e4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Aug 7 08:09:18 2013 -0400 Add socketpair(2) support Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/Makefile.am | 2 +- src/lib/socketpair.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.h | 15 +++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0f764f1..0fe0233 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ connect.c gethostbyname.c getaddrinfo.c close.c \ - getpeername.c socket.c syscall.c + getpeername.c socket.c syscall.c socketpair.c libtorsocks_la_LIBADD = \ $(top_builddir)/src/common/libcommon.la \ diff --git a/src/lib/socketpair.c b/src/lib/socketpair.c new file mode 100644 index 0000000..97a5761 --- /dev/null +++ b/src/lib/socketpair.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <assert.h> + +#include <common/log.h> + +#include "torsocks.h" + +/* + * Torsocks call for socketpair(2) + */ +LIBC_SOCKETPAIR_RET_TYPE tsocks_socketpair(LIBC_SOCKETPAIR_SIG) +{ + DBG("[socketpair] Creating socket with domain %d, type %d and protocol %d", + __domain, __type, __protocol); + + switch (__type) { + case SOCK_STREAM: + break; + default: + if (__domain == AF_INET || __domain == AF_INET6) { + ERR("Non TCP socketpair denied. Tor network can't handle it. " + "Stopping everything!"); + errno = EINVAL; + return -1; + } + break; + } + + /* Stream socket for INET/INET6 is good so open it. */ + return tsocks_libc_socketpair(__domain, __type, __protocol, __sv); +} + +/* + * Libc hijacked symbol socketpair(2). + */ +LIBC_SOCKETPAIR_DECL +{ + /* Find symbol if not already set. Exit if not found. */ + tsocks_libc_socketpair = tsocks_find_libc_symbol(LIBC_SOCKETPAIR_NAME_STR, + TSOCKS_SYM_EXIT_NOT_FOUND); + return tsocks_socketpair(LIBC_SOCKETPAIR_ARGS); +} diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index c6191e2..953446b 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -56,6 +56,15 @@ #define LIBC_SOCKET_ARGS \ __domain, __type, __protocol +/* socketpair(2) */ +#define LIBC_SOCKETPAIR_NAME socketpair +#define LIBC_SOCKETPAIR_NAME_STR XSTR(LIBC_SOCKETPAIR_NAME) +#define LIBC_SOCKETPAIR_RET_TYPE int +#define LIBC_SOCKETPAIR_SIG \ + int __domain, int __type, int __protocol, int __sv[2] +#define LIBC_SOCKETPAIR_ARGS \ + __domain, __type, __protocol, __sv + /* close(2) */ #include <unistd.h> @@ -188,6 +197,12 @@ TSOCKS_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) #define LIBC_SOCKET_DECL \ LIBC_SOCKET_RET_TYPE LIBC_SOCKET_NAME(LIBC_SOCKET_SIG) +/* socketpair(2) */ +TSOCKS_LIBC_DECL(socketpair, LIBC_SOCKETPAIR_RET_TYPE, LIBC_SOCKETPAIR_SIG) +TSOCKS_DECL(socketpair, LIBC_SOCKETPAIR_RET_TYPE, LIBC_SOCKETPAIR_SIG) +#define LIBC_SOCKETPAIR_DECL \ + LIBC_SOCKETPAIR_RET_TYPE LIBC_SOCKETPAIR_NAME(LIBC_SOCKETPAIR_SIG) + /* syscall(2) */ TSOCKS_LIBC_DECL(syscall, LIBC_SYSCALL_RET_TYPE, LIBC_SYSCALL_SIG) #define LIBC_SYSCALL_DECL \

1 0

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

04 Apr '14

commit e306235f302b58cb675f165b4a21f05b1814c6de Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 4 15:45:27 2014 +0000 Update translations for tails-greeter_completed --- ar/ar.po | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 85 insertions(+), 18 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 0d4431a..b1f8589 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -3,18 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# kraim <7kraim(a)gmail.com>, 2013 +# kraim <biskraim(a)gmail.com>, 2013 +# Arwa M, 2014 +# Mohammed Guessous <guessousuni(a)gmail.com>, 2014 # alshara3 <hsn.ali91(a)gmail.com>, 2013 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # Tails_developers <tails(a)boum.org>, 2013 +# uzumaki <tx99h4(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-06-20 18:10+0000\n" -"Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 13:54+0100\n" +"PO-Revision-Date: 2014-04-04 15:30+0000\n" +"Last-Translator: uzumaki <tx99h4(a)hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,26 +42,30 @@ msgid "Use persistence?" msgstr "هل ترغب في استخدام مساحة دائمة علي القرص الصلب؟" #: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">الوثائق</a>" + +#: ../glade/persistencewindow.glade.h:6 msgid "Yes" msgstr "نعم" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "No" msgstr "لا" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" msgstr "عبارة المرور:" -#: ../glade/persistencewindow.glade.h:8 +#: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" msgstr "للقراءة فقط؟" -#: ../glade/persistencewindow.glade.h:9 +#: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." msgstr "عبارة المرور غير صحيحة. الرجاء المحاولة مرة اخرى" -#: ../glade/persistencewindow.glade.h:10 +#: ../glade/persistencewindow.glade.h:11 msgid "More options?" msgstr "خيارات أكثر؟" @@ -68,36 +75,96 @@ msgstr "كلمة السر الخاصة بالإدارة" #: ../glade/optionswindow.glade.h:4 msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">الوثائق</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." msgstr "ادخل كلمة السر الخاصة بالإدارة في حال كنت تحتاج إلي عمل تغييرات إدارية. \nوإلا سيعطل هذا الخيار لتحسين الأمن." -#: ../glade/optionswindow.glade.h:6 +#: ../glade/optionswindow.glade.h:7 msgid "Password:" msgstr "كلمة السر:" -#: ../glade/optionswindow.glade.h:7 +#: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" msgstr "تحقق من أو اعد كتابة كلمة السر:" -#: ../glade/optionswindow.glade.h:8 +#: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" msgstr "كلمات السر غير متطابقة" -#: ../glade/optionswindow.glade.h:9 -msgid "Windows Camouflage" -msgstr "تخفي كنظام تشغيل ويندوز" - #: ../glade/optionswindow.glade.h:10 +msgid "Windows camouflage" +msgstr "تَخَفِّي ويندوز" + +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">الوثائق</a>" + +#: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." msgstr "هذا الخيار يجعل تيلز يشبه ويندوز اكس بي. وهذا قد يكون مفيداً في الاماكن العامه لتقليل الشبهه و جذب الانظار." -#: ../glade/optionswindow.glade.h:11 +#: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows XP Camouflage" msgstr "تفعيل التمويه كويندوز اكس بي" +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "انتحال عنوان MAC " + +#: ../glade/optionswindow.glade.h:15 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">الوثائق</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "انتحال عناوين MAC أخرى يخفي أرقام تسلسل بطاقات شبكتك للشبكات المحلية. هذا الأمر يساعدك على إخفاء موقعك الجغرافي." + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "انتحال عناوين وحدات التحكم في وصول الوسائط أأمن بشكل عام ولكنه أيضا قد يثير الشكوك أو يسبب مشاكل في الاتصال بالشبكة." + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "انتحال عناوين جميع وحدات التحكم في وصول الوسائط" + +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "تكوين الشبكة" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">الوثائق</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "اتصال هذا الحاسب بالإنترنت خالٍ من العوائق. أنت تود الاتصال بشبكة Tor بشكل مباشر." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "اتصال هذا الحاسب الإنترنت مراقب أو مصفى أو له وكيل. عليك تكوين إعدادات الجسر أو جدار الحماية أو الوكيل." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr "."

1 0

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

04 Apr '14

commit 1dcdf466cfb606538b769c6dec21d4e7d16b35b5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 4 15:45:24 2014 +0000 Update translations for tails-greeter --- ar/ar.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index e5742e5..b1f8589 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -10,13 +10,14 @@ # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # Tails_developers <tails(a)boum.org>, 2013 +# uzumaki <tx99h4(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 13:54+0100\n" -"PO-Revision-Date: 2014-04-03 06:30+0000\n" -"Last-Translator: Arwa M\n" +"PO-Revision-Date: 2014-04-04 15:30+0000\n" +"Last-Translator: uzumaki <tx99h4(a)hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,7 +99,7 @@ msgstr "كلمات السر غير متطابقة" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "تَخَفِّي ويندوز" #: ../glade/optionswindow.glade.h:11 msgid "" @@ -130,7 +131,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">الو msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "" +msgstr "انتحال عناوين MAC أخرى يخفي أرقام تسلسل بطاقات شبكتك للشبكات المحلية. هذا الأمر يساعدك على إخفاء موقعك الجغرافي." #: ../glade/optionswindow.glade.h:17 msgid ""

1 0

[orbot/master] add binaries (for non NDK developers)
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit fe44c2916439cb38d7fd5d84696335db9c0790a2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 4 10:27:36 2014 -0400 add binaries (for non NDK developers) --- res/raw/obfsproxy.mp3 | Bin 0 -> 352804 bytes res/raw/privoxy.mp3 | Bin 0 -> 264879 bytes res/raw/tor.mp3 | Bin 0 -> 1781819 bytes res/raw/xtables.mp3 | Bin 0 -> 166343 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/obfsproxy.mp3 b/res/raw/obfsproxy.mp3 new file mode 100644 index 0000000..e705e3a Binary files /dev/null and b/res/raw/obfsproxy.mp3 differ diff --git a/res/raw/privoxy.mp3 b/res/raw/privoxy.mp3 new file mode 100644 index 0000000..3b7d334 Binary files /dev/null and b/res/raw/privoxy.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..4dcd44e Binary files /dev/null and b/res/raw/tor.mp3 differ diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 new file mode 100644 index 0000000..8b0f109 Binary files /dev/null and b/res/raw/xtables.mp3 differ

1 0

[orbot/master] update language wizard display to be more clear
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 75d3ecb2ecdd55497822f0f094e2f608ebbba455 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 4 10:46:28 2014 -0400 update language wizard display to be more clear --- res/layout/layout_wizard_locale.xml | 1 - .../android/wizard/ChooseLocaleWizardActivity.java | 24 ++++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/res/layout/layout_wizard_locale.xml b/res/layout/layout_wizard_locale.xml index 897aca9..1918f56 100644 --- a/res/layout/layout_wizard_locale.xml +++ b/res/layout/layout_wizard_locale.xml @@ -40,7 +40,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:entries="@array/languages" > </ListView> diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index a8bebe9..7d7f7cd 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -2,39 +2,23 @@ package org.torproject.android.wizard; import java.util.Locale; -import org.torproject.android.Orbot; import org.torproject.android.R; import org.torproject.android.TorConstants; -import org.torproject.android.R.drawable; -import org.torproject.android.R.id; -import org.torproject.android.R.layout; -import org.torproject.android.R.string; -import org.torproject.android.settings.AppManager; import android.app.Activity; -import android.app.AlertDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.res.Configuration; -import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.view.View; -import android.view.View.OnClickListener; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; +import android.widget.ArrayAdapter; import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.ListView; -import android.widget.RadioButton; -import android.widget.RadioGroup; -import android.widget.TextView; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.Toast; public class ChooseLocaleWizardActivity extends Activity implements TorConstants { @@ -84,7 +68,13 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants Button next = ((Button)findViewById(R.id.btnWizard2)); // next.setEnabled(false); + String[] strLangs = getResources().getStringArray(R.array.languages); + strLangs[0] = Locale.getDefault().getDisplayName(); + ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, android.R.id.text1, strLangs); + listLocales.setAdapter(adapter); + listLocales.setSelection(0); + listLocales.setOnItemClickListener(new OnItemClickListener() {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014