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

[stem/master] Replace SocksListenAddress with SocksPort in tests
by atagar＠torproject.org 10 May '17

10 May '17

commit e35286dd97c49c9741497fae9cc544247a6d3c9f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 10 11:14:26 2017 -0700 Replace SocksListenAddress with SocksPort in tests Tor deprecated its SocksListenAddress option a while ago and has now dropped it, causing some integ tests to fail. Accounting for this. The option's deprecation was noted in the maual and logs but our tests don't present those so didn't spot the upcoming deprecation. Oops. :P --- test/integ/control/controller.py | 6 +++--- test/integ/process.py | 2 +- test/runner.py | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 895d435..2445221 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -435,10 +435,10 @@ class TestController(unittest.TestCase): custom_options = controller._get_custom_options() self.assertTrue('ControlPort' in custom_options or 'ControlSocket' in custom_options) self.assertEqual('1', custom_options['DownloadExtraInfo']) - self.assertEqual('127.0.0.1:1112', custom_options['SocksListenAddress']) + self.assertEqual('1112', custom_options['SocksPort']) self.assertTrue(controller.is_set('DownloadExtraInfo')) - self.assertTrue(controller.is_set('SocksListenAddress')) + self.assertTrue(controller.is_set('SocksPort')) self.assertFalse(controller.is_set('CellStatistics')) self.assertFalse(controller.is_set('ConnLimit')) @@ -1070,7 +1070,7 @@ class TestController(unittest.TestCase): try: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.settimeout(30) - s.connect(('127.0.0.1', int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]))) + s.connect(('127.0.0.1', int(controller.get_conf('SocksPort')))) test.network.negotiate_socks(s, '1.2.1.2', 80) s.sendall(stem.util.str_tools._to_bytes(test.network.ip_request)) # make the http request for the ip address response = s.recv(1000) diff --git a/test/integ/process.py b/test/integ/process.py index b81a3bf..79797ac 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -306,7 +306,7 @@ class TestProcess(unittest.TestCase): t.start() t.join() - if 'Invalid SocksPort/SocksListenAddress' in str(raised_exc[0]): + if 'Invalid SocksPort' in str(raised_exc[0]): return None # got to the point of invoking tor else: return raised_exc[0] diff --git a/test/runner.py b/test/runner.py index a494b65..69af65d 100644 --- a/test/runner.py +++ b/test/runner.py @@ -58,16 +58,15 @@ CONFIG = stem.util.conf.config_dict('test', { 'integ.log': './test/data/log', }) -SOCKS_HOST = '127.0.0.1' SOCKS_PORT = 1112 BASE_TORRC = """# configuration for stem integration tests DataDirectory %%s -SocksListenAddress %s:%i +SocksPort %i DownloadExtraInfo 1 Log notice stdout Log notice file %%s/tor_log -""" % (SOCKS_HOST, SOCKS_PORT) +""" % SOCKS_PORT # singleton Runner instance INTEG_RUNNER = None

1 0

[doctor/master] Further fix to correct stacktrace
by atagar＠torproject.org 10 May '17

10 May '17

commit 46ebb174eee680c63006250971c0d0bf1ba84526 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 10 10:19:06 2017 -0700 Further fix to correct stacktrace I need to be more careful about code I write before my morning coffee. :P --- consensus_health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 1e46b72..ba9c2b1 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -787,7 +787,7 @@ def shared_random_commit_partitioning(latest_consensus, consensuses, votes): for authority, vote in votes.items(): for commitment in vote.directory_authorities[0].shared_randomness_commitments: - if commitment.identity not in self_commitments[commitment.identity]: + if commitment.identity not in self_commitments: pass # we didn't get a vote for this authority so we don't know its self-reported commitment elif commitment.commit != self_commitments[commitment.identity]: issues.append(Issue(Runlevel.WARNING, 'SHARED_RANDOM_COMMITMENT_MISMATCH', authority = authority, their_v3ident = commitment.identity, our_value = commitment.commit, their_value = self_commitments[commitment.identity], to = [authority]))

1 0

[tor/master] Merge remote-tracking branch 'public/my-family-list-fix-4498'
by nickm＠torproject.org 10 May '17

10 May '17

commit d76cffda601eed40d6a81eadb1240d98ee1e70a2 Merge: 8266d19 9fc1346 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 10 11:12:24 2017 -0400 Merge remote-tracking branch 'public/my-family-list-fix-4498' changes/ticket4998 | 5 +++ doc/tor.1.txt | 13 ++++--- src/or/config.c | 102 ++++++++++++++++++++++++++++++------------------- src/or/or.h | 3 +- src/or/router.c | 12 ++---- src/test/test_config.c | 49 ++++++++++++++++-------- 6 files changed, 114 insertions(+), 70 deletions(-) diff --cc src/or/config.c index e1c1cbf,05c6040..09d558e --- a/src/or/config.c +++ b/src/or/config.c @@@ -398,14 -395,14 +398,14 @@@ static config_var_t option_vars_[] = V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), - V(MyFamily, STRING, NULL), + VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), - V(NATDListenAddress, LINELIST, NULL), + OBSOLETE("NATDListenAddress"), VPORT(NATDPort), V(Nickname, STRING, NULL), - V(PredictedPortsRelevanceTime, INTERVAL, "1 hour"), - V(WarnUnsafeSocks, BOOL, "1"), + OBSOLETE("PredictedPortsRelevanceTime"), + OBSOLETE("WarnUnsafeSocks"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), V(NumDirectoryGuards, UINT, "0"),

1 0

[tor/master] Changes file for ticket 4998
by nickm＠torproject.org 10 May '17

10 May '17

commit 9fc1346df2e1402a6895bdf826f8757da7e49608 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 9 08:22:13 2017 -0400 Changes file for ticket 4998 --- changes/ticket4998 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket4998 b/changes/ticket4998 new file mode 100644 index 0000000..01d169d --- /dev/null +++ b/changes/ticket4998 @@ -0,0 +1,5 @@ + o Minor features: + - The MyFamily line may now be repeated as many times as desired, for + relays that want to configure large families. Closes ticket 4998; + patch by Daniel Pinto. +

1 0

[tor/master] #22211 Fix a comment in routerparse.c
by nickm＠torproject.org 10 May '17

10 May '17

commit ee3ccd2facb2cfe863315f671c337eca72e6700c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 10 11:16:07 2017 -0400 #22211 Fix a comment in routerparse.c --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fa79cf7..0f6113c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2585,7 +2585,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, goto err; } } else if (flav == FLAV_MICRODESC) { - offset = -1; /* There is no identity digest */ + offset = -1; /* There is no descriptor digest in an md consensus r line */ } if (vote_rs) {

1 0

[tor/master] MyFamily config string is now a list. #4998
by nickm＠torproject.org 10 May '17

10 May '17

commit fa04fe1674bfc786785c88fb3f49e8b8a8e0b9e5 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Fri Apr 14 13:04:37 2017 +0100 MyFamily config string is now a list. #4998 --- doc/tor.1.txt | 13 +++---- src/or/config.c | 98 +++++++++++++++++++++++++++++++------------------- src/or/or.h | 2 +- src/or/router.c | 12 +++---- src/test/test_config.c | 38 +++++++++++++++----- 5 files changed, 103 insertions(+), 60 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 568d037..9168245 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1813,14 +1813,15 @@ is non-zero): If we have more onionskins queued for processing than we can process in this amount of time, reject new ones. (Default: 1750 msec) -[[MyFamily]] **MyFamily** __node__,__node__,__...__:: +[[MyFamily]] **MyFamily** __node__:: Declare that this Tor server is controlled or administered by a group or organization identical or similar to that of the other servers, defined by - their identity fingerprints. When two servers both declare - that they are in the same \'family', Tor clients will not use them in the - same circuit. (Each server only needs to list the other servers in its - family; it doesn't need to list itself, but it won't hurt.) Do not list - any bridge relay as it would compromise its concealment. + + their identity fingerprints. This option can be repeated many times, for + multiple families. When two servers both declare that they are in the + same \'family', Tor clients will not use them in the same circuit. (Each + server only needs to list the other servers in its family; it doesn't need to + list itself, but it won't hurt.) Do not list any bridge relay as it would + compromise its concealment. + + When listing a node, it's better to list it by fingerprint than by nickname: fingerprints are more reliable. diff --git a/src/or/config.c b/src/or/config.c index 809ff49..46057e5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -395,7 +395,7 @@ static config_var_t option_vars_[] = { V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), - V(MyFamily, STRING, NULL), + V(MyFamily, LINELIST, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), V(NATDListenAddress, LINELIST, NULL), @@ -707,7 +707,8 @@ static int options_transition_affects_workers( const or_options_t *old_options, const or_options_t *new_options); static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); -static int check_nickname_list(char **lst, const char *name, char **msg); +static int normalize_nickname_list(config_line_t **lst, const char *name, + char **msg); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); static int parse_ports(or_options_t *options, int validate_only, @@ -3885,7 +3886,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "You should also make sure you aren't listing this bridge's " "fingerprint in any other MyFamily."); } - if (check_nickname_list(&options->MyFamily, "MyFamily", msg)) + if (normalize_nickname_list(&options->MyFamily, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { routerset_t *rs = routerset_new(); @@ -4593,7 +4594,7 @@ options_transition_affects_descriptor(const or_options_t *old_options, get_effective_bwburst(old_options) != get_effective_bwburst(new_options) || !opt_streq(old_options->ContactInfo, new_options->ContactInfo) || - !opt_streq(old_options->MyFamily, new_options->MyFamily) || + !config_lines_eq(old_options->MyFamily, new_options->MyFamily) || !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || old_options->AccountingMax != new_options->AccountingMax || old_options->AccountingRule != new_options->AccountingRule || @@ -4689,27 +4690,33 @@ get_default_conf_file(int defaults_file) #endif } -/** Verify whether lst is a string containing valid-looking comma-separated - * nicknames, or NULL. Will normalise <b>lst</b> to prefix '$' to any nickname - * or fingerprint that needs it. Return 0 on success. +/** Verify whether lst is a list of strings containing valid-looking + * comma-separated nicknames, or NULL. Will normalise <b>lst</b> to prefix '$' + * to any nickname or fingerprint that needs it. Also splits comma-separated + * list elements into multiple elements. Return 0 on success. * Warn and return -1 on failure. */ static int -check_nickname_list(char **lst, const char *name, char **msg) +normalize_nickname_list(config_line_t **lst, const char *name, char **msg) { - int r = 0; - smartlist_t *sl; - int changes = 0; - if (!*lst) return 0; - sl = smartlist_new(); - smartlist_split_string(sl, *lst, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); + config_line_t *new_nicknames = NULL; + config_line_t *new_nicknames_last = NULL; + config_line_t *cl; + for (cl = *lst; cl; cl = cl->next) { + char *line = cl->value; + if (!line) + continue; - SMARTLIST_FOREACH_BEGIN(sl, char *, s) + int valid_line = 1; + smartlist_t *sl = smartlist_new(); + smartlist_split_string(sl, line, ",", + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); + SMARTLIST_FOREACH_BEGIN(sl, char *, s) { + char *normalized = NULL; if (!is_legal_nickname_or_hexdigest(s)) { // check if first char is dollar if (s[0] != '$') { @@ -4718,36 +4725,53 @@ check_nickname_list(char **lst, const char *name, char **msg) tor_asprintf(&prepended, "$%s", s); if (is_legal_nickname_or_hexdigest(prepended)) { - // The nickname is valid when it's prepended, swap the current - // version with a prepended one - tor_free(s); - SMARTLIST_REPLACE_CURRENT(sl, s, prepended); - changes = 1; - continue; + // The nickname is valid when it's prepended, set it as the + // normalized version + normalized = prepended; + } else { + // Still not valid, free and fallback to error message + tor_free(prepended); } + } - // Still not valid, free and fallback to error message - tor_free(prepended); + if (!normalized) { + tor_asprintf(msg, "Invalid nickname '%s' in %s line", s, name); + valid_line = 0; + break; } + } else { + normalized = tor_strdup(s); + } - tor_asprintf(msg, "Invalid nickname '%s' in %s line", s, name); - r = -1; - break; + config_line_t *next = tor_malloc_zero(sizeof(*next)); + next->key = tor_strdup(cl->key); + next->value = normalized; + next->next = NULL; + + if (!new_nicknames) { + new_nicknames = next; + new_nicknames_last = next; + } else { + new_nicknames_last->next = next; + new_nicknames_last = next; } - } - SMARTLIST_FOREACH_END(s); - // Replace the caller's nickname list with a fixed one - if (changes && r == 0) { - char *newNicknames = smartlist_join_strings(sl, ", ", 0, NULL); - tor_free(*lst); - *lst = newNicknames; + } SMARTLIST_FOREACH_END(s); + + SMARTLIST_FOREACH(sl, char *, s, tor_free(s)); + smartlist_free(sl); + + if (!valid_line) { + config_free_lines(new_nicknames); + return -1; + } } - SMARTLIST_FOREACH(sl, char *, s, tor_free(s)); - smartlist_free(sl); + // Replace the caller's nickname list with the normalized one + config_free_lines(*lst); + *lst = new_nicknames; - return r; + return 0; } /** Learn config file name from command line arguments, or use the default. diff --git a/src/or/or.h b/src/or/or.h index a7b3a66..41b3622 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3951,7 +3951,7 @@ typedef struct { /** If set, use these bridge authorities and not the default one. */ config_line_t *AlternateBridgeAuthority; - char *MyFamily; /**< Declared family for this OR. */ + config_line_t *MyFamily; /**< Declared family for this OR. */ config_line_t *NodeFamilies; /**< List of config lines for * node families */ smartlist_t *NodeFamilySets; /**< List of parsed NodeFamilies values. */ diff --git a/src/or/router.c b/src/or/router.c index 7fb49e8..c02cf53 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2278,14 +2278,12 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) } if (options->MyFamily && ! options->BridgeRelay) { - smartlist_t *family; if (!warned_nonexistent_family) warned_nonexistent_family = smartlist_new(); - family = smartlist_new(); ri->declared_family = smartlist_new(); - smartlist_split_string(family, options->MyFamily, ",", - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); - SMARTLIST_FOREACH_BEGIN(family, char *, name) { + config_line_t *family; + for (family = options->MyFamily; family; family = family->next) { + char *name = family->value; const node_t *member; if (!strcasecmp(name, options->Nickname)) goto skip; /* Don't list ourself, that's redundant */ @@ -2324,13 +2322,11 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) } skip: tor_free(name); - } SMARTLIST_FOREACH_END(name); + } /* remove duplicates from the list */ smartlist_sort_strings(ri->declared_family); smartlist_uniq_strings(ri->declared_family); - - smartlist_free(family); } /* Now generate the extrainfo. */ diff --git a/src/test/test_config.c b/src/test/test_config.c index f0874e0..ccada94 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -854,9 +854,23 @@ static void test_config_fix_my_family(void *arg) { char *err = NULL; - const char *family = "$1111111111111111111111111111111111111111, " - "1111111111111111111111111111111111111112, " - "$1111111111111111111111111111111111111113"; + config_line_t *family = tor_malloc_zero(sizeof(config_line_t)); + family->key = tor_strdup("MyFamily"); + family->value = tor_strdup("$1111111111111111111111111111111111111111, " + "1111111111111111111111111111111111111112, " + "$1111111111111111111111111111111111111113"); + + config_line_t *family2 = tor_malloc_zero(sizeof(config_line_t)); + family2->key = tor_strdup("MyFamily"); + family2->value = tor_strdup("1111111111111111111111111111111111111114"); + + config_line_t *family3 = tor_malloc_zero(sizeof(config_line_t)); + family3->key = tor_strdup("MyFamily"); + family3->value = tor_strdup("$1111111111111111111111111111111111111115"); + + family->next = family2; + family2->next = family3; + family3->next = NULL; or_options_t* options = options_new(); or_options_t* defaults = options_new(); @@ -864,7 +878,7 @@ test_config_fix_my_family(void *arg) options_init(options); options_init(defaults); - options->MyFamily = tor_strdup(family); + options->MyFamily = family; options_validate(NULL, options, defaults, 0, &err) ; @@ -872,10 +886,18 @@ test_config_fix_my_family(void *arg) TT_FAIL(("options_validate failed: %s", err)); } - tt_str_op(options->MyFamily,OP_EQ, - "$1111111111111111111111111111111111111111, " - "$1111111111111111111111111111111111111112, " - "$1111111111111111111111111111111111111113"); + const char *valid[] = { "$1111111111111111111111111111111111111111", + "$1111111111111111111111111111111111111112", + "$1111111111111111111111111111111111111113", + "$1111111111111111111111111111111111111114", + "$1111111111111111111111111111111111111115" }; + int ret_size = 0; + config_line_t *ret; + for (ret = options->MyFamily; ret && ret_size < 5; ret = ret->next) { + tt_str_op(ret->value, OP_EQ, valid[ret_size]); + ret_size++; + } + tt_int_op(ret_size, OP_EQ, 5); done: if (err != NULL) {

