tor-commits September 2012

tor-commits@lists.torproject.org

18 participants
792 discussions

[torspec/master] Make tor-fw-helper port-purpose-agnostic.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 43c37b1113cd42b9818236a75660b896e16e6324 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 11 19:51:54 2012 +0300 Make tor-fw-helper port-purpose-agnostic. --- tor-fw-helper-spec.txt | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/tor-fw-helper-spec.txt b/tor-fw-helper-spec.txt index 0068b26..fdc34b1 100644 --- a/tor-fw-helper-spec.txt +++ b/tor-fw-helper-spec.txt @@ -22,25 +22,37 @@ 2.1 Output format - When tor-fw-helper has completed the requested action successfully, it will - report the following message to standard output: +2.1.1. Motivation - tor-fw-helper: SUCCESS + tor-fw-helper should be able to signal to tor whether its actions + succeeded so that tor can act accordingly. For this reason it's + important to standarize the output format of tor-fw-helper. - If tor-fw-helper was unable to complete the requested action successfully, it - will report the following message to standard error: + tor-fw-helper outputs signalling commands to stdout, and debugging + messages to stderr. This means that a program that launches + tor-fw-helper only needs to monitor stdout to learn its status. - tor-fw-helper: FAILURE +2.1.2. TCP forwarding output - All informational messages are printed to standard output; all error messages - are printed to standard error. Messages other than SUCCESS and FAILURE - may be printed by any compliant tor-fw-helper. + When tor-fw-helper completes a TCP forwarding action, it prints the + following message to standard output: -2.2 Output format stability + tor-fw-helper tcp-forwarding <external port> <internal port> <status> [<message>] - The above SUCCESS and FAILURE messages are the only stable output formats - provided by this specification. tor-fw-helper-spec compliant implementations - must return SUCCESS or FAILURE as defined above. + where, + + <external port>, is the TCP port in the external side of the NAT + device that was forwarded. + <internal port>, is the TCP port in the internal side of the NAT + device that accepts forwarded traffic. + <status>, is either "SUCCESS" or "FAIL". + <message>, is an optional supplementary message that can include + multiple words. + + For example, upon successfully using NAT-PMP to forward connections from + port '4200' to port '4333', tor-fw-helper would output in stdout: + + tor-fw-helper tcp-forwarding 4200 4333 SUCCESS NAT-PMP succeded 3. Security Concerns

1 0

[torspec/master] Merge remote-tracking branch 'asn-gitorious/bug6059'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit e5e36e4acabc2914799f96de70bd649f8b80667d Merge: 5ddddcb 43c37b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:14:09 2012 -0400 Merge remote-tracking branch 'asn-gitorious/bug6059' tor-fw-helper-spec.txt | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-)

1 0

