nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Block the port-forwarding helper at a higher point

Browse Source
This commit is contained in:
Nick Mathewson 2017-08-09 10:48:43 -04:00
parent eb43401bfb
commit 801aa5d03b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/config.c
View File

@ -3575,6 +3575,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("PortForwarding is not compatible with Sandbox; at most one can "
"be set");
}
if (options->PortForwarding && options->NoExec) {
COMPLAIN("Both PortForwarding and NoExec are set; PortForwarding will "
"be ignored.");
}
if (ensure_bandwidth_cap(&options->BandwidthRate,
"BandwidthRate", msg) < 0)

3
src/or/main.c
View File

@ -2036,7 +2036,8 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options)
{
if (net_is_disabled() ||
! server_mode(options) ||
! options->PortForwarding) {
! options->PortForwarding ||
options->NoExec) {
return PERIODIC_EVENT_NO_UPDATE;
}
/* 11. check the port forwarding app */