SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nspawn: some minor modernizations

Browse Source
This commit is contained in:
Lennart Poettering
2020-04-23 07:59:26 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent 69123c218c
commit 81d2fe53fc
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-expose-ports.c
+11 -7
View File
@@ -52,7 +52,7 @@ int expose_port_parse(ExposePort **l, const char *s) {
}
if (r < 0)
return -EINVAL;
return r;
LIST_FOREACH(ports, p, *l)
if (p->protocol == protocol && p->host_port == host_port)
@@ -62,9 +62,11 @@ int expose_port_parse(ExposePort **l, const char *s) {
if (!p)
return -ENOMEM;
p->protocol = protocol;
p->host_port = host_port;
p->container_port = container_port;
*p = (ExposePort) {
.protocol = protocol,
.host_port = host_port,
.container_port = container_port,
};
LIST_PREPEND(ports, *l, p);
@@ -115,7 +117,6 @@ int expose_port_flush(ExposePort* l, union in_addr_union *exposed) {
int expose_port_execute(sd_netlink *rtnl, ExposePort *l, union in_addr_union *exposed) {
_cleanup_free_ struct local_address *addresses = NULL;
_cleanup_free_ char *pretty = NULL;
union in_addr_union new_exposed;
ExposePort *p;
bool add;
@@ -144,8 +145,11 @@ int expose_port_execute(sd_netlink *rtnl, ExposePort *l, union in_addr_union *ex
if (in_addr_equal(af, exposed, &new_exposed))
return 0;
in_addr_to_string(af, &new_exposed, &pretty);
log_debug("New container IP is %s.", strna(pretty));
if (DEBUG_LOGGING) {
_cleanup_free_ char *pretty = NULL;
in_addr_to_string(af, &new_exposed, &pretty);
log_debug("New container IP is %s.", strna(pretty));
}
LIST_FOREACH(ports, p, l) {