Nick Mathewson
2d27a3ecc0
Run "make autostyle"; add an endif comment
2020-01-08 18:38:24 -05:00
teor
a58cffe195
router: Improve port search function comments
2020-01-08 17:47:08 +10:00
Roger Dingledine
81fd8aad24
speaking of utf-8, remove strange char from comment
2020-01-07 18:25:17 -05:00
Nick Mathewson
e231cd5b61
Merge branch 'ticket32845_squashed'
2020-01-07 10:16:15 -05:00
teor
0e3fd4df99
string: Check UTF-8 string pointer and length
...
If they are inconsistent, output a raw bug log.
Part of 32845.
2020-01-07 10:16:08 -05:00
Nick Mathewson
17a1ae025a
Merge remote-tracking branch 'tor-github/pr/1640'
2020-01-07 08:59:31 -05:00
Nick Mathewson
c48068ece3
test_helpers: add a missing free for CID 1457527.
2020-01-07 08:22:02 -05:00
Nick Mathewson
f2aeaaf71d
Add new state to connection_proxy_state_to_string()
...
Also, add a CTASSERT() to make sure that we don't let this array get
out-of-sync again.
Found by coverity; this is CID 1457528.
2020-01-07 08:09:27 -05:00
teor
d62dbb6762
string: Add extra UTF-8 test cases
...
These test cases are validated differently by some
programming languages, because those languages have
incorrect UTF-8 implementations.
We want to make sure that tor validates them correctly.
Closes ticket 32845.
2020-01-07 17:05:48 +10:00
Neel Chauhan
ee015d36f8
Space the a-d unsigned ints in tor_inet_aton()
2020-01-06 20:20:38 -08:00
Nick Mathewson
1b63eea66c
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
2020-01-06 13:41:20 -05:00
Suphanat Chunhapanya
4264717ca3
test: HTTP CONNECT protocol
2020-01-06 13:39:10 -05:00
Suphanat Chunhapanya
de58a49a2d
test: HAPRoxy protocol
2020-01-06 13:39:10 -05:00
Suphanat Chunhapanya
41b9dca07b
test: Implement haproxy
2020-01-06 13:39:10 -05:00
Suphanat Chunhapanya
119004e87d
circuit: Implement haproxy
2020-01-06 13:39:10 -05:00
Nick Mathewson
1f498220bd
Merge remote-tracking branch 'tor-github/pr/1620'
2020-01-06 13:28:10 -05:00
Nick Mathewson
48f7341783
Merge branch 'maint-0.4.2'
2020-01-06 13:24:01 -05:00
Nick Mathewson
6da989cfe8
Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
2020-01-06 13:20:57 -05:00
Nick Mathewson
4f6901d7cc
When initializing pthreads, always set the main thread.
...
Fixes bug 32884. This is a bugfix on 0.3.3.1-alpha, when we started
allowing restart-in-process with tor_api.h.
2020-01-06 09:37:12 -05:00
Nick Mathewson
b6f099672b
Make ntmain.h functions stubs when NT_SERVICE not enabled.
...
This lets us simplify main.c a little, and avoid a practracker
exception.
Followup from #32883 .
2020-01-06 09:25:23 -05:00
Nick Mathewson
5c240db0bf
Restore feature where nt-services detect non-"run_tor" modes.
...
Followup for #32883 .
2020-01-06 09:25:23 -05:00
Nick Mathewson
13216f848a
Merge branch 'maint-0.4.2'
2020-01-06 08:08:59 -05:00
Nick Mathewson
16e94dc7a7
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-06 08:06:54 -05:00
Peter Gerber
b9d81282e0
Fix sandbox crash during reload of logging configuration
...
Allow calls to dup() which was introduced in commit a22fbab986
.
From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
2020-01-05 15:24:45 +00:00
Neel Chauhan
b062e0f0a4
Fix spacing in tor_sscanf() call in tor_inet_aton()
2019-12-20 14:11:03 -05:00
Neel Chauhan
01c6fde326
Fix spacing in tor_inet_aton() function header
2019-12-20 14:10:43 -05:00
Nick Mathewson
5c6fc5250e
test_util: remove UTIL_LEGACY_NO_WIN.
...
It was only used in one place.
2019-12-20 09:57:52 -05:00
Hans-Christoph Steiner
a96317a79d
Android: skip tests that check UNIX user account setup
...
* there is no ~ or HOME in Android
* UIDs and GIDs in Android represent apps, not users, and Android apps
cannot ever change UIDs
This should be replaced by whatever @nmathewson wants to name this stuff:
https://github.com/torproject/tor/pull/1436
2019-12-20 09:53:16 -05:00
Nick Mathewson
33a0f15b21
Merge branch 'bug29819_035'
2019-12-20 07:37:47 -05:00
teor
8c23ac4ae7
Replace several C identifiers.
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
EXPOSE_CLEAN_BACKTRACE BACKTRACE_PRIVATE \
TOR_CHANNEL_INTERNAL_ CHANNEL_OBJECT_PRIVATE \
CHANNEL_PRIVATE_ CHANNEL_FILE_PRIVATE \
EXPOSE_ROUTERDESC_TOKEN_TABLE ROUTERDESC_TOKEN_TABLE_PRIVATE \
SCHEDULER_PRIVATE_ SCHEDULER_PRIVATE
2019-12-20 13:27:58 +10:00
teor
cd160291a7
Code Style: Delete headers that are included twice
...
These changes were created using the "make autostyle" from
32522, and then split into commits.
2019-12-20 09:53:31 +10:00
teor
d8b868e483
Code Style: Delete PRIVATE defines that are never used
...
Some ".c" files define *_PRIVATE macros, but those macros are
not used in any header file. Delete them.
These changes were created using the "make autostyle" from
32522, and then split into commits.
2019-12-20 09:50:50 +10:00
teor
57b6678d52
Run "make autostyle"
2019-12-20 09:45:53 +10:00
Nick Mathewson
1bdbb4e9eb
Change conf_examples test for ConsensusParams option.
2019-12-19 12:09:03 -05:00
Nick Mathewson
42e31b5c45
Mark TestingEstimatedDescriptorPropagationTime as obsolete.
...
We stopped looking at this option in 85cf6dcba3
, back when we
implemented the minimal pieces of prop275. Since then, we've had
code to validate and adjust this option, and to give it a different
value in testing networks, but the option hasn't actually done
anything.
We can safely mark it as OBSOLETE, since doing so does not make any
old configuration get rejected.
Closes ticket 32807.
2019-12-19 11:04:48 -05:00
Nick Mathewson
3210598c30
Move TestingDirVote{Exit,Guard,HSdir}{,IsStrict} to dirauth module
2019-12-19 10:42:44 -05:00
Nick Mathewson
87f7c2d018
Correct the type for config_decl_ROUTERSET
...
This needs to be a point so that the CONF_VAR() macro can work
correctly.
2019-12-19 10:42:10 -05:00
Nick Mathewson
3739503404
Move TestingMin{Exit,Fast}FlagThreshold to dirauth module.
2019-12-19 10:14:09 -05:00
Nick Mathewson
cde5abfdc6
Move TestingDirAuthTimeToLearnReachability into dirauth module.
2019-12-19 10:08:22 -05:00
Nick Mathewson
be9bc5981f
Move MinMeasuredBWsForAuthToIgnoreAdvertised to dirauth module.
2019-12-19 09:51:11 -05:00
Nick Mathewson
0c7fd83123
Move ConsensusParams to dirauth module.
2019-12-19 09:46:14 -05:00
Nick Mathewson
77dea66e19
Move MinUptimeHidServDirectoryV2 to dirauth module.
2019-12-19 09:43:25 -05:00
Nick Mathewson
b1d029b9a1
Move AuthDirTestEd25519LinkKeys to the dirauth module.
2019-12-19 09:38:25 -05:00
Nick Mathewson
f4f70e1f13
Move AuthDirSharedRandomness to dirauth module.
2019-12-19 09:34:27 -05:00
Nick Mathewson
99874ecc1d
Move AuthDirPinKeys to dirauth module.
2019-12-19 09:34:18 -05:00
Nick Mathewson
9386b0b28a
Move AuthDirListBadExits to dirauth module.
2019-12-19 09:24:57 -05:00
Nick Mathewson
eedab30a7b
Move AuthDirHasIPv6Connectivity into dirauth module.
2019-12-19 09:19:02 -05:00
Nick Mathewson
bc0f1076d5
Move get_foo_options() test helpers into a new test module.
...
Some of these helpers will be needed in multiple places in the unit
tests, so we should move them now.
2019-12-19 09:19:02 -05:00
Nick Mathewson
7d5e360c3b
Move BW-guarantee options in to dirauth module.
2019-12-19 08:57:47 -05:00
Nick Mathewson
ea91edff15
Dirauth options: move versioning options to dirauth module
...
This commit moves VersioningAuthoritativeDirectory,
RecommendedClientVersions, and RecommendedServerVersions.
2019-12-19 08:57:47 -05:00