StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Extracted min and max allowed port values into named constants

Browse Source
This commit is contained in:
Maxim Biro 2014-05-17 20:49:42 -04:00
parent ceaeae8cff
commit 8be6b0986d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
other/bootstrap_daemon/tox_bootstrap_daemon.c
View File

@ -62,6 +62,9 @@
#define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false #define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false
#define DEFAULT_ENABLE_TCP_RELAY 1 #define DEFAULT_ENABLE_TCP_RELAY 1
#define MIN_ALLOWED_PORT 1
#define MAX_ALLOWED_PORT 65535
// Uses the already existing key or creates one if it didn't exist // Uses the already existing key or creates one if it didn't exist
// //
@ -156,8 +159,8 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
} }
(*tcp_relay_ports)[*tcp_relay_port_count] = config_setting_get_int(elem); (*tcp_relay_ports)[*tcp_relay_port_count] = config_setting_get_int(elem);
if ((*tcp_relay_ports)[i] < 1 || (*tcp_relay_ports)[i] > 65535) { if ((*tcp_relay_ports)[i] < MIN_ALLOWED_PORT || (*tcp_relay_ports)[i] > MAX_ALLOWED_PORT) {
syslog(LOG_WARNING, "Port #%d: Invalid port value, should be in [1, 65535]. Skipping.\n", i); syslog(LOG_WARNING, "Port #%d: Invalid port value, should be in [%d, %d]. Skipping.\n", i, MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
continue; continue;
} }
@ -359,9 +362,8 @@ int bootstrap_from_config(char *cfg_file_path, DHT *dht, int enable_ipv6)
goto next; goto next;
} }
// not (1 <= port <= 65535) if (bs_port < MIN_ALLOWED_PORT || bs_port > MAX_ALLOWED_PORT) {
if (bs_port < 1 || bs_port > 65535) { syslog(LOG_WARNING, "Bootstrap node #%d: Invalid '%s': %d, should be in [%d, %d]. Skipping the node.\n", i, NAME_PORT, bs_port, MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
syslog(LOG_WARNING, "Bootstrap node #%d: Invalid '%s': %d. Skipping the node.\n", i, NAME_PORT, bs_port);
goto next; goto next;
} }
@ -437,9 +439,8 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
// not (1 <= port <= 65535) if (port < MIN_ALLOWED_PORT || port > MAX_ALLOWED_PORT) {
if (port < 1 || port > 65535) { syslog(LOG_ERR, "Invalid port: %d, should be in [%d, %d]. Exiting.\n", port, MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
syslog(LOG_ERR, "Invalid port: %d, must be 1 <= port <= 65535. Exiting.\n", port);
return 1; return 1;
} }