1 0

[tor/master] Minor cleanups in test_config.
by nickm＠torproject.org 10 May '17

10 May '17

commit 2f714d60a461950a51481e8963df082bab070cf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 9 08:20:14 2017 -0400 Minor cleanups in test_config. Use a more standard indentation style for the end block; remove redundant if() around tor_free. --- src/test/test_config.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 8dc9fb0..d27f072 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -899,13 +899,10 @@ test_config_fix_my_family(void *arg) } tt_int_op(ret_size, OP_EQ, 5); - done: - if (err != NULL) { - tor_free(err); - } - - or_options_free(options); - or_options_free(defaults); + done: + tor_free(err); + or_options_free(options); + or_options_free(defaults); } static int n_hostname_01010101 = 0;

1 0

[tor/master] Split MyFamily into user-specified version and normalized version
by nickm＠torproject.org 10 May '17

10 May '17

commit b8abedfeeee3e8d15d952578abb102fbcc56ea04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 9 08:18:41 2017 -0400 Split MyFamily into user-specified version and normalized version This change prevents a no-longer-supported behavior where we change options that would later be written back to torrc with a SAVECONF. Also, use the "Pointer to final pointer" trick to build the normalized list, to avoid special-casing the first element. --- src/or/config.c | 42 ++++++++++++++++++++---------------------- src/or/or.h | 3 ++- src/test/test_config.c | 2 +- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 46057e5..05c6040 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -395,7 +395,7 @@ static config_var_t option_vars_[] = { V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), - V(MyFamily, LINELIST, NULL), + VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), V(NATDListenAddress, LINELIST, NULL), @@ -707,8 +707,9 @@ static int options_transition_affects_workers( const or_options_t *old_options, const or_options_t *new_options); static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); -static int normalize_nickname_list(config_line_t **lst, const char *name, - char **msg); +static int normalize_nickname_list(config_line_t **normalized_out, + const config_line_t *lst, const char *name, + char **msg); static char *get_bindaddr_from_transport_listen_line(const char *line, const char *transport); static int parse_ports(or_options_t *options, int validate_only, @@ -916,6 +917,7 @@ or_options_free(or_options_t *options) tor_free(options->BridgePassword_AuthDigest_); tor_free(options->command_arg); tor_free(options->master_key_fname); + config_free_lines(options->MyFamily); config_free(&options_format, options); } @@ -3880,13 +3882,14 @@ options_validate(or_options_t *old_options, or_options_t *options, "have it group-readable."); } - if (options->MyFamily && options->BridgeRelay) { + if (options->MyFamily_lines && options->BridgeRelay) { log_warn(LD_CONFIG, "Listing a family for a bridge relay is not " "supported: it can reveal bridge fingerprints to censors. " "You should also make sure you aren't listing this bridge's " "fingerprint in any other MyFamily."); } - if (normalize_nickname_list(&options->MyFamily, "MyFamily", msg)) + if (normalize_nickname_list(&options->MyFamily, + options->MyFamily_lines, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { routerset_t *rs = routerset_new(); @@ -4697,16 +4700,19 @@ get_default_conf_file(int defaults_file) * Warn and return -1 on failure. */ static int -normalize_nickname_list(config_line_t **lst, const char *name, char **msg) +normalize_nickname_list(config_line_t **normalized_out, + const config_line_t *lst, const char *name, + char **msg) { - if (!*lst) + if (!lst) return 0; config_line_t *new_nicknames = NULL; - config_line_t *new_nicknames_last = NULL; - config_line_t *cl; - for (cl = *lst; cl; cl = cl->next) { - char *line = cl->value; + config_line_t **new_nicknames_next = &new_nicknames; + + const config_line_t *cl; + for (cl = lst; cl; cl = cl->next) { + const char *line = cl->value; if (!line) continue; @@ -4748,14 +4754,8 @@ normalize_nickname_list(config_line_t **lst, const char *name, char **msg) next->value = normalized; next->next = NULL; - if (!new_nicknames) { - new_nicknames = next; - new_nicknames_last = next; - } else { - new_nicknames_last->next = next; - new_nicknames_last = next; - } - + *new_nicknames_next = next; + new_nicknames_next = &next->next; } SMARTLIST_FOREACH_END(s); SMARTLIST_FOREACH(sl, char *, s, tor_free(s)); @@ -4767,9 +4767,7 @@ normalize_nickname_list(config_line_t **lst, const char *name, char **msg) } } - // Replace the caller's nickname list with the normalized one - config_free_lines(*lst); - *lst = new_nicknames; + *normalized_out = new_nicknames; return 0; } diff --git a/src/or/or.h b/src/or/or.h index 41b3622..b54de03 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3951,7 +3951,8 @@ typedef struct { /** If set, use these bridge authorities and not the default one. */ config_line_t *AlternateBridgeAuthority; - config_line_t *MyFamily; /**< Declared family for this OR. */ + config_line_t *MyFamily_lines; /**< Declared family for this OR. */ + config_line_t *MyFamily; /**< Declared family for this OR, normalized */ config_line_t *NodeFamilies; /**< List of config lines for * node families */ smartlist_t *NodeFamilySets; /**< List of parsed NodeFamilies values. */ diff --git a/src/test/test_config.c b/src/test/test_config.c index ccada94..8dc9fb0 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -878,7 +878,7 @@ test_config_fix_my_family(void *arg) options_init(options); options_init(defaults); - options->MyFamily = family; + options->MyFamily_lines = family; options_validate(NULL, options, defaults, 0, &err) ;

1 0

[tor/master] Restore wget behavior when fetching compressed objects
by nickm＠torproject.org 10 May '17

10 May '17

commit 8266d193a608445b0d8675a83733870a2733e2b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 10 11:09:52 2017 -0400 Restore wget behavior when fetching compressed objects We do this by treating the presence of .z as meaning ZLIB_METHOD, even if Accept-Encoding does not include deflate. This fixes bug 22206; bug not in any released tor. --- src/or/directory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 67c28e1..c1db40e 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3516,8 +3516,9 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, tor_free(header); } else { compression_methods_supported = (1u << NO_METHOD); - if (zlib_compressed_in_url) - compression_methods_supported |= (1u << ZLIB_METHOD); + } + if (zlib_compressed_in_url) { + compression_methods_supported |= (1u << ZLIB_METHOD); } /* Remove all methods that we don't both support. */

1 0

[tor/master] Fix compilation on libevent2-only systems
by nickm＠torproject.org 10 May '17

10 May '17

commit 5dab99d6a81480278044dfbc1e51e7b7c3cc19e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 10 11:08:23 2017 -0400 Fix compilation on libevent2-only systems Patch from rubiate; fixes bug 22219. Remember, we don't support libevent1 any more. --- src/or/channelpadding.c | 2 +- src/test/test_channelpadding.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 4121651..f5248e8 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -20,7 +20,7 @@ #include "rephist.h" #include "router.h" #include "compat_time.h" -#include <event.h> +#include <event2/event.h> STATIC int channelpadding_get_netflow_inactive_timeout_ms(const channel_t *); STATIC int channelpadding_send_disable_command(channel_t *); diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index ba97694..ae6abe4 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -11,7 +11,7 @@ #include "channelpadding.h" #include "compat_libevent.h" #include "config.h" -#include <event.h> +#include <event2/event.h> #include "compat_time.h" #include "main.h" #include "networkstatus.h"

1 0