shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

core: introduce parse_ip_port (#4825)

Browse Source 
1. Listed in TODO.
2. Tree wide replace safe_atou16 with parse_ip_port incase
   it's used for ports.
This commit is contained in:
Susant Sahani 2016-12-06 16:51:45 +05:30 committed by Lennart Poettering
parent 5efdbf11d1
commit 10452f7c93
6 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -32,8 +32,6 @@ Features:
* replace all canonicalize_file_name() invocations by chase_symlinks(), in
particulr those where a rootdir is relevant.
* add parse_ip_port() or so, that is like safe_atou16() but checks for != 0
* drop nss-myhostname in favour of nss-resolve?
* drop internal dlopen() based nss-dns fallback in nss-resolve, and rely on the

16
src/basic/parse-util.c
View File

@ -574,3 +574,19 @@ int parse_nice(const char *p, int *ret) {
*ret = n;
return 0;
}
int parse_ip_port(const char *s, uint16_t *ret) {
uint16_t l;
int r;
r = safe_atou16(s, &l);
if (r < 0)
return r;
if (l == 0)
return -EINVAL;
*ret = (uint16_t) l;
return 0;
}

2
src/basic/parse-util.h
View File

@ -110,3 +110,5 @@ int parse_percent_unbounded(const char *p);
int parse_percent(const char *p);
int parse_nice(const char *p, int *ret);
int parse_ip_port(const char *s, uint16_t *ret);

4
src/network/netdev/vxlan.c
View File

@ -252,8 +252,8 @@ int config_parse_destination_port(const char *unit,
assert(rvalue);
assert(data);
r = safe_atou16(rvalue, &port);
if (r < 0 || port <= 0) {
r = parse_ip_port(rvalue, &port);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse VXLAN destination port '%s'.", rvalue);
return 0;
}

10
src/nspawn/nspawn-expose-ports.c
View File

@ -58,17 +58,17 @@ int expose_port_parse(ExposePort **l, const char *s) {
memcpy(v, e, split - e);
v[split - e] = 0;
r = safe_atou16(v, &host_port);
if (r < 0 || host_port <= 0)
r = parse_ip_port(v, &host_port);
if (r < 0)
return -EINVAL;
r = safe_atou16(split + 1, &container_port);
r = parse_ip_port(split + 1, &container_port);
} else {
r = safe_atou16(e, &container_port);
r = parse_ip_port(e, &container_port);
host_port = container_port;
}
if (r < 0 || container_port <= 0)
if (r < 0)
return -EINVAL;
LIST_FOREACH(ports, p, *l)

4
src/resolve/resolve-tool.c
View File

@ -881,8 +881,8 @@ static int resolve_tlsa(sd_bus *bus, const char *address) {
port = strrchr(address, ':');
if (port) {
r = safe_atou16(port + 1, &port_num);
if (r < 0 || port_num == 0)
r = parse_ip_port(port + 1, &port_num);
if (r < 0)
return log_error_errno(r, "Invalid port \"%s\".", port + 1);
address = strndupa(address, port - address);