nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set *have_low_ports_out from stub port_parse_ports_relay().

Browse Source 
Previously we just ignored this option, which would leave it unset,
and cause an assertion failure later on when running with the User
option.

Fixes bug 33668; bugfix on 0.4.3.1-alpha.
This commit is contained in:
Nick Mathewson 2020-03-19 20:04:53 -04:00
parent 250b8499b8
commit c478dc9b2f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug33668 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (--disable-module-relay):
- Fix an assertion failure when Tor is build without the relay module,
and then invoked with the "User" option. Fixes bug 33668; bugfix on
0.4.3.1-alpha.

17
src/feature/relay/relay_config.h
View File

@ -125,6 +125,20 @@ options_validate_relay_mode(const struct or_options_t *old_options,
return 0;
}
static inline int
port_parse_ports_relay(or_options_t *options,
char **msg,
smartlist_t *ports_out,
int *have_low_ports_out)
{
(void)options;
(void)msg;
(void)ports_out;
if (*have_low_ports_out < 0)
*have_low_ports_out = 0;
return 0;
}
#define relay_get_dirportfrontpage() \
(NULL)
#define relay_config_free_all() \
@ -138,9 +152,6 @@ options_validate_relay_mode(const struct or_options_t *old_options,
#define port_warn_nonlocal_ext_orports(ports, portname) \
(((void)(ports)),((void)(portname)))
#define port_parse_ports_relay(options, msg, ports_out, have_low_ports_out) \
(((void)(options)),((void)(msg)),((void)(ports_out)), \
((void)(have_low_ports_out)),0)
#define port_update_port_set_relay(options, ports) \
(((void)(options)),((void)(ports)))