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

[torsocks/master] Fix: remove FAQ file from Makefile
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 8b315c97c51c503bfc4dc8ce3200d6820d4da8ee Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Sep 1 10:40:38 2013 -0400 Fix: remove FAQ file from Makefile Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e982a1a..7c3253a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,6 @@ ACLOCAL_AMFLAGS = -I config SUBDIRS = src doc tests -dist_doc_DATA = ChangeLog FAQ +dist_doc_DATA = ChangeLog EXTRA_DIST = gpl-2.0.txt

1 0

[torsocks/master] Tests: add utils unit tests
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit d3b401fb0f66e35884519de2a6bfb3e158cf0538 Author: Luke Gallagher <luke(a)hypergeometric.net> Date: Fri Sep 6 12:49:48 2013 +1000 Tests: add utils unit tests Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 1 + tests/test_list | 1 + tests/unit/Makefile.am | 5 ++- tests/unit/test_utils.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e04cf8d..5bd2399 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ src/bin/torsocks tests/test_dns tests/unit/test_onion tests/unit/test_connection +tests/unit/test_utils diff --git a/tests/test_list b/tests/test_list index 7564c96..d433edb 100644 --- a/tests/test_list +++ b/tests/test_list @@ -1,3 +1,4 @@ ./test_dns ./unit/test_onion ./unit/test_connection +./unit/test_utils diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 9dd1bae..3fb1150 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -4,10 +4,13 @@ LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la LIBCOMMON=$(top_builddir)/src/common/libcommon.la -noinst_PROGRAMS = test_onion test_connection +noinst_PROGRAMS = test_onion test_connection test_utils test_onion_SOURCES = test_onion.c test_onion_LDADD = $(LIBTAP) $(LIBCOMMON) test_connection_SOURCES = test_connection.c test_connection_LDADD = $(LIBTAP) $(LIBCOMMON) + +test_utils_SOURCES = test_utils.c +test_utils_LDADD = $(LIBTAP) $(LIBCOMMON) diff --git a/tests/unit/test_utils.c b/tests/unit/test_utils.c new file mode 100644 index 0000000..e241901 --- /dev/null +++ b/tests/unit/test_utils.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * Luke Gallagher <luke(a)hypergeometric.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 <stdio.h> + +#include <common/utils.h> +#include <common/defaults.h> + +#include <tap/tap.h> + +#define NUM_TESTS 10 + +static void test_is_address_ipv4(void) +{ + int ret = 0; + + diag("Utils IPv4 test"); + + ret = utils_is_address_ipv4("127.0.0.1"); + ok(ret == 1, "Valid IPv4 address"); + + ret = utils_is_address_ipv4("127.0.0.256"); + ok(ret == -1, "Invalid IPv4 address"); + + ret = utils_is_address_ipv4("::1"); + ok(ret == -1, "Invalid IPv4 address when IPv6"); +} + +static void test_is_address_ipv6(void) +{ + int ret = 0; + + diag("Utils IPv6 test"); + + ret = utils_is_address_ipv6("::1"); + ok(ret == 1, "Valid IPv6 address"); + + ret = utils_is_address_ipv6("2001:DB8:0:0:8:800:200C:417A"); + ok(ret == 1, "Valid IPv6 address"); + + ret = utils_is_address_ipv6("2001:DB8:0:0:8:800:200C:G"); + ok(ret == -1, "Invalid IPv6 address"); + + ret = utils_is_address_ipv6("192.168.0.1"); + ok(ret == -1, "Invalid IPv6 address when IPv4"); +} + +static void helper_reset_tokens(char **tokens) +{ + assert(tokens); + + int i; + for (i = 0; i < DEFAULT_MAX_CONF_TOKEN; i++) { + tokens[i] = NULL; + } +} + +static void test_utils_tokenize_ignore_comments(void) +{ + int nb_token; + char line[BUFSIZ]; + char *tokens[DEFAULT_MAX_CONF_TOKEN]; + + diag("Utils tokenize line test"); + + helper_reset_tokens(tokens); + strcpy(line, "foo bar"); + nb_token = utils_tokenize_ignore_comments(line, sizeof(tokens), tokens); + ok(nb_token == 2 && + (0 == strcmp(tokens[0], "foo")) && + (0 == strcmp(tokens[1], "bar")), + "Returns 2 tokens"); + + helper_reset_tokens(tokens); + strcpy(line, "a b c"); + nb_token = utils_tokenize_ignore_comments(line, sizeof(tokens), tokens); + ok(nb_token == 3 && + (0 == strcmp(tokens[0], "a")) && + (0 == strcmp(tokens[1], "b")) && + (0 == strcmp(tokens[2], "c")), + "Returns 3 tokens"); + + helper_reset_tokens(tokens); + strcpy(line, "# this is a comment"); + nb_token = utils_tokenize_ignore_comments(line, sizeof(tokens), tokens); + ok(nb_token == 0, "Returns 0 tokens for comment"); +} + +int main(int argc, char **argv) +{ + /* Libtap call for the number of tests planned. */ + plan_tests(NUM_TESTS); + + test_is_address_ipv4(); + test_is_address_ipv6(); + test_utils_tokenize_ignore_comments(); + + return exit_status(); +}

