June 2011 - tor-commits - lists.torproject.org

[tor/master] Fix tor-fw-helper-natpmp.c API usage
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit 8b0d9452ca2053bbfba60750d169aaf52037cfcd Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Jun 19 02:31:13 2011 -0700 Fix tor-fw-helper-natpmp.c API usage libnatpmp-20110618 changed the API that tor-fw-helper used and for a time tor-fw-helper could not build against the newest libnatpmp. This patch brings support for libnatpmp to tor-fw-helper. --- changes/bug3434 | 2 ++ configure.in | 2 +- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug3434 b/changes/bug3434 new file mode 100644 index 0000000..24ee518 --- /dev/null +++ b/changes/bug3434 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Update tor-fw-helper to support libnatpmp-20110618; fixes 3434. diff --git a/configure.in b/configure.in index e5db370..12922ae 100644 --- a/configure.in +++ b/configure.in @@ -545,7 +545,7 @@ if test "$natpmp" = "true"; then [ int r; natpmp_t natpmp; natpmpresp_t response; - r = initnatpmp(&natpmp);], + r = initnatpmp(&natpmp, 0, 0);], [printf("initnatpmp() returned %d (%s)\n", r, r?"FAILED":"SUCCESS"); exit(0);], [--with-libnatpmp-dir], diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index 2630b8f..f9d5d0d 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -55,7 +55,7 @@ tor_natpmp_init(tor_fw_options_t *tor_fw_options, void *backend_state) if (tor_fw_options->verbose) fprintf(stdout, "V: natpmp init...\n"); - r = initnatpmp(&(state->natpmp)); + r = initnatpmp(&(state->natpmp), 0, 0); if (r == 0) { state->init = 1; fprintf(stdout, "tor-fw-helper: natpmp initialized...\n");

1 0

[torflow/master] Ticket #1975: Improve slice file distribution.
by mikeperry＠torproject.org 20 Jun '11

20 Jun '11

commit a0a57efd548143688921a7c13d2bf6150d925a4d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jun 20 14:09:20 2011 -0700 Ticket #1975: Improve slice file distribution. Values may not be final. Seeing what effect this has. --- NetworkScanners/BwAuthority/bwauthority.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index 236e502..70a8344 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -49,11 +49,13 @@ user_agent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.37 # TODO: We'll also want to try to prefer pairing unmeasured nodes # together then, and use a different url set for them. # cutoff percent URL -urls = [(10, "https://38.229.70.2/2M"), - (20, "https://38.229.70.2/1M"), - (30, "https://38.229.70.2/512k"), - (50, "https://38.229.70.2/256k"), - (100, "https://38.229.70.2/128k")] +urls = [(5, "https://38.229.70.2/16M"), # fbw 1499k..500k + (10, "https://38.229.70.2/8M"), # fbw 500k..350k + (20, "https://38.229.70.2/4M"), # fbw 350k..200k + (30, "https://38.229.70.2/2M"), # fbw 200k..128k + (50, "https://38.229.70.2/512k"), # fbw 128k..50k + (80, "https://38.229.70.2/256k"), # fbw 50k..26k + (100, "https://38.229.70.2/128k")] # fbw 26k..10k # Do NOT modify this object directly after it is handed to PathBuilder

1 0

[torbrowser/maint-2.2] update HACKING doc with information about patch format and how to contribute
by erinn＠torproject.org 20 Jun '11

20 Jun '11

commit 0c56c7b88522d5f0b135366d80c652f27c4f9909 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jun 20 16:45:47 2011 -0300 update HACKING doc with information about patch format and how to contribute --- docs/HACKING | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/docs/HACKING b/docs/HACKING index 03ad072..ce020ac 100644 --- a/docs/HACKING +++ b/docs/HACKING @@ -42,7 +42,8 @@ Modifications ---------------------- Some components of TBB are modified and all of the patches are available in the -git repository in src/current-patches. +git repository in src/current-patches. Within each patch is an explanation of +what the patch does. Please see them for more information. - Vidalia: modified on Linux and OS X * Vidalia has been patched for Linux in order to allow it to quit at the same @@ -171,3 +172,42 @@ whether they should be kept around in perpetuity is undecided at this moment. Official TBB releases for more than one architecture must use 'arch' in the filename. + +Patch format +---------------------- + +The patches for TBB components live in torbrowser.git/src/current-patches and +are in the following format: + +001-component-patch-summary.patch + +Please see TBB's git for a list of current patches: +https://gitweb.torproject.org/torbrowser.git/tree/refs/heads/maint-2.2:/src/current-patches + +If the patch is against anything in the existing torbrowser.git, do: + +$ git clone git://git.torproject.org/torbrowser.git + +If it's against an existing tarball of some component in TBB (such as Firefox, +OpenSSL, or Vidalia), you can use git format-patch by doing the following: + +$ cd srcdir && git init && git add --ignore-errors .; git commit -m "`basename $PWD`" + +Make your changes, then: + +$ git format-patch origin/master + +Make sure to add a sufficiently explanatory summary of the changes since future +people will be looking in the patch to see why it's being used. + +You may have to change the filename of the patch to fit appropriately in the +patch series if there are pre-existing patches. + +Submitting patches +---------------------- + +File a ticket on https://trac.torproject.org for the Tor bundles/installation +component and attach the patch. + +If you're a Tor developer and have a personal torbrowser.git, just tell me +which branch your changes are in.

1 0

[tor/master] Fix overwide line in config.c
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 8653f31d8d534282795acb54ee500ef7d42d3a32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:29:22 2011 -0400 Fix overwide line in config.c --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index c885046..df5cc86 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -310,7 +310,7 @@ static config_var_t _option_vars[] = { OBSOLETE("LogFile"), V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), V(LongLivedPorts, CSV, - "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), + "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"),

1 0

[tor/master] Fix overwide lines in util.c
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 1040ccafb20d5d32cdf0945226f570dcbaf96e90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:28:06 2011 -0400 Fix overwide lines in util.c --- src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 36aa9cc..b47b9c5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1677,11 +1677,12 @@ file_status(const char *fname) * is group-readable, but in all cases we create the directory mode 0700. * If CPD_CHECK_MODE_ONLY is set, then we don't alter the directory permissions * if they are too permissive: we just return -1. - * When effective_user is not NULL, check permissions against the given user and - * its primary group. + * When effective_user is not NULL, check permissions against the given user + * and its primary group. */ int -check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user) +check_private_dir(const char *dirname, cpd_check_t check, + const char *effective_user) { int r; struct stat st; @@ -1730,10 +1731,12 @@ check_private_dir(const char *dirname, cpd_check_t check, const char *effective_ } #ifndef MS_WINDOWS if (effective_user) { - /* Lookup the user and group information, if we have a problem, bail out. */ + /* Look up the user and group information. + * If we have a problem, bail out. */ pw = getpwnam(effective_user); if (pw == NULL) { - log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user); + log_warn(LD_CONFIG, "Error setting configured user: %s not found", + effective_user); return -1; } running_uid = pw->pw_uid;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 997499369e8f2e022d2d923fa10e54a9370c1e1e Merge: 8b26554 1040cca Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:28:16 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.2] Fix overwide lines in util.c
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 1040ccafb20d5d32cdf0945226f570dcbaf96e90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:28:06 2011 -0400 Fix overwide lines in util.c --- src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 36aa9cc..b47b9c5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1677,11 +1677,12 @@ file_status(const char *fname) * is group-readable, but in all cases we create the directory mode 0700. * If CPD_CHECK_MODE_ONLY is set, then we don't alter the directory permissions * if they are too permissive: we just return -1. - * When effective_user is not NULL, check permissions against the given user and - * its primary group. + * When effective_user is not NULL, check permissions against the given user + * and its primary group. */ int -check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user) +check_private_dir(const char *dirname, cpd_check_t check, + const char *effective_user) { int r; struct stat st; @@ -1730,10 +1731,12 @@ check_private_dir(const char *dirname, cpd_check_t check, const char *effective_ } #ifndef MS_WINDOWS if (effective_user) { - /* Lookup the user and group information, if we have a problem, bail out. */ + /* Look up the user and group information. + * If we have a problem, bail out. */ pw = getpwnam(effective_user); if (pw == NULL) { - log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user); + log_warn(LD_CONFIG, "Error setting configured user: %s not found", + effective_user); return -1; } running_uid = pw->pw_uid;

1 0

[pytorctl/master] Remove python 2.5ism
by mikeperry＠torproject.org 20 Jun '11

20 Jun '11

commit 7cd3224c4615c8b2e3f465ed2d1b22d2f9dbf89f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jun 20 10:03:30 2011 -0700 Remove python 2.5ism --- TorCtl.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index c515c97..edf9408 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -617,7 +617,8 @@ class Connection: try: authInfo = self.sendAndRecv("PROTOCOLINFO\r\n")[1][1] except Exception, exc: - excMsg = ": %s" % exc if exc.message else "" + if exc.message: excMsg = ": %s" % exc + else: excMsg = "" raise IOError("Unable to query PROTOCOLINFO for the authentication type%s" % excMsg) authType, cookiePath = None, None

1 0

[tor/master] Add port 6523 (Gobby) to LongLivedPorts.
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 8b265543eb0f5fdda15fca882028fa95983fa919 Author: intrigeri <intrigeri(a)boum.org> Date: Mon Jun 20 15:13:00 2011 +0200 Add port 6523 (Gobby) to LongLivedPorts. --- changes/feature3439 | 3 +++ doc/tor.1.txt | 2 +- src/or/config.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/feature3439 b/changes/feature3439 new file mode 100644 index 0000000..ee8c6f2 --- /dev/null +++ b/changes/feature3439 @@ -0,0 +1,3 @@ + o Minor features: + - Add port 6523 (Gobby) to LongLivedPorts. Patch by intrigeri; + implements ticket 3439. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7d72350..6454e6b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -651,7 +651,7 @@ The following options are useful only for clients (that is, if (e.g. chat and interactive shells). Circuits for streams that use these ports will contain only high-uptime nodes, to reduce the chance that a node will go down before the stream is finished. (Default: 21, 22, 706, 1863, - 5050, 5190, 5222, 5223, 6667, 6697, 8300) + 5050, 5190, 5222, 5223, 6523, 6667, 6697, 8300) **MapAddress** __address__ __newaddress__:: When a request for address arrives to Tor, it will rewrite it to newaddress diff --git a/src/or/config.c b/src/or/config.c index ca0d9b0..c885046 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -310,7 +310,7 @@ static config_var_t _option_vars[] = { OBSOLETE("LogFile"), V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), V(LongLivedPorts, CSV, - "21,22,706,1863,5050,5190,5222,5223,6667,6697,8300"), + "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"),

1 0

[obfsproxy/master] obfsproxy now compiles and runs on the Microsoft Windows computing platform.
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 8dd3fbc015eb671651dcb829a6761d9e0758bcf1 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Jun 20 03:41:13 2011 +0200 obfsproxy now compiles and runs on the Microsoft Windows computing platform. --- Makefile.am | 4 ++-- configure.ac | 9 +++++++++ src/main.c | 14 ++++++++++++++ src/network.c | 4 ++++ src/socks.c | 40 +++++++++++++++++++++++++++++++++++++++- src/socks.h | 4 ++++ src/test/tinytest.c | 8 ++++---- src/util.c | 4 ++++ 8 files changed, 80 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index bd3a2b2..614748f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ libobfsproxy_a_SOURCES = \ obfsproxy_SOURCES = \ src/main.c -obfsproxy_LDADD = @libevent_LIBS@ @openssl_LIBS@ libobfsproxy.a +obfsproxy_LDADD = libobfsproxy.a @libevent_LIBS@ @openssl_LIBS@ @LIB_WS32@ unittests_SOURCES = \ src/test/tinytest.c \ @@ -26,7 +26,7 @@ unittests_SOURCES = \ src/test/unittest_obfs2.c \ src/test/unittest_crypt.c \ src/test/unittest_socks.c -unittests_LDADD = @libevent_LIBS@ @openssl_LIBS@ libobfsproxy.a +unittests_LDADD = libobfsproxy.a @libevent_LIBS@ @openssl_LIBS@ @LIB_WS32@ noinst_HEADERS = \ src/network.h \ diff --git a/configure.ac b/configure.ac index da838db..c799d61 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,15 @@ PKG_CHECK_MODULES([openssl], [openssl >= 0.9.7]) # We don't need -lssl, only -lcrypto openssl_LIBS=`echo "$openssl_LIBS" | $SED -e 's/-lssl//'` +AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes) +AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes") +if test "x$HAVE_WINSOCK2_H" = "xyes"; then + LIB_WS32=-lws2_32 +else + LIB_WS32= +fi +AC_SUBST(LIB_WS32) + AC_CHECK_SIZEOF(size_t) AC_CONFIG_FILES([Makefile]) diff --git a/src/main.c b/src/main.c index 5ca365f..e469b7b 100644 --- a/src/main.c +++ b/src/main.c @@ -13,6 +13,10 @@ #include "util.h" #include "protocol.h" +#ifdef _WIN32 +#include <Ws2tcpip.h> +#endif + #ifndef __GNUC__ #define __attribute__(x) #endif @@ -278,6 +282,13 @@ main(int argc, const char **argv) /* Excellent. Now we should have protocol_options populated with all the protocol options we got from the user. */ + /* Ugly method to fix a Windows problem: + http://archives.seul.org/libevent/users/Oct-2010/msg00049.html */ +#ifdef _WIN32 + WSADATA wsaData; + WSAStartup(0x101, &wsaData); +#endif + /* Initialize libevent */ base = event_base_new(); if (!base) { @@ -292,6 +303,9 @@ main(int argc, const char **argv) } /* Handle signals */ +#ifdef SIGPIPE + signal(SIGPIPE, SIG_IGN); +#endif signal(SIGPIPE, SIG_IGN); sigevent = evsignal_new(base, SIGINT, handle_signal_cb, (void*) base); diff --git a/src/network.c b/src/network.c index e3c2fa0..ed78104 100644 --- a/src/network.c +++ b/src/network.c @@ -16,6 +16,10 @@ #include <errno.h> #include <event2/util.h> +#ifdef _WIN32 +#include <WS2tcpip.h> +#endif + struct listener_t { struct evconnlistener *listener; protocol_params_t *proto_params; diff --git a/src/socks.c b/src/socks.c index 7cf179b..13d5375 100644 --- a/src/socks.c +++ b/src/socks.c @@ -3,8 +3,14 @@ */ #include <sys/types.h> -#include <sys/socket.h> +#ifdef _WIN32 +#include <Winsock2.h> +#else #include <arpa/inet.h> +#include <sys/socket.h> +#endif + + #include <assert.h> #include <string.h> @@ -48,6 +54,38 @@ static enum socks_ret socks5_do_negotiation(struct evbuffer *dest, typedef unsigned char uchar; +/* + Necessary definitions for platforms that don't support + sockaddr_in6 and u_int16_t +*/ +#ifdef _WIN32 +typedef uint16_t sa_family_t; + +struct in6_addr +{ + union { + uint8_t u6_addr8[16]; + uint16_t u6_addr16[8]; + uint32_t u6_addr32[4]; + } in6_u; +#define s6_addr in6_u.u6_addr8 +#define s6_addr16 in6_u.u6_addr16 +#define s6_addr32 in6_u.u6_addr32 +}; + +/* Define struct sockaddr_in6 on platforms that do not have it. See notes + * on struct in6_addr. */ +struct sockaddr_in6 { + sa_family_t sin6_family; + uint16_t sin6_port; + // uint32_t sin6_flowinfo; + struct in6_addr sin6_addr; + // uint32_t sin6_scope_id; +}; + +typedef unsigned short u_int16_t; +#endif + socks_state_t * socks_state_new(void) { diff --git a/src/socks.h b/src/socks.h index caa7ec0..2f1e44b 100644 --- a/src/socks.h +++ b/src/socks.h @@ -5,7 +5,11 @@ #ifndef SOCKS_H #define SOCKS_H +#ifdef _WIN32 +#include <Winsock2.h> +#else #include <netdb.h> +#endif typedef struct socks_state_t socks_state_t; struct evbuffer; diff --git a/src/test/tinytest.c b/src/test/tinytest.c index ab43694..32410fd 100644 --- a/src/test/tinytest.c +++ b/src/test/tinytest.c @@ -28,7 +28,7 @@ #include <string.h> #include <assert.h> -#ifdef WIN32 +#ifdef _WIN32 #include <windows.h> #else #include <sys/types.h> @@ -61,7 +61,7 @@ const char *cur_test_prefix = NULL; /**< prefix of the current test group */ /** Name of the current test, if we haven't logged is yet. Used for --quiet */ const char *cur_test_name = NULL; -#ifdef WIN32 +#ifdef _WIN32 /** Pointer to argv[0] for win32. */ static const char *commandname = NULL; #endif @@ -100,7 +100,7 @@ static enum outcome _testcase_run_forked(const struct testgroup_t *group, const struct testcase_t *testcase) { -#ifdef WIN32 +#ifdef _WIN32 /* Fork? On Win32? How primitive! We'll do what the smart kids do: we'll invoke our own exe (whose name we recall from the command line) with a command line that tells it to run just the test we @@ -283,7 +283,7 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) { int i, j, n=0; -#ifdef WIN32 +#ifdef _WIN32 commandname = v[0]; #endif for (i=1; i<c; ++i) { diff --git a/src/util.c b/src/util.c index d4eddb6..7e3e747 100644 --- a/src/util.c +++ b/src/util.c @@ -14,6 +14,10 @@ #include "util.h" +#ifdef _WIN32 +#include <Ws2tcpip.h> +#endif + #include <event2/util.h> #include <event2/dns.h>

1 0