Nick Mathewson
6a6486a7bf
hs_circuit: use struct declaration.
...
This frees us from a dependency on include order.
2020-01-09 07:30:35 -05:00
Nick Mathewson
d7b8377c28
or_options_st.h: Add an include and a struct declaration.
...
This frees us from some dependencies on include order.
2020-01-09 07:30:35 -05:00
Nick Mathewson
8bb686d8a0
Include x509.h in tortls_internal.h.
...
This gives us the definition of tor_x509_cert_impl_t, and makes us
less dependent on include order.
2020-01-09 07:30:35 -05:00
Nick Mathewson
b1dceeca5a
Include sys/types.h in fdio.h, for "off_t".
...
Otherwise our compilation depends on include order.
2020-01-09 07:30:35 -05:00
Nick Mathewson
7b0d8834f2
Use raw_assert in ht.h
...
Also, include torerr.h from ht.h if we are using raw_assert.
Otherwise, our includes need to be ordered so that ht.h comes after
util_log.h.
2020-01-09 07:30:35 -05:00
Nick Mathewson
73b83b8f1a
Remove extra ; from tt_assert() macro definition.
...
We were actually omitting the semicolon in a few places, leading to
confusing indentation and some cocci failures.
2020-01-09 07:30:35 -05:00
Nick Mathewson
3ce2304c6d
Use new ENABLE/DISABLE_GCC_WARNING
...
This is an automated commit, generated by:
perl -i -pe 'next if /define/; s/((?:ENABLE|DISABLE)_GCC_WARNING)\(([A-Za-z0-9_\-]+)\)/$1(\"-W$2\")/' src/*/*/*.[ch] src/*/*.[ch]
2020-01-09 07:30:35 -05:00
Nick Mathewson
792e5b2403
Replace DISABLE/ENABLE_GCC_WARNING with something that will confuse clang-format less
2020-01-09 07:30:35 -05:00
teor
5082eeba38
Merge branch 'maint-0.4.2'
2019-12-16 08:16:28 +10:00
teor
bd11fb1096
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-16 08:16:20 +10:00
teor
ffccf6fc55
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-16 08:16:12 +10:00
teor
7481172983
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-16 08:16:04 +10:00
teor
1cd20ff848
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-16 08:15:55 +10:00
teor
648399d6c2
Merge remote-tracking branch 'tor-github/pr/1505'
2019-12-16 08:15:19 +10:00
teor
933b0c1b1b
Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2
2019-12-16 08:14:29 +10:00
teor
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
2019-12-16 08:14:04 +10:00
teor
7dd5946094
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
2019-12-16 08:13:38 +10:00
Nick Mathewson
a7b6c01468
Merge remote-tracking branch 'tor-github/pr/1598'
2019-12-13 11:09:17 -05:00
teor
f9a243a9d4
changes: update changes file for 32609
2019-12-12 16:12:18 +10:00
teor
36dce6836d
Makefile: Remove the broken, duplicate check-practracker-unit-test
...
This test doesn't set PYTHON, and ignores USE_PYTHON. And it's already
listed in TEST_SCRIPTS.
Fixes CI issue 32705.
2019-12-12 16:08:05 +10:00
teor
0bb879e821
src/ext: Add __future__ imports for python 3 compatibility
...
Closes ticket 32732.
2019-12-12 15:59:47 +10:00
teor
1619f14a04
python: Add __future__ imports for python 3 compatibility
...
Except for src/ext, which we may not want to modify.
Closes ticket 32732.
2019-12-12 15:58:51 +10:00
George Kadianakis
a38014e5c6
Merge branch 'tor-github/pr/1581'
2019-12-10 18:34:00 +02:00
David Goulet
fc32349adc
hs-v3: Handle client rendezvous circuit timeout
...
With v3, the "pending_final_cpath" of a circuit is always NULL which means
that for v3, established client rendezvous circuit waiting for the intro point
to ACK, will always end up timing out quickly.
This can increase the delays to which you connect to a service since in order
to succeed, the rendezvous circuit needs to fully established
(CIRCUIT_PURPOSE_C_REND_JOINED) within the cutoff of the introduction circuit
as well which is these days around 2-3 seconds.
Fixes #32021
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-12-10 18:33:48 +02:00
David Goulet
71767b06ae
Merge branch 'tor-github/pr/1583'
2019-12-10 09:42:09 -05:00
George Kadianakis
c959ea7558
hs-v3: Fix memory leak in test_hs_control_store_permanent_creds()
2019-12-10 09:42:05 -05:00
Nick Mathewson
944bdde50e
Merge branch 'maint-0.4.2'
...
"ours" to avoid version bump.
2019-12-09 16:04:09 -05:00
Nick Mathewson
b7d18f8610
bump to 0.4.2.5-dev
2019-12-09 16:03:31 -05:00
Nick Mathewson
17561434eb
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"ours" to avoid version bump.
2019-12-09 16:03:01 -05:00
Nick Mathewson
7174a80edd
bump to 0.4.1.7-dev
2019-12-09 16:02:36 -05:00
Nick Mathewson
7aaf714e8e
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-09 16:02:07 -05:00
Nick Mathewson
b9504f788c
Bump version to 0.4.0.6-dev
2019-12-09 16:01:56 -05:00
Nick Mathewson
651d29c0f7
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-12-09 16:01:22 -05:00
Nick Mathewson
0c4f0ec977
bump to 0.3.5.9-dev
2019-12-09 16:01:11 -05:00
Nick Mathewson
5d4005abfd
Merge remote-tracking branch 'tor-github/pr/1589'
2019-12-09 13:01:24 -05:00
Nick Mathewson
5fea7d8493
Copy forward the changelogs and releasenotes for today's releases.
...
They are 0.4.2.5, 0.4.1.7, 0.4.0.6, and 0.3.5.9.
2019-12-09 11:55:14 -05:00
Taylor Yu
7bd7089988
changes file for ticket 30984
2019-12-09 09:55:04 -06:00
Taylor Yu
bfe38878b2
Rename control_reply_add_1kv
...
Part of ticket 30984.
2019-12-09 09:55:04 -06:00
Nick Mathewson
e93801bfe6
Port changelog tools to python 3
...
Closes ticket 32704.
2019-12-09 10:53:48 -05:00
Taylor Yu
69d56625d1
Doxyfile: skip CHECK_PRINTF()
...
Part of ticket 30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
9b196f1563
simplify getinfo using reply lines
...
Simplify handle_control_getinfo() by using the new reply lines
abstraction. Previously, this function explicitly checked for whether
it should generate a MidReplyLine, a DataReplyLine, or an
EndReplyLine. control_write_reply_lines() now abstracts this check.
Part of #30984 .
2019-12-08 22:40:00 -06:00
Taylor Yu
a08f43ba04
use control reply lines for protocolinfo
...
Simplify handle_control_protocolinfo() by using the new reply line
abstraction.
Part of #30984 .
2019-12-08 22:40:00 -06:00
Taylor Yu
2143bae6c4
refactor handle_control_protocolinfo
...
Factor out the parts of handle_control_protocolinfo() that assemble
the AUTHMETHODS and COOKIEFILE strings.
Part of #30984 .
2019-12-08 22:40:00 -06:00
Taylor Yu
c744d23c8d
simplify getconf by using reply lines
...
In handle_control_getconf(), use the new control reply line
abstraction to simplify output generation. Previously, this function
explicitly checked for whether it should generate a MidReplyLine or an
EndReplyLine. control_write_reply_lines() now abstracts this check.
Part of #30984 .
2019-12-08 22:40:00 -06:00
Taylor Yu
1a68a18093
reply lines structures
...
Part of #30984 .
2019-12-08 22:40:00 -06:00
Taylor Yu
1e8bb79bbe
add KV_RAW to kvline.c
...
Add the KV_RAW flag to kvline_encode(). This allows generation of
output that is compatible with some quirks of the control protocol.
Part of #30984 .
2019-12-08 17:09:43 -06:00
Taylor Yu
4b22c739fe
clean up kvline_can_encode_lines()
...
Add a check for '=' characters in needs_escape(). This simplifies the
logic in kvline_can_encode_lines().
Part of #30984 .
2019-12-08 17:09:42 -06:00
Nick Mathewson
3248630fc8
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-06 16:02:08 -05:00
Nick Mathewson
6513102b9d
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-06 16:02:08 -05:00
Nick Mathewson
089466eff3
Merge branch 'maint-0.4.2'
2019-12-06 16:02:08 -05:00