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

[torsocks/master] Revert "Fix: explicitly remove src.old from tarball"
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 8a9212a0d8e52394f796d3d037158bc3c5db1fe3 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Nov 6 19:58:25 2013 -0500 Revert "Fix: explicitly remove src.old from tarball" noinst_DIST actually adds file to the tarball and seems not working with subdirs. This reverts commit 293d484d94d40fcf610d71de635c4c0c7e4af463. --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bbef61a..7c3253a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,4 +5,3 @@ SUBDIRS = src doc tests dist_doc_DATA = ChangeLog EXTRA_DIST = gpl-2.0.txt -noinst_DIST = src.old

1 0

[torsocks/master] Fix: install documentation in doc directory
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 98e382a2cd6c5f45a222f4da0abbaa103e14fbf2 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Nov 6 17:02:56 2013 -0500 Fix: install documentation in doc directory Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 37efd94..d359d43 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,5 +6,5 @@ dist_man1_MANS = torsocks.1 dist_man5_MANS = torsocks.conf.5 dist_man8_MANS = torsocks.8 -dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG +dist_doc_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG

1 0

[torsocks/master] Add __syscall support for *BSD systems
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 1065e551161dfaa8f28da89b64bb57a3ea22d5df Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Nov 6 18:49:42 2013 -0500 Add __syscall support for *BSD systems Fixes #17 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/syscall.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.h | 26 ++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 67d3de2..adc433b 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -68,6 +68,7 @@ static LIBC_CONNECT_RET_TYPE handle_connect(va_list args) return tsocks_connect(sockfd, addr, addrlen); } +#if (defined(__linux__) || defined(__darwin__)) /* * Handle mmap(2) syscall. */ @@ -87,6 +88,7 @@ static LIBC_SYSCALL_RET_TYPE handle_mmap(va_list args) return (LIBC_SYSCALL_RET_TYPE) mmap(addr, len, prot, flags, fd, offset); } +#endif /* __linux__, __darwin__ */ /* * Handle munmap(2) syscall. @@ -120,6 +122,14 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int __number, va_list args) ret = handle_close(args); break; case TSOCKS_NR_MMAP: +#if (defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__x86_64) + /* + * On an 64 bit *BSD system, __syscall(2) should be used for mmap(). + * This is NOT suppose to happen but for protection we deny that call. + */ + ret = -1; + errno = ENOSYS; +#else /* * The mmap/munmap syscall are handled here for a very specific case so * buckle up here for the explanation :). @@ -141,6 +151,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int __number, va_list args) * own memory using mmap() called by syscall(). Same for munmap(). */ ret = handle_mmap(args); +#endif /* __NetBSD__, __FreeBSD__, __x86_64 */ break; case TSOCKS_NR_MUNMAP: ret = handle_munmap(args); @@ -174,3 +185,70 @@ LIBC_SYSCALL_DECL return ret; } + +/* Only used for *BSD systems. */ +#if (defined(__NetBSD__) || defined(__FreeBSD__)) + +/* __syscall(2) */ +TSOCKS_LIBC_DECL(__syscall, LIBC___SYSCALL_RET_TYPE, LIBC___SYSCALL_SIG) + +/* + * Handle *BSD mmap(2) syscall. + */ +static LIBC___SYSCALL_RET_TYPE handle_bsd_mmap(va_list args) +{ + void *addr; + size_t len; + int prot, flags, fd; + off_t offset; + + addr = va_arg(args, __typeof__(addr)); + len = va_arg(args, __typeof__(len)); + prot = va_arg(args, __typeof__(prot)); + flags = va_arg(args, __typeof__(flags)); + fd = va_arg(args, __typeof__(fd)); + offset = va_arg(args, __typeof__(offset)); + + return (LIBC___SYSCALL_RET_TYPE) mmap(addr, len, prot, flags, fd, offset); +} + +LIBC___SYSCALL_RET_TYPE tsocks___syscall(quad_t __number, va_list args) +{ + LIBC_SYSCALL_RET_TYPE ret; + + switch (__number) { + case TSOCKS_NR_MMAP: + /* + * Please see the mmap comment in the syscall() function to understand + * why mmap is being hijacked. + */ + ret = handle_bsd_mmap(args); + break; + default: + /* + * Deny call since we have no idea if this call can leak or not data + * off the Tor network. + */ + WARN("[syscall] Unsupported __syscall number %ld. Denying the call", + __number); + ret = -1; + errno = ENOSYS; + break; + } + + return ret; +} + +LIBC___SYSCALL_DECL +{ + LIBC___SYSCALL_RET_TYPE ret; + va_list args; + + va_start(args, __number); + ret = tsocks___syscall(__number, args); + va_end(args); + + return ret; +} + +#endif /* __NetBSD__, __FreeBSD__ */ diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 78dc3ec..d724a77 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -208,6 +208,25 @@ struct hostent **__result, int *__h_errnop #endif /* __GLIBC__ && __FreeBSD_kernel__ */ +/* __syscall(2) */ +#if defined(__FreeBSD__) + +#define LIBC___SYSCALL_NAME __syscall +#define LIBC___SYSCALL_NAME_STR XSTR(LIBC___SYSCALL_NAME) +#define LIBC___SYSCALL_RET_TYPE off_t +#define LIBC___SYSCALL_SIG quad_t __number, ... +#define LIBC___SYSCALL_ARGS __number + +#elif defined(__NetBSD__) + +#define LIBC___SYSCALL_NAME __syscall +#define LIBC___SYSCALL_NAME_STR XSTR(LIBC___SYSCALL_NAME) +#define LIBC___SYSCALL_RET_TYPE quad_t +#define LIBC___SYSCALL_SIG quad_t __number, ... +#define LIBC___SYSCALL_ARGS __number + +#endif /* __FreeBSD__, __NetBSD__ */ + /* * The following defines are libc function declarations using the macros * defined above on a per OS basis. @@ -241,6 +260,13 @@ extern TSOCKS_LIBC_DECL(syscall, LIBC_SYSCALL_RET_TYPE, LIBC_SYSCALL_SIG) #define LIBC_SYSCALL_DECL \ LIBC_SYSCALL_RET_TYPE LIBC_SYSCALL_NAME(LIBC_SYSCALL_SIG) +/* __syscall(2) */ +#if (defined(__FreeBSD__) || defined(__NetBSD__)) +extern TSOCKS_LIBC_DECL(__syscall, LIBC___SYSCALL_RET_TYPE, LIBC___SYSCALL_SIG) +#define LIBC___SYSCALL_DECL \ + LIBC___SYSCALL_RET_TYPE LIBC___SYSCALL_NAME(LIBC___SYSCALL_SIG) +#endif /* __FreeBSD__, __NetBSD__ */ + /* close(2) */ extern TSOCKS_LIBC_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG) TSOCKS_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG)