1 0

[torsocks/master] Fix: undefined syscall values for x86
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 24f63e2a16efe1719560dda6ee7e4f059e34a2f4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Oct 12 13:41:50 2013 -0400 Fix: undefined syscall values for x86 Reference #11 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 42 ++++++++++++++++++++++++++++++++++++++++++ src/lib/syscall.c | 6 +++--- src/lib/torsocks.h | 5 ----- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 18404b2..07c856f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -43,4 +43,46 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #endif /* __linux__, __darwin__, __FreeBSD__ */ +#if defined(__linux__) + +#if defined(__i386) +#include <asm-generic/unistd.h> +#else +#include <unistd.h> +#endif /* defined __i386 */ + +#include <sys/syscall.h> + +/* + * Some old system requires kernel headers for those values. If they are not + * defined, set them to a non syscall value. Just to be clear, if the value is + * undefined (here -1), tsocks syscall() will DENY the real syscall if catched. + */ +#ifndef __NR_socket +#define __NR_socket -1 +#endif +#ifndef __NR_connect +#define __NR_connect -1 +#endif +#ifndef __NR_close +#define __NR_close -1 +#endif + +#define TSOCKS_NR_SOCKET __NR_socket +#define TSOCKS_NR_CONNECT __NR_connect +#define TSOCKS_NR_CLOSE __NR_close + +#endif /* __linux__ */ + +#if (defined(__FreeBSD__) || defined(__darwin__)) + +#include <sys/syscall.h> +#include <unistd.h> + +#define TSOCKS_NR_SOCKET SYS_socket +#define TSOCKS_NR_CONNECT SYS_connect +#define TSOCKS_NR_CLOSE SYS_close + +#endif /* __FreeBSD__, __darwin__ */ + #endif /* TORSOCKS_COMPAT_H */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 0edd460..b06e2e3 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -80,13 +80,13 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int __number, va_list args) DBG("[syscall] Syscall libc wrapper number %ld called", __number); switch (__number) { - case SYS_socket: + case TSOCKS_NR_SOCKET: ret = handle_socket(args); break; - case SYS_connect: + case TSOCKS_NR_CONNECT: ret = handle_connect(args); break; - case SYS_close: + case TSOCKS_NR_CLOSE: ret = handle_close(args); break; default: diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 1554abc..4adf532 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -176,8 +176,6 @@ struct hostent **__result, int *__h_errnop #if (defined(__linux__)) #define _GNU_SOURCE -#include <unistd.h> -#include <sys/syscall.h> /* syscall(2) */ #define LIBC_SYSCALL_NAME syscall @@ -190,9 +188,6 @@ struct hostent **__result, int *__h_errnop #if (defined(__FreeBSD__) || defined(__darwin__)) -#include <sys/syscall.h> -#include <unistd.h> - /* syscall(2) */ #define LIBC_SYSCALL_NAME syscall #define LIBC_SYSCALL_NAME_STR XSTR(LIBC_SYSCALL_NAME)

1 0

[torsocks/master] Fix: torsocks.in libdir path with lib prefix
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit a3bcafdca1a157a9f582109bf3d3e00eb26ce555 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Oct 8 19:15:55 2013 -0400 Fix: torsocks.in libdir path with lib prefix Fixes #8 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/bin/torsocks.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index c5519ec..61fb593 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -59,7 +59,10 @@ # Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 # Modified by David Goulet <dgoulet(a)ev0ke.net> 2013 -LIBDIR="@prefix@/@libdir@/torsocks" +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +LIBDIR="${libdir}/torsocks" LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@" SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}"

1 0

