March 2018 - tor-commits - lists.torproject.org

[metrics-web/master] Fix specified full path of sanitized webstats.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit acc26196bcac4dc5ce908b1667fc22c677dd97f1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 19 14:50:01 2018 +0100 Fix specified full path of sanitized webstats. Also fix path in convert script. Fixes #25525. --- src/main/resources/spec/convert.sh | 2 +- src/main/resources/spec/web-server-logs.xml | 2 +- src/main/resources/web/jsps/web-server-logs.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/spec/convert.sh b/src/main/resources/spec/convert.sh index 0287416..95287e2 100755 --- a/src/main/resources/spec/convert.sh +++ b/src/main/resources/spec/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash for specfile in "bridge-descriptors" "web-server-logs"; do saxon-xslt $specfile.xml rfc2629.xslt xml2rfc-topblock=no | \ - tidy -q | awk -f convert.awk > ../web/WEB-INF/$specfile.jsp + tidy -q | awk -f convert.awk > ../web/jsps/$specfile.jsp done diff --git a/src/main/resources/spec/web-server-logs.xml b/src/main/resources/spec/web-server-logs.xml index 13cfad7..c180f8c 100644 --- a/src/main/resources/spec/web-server-logs.xml +++ b/src/main/resources/spec/web-server-logs.xml @@ -190,7 +190,7 @@ mod_log_config module</eref>.</t> <t>Sanitized log files may additionally be sorted into directories by virtual host and date as in: <list> - <t><virtual-host>/YYYY/MM/<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</t> + <t><virtual-host>/YYYY/MM/DD/<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</t> </list> The virtual hostnames, like 'metrics.torproject.org' or 'dist.torproject.org', are more familiar to the public and were therefore diff --git a/src/main/resources/web/jsps/web-server-logs.jsp b/src/main/resources/web/jsps/web-server-logs.jsp index 5e9cc79..8832b2a 100644 --- a/src/main/resources/web/jsps/web-server-logs.jsp +++ b/src/main/resources/web/jsps/web-server-logs.jsp @@ -277,7 +277,7 @@ of the filename. by virtual host and date as in: <ul class="empty"> <li> -<virtual-host>/YYYY/MM/<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</li> +<virtual-host>/YYYY/MM/DD/<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</li> </ul> The virtual hostnames, like 'metrics.torproject.org' or 'dist.torproject.org', are more familiar to the public and were

1 0

[torspec/master] Fix an ambiguity in the grammar for Document.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 3e533e974b15d0ad71dca9466efef81f977e6859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 09:06:19 2018 -0400 Fix an ambiguity in the grammar for Document. Previously, a BEGIN/END block might be interpreted as starting with the keyword "-----BEGIN". This change specifically disallows that, to match the behavior of the existing Tor code. Fixes bug 25188. Bugfix from "witchof0x20". --- dir-spec.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 186c4a8..bc17913 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -222,6 +222,8 @@ BeginLine ::= "-----BEGIN " Keyword "-----" NL EndLine ::= "-----END " Keyword "-----" NL + A Keyword may not be "-----BEGIN". + The BeginLine and EndLine of an Object must use the same keyword. When interpreting a Document, software MUST ignore any KeywordLine that

1 0

