George Kadianakis
fede64822d
Merge branch 'tor-github/pr/1128'
2019-06-26 10:53:34 +03:00
George Kadianakis
b2ef076e1a
Merge branch 'maint-0.4.1'
2019-06-26 10:51:50 +03:00
George Kadianakis
00acccac64
Merge branch 'tor-github/pr/1114' into maint-0.4.1
2019-06-26 10:51:12 +03:00
Nick Mathewson
e8790971f6
changes file for ticket 30914
2019-06-25 12:51:25 -04:00
Nick Mathewson
f3330d2be3
Make "invisibility" and "undumpability" properties of variables.
...
Previously, these were magical things that we detected by checking
whether a variable's name was prefixed with two or three underscores.
2019-06-25 12:51:25 -04:00
Nick Mathewson
c390efe84f
A few more test cases and unreachable lines
2019-06-25 12:51:25 -04:00
Nick Mathewson
a7835202cf
Turn several properties of types or variables into flags.
...
"unsettable" is a property of types. LINELIST_V and OBSOLETE are
unsettable, meaning that they cannot be set by name.
"contained" is a property of types. I'm hoping to find a better
name here. LINELIST_S is "contained" because it always appears
within a LINELIST_V, and as such doesn't need to be dumped ore
copied independently.
"cumulative" is a property of types. Cumulative types can appear
more than once in a torrc without causing a warning, because they
add to each other rather than replacing each other.
"obsolete" is a property of variables.
"marking fragile" is now a command that struct members can accept.
With these changes, confparse and config no longer ever need to
mention CONFIG_TYPE_XYZ values by name.
2019-06-25 12:51:25 -04:00
Nick Mathewson
a114df9a04
Add a function to make sure all values in a config object are ok
2019-06-25 12:51:25 -04:00
Nick Mathewson
b6457d4c08
Extend macros to allow flag arguments.
2019-06-25 12:51:25 -04:00
Nick Mathewson
a91ed23403
Use structvar to find the types for config vars.
2019-06-25 12:51:25 -04:00
Nick Mathewson
5b252d31ed
Add a "flags" member to config_var_t
...
Additionally, adjust the macros so that we can add new members like
this more easily.
2019-06-25 12:51:25 -04:00
Nick Mathewson
53e969c137
Use struct_var_{copy,eq} in confparse.c.
2019-06-25 12:51:25 -04:00
Nick Mathewson
c553750e32
Move responsibility for config var macros
...
The testing-only parts now live in a conftesting.h; the shared parts
of the macros live in confmacros.h
2019-06-25 12:51:25 -04:00
Nick Mathewson
59317c8a23
Use struct_magic_decl to verify magic numbers in config objects
2019-06-25 12:51:25 -04:00
Nick Mathewson
4d101b39d7
Move config_var_t info conftypes.h
2019-06-25 12:51:25 -04:00
Nick Mathewson
3a4d67cf45
Port confparse to use struct_var in place of typed_var.
...
This requires changes to config_var_t, causing corresponding changes
throughout its users.
2019-06-25 12:51:25 -04:00
Nick Mathewson
2da188667d
Add new "struct_var_" functions to manipulate struct fields.
...
These functions exist one level higher than typed_var_t. They
describe a type, a name, and an offset within a structure.
2019-06-25 12:51:25 -04:00
Taylor Yu
5612eccef8
Changes file for ticket 30889
2019-06-25 11:42:41 -05:00
Taylor Yu
5faf54970d
Fix some onion helpers
...
Fix add_onion_helper_clientauth() and add_onion_helper_keyarg() to
explicitly call the appropriate control reply abstractions instead of
allocating a string to pass to their callers.
Part of ticket 30889.
2019-06-25 11:42:34 -05:00
Taylor Yu
e5e6953be7
Make control_write_reply() mockable
...
Part of ticket 30889.
2019-06-25 11:40:44 -05:00
Taylor Yu
0dd59fdb56
Clean up some uses of low-level control replies
...
Part of ticket 30889.
2019-06-25 11:39:59 -05:00
Nick Mathewson
3644f4ab5f
Remove changes files that appeared in 0.4.1.3-alpha or earlier.
2019-06-25 11:57:08 -04:00
Nick Mathewson
3a9b41895f
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-06-25 11:56:22 -04:00
Nick Mathewson
fe41504309
forward-port the 0.4.1.3-alpha changelog
2019-06-25 11:56:08 -04:00
Nick Mathewson
e4f66bf7ff
bump to 0.4.1.3-alpha-dev
2019-06-25 11:55:53 -04:00
teor
c131b0763e
stats: add comments about the required chunk structure in extra info files
...
These comments should prevent future instances of 30958.
And allow a larger file in practracker.
Follow up after 30958.
2019-06-25 12:30:59 +10:00
teor
2663bca392
Merge branch 'bug30958_041' into bug30958_master
2019-06-25 12:29:28 +10:00
Nick Mathewson
e16b90b88a
Partially port routerset to being a full-fledged config type again.
2019-06-24 17:52:00 -04:00
Nick Mathewson
705bda859e
Add unit tests for the unitparse.c module.
2019-06-24 17:50:43 -04:00
Nick Mathewson
f007437292
Further clarify our clarification about the type of POSINT
2019-06-24 17:50:43 -04:00
Nick Mathewson
c60a85d22a
Add a "typed_var" abstraction to implement lvalue access in C.
...
Right now, this has been done at a high level by confparse.c, but it
makes more sense to lower it.
This API is radically un-typesafe as it stands; we'll be wrapping it
in a safer API as we do #30914 and lower the struct manipulation
code as well.
Closes ticket 30864.
2019-06-24 17:50:43 -04:00
Nick Mathewson
5a2ab886ba
Add a function to append an existing line to a config line list.
...
We had an existing function to do this, but it took a pair of
strings rather than a line.
2019-06-24 15:11:57 -04:00
Nick Mathewson
458da8a80d
Move unit-parsing code to src/lib/confmgt
...
lib/confmgt is at a higher level than lib/conf, since it needs to
call down to logging and similar modules.
2019-06-24 15:11:57 -04:00
Nick Mathewson
246599abb4
Start moving types that will be used for config vars to lib/conf
...
This will be a lower-level module than anything that actually
sets or handles configuration variables.
Part of 30864.
2019-06-24 15:11:57 -04:00
Nick Mathewson
81d16d8d0c
checkSpace.pl: Allow 'bool' before a space and an open-paren
...
We need this so we can declare function pointers returning bool
without upsetting our style checker. :/
2019-06-24 15:11:57 -04:00
Nick Mathewson
4bac6b6e7d
Remove the unused "exitcode" variable from test_rebind.sh
...
Fixes a shellcheck issue; closes ticket 30964. No user-visible
change.
2019-06-24 13:49:19 -04:00
Nick Mathewson
a87700633c
Don't try to shellcheck src/rust/registry
...
Fixes bug 30963; bug not in any released Tor.
2019-06-24 13:45:05 -04:00
Nick Mathewson
aec359ef62
Merge branch 'maint-0.4.1'
2019-06-24 13:36:42 -04:00
Nick Mathewson
bd66a40845
Merge remote-tracking branch 'tor-github/pr/1131'
2019-06-24 13:36:36 -04:00
Nick Mathewson
8803930de8
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
2019-06-24 13:36:10 -04:00
Nick Mathewson
3b6bd768d3
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-06-24 09:32:54 -04:00
Nick Mathewson
aab5f42ae0
bump to 0.4.1.3-alpha
2019-06-24 09:32:46 -04:00
teor
d9f49e9bc1
Merge branch 'bug30958_040' into bug30958_041
2019-06-24 21:31:27 +10:00
teor
e350dfc085
Merge branch 'bug30958_035' into bug30958_040
2019-06-24 21:31:10 +10:00
teor
b7dda83cfa
Merge branch 'bug30958_029' into bug30958_035
2019-06-24 21:30:47 +10:00
teor
5beb32d3d9
stats: Stop removing the ed25519 signature if the extra info file is too big
...
If the signature data was removed, but the keyword was kept, this could
result in an unparseable extra info file.
Fixes bug 30958; bugfix on 0.2.7.2-alpha.
2019-06-24 21:30:03 +10:00
teor
45be44ed9c
stats: Split extrainfo_dump_to_string() into smaller functions.
...
Closes ticket 30956.
2019-06-24 20:47:44 +10:00
teor
872b85e689
Merge branch 'bug30956_041' into bug30956_master
2019-06-24 19:47:34 +10:00
teor
8356cc5b51
stats: Always publish pluggable transports in extra info documents
...
Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.
Fixes bug 30956; bugfix on 0.4.1.1-alpha.
2019-06-24 19:44:24 +10:00
rl1987
84f0f15066
Improve comment in .travis.yml
2019-06-23 14:12:05 +03:00