[tor/master] Use tor_malloc_zero() in var_cell_new().
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 8284c2bcba4d8daecf5416fa88324212c5fc17ea Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 6 01:22:32 2012 +0300 Use tor_malloc_zero() in var_cell_new(). This is just a precaution; we seem to be using var_cell_t.payload and var_cell_t.payload_len correctly at the moment. --- src/or/connection_or.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index da27cba..5a3b620 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -327,7 +327,7 @@ var_cell_t * var_cell_new(uint16_t payload_len) { size_t size = STRUCT_OFFSET(var_cell_t, payload) + payload_len; - var_cell_t *cell = tor_malloc(size); + var_cell_t *cell = tor_malloc_zero(size); cell->payload_len = payload_len; cell->command = 0; cell->circ_id = 0;

1 0

[tor/master] Log more information when we fail to terminate a process.
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 93c38b679f01bba7d85ddf5eeac51c462e782a62 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 6 17:03:11 2012 +0300 Log more information when we fail to terminate a process. --- src/common/util.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index ce67252..4b1bce8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3897,10 +3897,15 @@ tor_process_handle_destroy(process_handle_t *process_handle, if (also_terminate_process) { if (tor_terminate_process(process_handle) < 0) { - log_notice(LD_GENERAL, "Failed to terminate process with PID '%d'", - tor_process_get_pid(process_handle)); + log_notice(LD_GENERAL, "Failed to terminate process with " + "PID '%d' ('%s').", tor_process_get_pid(process_handle), +#ifdef _WIN32 + format_win32_error(GetLastError())); +#else + strerror(errno)); +#endif } else { - log_info(LD_GENERAL, "Terminated process with PID '%d'", + log_info(LD_GENERAL, "Terminated process with PID '%d'.", tor_process_get_pid(process_handle)); } }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug6765'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit deee0b67c3171cf4a6c7cf9c64c642d882b39880 Merge: 0012054 8284c2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:12:11 2012 -0400 Merge remote-tracking branch 'asn/bug6765' src/or/connection_or.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'asn/bug6779'
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit d2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e Merge: deee0b6 93c38b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 10:12:15 2012 -0400 Merge remote-tracking branch 'asn/bug6779' src/common/util.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)

1 0

[tor/master] fix punctuation in logs
by arma＠torproject.org 06 Sep '12

06 Sep '12

commit 00120544a4bfa9c26d2c8a336389d33b8b3642c2 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 6 01:35:05 2012 -0400 fix punctuation in logs --- src/or/dirserv.c | 2 +- src/or/router.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 086db03..7f46906 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -727,7 +727,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) "MAX_DESCRIPTOR_UPLOAD_SIZE (%d) constant is too low.", ri->nickname, source, (int)ri->cache_info.signed_descriptor_len, MAX_DESCRIPTOR_UPLOAD_SIZE); - *msg = "Router descriptor was too large"; + *msg = "Router descriptor was too large."; control_event_or_authdir_new_descriptor("REJECTED", ri->cache_info.signed_descriptor_body, ri->cache_info.signed_descriptor_len, *msg); diff --git a/src/or/router.c b/src/or/router.c index 2cb0e26..9a3ef9d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -672,7 +672,7 @@ init_keys(void) * we don't really need new keys yet so the descriptor doesn't * change and the old one is still fresh. */ log_info(LD_GENERAL, "Couldn't add own descriptor to directory " - "after key init: %s. This is usually not a problem.", + "after key init: %s This is usually not a problem.", m?m:"<unknown error>"); } }

1 0

[tor/master] Fix warning when implicitly casting strlen(microdesc) to int
by nickm＠torproject.org 06 Sep '12

06 Sep '12

commit 5d679caa32c71a8bc7d4ed4ab716349e603e642c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 20:49:25 2012 -0400 Fix warning when implicitly casting strlen(microdesc) to int Harmless unless we somehow generate a microdesc of more than INT_MAX bytes. --- changes/ssize_t_warning | 4 ++++ src/or/dirvote.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/ssize_t_warning b/changes/ssize_t_warning new file mode 100644 index 0000000..01609cc --- /dev/null +++ b/changes/ssize_t_warning @@ -0,0 +1,4 @@ + o Minor build fixes: + - Fix a harmless (in this case) build warning for implicitly + converting a strlen() to an int. Bugfix on 0.2.4.1-alpha. + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 8e85b2b..ea85636 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3606,7 +3606,7 @@ dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len, int consensus_method_low, int consensus_method_high) { - int ret = -1; + ssize_t ret = -1; char d64[BASE64_DIGEST256_LEN+1]; char *microdesc_consensus_methods = make_consensus_method_list(consensus_method_low,

1 0

[tor/master] bump to 0.2.4.1-alpha-dev
by arma＠torproject.org 06 Sep '12

06 Sep '12

commit a504a81d22c9f000fefd44093c4a18693b8228fc Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 20:05:50 2012 -0400 bump to 0.2.4.1-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0bde608..dc1c249 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.1-alpha]) +AC_INIT([tor],[0.2.4.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 0195e33..b7163c3 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.1-alpha" +!define VERSION "0.2.4.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 88c802c..286854f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.1-alpha" +#define VERSION "0.2.4.1-alpha-dev"

1 0

r25782: {website} two new tarballs are available (there's no space on the down (website/trunk/include)
by Roger Dingledine 05 Sep '12

05 Sep '12

Author: arma Date: 2012-09-05 23:29:55 +0000 (Wed, 05 Sep 2012) New Revision: 25782 Modified: website/trunk/include/versions.wmi Log: two new tarballs are available (there's no space on the download page for 0.2.4.1-alpha yet.) Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-09-05 23:10:06 UTC (rev 25781) +++ website/trunk/include/versions.wmi 2012-09-05 23:29:55 UTC (rev 25782) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.38</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.20-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.21-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.20-rc</define-tag>

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
80
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2012