tor-commits

tor-commits@lists.torproject.org

1 participants
212369 discussions

[torsocks/master] Make tests compile and run on OSX
by hoganrobert＠torproject.org 20 Feb '11

20 Feb '11

commit 94421ba8e0cc59003ecdb0317c346d7783723b5e Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 19:28:36 2011 +0000 Make tests compile and run on OSX --- configure.in | 17 ++++++++++++++++- test/test_torsocks.c | 15 +++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 3366420..69d2efb 100644 --- a/configure.in +++ b/configure.in @@ -521,6 +521,8 @@ LIBS=${SIMPLELIBS} AC_SEARCH_LIBS(dlopen, [dl]) AC_SEARCH_LIBS(res_query, [resolv]) +TESTLDFLAGS="$LDFLAGS" + dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES dnl instead of LD_PRELOAD case "$host_os" in @@ -575,6 +577,16 @@ case $host in *-*-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 AC_SUBST(SHLIB_EXT) @@ -615,5 +627,8 @@ AC_ENABLE_STATIC AC_CONFIG_FILES([src/usewithtor src/torsocks src/torsocks.conf.5 src/torsocks.8 src/usewithtor.1 src/torsocks.1]) -AC_OUTPUT(Makefile src/Makefile test/Makefile) +AC_OUTPUT(Makefile src/Makefile) +dnl Dump any LDFLAGS that were only required for linking libtorsocks, such as -dynamiclib on OSX. +LDFLAGS="$TESTLDFLAGS" +AC_OUTPUT(test/Makefile) diff --git a/test/test_torsocks.c b/test/test_torsocks.c index 6e8933b..60d78c8 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -37,6 +37,9 @@ #include <arpa/inet.h> #endif #include <arpa/nameser.h> +#if defined(__APPLE__) || defined(__darwin__) +#include <arpa/nameser_compat.h> +#endif #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <pthread.h> @@ -80,7 +83,7 @@ static int icmp_test() char datagram[400]; struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; -#if defined(OPENBSD) || defined(FREEBSD) +#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) struct icmp *icmphdr=(struct icmp *)(iphdr +1); #else struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); @@ -112,7 +115,7 @@ static int icmp_test() iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); -#if defined(OPENBSD) || defined(FREEBSD) +#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) icmphdr->icmp_type=130; icmphdr->icmp_code=0; icmphdr->icmp_cksum=htons(0xc3b0); @@ -264,7 +267,7 @@ static int res_tests(char *ip, char *test) { See: http://sourceware.org/ml/libc-help/2009-11/msg00013.html */ printf("\n---------------------- %s res_query() TEST----------------------\n\n", test); snprintf((char *)host, 127, "www.google.com"); -#ifndef OPENBSD +#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) ret = res_nquery(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); #else ret = res_query((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); @@ -273,7 +276,7 @@ static int res_tests(char *ip, char *test) { printf("\n---------------------- %s res_search() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); -#ifndef OPENBSD +#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) ret = res_nsearch(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); #else ret = res_search((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); @@ -282,7 +285,7 @@ static int res_tests(char *ip, char *test) { printf("\n--------------- %s res_querydomain() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); -#ifndef OPENBSD +#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) ret = res_nquerydomain(&_res, "www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); #else ret = res_querydomain("www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); @@ -291,7 +294,7 @@ static int res_tests(char *ip, char *test) { printf("\n---------------------- %s res_send() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); -#ifndef OPENBSD +#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) ret = res_nsend(&_res, host, 32, dnsreply, sizeof( dnsreply )); #else ret = res_send(host, 32, dnsreply, sizeof( dnsreply ));

1 0

[torsocks/master] Compile and run tests on FreeBSD
by hoganrobert＠torproject.org 20 Feb '11

20 Feb '11

commit 9de888be00f23ba1cfe1b172de61a59da6ae0ecd Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 15:36:50 2011 +0000 Compile and run tests on FreeBSD --- configure.in | 3 +++ test/test_torsocks.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f238caa..3366420 100644 --- a/configure.in +++ b/configure.in @@ -572,6 +572,9 @@ case $host in AC_SEARCH_LIBS(pthread_create, [pthread]) AC_SEARCH_LIBS(pthread_detach, [pthread]) ;; +*-*-freebsd*) + AC_DEFINE(FREEBSD, 1, "Define to handle FreeBSD") + ;; esac AC_SUBST(SHLIB_EXT) diff --git a/test/test_torsocks.c b/test/test_torsocks.c index 902a216..6e8933b 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -80,7 +80,7 @@ static int icmp_test() char datagram[400]; struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; -#ifdef OPENBSD +#if defined(OPENBSD) || defined(FREEBSD) struct icmp *icmphdr=(struct icmp *)(iphdr +1); #else struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); @@ -112,7 +112,7 @@ static int icmp_test() iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); -#ifdef OPENBSD +#if defined(OPENBSD) || defined(FREEBSD) icmphdr->icmp_type=130; icmphdr->icmp_code=0; icmphdr->icmp_cksum=htons(0xc3b0);

1 0

[torsocks/master] Make tests compile and run on OpenBSD
by hoganrobert＠torproject.org 20 Feb '11

