February 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug21372_squashed'
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit bc9121d5c99de17b350c2e4f646160b53f1c832c Merge: 0740d67 19e25d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 3 10:35:23 2017 -0500 Merge branch 'bug21372_squashed' changes/bug21372 | 4 ++++ src/or/circuitbuild.c | 5 +++-- src/or/control.c | 7 ++----- src/or/rendservice.c | 3 +++ 4 files changed, 12 insertions(+), 7 deletions(-)

1 0

[tor/master] further lintchanges fixes
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit 0740d67e547a9bf9cf69eeb188224520e970c2d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 3 10:24:37 2017 -0500 further lintchanges fixes --- changes/bug20980 | 2 +- changes/bug21302 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/bug20980 b/changes/bug20980 index 362a753..0f8e28e 100644 --- a/changes/bug20980 +++ b/changes/bug20980 @@ -1,4 +1,4 @@ o Minor bugfix (OpenBSD): - Use "OpenBSD" pre-defined compiler macro instead of "OPENBSD" or "__OpenBSD__". It is supported by OpenBSD itself and also most OpenBSD - variants like Bitrig. Fixes bug 20980. + variants like Bitrig. Fixes bug 20980; bugfix on 0.1.2.1-alpha. diff --git a/changes/bug21302 b/changes/bug21302 index 351b23e..309b357 100644 --- a/changes/bug21302 +++ b/changes/bug21302 @@ -1,8 +1,8 @@ o Minor bugfixes (hidden service): - Two possible underflow which would ultimately lead to creating a lot of introduction points circuits and closing them in a non stop loop. Fixes - bug 21302; bugfix on tor-0.2.7.2-alpha. + bug 21302; bugfix on 0.2.7.2-alpha. - Cleanup expiring intro point nodes if no circuit is associated to it anymore. It was causing, rarely, the service to not open enough introduction points circuit in the case we had dead expiring nodes.; - bugfix on tor-0.2.7.2-alpha. + bugfix on 0.2.7.2-alpha.

1 0

[metrics-web/master] Add webstats-tb-platform graph.
by karsten＠torproject.org 03 Feb '17

03 Feb '17

