- tor-commits - lists.torproject.org

r24963: {website} make a farsi exception as well. (website/trunk)
by Andrew Lewman 25 Aug '11

25 Aug '11

Author: phobos Date: 2011-08-25 16:50:25 +0000 (Thu, 25 Aug 2011) New Revision: 24963 Modified: website/trunk/po2wml.sh Log: make a farsi exception as well. Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-08-23 12:15:54 UTC (rev 24962) +++ website/trunk/po2wml.sh 2011-08-25 16:50:25 UTC (rev 24963) @@ -212,6 +212,36 @@ echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi + # If the translation is Farsi, include the + # correct header, css, menu files and footer + if [ $subdir = "fa" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@fa/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "fa/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "fa/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "fa/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + # If the directory does not include sidenav.wmi, # copy it from the English directory (only if # the English directory has this file)

1 0

[metrics-web/master] Tweak list of country names.
by karsten＠torproject.org 25 Aug '11

25 Aug '11

commit f81633a22621f6a0c4a53468975edc1eeb62b4fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 25 13:06:57 2011 +0200 Tweak list of country names. --- rserve/graphs.R | 2 +- src/org/torproject/ernie/web/Countries.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index c6ba4fd..ffdbdd6 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -134,7 +134,7 @@ countrylist <- list( "lt" = "Lithuania", "lu" = "Luxembourg", "lv" = "Latvia", - "ly" = "Libyan Arab Jamahiriya", + "ly" = "Libya", "ma" = "Morocco", "mc" = "Monaco", "md" = "the Republic of Moldova", diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 6829488..7149cfb 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -52,6 +52,7 @@ public class Countries { this.knownCountries.add("bn;Brunei Darussalam".split(";")); this.knownCountries.add("bg;Bulgaria".split(";")); this.knownCountries.add("bf;Burkina Faso".split(";")); + this.knownCountries.add("mm;Burma".split(";")); this.knownCountries.add("bi;Burundi".split(";")); this.knownCountries.add("kh;Cambodia".split(";")); this.knownCountries.add("cm;Cameroon".split(";")); @@ -147,7 +148,7 @@ public class Countries { this.knownCountries.add("lb;Lebanon".split(";")); this.knownCountries.add("ls;Lesotho".split(";")); this.knownCountries.add("lr;Liberia".split(";")); - this.knownCountries.add("ly;Libyan Arab Jamahiriya".split(";")); + this.knownCountries.add("ly;Libya".split(";")); this.knownCountries.add("li;Liechtenstein".split(";")); this.knownCountries.add("lt;Lithuania".split(";")); this.knownCountries.add("lu;Luxembourg".split(";"));

1 0

[metrics-web/master] Update path to direct-users-ranges.csv.
by karsten＠torproject.org 25 Aug '11

25 Aug '11

commit e51b410bd27837afc7b86734a1e7b0fbd805fa7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 25 13:09:54 2011 +0200 Update path to direct-users-ranges.csv. --- rserve/graphs.R | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index ffdbdd6..d1356b4 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -633,8 +633,8 @@ plot_direct_users <- function(start, end, country, events, path, dpi) { plot <- ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) if (events == "on" & country != "all") { r <- read.csv( - "/srv/metrics.torproject.org/web/direct-users-ranges.csv", - stringsAsFactors = FALSE) + "/srv/metrics.torproject.org/web/detector/direct-users-ranges.csv", + stringsAsFactors = FALSE) r <- r[r$date >= start & r$date <= end & r$country == country, c("date", "minusers", "maxusers")] r <- cast(rbind(melt(u, id.vars = "date"), melt(r, id.vars = "date")))

1 0

[torouter/master] we want to install this directly so that autoclean doesn't kill it
by ioerror＠torproject.org 24 Aug '11

24 Aug '11

commit 12658f7719b46d6e2dfbf778ca5877d384a5fdd6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Aug 25 02:08:13 2011 +0200 we want to install this directly so that autoclean doesn't kill it --- packages/torouter-prep/src/torouter_config.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index e5a3391..8449eec 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -80,6 +80,9 @@ apt-get -y install ttdnsd # Install a normal dns cache for eth1 apt-get -y install dnsmasq +# install the best dhcp client we're gonna get in debian land +apt-get -y install isc-dhcp-client + ## ## Configuration stage of the script ##

1 0

[torouter/master] Make the network interfaces be inside config.py
by hellais＠torproject.org 24 Aug '11

24 Aug '11

commit 2da67986a68571789172cc1f469f2d010d8128de Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 25 01:57:59 2011 +0200 Make the network interfaces be inside config.py --- packages/torouter-web/src/tui/config.py | 3 +++ .../torouter-web/src/tui/controllers/network.py | 2 +- packages/torouter-web/src/tui/utils/parsing.py | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py index 73087f2..69ea54d 100644 --- a/packages/torouter-web/src/tui/config.py +++ b/packages/torouter-web/src/tui/config.py @@ -11,6 +11,9 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") +# Network devices +network_devices = ('wlan0', 'eth0', 'eth1') + #interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc" torrc_file = "/var/tmp/tor-tui/torrc" diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py index 6b62da7..598d332 100644 --- a/packages/torouter-web/src/tui/controllers/network.py +++ b/packages/torouter-web/src/tui/controllers/network.py @@ -81,7 +81,7 @@ class wireless: itfc.set_mac(data.mac) itfc.wifi['netmask'] = data.netmask itfc.wifi['address'] = data.address - filecontent = itfc.exclude_output("wlan0") + itfc.output(itfc.wifi) + filecontent = itfc.exclude_output(config.network_interfaces[0]) + itfc.output(itfc.wifi) files = [('/etc/network/interfaces', filecontent)] fileio.write(files) #print itfc.output(itfc.wifi) diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index 690d15d..310ea5c 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -2,6 +2,7 @@ # files, they will be used inside torouter to visualize # and edit configuration import os, re +from tui import config class interfaces: def __init__(self,filename): @@ -31,7 +32,7 @@ class interfaces: def parse_line(self, line, iface): name = line.split(" ")[0] values = " ".join(line.split(" ")[1:]).rstrip() - if iface == "wlan0": + if iface == config.network_interfaces[0]: if self.wifi.has_key(name): if type(self.wifi[name]) is list: self.wifi[name].append(values) @@ -39,7 +40,7 @@ class interfaces: self.wifi[name] = [self.wifi[name],values] else: self.wifi.update({name : values}) - elif iface == "eth1": + elif iface == config.network_interfaces[2]: if self.eth1.has_key(name): if type(self.eth1[name]) is list: self.eth1[name].append(values) @@ -47,7 +48,7 @@ class interfaces: self.eth1[name] = [self.eth1[name],values] else: self.eth1.update({name : values}) - elif iface == "eth0": + elif iface == config.network_interfaces[1]: if self.eth0.has_key(name): if type(self.eth0[name]) is list: self.eth0[name].append(values) @@ -103,7 +104,7 @@ class interfaces: # XXX currently works for one pre-up entry, must make it work also for arrays def set_mac(self, mac): - self.wifi['pre-up'] = 'ifconfig wlan0 hw ether ' + mac + self.wifi['pre-up'] = 'ifconfig ' + config.network_interfaces[0] + ' hw ether ' + mac class torrc:

1 0

[tor/master] Apply rate-limiting to the lowest bufferevent in the stack.
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit 59d0f750c972011372febefbee958b37a17a0569 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:09:56 2011 -0400 Apply rate-limiting to the lowest bufferevent in the stack. When we're doing filtering ssl bufferevents, we want the rate-limits to apply to the lowest level of the bufferevent stack, so that we're actually limiting bytes sent on the network. Otherwise, we'll read from the network aggressively, and only limit stuff as we process it. --- changes/bug3804 | 4 ++++ src/common/compat_libevent.c | 26 ++++++++++++++++++++++++++ src/common/compat_libevent.h | 6 ++++++ src/or/connection.c | 2 +- src/or/connection_or.c | 4 ++-- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/changes/bug3804 b/changes/bug3804 new file mode 100644 index 0000000..d498db8 --- /dev/null +++ b/changes/bug3804 @@ -0,0 +1,4 @@ + o Major bugfixes (bufferevents): + - Apply rate-limiting only at the bottom of a chain of filtering + bufferevents. This prevents us from filling up internal memory + buffers. Bugfix on 0.2.3.1-alpha; fixes bug 3804. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 595742f..beae950 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -20,6 +20,9 @@ #ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> #include <event2/thread.h> +#ifdef USE_BUFFEREVENTS +#include <event2/bufferevent.h> +#endif #else #include <event.h> #endif @@ -614,5 +617,28 @@ tor_libevent_get_one_tick_timeout(void) } return one_tick; } + +static struct bufferevent * +tor_get_root_bufferevent(struct bufferevent *bev) +{ + struct bufferevent *u; + while ((u = bufferevent_get_underlying(bev)) != NULL) + bev = u; + return bev; +} + +int +tor_set_bufferevent_rate_limit(struct bufferevent *bev, + struct ev_token_bucket_cfg *cfg) +{ + return bufferevent_set_rate_limit(tor_get_root_bufferevent(bev), cfg); +} + +int +tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, + struct bufferevent_rate_limit_group *g) +{ + return bufferevent_add_to_rate_limit_group(tor_get_root_bufferevent(bev), g); +} #endif diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index bbe105b..15b0fc2 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -10,6 +10,8 @@ struct event; struct event_base; #ifdef USE_BUFFEREVENTS struct bufferevent; +struct ev_token_bucket_cfg; +struct bufferevent_rate_limit_group; #endif #ifdef HAVE_EVENT2_EVENT_H @@ -74,6 +76,10 @@ const char *tor_libevent_get_version_str(void); #define TOR_LIBEVENT_TICKS_PER_SECOND 3 const struct timeval *tor_libevent_get_one_tick_timeout(void); int tor_libevent_using_iocp_bufferevents(void); +int tor_set_bufferevent_rate_limit(struct bufferevent *bev, + struct ev_token_bucket_cfg *cfg); +int tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, + struct bufferevent_rate_limit_group *g); #endif #endif diff --git a/src/or/connection.c b/src/or/connection.c index f8f82a3..c4cbef4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2509,7 +2509,7 @@ connection_enable_rate_limiting(connection_t *conn) if (conn->bufev) { if (!global_rate_limit) connection_bucket_init(); - bufferevent_add_to_rate_limit_group(conn->bufev, global_rate_limit); + tor_add_bufferevent_to_rate_limit_group(conn->bufev, global_rate_limit); } } diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e66d36a..a75444e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -585,7 +585,7 @@ connection_or_update_token_buckets_helper(or_connection_t *conn, int reset, burst, tick); old_cfg = conn->bucket_cfg; if (conn->_base.bufev) - bufferevent_set_rate_limit(conn->_base.bufev, cfg); + tor_set_bufferevent_rate_limit(conn->_base.bufev, cfg); if (old_cfg) ev_token_bucket_cfg_free(old_cfg); conn->bucket_cfg = cfg; @@ -1102,7 +1102,7 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) } conn->_base.bufev = b; if (conn->bucket_cfg) - bufferevent_set_rate_limit(conn->_base.bufev, conn->bucket_cfg); + tor_set_bufferevent_rate_limit(conn->_base.bufev, conn->bucket_cfg); connection_enable_rate_limiting(TO_CONN(conn)); connection_configure_bufferevent_callbacks(TO_CONN(conn));

1 0

[tor/master] Add write watermarks to filtered bufferevents.
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit f186e16241f7d6a0090260f87ce412a0fb7ec47a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:18:25 2011 -0400 Add write watermarks to filtered bufferevents. --- changes/bug3804 | 9 +++++++-- src/common/tortls.c | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug3804 b/changes/bug3804 index d498db8..7ad091c 100644 --- a/changes/bug3804 +++ b/changes/bug3804 @@ -1,4 +1,9 @@ o Major bugfixes (bufferevents): - Apply rate-limiting only at the bottom of a chain of filtering - bufferevents. This prevents us from filling up internal memory - buffers. Bugfix on 0.2.3.1-alpha; fixes bug 3804. + bufferevents. This prevents us from filling up internal read + buffers and violating rate-limits when filtering bufferevents + are enabled. Bugfix on 0.2.3.1-alpha; fixes part of bug 3804. + - Add high-watermarks to the output buffers for filtered + bufferevents. This prevents us from filling up internal write + buffers and wasting CPU cycles when filtering bufferevents are + enabled. Bugfix on 0.2.3.1-alpha; fixes part of bug 3804. diff --git a/src/common/tortls.c b/src/common/tortls.c index 2aaa2c4..1bb9c74 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -51,6 +51,7 @@ #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h> +#include <event2/event.h> #include "compat_libevent.h" #endif @@ -1905,6 +1906,10 @@ tor_tls_init_bufferevent(tor_tls_t *tls, struct bufferevent *bufev_in, state, BEV_OPT_DEFER_CALLBACKS| BEV_OPT_CLOSE_ON_FREE); + /* Tell the underlying bufferevent when to accept more data from the SSL + filter (only when it's got less than 32K to write), and when to notify + the SSL filter that it could write more (when it drops under 24K). */ + bufferevent_setwatermark(bufev_in, EV_WRITE, 24*1024, 32*1024); } else { if (bufev_in) { evutil_socket_t s = bufferevent_getfd(bufev_in);

1 0

[tor/master] Set write low-watermarks on all bufferevents.
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit dfcd3d9ce00dedcf00124c9329985c5522f286dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:30:20 2011 -0400 Set write low-watermarks on all bufferevents. If we don't do this, then we never invoke the bufferevent write callbacks until all the bufferevent's data is flushed. --- changes/bug3805 | 5 +++++ src/or/connection.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug3805 b/changes/bug3805 new file mode 100644 index 0000000..9d12b81 --- /dev/null +++ b/changes/bug3805 @@ -0,0 +1,5 @@ + o Major bugfixes (bufferevents): + - Correctly notice when data has been written from a bufferevent + without flushing it completely. Bugfix on 0.2.3.1-alpha; fixes + bug 3805. + diff --git a/src/or/connection.c b/src/or/connection.c index c4cbef4..dc804dd 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2947,6 +2947,11 @@ connection_configure_bufferevent_callbacks(connection_t *conn) connection_handle_write_cb, connection_handle_event_cb, conn); + /* Set a fairly high write low-watermark so that we get the write callback + called whenever data is written to bring us under 128K. Leave the + high-watermark at 0. + */ + bufferevent_setwatermark(bufev, EV_WRITE, 128*1024, 0); input = bufferevent_get_input(bufev); output = bufferevent_get_output(bufev);

1 0

[tor/master] Merge branch 'bufev_ratelim_and_wm'
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit b161674d5dc312f95a495bed3c25d892fc9f0550 Merge: ede9cd4 dfcd3d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 24 17:57:55 2011 -0400 Merge branch 'bufev_ratelim_and_wm' changes/bug3804 | 9 +++++++++ changes/bug3805 | 5 +++++ src/common/compat_libevent.c | 26 ++++++++++++++++++++++++++ src/common/compat_libevent.h | 6 ++++++ src/common/tortls.c | 5 +++++ src/or/connection.c | 7 ++++++- src/or/connection_or.c | 4 ++-- 7 files changed, 59 insertions(+), 3 deletions(-)

1 0

[tor/master] lround() missing in MSVC
by nickm＠torproject.org 24 Aug '11

24 Aug '11

commit 5939c09d35de5be4b135bb0ad6dde24700e75fc2 Author: Gisle Vanem <gvanem(a)broadpark.no> Date: Wed Aug 24 13:52:44 2011 -0400 lround() missing in MSVC lround() is missing in MS Visual-C's <math.h>. Not available anywhere. Here is an easy patch. --- changes/msvc_lround | 4 ++++ src/common/util.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/msvc_lround b/changes/msvc_lround new file mode 100644 index 0000000..e4aea95 --- /dev/null +++ b/changes/msvc_lround @@ -0,0 +1,4 @@ + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + diff --git a/src/common/util.c b/src/common/util.c index b47b9c5..ee0acbb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -334,7 +334,11 @@ tor_mathlog(double d) long tor_lround(double d) { +#ifdef _MSC_VER + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); +#else return lround(d); +#endif } /** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */

1 0