20 Feb '11

commit 6bec541ad5398625f14757199df26ce5a4755f9c Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 11:04:54 2011 +0000 Make tests compile and run on OpenBSD --- test/Makefile.am | 2 - test/test_torsocks.c | 74 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index c03c387..84e4859 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,4 @@ noinst_PROGRAMS= test_torsocks -LIBS = -lresolv - test_torsocks_SOURCES= test_torsocks.c CLEANFILES= test_torsocks diff --git a/test/test_torsocks.c b/test/test_torsocks.c index a262303..902a216 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -19,13 +19,24 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +/* PreProcessor Defines */ +#include <config.h> -#include <arpa/inet.h> -#include <arpa/nameser.h> #include <errno.h> #include <fcntl.h> #include <netdb.h> +#ifdef OPENBSD +#include <netinet/in_systm.h> +#endif +#include <sys/types.h> +#include <sys/socket.h> +#ifndef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifndef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#include <arpa/nameser.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <pthread.h> @@ -33,9 +44,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/socket.h> #include <sys/time.h> -#include <sys/types.h> +#ifdef OPENBSD +#include <sys/uio.h> +#endif #include <sys/un.h> #include <sysexits.h> #include <syslog.h> @@ -68,7 +80,11 @@ static int icmp_test() char datagram[400]; struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; +#ifdef OPENBSD + struct icmp *icmphdr=(struct icmp *)(iphdr +1); +#else struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); +#endif char *buff=(char *)(icmphdr +1); printf("\n----------------icmp() TEST----------------------------\n\n"); @@ -96,16 +112,21 @@ static int icmp_test() iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); +#ifdef OPENBSD + icmphdr->icmp_type=130; + icmphdr->icmp_code=0; + icmphdr->icmp_cksum=htons(0xc3b0); +#else icmphdr->type=130; icmphdr->code=0; icmphdr->checksum=htons(0xc3b0); icmphdr->un.echo.sequence=0; icmphdr->un.echo.id=0; - - int one=1; - int *val=&one; - if(setsockopt(sockfd,IPPROTO_IP,IP_HDRINCL,val,sizeof(one))<0) - printf("cannot set HDRINCL!\n"); +#endif + int one=1; + int *val=&one; + if(setsockopt(sockfd,IPPROTO_IP,IP_HDRINCL,val,sizeof(one))<0) + printf("cannot set HDRINCL!\n"); if(sendto(sockfd,datagram,35,0,(struct sockaddr *)&dest,sizeof(dest))<0) @@ -228,7 +249,6 @@ static int res_tests(char *ip, char *test) { return -1; } - inet_ntop(AF_INET, &_res.nsaddr_list[0].sin_addr.s_addr, buf, sizeof(buf)); addr.sin_family=AF_INET; addr.sin_port=htons(53); @@ -240,29 +260,43 @@ static int res_tests(char *ip, char *test) { inet_ntop(AF_INET, &_res.nsaddr_list[0].sin_addr.s_addr, buf, sizeof(buf)); printf("nameserver for test: %s\n", buf); + /* Modifying _res directly doesn't work, so we have to use res_n* where available. + See: http://sourceware.org/ml/libc-help/2009-11/msg00013.html */ printf("\n---------------------- %s res_query() TEST----------------------\n\n", test); snprintf((char *)host, 127, "www.google.com"); - ret = res_nquery( &_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -// printf("RES_QUERY results: %s.\n", dnsreply); +#ifndef OPENBSD + ret = res_nquery(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#else + ret = res_query((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#endif printf("return code: %i\n", ret); printf("\n---------------------- %s res_search() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); - ret = res_nsearch( &_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -// printf("RES_SEARCH results: %s.\n", dnsreply); +#ifndef OPENBSD + ret = res_nsearch(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#else + ret = res_search((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#endif printf("return code: %i\n", ret); printf("\n--------------- %s res_querydomain() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); - ret = res_nquerydomain( &_res, "www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -// printf("RES_QUERYDOMAIN results: %s.\n", dnsreply); +#ifndef OPENBSD + ret = res_nquerydomain(&_res, "www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#else + ret = res_querydomain("www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); +#endif printf("return code: %i\n", ret); printf("\n---------------------- %s res_send() TEST----------------------\n\n", test); memset( dnsreply, '\0', sizeof( dnsreply )); - ret = res_nsend( &_res, host, 32, dnsreply, sizeof( dnsreply )); -// printf("RES_SEND results: %s.\n", dnsreply); - printf("return code: %i\n", ret); +#ifndef OPENBSD + ret = res_nsend(&_res, host, 32, dnsreply, sizeof( dnsreply )); +#else + ret = res_send(host, 32, dnsreply, sizeof( dnsreply )); +#endif +printf("return code: %i\n", ret); return ret; } @@ -353,7 +387,7 @@ static int gethostbyaddr_test() { printf("\n----------------------gethostbyaddr() TEST-----------------\n\n"); - inet_aton("38.229.70.16",&bar); + inet_aton("38.229.70.16", &bar); foo=gethostbyaddr(&bar,4,AF_INET); if (foo) { int i;

