]>
git.ipfire.org Git - thirdparty/tor.git/log
Nick Mathewson [Fri, 25 Oct 2019 00:16:44 +0000 (20:16 -0400)]
tests: set DataDirectory_option as well as DataDirectory.
options_validate_cb() derives DataDirectory (which we use) from
DataDirectory_option (which the user sets). I want to add a test
that will call options_validate_cb(), but it will fail unless it
derives the same value.
Nick Mathewson [Fri, 25 Oct 2019 00:16:10 +0000 (20:16 -0400)]
config: make options_act*() mockable.
I'll need this for testing options_trial_assign().
Nick Mathewson [Thu, 24 Oct 2019 21:35:15 +0000 (17:35 -0400)]
Extend confmgr tests to handle validation callbacks.
Nick Mathewson [Thu, 24 Oct 2019 13:16:50 +0000 (09:16 -0400)]
config.c: Turn options_transition_allowed() into a proper callback
Nick Mathewson [Thu, 24 Oct 2019 13:08:17 +0000 (09:08 -0400)]
config.c: extract validate, check-transition, and set into a function
This eliminates duplicated code. The options_validate() function
itself is now tests-only.
Nick Mathewson [Wed, 23 Oct 2019 20:00:25 +0000 (16:00 -0400)]
Write a new set of config validation callbacks.
Unlike legacy_validate_fn_t, these callbacks have separation of
duties, into:
* early normalization and computation.
* validation
* transition checking
* late normalization and computation
Only the first and last steps get mutable objects. Only the
transition-checking step gets to see the previous values of this
object.
Nick Mathewson [Wed, 23 Oct 2019 19:38:15 +0000 (15:38 -0400)]
Make foo_validate() functions call config_validate().
The former foo_validate() functions are now toplevel
legacy_validate_fn callbacks. The new foo_validate() functions now
call them.
This change lets us remove the old shared_random disk state
validation callback entirely.
Nick Mathewson [Wed, 23 Oct 2019 19:12:19 +0000 (15:12 -0400)]
Add a config_validate() function to invoke verify callbacks.
As we turn our monolithic configuration objects into suites of
smaller module-specific configuration objects, we will want each one
to be able to provide its own verification callbacks. That means
that instead of invoking these verification callbacks directly, we will
want to call them via the configuration manager object.
Nick Mathewson [Wed, 23 Oct 2019 18:39:20 +0000 (14:39 -0400)]
Rename validate_fn{,_t} to start with "legacy_".
The current API of this callback mixes responsibilities, including:
* validation
* transition checking
* processing (modifying) the configuration object.
These will have to be disentangled piece by piece, so for now, we'll
have "legacy" validate functions as well.
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
validate_fn_t legacy_validate_fn_t \
validate_fn legacy_validate_fn
Nick Mathewson [Wed, 23 Oct 2019 22:03:24 +0000 (18:03 -0400)]
test_options: stop generating old_data entirely.
Now that we no longer use it anywhere, we can remove this variable
from the test data structure.
Nick Mathewson [Wed, 23 Oct 2019 21:52:48 +0000 (17:52 -0400)]
test_options: don't pass an old_options argument to options_validate()
This input was inessential, and none of the tests actually depended
on it or tested anything about it (as can be seen from the fact that
tests all still pass when it's removed).
I tried to generate this commit with a coccinelle script, but it had
trouble parsing a lot of options_validate as it stands. Instead, I
did a search-and-replace to replace "tdata->old_opt," with "NULL,".
Nick Mathewson [Thu, 25 Jul 2019 13:43:50 +0000 (09:43 -0400)]
Use named-member syntax for initializing config_format_t objects
I'm about to mess with their lists of callbacks, and I don't want to
proliferate lists where we say "NULL, NULL, NULL, ..."
Nick Mathewson [Thu, 24 Oct 2019 19:55:38 +0000 (15:55 -0400)]
Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
Nick Mathewson [Thu, 24 Oct 2019 19:55:22 +0000 (15:55 -0400)]
bump to 0.4.2.3-alpha-dev
Nick Mathewson [Thu, 24 Oct 2019 19:52:55 +0000 (15:52 -0400)]
Forward-port the changelog for 0.4.2.3-alpha
Nick Mathewson [Thu, 24 Oct 2019 15:45:07 +0000 (11:45 -0400)]
A little more text in the SEE ALSO section.
Nick Mathewson [Thu, 24 Oct 2019 15:44:19 +0000 (11:44 -0400)]
Merge remote-tracking branch 'tor-github/pr/1437'
David Goulet [Thu, 24 Oct 2019 13:08:36 +0000 (09:08 -0400)]
configure: Add --disable-module-relay to summary
Closes #32266
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Thu, 24 Oct 2019 00:26:15 +0000 (20:26 -0400)]
Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
Nick Mathewson [Thu, 24 Oct 2019 00:25:34 +0000 (20:25 -0400)]
Bump to 0.4.2.3-alpha
teor [Thu, 24 Oct 2019 00:00:47 +0000 (10:00 +1000)]
Merge remote-tracking branch 'tor-github/pr/1447'
David Goulet [Wed, 23 Oct 2019 13:11:43 +0000 (09:11 -0400)]
Merge branch 'tor-github/pr/1451'
teor [Wed, 23 Oct 2019 12:59:16 +0000 (22:59 +1000)]
Merge remote-tracking branch 'tor-github/pr/1449'
teor [Wed, 23 Oct 2019 03:36:39 +0000 (13:36 +1000)]
changes: file for 32216
teor [Wed, 23 Oct 2019 03:28:37 +0000 (13:28 +1000)]
scripts/git: Avoid sleeping before the last push in git-push-all.sh
Change the loop order, so that we only sleep between pushes,
and avoid sleeping after all the pushes are done.
(In rare cases, there may still be an extra sleep.)
Part of 32216.
teor [Wed, 23 Oct 2019 03:26:07 +0000 (13:26 +1000)]
scripts/git: Make git-push-all.sh skip more branches that match upstream
The script now skips master, maint-* and release-* branches that match
upstream, not just test branches.
And fix "no branches" bugs that this change makes happen more often.
Part of 32216.
teor [Wed, 23 Oct 2019 02:58:15 +0000 (12:58 +1000)]
scripts/git: Pass all unrecognised arguments to git-push-all.sh
This makes the behaviour of git-push-all.sh -n identical to the other
git scripts.
Part of 32216.
teor [Wed, 23 Oct 2019 03:00:35 +0000 (13:00 +1000)]
scripts/git: Fix a variable name typo in git-push-all.sh
Obviously correct changes to already reviewed code.
teor [Wed, 23 Oct 2019 02:26:32 +0000 (12:26 +1000)]
changes: file for 29603
We merged this change without a changes file.
teor [Wed, 23 Oct 2019 00:00:49 +0000 (10:00 +1000)]
Merge branch 'maint-0.4.2'
teor [Tue, 22 Oct 2019 23:59:07 +0000 (09:59 +1000)]
Merge branch 'maint-0.4.1' into maint-0.4.2
`git merge --strategy ours` to use STATIC for unit tests in
maint-0.4.2.
teor [Tue, 22 Oct 2019 23:58:22 +0000 (09:58 +1000)]
Merge branch 'pr1450_squashed' into maint-0.4.1
Nick Mathewson [Thu, 29 Aug 2019 15:43:43 +0000 (11:43 -0400)]
Authorities reject relays running unsupported Tor release series.
Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1,
0.3.2, 0.3.3, and 0.3.4 are now rejected.
Also, extract this version-checking code into a new function, so we
can test it.
Closes ticket 31549.
Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.
teor [Tue, 22 Oct 2019 22:47:30 +0000 (08:47 +1000)]
Merge branch 'maint-0.4.2'
teor [Tue, 22 Oct 2019 22:47:23 +0000 (08:47 +1000)]
Merge branch 'maint-0.4.1' into maint-0.4.2
teor [Tue, 22 Oct 2019 22:47:15 +0000 (08:47 +1000)]
Merge branch 'maint-0.4.0' into maint-0.4.1
teor [Tue, 22 Oct 2019 22:47:08 +0000 (08:47 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 22 Oct 2019 22:47:01 +0000 (08:47 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.5
teor [Tue, 22 Oct 2019 22:35:17 +0000 (08:35 +1000)]
Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
teor [Tue, 22 Oct 2019 22:32:52 +0000 (08:32 +1000)]
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
teor [Tue, 22 Oct 2019 22:32:22 +0000 (08:32 +1000)]
Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9
teor [Tue, 22 Oct 2019 22:30:48 +0000 (08:30 +1000)]
Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
teor [Tue, 22 Oct 2019 22:28:03 +0000 (08:28 +1000)]
Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
teor [Tue, 22 Oct 2019 22:24:30 +0000 (08:24 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.5
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
teor [Tue, 22 Oct 2019 22:20:45 +0000 (08:20 +1000)]
Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
Philipp Winter [Thu, 19 Sep 2019 19:42:44 +0000 (12:42 -0700)]
Remove outdated note.
BridgeDB supports bridge-distribution lines since version 0.5.0:
<https://bugs.torproject.org/23957>
Roger Dingledine [Wed, 16 Oct 2019 10:13:14 +0000 (06:13 -0400)]
clarify in man page: we count by powers of two
Make clear in the man page, in both the bandwidth section and the
accountingmax section, that Tor counts in powers of two, not
powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion
bytes.
Resolves ticket 32106.
teor [Tue, 22 Oct 2019 21:37:39 +0000 (07:37 +1000)]
Tidy whitespace around some STMT_BEGINs and STMT_ENDs
Nick Mathewson [Tue, 22 Oct 2019 18:47:28 +0000 (14:47 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 18:46:10 +0000 (14:46 -0400)]
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 18:21:17 +0000 (14:21 -0400)]
Changes file for options_validate() API changes in #32187.
Nick Mathewson [Tue, 22 Oct 2019 18:16:23 +0000 (14:16 -0400)]
config validation: make the "old_options" argument const.
We can't do this with the "options" argument yet, since several
places in the code change those right now.
Nick Mathewson [Tue, 22 Oct 2019 18:09:02 +0000 (14:09 -0400)]
test_options: remove def_opt member of test data.
Nick Mathewson [Tue, 22 Oct 2019 18:07:32 +0000 (14:07 -0400)]
test_options: remove "dflt" part of setup_options().
It is no longer used anywhere.
Nick Mathewson [Tue, 22 Oct 2019 18:06:02 +0000 (14:06 -0400)]
Remove a pair of now-unused default-options arguments.
Nick Mathewson [Tue, 22 Oct 2019 18:05:29 +0000 (14:05 -0400)]
test_options: Fix options_validate() calls in macros.
Coccinelle missed these.
Nick Mathewson [Tue, 22 Oct 2019 18:01:42 +0000 (14:01 -0400)]
Use coccinelle to fix most options_validate() call sites.
There was one that it could not find because it was in a macro definition.
I used the following semantic patch:
@@
expression e1, e2, e3, e4, e5;
@@
options_validate(e1,
e2,
- e3,
- e4,
e5)
Nick Mathewson [Tue, 22 Oct 2019 17:56:07 +0000 (13:56 -0400)]
Remove unused arguments from options_validate().
This change breaks compilation; a subsequent commit will fix it with
a coccinelle patch.
Nick Mathewson [Tue, 22 Oct 2019 17:52:40 +0000 (13:52 -0400)]
validate_fn(): remove now-unused defaults and from_setconf.
These arguments were only used by options_validate, and are now
ignored even there.
Nick Mathewson [Tue, 22 Oct 2019 17:01:25 +0000 (13:01 -0400)]
Remove changes files that are already merged in 0.4.2.
Nick Mathewson [Tue, 22 Oct 2019 16:54:44 +0000 (12:54 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:54:43 +0000 (12:54 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:54:37 +0000 (12:54 -0400)]
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:53:12 +0000 (12:53 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:53:12 +0000 (12:53 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:53:06 +0000 (12:53 -0400)]
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:52:32 +0000 (12:52 -0400)]
Merge remote-tracking branch 'tor-github/pr/1446'
Nick Mathewson [Tue, 22 Oct 2019 16:51:33 +0000 (12:51 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:51:33 +0000 (12:51 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:51:27 +0000 (12:51 -0400)]
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:15:14 +0000 (12:15 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:15:14 +0000 (12:15 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:15:06 +0000 (12:15 -0400)]
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:13:56 +0000 (12:13 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:13:55 +0000 (12:13 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:13:47 +0000 (12:13 -0400)]
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:11:59 +0000 (12:11 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:11:59 +0000 (12:11 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:11:50 +0000 (12:11 -0400)]
Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:10:30 +0000 (12:10 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Tue, 22 Oct 2019 16:10:30 +0000 (12:10 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:10:30 +0000 (12:10 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:10:30 +0000 (12:10 -0400)]
Merge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 16:10:08 +0000 (12:10 -0400)]
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
Nick Mathewson [Tue, 22 Oct 2019 16:08:53 +0000 (12:08 -0400)]
Merge branch 'maint-0.4.2'
Nick Mathewson [Tue, 22 Oct 2019 16:08:53 +0000 (12:08 -0400)]
Merge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 22 Oct 2019 16:08:46 +0000 (12:08 -0400)]
Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1
Nick Mathewson [Tue, 22 Oct 2019 13:40:31 +0000 (09:40 -0400)]
Re-run make autostyle.
Nick Mathewson [Tue, 22 Oct 2019 13:39:06 +0000 (09:39 -0400)]
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
Nick Mathewson [Wed, 9 Oct 2019 17:24:16 +0000 (13:24 -0400)]
test_addr.c: use COCCI to suppress macros coccinelle cannot parse.
Nick Mathewson [Wed, 9 Oct 2019 17:22:34 +0000 (13:22 -0400)]
test.h: Use COCCI to suppress macros Coccinelle does not understand.
Nick Mathewson [Wed, 9 Oct 2019 17:13:54 +0000 (13:13 -0400)]
threads.h: coccinelle cannot understand a macro.
Nick Mathewson [Wed, 9 Oct 2019 17:12:28 +0000 (13:12 -0400)]
ctassert.h: fix CTASSERT_DECL so coccinelle can parse it.
Nick Mathewson [Wed, 9 Oct 2019 17:09:44 +0000 (13:09 -0400)]
ratelim.h: use COCCI to hide an initializer.
Nick Mathewson [Wed, 9 Oct 2019 17:07:15 +0000 (13:07 -0400)]
util_bug.h: Coccinelle does not understand IF_BUG_ONCE or #nodef.
Nick Mathewson [Wed, 9 Oct 2019 16:59:22 +0000 (12:59 -0400)]
weakrng.h: use COCCI to hide a macro coccinelle cannot parse.
Nick Mathewson [Wed, 9 Oct 2019 16:57:37 +0000 (12:57 -0400)]
Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
Nick Mathewson [Wed, 9 Oct 2019 16:55:37 +0000 (12:55 -0400)]
smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle
Nick Mathewson [Wed, 9 Oct 2019 16:54:23 +0000 (12:54 -0400)]
namemap_st.h: Use COCCI to hide an initializer.
Nick Mathewson [Wed, 9 Oct 2019 16:51:56 +0000 (12:51 -0400)]
timeval.h: Coccinelle cannot understand timercmp.