Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nick Mathewson
Tor
Commits
83424cb6
Unverified
Commit
83424cb6
authored
Nov 25, 2019
by
teor
Browse files
Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5
parents
f9812ee5
984a28f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
changes/ticket31548
0 → 100644
View file @
83424cb6
o Major bugfixes (hidden service v3):
- Make onion service always use the exact amount of configured intro points
(or less due to node exlusion). Before, a service could sometimes pick
more intro points than configured with the
HiddenServiceNumIntroductionPoints option. Fixes bug 31548; bugfix on
0.3.2.1-alpha.
src/feature/hs/hs_service.c
View file @
83424cb6
...
...
@@ -1686,6 +1686,15 @@ build_desc_intro_points(const hs_service_t *service,
DIGEST256MAP_FOREACH
(
desc
->
intro_points
.
map
,
key
,
const
hs_service_intro_point_t
*
,
ip
)
{
if
(
!
ip
->
circuit_established
)
{
/* Ignore un-established intro points. They can linger in that list
* because their circuit has not opened and they haven't been removed
* yet even though we have enough intro circuits.
*
* Due to #31561, it can stay in that list until rotation so this check
* prevents to publish an intro point without a circuit. */
continue
;
}
hs_desc_intro_point_t
*
desc_ip
=
hs_desc_intro_point_new
();
if
(
setup_desc_intro_point
(
&
desc
->
signing_kp
,
ip
,
now
,
desc_ip
)
<
0
)
{
hs_desc_intro_point_free
(
desc_ip
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment