picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: monopolize in_addr utility functions in shared/in-addr-util.h 

Primarily, this means we get rid of net_parse_inaddr(), and replace it
everywhere with in_addr_from_string() and in_addr_from_string_auto().
These functions do not clobber the callers arguments on failure, which
is more close to our usual coding style.
This commit is contained in:
Lennart Poettering 2014-08-11 22:44:51 +02:00
parent cedc8c44d4
commit 44e7b94926
8 changed files with 79 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/libsystemd-network/network-internal.c
View File

@ -27,28 +27,27 @@
#include "strv.h" #include "strv.h"
#include "siphash24.h" #include "siphash24.h"
#include "libudev-private.h" #include "libudev-private.h"
#include "network-internal.h"
#include "dhcp-lease-internal.h" #include "dhcp-lease-internal.h"
#include "log.h" #include "log.h"
#include "utf8.h" #include "utf8.h"
#include "util.h" #include "util.h"
#include "conf-parser.h" #include "conf-parser.h"
#include "condition.h" #include "condition.h"
#include "network-internal.h"
const char *net_get_name(struct udev_device *device) { const char *net_get_name(struct udev_device *device) {
const char *name = NULL, *field = NULL; const char *name, *field;
assert(device); assert(device);
/* fetch some persistent data unique (on this machine) to this device */ /* fetch some persistent data unique (on this machine) to this device */
FOREACH_STRING(field, "ID_NET_NAME_ONBOARD", "ID_NET_NAME_SLOT", FOREACH_STRING(field, "ID_NET_NAME_ONBOARD", "ID_NET_NAME_SLOT", "ID_NET_NAME_PATH", "ID_NET_NAME_MAC") {
"ID_NET_NAME_PATH", "ID_NET_NAME_MAC") {
name = udev_device_get_property_value(device, field); name = udev_device_get_property_value(device, field);
if (name) if (name)
break; return name;
} }
return name; return NULL;
} }
#define HASH_KEY SD_ID128_MAKE(d3,1e,48,fa,90,fe,4b,4c,9d,af,d5,d7,a1,b1,2e,8a) #define HASH_KEY SD_ID128_MAKE(d3,1e,48,fa,90,fe,4b,4c,9d,af,d5,d7,a1,b1,2e,8a)
@ -133,12 +132,6 @@ bool net_match_config(const struct ether_addr *match_mac,
return 1; return 1;
} }
unsigned net_netmask_to_prefixlen(const struct in_addr *addr) {
assert(addr);
return 32 - u32ctz(be32toh(addr->s_addr));
}
int config_parse_net_condition(const char *unit, int config_parse_net_condition(const char *unit,
const char *filename, const char *filename,
unsigned line, unsigned line,
@ -304,41 +297,6 @@ int config_parse_hwaddr(const char *unit,
return 0; return 0;
} }
int net_parse_inaddr(const char *address, int *family, void *dst) {
int r;
assert(address);
assert(family);
assert(dst);
/* IPv4 */
r = inet_pton(AF_INET, address, dst);
if (r > 0) {
/* succsefully parsed IPv4 address */
if (*family == AF_UNSPEC)
*family = AF_INET;
else if (*family != AF_INET)
return -EINVAL;
} else if (r < 0)
return -errno;
else {
/* not an IPv4 address, so let's try IPv6 */
r = inet_pton(AF_INET6, address, dst);
if (r > 0) {
/* successfully parsed IPv6 address */
if (*family == AF_UNSPEC)
*family = AF_INET6;
else if (*family != AF_INET6)
return -EINVAL;
} else if (r < 0)
return -errno;
else
return -EINVAL;
}
return 0;
}
void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size) { void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size) {
unsigned i; unsigned i;

8
src/libsystemd-network/network-internal.h
View File

@ -1,5 +1,7 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/*** /***
This file is part of systemd. This file is part of systemd.
@ -19,8 +21,6 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#pragma once
#include <netinet/ether.h> #include <netinet/ether.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <stdbool.h> #include <stdbool.h>
@ -44,8 +44,6 @@ bool net_match_config(const struct ether_addr *match_mac,
const char *dev_type, const char *dev_type,
const char *dev_name); const char *dev_name);
unsigned net_netmask_to_prefixlen(const struct in_addr *netmask);
int config_parse_net_condition(const char *unit, const char *filename, unsigned line, int config_parse_net_condition(const char *unit, const char *filename, unsigned line,
const char *section, unsigned section_line, const char *lvalue, const char *section, unsigned section_line, const char *lvalue,
int ltype, const char *rvalue, void *data, void *userdata); int ltype, const char *rvalue, void *data, void *userdata);
@ -62,8 +60,6 @@ int config_parse_ifalias(const char *unit, const char *filename, unsigned line,
const char *section, unsigned section_line, const char *lvalue, const char *section, unsigned section_line, const char *lvalue,
int ltype, const char *rvalue, void *data, void *userdata); int ltype, const char *rvalue, void *data, void *userdata);
int net_parse_inaddr(const char *address, int *family, void *dst);
int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]); int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]);
const char *net_get_name(struct udev_device *device); const char *net_get_name(struct udev_device *device);

60
src/network/networkd-address.c
View File

@ -394,7 +394,8 @@ int address_configure(Address *address, Link *link,
return 0; return 0;
} }
int config_parse_broadcast(const char *unit, int config_parse_broadcast(
const char *unit,
const char *filename, const char *filename,
unsigned line, unsigned line,
const char *section, const char *section,
@ -404,9 +405,9 @@ int config_parse_broadcast(const char *unit,
const char *rvalue, const char *rvalue,
void *data, void *data,
void *userdata) { void *userdata) {
Network *network = userdata; Network *network = userdata;
_cleanup_address_free_ Address *n = NULL; _cleanup_address_free_ Address *n = NULL;
_cleanup_free_ char *address = NULL;
int r; int r;
assert(filename); assert(filename);
@ -421,18 +422,18 @@ int config_parse_broadcast(const char *unit,
if (n->family == AF_INET6) { if (n->family == AF_INET6) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Broadcast is not valid for IPv6 addresses, " "Broadcast is not valid for IPv6 addresses, ignoring assignment: %s", rvalue);
"ignoring assignment: %s", address);
return 0; return 0;
} }
r = net_parse_inaddr(address, &n->family, &n->broadcast); r = in_addr_from_string(AF_INET, rvalue, (union in_addr_union*) &n->broadcast);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Broadcast is invalid, ignoring assignment: %s", address); "Broadcast is invalid, ignoring assignment: %s", rvalue);
return 0; return 0;
} }
n->family = AF_INET;
n = NULL; n = NULL;
return 0; return 0;
@ -448,12 +449,12 @@ int config_parse_address(const char *unit,
const char *rvalue, const char *rvalue,
void *data, void *data,
void *userdata) { void *userdata) {
Network *network = userdata; Network *network = userdata;
_cleanup_address_free_ Address *n = NULL; _cleanup_address_free_ Address *n = NULL;
_cleanup_free_ char *address = NULL; const char *address, *e;
union in_addr_union *addr; union in_addr_union buffer;
const char *e; int r, f;
int r;
assert(filename); assert(filename);
assert(section); assert(section);
@ -471,11 +472,6 @@ int config_parse_address(const char *unit,
if (r < 0) if (r < 0)
return r; return r;
if (streq(lvalue, "Address"))
addr = &n->in_addr;
else
addr = &n->in_addr_peer;
/* Address=address/prefixlen */ /* Address=address/prefixlen */
/* prefixlen */ /* prefixlen */
@ -485,32 +481,38 @@ int config_parse_address(const char *unit,
r = safe_atou(e + 1, &i); r = safe_atou(e + 1, &i);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Interface prefix length is invalid, " "Interface prefix length is invalid, ignoring assignment: %s", e + 1);
"ignoring assignment: %s", e + 1);
return 0; return 0;
} }
n->prefixlen = (unsigned char) i; n->prefixlen = (unsigned char) i;
address = strndup(rvalue, e - rvalue); address = strndupa(rvalue, e - rvalue);
if (!address) } else
return log_oom(); address = rvalue;
} else {
address = strdup(rvalue);
if (!address)
return log_oom();
}
r = net_parse_inaddr(address, &n->family, addr); r = in_addr_from_string_auto(address, &f, &buffer);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Address is invalid, ignoring assignment: %s", address); "Address is invalid, ignoring assignment: %s", address);
return 0; return 0;
} }
if (n->family == AF_INET && !n->broadcast.s_addr) if (n->family != AF_UNSPEC && f != n->family) {
n->broadcast.s_addr = n->in_addr.in.s_addr | log_syntax(unit, LOG_ERR, filename, line, EINVAL,
htonl(0xfffffffflu >> n->prefixlen); "Address is incompatible, ignoring assignment: %s", address);
return 0;
}
n->family = f;
if (streq(lvalue, "Address"))
n->in_addr = buffer;
else
n->in_addr_peer = buffer;
if (n->family == AF_INET && n->broadcast.s_addr == 0)
n->broadcast.s_addr = n->in_addr.in.s_addr | htonl(0xfffffffflu >> n->prefixlen);
n = NULL; n = NULL;

6
src/network/networkd-link.c
View File

@ -750,7 +750,7 @@ static int link_enter_set_addresses(Link *link) {
return r; return r;
} }
prefixlen = net_netmask_to_prefixlen(&netmask); prefixlen = in_addr_netmask_to_prefixlen(&netmask);
r = address_new_dynamic(&address); r = address_new_dynamic(&address);
if (r < 0) { if (r < 0) {
@ -983,7 +983,7 @@ static int dhcp_lease_lost(Link *link) {
sd_dhcp_lease_get_address(link->dhcp_lease, &addr); sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask); sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
prefixlen = net_netmask_to_prefixlen(&netmask); prefixlen = in_addr_netmask_to_prefixlen(&netmask);
address->family = AF_INET; address->family = AF_INET;
address->in_addr.in = addr; address->in_addr.in = addr;
@ -1073,7 +1073,7 @@ static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
return r; return r;
} }
prefixlen = net_netmask_to_prefixlen(&netmask); prefixlen = in_addr_netmask_to_prefixlen(&netmask);
r = sd_dhcp_lease_get_router(lease, &gateway); r = sd_dhcp_lease_get_router(lease, &gateway);
if (r < 0 && r != -ENOENT) { if (r < 0 && r != -ENOENT) {

17
src/network/networkd-netdev-tunnel.c
View File

@ -266,21 +266,28 @@ int config_parse_tunnel_address(const char *unit,
void *data, void *data,
void *userdata) { void *userdata) {
Tunnel *t = userdata; Tunnel *t = userdata;
union in_addr_union *addr = data; union in_addr_union *addr = data, buffer;
int r; int r, f;
assert(filename); assert(filename);
assert(lvalue); assert(lvalue);
assert(rvalue); assert(rvalue);
assert(data); assert(data);
r = net_parse_inaddr(rvalue, &t->family, addr); r = in_addr_from_string_auto(rvalue, &f, &buffer);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Tunnel address is invalid, ignoring assignment: %s", rvalue);
"Tunnel address is invalid, ignoring assignment: %s", rvalue);
return 0; return 0;
} }
if (t->family != AF_UNSPEC && t->family != f) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Tunnel addresses incompatible, ignoring assignment: %s", rvalue);
return 0;
}
t->family = f;
*addr = buffer;
return 0; return 0;
} }

38
src/network/networkd-route.c
View File

@ -256,10 +256,11 @@ int config_parse_gateway(const char *unit,
const char *rvalue, const char *rvalue,
void *data, void *data,
void *userdata) { void *userdata) {
Network *network = userdata; Network *network = userdata;
_cleanup_route_free_ Route *n = NULL; _cleanup_route_free_ Route *n = NULL;
_cleanup_free_ char *route = NULL; union in_addr_union buffer;
int r; int r, f;
assert(filename); assert(filename);
assert(section); assert(section);
@ -277,13 +278,15 @@ int config_parse_gateway(const char *unit,
if (r < 0) if (r < 0)
return r; return r;
r = net_parse_inaddr(rvalue, &n->family, &n->in_addr); r = in_addr_from_string_auto(rvalue, &f, &buffer);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Route is invalid, ignoring assignment: %s", route); "Route is invalid, ignoring assignment: %s", rvalue);
return 0; return 0;
} }
n->family = f;
n->in_addr = buffer;
n = NULL; n = NULL;
return 0; return 0;
@ -299,11 +302,12 @@ int config_parse_destination(const char *unit,
const char *rvalue, const char *rvalue,
void *data, void *data,
void *userdata) { void *userdata) {
Network *network = userdata; Network *network = userdata;
_cleanup_route_free_ Route *n = NULL; _cleanup_route_free_ Route *n = NULL;
_cleanup_free_ char *address = NULL; const char *address, *e;
const char *e; union in_addr_union buffer;
int r; int r, f;
assert(filename); assert(filename);
assert(section); assert(section);
@ -319,17 +323,12 @@ int config_parse_destination(const char *unit,
/* address */ /* address */
e = strchr(rvalue, '/'); e = strchr(rvalue, '/');
if (e) { if (e)
address = strndup(rvalue, e - rvalue); address = strndupa(rvalue, e - rvalue);
if (!address) else
return log_oom(); address = rvalue;
} else {
address = strdup(rvalue);
if (!address)
return log_oom();
}
r = net_parse_inaddr(address, &n->family, &n->dst_addr); r = in_addr_from_string_auto(address, &f, &buffer);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Destination is invalid, ignoring assignment: %s", address); "Destination is invalid, ignoring assignment: %s", address);
@ -343,8 +342,7 @@ int config_parse_destination(const char *unit,
r = safe_atou(e + 1, &i); r = safe_atou(e + 1, &i);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Route destination prefix length is invalid, " "Route destination prefix length is invalid, ignoring assignment: %s", e + 1);
"ignoring assignment: %s", e + 1);
return 0; return 0;
} }
@ -360,6 +358,8 @@ int config_parse_destination(const char *unit,
} }
} }
n->family = f;
n->dst_addr = buffer;
n = NULL; n = NULL;
return 0; return 0;

6
src/shared/in-addr-util.c
View File

@ -242,3 +242,9 @@ int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *re
return -EINVAL; return -EINVAL;
} }
unsigned in_addr_netmask_to_prefixlen(const struct in_addr *addr) {
assert(addr);
return 32 - u32ctz(be32toh(addr->s_addr));
}

1
src/shared/in-addr-util.h
View File

@ -39,6 +39,7 @@ int in_addr_prefix_next(int family, union in_addr_union *u, unsigned prefixlen);
int in_addr_to_string(int family, const union in_addr_union *u, char **ret); int in_addr_to_string(int family, const union in_addr_union *u, char **ret);
int in_addr_from_string(int family, const char *s, union in_addr_union *ret); int in_addr_from_string(int family, const char *s, union in_addr_union *ret);
int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *ret); int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *ret);
unsigned in_addr_netmask_to_prefixlen(const struct in_addr *addr);
static inline size_t FAMILY_ADDRESS_SIZE(int family) { static inline size_t FAMILY_ADDRESS_SIZE(int family) {
assert(family == AF_INET || family == AF_INET6); assert(family == AF_INET || family == AF_INET6);