Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
a62f59f0
Commit
a62f59f0
authored
7 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Mark "previously validated foo could not be set" blocks as unreachable.
parent
c4a07b26
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/or/config.c
+14
-0
14 additions, 0 deletions
src/or/config.c
with
14 additions
and
0 deletions
src/or/config.c
+
14
−
0
View file @
a62f59f0
...
...
@@ -1717,9 +1717,11 @@ options_act(const or_options_t *old_options)
for
(
cl
=
options
->
Bridges
;
cl
;
cl
=
cl
->
next
)
{
bridge_line_t
*
bridge_line
=
parse_bridge_line
(
cl
->
value
);
if
(
!
bridge_line
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Previously validated Bridge line could not be added!"
);
return
-
1
;
// LCOV_EXCL_STOP
}
bridge_add_from_config
(
bridge_line
);
}
...
...
@@ -1727,15 +1729,19 @@ options_act(const or_options_t *old_options)
}
if
(
running_tor
&&
hs_config_service_all
(
options
,
0
)
<
0
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Previously validated hidden services line could not be added!"
);
return
-
1
;
// LCOV_EXCL_STOP
}
if
(
running_tor
&&
rend_parse_service_authorization
(
options
,
0
)
<
0
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Previously validated client authorization for "
"hidden services could not be added!"
);
return
-
1
;
// LCOV_EXCL_STOP
}
/* Load state */
...
...
@@ -1758,10 +1764,12 @@ options_act(const or_options_t *old_options)
if
(
options
->
ClientTransportPlugin
)
{
for
(
cl
=
options
->
ClientTransportPlugin
;
cl
;
cl
=
cl
->
next
)
{
if
(
parse_transport_line
(
options
,
cl
->
value
,
0
,
0
)
<
0
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Previously validated ClientTransportPlugin line "
"could not be added!"
);
return
-
1
;
// LCOV_EXCL_STOP
}
}
}
...
...
@@ -1769,10 +1777,12 @@ options_act(const or_options_t *old_options)
if
(
options
->
ServerTransportPlugin
&&
server_mode
(
options
))
{
for
(
cl
=
options
->
ServerTransportPlugin
;
cl
;
cl
=
cl
->
next
)
{
if
(
parse_transport_line
(
options
,
cl
->
value
,
0
,
1
)
<
0
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Previously validated ServerTransportPlugin line "
"could not be added!"
);
return
-
1
;
// LCOV_EXCL_STOP
}
}
}
...
...
@@ -1858,8 +1868,10 @@ options_act(const or_options_t *old_options)
/* Set up accounting */
if
(
accounting_parse_options
(
options
,
0
)
<
0
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Error in previously validated accounting options"
);
return
-
1
;
// LCOV_EXCL_STOP
}
if
(
accounting_is_enabled
(
options
))
configure_accounting
(
time
(
NULL
));
...
...
@@ -1895,10 +1907,12 @@ options_act(const or_options_t *old_options)
}
if
(
parse_outbound_addresses
(
options
,
0
,
&
msg
)
<
0
)
{
// LCOV_EXCL_START
log_warn
(
LD_BUG
,
"Failed parsing previously validated outbound "
"bind addresses: %s"
,
msg
);
tor_free
(
msg
);
return
-
1
;
// LCOV_EXCL_STOP
}
config_maybe_load_geoip_files_
(
options
,
old_options
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment