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

[tor/release-0.2.2] Specify text or binary mode in every start_writing_to_stdio_file call
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit f021df58246b5cb9b1312e5339f484462ba94b02 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Jul 18 18:12:31 2011 -0700 Specify text or binary mode in every start_writing_to_stdio_file call --- changes/bug3607 | 15 +++++++++++++++ src/or/geoip.c | 4 ++-- src/or/rendservice.c | 6 ++++-- src/or/rephist.c | 2 +- src/tools/tor-gencert.c | 4 ++-- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/changes/bug3607 b/changes/bug3607 new file mode 100644 index 0000000..2e86253 --- /dev/null +++ b/changes/bug3607 @@ -0,0 +1,15 @@ + o Minor bugfixes: + + - Write several files (currently, buffer-stats, dirreq-stats, and + entry-stats on relays that collect those statistics, client_keys + and hostname files for hidden services that use authentication, + and (in the tor-gencert utility) newly generated identity and + signing keys) in text mode, on OSes that distinguish text mode + from binary mode (i.e. on Windows). Previously, we wouldn't + specify text mode or binary mode, leading to an assertion + failure. Fixes bug 3607. Bugfix on 0.2.1.1-alpha (when the + DirRecordUsageByCountry option which would have triggered the + assertion failure was added), although this assertion failure + would have occurred in tor-gencert on Windows in 0.2.0.1-alpha. + + diff --git a/src/or/geoip.c b/src/or/geoip.c index c621ea8..c51142c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -976,7 +976,7 @@ geoip_dirreq_stats_write(time_t now) data_v2 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); data_v3 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, 0600, &open_file); if (!out) goto done; @@ -1309,7 +1309,7 @@ geoip_entry_stats_write(time_t now) filename = get_datadir_fname2("stats", "entry-stats"); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, 0600, &open_file); if (!out) goto done; diff --git a/src/or/rendservice.c b/src/or/rendservice.c index d9a9364..8a01711 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -635,13 +635,15 @@ rend_service_load_keys(void) } /* Prepare client_keys and hostname files. */ - if (!(cfile = start_writing_to_stdio_file(cfname, OPEN_FLAGS_REPLACE, + if (!(cfile = start_writing_to_stdio_file(cfname, + OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_cfile))) { log_warn(LD_CONFIG, "Could not open client_keys file %s", escaped(cfname)); goto err; } - if (!(hfile = start_writing_to_stdio_file(fname, OPEN_FLAGS_REPLACE, + if (!(hfile = start_writing_to_stdio_file(fname, + OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_hfile))) { log_warn(LD_CONFIG, "Could not open hostname file %s", escaped(fname)); goto err; diff --git a/src/or/rephist.c b/src/or/rephist.c index b7341f3..2444700 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2500,7 +2500,7 @@ rep_hist_buffer_stats_write(time_t now) if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "buffer-stats"); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, 0600, &open_file); if (!out) goto done; diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index a04edda..7a516b4 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -264,7 +264,7 @@ load_identity_key(void) } if (!(f = start_writing_to_stdio_file(identity_key_file, - OPEN_FLAGS_REPLACE, 0400, + OPEN_FLAGS_REPLACE | O_TEXT, 0400, &open_file))) return 1; @@ -349,7 +349,7 @@ generate_signing_key(void) } if (!(f = start_writing_to_stdio_file(signing_key_file, - OPEN_FLAGS_REPLACE, 0600, + OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_file))) return 1;

1 0

[tor/release-0.2.2] Merge branch 'bug3577' into maint-0.2.2
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 866a2828bdcb88398ee8332e918e9a9028397156 Merge: 5580fbb 2e34416 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:20:01 2011 -0400 Merge branch 'bug3577' into maint-0.2.2 changes/bug3577 | 4 ++++ src/or/control.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.2] Check return value in fmt_addr
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 718252b253049f84fefa14e212cf560838e6607c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:16:06 2011 -0400 Check return value in fmt_addr Previously, if tor_addr_to_str() returned NULL, we would reuse the last value returned by fmt_addr(). (This could happen if we were erroneously asked to format an AF_UNSPEC address.) Now instead we return "???". --- changes/fmt_addr | 4 ++++ src/common/address.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/fmt_addr b/changes/fmt_addr new file mode 100644 index 0000000..b88c9e1 --- /dev/null +++ b/changes/fmt_addr @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When unable to format an address as a string, report its value + as "???" rather than reusing the last formatted address. Bugfix + on 0.2.1.5-alpha. diff --git a/src/common/address.c b/src/common/address.c index 1c72539..7fc7301 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -958,8 +958,10 @@ fmt_addr(const tor_addr_t *addr) { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return buf; + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + return buf; + else + return "???"; } /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>. The string

1 0

[tor/release-0.2.2] Untangle first sentence of changes/bug3607
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 3e3aac5fd552b7b1949b0d2e12368cea26449b83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 19 11:14:01 2011 -0400 Untangle first sentence of changes/bug3607 --- changes/bug3607 | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/changes/bug3607 b/changes/bug3607 index 2e86253..5ece219 100644 --- a/changes/bug3607 +++ b/changes/bug3607 @@ -1,12 +1,12 @@ o Minor bugfixes: - - Write several files (currently, buffer-stats, dirreq-stats, and - entry-stats on relays that collect those statistics, client_keys - and hostname files for hidden services that use authentication, - and (in the tor-gencert utility) newly generated identity and - signing keys) in text mode, on OSes that distinguish text mode - from binary mode (i.e. on Windows). Previously, we wouldn't - specify text mode or binary mode, leading to an assertion + - Write several files in text mode, on OSes that distinguish text + mode from binary mode (namely, Windows). These files are: + buffer-stats, dirreq-stats, and entry-stats on relays that collect + those statistics; client_keys and hostname files for hidden + services that use authentication; and (in the tor-gencert utility) + newly generated identity and signing keys. Previously, we + wouldn't specify text mode or binary mode, leading to an assertion failure. Fixes bug 3607. Bugfix on 0.2.1.1-alpha (when the DirRecordUsageByCountry option which would have triggered the assertion failure was added), although this assertion failure