[metrics-lib/master] Override logLines method from LogDescriptor.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit c54b264ad865d522bceb135d0fd0ab6b116e5f81 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Feb 26 15:24:26 2018 +0000 Override logLines method from LogDescriptor. --- .../java/org/torproject/descriptor/WebServerAccessLog.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/org/torproject/descriptor/WebServerAccessLog.java b/src/main/java/org/torproject/descriptor/WebServerAccessLog.java index 5f3ad73..a24b9cd 100644 --- a/src/main/java/org/torproject/descriptor/WebServerAccessLog.java +++ b/src/main/java/org/torproject/descriptor/WebServerAccessLog.java @@ -6,6 +6,7 @@ package org.torproject.descriptor; import java.time.LocalDate; import java.util.List; import java.util.Optional; +import java.util.stream.Stream; /** * Contains a sanitized web server access log file from a {@code torproject.org} @@ -63,6 +64,15 @@ public interface WebServerAccessLog extends LogDescriptor { public List<String> getUnrecognizedLines(); /** + * Returns a stream of all valid log lines. + * + * @since 2.3.0 + */ + @Override + public Stream<WebServerAccessLog.Line> logLines() + throws DescriptorParseException; + + /** * Facilitates access to all log line fields that don't only contain * default values post sanitization. *

1 0

[metrics-lib/master] Add change log entry for #25526.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit 2e235ef8f38aac679817fa8e8b9171aadb3d5b9d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 19 11:58:37 2018 +0100 Add change log entry for #25526. --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d87ba4..d8576e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 2.3.0 - 2018-0?-?? + + * Minor changes. + - Override logLines() method from LogDescriptor in + WebServerAccessLog. + + # Changes in version 2.2.0 - 2018-02-26 * Major changes

1 0

[tor/master] Remove duplicate code between parse_{c, s}method in transport.c
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 130e2ffad74c04dbb2acaf94eb2be3879f6a898d Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Sat Feb 24 20:27:08 2018 +0530 Remove duplicate code between parse_{c,s}method in transport.c - Merged common code in function parse_{c,s}method to a single function - Removed duplicate code in transport.c - Fixes #6236 --- changes/ticket6236 | 4 ++ src/or/transports.c | 182 ++++++++++++++++++++-------------------------------- 2 files changed, 75 insertions(+), 111 deletions(-) diff --git a/changes/ticket6236 b/changes/ticket6236 new file mode 100644 index 000000000..9dea07e69 --- /dev/null +++ b/changes/ticket6236 @@ -0,0 +1,4 @@ + o Minor bugfixes (Duplicate code): + - Remove duplicate code in parse_{c,s}method_line and bootstrap + their functionalities into a single function. Fixes + bug 6236; bugfix on 0.2.3.6-alpha. diff --git a/src/or/transports.c b/src/or/transports.c index b08dcd161..5cbf1ddbc 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1025,48 +1025,71 @@ parse_method_error(const char *line, int is_server) line+strlen(error)+1); } -/** Parses an SMETHOD line and if well-formed it registers the - * new transport in mp. */ -STATIC int -parse_smethod_line(const char *line, managed_proxy_t *mp) +/** A helper for parse_{c,s}method_line(), bootstraps its + * functionalities. If is_smethod is true then the + * the line to parse is a SMETHOD line otherwise it is a + * CMETHOD line*/ +static int +parse_method_line_helper(const char *line, + managed_proxy_t *mp, + int is_smethod) { + int item_index = 0; int r; - smartlist_t *items = NULL; - char *method_name=NULL; + char *transport_name=NULL; char *args_string=NULL; char *addrport=NULL; - tor_addr_t tor_addr; + int socks_ver=PROXY_NONE; char *address=NULL; uint16_t port = 0; + const char *method_str = is_smethod ? PROTO_SMETHOD : PROTO_CMETHOD; + const int min_args_count = is_smethod ? 3 : 4; + + tor_addr_t tor_addr; transport_t *transport=NULL; + smartlist_t *items= smartlist_new(); - items = smartlist_new(); smartlist_split_string(items, line, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - if (smartlist_len(items) < 3) { - log_warn(LD_CONFIG, "Server managed proxy sent us a SMETHOD line " - "with too few arguments."); + if (smartlist_len(items) < min_args_count) { + log_warn(LD_CONFIG, "Managed proxy sent us a %s line " + "with too few arguments.", method_str); goto err; } - /* Example of legit SMETHOD line: - SMETHOD obfs2 0.0.0.0:25612 ARGS:secret=supersekrit,key=superkey */ - - tor_assert(!strcmp(smartlist_get(items,0),PROTO_SMETHOD)); + tor_assert(!strcmp(smartlist_get(items, item_index),method_str)); + ++item_index; - method_name = smartlist_get(items,1); - if (!string_is_C_identifier(method_name)) { + transport_name = smartlist_get(items,item_index); + ++item_index; + if (!string_is_C_identifier(transport_name)) { log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", - method_name); + transport_name); goto err; } - addrport = smartlist_get(items, 2); + /** Check for the proxy method sent to us in CMETHOD line. */ + if (!is_smethod) { + const char *socks_ver_str = smartlist_get(items,item_index); + ++item_index; + + if (!strcmp(socks_ver_str,"socks4")) { + socks_ver = PROXY_SOCKS4; + } else if (!strcmp(socks_ver_str,"socks5")) { + socks_ver = PROXY_SOCKS5; + } else { + log_warn(LD_CONFIG, "Client managed proxy sent us a proxy protocol " + "we don't recognize. (%s)", socks_ver_str); + goto err; + } + } + + addrport = smartlist_get(items, item_index); + ++item_index; if (tor_addr_port_split(LOG_WARN, addrport, &address, &port)<0) { - log_warn(LD_CONFIG, "Error parsing transport " - "address '%s'", addrport); + log_warn(LD_CONFIG, "Error parsing transport address '%s'", addrport); goto err; } @@ -1081,10 +1104,11 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) goto err; } - if (smartlist_len(items) > 3) { + /** Check for options in the SMETHOD line. */ + if (is_smethod && smartlist_len(items) > min_args_count) { /* Seems like there are also some [options] in the SMETHOD line. Let's see if we can parse them. */ - char *options_string = smartlist_get(items, 3); + char *options_string = smartlist_get(items, item_index); log_debug(LD_CONFIG, "Got options_string: %s", options_string); if (!strcmpstart(options_string, "ARGS:")) { args_string = options_string+strlen("ARGS:"); @@ -1092,15 +1116,20 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) } } - transport = transport_new(&tor_addr, port, method_name, - PROXY_NONE, args_string); + transport = transport_new(&tor_addr, port, transport_name, + socks_ver, args_string); smartlist_add(mp->transports, transport); - /* For now, notify the user so that they know where the server - transport is listening. */ - log_info(LD_CONFIG, "Server transport %s at %s:%d.", - method_name, address, (int)port); + /** Logs info about line parsing success for client or server */ + if (is_smethod) { + log_info(LD_CONFIG, "Server transport %s at %s:%d.", + transport_name, address, (int)port); + } else { + log_info(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " + "Attached to managed proxy.", + transport_name, address, (int)port, socks_ver); + } r=0; goto done; @@ -1115,93 +1144,24 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) return r; } +/** Parses an SMETHOD line and if well-formed it registers the + * new transport in mp. */ +STATIC int +parse_smethod_line(const char *line, managed_proxy_t *mp) +{ + /* Example of legit SMETHOD line: + SMETHOD obfs2 0.0.0.0:25612 ARGS:secret=supersekrit,key=superkey */ + return parse_method_line_helper(line, mp, 1); +} + /** Parses a CMETHOD line, and if well-formed it registers * the new transport in mp. */ STATIC int parse_cmethod_line(const char *line, managed_proxy_t *mp) { - int r; - smartlist_t *items = NULL; - - char *method_name=NULL; - - char *socks_ver_str=NULL; - int socks_ver=PROXY_NONE; - - char *addrport=NULL; - tor_addr_t tor_addr; - char *address=NULL; - uint16_t port = 0; - - transport_t *transport=NULL; - - items = smartlist_new(); - smartlist_split_string(items, line, NULL, - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - if (smartlist_len(items) < 4) { - log_warn(LD_CONFIG, "Client managed proxy sent us a CMETHOD line " - "with too few arguments."); - goto err; - } - - tor_assert(!strcmp(smartlist_get(items,0),PROTO_CMETHOD)); - - method_name = smartlist_get(items,1); - if (!string_is_C_identifier(method_name)) { - log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", - method_name); - goto err; - } - - socks_ver_str = smartlist_get(items,2); - - if (!strcmp(socks_ver_str,"socks4")) { - socks_ver = PROXY_SOCKS4; - } else if (!strcmp(socks_ver_str,"socks5")) { - socks_ver = PROXY_SOCKS5; - } else { - log_warn(LD_CONFIG, "Client managed proxy sent us a proxy protocol " - "we don't recognize. (%s)", socks_ver_str); - goto err; - } - - addrport = smartlist_get(items, 3); - if (tor_addr_port_split(LOG_WARN, addrport, &address, &port)<0) { - log_warn(LD_CONFIG, "Error parsing transport " - "address '%s'", addrport); - goto err; - } - - if (!port) { - log_warn(LD_CONFIG, - "Transport address '%s' has no port.", addrport); - goto err; - } - - if (tor_addr_parse(&tor_addr, address) < 0) { - log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); - goto err; - } - - transport = transport_new(&tor_addr, port, method_name, socks_ver, NULL); - - smartlist_add(mp->transports, transport); - - log_info(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " - "Attached to managed proxy.", - method_name, address, (int)port, socks_ver); - - r=0; - goto done; - - err: - r = -1; - - done: - SMARTLIST_FOREACH(items, char*, s, tor_free(s)); - smartlist_free(items); - tor_free(address); - return r; + /* Example of legit CMETHOD line: + CMETHOD obfs2 socks5 127.0.0.1:35713 */ + return parse_method_line_helper(line, mp, 0); } /** Parses an PROXY-ERROR line and warns the user accordingly. */

1 0

[tor/master] Merge remote-tracking branch 'fristonio/ticket-6236'
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit b0f0c0f5505b3cf4cfbd4a3c1908ace4740f343b Merge: a324cd902 130e2ffad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 06:42:10 2018 -0400 Merge remote-tracking branch 'fristonio/ticket-6236' changes/ticket6236 | 4 ++ src/or/transports.c | 182 ++++++++++++++++++++-------------------------------- 2 files changed, 75 insertions(+), 111 deletions(-)

1 0

[collector/master] Add lines according to their count.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit 2c00f28ab7eaba0310d2d96eda7f81f2a301a4a5 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Mar 7 13:46:54 2018 +0000 Add lines according to their count. Making the test from the previous commit pass and fixing task-25522. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 8ef9dde..df178b4 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -47,6 +47,7 @@ import java.util.SortedSet; import java.util.StringJoiner; import java.util.TreeMap; import java.util.TreeSet; +import java.util.function.UnaryOperator; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -188,7 +189,7 @@ public class SanitizeWeblogs extends CollecTorMain { } public static byte[] bytesFor(String line, long times) { - return Stream.of(line).limit(times) + return Stream.iterate(line, UnaryOperator.identity()).limit(times) .collect(Collectors.joining("\n", "", "\n")).getBytes(); }

1 0

[collector/master] Add a failing test.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit 2e6fa506b3c9634837e6da4c8ad3dbf477936232 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Mar 7 13:46:51 2018 +0000 Add a failing test. Making a static method easier accessible for tests. --- .../collector/webstats/SanitizeWeblogs.java | 2 +- .../collector/webstats/SanitizeWeblogsTest.java | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index 5a270dd..8ef9dde 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -187,7 +187,7 @@ public class SanitizeWeblogs extends CollecTorMain { } } - private static byte[] bytesFor(String line, long times) { + public static byte[] bytesFor(String line, long times) { return Stream.of(line).limit(times) .collect(Collectors.joining("\n", "", "\n")).getBytes(); } diff --git a/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java b/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java new file mode 100644 index 0000000..9ad4996 --- /dev/null +++ b/src/test/java/org/torproject/collector/webstats/SanitizeWeblogsTest.java @@ -0,0 +1,20 @@ +/* Copyright 2017--2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.collector.webstats; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class SanitizeWeblogsTest { + + @Test + public void bytesForTest() { + String lines = "line\nline\nline\nline\nline\n" + + "line\nline\nline\nline\nline\n"; + assertEquals(lines, new String(SanitizeWeblogs.bytesFor("line", 10))); + } + +} +

1 0

[collector/master] Avoid calling bytesFor() unnecessarily.
by karsten＠torproject.org 19 Mar '18

19 Mar '18

commit 8c1bdd9a8403a0a19149b6388bbc940ee632eaae Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Mar 17 10:45:55 2018 +0100 Avoid calling bytesFor() unnecessarily. Found while looking into #25522. --- src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java index df178b4..fd301b0 100644 --- a/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/collector/webstats/SanitizeWeblogs.java @@ -169,9 +169,12 @@ public class SanitizeWeblogs extends CollecTorMain { OutputStream os = FileType.XZ.outputStream(baos)) { for (Map.Entry<String, Long> entry : lines.entrySet()) { long count = entry.getValue(); - byte[] batch = bytesFor(entry.getKey(), BATCH); + byte[] batch = null; while (count > 0) { if (count > BATCH) { + if (null == batch) { + batch = bytesFor(entry.getKey(), BATCH); + } os.write(batch); count -= BATCH; } else {

1 0

[tor/master] cmux: Rename cell_ewma_set_scale_factor()
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 9af5b625e8be64ed63ad5b19ae6c4b450e977ce0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 15 13:51:34 2018 -0500 cmux: Rename cell_ewma_set_scale_factor() It is rename to something more meaningful that explains what it does exactly which is sets the EWMA options (currently only one exists). The new name is cmux_ewma_set_options(). Also, remove a public function from circuitmux_ewma.h that is only used in the C file. Make it static inline as well. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/circuitmux_ewma.c | 18 +++++++++--------- src/or/circuitmux_ewma.h | 6 +++--- src/or/config.c | 2 +- src/or/networkstatus.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index d9ee8d3ef..b2ace8a9f 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -241,6 +241,13 @@ circuitmux_policy_t ewma_policy = { /*** EWMA method implementations using the below EWMA helper functions ***/ +/** Compute and return the current cell_ewma tick. */ +static inline unsigned int +cell_ewma_get_tick(void) +{ + return ((unsigned)approx_time() / EWMA_TICK_LEN); +} + /** * Allocate an ewma_policy_data_t and upcast it to a circuitmux_policy_data_t; * this is called when setting the policy on a circuitmux_t to ewma_policy. @@ -610,13 +617,6 @@ cell_ewma_tick_from_timeval(const struct timeval *now, return res; } -/** Compute and return the current cell_ewma tick. */ -unsigned int -cell_ewma_get_tick(void) -{ - return ((unsigned)approx_time() / EWMA_TICK_LEN); -} - /* Default value for the CircuitPriorityHalflifeMsec consensus parameter in * msec. */ #define CMUX_PRIORITY_HALFLIFE_MSEC_DEFAULT 30000 @@ -672,8 +672,8 @@ get_circuit_priority_halflife(const or_options_t *options, /** Adjust the global cell scale factor based on options */ void -cell_ewma_set_scale_factor(const or_options_t *options, - const networkstatus_t *consensus) +cmux_ewma_set_options(const or_options_t *options, + const networkstatus_t *consensus) { double halflife; const char *source; diff --git a/src/or/circuitmux_ewma.h b/src/or/circuitmux_ewma.h index 4e9e512df..2ef8c2586 100644 --- a/src/or/circuitmux_ewma.h +++ b/src/or/circuitmux_ewma.h @@ -12,12 +12,12 @@ #include "or.h" #include "circuitmux.h" +/* The public EWMA policy callbacks object. */ extern circuitmux_policy_t ewma_policy; /* Externally visible EWMA functions */ -unsigned int cell_ewma_get_tick(void); -void cell_ewma_set_scale_factor(const or_options_t *options, - const networkstatus_t *consensus); +void cmux_ewma_set_options(const or_options_t *options, + const networkstatus_t *consensus); #endif /* !defined(TOR_CIRCUITMUX_EWMA_H) */ diff --git a/src/or/config.c b/src/or/config.c index 0ac777921..107f9ac5f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2073,7 +2073,7 @@ options_act(const or_options_t *old_options) configure_accounting(time(NULL)); /* Change the cell EWMA settings */ - cell_ewma_set_scale_factor(options, networkstatus_get_latest_consensus()); + cmux_ewma_set_options(options, networkstatus_get_latest_consensus()); /* Update the BridgePassword's hashed version as needed. We store this as a * digest so that we can do side-channel-proof comparisons on it. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 80cdc9e5b..3455a7bb6 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2003,7 +2003,7 @@ networkstatus_set_current_consensus(const char *consensus, update_consensus_networkstatus_fetch_time(now); /* Change the cell EWMA settings */ - cell_ewma_set_scale_factor(options, c); + cmux_ewma_set_options(options, c); /* XXXX this call might be unnecessary here: can changing the * current consensus really alter our view of any OR's rate limits? */

1 0