- tor-commits - lists.torproject.org

[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

[torouter/master] remove apt-utils
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit ed18ccdf73b646eadceecf309b5ed41e0129c52b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 18 18:48:32 2011 +0200 remove apt-utils --- 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 545c9f9..2a696e0 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}, apt-utils, openssh-server, isc-dhcp-client, cron-apt +Depends: ${misc:Depends}, openssh-server, isc-dhcp-client, cron-apt 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 target to update apt archive
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit 0ef8a64dfe06afd61d61e5e1648a11e27137ef3f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 18 18:51:38 2011 +0200 add target to update apt archive --- packages/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index eec600c..3fff908 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -10,3 +10,8 @@ prepdeb: mvdebs: mv *.deb *.build *.changes *.dsc *.tar.gz packages-for-upload/ + +updatearchive: + scp packages-for-upload/* vescum.torproject.org:/srv/torrouter.torproject.org/ftp-archive/archive/poo… + ssh vescum.torproject.org make -C /srv/torrouter.torproject.org/ftp-archive +

1 0

[arm/master] Adding port usage information to count dialog
by atagar＠torproject.org 18 Aug '11

18 Aug '11

commit 1d1776e459a65b75af4f0525ac57dce6d2f02df8 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 18 09:26:57 2011 -0700 Adding port usage information to count dialog When showing exiting port usages also including a label saying what they're for. --- src/cli/connections/countPopup.py | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/cli/connections/countPopup.py b/src/cli/connections/countPopup.py index 341087f..7904519 100644 --- a/src/cli/connections/countPopup.py +++ b/src/cli/connections/countPopup.py @@ -8,9 +8,10 @@ import operator import cli.controller import cli.popups -from util import enum, log, uiTools +from util import connections, enum, log, uiTools CountType = enum.Enum("CLIENT_LOCALE", "EXIT_PORT") +EXIT_USAGE_WIDTH = 15 def showCountDialog(countType, counts): """ @@ -60,10 +61,23 @@ def showCountDialog(countType, counts): valWidth = max(valWidth, len(str(v))) valueTotal += v + # extra space since we're adding usage informaion + if countType == CountType.EXIT_PORT: + keyWidth += EXIT_USAGE_WIDTH + labelFormat = "%%-%is %%%ii (%%%%%%-2i)" % (keyWidth, valWidth) for i in range(height - 4): k, v = sortedCounts[i] + + # includes a port usage column + if countType == CountType.EXIT_PORT: + usage = connections.getPortUsage(k) + + if usage: + keyFormat = "%%-%is %%s" % (keyWidth - EXIT_USAGE_WIDTH) + k = keyFormat % (k, usage[:EXIT_USAGE_WIDTH - 3]) + label = labelFormat % (k, v, v * 100 / valueTotal) popup.addstr(i + 1, 2, label, curses.A_BOLD | uiTools.getColor("green"))

1 0

[torouter/master] temp torrouter archive public key
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit febc76b8fe6ab3c5a8b3bf73d50cbb35fc7fd6aa Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 18 18:29:36 2011 +0200 temp torrouter archive public key --- packages/torouter-prep/configs/047E6A24.asc | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/047E6A24.asc b/packages/torouter-prep/configs/047E6A24.asc new file mode 100644 index 0000000..e2a8303 --- /dev/null +++ b/packages/torouter-prep/configs/047E6A24.asc @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQENBE5MF30BCACy2Ywqme78KCxY0qEXxm0vpBYe9X2kTdaJMS65tLfjbuHJ+WO4 +OKCJ5AJc7NMvZGpVucn4JPTRN34oReXzYWrlm0yfmqnRHm9sEJhDqNbSV6RML+9E +oikxj6w6uboVEnrbLPzsWEcSze28dLcqVzDMm3aHO0erjBMlUEN4a7rrU0MDf+SH +4rz0kkEaBj8gzX+cJQEU5uIdlcINFtL34cNIZPAB3O2ZOjvrDbWJcI6wG/ZfefDk +2z98eSzhJfTWKsjnPmSsp7QTu+lj+mJN7BBoLILLJ+xq1XPJfigiuQucK3k2xMBv +eYEpK+11af6/bt5+yQec8dyH7+feYnpY2gW9ABEBAAG0H3RvcnJvdXRlciBhcmNo +aXZlIGtleSAoMjAxMS0wOCmJAT4EEwECACgFAk5MF30CGwMFCQDtTgAGCwkIBwMC +BhUIAgkKCwQWAgMBAh4BAheAAAoJEJGCGDUEfmokfYEH/RzFD2x5j1kJ+1+F2pTN +bTochEBvT4gsKCcuT+i7Q4FaorVCePoAyjcW3HBGBNf6G0a37KmtPoQBqXZ2wxVN +7SDFFG4nH27z+OdkrZkUmwnjr3O5QskMuiOfkvpD0aRKvmB/MznxjBW9brJr63Gx +IGkdvvZad2V4+jEwTWiOAodWbYGX9A5CgWUL+SHFhsLe3B3ZMrvgbReJqbOGRBTR +nGWYjLH5K0lNLPNb8spKOxT/h5gKib9p5680hQG672n9EJGixfmvrCQF/3cqy2SG +CmfX5Tt7+l/C6LfyaHWHsQsjqVtCmwPjfQ1sRa1S9UPXjrZb/54kDUHfpUByB/ab +kGU= +=ZXbM +-----END PGP PUBLIC KEY BLOCK-----

1 0

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

18 Aug '11

commit b0fa1713dd413ab26fba54aca2eaf03d3e18e89a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 18 18:30:58 2011 +0200 add torrouter key --- packages/torouter-prep/src/torouter_config.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index aec9b48..5344411 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -20,8 +20,13 @@ useradd -g $ADMINGROUP -s /bin/bash $ADMINUSER # Install the Tor repo key # 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 +# 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 + # Set us to have a default host name and hosts file cp $config_dir/hostname /etc/hostname cp $config_dir/hosts /etc/hosts

1 0

[torouter/master] move built packages into a directory
by ioerror＠torproject.org 18 Aug '11

18 Aug '11

commit 0faeb93621c5c626931bd372c9d4987e69e37f1a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 18 17:27:12 2011 +0200 move built packages into a directory --- packages/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index 2a25f11..eec600c 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,4 +1,4 @@ -debs: webdeb prepdeb +debs: webdeb prepdeb mvdebs webdeb: # By default we will but not sign for now @@ -7,3 +7,6 @@ webdeb: prepdeb: # By default we will but not sign for now cd torouter-prep && debuild --no-tgz-check -us -uc + +mvdebs: + mv *.deb *.build *.changes *.dsc *.tar.gz packages-for-upload/

1 0