[torsocks/master] Fix: check fileno returned value
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 729ca3f504b16f6e67d587cb8616daf7efc61f66 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Oct 8 19:24:18 2013 -0400 Fix: check fileno returned value Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/log.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 472dc49..2b6e542 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -163,9 +163,10 @@ int log_init(int level, const char *filepath, enum log_time_status t_status) } } else { /* The default output is stderr if no filepath is given. */ - (void) fileno(stderr); - if (errno != EBADF) { + ret = fileno(stderr); + if (ret < 0 && errno != EBADF) { logconfig.fp = stderr; + ret = 0; } }

1 0

[torsocks/master] Add compatibility with GNU/kFreeBSD
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 3eef0073a9b4460b62a62e9d0556667cb475da3b Author: Jérémy Bobbio <lunar(a)debian.org> Date: Fri Oct 25 09:48:22 2013 -0400 Add compatibility with GNU/kFreeBSD Signed-off-by: Jérémy Bobbio <lunar(a)debian.org> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.c | 4 ++-- src/common/compat.h | 10 ++++++---- src/common/ref.h | 4 ++-- src/lib/torsocks.h | 15 +++++++++++++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 5e3cf77..b4cdd1d 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -19,7 +19,7 @@ #include "compat.h" -#if (defined(__linux__) || defined(__FreeBSD__) || defined(__darwin__)) +#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__)) /* * Initialize a pthread mutex. This never fails. @@ -71,4 +71,4 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m) assert(!ret); } -#endif /* __linux__, __darwin__, __FreeBSD__ */ +#endif /* __GLIBC__, __darwin__, __FreeBSD__ */ diff --git a/src/common/compat.h b/src/common/compat.h index 31de549..8207fc0 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -22,7 +22,7 @@ #define __darwin__ 1 #endif -#if (defined(__linux__) || defined(__FreeBSD__) || defined(__darwin__)) +#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__)) #define RTLD_NEXT ((void *) -1) @@ -41,7 +41,9 @@ void tsocks_mutex_destroy(tsocks_mutex_t *m); void tsocks_mutex_lock(tsocks_mutex_t *m); void tsocks_mutex_unlock(tsocks_mutex_t *m); -#endif /* __linux__, __darwin__, __FreeBSD__ */ +#else +#error "OS not supported." +#endif /* __GLIBC__, __darwin__, __FreeBSD__ */ #if defined(__linux__) @@ -74,7 +76,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #endif /* __linux__ */ -#if (defined(__FreeBSD__) || defined(__darwin__)) +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__darwin__)) #include <sys/syscall.h> #include <unistd.h> @@ -83,6 +85,6 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #define TSOCKS_NR_CONNECT SYS_connect #define TSOCKS_NR_CLOSE SYS_close -#endif /* __FreeBSD__, __darwin__ */ +#endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__ */ #endif /* TORSOCKS_COMPAT_H */ diff --git a/src/common/ref.h b/src/common/ref.h index c7b878f..f80fd19 100644 --- a/src/common/ref.h +++ b/src/common/ref.h @@ -26,7 +26,7 @@ struct ref { long count; }; -#if (defined(__linux__) || defined(__FreeBSD__) || defined(__darwin__)) +#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__)) /* * Get a reference by incrementing the refcount. @@ -57,6 +57,6 @@ static inline void ref_put(struct ref *r, #else #error "OS not supported" -#endif /* __linux__, __FreeBSD__, __darwin__ */ +#endif /* __GLIBC__, __FreeBSD__, __darwin__ */ #endif /* TORSOCKS_REF_H */ diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 4adf532..a931d2a 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -33,7 +33,7 @@ #define TSOCKS_DECL(name, type, sig) \ extern type tsocks_##name(sig); -#if (defined(__linux__) || defined(__FreeBSD__) || defined(__darwin__)) +#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__darwin__)) /* connect(2) */ #include <sys/types.h> @@ -171,7 +171,7 @@ struct hostent **__result, int *__h_errnop #else #error "OS not supported." -#endif /* __linux__ , __FreeBSD__, __darwin__ */ +#endif /* __GLIBC__ , __FreeBSD__, __darwin__ */ #if (defined(__linux__)) @@ -197,6 +197,17 @@ struct hostent **__result, int *__h_errnop #endif /* __FreeBSD__, __darwin__ */ +#if defined(__GLIBC__) && defined(__FreeBSD_kernel__) + +/* syscall(2) */ +#define LIBC_SYSCALL_NAME syscall +#define LIBC_SYSCALL_NAME_STR XSTR(LIBC_SYSCALL_NAME) +#define LIBC_SYSCALL_RET_TYPE long int +#define LIBC_SYSCALL_SIG long int __number, ... +#define LIBC_SYSCALL_ARGS __number + +#endif /* __GLIBC__ && __FreeBSD_kernel__ */ + /* * The following defines are libc function declarations using the macros * defined above on a per OS basis.

1 0

[torsocks/master] Fix: bad ret value check for default logging
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 49200e32702a3ea14e5254df03825813b55b994b Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Oct 30 12:04:27 2013 -0400 Fix: bad ret value check for default logging Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 2b6e542..b68d66b 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -137,7 +137,7 @@ int log_init(int level, const char *filepath, enum log_time_status t_status) { int ret = 0; - /* Reset logconfig. Useful if this is call multiple times. */ + /* Reset logconfig. Useful if this is called multiple times. */ memset(&logconfig, 0, sizeof(logconfig)); if (level < MSGNONE || level > MSGDEBUG) { @@ -164,7 +164,7 @@ int log_init(int level, const char *filepath, enum log_time_status t_status) } else { /* The default output is stderr if no filepath is given. */ ret = fileno(stderr); - if (ret < 0 && errno != EBADF) { + if (ret >= 0 && errno != EBADF) { logconfig.fp = stderr; ret = 0; }

1 0

[torsocks/master] Fix compatibility with s390 and s390x architectures
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 90eafafc6148fc55e986a36ce3e26ed1e85e9140 Author: Jérémy Bobbio <lunar(a)zelenka.debian.org> Date: Fri Oct 25 09:14:07 2013 -0400 Fix compatibility with s390 and s390x architectures Signed-off-by: Jérémy Bobbio <lunar(a)zelenka.debian.org> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.h b/src/common/compat.h index 07c856f..31de549 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -45,7 +45,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #if defined(__linux__) -#if defined(__i386) +#if defined(__i386) || defined(__s390__) || defined(__s390x__) #include <asm-generic/unistd.h> #else #include <unistd.h>

1 0

[torsocks/master] Update version to v2.0.0-rc2
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit b68d61f4f1cdf725de4b6d259c3a0dec2f8ef30a Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Sep 2 14:06:44 2013 -0400 Update version to v2.0.0-rc2 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- ChangeLog | 17 +++++++++++++++++ configure.ac | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6b4a99a..d6a19ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2013-09-02 torsocks 2.0.0-rc2 + * Fix: remove FAQ file from Makefile + * Fix: remove out of date and inaccurate FAQ + * Tests: add connection object unit test + * Fix: Improve README file + * Tests: add onion pool subsystem unit test + * Use extern for tsocks_libc_* in torsocks.h + * Define LIBC_SYSCALL_ for OS X + * Make sure __darwin__ is defined + * Fix: explicitly ignore fileno return value + * Use AC_CHECK_FUNC rather than AC_LINK_IFELSE. + * Find out if we really need libdl. + * Define LIBC_SYSCALL_ for FreeBSD. + * Use SYS_ from <sys/syscall.h>. + * Include <sys/socket.h> for AF_INET*. + * Use getsockname(2) for finding out socket address family + 2013-08-24 torsocks 2.0.0-rc1 * Major rewrite from version 1.4 * Libc TCP communication support diff --git a/configure.ac b/configure.ac index 6c89912..6c9c5fd 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],[dgoulet@ev0ke.net],[],[https://torproject.org]) +AC_INIT([torsocks], [2.0.0-rc2],[dgoulet@ev0ke.net],[],[https://torproject.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET # Get hostname and other information.

1 0

[torsocks/master] Fix: missing registry unlock on error
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit e55eae3d3ca84cdd19bed5a881b9cc85ee48ffc0 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Oct 24 13:11:10 2013 -0400 Fix: missing registry unlock on error Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/getpeername.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/getpeername.c b/src/lib/getpeername.c index 8e2bd44..2315ace 100644 --- a/src/lib/getpeername.c +++ b/src/lib/getpeername.c @@ -43,10 +43,10 @@ LIBC_GETPEERNAME_RET_TYPE tsocks_getpeername(LIBC_GETPEERNAME_SIG) ret = -1; goto end; } - connection_registry_unlock(); errno = 0; end: + connection_registry_unlock(); return ret; }

1 0