1 0

[torsocks/master] Fix segfault
by hoganrobert＠torproject.org 20 Feb '11

20 Feb '11

commit d8c11fa185dbcb4ea448394670b70f51e6cd786c Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 13:52:59 2011 +0000 Fix segfault Occurred when tor not running, torsocks run in debug/test mode, and gethostbyaddr() fails. --- src/dead_pool.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dead_pool.c b/src/dead_pool.c index 0ef0d30..13e5740 100644 --- a/src/dead_pool.c +++ b/src/dead_pool.c @@ -590,8 +590,9 @@ our_gethostbyaddr(dead_pool *pool, const void *_addr, socklen_t len, int type) he.h_addrtype = type; he.h_addr_list = addrs; - show_msg(MSGTEST, "our_gethostbyaddr: resolved '%s' to: '%s'\n", - inet_ntoa(*((struct in_addr *)he.h_addr)), result_hostname); + if (result_hostname) + show_msg(MSGTEST, "our_gethostbyaddr: resolved '%s' to: '%s'\n", + inet_ntoa(*((struct in_addr *)he.h_addr)), result_hostname); return &he;

1 0

[torsocks/master] Fix compile warning in test_torsocks.c
by hoganrobert＠torproject.org 20 Feb '11

20 Feb '11

commit 90f3cc0b3f08b965ec999fbcecbc9f9ff4f5dbf4 Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 14:00:07 2011 +0000 Fix compile warning in test_torsocks.c --- test/test_torsocks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/test_torsocks.c b/test/test_torsocks.c index e67de0a..a262303 100644 --- a/test/test_torsocks.c +++ b/test/test_torsocks.c @@ -69,7 +69,7 @@ static int icmp_test() struct sockaddr_in dest; struct ip *iphdr=(struct ip *) datagram; struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); - char *buff=(icmphdr +1); + char *buff=(char *)(icmphdr +1); printf("\n----------------icmp() TEST----------------------------\n\n"); if((sockfd=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP))<0)

1 0

[torsocks/master] Fix copyright notice
by hoganrobert＠torproject.org 20 Feb '11

20 Feb '11

commit 6d595039efef25fe5bab96c1913fac88e376d8ce Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 20 10:51:44 2011 +0000 Fix copyright notice --- test/run_tests.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/run_tests.sh b/test/run_tests.sh index 5dc50f7..5582102 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -1,7 +1,7 @@ #! /bin/sh # *************************************************************************** # * * -# * Copyright (C) 2008-2011 Robert Hogan <robert(a)roberthogan.net> * +# * Copyright (C) 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 *

1 0

[tor-svn] r24247: {website} Change sitemap.xml's MIME type to text/xml Previously, its M (website/trunk)
by Robert Ransom 20 Feb '11

20 Feb '11

Author: rransom Date: 2011-02-20 05:11:35 +0000 (Sun, 20 Feb 2011) New Revision: 24247 Modified: website/trunk/sitemap.xml Log: Change sitemap.xml's MIME type to text/xml Previously, its MIME type was application/xml, which Subversion thought was a binary file type, so commit-notification mails didn't include diffs. Hopefully, Subversion will recognize text/xml as a text file type, and generate diffs in the future. Property changes on: website/trunk/sitemap.xml ___________________________________________________________________ Modified: svn:mime-type - application/xml + text/xml

1 0

[tor-svn] r24246: {website} Trivial fixes to docs/en/documentation.wml (website/trunk/docs/en)
by Robert Ransom 20 Feb '11

20 Feb '11

Author: rransom Date: 2011-02-20 04:57:15 +0000 (Sun, 20 Feb 2011) New Revision: 24246 Modified: website/trunk/docs/en/documentation.wml Log: Trivial fixes to docs/en/documentation.wml Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2011-02-20 04:31:14 UTC (rev 24245) +++ website/trunk/docs/en/documentation.wml 2011-02-20 04:57:15 UTC (rev 24246) @@ -54,7 +54,7 @@ common questions from or for relay operators. The <a href="<page eff/tor-legal-faq>">Tor Legal FAQ</a> is written by EFF lawyers, and aims to give you an overview of some of the legal issues - that arise from the Tor project in the US. + that arise from The Tor Project in the US. </li> <li>The <a href="<page docs/tor-manual-dev>">manual</a> @@ -268,7 +268,7 @@ <li>Git and SVN access: <ul> <li><kbd>git clone git://git.torproject.org/git/tor</kbd></li> - <li>The development branch is <kbd>master</kbd>. The active maintenance branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>.</li> + <li>The development branch is <kbd>master</kbd>. The active maintenance branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>.</li> <li><kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd></li> </ul> </li>

1 0

[tor-svn] r24245: {website} update the sitemap and test new svn hooks. (website/trunk)
by Andrew Lewman 20 Feb '11

20 Feb '11

Author: phobos Date: 2011-02-20 04:31:14 +0000 (Sun, 20 Feb 2011) New Revision: 24245 Modified: website/trunk/sitemap.xml Log: update the sitemap and test new svn hooks. Modified: website/trunk/sitemap.xml =================================================================== (Binary files differ)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits