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

[torsocks/master] Rename configure.in and improve it
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit c42326a036a9cadaf16aad741c969b44f29ea737 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed May 29 16:57:24 2013 -0400 Rename configure.in and improve it Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 655 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 645 --------------------------------------------------------- 2 files changed, 655 insertions(+), 645 deletions(-) diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..4bf2e36 --- /dev/null +++ b/configure.ac @@ -0,0 +1,655 @@ +############################################################################## +# 1. Initialize the autoconf build +############################################################################## + +# Process this file with autoconf to produce a configure script. +AC_INIT([torsocks], [2.0.0-rc1],[jacob@appelbaum.net],[],[https://torproject.org]) +AC_CONFIG_AUX_DIR([config]) +AC_CANONICAL_TARGET +# Get hostname and other information. +AC_CANONICAL_HOST +AC_CONFIG_MACRO_DIR([config]) + +# Create a config.g file to store defines generated by configure +AC_CONFIG_HEADER([include/config.h]) + +# Automake initialization +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) + +# Silent compilation. Easier to spot errors! +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_LN_S + +dnl Arguments we allow +AC_ARG_ENABLE(debug, +[ --disable-debug disable ALL error messages from torsocks ]) +AC_ARG_ENABLE(oldmethod, +[ --enable-oldmethod use the old method to override connect ]) +AC_ARG_ENABLE(envconf, +[ --disable-envconf do not allow TORSOCKS_CONF_FILE to specify configuration file ]) + + +############################################################################## +# 2. Check for some standard headers and libraries +############################################################################## + +dnl Check if the C compiler accepts -Wall +AC_MSG_CHECKING(if the C compiler accepts -Wall) +OLDCFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Wall" +AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ + CFLAGS="$OLDCFLAGS" + AC_MSG_RESULT(no)]) + +dnl Checks for standard header files. +AC_HEADER_STDC + +dnl Check for the dynamic loader function header +AC_CHECK_HEADER(dlfcn.h,,AC_MSG_ERROR("dlfcn.h not found")) + +dnl Check for the socket header +AC_CHECK_HEADER(sys/socket.h,,AC_MSG_ERROR("sys/socket.h not found")) + +dnl Check for the arpa/inet.h header (inet_ntoa and inet_addr) +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) + +dnl Checks for library functions. +AC_CHECK_FUNCS(strcspn strdup strerror strspn strtol mmap strcasecmp \ + strncasecmp strtol,,[AC_MSG_ERROR("Required function not found")]) + +############################################################################## +# 3. Determine libraries we need to include when linking libtorsocks. +# OpenBSD and OSX have some special requirements here. +# Also check the host we're building on, as some of the code +# in torsocks.c and elsewhere is platform-dependent. +############################################################################## + +dnl First find the library that contains connect() (obviously +dnl the most important library for us). Once we've found it +dnl we chuck it on the end of LIBS, that lib may end up there +dnl more than once (since we do our search with an empty libs +dnl list) but that isn't a problem +OLDLIBS="${LIBS}" +LIBS= +CONNECTLIB= +for LIB in c socket; do + AC_CHECK_LIB("${LIB}",connect,[ + CONNECTLIB="${LIB}" + break + ],) +done +LIBS="${OLDLIBS} -l${CONNECTLIB}" +if test "${CONNECTLIB}" = ""; then + AC_MSG_ERROR('Could not find library containing connect()') +fi + + +dnl Check for socket +AC_CHECK_FUNC(socket,, [ + AC_CHECK_LIB(socket, socket,,AC_MSG_ERROR("socket function not found"))]) + +dnl Check for a function to convert an ascii ip address +dnl to a sin_addr. +AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), [ + AC_CHECK_FUNC(inet_addr, AC_DEFINE([HAVE_INET_ADDR],[],[Description]), [ + AC_CHECK_LIB(nsl, inet_addr, [ AC_DEFINE([HAVE_INET_ADDR],[],[Description]) + LIBS="${LIBS} -lnsl" ], [ + AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) + + +dnl Look for gethostbyname (needed by torsocks) +AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ + AC_CHECK_LIB(xnet, gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ + AC_MSG_ERROR(["gethostbyname not found, name lookups in " \ + "torsocks disabled"])])]) + + +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]) + + +dnl OpenBSD needs -lpthread. It also doesn't support AI_V4MAPPED. +case $host in +*-*-openbsd*) + AC_DEFINE(OPENBSD, 1, "Define to handle OpenBSD") + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) + ;; +*-*-freebsd*) + AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") + ;; +*-*-darwin*) + dnl Needed to compile tests. + dnl See https://bugs.g10code.com/gnupg/issue1292: + dnl "On OS X (at least in 10.6 and I believe starting at 10.3) the DNS resolution + dnl services fail to compile. This is a result of the addition of BIND9 compatible + dnl resolution libraries on OS X that are being picked up by the configure script + dnl instead of -lresolv causing the tests for useable resolution services to fail + dnl thus disabling features like pka auto lookup." + LIBS="-lresolv $LIBS" + ;; +esac + + +############################################################################## +# 3. Check if we need to use --enable-oldmethod, regardless of what was +# given on the ./configure command line. +############################################################################## + +dnl If we're using gcc here define _GNU_SOURCE +AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h) +AC_EGREP_CPP(yes, +[ + #include <dlfcn.h> + #ifdef RTLD_NEXT + yes + #endif +], [ + AC_MSG_RESULT(yes) +], [ + AC_MSG_RESULT(no) + AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h with _GNU_SOURCE) + AC_EGREP_CPP(yes, + [ + #define _GNU_SOURCE + #include <dlfcn.h> + #ifdef RTLD_NEXT + yes + #endif + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE([USE_GNU_SOURCE],[],[Description]) + ], [ + AC_MSG_RESULT(no) + AC_DEFINE([USE_OLD_DLSYM],[],[Description]) + oldmethod="yes" + ]) +]) + +if test "x${enable_envconf}" = "x"; then + AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) +fi + +############################################################################## +# 3. If --enable-oldmethod was requested, perform the necessary checks +############################################################################## + +if test "${enable_oldmethod}" = "yes"; then + AC_DEFINE([USE_OLD_DLSYM],[],[Description]) + oldmethod="yes" +fi + +dnl If we have to use the old method of overriding connect (i.e no +dnl RTLD_NEXT) we need to know the location of the library that +dnl contains connect(), select(), poll() and close() +if test "${oldmethod}" = "yes"; then + dnl We need to find the path to the library, to do + dnl this we use find on the usual suspects, i.e /lib and + dnl /usr/lib + + 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 Now find the library we need + AC_MSG_CHECKING(location of lib${CONNECTLIB}.so) + LIBCONNECT= + for DIR in '/lib' '/usr/lib'; do + if test "${LIBCONNECT}" = ""; then + LIBCONNECT=`$FIND $DIR -name "lib${CONNECTLIB}.so.?" 2>/dev/null | $TAIL -1` + fi + done + AC_DEFINE_UNQUOTED([LIBCONNECT],["${LIBCONNECT}"],[Description]) + if test "${LIBCONNECT}" = ""; then + AC_MSG_ERROR("not found!") + fi + + AC_MSG_RESULT($LIBCONNECT) + + dnl Now find the resolve library we need + AC_MSG_CHECKING(location of libresolv.so) + LIBRESOLV= + for DIR in '/lib' '/usr/lib'; do + if test "${LIBRESOLV}" = ""; then + LIBRESOLV=`$FIND $DIR -name "libresolv.so.?" 2>/dev/null | $TAIL -1` + fi + done + AC_DEFINE_UNQUOTED([LIBRESOLV],["${LIBRESOLV}"],[Description]) + if test "${LIBRESOLV}" = ""; then + AC_MSG_ERROR("not found!") + fi + + AC_MSG_RESULT($LIBRESOLV) + + dnl close() should be in libc, find it + AC_MSG_CHECKING(location of libc.so) + LIBC= + for DIR in '/lib' '/usr/lib'; do + if test "${LIBC}" = ""; then + LIBC=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` + fi + done + + AC_DEFINE_UNQUOTED([LIBC],["${LIBC}"],[Description]) + if test "${LIBC}" = ""; then + AC_MSG_ERROR("not found!") + fi + + AC_MSG_RESULT($LIBC) +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. +############################################################################## + +# This variable is used for the LDFLAGS in test/Makefile.am +TESTLDFLAGS="$LDFLAGS" +AC_SUBST(TESTLDFLAGS) + +# Version information for libtorsocks +TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0" + +dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES +dnl instead of LD_PRELOAD +case "$host_os" in +darwin*) + dnl Check if the linker accepts -dynamiclib; necessary on Mac OS X + AC_MSG_CHECKING(if the linker accepts -dynamiclib) + OLDLDFLAGS="$TORSOCKSLDFLAGS" + TORSOCKSLDFLAGS="$TORSOCKSLDFLAGS -dynamiclib" + AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ + TORSOCKSLDFLAGS="$OLDLDFLAGS" + AC_MSG_RESULT(no)]) + + # dnl Check if the linker accepts -multiply_defined suppress; necessary on Mac OS X + # AC_MSG_CHECKING(if the linker accepts -multiply_defined suppress) + # OLDLDFLAGS="$LDFLAGS" + # LDFLAGS="$LDFLAGS -multiply_defined suppress" + # AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ + # LDFLAGS="$OLDLDFLAGS" + # AC_MSG_RESULT(no)]) + + dnl Check if the linker accepts -single_module; necessary on Mac OS X + AC_MSG_CHECKING(if the linker accepts -single_module) + OLDLDFLAGS="$TORSOCKSLDFLAGS" + SHLIB_EXT="so" + LDPRELOAD="LD_PRELOAD" + TORSOCKSLDFLAGS="$TORSOCKSLDFLAGS -single_module" + AC_TRY_COMPILE(,, + [ + SHLIB_EXT="dylib" + LDPRELOAD="DYLD_INSERT_LIBRARIES" + AC_MSG_RESULT(yes) + ], [ + TORSOCKSLDFLAGS="$OLDLDFLAGS" + AC_MSG_RESULT(no) + ] + ) + + ;; +*) + SHLIB_EXT="so" + LDPRELOAD="LD_PRELOAD" + ;; +esac + +AC_SUBST(SHLIB_EXT) +AC_SUBST(LDPRELOAD) +AC_SUBST(TORSOCKSLDFLAGS) + +############################################################################## +# 7. Determine where the install should write the default configuration +# file and where libtorsocks should read it from by default. +############################################################################## + +if test "x$prefix" = "xNONE"; then + prefix=$ac_default_prefix +fi + +if test "x$CONFDIR" = "x"; then + CONFDIR=`eval echo $sysconfdir` +fi +AC_SUBST(CONFDIR) +AH_TEMPLATE([CONFDIR],[torsock's configuration directory]) +AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") + +AC_ARG_WITH(conf, +[ --with-conf=<file> location of configuration file (${CONFDIR}/torsocks.conf default)],[ +if test "${withval}" = "yes" ; then + AC_MSG_ERROR("--with-conf requires the location of the configuration file as an argument") +else + AC_DEFINE_UNQUOTED([CONF_FILE], ["${withval}"],[Description]) +fi +], [ + AC_DEFINE_UNQUOTED([CONF_FILE], ["${CONFDIR}/torsocks.conf"],[Description]) +]) + +############################################################################## +# 8. Clean up and create some supporting scripts from their *.in files +############################################################################## + +AC_LANG_C +AC_PROG_CC +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL +AC_SUBST(LIBTOOL_DEPS) +AC_ENABLE_SHARED +AC_ENABLE_STATIC + +AC_CONFIG_FILES([ + Makefile + src/Makefile + doc/Makefile + test/Makefile +]) + +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index f0bbcdb..0000000 --- a/configure.in +++ /dev/null @@ -1,645 +0,0 @@ -############################################################################## -# 1. Initialize the autoconf build -############################################################################## - -# Process this file with autoconf to produce a configure script. -AC_INIT() - -# Create a config.g file to store defines generated by configure -AC_CONFIG_HEADER(config.h) - -# Automake initialization -AM_INIT_AUTOMAKE(torsocks, 1.3) - -# Get hostname and other information. -AC_CANONICAL_HOST -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S - - -dnl Arguments we allow -AC_ARG_ENABLE(debug, -[ --disable-debug disable ALL error messages from torsocks ]) -AC_ARG_ENABLE(oldmethod, -[ --enable-oldmethod use the old method to override connect ]) -AC_ARG_ENABLE(envconf, -[ --disable-envconf do not allow TORSOCKS_CONF_FILE to specify configuration file ]) - - -############################################################################## -# 2. Check for some standard headers and libraries -############################################################################## - -dnl Check if the C compiler accepts -Wall -AC_MSG_CHECKING(if the C compiler accepts -Wall) -OLDCFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall" -AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ - CFLAGS="$OLDCFLAGS" - AC_MSG_RESULT(no)]) - -dnl Checks for standard header files. -AC_HEADER_STDC - -dnl Check for the dynamic loader function header -AC_CHECK_HEADER(dlfcn.h,,AC_MSG_ERROR("dlfcn.h not found")) - -dnl Check for the socket header -AC_CHECK_HEADER(sys/socket.h,,AC_MSG_ERROR("sys/socket.h not found")) - -dnl Check for the arpa/inet.h header (inet_ntoa and inet_addr) -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) - -dnl Checks for library functions. -AC_CHECK_FUNCS(strcspn strdup strerror strspn strtol mmap strcasecmp \ - strncasecmp strtol,,[AC_MSG_ERROR("Required function not found")]) - -############################################################################## -# 3. Determine libraries we need to include when linking libtorsocks. -# OpenBSD and OSX have some special requirements here. -# Also check the host we're building on, as some of the code -# in torsocks.c and elsewhere is platform-dependent. -############################################################################## - -dnl First find the library that contains connect() (obviously -dnl the most important library for us). Once we've found it -dnl we chuck it on the end of LIBS, that lib may end up there -dnl more than once (since we do our search with an empty libs -dnl list) but that isn't a problem -OLDLIBS="${LIBS}" -LIBS= -CONNECTLIB= -for LIB in c socket; do - AC_CHECK_LIB("${LIB}",connect,[ - CONNECTLIB="${LIB}" - break - ],) -done -LIBS="${OLDLIBS} -l${CONNECTLIB}" -if test "${CONNECTLIB}" = ""; then - AC_MSG_ERROR('Could not find library containing connect()') -fi - - -dnl Check for socket -AC_CHECK_FUNC(socket,, [ - AC_CHECK_LIB(socket, socket,,AC_MSG_ERROR("socket function not found"))]) - -dnl Check for a function to convert an ascii ip address -dnl to a sin_addr. -AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), [ - AC_CHECK_FUNC(inet_addr, AC_DEFINE([HAVE_INET_ADDR],[],[Description]), [ - AC_CHECK_LIB(nsl, inet_addr, [ AC_DEFINE([HAVE_INET_ADDR],[],[Description]) - LIBS="${LIBS} -lnsl" ], [ - AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) - - -dnl Look for gethostbyname (needed by torsocks) -AC_CHECK_FUNC(gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ - AC_CHECK_LIB(xnet, gethostbyname, AC_DEFINE([HAVE_GETHOSTBYNAME],[],[Description]), [ - AC_MSG_ERROR(["gethostbyname not found, name lookups in " \ - "torsocks disabled"])])]) - - -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]) - - -dnl OpenBSD needs -lpthread. It also doesn't support AI_V4MAPPED. -case $host in -*-*-openbsd*) - AC_DEFINE(OPENBSD, 1, "Define to handle OpenBSD") - AC_SEARCH_LIBS(pthread_create, [pthread]) - AC_SEARCH_LIBS(pthread_detach, [pthread]) - ;; -*-*-freebsd*) - AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") - ;; -*-*-darwin*) - dnl Needed to compile tests. - dnl See https://bugs.g10code.com/gnupg/issue1292: - dnl "On OS X (at least in 10.6 and I believe starting at 10.3) the DNS resolution - dnl services fail to compile. This is a result of the addition of BIND9 compatible - dnl resolution libraries on OS X that are being picked up by the configure script - dnl instead of -lresolv causing the tests for useable resolution services to fail - dnl thus disabling features like pka auto lookup." - LIBS="-lresolv $LIBS" - ;; -esac - - -############################################################################## -# 3. Check if we need to use --enable-oldmethod, regardless of what was -# given on the ./configure command line. -############################################################################## - -dnl If we're using gcc here define _GNU_SOURCE -AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h) -AC_EGREP_CPP(yes, -[ - #include <dlfcn.h> - #ifdef RTLD_NEXT - yes - #endif -], [ - AC_MSG_RESULT(yes) -], [ - AC_MSG_RESULT(no) - AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h with _GNU_SOURCE) - AC_EGREP_CPP(yes, - [ - #define _GNU_SOURCE - #include <dlfcn.h> - #ifdef RTLD_NEXT - yes - #endif - ], [ - AC_MSG_RESULT(yes) - AC_DEFINE([USE_GNU_SOURCE],[],[Description]) - ], [ - AC_MSG_RESULT(no) - AC_DEFINE([USE_OLD_DLSYM],[],[Description]) - oldmethod="yes" - ]) -]) - -if test "x${enable_envconf}" = "x"; then - AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) -fi - -############################################################################## -# 3. If --enable-oldmethod was requested, perform the necessary checks -############################################################################## - -if test "${enable_oldmethod}" = "yes"; then - AC_DEFINE([USE_OLD_DLSYM],[],[Description]) - oldmethod="yes" -fi - -dnl If we have to use the old method of overriding connect (i.e no -dnl RTLD_NEXT) we need to know the location of the library that -dnl contains connect(), select(), poll() and close() -if test "${oldmethod}" = "yes"; then - dnl We need to find the path to the library, to do - dnl this we use find on the usual suspects, i.e /lib and - dnl /usr/lib - - 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 Now find the library we need - AC_MSG_CHECKING(location of lib${CONNECTLIB}.so) - LIBCONNECT= - for DIR in '/lib' '/usr/lib'; do - if test "${LIBCONNECT}" = ""; then - LIBCONNECT=`$FIND $DIR -name "lib${CONNECTLIB}.so.?" 2>/dev/null | $TAIL -1` - fi - done - AC_DEFINE_UNQUOTED([LIBCONNECT],["${LIBCONNECT}"],[Description]) - if test "${LIBCONNECT}" = ""; then - AC_MSG_ERROR("not found!") - fi - - AC_MSG_RESULT($LIBCONNECT) - - dnl Now find the resolve library we need - AC_MSG_CHECKING(location of libresolv.so) - LIBRESOLV= - for DIR in '/lib' '/usr/lib'; do - if test "${LIBRESOLV}" = ""; then - LIBRESOLV=`$FIND $DIR -name "libresolv.so.?" 2>/dev/null | $TAIL -1` - fi - done - AC_DEFINE_UNQUOTED([LIBRESOLV],["${LIBRESOLV}"],[Description]) - if test "${LIBRESOLV}" = ""; then - AC_MSG_ERROR("not found!") - fi - - AC_MSG_RESULT($LIBRESOLV) - - dnl close() should be in libc, find it - AC_MSG_CHECKING(location of libc.so) - LIBC= - for DIR in '/lib' '/usr/lib'; do - if test "${LIBC}" = ""; then - LIBC=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` - fi - done - - AC_DEFINE_UNQUOTED([LIBC],["${LIBC}"],[Description]) - if test "${LIBC}" = ""; then - AC_MSG_ERROR("not found!") - fi - - AC_MSG_RESULT($LIBC) -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. -############################################################################## - -# This variable is used for the LDFLAGS in test/Makefile.am -TESTLDFLAGS="$LDFLAGS" -AC_SUBST(TESTLDFLAGS) - -# Version information for libtorsocks -TORSOCKSLDFLAGS="$LDFLAGS -version-info 1:0:0" - -dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES -dnl instead of LD_PRELOAD -case "$host_os" in -darwin*) - dnl Check if the linker accepts -dynamiclib; necessary on Mac OS X - AC_MSG_CHECKING(if the linker accepts -dynamiclib) - OLDLDFLAGS="$TORSOCKSLDFLAGS" - TORSOCKSLDFLAGS="$TORSOCKSLDFLAGS -dynamiclib" - AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ - TORSOCKSLDFLAGS="$OLDLDFLAGS" - AC_MSG_RESULT(no)]) - - # dnl Check if the linker accepts -multiply_defined suppress; necessary on Mac OS X - # AC_MSG_CHECKING(if the linker accepts -multiply_defined suppress) - # OLDLDFLAGS="$LDFLAGS" - # LDFLAGS="$LDFLAGS -multiply_defined suppress" - # AC_TRY_COMPILE(,,AC_MSG_RESULT(yes),[ - # LDFLAGS="$OLDLDFLAGS" - # AC_MSG_RESULT(no)]) - - dnl Check if the linker accepts -single_module; necessary on Mac OS X - AC_MSG_CHECKING(if the linker accepts -single_module) - OLDLDFLAGS="$TORSOCKSLDFLAGS" - SHLIB_EXT="so" - LDPRELOAD="LD_PRELOAD" - TORSOCKSLDFLAGS="$TORSOCKSLDFLAGS -single_module" - AC_TRY_COMPILE(,, - [ - SHLIB_EXT="dylib" - LDPRELOAD="DYLD_INSERT_LIBRARIES" - AC_MSG_RESULT(yes) - ], [ - TORSOCKSLDFLAGS="$OLDLDFLAGS" - AC_MSG_RESULT(no) - ] - ) - - ;; -*) - SHLIB_EXT="so" - LDPRELOAD="LD_PRELOAD" - ;; -esac - -AC_SUBST(SHLIB_EXT) -AC_SUBST(LDPRELOAD) -AC_SUBST(TORSOCKSLDFLAGS) - -############################################################################## -# 7. Determine where the install should write the default configuration -# file and where libtorsocks should read it from by default. -############################################################################## - -if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix -fi - -if test "x$CONFDIR" = "x"; then - CONFDIR=`eval echo $sysconfdir` -fi -AC_SUBST(CONFDIR) -AH_TEMPLATE([CONFDIR],[torsock's configuration directory]) -AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") - -AC_ARG_WITH(conf, -[ --with-conf=<file> location of configuration file (${CONFDIR}/torsocks.conf default)],[ -if test "${withval}" = "yes" ; then - AC_MSG_ERROR("--with-conf requires the location of the configuration file as an argument") -else - AC_DEFINE_UNQUOTED([CONF_FILE], ["${withval}"],[Description]) -fi -], [ - AC_DEFINE_UNQUOTED([CONF_FILE], ["${CONFDIR}/torsocks.conf"],[Description]) -]) - -############################################################################## -# 8. Clean up and create some supporting scripts from their *.in files -############################################################################## - -AC_LANG_C -AC_PROG_CC -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL -AC_SUBST(LIBTOOL_DEPS) -AC_ENABLE_SHARED -AC_ENABLE_STATIC - -AC_CONFIG_FILES([src/usewithtor src/torsocks doc/torsocks.conf.5 doc/torsocks.8 doc/usewithtor.1 doc/torsocks.1]) -AC_CONFIG_FILES(Makefile src/Makefile doc/Makefile test/Makefile) -AC_OUTPUT

1 0

[torsocks/master] Fix single quote and add default includes
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 6d6d02187a81b38bc8f4a4e2daa689663a05f972 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 11:54:45 2013 -0400 Fix single quote and add default includes Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4bf2e36..aded828 100644 --- a/configure.ac +++ b/configure.ac @@ -619,7 +619,7 @@ if test "x$CONFDIR" = "x"; then CONFDIR=`eval echo $sysconfdir` fi AC_SUBST(CONFDIR) -AH_TEMPLATE([CONFDIR],[torsock's configuration directory]) +AH_TEMPLATE([CONFDIR],[torsocks configuration directory]) AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") AC_ARG_WITH(conf, @@ -645,6 +645,9 @@ AC_SUBST(LIBTOOL_DEPS) AC_ENABLE_SHARED AC_ENABLE_STATIC +DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h" +AC_SUBST(DEFAULT_INCLUDES) + AC_CONFIG_FILES([ Makefile src/Makefile

1 0

[torsocks/master] Add config/ dir to default include path
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 1ad42aa9f02a5c73765670b786a11c3b23811d87 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 11:55:17 2013 -0400 Add config/ dir to default include path Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0ef8147..912a8f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,6 @@ # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I config + SUBDIRS = src doc test

1 0

[torsocks/master] Add gitignore to repository
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 5b3bc6814815796e58605597ffddbe575ca07787 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed May 29 16:42:34 2013 -0400 Add gitignore to repository Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cc20063 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +*.o +*.so +*.swp +*.o +*.swo +*.pyc +Makefile +.libs/ +.deps/ +*~ +*.la +*.lo +Makefile.in +*.loT +*.info +*.bz2 +*.tar +aclocal.m4 +autom4te.cache/ +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +stamp-h1 +tags + +doc/torsocks.1 +doc/torsocks.8 +doc/torsocks.conf.5 +doc/usewithtor.1 + +src/torsocks +src/usewithtor + +test/test_torsocks

1 0

[torsocks/master] Add run_tests.sh to make check
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit f0618d7129fee227dbf4cf042d0c2a7feb32bad7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 12:06:06 2013 -0400 Add run_tests.sh to make check Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- test/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 10e037b..263fea0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,6 +2,8 @@ noinst_PROGRAMS= test_torsocks test_torsocks_SOURCES= test_torsocks.c test_torsocks_LDFLAGS= $(TESTLDFLAGS) -CLEANFILES= test_torsocks -dist_data_DATA = run_tests.sh expectedresults.txt \ No newline at end of file +dist_data_DATA = run_tests.sh expectedresults.txt + +check-am: + ./run_tests.sh

1 0

[torsocks/master] Add config/ and include/ dir in the repository and update gitignore
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 14c9a0f59fc5839d3a9eb880212629f3347257b6 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 11:55:57 2013 -0400 Add config/ and include/ dir in the repository and update gitignore Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index cc20063..2054342 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,8 @@ missing stamp-h1 tags +config/* + doc/torsocks.1 doc/torsocks.8 doc/torsocks.conf.5 diff --git a/config/.placeholder b/config/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/include/.placeholder b/include/.placeholder new file mode 100644 index 0000000..e69de29

1 0

[torsocks/master] Add new source directory structure and makefiles
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 45883524c5e034bbbe08206f141fdb53eb9082f0 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 12:58:43 2013 -0400 Add new source directory structure and makefiles Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 2 ++ src/Makefile.am | 19 +------------------ src/common/Makefile.am | 8 ++++++++ src/lib/Makefile.am | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index aded828..517155b 100644 --- a/configure.ac +++ b/configure.ac @@ -651,6 +651,8 @@ AC_SUBST(DEFAULT_INCLUDES) AC_CONFIG_FILES([ Makefile src/Makefile + src/common/Makefile + src/lib/Makefile doc/Makefile test/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index e3a01c9..67c8cf5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,18 +1 @@ -# Makefile used by configure to create real Makefile - -libdir = @libdir@/torsocks - -# Install invocation scripts -bin_SCRIPTS = torsocks usewithtor -INSTALL_SCRIPT = $(install_sh) -c -m 755 - -libtorsocks_la_LDFLAGS= $(TORSOCKSLDFLAGS) -# Install main library to $(prefix)/lib/tor (must match torsocks.in) -lib_LTLIBRARIES = libtorsocks.la -libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c\ - common.h dead_pool.h expansion_table.h parser.h socks.h - -DISTCLEANFILES=parser.lo dead_pool.lo common.lo libtorsocks.lo torsocks.lo darwin_warts.lo socks.lo\ - config.cache config.log config.h Makefile \ - aclocal.m4 config.status usewithtor torsocks \ - autom4te.cache .libs .deps +SUBDIRS = common lib diff --git a/src/common/Makefile.am b/src/common/Makefile.am new file mode 100644 index 0000000..c663a99 --- /dev/null +++ b/src/common/Makefile.am @@ -0,0 +1,8 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src + +AM_CFLAGS = -fno-strict-aliasing + +noinst_LTLIBRARIES = libcommon.la +libcommon_la_SOURCES = + + diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am new file mode 100644 index 0000000..4a4fbea --- /dev/null +++ b/src/lib/Makefile.am @@ -0,0 +1,16 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(builddir) + +libdir = @libdir@/torsocks + +# Install invocation scripts +bin_SCRIPTS = torsocks usewithtor +INSTALL_SCRIPT = $(install_sh) -c -m 755 + +lib_LTLIBRARIES = libtorsocks.la + +libtorsocks_la_SOURCES = + +libtorsocks_la_LDFLAGS = $(TORSOCKSLDFLAGS) + +libtorsocks_la_LIBADD = \ + $(top_builddir)/src/common/libcommon.la

1 0

[torsocks/master] Add torsocks and usewithtor scripts from old source
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 94faab889c8c0a0e422dd6a506eceaa69b9d1ec6 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 13:03:34 2013 -0400 Add torsocks and usewithtor scripts from old source Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.in | 167 +++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/usewithtor.in | 113 +++++++++++++++++++++++++++++++++ 2 files changed, 280 insertions(+) diff --git a/src/lib/torsocks.in b/src/lib/torsocks.in new file mode 100644 index 0000000..4eaed8f --- /dev/null +++ b/src/lib/torsocks.in @@ -0,0 +1,167 @@ +#!/bin/sh +# *************************************************************************** +# * * +# * * +# * Copyright (C) 2008 by Robert Hogan * +# * robert(a)roberthogan.net * +# * Copyright (C) 2012 by Jacob Appelbaum <jacob(a)torproject.org> * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU General Public License as published by * +# * the Free Software Foundation; either version 2 of the License, or * +# * (at your option) any later version. * +# * * +# * 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., * +#* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +# *************************************************************************** +# * * +# * This is a modified version of a source file from the Tor project. * +# * Original copyright information follows: * +# *************************************************************************** +# Wrapper script for use of the torsocks(8) transparent socksification library +# +# There are three forms of usage for this script: +# +# @prefix@/bin/torsocks program [program arguments...] +# +# This form sets the users @LDPRELOAD@ environment variable so that torsocks(8) +# will be loaded to socksify the application then executes the specified +# program (with the provided arguments). The following simple example might +# be used to telnet to www.foo.org via a torsocks.conf(5) configured socks server: +# +# @prefix@/bin/torsocks telnet www.foo.org +# +# The second form allows for torsocks(8) to be switched on and off for a +# session (that is, it adds and removes torsocks from the @LDPRELOAD@ environment +# variable). This form must be _sourced_ into the user's existing session +# (and will only work with bourne shell users): +# +# . @prefix@/bin/torsocks on +# telnet www.foo.org +# . @prefix@/bin/torsocks off +# +# Or +# +# source @prefix@/bin/torsocks on +# telnet www.foo.org +# source @prefix@/bin/torsocks off +# +# The third form creates a new shell with @LDPRELOAD@ set and is achieved +# simply by running the script with no arguments +# +# @prefix@/bin/torsocks +# +# When finished the user can simply terminate the shell with 'exit' +# +# This script is originally from the debian torsocks package by +# Tamas Szerb <toma(a)rulez.org> +# Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 + +not_found () { + echo "ERROR: $1 cannot be found in PATH." >&2 + exit 1 +} + +set_id () { + echo "ERROR: $1 is set${2}id. torsocks will not work on a set${2}id executable." >&2 + exit 1 +} + +if [ $# = 0 ] ; then + echo "$0: insufficient arguments" + exit +fi + +LIBDIR="@prefix@/lib/torsocks" +LIB_NAME="libtorsocks" +SHLIB_EXT="@SHLIB_EXT@" +SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" + +# Check for libtorsocks and if set the 64bit variant +if [ ! -f $SHLIB ]; then + LIBDIR="@prefix@/lib64/torsocks" + SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +fi + +# Ensure libtorsocks exists, +if [ ! -f $SHLIB ]; then + echo "$0: $SHLIB does not exist! Try re-installing torsocks." + exit +fi + +case "$1" in + on) + if [ -z "$@LDPRELOAD@" ] + then + export @LDPRELOAD@="${SHLIB}" + else + echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ + export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" + fi + # FIXME: This env variable is only meaningful on Mac OSX, so it would be better + # not to set it at all on other platforms. + export DYLD_FORCE_FLAT_NAMESPACE=1 + ;; + off) + #replace '/' with '\/' in @prefix@ + # escprefix=`echo '@prefix@' |sed 's/\\//\\\\\//g'` + # export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"` + export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#@prefix@/lib/torsocks/libtorsocks\.@SHLIB_EXT@ *##"` + if [ -z "$@LDPRELOAD@" ] + then + unset @LDPRELOAD@ + # FIXME: This env variable is only meaningful on Mac OSX, so it would be better + # not to set it at all on other platforms. + unset DYLD_FORCE_FLAT_NAMESPACE=1 + fi + ;; + show|sh) + echo "@LDPRELOAD@=\"$@LDPRELOAD@\"" + ;; + -h|-?) + echo "$0: Please see torsocks(1) or read comment at top of $0" + ;; + --shell) + if [ -z "$@LDPRELOAD@" ] + then + export @LDPRELOAD@="${SHLIB}" + else + echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ + export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" + fi + export DYLD_FORCE_FLAT_NAMESPACE=1 + echo "torsocks: new torified shell coming right up..." + ${SHELL:-/bin/sh} + ;; + *) + if [ -z "$@LDPRELOAD@" ] + then + export @LDPRELOAD@="${SHLIB}" + else + echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ + export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" + fi + export DYLD_FORCE_FLAT_NAMESPACE=1 + + if [ $# -gt 0 ] + then + if ! which "$1" >/dev/null 2>&1; then + not_found $1 + elif [ -u `which "$1"` ]; then + set_id $1 u + elif [ -g `which "$1"` ]; then + set_id $1 g + fi + exec "$@" + fi + ;; +esac + +#EOF diff --git a/src/lib/usewithtor.in b/src/lib/usewithtor.in new file mode 100644 index 0000000..e606760 --- /dev/null +++ b/src/lib/usewithtor.in @@ -0,0 +1,113 @@ +#! /bin/sh +# *************************************************************************** +# * * +# * Copyright (C) 2008-2011 Robert Hogan <robert(a)roberthogan.net> * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU General Public License as published by * +# * the Free Software Foundation; either version 2 of the License, or * +# * (at your option) any later version. * +# * * +# * 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., * +#* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +# *************************************************************************** +# * * +# * This is a modified version of a source file from the Tor project. * +# * Original copyright notice from tsocks source file follows: * +# *************************************************************************** + +# Wrapper script for use of the tsocks(8) transparent socksification library +# See the tsocks(1) and torify(1) manpages. + +# Copyright (c) 2004, 2006 Peter Palfrader +# Modified by Jacob Appelbaum <jacob(a)appelbaum.net> April 16th 2006 +# Modified by Marcus Griep <marcus(a)griep.us> June 16 2009 +# May be distributed under the same terms as Tor itself + + +# Define and ensure we have tsocks +# XXX: what if we don't have which? +TORSOCKS="`which torsocks`" +PROG= +VERBOSE= + +usage () { + echo "Usage: $0 [-hv] <command> [<options>...]" +} + +not_found () { + echo "ERROR: $1 cannot be found in PATH." >&2 + exit 1 +} + +set_id () { + echo "ERROR: $1 is set${2}id. usewithtor will not work on a set${2}id executable." >&2 + exit 1 +} + +# Check for any argument list +if [ "$#" = 0 ]; then + usage >&2 + exit 1 +fi + +while [ "$1" ]; do + case "$1" in + -h|--h*) + usage + exit 0 + ;; + -v|--v*) + VERBOSE=YesPlease + shift + ;; + *) + break; + esac +done + +if ! which "$1" >/dev/null 2>&1; then + not_found $1 +elif [ -u `which "$1"` ]; then + set_id $1 u +elif [ -g `which "$1"` ]; then + set_id $1 g +fi + +if [ -x "$TORSOCKS" ]; then + PROG=torsocks +else + echo "$0: Unable to find torsocks in PATH." >&2 + echo " Perhaps you haven't installed it?" >&2 + exit 1 +fi + +if [ "$VERBOSE" ]; then + echo "We're armed with the following torsocks: $TORSOCKS" + echo "We're attempting to use $PROG for all tor action." +fi + +if [ "$PROG" = "torsocks" ]; then + # Define our torsocks config file + TORSOCKS_CONF_FILE="@CONFDIR@/torsocks.conf" + export TORSOCKS_CONF_FILE + + # Check that we've got a torsocks config file + if [ -r "$TORSOCKS_CONF_FILE" ]; then + exec torsocks "$@" + else + echo "$0: Missing torsocks configuration file \"$TORSOCKS_CONF_FILE\" - torsocks will use defaults sensible for Tor." >&2 + exec torsocks "$@" + fi +fi + +# We should have hit an exec. If we get here, we didn't exec +echo "$0: failed to exec $PROG $@" >&2 +exit 1

1 0

[torsocks/master] Add defaults.h containing some defaults value
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 67ba8d182c859308cd0761133d3c6cd3c7f29f95 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 14:08:09 2013 -0400 Add defaults.h containing some defaults value Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/defaults.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/common/defaults.h b/src/common/defaults.h new file mode 100644 index 0000000..c13db66 --- /dev/null +++ b/src/common/defaults.h @@ -0,0 +1,25 @@ +/* + * 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. + */ + +#ifndef TORSOCKS_DEFAULTS_H +#define TORSOCKS_DEFAULTS_H + +#define DEFAULT_TOR_PORT 9050 +#define DEFAULT_TOR_ADDRESS "127.0.0.1" +#define DEFAULT_TOR_SOCKS 5 + +#endif /* TORSOCKS_DEFAULTS_H */

1 0

[torsocks/master] Add utils.c/utils.h with calls from old code
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 0e12a3c565e8b5abcfb5ea3657b2fbf94f5cc483 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Jun 2 14:25:54 2013 -0400 Add utils.c/utils.h with calls from old code Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/Makefile.am | 2 +- src/common/config-file.c | 77 ++++------------------------------- src/common/utils.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ src/common/utils.h | 28 +++++++++++++ 4 files changed, 136 insertions(+), 71 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f23e439..5f325a2 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src AM_CFLAGS = -fno-strict-aliasing noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = log.c log.h config-file.c config-file.h +libcommon_la_SOURCES = log.c log.h config-file.c config-file.h utils.c utils.h diff --git a/src/common/config-file.c b/src/common/config-file.c index a085a19..ad7b683 100644 --- a/src/common/config-file.c +++ b/src/common/config-file.c @@ -29,38 +29,11 @@ #include "config-file.h" #include "log.h" +#include "utils.h" /* Global configuration variables. */ static struct config_server_entry *currentcontext = NULL; -/* This routines breaks up input lines into tokens */ -/* and places these tokens into the array specified */ -/* by tokens */ -static int tokenize(char *line, int arrsize, char *tokens[]) { - int tokenno = -1; - int finished = 0; - - /* Whitespace is ignored before and after tokens */ - while ((tokenno < (arrsize - 1)) && - (line = line + strspn(line, " \t")) && - (*line != (char) 0) && - (!finished)) { - tokenno++; - tokens[tokenno] = line; - line = line + strcspn(line, " \t"); - *line = (char) 0; - line++; - - /* We ignore everything after a # */ - if (*tokens[tokenno] == '#') { - finished = 1; - tokenno--; - } - } - - return(tokenno + 1); -} - /* Check server entries (and establish defaults) */ static int check_server(struct config_server_entry *server) { @@ -117,15 +90,15 @@ int make_config_network_entry(char *value, struct config_network_entry **ent) { split = buf; /* Now rip it up */ - ip = strsplit(&separator, &split, "/:"); + ip = utils_strsplit(&separator, &split, "/:"); if (separator == ':') { /* We have a start port */ - start_port = strsplit(&separator, &split, "-/"); + start_port = utils_strsplit(&separator, &split, "-/"); if (separator == '-') /* We have an end port */ - end_port = strsplit(&separator, &split, "/"); + end_port = utils_strsplit(&separator, &split, "/"); } - subnet = strsplit(NULL, &split, " \n"); + subnet = utils_strsplit(NULL, &split, " \n"); if ((ip == NULL) || (subnet == NULL)) { /* Network specification not validly constructed */ @@ -258,7 +231,7 @@ static int handle_reaches(int lineno, char *value) { static int handle_server(struct config_parsed *config, int lineno, char *value) { char *ip; - ip = strsplit(NULL, &value, " "); + ip = utils_strsplit(NULL, &value, " "); /* We don't verify this ip/hostname at this stage, */ /* its resolved immediately before use in torsocks.c */ @@ -599,7 +572,7 @@ static int handle_line(struct config_parsed *config, char *line, int lineno) strncpy(savedline, line, CONFIG_MAXLINE - 1); savedline[CONFIG_MAXLINE - 1] = (char) 0; /* Tokenize the input string */ - nowords = tokenize(line, 10, words); + nowords = utils_tokenize_ignore_comments(line, 10, words); /* Set the spare slots to an empty string to simplify */ /* processing */ @@ -731,42 +704,6 @@ int pick_server(struct config_parsed *config, struct config_server_entry **ent, return(0); } -/* This function is very much like strsep, it looks in a string for */ -/* a character from a list of characters, when it finds one it */ -/* replaces it with a \0 and returns the start of the string */ -/* (basically spitting out tokens with arbitrary separators). If no */ -/* match is found the remainder of the string is returned and */ -/* the start pointer is set to be NULL. The difference between */ -/* standard strsep and this function is that this one will */ -/* set *separator to the character separator found if it isn't null */ -char *strsplit(char *separator, char **text, const char *search) { - unsigned int len; - char *ret; - - ret = *text; - - if (*text == NULL) { - if (separator) - *separator = '\0'; - return(NULL); - } else { - len = strcspn(*text, search); - if (len == strlen(*text)) { - if (separator) - *separator = '\0'; - *text = NULL; - } else { - *text = *text + len; - if (separator) - *separator = **text; - **text = '\0'; - *text = *text + 1; - } - } - - return(ret); -} - /* * Read and populate the given config parsed data structure. * diff --git a/src/common/utils.c b/src/common/utils.c new file mode 100644 index 0000000..3c537fc --- /dev/null +++ b/src/common/utils.c @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> + * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> + * 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 <string.h> + +#include "macros.h" +#include "utils.h" + +/* + * This routines breaks up input lines into tokens and places these tokens into + * the array specified by tokens + * + * Return the number of token plus one set in the given array. + */ +ATTR_HIDDEN +int utils_tokenize_ignore_comments(char *line, int arrsize, char **tokens) +{ + int tokenno = -1; + int finished = 0; + + /* Whitespace is ignored before and after tokens */ + while ((tokenno < (arrsize - 1)) && + (line = line + strspn(line, " \t")) && + (*line != (char) 0) && + (!finished)) { + tokenno++; + tokens[tokenno] = line; + line = line + strcspn(line, " \t"); + *line = '\0'; + line++; + + /* We ignore everything after a # */ + if (*tokens[tokenno] == '#') { + finished = 1; + tokenno--; + } + } + + return tokenno + 1; +} + +/* + * This function is very much like strsep, it looks in a string for a character + * from a list of characters, when it finds one it replaces it with a \0 and + * returns the start of the string (basically spitting out tokens with + * arbitrary separators). + * + * If no match is found the remainder of the string is returned and the start + * pointer is set to be NULL. The difference between standard strsep and this + * function is that this one will set separator to the character separator + * found if it isn't NULL. + */ +ATTR_HIDDEN +char *utils_strsplit(char *separator, char **text, const char *search) +{ + unsigned int len; + char *ret; + + ret = *text; + + if (*text == NULL) { + if (separator) { + *separator = '\0'; + } + return NULL; + } + + len = strcspn(*text, search); + if (len == strlen(*text)) { + if (separator) { + *separator = '\0'; + } + *text = NULL; + } else { + *text = *text + len; + if (separator) { + *separator = **text; + } + **text = '\0'; + *text = *text + 1; + } + + return ret; +} diff --git a/src/common/utils.h b/src/common/utils.h new file mode 100644 index 0000000..26a5092 --- /dev/null +++ b/src/common/utils.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> + * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> + * 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. + */ + +#ifndef TORSOCKS_UTILS_H +#define TORSOCKS_UTILS_H + +#include <netinet/in.h> + +char *utils_strsplit(char *separator, char **text, const char *search); +int utils_tokenize_ignore_comments(char *line, int arrsize, char **tokens); + +#endif /* TORSOCKS_UTILS_H */

1 0