1 0

[torouter/master] add depend by suggestion of bertagaz
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit b3766c4fff288c17e0baa346cf9d2b962a0483d2 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 21:13:35 2011 +0200 add depend by suggestion of bertagaz --- packages/torouter-web/debian/torouter-tui.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/debian/torouter-tui.init b/packages/torouter-web/debian/torouter-tui.init index d943333..7b7a0a0 100644 --- a/packages/torouter-web/debian/torouter-tui.init +++ b/packages/torouter-web/debian/torouter-tui.init @@ -1,7 +1,7 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: torouter-tui -# Required-Start: $syslog +# Required-Start: $network $syslog # Required-Stop: $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6

1 0

[torouter/master] change depends by suggestion of bertagaz
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 7b46a0af09791cbfcb723de44ccd7f0388bc34b1 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 21:22:41 2011 +0200 change depends by suggestion of bertagaz --- packages/torouter-web/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/debian/control b/packages/torouter-web/debian/control index ef9cd80..00f53f4 100644 --- a/packages/torouter-web/debian/control +++ b/packages/torouter-web/debian/control @@ -2,7 +2,7 @@ Source: torouter-tui Section: unknown Priority: extra Maintainer: Jacob Appelbaum <jacob(a)torproject.org> -Build-Depends: debhelper (>= 7.0.50~) +Build-Depends: debhelper (>= 7.0.50~), python-dev Standards-Version: 3.9.1 Homepage: <https://www.torproject.org/>

1 0

[tor/master] Call evthread_use_windows_threads when running with IOCP on windows
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 52e36feda153e70cd08d624df73035b7e59a95ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 14:44:16 2011 -0400 Call evthread_use_windows_threads when running with IOCP on windows --- changes/le-win-threads | 3 +++ src/common/compat_libevent.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/le-win-threads b/changes/le-win-threads new file mode 100644 index 0000000..5be44a2 --- /dev/null +++ b/changes/le-win-threads @@ -0,0 +1,3 @@ + o Major bugfixes (IOCP): + - When using IOCP on windows, we need to enable Libevent windows threading + support. Bugfix on 0.2.3.1-alpha. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index c338dd6..8752de7 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -19,6 +19,7 @@ #ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> +#include <event2/thread.h> #else #include <event.h> #endif @@ -183,8 +184,10 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) struct event_config *cfg = event_config_new(); #if defined(MS_WINDOWS) && defined(USE_BUFFEREVENTS) - if (! torcfg->disable_iocp) + if (! torcfg->disable_iocp) { + evthread_use_windows_threads(); event_config_set_flag(cfg, EVENT_BASE_FLAG_STARTUP_IOCP); + } #endif #if defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER >= V(2,0,7)

1 0

[torouter/master] add proper rules
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit afb8eef3e63870d02547e21464d63f8ac867e2e0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 19:55:34 2011 +0200 add proper rules --- packages/torouter-web/debian/rules | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/debian/rules b/packages/torouter-web/debian/rules index d40e263..e92c9cb 100755 --- a/packages/torouter-web/debian/rules +++ b/packages/torouter-web/debian/rules @@ -3,5 +3,4 @@ export DH_VERBOSE=1 %: - dh_installinit dh $@

1 0

[torouter/master] update control
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 2e38fe26554fe28b36eca0e96202018494ac3f44 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 19:49:48 2011 +0200 update control --- packages/torouter-web/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/debian/control b/packages/torouter-web/debian/control index a2aaac6..ef9cd80 100644 --- a/packages/torouter-web/debian/control +++ b/packages/torouter-web/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.9.1 Homepage: <https://www.torproject.org/> -Package: torouter +Package: torouter-tui Architecture: all Depends: ${misc:Depends}, python, python-webpy Description: Torouter web UI

1 0

[torouter/master] make basic init from skel
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 02de65af0742dc35f42f20d71c07decae5c235eb Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 19:48:11 2011 +0200 make basic init from skel --- packages/torouter-web/debian/rules | 3 +- packages/torouter-web/debian/torouter-tui.init | 155 ++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/debian/rules b/packages/torouter-web/debian/rules index 74439ab..d40e263 100755 --- a/packages/torouter-web/debian/rules +++ b/packages/torouter-web/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- -#export DH_VERBOSE=1 +export DH_VERBOSE=1 %: + dh_installinit dh $@ diff --git a/packages/torouter-web/debian/torouter-tui.init b/packages/torouter-web/debian/torouter-tui.init new file mode 100644 index 0000000..d943333 --- /dev/null +++ b/packages/torouter-web/debian/torouter-tui.init @@ -0,0 +1,155 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: torouter-tui +# Required-Start: $syslog +# Required-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: torouter-tui initscript +# Description: This file starts the torouter-tui python web UI. +### END INIT INFO + +# Author: Jacob Appelbaum <jacob(a)appelbaum.net> +# + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="torouter-tui python web UI" +NAME=runui.py +DAEMON=/usr/bin/$NAME +DAEMON_ARGS="" +PIDFILE=/var/run/torouter-tui.pid +SCRIPTNAME=/etc/init.d/torouter-tui + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +:

1 0