1 0

[torsocks/master] Fix: add missing errno to handle non-blocking connect()
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 7ed0346b388350c71a315e6c2567a6178c6bc128 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Nov 6 19:41:52 2013 -0500 Fix: add missing errno to handle non-blocking connect() Fixes #16 Reported-by: adrelanos <adrelanos(a)riseup.net> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/socks5.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/common/socks5.c b/src/common/socks5.c index fcd48b6..ede3594 100644 --- a/src/common/socks5.c +++ b/src/common/socks5.c @@ -146,8 +146,14 @@ int socks5_connect(struct connection *conn) 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)); + } while (ret < 0 && + (errno == EINTR || errno == EINPROGRESS || errno == EALREADY)); if (ret < 0) { + /* The non blocking socket is now connected. */ + if (errno == EISCONN) { + ret = 0; + goto error; + } ret = -errno; PERROR("socks5 libc connect"); }

1 0

[torsocks/master] Fix: reject IPv6 socket creation
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit dbed09b483170b76c531e219792060ecf0e96ca6 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Nov 7 20:16:51 2013 -0500 Fix: reject IPv6 socket creation Since Tor does not yet handle IPv6 DNS resolution or traffic, simply reject any socket creation with AF_INET6 type. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/socket.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/socket.c b/src/lib/socket.c index 8a4c0d1..dcc0444 100644 --- a/src/lib/socket.c +++ b/src/lib/socket.c @@ -34,6 +34,12 @@ LIBC_SOCKET_RET_TYPE tsocks_socket(LIBC_SOCKET_SIG) switch (__type) { case SOCK_STREAM: + if (__domain == AF_INET6) { + /* Tor does not handle IPv6 at the moment. Reject it. */ + ERR("Socket is IPv6. Tor does not handle AF_INET6 connection."); + errno = EINVAL; + return -1; + } break; default: if (__domain == AF_INET || __domain == AF_INET6) {

1 0

[torsocks/master] Fix: check if address is local after onion lookup
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 8068776cafdf42fbc1cd5c8d4751c657ddbb33ed Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Nov 7 21:26:12 2013 -0500 Fix: check if address is local after onion lookup Make the .onion address lookup before we check if the address is local (in the loopback network range). By default, onion cookies are in that range (127.42.42.x). Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/connect.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/lib/connect.c b/src/lib/connect.c index ab2e082..bdc9e6f 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -71,16 +71,6 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) inet_addr = (struct sockaddr_in *) __addr; - /* Check if address is local IPv4. */ - if (__addr->sa_family == AF_INET && - utils_is_ipv4_local(inet_addr->sin_addr.s_addr)) { - WARN("[connect] Connection to a local address are denied since it " - "might be a TCP DNS query to a local DNS server. " - "Rejecting it for safety reasons."); - errno = EPERM; - goto error; - } - /* * Lock registry to get the connection reference if one. In this code path, * if a connection object is found, it will not be used since a double @@ -104,7 +94,6 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) on_entry = onion_entry_find_by_ip(inet_addr->sin_addr.s_addr, &tsocks_onion_pool); onion_pool_unlock(&tsocks_onion_pool); - if (on_entry) { /* * Create a connection without a destination address since we will set @@ -119,6 +108,19 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) new_conn->dest_addr.hostname.addr = strdup(on_entry->hostname); new_conn->dest_addr.hostname.port = inet_addr->sin_port; } else { + /* + * Check if address is local IPv4. At this point, we are sure it's not + * a .onion cookie address that is by default in the loopback network. + */ + if (__addr->sa_family == AF_INET && + utils_is_ipv4_local(inet_addr->sin_addr.s_addr)) { + WARN("[connect] Connection to a local address are denied since it " + "might be a TCP DNS query to a local DNS server. " + "Rejecting it for safety reasons."); + errno = EPERM; + goto error; + } + new_conn = connection_create(__sockfd, __addr); if (!new_conn) { errno = ENOMEM;

1 0

[torsocks/master] Fix: fix localhost resolution address
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 467f3a847b7f9c529bf1ffc1f65eb275dfaa8062 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Nov 7 20:03:31 2013 -0500 Fix: fix localhost resolution address Every DNS resolving call now will query the local host table (usually /etc/hosts) before trying through Tor. Thus this fixes the issue of localhost resolution. If the application tries to connect to localhost, it is refused since it might be a TCP DNS query to a local DNS server. Adds a test for localhost resolution with getaddrinfo(). Fixes #14 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 8 ++++++++ src/common/utils.c | 15 +++++++++++++++ src/common/utils.h | 2 ++ src/lib/connect.c | 11 +++++++++++ src/lib/torsocks.c | 39 +++++++++++++++++++++++++++++++++++++++ tests/test_dns.c | 9 ++++++++- 6 files changed, 83 insertions(+), 1 deletion(-) diff --git a/src/common/compat.h b/src/common/compat.h index 9173caf..faadfdb 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -101,4 +101,12 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */ +/* + * Shamelessly taken from linux/in.h of the libc. This is consider trivial code + * by the GPL license thus copying it as is should be OK. + */ +#ifndef IN_LOOPBACK +#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000) +#endif + #endif /* TORSOCKS_COMPAT_H */ diff --git a/src/common/utils.c b/src/common/utils.c index 0c5c2c8..33fc109 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <string.h> +#include "compat.h" #include "macros.h" #include "utils.h" @@ -176,3 +177,17 @@ int utils_strcasecmpend(const char *s1, const char *s2) return strncasecmp(s1 + (n1 - n2), s2, n2); } } + + +/* + * Check if the given IPv4 is in the loopback net (127.x.x.x). + * + * Return 1 if so else 0 if not. + */ +ATTR_HIDDEN +int utils_is_ipv4_local(in_addr_t addr) +{ + assert(addr); + + return IN_LOOPBACK(addr); +} diff --git a/src/common/utils.h b/src/common/utils.h index aeda872..062441e 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -29,4 +29,6 @@ int utils_tokenize_ignore_comments(const char *_line, size_t size, char **tokens int utils_is_address_ipv4(const char *ip); int utils_is_address_ipv6(const char *ip); +int utils_is_ipv4_local(in_addr_t addr); + #endif /* TORSOCKS_UTILS_H */ diff --git a/src/lib/connect.c b/src/lib/connect.c index bc3ac9d..09d3be6 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -22,6 +22,7 @@ #include <common/connection.h> #include <common/log.h> #include <common/onion.h> +#include <common/utils.h> #include "torsocks.h" @@ -70,6 +71,16 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) inet_addr = (struct sockaddr_in *) __addr; + /* Check if address is local IPv4. */ + if (__addr->sa_family == AF_INET && + utils_is_ipv4_local(be32toh(inet_addr->sin_addr.s_addr))) { + WARN("[connect] Connection to a local address are denied since it " + "might be a TCP DNS query to a local DNS server. " + "Rejecting it for safety reasons."); + errno = EPERM; + goto error; + } + /* * Lock registry to get the connection reference if one. In this code path, * if a connection object is found, it will not be used since a double diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 55ae98b..93c2c35 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -322,6 +322,40 @@ error: } /* + * Lookup the local host table (usually /etc/hosts) for a given hostname. + * + * If found, ip_addr is populated and 0 is returned. + * If NOT found, -1 is return and ip_addr is untouched. + */ +static int hosts_file_resolve(const char *hostname, uint32_t *ip_addr) +{ + int ret; + struct hostent *host; + + assert(hostname); + assert(ip_addr); + + DBG("Looking in local host table for %s", hostname); + + /* Query the local host table if the hostname is present. */ + while ((host = gethostent()) != NULL) { + if (strncasecmp(hostname, host->h_name, strlen(hostname)) == 0) { + /* IP is found, copying and returning success. */ + memcpy(ip_addr, host->h_addr_list[0], sizeof(uint32_t)); + ret = 0; + goto end; + } + } + + /* Not found. */ + ret = -1; + +end: + endhostent(); + return ret; +} + +/* * Initiate a SOCK5 connection to the Tor network using the given connection. * The socks5 API will use the torsocks configuration object to find the tor * daemon. @@ -369,6 +403,11 @@ int tsocks_tor_resolve(const char *hostname, uint32_t *ip_addr) assert(hostname); assert(ip_addr); + ret = hosts_file_resolve(hostname, ip_addr); + if (!ret) { + goto end; + } + DBG("Resolving %s on the Tor network", hostname); /* diff --git a/tests/test_dns.c b/tests/test_dns.c index 01bb5d9..58c7675 100644 --- a/tests/test_dns.c +++ b/tests/test_dns.c @@ -24,7 +24,7 @@ #include <tap/tap.h> -#define NUM_TESTS 3 +#define NUM_TESTS 4 struct test_host { const char *name; @@ -49,6 +49,12 @@ static const struct test_host tor_dir_auth2 = { .ip = "171.25.193.9", }; +/* localhost resolution. */ +static const struct test_host tor_localhost = { + .name = "localhost", + .ip = "127.0.0.1", +}; + static void test_gethostbyname(const struct test_host *host) { struct hostent *he; @@ -133,6 +139,7 @@ int main(int argc, char **argv) test_getaddrinfo(&tor_check); test_gethostbyname(&tor_dir_auth1); test_gethostbyaddr(&tor_dir_auth2); + test_getaddrinfo(&tor_localhost); return 0; }

1 0

[torsocks/master] Fix: lookup libc name and pass it to dlopen()
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 90cd878468554a5c9dd52718a74f401238120748 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Nov 9 15:35:58 2013 -0500 Fix: lookup libc name and pass it to dlopen() The configure process now looks up the libc file name on a per OS basis and this value is passed to dlopen() that handles the library lookup in the system like stated in dlopen(3). Fixes #12 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 41 +++++++++++++++-------------------------- src/lib/torsocks.c | 6 +++--- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index c02ffda..a6b7138 100644 --- a/configure.ac +++ b/configure.ac @@ -115,34 +115,23 @@ if test "x${enable_envconf}" = "x"; then AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) fi -dnl Check that find is available, it should be somehere -dnl in the path -AC_CHECK_PROG(FIND, find, find) -if test "${FIND}" = ""; then - AC_MSG_ERROR('find not found in path') -fi - -dnl Find tail, it should always be somewhere in the path -dnl but for safety's sake -AC_CHECK_PROG(TAIL, tail, tail) -if test "${TAIL}" = ""; then - AC_MSG_ERROR('tail not found in path') -fi - dnl Get libc full system path. Use prefix or some hardcoded standard dnl location on Unixish system. -AC_MSG_CHECKING(location of libc.so) -for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do - if test "${LIBC_PATH}" = ""; then - LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` - fi -done -AC_DEFINE_UNQUOTED([LIBC_PATH],["${LIBC_PATH}"],[Description]) -if test "${LIBC_PATH}" = ""; then - AC_MSG_ERROR("not found!") -fi - -AC_MSG_RESULT($LIBC_PATH) +AC_MSG_CHECKING(file name of the C library) +AS_CASE([$host_os], + [darwin*], [libc_name="libSystem.dylib"], + [linux*], + [ + libc_name=`ldd /bin/ls | grep libc | cut -d ' ' -f 1 | tr -d '\t'` + if test "${libc_name}" == ""; then + # Default libc on most system. + libc_name="libc.so.6" + fi + ], + [libc_name="libc.so"] +) +AC_DEFINE_UNQUOTED([LIBC_NAME],["${libc_name}"], [Description]) +AC_MSG_RESULT($libc_name) ############################################################################## # 5. Determine how to preload libtorsocks.so on this system. diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 93c2c35..332c561 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -123,9 +123,9 @@ static void init_libc_symbols(void) void *libc_ptr; dlerror(); - libc_ptr = dlopen(LIBC_PATH, RTLD_LAZY); + libc_ptr = dlopen(LIBC_NAME, RTLD_LAZY); if (!libc_ptr) { - ERR("Unable to dlopen() library " LIBC_PATH "(%s)", dlerror()); + ERR("Unable to dlopen() library " LIBC_NAME "(%s)", dlerror()); goto error; } @@ -136,7 +136,7 @@ static void init_libc_symbols(void) tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR); if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket || !tsocks_libc_syscall) { - ERR("Unable to lookup symbols in " LIBC_PATH "(%s)", dlerror()); + ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror()); goto error; }

1 0

[torsocks/master] Fix: put utils_is_ipv4_local static inline
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 88af304be86cbc633b41fde6716c33dab698c8d2 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Nov 7 21:22:35 2013 -0500 Fix: put utils_is_ipv4_local static inline Also remove the assert() since 0.0.0.0 is valid :) Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/utils.c | 15 --------------- src/common/utils.h | 12 +++++++++++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 33fc109..0c5c2c8 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -24,7 +24,6 @@ #include <stdlib.h> #include <string.h> -#include "compat.h" #include "macros.h" #include "utils.h" @@ -177,17 +176,3 @@ int utils_strcasecmpend(const char *s1, const char *s2) return strncasecmp(s1 + (n1 - n2), s2, n2); } } - - -/* - * Check if the given IPv4 is in the loopback net (127.x.x.x). - * - * Return 1 if so else 0 if not. - */ -ATTR_HIDDEN -int utils_is_ipv4_local(in_addr_t addr) -{ - assert(addr); - - return IN_LOOPBACK(addr); -} diff --git a/src/common/utils.h b/src/common/utils.h index 062441e..474b2df 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -22,6 +22,8 @@ #include <netinet/in.h> +#include "compat.h" + char *utils_strsplit(char *separator, char **text, const char *search); int utils_strcasecmpend(const char *s1, const char *s2); int utils_tokenize_ignore_comments(const char *_line, size_t size, char **tokens); @@ -29,6 +31,14 @@ int utils_tokenize_ignore_comments(const char *_line, size_t size, char **tokens int utils_is_address_ipv4(const char *ip); int utils_is_address_ipv6(const char *ip); -int utils_is_ipv4_local(in_addr_t addr); +/* + * Check if the given IPv4 is in the loopback net (127.x.x.x). + * + * Return 1 if so else 0 if not. + */ +static inline int utils_is_ipv4_local(in_addr_t addr) +{ + return IN_LOOPBACK(addr); +} #endif /* TORSOCKS_UTILS_H */

1 0

[torsocks/master] Fix: bad include and duplicate syscall values
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 8bdc54163af8048e4a301162d8d1fafc01e6fc71 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Nov 9 14:11:54 2013 -0500 Fix: bad include and duplicate syscall values First, for the unistd.h include, remove the i386 and s390/x defined to include asm-generic/unistd.h since this header is x64 specific! If some syscall's values are missing, they will be nullified and handled accordingly. The second issue is that we set different bad values to an unknown syscall value so we don't end up with duplicates in the torsocks syscall wrapper switch case. Fixes #18 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index f8e241e..e9a59e7 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -46,34 +46,31 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m); #endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */ #if defined(__linux__) - -#if defined(__i386) || defined(__s390__) || defined(__s390x__) -#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. + * defined, set them to a bad syscall value. Just to be clear, if the value is + * undefined, tsocks syscall() will DENY the real syscall if catched. + * + * The values are not the same per syscall here so we don't end up with + * duplicates in the switch case in the tsocks sycall wrapper. */ #ifndef __NR_socket #define __NR_socket -1 #endif #ifndef __NR_connect -#define __NR_connect -1 +#define __NR_connect -2 #endif #ifndef __NR_close -#define __NR_close -1 +#define __NR_close -3 #endif #ifndef __NR_mmap -#define __NR_mmap -1 +#define __NR_mmap -4 #endif #ifndef __NR_munmap -#define __NR_munmap -1 +#define __NR_munmap -5 #endif #define TSOCKS_NR_SOCKET __NR_socket

1 0