commit fd5f640af28b4854b3e3cc999a51a37dc0267a53 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 2 20:31:01 2017 +0100 Add webstats-tb-platform graph. --- website/etc/categories.json | 1 + website/etc/metrics.json | 14 ++++++++++++++ website/etc/web.xml | 4 ++++ website/rserve/graphs.R | 29 +++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/website/etc/categories.json b/website/etc/categories.json index 134ef44..de10ceb 100644 --- a/website/etc/categories.json +++ b/website/etc/categories.json @@ -81,6 +81,7 @@ "description": "The following application statistics are based on the analysis of requests to <code>torproject.org</code> web servers.", "metrics": [ "webstats-tb", + "webstats-tb-platform", "webstats-tb-locale", "webstats-tm" ] diff --git a/website/etc/metrics.json b/website/etc/metrics.json index 41e2c6f..2af4bf6 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -418,6 +418,20 @@ ] }, { + "id": "webstats-tb-platform", + "title": "Tor Browser downloads by platform", + "type": "Graph", + "description": "This graph shows absolute numbers of requests to Tor's web servers by request type. It is based on data from <a href=\"https://webstats.torproject.org/\" target=\"_blank\"><code>webstats.torproject.org</code></a> which collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's \"combined\" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings. All shown requests are requests made by the user to download a Tor Browser executable from the Tor website, broken down by platform of the requested executable.", + "function": "plot_webstats_tb_platform", + "parameters": [ + "start", + "end" + ], + "data": [ + "webstats" + ] + }, + { "id": "webstats-tb-locale", "title": "Tor Browser downloads by locale", "type": "Graph", diff --git a/website/etc/web.xml b/website/etc/web.xml index 9e42aa5..bd7f4f1 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -47,6 +47,7 @@ <url-pattern>/hidserv-rend-relayed-cells.html</url-pattern> <url-pattern>/hidserv-frac-reporting.html</url-pattern> <url-pattern>/webstats-tb.html</url-pattern> + <url-pattern>/webstats-tb-platform.html</url-pattern> <url-pattern>/webstats-tb-locale.html</url-pattern> <url-pattern>/webstats-tm.html</url-pattern> </servlet-mapping> @@ -183,6 +184,9 @@ <url-pattern>/webstats-tb.png</url-pattern> <url-pattern>/webstats-tb.pdf</url-pattern> <url-pattern>/webstats-tb.svg</url-pattern> + <url-pattern>/webstats-tb-platform.png</url-pattern> + <url-pattern>/webstats-tb-platform.pdf</url-pattern> + <url-pattern>/webstats-tb-platform.svg</url-pattern> <url-pattern>/webstats-tb-locale.png</url-pattern> <url-pattern>/webstats-tb-locale.pdf</url-pattern> <url-pattern>/webstats-tb-locale.svg</url-pattern> diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index 1b232f4..4c2f45e 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -1126,6 +1126,35 @@ plot_webstats_tb <- function(start, end, path) { ggsave(filename = path, width = 8, height = 5, dpi = 72) } +plot_webstats_tb_platform <- function(start, end, path) { + end <- min(end, as.character(Sys.Date() - 2)) + d <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", + "webstats.csv", sep = ""), stringsAsFactors = FALSE) + d <- d[d$log_date >= start & d$log_date <= end & d$request_type == 'tbid', ] + d <- aggregate(list(count = d$count), by = list(log_date = as.Date(d$log_date), + platform = d$platform), FUN = sum) + date_breaks <- date_breaks(as.numeric(max(d$log_date) - min(d$log_date))) + formatter <- function(x, ...) { + format(x, ..., scientific = FALSE, big.mark = ' ') } + ggplot(d, aes(x = log_date, y = count, colour = platform)) + + geom_point() + + geom_line() + + expand_limits(y = 0) + + scale_x_date(name = paste("\nThe Tor Project - ", + "https://metrics.torproject.org/", sep = ""), + labels = date_format(date_breaks$format), + breaks = date_breaks$major, + minor_breaks = date_breaks$minor) + + scale_y_continuous(name = 'Requests per day\n', labels = formatter) + + scale_colour_hue(name = "Platform", + breaks = c("w", "m", "l", "o", ""), + labels = c("Windows", "Mac", "Linux", "Other", "Unknown")) + + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), + strip.background = element_rect(fill = NA)) + + ggtitle("Tor Browser downloads by platform\n") + ggsave(filename = path, width = 8, height = 5, dpi = 72) +} + plot_webstats_tb_locale <- function(start, end, path) { end <- min(end, as.character(Sys.Date() - 2)) d <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/",

1 0

[metrics-web/master] Keep only a single copy of the formatter function.
by karsten＠torproject.org 03 Feb '17

03 Feb '17

commit 487a0b433709f5b01daf8e617d536f7c583dfeec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 3 15:44:25 2017 +0100 Keep only a single copy of the formatter function. --- website/rserve/graphs.R | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index 4c2f45e..fad2e1b 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -269,6 +269,10 @@ date_breaks <- function(days) { list(major = major, minor = minor, format = format) } +formatter <- function(x, ...) { + format(x, ..., scientific = FALSE, big.mark = ' ') +} + plot_networksize <- function(start, end, path) { end <- min(end, as.character(Sys.Date() - 2)) s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/", @@ -850,8 +854,6 @@ plot_userstats <- function(start, end, node, variable, value, events, date = seq(from = as.Date(start, "%Y-%m-%d"), to = as.Date(end, "%Y-%m-%d"), by="1 day"), value = ifelse(value == 'all', '', value)))) - formatter <- function(x, ...) { - format(x, ..., scientific = FALSE, big.mark = ' ') } date_breaks <- date_breaks( as.numeric(max(u$date) - min(u$date))) if (length(value) > 1) { @@ -934,8 +936,6 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { by = list(transport = u$transport), FUN = sum) a <- a[order(a$mid, decreasing = TRUE)[1:top], ] u <- u[u$transport %in% a$transport, ] - formatter <- function(x, ...) { - format(x, ..., scientific = FALSE, big.mark = ' ') } max_y <- ifelse(length(na.omit(u$high)) == 0, 0, max(u$high, na.rm = TRUE)) title <- paste("Bridge users by transport from ", @@ -1107,8 +1107,6 @@ plot_webstats_tb <- function(start, end, path) { 'Signature downloads' = 'tbsd', 'Update pings' = 'tbup', 'Update requests' = 'tbur') - formatter <- function(x, ...) { - format(x, ..., scientific = FALSE, big.mark = ' ') } ggplot(d, aes(x = log_date, y = count)) + geom_point() + geom_line() + @@ -1134,8 +1132,6 @@ plot_webstats_tb_platform <- function(start, end, path) { d <- aggregate(list(count = d$count), by = list(log_date = as.Date(d$log_date), platform = d$platform), FUN = sum) date_breaks <- date_breaks(as.numeric(max(d$log_date) - min(d$log_date))) - formatter <- function(x, ...) { - format(x, ..., scientific = FALSE, big.mark = ' ') } ggplot(d, aes(x = log_date, y = count, colour = platform)) + geom_point() + geom_line() + @@ -1167,8 +1163,6 @@ plot_webstats_tb_locale <- function(start, end, path) { d <- aggregate(list(count = d$count), by = list(log_date = as.Date(d$log_date), locale = ifelse(d$locale %in% e$locale, d$locale, '(other)')), FUN = sum) date_breaks <- date_breaks(as.numeric(max(d$log_date) - min(d$log_date))) - formatter <- function(x, ...) { - format(x, ..., scientific = FALSE, big.mark = ' ') } ggplot(d, aes(x = log_date, y = count, colour = locale)) + geom_point() + geom_line() + @@ -1198,8 +1192,6 @@ plot_webstats_tm <- function(start, end, path) { levels(d$request_type) <- list( 'Initial downloads' = 'tmid', 'Update pings' = 'tmup') - formatter <- function(x, ...) { - format(x, ..., scientific = FALSE, big.mark = ' ') } ggplot(d, aes(x = log_date, y = count)) + geom_point() + geom_line() +

1 0

[metrics-web/master] Tweak webstats graph descriptions.
by karsten＠torproject.org 03 Feb '17

03 Feb '17

commit 08ee5d3f3f5ffbc5b2b1f18d489e3bebf08ad56f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 3 15:44:38 2017 +0100 Tweak webstats graph descriptions. --- website/etc/categories.json | 2 +- website/etc/metrics.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/etc/categories.json b/website/etc/categories.json index de10ceb..acd0614 100644 --- a/website/etc/categories.json +++ b/website/etc/categories.json @@ -78,7 +78,7 @@ "icon": "fa-download", "header": "Applications", "summary": "How many Tor applications, like Tor Browser, have been downloaded or updated.", - "description": "The following application statistics are based on the analysis of requests to <code>torproject.org</code> web servers.", + "description": "The following application statistics are based on the analysis of web server requests. All data comes from <a href=\"https://webstats.torproject.org/\" target=\"_blank\"><code>webstats.torproject.org</code></a> which collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's \"combined\" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings.", "metrics": [ "webstats-tb", "webstats-tb-platform", diff --git a/website/etc/metrics.json b/website/etc/metrics.json index 2af4bf6..3eb000c 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -407,7 +407,7 @@ "id": "webstats-tb", "title": "Tor Browser downloads and updates", "type": "Graph", - "description": "This graph shows absolute numbers of requests to Tor's web servers by request type. It is based on data from <a href=\"https://webstats.torproject.org/\" target=\"_blank\"><code>webstats.torproject.org</code></a> which collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's \"combined\" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings. Initial downloads and signature downloads are requests made by the user to download a Tor Browser executable or a corresponding signature file from the Tor website. Update pings and update requests are requests made by Tor Browser to check whether a newer version is available or to download a newer version.", + "description": "This graph shows absolute numbers of requests to Tor's web servers related to Tor Browser. Initial downloads and signature downloads are requests made by the user to download a Tor Browser executable or a corresponding signature file from the Tor website. Update pings and update requests are requests made by Tor Browser to check whether a newer version is available or to download a newer version.", "function": "plot_webstats_tb", "parameters": [ "start", @@ -421,7 +421,7 @@ "id": "webstats-tb-platform", "title": "Tor Browser downloads by platform", "type": "Graph", - "description": "This graph shows absolute numbers of requests to Tor's web servers by request type. It is based on data from <a href=\"https://webstats.torproject.org/\" target=\"_blank\"><code>webstats.torproject.org</code></a> which collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's \"combined\" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings. All shown requests are requests made by the user to download a Tor Browser executable from the Tor website, broken down by platform of the requested executable.", + "description": "This graph shows absolute numbers of requests to Tor's web servers to download a Tor Browser executable, broken down by platform (Windows, Mac, Linux) of the requested executable.", "function": "plot_webstats_tb_platform", "parameters": [ "start", @@ -435,7 +435,7 @@ "id": "webstats-tb-locale", "title": "Tor Browser downloads by locale", "type": "Graph", - "description": "This graph shows absolute numbers of requests to Tor's web servers by request type. It is based on data from <a href=\"https://webstats.torproject.org/\" target=\"_blank\"><code>webstats.torproject.org</code></a> which collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's \"combined\" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings. All shown requests are requests made by the user to download a Tor Browser executable from the Tor website, broken down by requested locale.", + "description": "This graph shows absolute numbers of requests to Tor's web servers to download a Tor Browser executable, broken down by requested locale.", "function": "plot_webstats_tb_locale", "parameters": [ "start", @@ -449,7 +449,7 @@ "id": "webstats-tm", "title": "Tor Messenger downloads and updates", "type": "Graph", - "description": "This graph shows absolute numbers of requests to Tor's web servers by request type. It is based on data from <a href=\"https://webstats.torproject.org/\" target=\"_blank\"><code>webstats.torproject.org</code></a> which collects logs from <code>torproject.org</code> web servers and provides them as a stripped-down version of Apache's \"combined\" log format without IP addresses, log times, HTTP parameters, referers, and user agent strings. Initial downloads are requests made by the user to download a Tor Messenger executable from the Tor website. Update pings are requests made by Tor Messenger to check whether a newer version is available.", + "description": "This graph shows absolute numbers of requests to Tor's web servers related to Tor Messenger. Initial downloads are requests made by the user to download a Tor Messenger executable from the Tor website. Update pings are requests made by Tor Messenger to check whether a newer version is available.", "function": "plot_webstats_tm", "parameters": [ "start",

1 0

[tor/master] hs: Fix possible integer underflow with IP nodes
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit cc0342a2ae4264c5b8796e2731a51272342bb8f4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 1 11:07:09 2017 -0500 hs: Fix possible integer underflow with IP nodes In rend_consider_services_intro_points(), we had a possible interger underflow which could lead to creating a very large number of intro points. We had a safe guard against that *except* if the expiring_nodes list was not empty which is realistic thing. This commit removes the check on the expiring nodes length being zero. It's not because we have an empty list of expiring nodes that we don't want to open new IPs. Prior to this check, we remove invalid IP nodes from the main list of a service so it should be the only thing to look at when deciding if we need to create new IP(s) or not. Partially fixes #21302. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/rendservice.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 00f2515..5514de6 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -4072,17 +4072,17 @@ rend_consider_services_intro_points(void) /* Avoid mismatched signed comparaison below. */ intro_nodes_len = (unsigned int) smartlist_len(service->intro_nodes); - /* Quiescent state, no node expiring and we have more or the amount of - * wanted node for this service. Proceed to the next service. Could be - * more because we launch two preemptive circuits if our intro nodes - * list is empty. */ - if (smartlist_len(service->expiring_nodes) == 0 && - intro_nodes_len >= service->n_intro_points_wanted) { + /* Quiescent state, we have more or the equal amount of wanted node for + * this service. Proceed to the next service. We can have more nodes + * because we launch extra preemptive circuits if our intro nodes list was + * originally empty for performance reasons. */ + if (intro_nodes_len >= service->n_intro_points_wanted) { continue; } - /* Number of intro points we want to open which is the wanted amount - * minus the current amount of valid nodes. */ + /* Number of intro points we want to open which is the wanted amount minus + * the current amount of valid nodes. We know that this won't underflow + * because of the check above. */ n_intro_points_to_open = service->n_intro_points_wanted - intro_nodes_len; if (intro_nodes_len == 0) { /* We want to end up with n_intro_points_wanted intro points, but if

1 0

[tor/master] Merge branch 'dgoulet/bug21302_030_01_squashed'
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit 9d5a9feb404c61d93309eea1c68fcae3ff0cf8f3 Merge: 1ec429d eea7634 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 3 09:54:24 2017 -0500 Merge branch 'dgoulet/bug21302_030_01_squashed' changes/bug21302 | 8 ++++++++ src/or/rendservice.c | 47 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 12 deletions(-)

1 0

[tor/master] hs: Remove intro point expiring node if no circuit
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit eea763400f16541f990ea7f65eea389336fab7b8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 1 11:30:46 2017 -0500 hs: Remove intro point expiring node if no circuit Once a second, we go over all services and consider the validity of the intro points. Now, also try to remove expiring nodes that have no more circuit associated to them. This is possible if we moved an intro point object previously to that list and the circuit actually timed out or was closed by the introduction point itself. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21302 | 8 ++++++++ src/or/rendservice.c | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/changes/bug21302 b/changes/bug21302 new file mode 100644 index 0000000..351b23e --- /dev/null +++ b/changes/bug21302 @@ -0,0 +1,8 @@ + o Minor bugfixes (hidden service): + - Two possible underflow which would ultimately lead to creating a lot of + introduction points circuits and closing them in a non stop loop. Fixes + bug 21302; bugfix on tor-0.2.7.2-alpha. + - Cleanup expiring intro point nodes if no circuit is associated to it + anymore. It was causing, rarely, the service to not open enough + introduction points circuit in the case we had dead expiring nodes.; + bugfix on tor-0.2.7.2-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0db81ae..4c5372c 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3907,6 +3907,19 @@ remove_invalid_intro_points(rend_service_t *service, { tor_assert(service); + /* Remove any expired nodes that doesn't have a circuit. */ + SMARTLIST_FOREACH_BEGIN(service->expiring_nodes, rend_intro_point_t *, + intro) { + origin_circuit_t *intro_circ = + find_intro_circuit(intro, service->pk_digest); + if (intro_circ) { + continue; + } + /* No more circuit, cleanup the into point object. */ + SMARTLIST_DEL_CURRENT(service->expiring_nodes, intro); + rend_intro_point_free(intro); + } SMARTLIST_FOREACH_END(intro); + SMARTLIST_FOREACH_BEGIN(service->intro_nodes, rend_intro_point_t *, intro) { /* Find the introduction point node object. */

1 0

[tor/master] hs: Fix an underflow in rend_service_intro_has_opened()
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit 8573d994706c16628bb60e0aabdb9a5190beff13 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 1 11:22:17 2017 -0500 hs: Fix an underflow in rend_service_intro_has_opened() In rend_service_intro_has_opened(), this is subject to a possible underflow because of how the if() casts the results. In the case where the expiring nodes list length is bigger than the number of IP circuits, we end up in the following situation where the result will be cast to an unsigned int. For instance, "5 - 6" is actually a BIG number. Ultimately leading to closing IP circuits in a non stop loop. Partially fixes #21302. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/rendservice.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 5514de6..0db81ae 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3227,6 +3227,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) rend_service_t *service; char buf[RELAY_PAYLOAD_SIZE]; char serviceid[REND_SERVICE_ID_LEN_BASE32+1]; + unsigned int expiring_nodes_len, num_ip_circuits, valid_ip_circuits = 0; int reason = END_CIRC_REASON_TORPROTOCOL; const char *rend_pk_digest; @@ -3248,13 +3249,22 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) goto err; } + /* Take the current amount of expiring nodes and the current amount of IP + * circuits and compute how many valid IP circuits we have. */ + expiring_nodes_len = (unsigned int) smartlist_len(service->expiring_nodes); + num_ip_circuits = count_intro_point_circuits(service); + /* Let's avoid an underflow. The valid_ip_circuits is initialized to 0 in + * case this condition turns out false because it means that all circuits + * are expiring so we need to keep this circuit. */ + if (num_ip_circuits > expiring_nodes_len) { + valid_ip_circuits = num_ip_circuits - expiring_nodes_len; + } + /* If we already have enough introduction circuits for this service, * redefine this one as a general circuit or close it, depending. - * Substract the amount of expiring nodes here since the circuits are + * Substract the amount of expiring nodes here because the circuits are * still opened. */ - if ((count_intro_point_circuits(service) - - smartlist_len(service->expiring_nodes)) > - service->n_intro_points_wanted) { + if (valid_ip_circuits > service->n_intro_points_wanted) { const or_options_t *options = get_options(); /* Remove the intro point associated with this circuit, it's being * repurposed or closed thus cleanup memory. */

1 0

[tor/master] Use the standard OpenBSD preprocessor definition
by nickm＠torproject.org 03 Feb '17

03 Feb '17

commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Sep 1 17:50:38 2016 +0000 Use the standard OpenBSD preprocessor definition --- changes/bug20980 | 4 ++++ configure.ac | 4 ---- src/common/backtrace.c | 2 +- src/common/torgzip.c | 2 +- src/common/util.c | 2 +- src/ext/csiphash.c | 4 ++-- src/ext/trunnel/trunnel.c | 2 +- src/or/config.c | 2 +- src/or/connection_edge.c | 2 +- src/or/directory.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test_options.c | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/changes/bug20980 b/changes/bug20980 new file mode 100644 index 0000000..362a753 --- /dev/null +++ b/changes/bug20980 @@ -0,0 +1,4 @@ + o Minor bugfix (OpenBSD): + - Use "OpenBSD" pre-defined compiler macro instead of "OPENBSD" or + "__OpenBSD__". It is supported by OpenBSD itself and also most OpenBSD + variants like Bitrig. Fixes bug 20980. diff --git a/configure.ac b/configure.ac index 669dc37..bad21e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1150,10 +1150,6 @@ if test "x$linux_netfilter_ipv6_ip6_tables" = "x1"; then fi if test "x$transparent_ok" = "x1"; then AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support") - case "$host" in - *-*-openbsd* | *-*-bitrig*) - AC_DEFINE(OPENBSD, 1, "Define to handle pf on OpenBSD properly") ;; - esac else AC_MSG_NOTICE([Transparent proxy support enabled, but missing headers.]) fi diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 81e04e9..6109695 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -76,7 +76,7 @@ clean_backtrace(void **stack, size_t depth, const ucontext_t *ctx) #ifdef PC_FROM_UCONTEXT #if defined(__linux__) const size_t n = 1; -#elif defined(__darwin__) || defined(__APPLE__) || defined(__OpenBSD__) \ +#elif defined(__darwin__) || defined(__APPLE__) || defined(OpenBSD) \ || defined(__FreeBSD__) const size_t n = 2; #else diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 3353f0e..04ae353 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -206,7 +206,7 @@ tor_gzip_compress(char **out, size_t *out_len, } done: *out_len = stream->total_out; -#ifdef OPENBSD +#if defined(OpenBSD) /* "Hey Rocky! Watch me change an unsigned field to a signed field in a * third-party API!" * "Oh, that trick will just make people do unsafe casts to the unsigned diff --git a/src/common/util.c b/src/common/util.c index 824b4fb..180712a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -79,7 +79,7 @@ #include <malloc/malloc.h> #endif #ifdef HAVE_MALLOC_H -#if !defined(OPENBSD) && !defined(__FreeBSD__) +#if !defined(OpenBSD) && !defined(__FreeBSD__) /* OpenBSD has a malloc.h, but for our purposes, it only exists in order to * scold us for being so stupid as to autodetect its presence. To be fair, * they've done this since 1996, when autoconf was only 5 years old. */ diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index b60f73a..8348c66 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -53,7 +53,7 @@ #else /* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> @@ -62,7 +62,7 @@ __BYTE_ORDER == __LITTLE_ENDIAN # define _le64toh(x) ((uint64_t)(x)) # else -# if defined(__OpenBSD__) +# if defined(OpenBSD) # define _le64toh(x) letoh64(x) # else # define _le64toh(x) le64toh(x) diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index a008fb9..8f72351 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -31,7 +31,7 @@ # define IS_LITTLE_ENDIAN # endif #else -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> diff --git a/src/or/config.c b/src/or/config.c index 8016282..e979930 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3086,7 +3086,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (!strcasecmp(options->TransProxyType, "default")) { options->TransProxyType_parsed = TPT_DEFAULT; } else if (!strcasecmp(options->TransProxyType, "pf-divert")) { -#if !defined(__OpenBSD__) && !defined( DARWIN ) +#if !defined(OpenBSD) && !defined( DARWIN ) /* Later versions of OS X have pf */ REJECT("pf-divert is a OpenBSD-specific " "and OS X/Darwin-specific feature."); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 82d5d3c..ef55104 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1959,7 +1959,7 @@ get_pf_socket(void) if (pf_socket >= 0) return pf_socket; -#ifdef OPENBSD +#if defined(OpenBSD) /* only works on OpenBSD */ pf = tor_open_cloexec("/dev/pf", O_RDONLY, 0); #else diff --git a/src/or/directory.c b/src/or/directory.c index 4c94fe4..93dc488 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -39,7 +39,7 @@ #include "shared_random.h" #if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -#ifndef OPENBSD +#if !defined(OpenBSD) #include <malloc.h> #endif #endif diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 2188244..d3f2dc0 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -36,7 +36,7 @@ const char *s = NULL; sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ const char *malloc_options="sufjj"; diff --git a/src/test/test_options.c b/src/test/test_options.c index e822404..d5782e9 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1022,7 +1022,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(__OpenBSD__) && !defined( DARWIN ) +#if !defined(OpenBSD) && !defined( DARWIN ) tt_str_op(msg, OP_EQ, "pf-divert is a OpenBSD-specific and OS X/Darwin-specific feature."); #else @@ -1091,7 +1091,7 @@ test_options_validate__transproxy(void *ignored) if (msg) { TT_DIE(("Expected NULL but got '%s'", msg)); } -#elif defined(__OpenBSD__) +#elif defined(OpenBSD) tdata = get_options_test_data("TransProxyType pf-divert\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);

1 0