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
Mike Perry
Tor
Commits
fe187763
Commit
fe187763
authored
Jul 20, 2018
by
Neel Chauhan
Browse files
Don't prepend reject *:* to Reachable(OR/Dir)Addresses in options_validate()
parent
9ae35975
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/app/config/config.c
View file @
fe187763
...
...
@@ -3359,7 +3359,6 @@ STATIC int
options_validate
(
or_options_t
*
old_options
,
or_options_t
*
options
,
or_options_t
*
default_options
,
int
from_setconf
,
char
**
msg
)
{
int
i
;
config_line_t
*
cl
;
const
char
*
uname
=
get_uname
();
int
n_ports
=
0
;
...
...
@@ -3680,30 +3679,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
}
}
/* Terminate Reachable*Addresses with reject *
*/
for
(
i
=
0
;
i
<
3
;
i
++
)
{
config_line_t
**
linep
=
(
i
==
0
)
?
&
options
->
ReachableAddresses
:
(
i
==
1
)
?
&
options
->
ReachableORAddresses
:
&
options
->
ReachableDirAddresses
;
if
(
!*
linep
)
continue
;
/* We need to end with a reject *:*, not an implicit accept *:* */
for
(;;)
{
linep
=
&
((
*
linep
)
->
next
);
if
(
!*
linep
)
{
*
linep
=
tor_malloc_zero
(
sizeof
(
config_line_t
));
(
*
linep
)
->
key
=
tor_strdup
(
(
i
==
0
)
?
"ReachableAddresses"
:
(
i
==
1
)
?
"ReachableORAddresses"
:
"ReachableDirAddresses"
);
(
*
linep
)
->
value
=
tor_strdup
(
"reject *:*"
);
break
;
}
}
}
if
((
options
->
ReachableAddresses
||
options
->
ReachableORAddresses
||
options
->
ReachableDirAddresses
||
...
...
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