- tor-commits - lists.torproject.org

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit dfe11c74fe59ceaa68778d80ce6a8a16227350f9 Merge: e14cf93 9539219 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 18 12:11:34 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/Makefile | 6 +- packages/dreamplug-uaputl/Makefile | 55 + .../dreamplug-uaputl/config/80211d_domain.conf | 28 + packages/dreamplug-uaputl/config/pack.conf | 1 + .../config/sample_cal_data_bg_8688.conf | 42 + packages/dreamplug-uaputl/config/uapcoex.conf | 21 + packages/dreamplug-uaputl/config/uaputl.conf | 95 + packages/dreamplug-uaputl/debian/README | 8 + packages/dreamplug-uaputl/debian/changelog | 5 + packages/dreamplug-uaputl/debian/compat | 1 + packages/dreamplug-uaputl/debian/control | 15 + packages/dreamplug-uaputl/debian/copyright | 28 + packages/dreamplug-uaputl/debian/dirs | 1 + packages/dreamplug-uaputl/debian/rules | 13 + packages/dreamplug-uaputl/debian/source/format | 1 + packages/dreamplug-uaputl/uapcmd.c | 4704 +++++++++++++++++ packages/dreamplug-uaputl/uapcmd.h | 63 + packages/dreamplug-uaputl/uaputl.c | 5565 ++++++++++++++++++++ packages/dreamplug-uaputl/uaputl.h | 1289 +++++ packages/torouter-web/debian/control | 4 +- packages/torouter-web/debian/rules | 2 +- packages/torouter-web/debian/torouter-tui.init | 155 + 22 files changed, 12098 insertions(+), 4 deletions(-)

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 11aaab578cc13910aca7a32d87072781056f30df Merge: dfe11c7 e3327c3 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 10:51:07 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/Makefile | 12 +- packages/dreamplug-uaputl/Makefile | 55 - .../dreamplug-uaputl/config/80211d_domain.conf | 28 - packages/dreamplug-uaputl/config/pack.conf | 1 - .../config/sample_cal_data_bg_8688.conf | 42 - packages/dreamplug-uaputl/config/uapcoex.conf | 21 - packages/dreamplug-uaputl/config/uaputl.conf | 95 - packages/dreamplug-uaputl/debian/README | 8 - packages/dreamplug-uaputl/debian/changelog | 5 - packages/dreamplug-uaputl/debian/compat | 1 - packages/dreamplug-uaputl/debian/control | 15 - packages/dreamplug-uaputl/debian/copyright | 28 - packages/dreamplug-uaputl/debian/dirs | 1 - packages/dreamplug-uaputl/debian/rules | 13 - packages/dreamplug-uaputl/debian/source/format | 1 - packages/dreamplug-uaputl/uapcmd.c | 4704 ----------------- packages/dreamplug-uaputl/uapcmd.h | 63 - packages/dreamplug-uaputl/uaputl.c | 5565 -------------------- packages/dreamplug-uaputl/uaputl.h | 1289 ----- packages/torouter-prep/Makefile | 2 + packages/torouter-prep/configs/047E6A24.asc | 19 + ...3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key | Bin 0 -> 3742 bytes .../configs/apt-preferences.d-backports | 3 + packages/torouter-prep/configs/apt.conf | 1 + packages/torouter-prep/configs/armrc.sample.gz | Bin 0 -> 3633 bytes packages/torouter-prep/configs/dnsmasq.conf | 3 +- packages/torouter-prep/configs/inittab | 70 + packages/torouter-prep/configs/interfaces | 10 +- .../configs/modprobe.d-blacklist.conf | 26 + packages/torouter-prep/configs/ntp.conf | 55 + packages/torouter-prep/configs/sources.list | 3 + packages/torouter-prep/configs/torrc | 31 +- packages/torouter-prep/configs/ttdnsd-default | 17 + packages/torouter-prep/debian/control | 2 +- packages/torouter-prep/debian/dirs | 1 + packages/torouter-prep/src/torouter_config.sh | 139 +- 36 files changed, 283 insertions(+), 12046 deletions(-)

1 0

r24957: {website} the 0.2.2.31-rc tarball is up (once somebody does a website (website/trunk/include)
by Roger Dingledine 19 Aug '11

19 Aug '11

Author: arma Date: 2011-08-19 03:29:40 +0000 (Fri, 19 Aug 2011) New Revision: 24957 Modified: website/trunk/include/versions.wmi Log: the 0.2.2.31-rc tarball is up (once somebody does a website push) Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-17 16:55:15 UTC (rev 24956) +++ website/trunk/include/versions.wmi 2011-08-19 03:29:40 UTC (rev 24957) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.2.2.31-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag>

1 0

[torouter/master] add torouter-tui
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit e3327c32629717ee81283b9813e5764e6fda2c2e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 01:43:49 2011 +0200 add torouter-tui --- packages/torouter-prep/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/debian/control b/packages/torouter-prep/debian/control index 2a696e0..7e25103 100644 --- a/packages/torouter-prep/debian/control +++ b/packages/torouter-prep/debian/control @@ -8,7 +8,7 @@ Homepage: <https://www.torproject.org/> Package: torouter-prep Architecture: all -Depends: ${misc:Depends}, openssh-server, isc-dhcp-client, cron-apt +Depends: ${misc:Depends}, openssh-server, isc-dhcp-client, cron-apt, torouter-tui Description: Torouter meta-package to take over the DreamPlug DreamPlug devices may use this package to convert to a Torouter. This package only works if the DreamPlug is already running Debian.

1 0

[torouter/master] add fixup
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit 1d9263de0b3546d8832eb071ec5afa9d17658bbf Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 01:26:45 2011 +0200 add fixup --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 87df86b..7d78f04 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -79,7 +79,7 @@ apt-get -y install dnsmasq ## # Configure arm -zcat $config_dir/armrc.sample.gz > ~$(ADMINUSER)/.armrc +zcat $config_dir/armrc.sample.gz > ~$ADMINUSER/.armrc # Reconfigure /etc/inittab here cp $config_dir/inittab /etc/inittab

1 0

[torouter/master] fixup
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit 6e0105a193afc8f94ce6717e574a0e3442f41baa Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 01:10:22 2011 +0200 fixup --- packages/torouter-prep/src/torouter_config.sh | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index cec4606..87df86b 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -2,13 +2,11 @@ export VERSION="0.1" -echo "This program will reconfigure your Debian system into a Torouter" -exit 0 -echo "This is where we'd take over the entire Torouter system" +echo "This program will now reconfigure your Debian system into a Torouter" # For every file we touch, move it to the temp_dir and then tar it up in the end export temp_dir="`mktemp -d`" -export config_dir="/usr/share/doc/torouter-prep/example-configs/" +export config_dir="/usr/share/torouter-prep/example-configs/" # Add a user to administrate the Torouter later export ADMINUSER="torouter" @@ -21,11 +19,11 @@ useradd -g $ADMINGROUP -s /bin/bash $ADMINUSER # gpg --keyserver keys.gnupg.net --recv 886DDD89 # gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - # This is the main Tor repo apt pubkey -apt-get add $config_dir/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key +apt-key add $config_dir/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key # This is the temp torrouter archive pubkey; this should be updated when we # freeze this repo and know what we want to do -apt-get add $config_dir/047E6A24.asc +apt-key add $config_dir/047E6A24.asc # Set us to have a default host name and hosts file cp $config_dir/hostname /etc/hostname

1 0

[tor/master] Remove warning about a loop parsing evbuffer socks
by nickm＠torproject.org 18 Aug '11

18 Aug '11

commit df96aed14f67c9ffc2c4908add7079a0424d7cbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 18 16:15:03 2011 -0400 Remove warning about a loop parsing evbuffer socks This behavior is normal when we want more data than the evbuffer actually has for us. We'll ask for (say) 7 bytes, get only 5 (because that's all there is), try to parse the 5 bytes, and get told "no, I want 7". One option would be to bail out early whenever want_length is > buflen, but sometimes we use an over-large want_length. So instead, let's just remove the warning here: it's not a bug after all. --- src/or/buffers.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index ffc1514..85d58e8 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1657,9 +1657,9 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, if (res == 0 && n_drain == 0 && want_length <= last_wanted) { /* If we drained nothing, and we didn't ask for more than last time, - * we're stuck in a loop. That's bad. It shouldn't be possible, but - * let's make sure. */ - log_warn(LD_BUG, "We seem to be caught in a parse loop; breaking out"); + * then we probably wanted more data than the buffer actually had, + * and we're finding out that we're not satisified with it. It's + * time to break until we have more data. */ break; }

1 0

[tor/master] Appease "make check-spaces"
by nickm＠torproject.org 18 Aug '11

18 Aug '11

commit 263d68aa82e77026e2a34c07152435b0c31feb0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 18 15:17:37 2011 -0400 Appease "make check-spaces" --- src/or/buffers.c | 8 ++++---- src/or/connection.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index c9c8e43..ffc1514 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1054,14 +1054,14 @@ fetch_var_cell_from_buf(buf_t *buf, var_cell_t **out, int linkproto) #ifdef USE_BUFFEREVENTS /** Try to read n bytes from buf at pos (which may be * NULL for the start of the buffer), copying the data only if necessary. Set - * *data_out to a pointer to the desired bytes. Set free_out to 1 - * if we needed to malloc *data because the original bytes were + * *data_out to a pointer to the desired bytes. Set free_out + * to 1 if we needed to malloc *data because the original bytes were * noncontiguous; 0 otherwise. Return the number of bytes actually available * at *data_out. */ static ssize_t -inspect_evbuffer(struct evbuffer *buf, char **data_out, size_t n, int *free_out, - struct evbuffer_ptr *pos) +inspect_evbuffer(struct evbuffer *buf, char **data_out, size_t n, + int *free_out, struct evbuffer_ptr *pos) { int n_vecs, i; diff --git a/src/or/connection.c b/src/or/connection.c index 4e691e1..f8f82a3 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4166,3 +4166,4 @@ connection_free_all(void) bufferevent_rate_limit_group_free(global_rate_limit); #endif } +

1 0

[tor/master] Automatically use filtering bufferevents with IOCP.
by nickm＠torproject.org 18 Aug '11

18 Aug '11

commit d3653063d30ee8174f6ec330124553c6717fbe9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 18 15:08:49 2011 -0400 Automatically use filtering bufferevents with IOCP. --- changes/bug3752 | 5 +++++ src/common/compat_libevent.c | 11 +++++++++++ src/common/compat_libevent.h | 1 + src/common/tortls.c | 2 +- 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/changes/bug3752 b/changes/bug3752 new file mode 100644 index 0000000..270f155 --- /dev/null +++ b/changes/bug3752 @@ -0,0 +1,5 @@ + o Major bugfixes: + - The IOCP backend now works even when the user has not specified + the (internal, debbuging-only) _UseFilteringSSLBufferevents option. + Fixes part of bug 3752; bugfix on 0.2.3.1-alpha. + diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 8752de7..595742f 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -164,6 +164,16 @@ struct event_base *the_event_base = NULL; #endif #endif +#ifdef USE_BUFFEREVENTS +static int using_iocp_bufferevents = 0; + +int +tor_libevent_using_iocp_bufferevents(void) +{ + return using_iocp_bufferevents; +} +#endif + /** Initialize the Libevent library and set up the event base. */ void tor_libevent_initialize(tor_libevent_cfg *torcfg) @@ -187,6 +197,7 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) if (! torcfg->disable_iocp) { evthread_use_windows_threads(); event_config_set_flag(cfg, EVENT_BASE_FLAG_STARTUP_IOCP); + using_iocp_bufferevents = 1; } #endif diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 8669fd4..bbe105b 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -73,6 +73,7 @@ const char *tor_libevent_get_version_str(void); #ifdef USE_BUFFEREVENTS #define TOR_LIBEVENT_TICKS_PER_SECOND 3 const struct timeval *tor_libevent_get_one_tick_timeout(void); +int tor_libevent_using_iocp_bufferevents(void); #endif #endif diff --git a/src/common/tortls.c b/src/common/tortls.c index 4556030..2aaa2c4 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1892,7 +1892,7 @@ tor_tls_init_bufferevent(tor_tls_t *tls, struct bufferevent *bufev_in, const enum bufferevent_ssl_state state = receiving ? BUFFEREVENT_SSL_ACCEPTING : BUFFEREVENT_SSL_CONNECTING; - if (filter) { + if (filter || tor_libevent_using_iocp_bufferevents()) { /* Grab an extra reference to the SSL, since BEV_OPT_CLOSE_ON_FREE means that the SSL will get freed too.

1 0

[torouter/master] pin apt to stable
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit 7e495f7c032c5abc5a0d73eabcc5c468c836cbd8 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 18 19:05:28 2011 +0200 pin apt to stable --- packages/torouter-prep/configs/apt.conf | 1 + packages/torouter-prep/src/torouter_config.sh | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/apt.conf b/packages/torouter-prep/configs/apt.conf new file mode 100644 index 0000000..4143a94 --- /dev/null +++ b/packages/torouter-prep/configs/apt.conf @@ -0,0 +1 @@ +APT::Default-Release "stable"; diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 5344411..cec4606 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -36,6 +36,7 @@ cp $config_dir/sources.list /etc/apt/sources.list # We're creating this file to ensure we get updates cp $config_dir/apt-preferences.d-backports /etc/apt/preferences.d/backports +cp $config_dir/apt.conf /etc/apt/apt.conf apt-get -y update

1 0