#include "pretty-print.h"
#include "process-util.h"
#include "signal-util.h"
+#include "socket-netlink.h"
#include "socket-util.h"
#include "string-util.h"
#include "strv.h"
return -EINVAL;
}
-int in_addr_ifindex_from_string_auto(const char *s, int *family, union in_addr_union *ret, int *ifindex) {
- _cleanup_free_ char *buf = NULL;
- const char *suffix;
- int r, ifi = 0;
-
- assert(s);
- assert(family);
- assert(ret);
-
- /* Similar to in_addr_from_string_auto() but also parses an optionally appended IPv6 zone suffix ("scope id")
- * if one is found. */
-
- suffix = strchr(s, '%');
- if (suffix) {
-
- if (ifindex) {
- /* If we shall return the interface index, try to parse it */
- r = parse_ifindex(suffix + 1, &ifi);
- if (r < 0) {
- unsigned u;
-
- u = if_nametoindex(suffix + 1);
- if (u <= 0)
- return -errno;
-
- ifi = (int) u;
- }
- }
-
- buf = strndup(s, suffix - s);
- if (!buf)
- return -ENOMEM;
-
- s = buf;
- }
-
- r = in_addr_from_string_auto(s, family, ret);
- if (r < 0)
- return r;
-
- if (ifindex)
- *ifindex = ifi;
-
- return r;
-}
-
unsigned char in4_addr_netmask_to_prefixlen(const struct in_addr *addr) {
assert(addr);
int in_addr_ifindex_to_string(int family, const union in_addr_union *u, int ifindex, char **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 *ret_family, union in_addr_union *ret);
-int in_addr_ifindex_from_string_auto(const char *s, int *family, union in_addr_union *ret, int *ifindex);
+
unsigned char in4_addr_netmask_to_prefixlen(const struct in_addr *addr);
struct in_addr* in4_addr_prefixlen_to_netmask(struct in_addr *addr, unsigned char prefixlen);
int in4_addr_default_prefixlen(const struct in_addr *addr, unsigned char *prefixlen);
return 0;
}
-int parse_ifindex(const char *s, int *ret) {
+int parse_ifindex(const char *s) {
int ifi, r;
assert(s);
- assert(ret);
r = safe_atoi(s, &ifi);
if (r < 0)
if (ifi <= 0)
return -EINVAL;
- *ret = ifi;
- return 0;
-}
-
-int parse_ifindex_or_ifname(const char *s, int *ret) {
- int r;
-
- assert(s);
- assert(ret);
-
- r = parse_ifindex(s, ret);
- if (r >= 0)
- return r;
-
- r = (int) if_nametoindex(s);
- if (r <= 0)
- return -errno;
-
- *ret = r;
- return 0;
+ return ifi;
}
int parse_mtu(int family, const char *s, uint32_t *ret) {
int parse_dev(const char *s, dev_t *ret);
int parse_pid(const char *s, pid_t* ret_pid);
int parse_mode(const char *s, mode_t *ret);
-int parse_ifindex(const char *s, int *ret);
-int parse_ifindex_or_ifname(const char *s, int *ret);
+int parse_ifindex(const char *s);
int parse_mtu(int family, const char *s, uint32_t *ret);
int parse_size(const char *t, uint64_t base, uint64_t *size);
return r;
}
-
-int make_socket_fd(int log_level, const char* address, int type, int flags) {
- SocketAddress a;
- int fd, r;
-
- r = socket_address_parse(&a, address);
- if (r < 0)
- return log_error_errno(r, "Failed to parse socket address \"%s\": %m", address);
-
- a.type = type;
-
- fd = socket_address_listen(&a, type | flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT,
- NULL, false, false, false, 0755, 0644, NULL);
- if (fd < 0 || log_get_max_level() >= log_level) {
- _cleanup_free_ char *p = NULL;
-
- r = socket_address_print(&a, &p);
- if (r < 0)
- return log_error_errno(r, "socket_address_print(): %m");
-
- if (fd < 0)
- log_error_errno(fd, "Failed to listen on %s: %m", p);
- else
- log_full(log_level, "Listening on %s", p);
- }
-
- return fd;
-}
#endif
static const char* const socket_address_type_table[] = {
- [SOCK_STREAM] = "Stream",
- [SOCK_DGRAM] = "Datagram",
- [SOCK_RAW] = "Raw",
- [SOCK_RDM] = "ReliableDatagram",
+ [SOCK_STREAM] = "Stream",
+ [SOCK_DGRAM] = "Datagram",
+ [SOCK_RAW] = "Raw",
+ [SOCK_RDM] = "ReliableDatagram",
[SOCK_SEQPACKET] = "SequentialPacket",
- [SOCK_DCCP] = "DatagramCongestionControl",
+ [SOCK_DCCP] = "DatagramCongestionControl",
};
DEFINE_STRING_TABLE_LOOKUP(socket_address_type, int);
-int socket_address_parse(SocketAddress *a, const char *s) {
- _cleanup_free_ char *n = NULL;
- char *e;
- int r;
-
- assert(a);
- assert(s);
-
- *a = (SocketAddress) {
- .type = SOCK_STREAM,
- };
-
- if (*s == '[') {
- uint16_t port;
-
- /* IPv6 in [x:.....:z]:p notation */
-
- e = strchr(s+1, ']');
- if (!e)
- return -EINVAL;
-
- n = strndup(s+1, e-s-1);
- if (!n)
- return -ENOMEM;
-
- errno = 0;
- if (inet_pton(AF_INET6, n, &a->sockaddr.in6.sin6_addr) <= 0)
- return errno_or_else(EINVAL);
-
- e++;
- if (*e != ':')
- return -EINVAL;
-
- e++;
- r = parse_ip_port(e, &port);
- if (r < 0)
- return r;
-
- a->sockaddr.in6.sin6_family = AF_INET6;
- a->sockaddr.in6.sin6_port = htobe16(port);
- a->size = sizeof(struct sockaddr_in6);
-
- } else if (*s == '/') {
- /* AF_UNIX socket */
-
- size_t l;
-
- l = strlen(s);
- if (l >= sizeof(a->sockaddr.un.sun_path)) /* Note that we refuse non-NUL-terminated sockets when
- * parsing (the kernel itself is less strict here in what it
- * accepts) */
- return -EINVAL;
-
- a->sockaddr.un.sun_family = AF_UNIX;
- memcpy(a->sockaddr.un.sun_path, s, l);
- a->size = offsetof(struct sockaddr_un, sun_path) + l + 1;
-
- } else if (*s == '@') {
- /* Abstract AF_UNIX socket */
- size_t l;
-
- l = strlen(s+1);
- if (l >= sizeof(a->sockaddr.un.sun_path) - 1) /* Note that we refuse non-NUL-terminated sockets here
- * when parsing, even though abstract namespace sockets
- * explicitly allow embedded NUL bytes and don't consider
- * them special. But it's simply annoying to debug such
- * sockets. */
- return -EINVAL;
-
- a->sockaddr.un.sun_family = AF_UNIX;
- memcpy(a->sockaddr.un.sun_path+1, s+1, l);
- a->size = offsetof(struct sockaddr_un, sun_path) + 1 + l;
-
- } else if (startswith(s, "vsock:")) {
- /* AF_VSOCK socket in vsock:cid:port notation */
- const char *cid_start = s + STRLEN("vsock:");
- unsigned port;
-
- e = strchr(cid_start, ':');
- if (!e)
- return -EINVAL;
-
- r = safe_atou(e+1, &port);
- if (r < 0)
- return r;
-
- n = strndup(cid_start, e - cid_start);
- if (!n)
- return -ENOMEM;
-
- if (!isempty(n)) {
- r = safe_atou(n, &a->sockaddr.vm.svm_cid);
- if (r < 0)
- return r;
- } else
- a->sockaddr.vm.svm_cid = VMADDR_CID_ANY;
-
- a->sockaddr.vm.svm_family = AF_VSOCK;
- a->sockaddr.vm.svm_port = port;
- a->size = sizeof(struct sockaddr_vm);
-
- } else {
- uint16_t port;
-
- e = strchr(s, ':');
- if (e) {
- r = parse_ip_port(e + 1, &port);
- if (r < 0)
- return r;
-
- n = strndup(s, e-s);
- if (!n)
- return -ENOMEM;
-
- /* IPv4 in w.x.y.z:p notation? */
- r = inet_pton(AF_INET, n, &a->sockaddr.in.sin_addr);
- if (r < 0)
- return -errno;
-
- if (r > 0) {
- /* Gotcha, it's a traditional IPv4 address */
- a->sockaddr.in.sin_family = AF_INET;
- a->sockaddr.in.sin_port = htobe16(port);
- a->size = sizeof(struct sockaddr_in);
- } else {
- unsigned idx;
-
- if (strlen(n) > IF_NAMESIZE-1)
- return -EINVAL;
-
- /* Uh, our last resort, an interface name */
- idx = if_nametoindex(n);
- if (idx == 0)
- return -EINVAL;
-
- a->sockaddr.in6.sin6_family = AF_INET6;
- a->sockaddr.in6.sin6_port = htobe16(port);
- a->sockaddr.in6.sin6_scope_id = idx;
- a->sockaddr.in6.sin6_addr = in6addr_any;
- a->size = sizeof(struct sockaddr_in6);
- }
- } else {
-
- /* Just a port */
- r = parse_ip_port(s, &port);
- if (r < 0)
- return r;
-
- if (socket_ipv6_is_supported()) {
- a->sockaddr.in6.sin6_family = AF_INET6;
- a->sockaddr.in6.sin6_port = htobe16(port);
- a->sockaddr.in6.sin6_addr = in6addr_any;
- a->size = sizeof(struct sockaddr_in6);
- } else {
- a->sockaddr.in.sin_family = AF_INET;
- a->sockaddr.in.sin_port = htobe16(port);
- a->sockaddr.in.sin_addr.s_addr = INADDR_ANY;
- a->size = sizeof(struct sockaddr_in);
- }
- }
- }
-
- return 0;
-}
-
-int socket_address_parse_and_warn(SocketAddress *a, const char *s) {
- SocketAddress b;
- int r;
-
- /* Similar to socket_address_parse() but warns for IPv6 sockets when we don't support them. */
-
- r = socket_address_parse(&b, s);
- if (r < 0)
- return r;
-
- if (!socket_ipv6_is_supported() && b.sockaddr.sa.sa_family == AF_INET6) {
- log_warning("Binding to IPv6 address not available since kernel does not support IPv6.");
- return -EAFNOSUPPORT;
- }
-
- *a = b;
- return 0;
-}
-
-int socket_address_parse_netlink(SocketAddress *a, const char *s) {
- _cleanup_free_ char *word = NULL;
- unsigned group = 0;
- int family, r;
-
- assert(a);
- assert(s);
-
- zero(*a);
- a->type = SOCK_RAW;
-
- r = extract_first_word(&s, &word, NULL, 0);
- if (r < 0)
- return r;
- if (r == 0)
- return -EINVAL;
-
- family = netlink_family_from_string(word);
- if (family < 0)
- return -EINVAL;
-
- if (!isempty(s)) {
- r = safe_atou(s, &group);
- if (r < 0)
- return r;
- }
-
- a->sockaddr.nl.nl_family = AF_NETLINK;
- a->sockaddr.nl.nl_groups = group;
-
- a->type = SOCK_RAW;
- a->size = sizeof(struct sockaddr_nl);
- a->protocol = family;
-
- return 0;
-}
-
int socket_address_verify(const SocketAddress *a, bool strict) {
assert(a);
return true;
}
-bool socket_address_is(const SocketAddress *a, const char *s, int type) {
- struct SocketAddress b;
-
- assert(a);
- assert(s);
-
- if (socket_address_parse(&b, s) < 0)
- return false;
-
- b.type = type;
-
- return socket_address_equal(a, &b);
-}
-
-bool socket_address_is_netlink(const SocketAddress *a, const char *s) {
- struct SocketAddress b;
-
- assert(a);
- assert(s);
-
- if (socket_address_parse_netlink(&b, s) < 0)
- return false;
-
- return socket_address_equal(a, &b);
-}
-
const char* socket_address_get_path(const SocketAddress *a) {
assert(a);
uint8_t un_buffer[sizeof(struct sockaddr_un) + 1];
};
+#define SUN_PATH_LEN (sizeof(((struct sockaddr_un){}).sun_path))
+
typedef struct SocketAddress {
union sockaddr_union sockaddr;
const char* socket_address_type_to_string(int t) _const_;
int socket_address_type_from_string(const char *s) _pure_;
-int socket_address_parse(SocketAddress *a, const char *s);
-int socket_address_parse_and_warn(SocketAddress *a, const char *s);
-int socket_address_parse_netlink(SocketAddress *a, const char *s);
-int socket_address_print(const SocketAddress *a, char **p);
-int socket_address_verify(const SocketAddress *a, bool strict) _pure_;
-
int sockaddr_un_unlink(const struct sockaddr_un *sa);
static inline int socket_address_unlink(const SocketAddress *a) {
mode_t directory_mode,
mode_t socket_mode,
const char *label);
-int make_socket_fd(int log_level, const char* address, int type, int flags);
-
-bool socket_address_is(const SocketAddress *a, const char *s, int type);
-bool socket_address_is_netlink(const SocketAddress *a, const char *s);
+int socket_address_verify(const SocketAddress *a, bool strict) _pure_;
+int socket_address_print(const SocketAddress *a, char **p);
bool socket_address_matches_fd(const SocketAddress *a, int fd);
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_;
#include "parse-util.h"
#include "path-util.h"
#include "socket.h"
+#include "socket-netlink.h"
#include "socket-util.h"
#include "string-util.h"
#include "unit.h"
#endif
#include "securebits-util.h"
#include "signal-util.h"
+#include "socket-netlink.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "signal-util.h"
#include "smack-util.h"
#include "socket.h"
+#include "socket-netlink.h"
#include "special.h"
#include "string-table.h"
#include "string-util.h"
#include "process-util.h"
#include "rlimit-util.h"
#include "signal-util.h"
+#include "socket-netlink.h"
#include "socket-util.h"
#include "stat-util.h"
#include "string-table.h"
return 0;
}
-int device_set_ifindex(sd_device *device, const char *_ifindex) {
- int ifindex, r;
+int device_set_ifindex(sd_device *device, const char *name) {
+ int r, ifindex;
assert(device);
- assert(_ifindex);
+ assert(name);
- r = parse_ifindex(_ifindex, &ifindex);
- if (r < 0)
- return r;
+ ifindex = parse_ifindex(name);
+ if (ifindex < 0)
+ return ifindex;
- r = device_add_property_internal(device, "IFINDEX", _ifindex);
+ r = device_add_property_internal(device, "IFINDEX", name);
if (r < 0)
return r;
struct ifreq ifr = {};
int ifindex;
- r = parse_ifindex(&id[1], &ifr.ifr_ifindex);
+ r = ifr.ifr_ifindex = parse_ifindex(&id[1]);
if (r < 0)
return r;
*(char*) (mempcpy(buf, word, l)) = 0;
- if (parse_ifindex(buf, &ifi) < 0)
+ ifi = parse_ifindex(buf);
+ if (ifi < 0)
continue;
if (!GREEDY_REALLOC(ni, allocated, nr+1)) {
return 0;
}
-int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name, int *ret) {
+int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name) {
+ _cleanup_(sd_netlink_unrefp) sd_netlink *our_rtnl = NULL;
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL, *reply = NULL;
- int r;
+ int r, ret;
- assert(rtnl);
assert(name);
- assert(ret);
+ if (!rtnl)
+ rtnl = &our_rtnl;
if (!*rtnl) {
r = sd_netlink_open(rtnl);
if (r < 0)
return r;
r = sd_netlink_call(*rtnl, message, 0, &reply);
+ if (r == -EINVAL)
+ return -ENODEV; /* The device doesn't exist */
if (r < 0)
return r;
- return sd_rtnl_message_link_get_ifindex(reply, ret);
+ r = sd_rtnl_message_link_get_ifindex(reply, &ret);
+ if (r < 0)
+ return r;
+ assert(ret > 0);
+ return ret;
}
int rtnl_message_new_synthetic_error(sd_netlink *rtnl, int error, uint32_t serial, sd_netlink_message **ret) {
int rtnl_set_link_properties(sd_netlink **rtnl, int ifindex, const char *alias, const struct ether_addr *mac, uint32_t mtu);
int rtnl_set_link_alternative_names(sd_netlink **rtnl, int ifindex, char * const *alternative_names);
int rtnl_set_link_alternative_names_by_ifname(sd_netlink **rtnl, const char *ifname, char * const *alternative_names);
-int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name, int *ret);
+int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name);
int rtnl_log_parse_error(int r);
int rtnl_log_create_error(int r);
_cleanup_free_ int *ifis = NULL;
_cleanup_free_ char *s = NULL;
size_t allocated = 0, c = 0;
- const char *x;
int r;
assert_return(ifindex > 0, -EINVAL);
if (r < 0)
return r;
- for (x = s;;) {
+ for (const char *x = s;;) {
_cleanup_free_ char *word = NULL;
r = extract_first_word(&x, &word, NULL, 0);
if (r == 0)
break;
- r = parse_ifindex(word, &ifindex);
- if (r < 0)
- return r;
-
if (!GREEDY_REALLOC(ifis, allocated, c + 2))
return -ENOMEM;
- ifis[c++] = ifindex;
+ r = ifis[c++] = parse_ifindex(word);
+ if (r < 0)
+ return r;
}
if (ifis)
if (netif) {
size_t allocated = 0, nr = 0;
const char *p;
- int *ni = NULL;
+ _cleanup_free_ int *ni = NULL;
p = netif;
for (;;) {
_cleanup_free_ char *word = NULL;
- int ifi;
r = extract_first_word(&p, &word, NULL, 0);
if (r == 0)
break;
}
- if (parse_ifindex(word, &ifi) < 0)
+ r = parse_ifindex(word);
+ if (r < 0)
continue;
- if (!GREEDY_REALLOC(ni, allocated, nr+1)) {
- free(ni);
+ if (!GREEDY_REALLOC(ni, allocated, nr + 1))
return log_oom();
- }
- ni[nr++] = ifi;
+ ni[nr++] = r;
}
free(m->netif);
- m->netif = ni;
+ m->netif = TAKE_PTR(ni);
m->n_netif = nr;
}
printf("\t Root: %s\n", i->root_directory);
if (i->n_netif > 0) {
- size_t c;
-
fputs("\t Iface:", stdout);
- for (c = 0; c < i->n_netif; c++) {
+ for (size_t c = 0; c < i->n_netif; c++) {
char name[IF_NAMESIZE+1];
if (format_ifname(i->netif[c], name)) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
bool properties, new_line = false;
sd_bus *bus = userdata;
- int r = 0, i;
+ int r = 0;
assert(bus);
return r;
}
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
const char *path = NULL;
r = sd_bus_call_method(bus,
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
bool properties, new_line = false;
sd_bus *bus = userdata;
- int r = 0, i;
+ int r = 0;
assert(bus);
return r;
}
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
const char *path = NULL;
r = sd_bus_call_method(
static int kill_machine(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
- int r, i;
+ int r;
assert(bus);
if (!arg_kill_who)
arg_kill_who = "all";
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
r = sd_bus_call_method(
bus,
"org.freedesktop.machine1",
static int terminate_machine(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
- int r, i;
+ int r;
assert(bus);
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
r = sd_bus_call_method(
bus,
"org.freedesktop.machine1",
static int remove_image(int argc, char *argv[], void *userdata) {
sd_bus *bus = userdata;
- int r, i;
+ int r;
assert(bus);
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL;
sd_bus *bus = userdata;
- int r, i;
+ int r;
assert(bus);
if (r < 0)
return log_oom();
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_free_ char *unit = NULL;
const char *object;
size_t n_changes = 0;
const char *method = NULL;
sd_bus *bus = userdata;
- int r, i;
+ int r;
assert(bus);
if (r < 0)
return bus_log_create_error(r);
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
_cleanup_free_ char *unit = NULL;
r = make_service_name(argv[i], &unit);
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ TransferInfo *transfers = NULL;
- size_t n_transfers = 0, n_allocated = 0, j;
+ size_t n_transfers = 0, n_allocated = 0;
const char *type, *remote, *local;
sd_bus *bus = userdata;
uint32_t id, max_id = 0;
(int) max_local, "LOCAL",
(int) max_remote, "REMOTE");
- for (j = 0; j < n_transfers; j++)
+ for (size_t j = 0; j < n_transfers; j++)
if (transfers[j].progress < 0)
printf("%*" PRIu32 " %*s %-*s %-*s %-*s\n",
static int cancel_transfer(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
- int r, i;
+ int r;
assert(bus);
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
- for (i = 1; i < argc; i++) {
+ for (int i = 1; i < argc; i++) {
uint32_t id;
r = safe_atou32(argv[i], &id);
done:
if (shell >= 0) {
char *t;
- int i;
/* We found the "shell" verb while processing the argument list. Since we turned off reordering of the
* argument list initially let's readjust it now, and move the "shell" verb to the back. */
optind -= 1; /* place the option index where the "shell" verb will be placed */
t = argv[shell];
- for (i = shell; i < optind; i++)
+ for (int i = shell; i < optind; i++)
argv[i] = argv[i+1];
argv[optind] = t;
}
#include "parse-util.h"
#include "pretty-print.h"
#include "set.h"
+#include "socket-netlink.h"
#include "socket-util.h"
#include "sort-util.h"
#include "sparse-endian.h"
return log_oom();
for (i = 1; i < argc; i++) {
- r = parse_ifindex_or_ifname(argv[i], &index);
- if (r < 0) {
- r = rtnl_resolve_link_alternative_name(&rtnl, argv[i], &index);
- if (r < 0)
- return log_error_errno(r, "Failed to resolve interface %s", argv[i]);
- }
+ index = resolve_interface_or_warn(&rtnl, argv[i]);
+ if (index < 0)
+ return index;
r = set_put(indexes, INT_TO_PTR(index));
if (r < 0)
return log_error_errno(r, "Failed to connect system bus: %m");
for (i = 1; i < argc; i++) {
- r = parse_ifindex_or_ifname(argv[i], &index);
- if (r < 0) {
- r = rtnl_resolve_link_alternative_name(&rtnl, argv[i], &index);
- if (r < 0)
- return log_error_errno(r, "Failed to resolve interface %s", argv[i]);
- }
+ index = resolve_interface_or_warn(&rtnl, argv[i]);
+ if (index < 0)
+ return index;
r = link_renew_one(bus, index, argv[i]);
if (r < 0 && k >= 0)
return log_oom();
for (i = 1; i < argc; i++) {
- r = parse_ifindex_or_ifname(argv[i], &index);
- if (r < 0) {
- r = rtnl_resolve_link_alternative_name(&rtnl, argv[i], &index);
- if (r < 0)
- return log_error_errno(r, "Failed to resolve interface %s", argv[i]);
- }
+ index = resolve_interface_or_warn(&rtnl, argv[i]);
+ if (index < 0)
+ return index;
r = set_put(indexes, INT_TO_PTR(index));
if (r < 0)
if (r < 0) {
char ifname[IF_NAMESIZE + 1];
- return log_error_errno(r, "Failed to reconfigure network interface %s: %m", format_ifname_full(index, ifname, FORMAT_IFNAME_IFINDEX));
+ return log_error_errno(r, "Failed to reconfigure network interface %s: %m",
+ format_ifname_full(index, ifname, FORMAT_IFNAME_IFINDEX));
}
}
if (r <= 0)
return 0;
- r = parse_ifindex(identifier, &ifindex);
- if (r < 0)
+ ifindex = parse_ifindex(identifier);
+ if (ifindex < 0)
return 0;
r = link_get(m, ifindex, &link);
#include "alloc-util.h"
#include "bus-common-errors.h"
#include "bus-util.h"
-#include "netlink-util.h"
#include "networkd-link-bus.h"
#include "networkd-link.h"
#include "networkd-manager-bus.h"
#include "networkd-manager.h"
#include "path-util.h"
+#include "socket-netlink.h"
#include "strv.h"
#include "user-util.h"
if (r < 0)
return r;
- index = if_nametoindex(name);
- if (index <= 0) {
- r = rtnl_resolve_link_alternative_name(&manager->rtnl, name, &index);
- if (r < 0)
- return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_LINK, "Link %s not known", name);
- }
+ index = resolve_ifname(&manager->rtnl, name);
+ if (index < 0)
+ return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_LINK, "Link %s cannot be resolved", name);
link = hashmap_get(manager->links, INT_TO_PTR(index));
if (!link)
#include "networkd-route.h"
#include "parse-util.h"
#include "set.h"
+#include "socket-netlink.h"
#include "string-table.h"
#include "string-util.h"
#include "strxcpyx.h"
m->gateway.family = family;
if (dev) {
- r = parse_ifindex_or_ifname(dev, &m->ifindex);
+ r = resolve_interface(NULL, dev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r,
"Invalid interface name or index, ignoring assignment: %s", dev);
return 0;
}
+ m->ifindex = r;
}
if (!isempty(p)) {
#include "nspawn-network.h"
#include "parse-util.h"
#include "siphash24.h"
+#include "socket-netlink.h"
#include "socket-util.h"
#include "stat-util.h"
#include "string-util.h"
if (r < 0)
return r;
- u = if_nametoindex(n);
+ u = if_nametoindex(n); /* We don't need to use resolve_ifname() here because the
+ * name we assigned is always the main name. */
if (u == 0)
return log_error_errno(errno, "Failed to resolve interface %s: %m", n);
assert(veth_name);
assert(bridge_name);
- r = parse_ifindex_or_ifname(bridge_name, &bridge_ifi);
- if (r < 0)
- return r;
+ bridge_ifi = resolve_interface(&rtnl, bridge_name);
+ if (bridge_ifi < 0)
+ return bridge_ifi;
r = sd_rtnl_message_new_link(rtnl, &m, RTM_SETLINK, 0);
if (r < 0)
return remove_one_link(rtnl, bridge_name);
}
-static int parse_interface(const char *name) {
- int ifi, r;
-
- r = parse_ifindex_or_ifname(name, &ifi);
- if (r < 0)
- return log_error_errno(r, "Failed to resolve interface %s: %m", name);
-
- return ifi;
-}
-
int test_network_interface_initialized(const char *name) {
_cleanup_(sd_device_unrefp) sd_device *d = NULL;
int ifi, r;
/* udev should be around. */
- ifi = parse_interface(name);
+ ifi = resolve_interface_or_warn(NULL, name);
if (ifi < 0)
return ifi;
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
int ifi;
- ifi = parse_interface(*i);
+ ifi = resolve_interface_or_warn(&rtnl, *i);
if (ifi < 0)
return ifi;
struct ether_addr mac;
int ifi;
- ifi = parse_interface(*i);
+ ifi = resolve_interface_or_warn(&rtnl, *i);
if (ifi < 0)
return ifi;
_cleanup_free_ char *n = NULL, *a = NULL;
int ifi;
- ifi = parse_interface(*i);
+ ifi = resolve_interface_or_warn(&rtnl, *i);
if (ifi < 0)
return ifi;
#include "escape.h"
#include "format-util.h"
#include "gcrypt-util.h"
-#include "in-addr-util.h"
#include "main-func.h"
#include "missing_network.h"
#include "netlink-util.h"
#include "resolvectl.h"
#include "resolved-def.h"
#include "resolved-dns-packet.h"
+#include "socket-netlink.h"
+#include "stdio-util.h"
#include "string-table.h"
#include "strv.h"
#include "terminal-util.h"
int ifname_mangle(const char *s) {
_cleanup_free_ char *iface = NULL;
const char *dot;
- int ifi, r;
+ int ifi;
assert(s);
if (!iface)
return log_oom();
- r = parse_ifindex_or_ifname(iface, &ifi);
- if (r < 0) {
- if (r == -ENODEV && arg_ifindex_permissive) {
+ ifi = resolve_interface(NULL, iface);
+ if (ifi < 0) {
+ if (ifi == -ENODEV && arg_ifindex_permissive) {
log_debug("Interface '%s' not found, but -f specified, ignoring.", iface);
return 0; /* done */
}
- return log_error_errno(r, "Unknown interface '%s': %m", iface);
+ return log_error_errno(ifi, "Failed to resolve interface \"%s\": %m", iface);
}
if (arg_ifindex > 0 && arg_ifindex != ifi)
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
_cleanup_(link_info_clear) struct link_info link_info = {};
- _cleanup_free_ char *ifi = NULL, *p = NULL;
- char ifname[IF_NAMESIZE + 1] = "";
+ _cleanup_free_ char *p = NULL;
+ char ifi[DECIMAL_STR_MAX(int)], ifname[IF_NAMESIZE + 1] = "";
char **i;
int r;
name = ifname;
}
- if (asprintf(&ifi, "%i", ifindex) < 0)
- return log_oom();
-
+ xsprintf(ifi, "%i", ifindex);
r = sd_bus_path_encode("/org/freedesktop/resolve1/link", ifi, &p);
if (r < 0)
return log_oom();
static int verb_status(int argc, char **argv, void *userdata) {
sd_bus *bus = userdata;
- int q, r = 0;
+ _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
+ int r = 0;
if (argc > 1) {
char **ifname;
bool empty_line = false;
STRV_FOREACH(ifname, argv + 1) {
- int ifindex;
+ int ifindex, q;
- q = parse_ifindex_or_ifname(*ifname, &ifindex);
- if (q < 0) {
- log_error_errno(q, "Unknown interface '%s', ignoring: %m", *ifname);
+ ifindex = resolve_interface(&rtnl, *ifname);
+ if (ifindex < 0) {
+ log_warning_errno(ifindex, "Failed to resolve interface \"%s\", ignoring: %m", *ifname);
continue;
}
#include "resolved-dnssd-bus.h"
#include "resolved-dnssd.h"
#include "resolved-link-bus.h"
+#include "socket-netlink.h"
#include "stdio-util.h"
#include "strv.h"
#include "user-util.h"
#include "hostname-util.h"
#include "resolved-dns-synthesize.h"
#include "resolved-etc-hosts.h"
+#include "socket-netlink.h"
#include "string-util.h"
#include "strv.h"
#include "time-util.h"
int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
_cleanup_free_ char *e = NULL;
Manager *m = userdata;
- int ifindex;
Link *link;
- int r;
+ int ifindex, r;
assert(bus);
assert(path);
if (r <= 0)
return 0;
- r = parse_ifindex(e, &ifindex);
- if (r < 0)
+ ifindex = parse_ifindex(e);
+ if (ifindex < 0)
return 0;
link = hashmap_get(m->links, INT_TO_PTR(ifindex));
void manager_cleanup_saved_user(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
- int r;
assert(m);
if (dot_or_dot_dot(de->d_name))
continue;
- r = parse_ifindex(de->d_name, &ifindex);
- if (r < 0) /* Probably some temporary file from a previous run. Delete it */
+ ifindex = parse_ifindex(de->d_name);
+ if (ifindex < 0) /* Probably some temporary file from a previous run. Delete it */
goto rm;
l = hashmap_get(m->links, INT_TO_PTR(ifindex));
/* SPDX-License-Identifier: LGPL-2.1+ */
#include "alloc-util.h"
-#include "in-addr-util.h"
#include "macro.h"
#include "resolved-util.h"
+#include "socket-netlink.h"
int in_addr_ifindex_name_from_string_auto(const char *s, int *family, union in_addr_union *ret, int *ifindex, char **server_name) {
_cleanup_free_ char *buf = NULL, *name = NULL;
serialize.h
sleep-config.c
sleep-config.h
+ socket-netlink.c
+ socket-netlink.h
spawn-ask-password-agent.c
spawn-ask-password-agent.h
spawn-polkit-agent.c
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <net/if.h>
+#include <string.h>
+
+#include "alloc-util.h"
+#include "errno-util.h"
+#include "extract-word.h"
+#include "log.h"
+#include "memory-util.h"
+#include "netlink-util.h"
+#include "parse-util.h"
+#include "socket-netlink.h"
+#include "socket-util.h"
+#include "string-util.h"
+
+int resolve_ifname(sd_netlink **rtnl, const char *name) {
+ int r;
+
+ /* Like if_nametoindex, but resolves "alternative names" too. */
+
+ assert(name);
+
+ r = if_nametoindex(name);
+ if (r > 0)
+ return r;
+
+ return rtnl_resolve_link_alternative_name(rtnl, name);
+}
+
+int resolve_interface(sd_netlink **rtnl, const char *name) {
+ int r;
+
+ /* Like resolve_ifname, but resolves interface numbers too. */
+
+ assert(name);
+
+ r = parse_ifindex(name);
+ if (r > 0)
+ return r;
+ assert(r < 0);
+
+ return resolve_ifname(rtnl, name);
+}
+
+int resolve_interface_or_warn(sd_netlink **rtnl, const char *name) {
+ int r;
+
+ r = resolve_interface(rtnl, name);
+ if (r < 0)
+ return log_error_errno(r, "Failed to resolve interface \"%s\": %m", name);
+ return r;
+}
+
+int socket_address_parse(SocketAddress *a, const char *s) {
+ _cleanup_free_ char *n = NULL;
+ char *e;
+ int r;
+
+ assert(a);
+ assert(s);
+
+ *a = (SocketAddress) {
+ .type = SOCK_STREAM,
+ };
+
+ if (*s == '[') {
+ uint16_t port;
+
+ /* IPv6 in [x:.....:z]:p notation */
+
+ e = strchr(s+1, ']');
+ if (!e)
+ return -EINVAL;
+
+ n = strndup(s+1, e-s-1);
+ if (!n)
+ return -ENOMEM;
+
+ errno = 0;
+ if (inet_pton(AF_INET6, n, &a->sockaddr.in6.sin6_addr) <= 0)
+ return errno_or_else(EINVAL);
+
+ e++;
+ if (*e != ':')
+ return -EINVAL;
+
+ e++;
+ r = parse_ip_port(e, &port);
+ if (r < 0)
+ return r;
+
+ a->sockaddr.in6.sin6_family = AF_INET6;
+ a->sockaddr.in6.sin6_port = htobe16(port);
+ a->size = sizeof(struct sockaddr_in6);
+
+ } else if (*s == '/') {
+ /* AF_UNIX socket */
+
+ size_t l;
+
+ l = strlen(s);
+ if (l >= sizeof(a->sockaddr.un.sun_path)) /* Note that we refuse non-NUL-terminated sockets when
+ * parsing (the kernel itself is less strict here in what it
+ * accepts) */
+ return -EINVAL;
+
+ a->sockaddr.un.sun_family = AF_UNIX;
+ memcpy(a->sockaddr.un.sun_path, s, l);
+ a->size = offsetof(struct sockaddr_un, sun_path) + l + 1;
+
+ } else if (*s == '@') {
+ /* Abstract AF_UNIX socket */
+ size_t l;
+
+ l = strlen(s+1);
+ if (l >= sizeof(a->sockaddr.un.sun_path) - 1) /* Note that we refuse non-NUL-terminated sockets here
+ * when parsing, even though abstract namespace sockets
+ * explicitly allow embedded NUL bytes and don't consider
+ * them special. But it's simply annoying to debug such
+ * sockets. */
+ return -EINVAL;
+
+ a->sockaddr.un.sun_family = AF_UNIX;
+ memcpy(a->sockaddr.un.sun_path+1, s+1, l);
+ a->size = offsetof(struct sockaddr_un, sun_path) + 1 + l;
+
+ } else if (startswith(s, "vsock:")) {
+ /* AF_VSOCK socket in vsock:cid:port notation */
+ const char *cid_start = s + STRLEN("vsock:");
+ unsigned port;
+
+ e = strchr(cid_start, ':');
+ if (!e)
+ return -EINVAL;
+
+ r = safe_atou(e+1, &port);
+ if (r < 0)
+ return r;
+
+ n = strndup(cid_start, e - cid_start);
+ if (!n)
+ return -ENOMEM;
+
+ if (!isempty(n)) {
+ r = safe_atou(n, &a->sockaddr.vm.svm_cid);
+ if (r < 0)
+ return r;
+ } else
+ a->sockaddr.vm.svm_cid = VMADDR_CID_ANY;
+
+ a->sockaddr.vm.svm_family = AF_VSOCK;
+ a->sockaddr.vm.svm_port = port;
+ a->size = sizeof(struct sockaddr_vm);
+
+ } else {
+ uint16_t port;
+
+ e = strchr(s, ':');
+ if (e) {
+ r = parse_ip_port(e + 1, &port);
+ if (r < 0)
+ return r;
+
+ n = strndup(s, e-s);
+ if (!n)
+ return -ENOMEM;
+
+ /* IPv4 in w.x.y.z:p notation? */
+ r = inet_pton(AF_INET, n, &a->sockaddr.in.sin_addr);
+ if (r < 0)
+ return -errno;
+
+ if (r > 0) {
+ /* Gotcha, it's a traditional IPv4 address */
+ a->sockaddr.in.sin_family = AF_INET;
+ a->sockaddr.in.sin_port = htobe16(port);
+ a->size = sizeof(struct sockaddr_in);
+ } else {
+ int idx;
+
+ /* Uh, our last resort, an interface name */
+ idx = resolve_ifname(NULL, n);
+ if (idx < 0)
+ return idx;
+
+ a->sockaddr.in6.sin6_family = AF_INET6;
+ a->sockaddr.in6.sin6_port = htobe16(port);
+ a->sockaddr.in6.sin6_scope_id = idx;
+ a->sockaddr.in6.sin6_addr = in6addr_any;
+ a->size = sizeof(struct sockaddr_in6);
+ }
+ } else {
+
+ /* Just a port */
+ r = parse_ip_port(s, &port);
+ if (r < 0)
+ return r;
+
+ if (socket_ipv6_is_supported()) {
+ a->sockaddr.in6.sin6_family = AF_INET6;
+ a->sockaddr.in6.sin6_port = htobe16(port);
+ a->sockaddr.in6.sin6_addr = in6addr_any;
+ a->size = sizeof(struct sockaddr_in6);
+ } else {
+ a->sockaddr.in.sin_family = AF_INET;
+ a->sockaddr.in.sin_port = htobe16(port);
+ a->sockaddr.in.sin_addr.s_addr = INADDR_ANY;
+ a->size = sizeof(struct sockaddr_in);
+ }
+ }
+ }
+
+ return 0;
+}
+
+int socket_address_parse_and_warn(SocketAddress *a, const char *s) {
+ SocketAddress b;
+ int r;
+
+ /* Similar to socket_address_parse() but warns for IPv6 sockets when we don't support them. */
+
+ r = socket_address_parse(&b, s);
+ if (r < 0)
+ return r;
+
+ if (!socket_ipv6_is_supported() && b.sockaddr.sa.sa_family == AF_INET6) {
+ log_warning("Binding to IPv6 address not available since kernel does not support IPv6.");
+ return -EAFNOSUPPORT;
+ }
+
+ *a = b;
+ return 0;
+}
+
+int socket_address_parse_netlink(SocketAddress *a, const char *s) {
+ _cleanup_free_ char *word = NULL;
+ unsigned group = 0;
+ int family, r;
+
+ assert(a);
+ assert(s);
+
+ zero(*a);
+ a->type = SOCK_RAW;
+
+ r = extract_first_word(&s, &word, NULL, 0);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return -EINVAL;
+
+ family = netlink_family_from_string(word);
+ if (family < 0)
+ return -EINVAL;
+
+ if (!isempty(s)) {
+ r = safe_atou(s, &group);
+ if (r < 0)
+ return r;
+ }
+
+ a->sockaddr.nl.nl_family = AF_NETLINK;
+ a->sockaddr.nl.nl_groups = group;
+
+ a->type = SOCK_RAW;
+ a->size = sizeof(struct sockaddr_nl);
+ a->protocol = family;
+
+ return 0;
+}
+
+bool socket_address_is(const SocketAddress *a, const char *s, int type) {
+ struct SocketAddress b;
+
+ assert(a);
+ assert(s);
+
+ if (socket_address_parse(&b, s) < 0)
+ return false;
+
+ b.type = type;
+
+ return socket_address_equal(a, &b);
+}
+
+bool socket_address_is_netlink(const SocketAddress *a, const char *s) {
+ struct SocketAddress b;
+
+ assert(a);
+ assert(s);
+
+ if (socket_address_parse_netlink(&b, s) < 0)
+ return false;
+
+ return socket_address_equal(a, &b);
+}
+
+int make_socket_fd(int log_level, const char* address, int type, int flags) {
+ SocketAddress a;
+ int fd, r;
+
+ r = socket_address_parse(&a, address);
+ if (r < 0)
+ return log_error_errno(r, "Failed to parse socket address \"%s\": %m", address);
+
+ a.type = type;
+
+ fd = socket_address_listen(&a, type | flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT,
+ NULL, false, false, false, 0755, 0644, NULL);
+ if (fd < 0 || log_get_max_level() >= log_level) {
+ _cleanup_free_ char *p = NULL;
+
+ r = socket_address_print(&a, &p);
+ if (r < 0)
+ return log_error_errno(r, "socket_address_print(): %m");
+
+ if (fd < 0)
+ log_error_errno(fd, "Failed to listen on %s: %m", p);
+ else
+ log_full(log_level, "Listening on %s", p);
+ }
+
+ return fd;
+}
+
+int in_addr_ifindex_from_string_auto(const char *s, int *family, union in_addr_union *ret_addr, int *ret_ifindex) {
+ _cleanup_free_ char *buf = NULL;
+ const char *suffix;
+ int r, ifindex = 0;
+
+ assert(s);
+ assert(family);
+ assert(ret_addr);
+
+ /* Similar to in_addr_from_string_auto() but also parses an optionally appended IPv6 zone suffix ("scope id")
+ * if one is found. */
+
+ suffix = strchr(s, '%');
+ if (suffix) {
+ if (ret_ifindex) {
+ /* If we shall return the interface index, try to parse it */
+ ifindex = resolve_interface(NULL, suffix + 1);
+ if (ifindex < 0)
+ return ifindex;
+ }
+
+ s = buf = strndup(s, suffix - s);
+ if (!buf)
+ return -ENOMEM;
+ }
+
+ r = in_addr_from_string_auto(s, family, ret_addr);
+ if (r < 0)
+ return r;
+
+ if (ret_ifindex)
+ *ret_ifindex = ifindex;
+
+ return r;
+}
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include "sd-netlink.h"
+
+#include "in-addr-util.h"
+#include "macro.h"
+#include "socket-util.h"
+
+int resolve_ifname(sd_netlink **rtnl, const char *name);
+int resolve_interface(sd_netlink **rtnl, const char *name);
+int resolve_interface_or_warn(sd_netlink **rtnl, const char *name);
+
+int make_socket_fd(int log_level, const char* address, int type, int flags);
+
+int socket_address_parse(SocketAddress *a, const char *s);
+int socket_address_parse_and_warn(SocketAddress *a, const char *s);
+int socket_address_parse_netlink(SocketAddress *a, const char *s);
+
+bool socket_address_is(const SocketAddress *a, const char *s, int type);
+bool socket_address_is_netlink(const SocketAddress *a, const char *s);
+
+int in_addr_ifindex_from_string_auto(const char *s, int *family, union in_addr_union *ret, int *ifindex);
[],
[]],
+ [['src/test/test-socket-netlink.c'],
+ [],
+ []],
+
[['src/test/test-in-addr-util.c'],
[],
[]],
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "alloc-util.h"
+#include "tests.h"
+#include "socket-netlink.h"
+#include "string-util.h"
+
+static void test_socket_address_parse_one(const char *in, int ret, int family, const char *expected) {
+ SocketAddress a;
+ _cleanup_free_ char *out = NULL;
+ int r;
+
+ r = socket_address_parse(&a, in);
+ if (r >= 0)
+ assert_se(socket_address_print(&a, &out) >= 0);
+
+ log_info("\"%s\" → %s → \"%s\" (expect \"%s\")", in,
+ r >= 0 ? "✓" : "✗", empty_to_dash(out), r >= 0 ? expected ?: in : "-");
+ assert_se(r == ret);
+ if (r >= 0) {
+ assert_se(a.sockaddr.sa.sa_family == family);
+ assert_se(streq(out, expected ?: in));
+ }
+}
+
+static void test_socket_address_parse(void) {
+ log_info("/* %s */", __func__);
+
+ test_socket_address_parse_one("junk", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("192.168.1.1", -EINVAL, 0, NULL);
+ test_socket_address_parse_one(".168.1.1", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("989.168.1.1", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("192.168.1.1:65536", -ERANGE, 0, NULL);
+ test_socket_address_parse_one("192.168.1.1:0", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("0", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("65536", -ERANGE, 0, NULL);
+
+ const int default_family = socket_ipv6_is_supported() ? AF_INET6 : AF_INET;
+
+ test_socket_address_parse_one("65535", 0, default_family, "[::]:65535");
+
+ /* The checks below will pass even if ipv6 is disabled in
+ * kernel. The underlying glibc's inet_pton() is just a string
+ * parser and doesn't make any syscalls. */
+
+ test_socket_address_parse_one("[::1]", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("[::1]8888", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("::1", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("[::1]:0", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("[::1]:65536", -ERANGE, 0, NULL);
+ test_socket_address_parse_one("[a:b:1]:8888", -EINVAL, 0, NULL);
+
+ test_socket_address_parse_one("8888", 0, default_family, "[::]:8888");
+ test_socket_address_parse_one("[2001:0db8:0000:85a3:0000:0000:ac1f:8001]:8888", 0, AF_INET6,
+ "[2001:db8:0:85a3::ac1f:8001]:8888");
+ test_socket_address_parse_one("[::1]:8888", 0, AF_INET6, NULL);
+ test_socket_address_parse_one("192.168.1.254:8888", 0, AF_INET, NULL);
+ test_socket_address_parse_one("/foo/bar", 0, AF_UNIX, NULL);
+ test_socket_address_parse_one("/", 0, AF_UNIX, NULL);
+ test_socket_address_parse_one("@abstract", 0, AF_UNIX, NULL);
+
+ {
+ char aaa[SUN_PATH_LEN + 1] = "@";
+
+ memset(aaa + 1, 'a', SUN_PATH_LEN - 1);
+ char_array_0(aaa);
+
+ test_socket_address_parse_one(aaa, -EINVAL, 0, NULL);
+
+ aaa[SUN_PATH_LEN - 1] = '\0';
+ test_socket_address_parse_one(aaa, 0, AF_UNIX, NULL);
+ }
+
+ test_socket_address_parse_one("vsock:2:1234", 0, AF_VSOCK, NULL);
+ test_socket_address_parse_one("vsock::1234", 0, AF_VSOCK, NULL);
+ test_socket_address_parse_one("vsock:2:1234x", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("vsock:2x:1234", -EINVAL, 0, NULL);
+ test_socket_address_parse_one("vsock:2", -EINVAL, 0, NULL);
+}
+
+static void test_socket_address_parse_netlink(void) {
+ SocketAddress a;
+
+ log_info("/* %s */", __func__);
+
+ assert_se(socket_address_parse_netlink(&a, "junk") < 0);
+ assert_se(socket_address_parse_netlink(&a, "") < 0);
+
+ assert_se(socket_address_parse_netlink(&a, "route") >= 0);
+ assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
+ assert_se(a.sockaddr.nl.nl_groups == 0);
+ assert_se(a.protocol == NETLINK_ROUTE);
+ assert_se(socket_address_parse_netlink(&a, "route") >= 0);
+ assert_se(socket_address_parse_netlink(&a, "route 10") >= 0);
+ assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
+ assert_se(a.sockaddr.nl.nl_groups == 10);
+ assert_se(a.protocol == NETLINK_ROUTE);
+
+ /* With spaces and tabs */
+ assert_se(socket_address_parse_netlink(&a, " kobject-uevent ") >= 0);
+ assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
+ assert_se(a.sockaddr.nl.nl_groups == 0);
+ assert_se(a.protocol == NETLINK_KOBJECT_UEVENT);
+ assert_se(socket_address_parse_netlink(&a, " \t kobject-uevent \t 10") >= 0);
+ assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
+ assert_se(a.sockaddr.nl.nl_groups == 10);
+ assert_se(a.protocol == NETLINK_KOBJECT_UEVENT);
+ assert_se(socket_address_parse_netlink(&a, "kobject-uevent\t10") >= 0);
+ assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
+ assert_se(a.sockaddr.nl.nl_groups == 10);
+ assert_se(a.protocol == NETLINK_KOBJECT_UEVENT);
+
+ /* trailing space is not supported */
+ assert_se(socket_address_parse_netlink(&a, "kobject-uevent\t10 ") < 0);
+
+ /* Group must be unsigned */
+ assert_se(socket_address_parse_netlink(&a, "kobject-uevent -1") < 0);
+
+ /* oss-fuzz #6884 */
+ assert_se(socket_address_parse_netlink(&a, "\xff") < 0);
+}
+
+static void test_socket_address_equal(void) {
+ SocketAddress a, b;
+
+ log_info("/* %s */", __func__);
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_parse(&b, "192.168.1.1:888") >= 0);
+ assert_se(!socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_parse(&b, "192.16.1.1:8888") >= 0);
+ assert_se(!socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_parse(&b, "8888") >= 0);
+ assert_se(!socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_parse(&b, "/foo/bar/") >= 0);
+ assert_se(!socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_parse(&b, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "/foo/bar") >= 0);
+ assert_se(socket_address_parse(&b, "/foo/bar") >= 0);
+ assert_se(socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "[::1]:8888") >= 0);
+ assert_se(socket_address_parse(&b, "[::1]:8888") >= 0);
+ assert_se(socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "@abstract") >= 0);
+ assert_se(socket_address_parse(&b, "@abstract") >= 0);
+ assert_se(socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse_netlink(&a, "firewall") >= 0);
+ assert_se(socket_address_parse_netlink(&b, "firewall") >= 0);
+ assert_se(socket_address_equal(&a, &b));
+
+ assert_se(socket_address_parse(&a, "vsock:2:1234") >= 0);
+ assert_se(socket_address_parse(&b, "vsock:2:1234") >= 0);
+ assert_se(socket_address_equal(&a, &b));
+ assert_se(socket_address_parse(&b, "vsock:2:1235") >= 0);
+ assert_se(!socket_address_equal(&a, &b));
+ assert_se(socket_address_parse(&b, "vsock:3:1234") >= 0);
+ assert_se(!socket_address_equal(&a, &b));
+}
+
+static void test_socket_address_get_path(void) {
+ SocketAddress a;
+
+ log_info("/* %s */", __func__);
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(!socket_address_get_path(&a));
+
+ assert_se(socket_address_parse(&a, "@abstract") >= 0);
+ assert_se(!socket_address_get_path(&a));
+
+ assert_se(socket_address_parse(&a, "[::1]:8888") >= 0);
+ assert_se(!socket_address_get_path(&a));
+
+ assert_se(socket_address_parse(&a, "/foo/bar") >= 0);
+ assert_se(streq(socket_address_get_path(&a), "/foo/bar"));
+
+ assert_se(socket_address_parse(&a, "vsock:2:1234") >= 0);
+ assert_se(!socket_address_get_path(&a));
+}
+
+static void test_socket_address_is(void) {
+ SocketAddress a;
+
+ log_info("/* %s */", __func__);
+
+ assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+ assert_se(socket_address_is(&a, "192.168.1.1:8888", SOCK_STREAM));
+ assert_se(!socket_address_is(&a, "route", SOCK_STREAM));
+ assert_se(!socket_address_is(&a, "192.168.1.1:8888", SOCK_RAW));
+}
+
+static void test_socket_address_is_netlink(void) {
+ SocketAddress a;
+
+ log_info("/* %s */", __func__);
+
+ assert_se(socket_address_parse_netlink(&a, "route 10") >= 0);
+ assert_se(socket_address_is_netlink(&a, "route 10"));
+ assert_se(!socket_address_is_netlink(&a, "192.168.1.1:8888"));
+ assert_se(!socket_address_is_netlink(&a, "route 1"));
+}
+
+int main(int argc, char *argv[]) {
+ test_setup_logging(LOG_DEBUG);
+
+ test_socket_address_parse();
+ test_socket_address_parse_netlink();
+ test_socket_address_equal();
+ test_socket_address_get_path();
+ test_socket_address_is();
+ test_socket_address_is_netlink();
+
+ return 0;
+}
#include "macro.h"
#include "missing_network.h"
#include "process-util.h"
+#include "socket-netlink.h"
#include "socket-util.h"
#include "string-util.h"
#include "tests.h"
#include "tmpfile-util.h"
+assert_cc(SUN_PATH_LEN == 108);
+
static void test_ifname_valid(void) {
log_info("/* %s */", __func__);
assert(ifname_valid_full("xxxxxxxxxxxxxxxx", true));
}
-static void test_socket_address_parse_one(const char *in, int ret, int family, const char *expected) {
- SocketAddress a;
- _cleanup_free_ char *out = NULL;
- int r;
-
- r = socket_address_parse(&a, in);
- if (r >= 0)
- assert_se(socket_address_print(&a, &out) >= 0);
-
- log_info("\"%s\" → %s → \"%s\" (expect \"%s\")", in,
- r >= 0 ? "✓" : "✗", empty_to_dash(out), r >= 0 ? expected ?: in : "-");
- assert_se(r == ret);
- if (r >= 0) {
- assert_se(a.sockaddr.sa.sa_family == family);
- assert_se(streq(out, expected ?: in));
- }
-}
-
-#define SUN_PATH_LEN (sizeof(((struct sockaddr_un){}).sun_path))
-assert_cc(SUN_PATH_LEN == 108);
-
-static void test_socket_address_parse(void) {
- log_info("/* %s */", __func__);
-
- test_socket_address_parse_one("junk", -EINVAL, 0, NULL);
- test_socket_address_parse_one("192.168.1.1", -EINVAL, 0, NULL);
- test_socket_address_parse_one(".168.1.1", -EINVAL, 0, NULL);
- test_socket_address_parse_one("989.168.1.1", -EINVAL, 0, NULL);
- test_socket_address_parse_one("192.168.1.1:65536", -ERANGE, 0, NULL);
- test_socket_address_parse_one("192.168.1.1:0", -EINVAL, 0, NULL);
- test_socket_address_parse_one("0", -EINVAL, 0, NULL);
- test_socket_address_parse_one("65536", -ERANGE, 0, NULL);
-
- const int default_family = socket_ipv6_is_supported() ? AF_INET6 : AF_INET;
-
- test_socket_address_parse_one("65535", 0, default_family, "[::]:65535");
-
- /* The checks below will pass even if ipv6 is disabled in
- * kernel. The underlying glibc's inet_pton() is just a string
- * parser and doesn't make any syscalls. */
-
- test_socket_address_parse_one("[::1]", -EINVAL, 0, NULL);
- test_socket_address_parse_one("[::1]8888", -EINVAL, 0, NULL);
- test_socket_address_parse_one("::1", -EINVAL, 0, NULL);
- test_socket_address_parse_one("[::1]:0", -EINVAL, 0, NULL);
- test_socket_address_parse_one("[::1]:65536", -ERANGE, 0, NULL);
- test_socket_address_parse_one("[a:b:1]:8888", -EINVAL, 0, NULL);
-
- test_socket_address_parse_one("8888", 0, default_family, "[::]:8888");
- test_socket_address_parse_one("[2001:0db8:0000:85a3:0000:0000:ac1f:8001]:8888", 0, AF_INET6,
- "[2001:db8:0:85a3::ac1f:8001]:8888");
- test_socket_address_parse_one("[::1]:8888", 0, AF_INET6, NULL);
- test_socket_address_parse_one("192.168.1.254:8888", 0, AF_INET, NULL);
- test_socket_address_parse_one("/foo/bar", 0, AF_UNIX, NULL);
- test_socket_address_parse_one("/", 0, AF_UNIX, NULL);
- test_socket_address_parse_one("@abstract", 0, AF_UNIX, NULL);
-
- {
- char aaa[SUN_PATH_LEN + 1] = "@";
-
- memset(aaa + 1, 'a', SUN_PATH_LEN - 1);
- char_array_0(aaa);
-
- test_socket_address_parse_one(aaa, -EINVAL, 0, NULL);
-
- aaa[SUN_PATH_LEN - 1] = '\0';
- test_socket_address_parse_one(aaa, 0, AF_UNIX, NULL);
- }
-
- test_socket_address_parse_one("vsock:2:1234", 0, AF_VSOCK, NULL);
- test_socket_address_parse_one("vsock::1234", 0, AF_VSOCK, NULL);
- test_socket_address_parse_one("vsock:2:1234x", -EINVAL, 0, NULL);
- test_socket_address_parse_one("vsock:2x:1234", -EINVAL, 0, NULL);
- test_socket_address_parse_one("vsock:2", -EINVAL, 0, NULL);
-}
-
static void test_socket_print_unix_one(const char *in, size_t len_in, const char *expected) {
_cleanup_free_ char *out = NULL, *c = NULL;
test_socket_print_unix_one("\0\a\b\n\255", 6, "@\\a\\b\\n\\255\\000");
}
-static void test_socket_address_parse_netlink(void) {
- SocketAddress a;
-
- log_info("/* %s */", __func__);
-
- assert_se(socket_address_parse_netlink(&a, "junk") < 0);
- assert_se(socket_address_parse_netlink(&a, "") < 0);
-
- assert_se(socket_address_parse_netlink(&a, "route") >= 0);
- assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
- assert_se(a.sockaddr.nl.nl_groups == 0);
- assert_se(a.protocol == NETLINK_ROUTE);
- assert_se(socket_address_parse_netlink(&a, "route") >= 0);
- assert_se(socket_address_parse_netlink(&a, "route 10") >= 0);
- assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
- assert_se(a.sockaddr.nl.nl_groups == 10);
- assert_se(a.protocol == NETLINK_ROUTE);
-
- /* With spaces and tabs */
- assert_se(socket_address_parse_netlink(&a, " kobject-uevent ") >= 0);
- assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
- assert_se(a.sockaddr.nl.nl_groups == 0);
- assert_se(a.protocol == NETLINK_KOBJECT_UEVENT);
- assert_se(socket_address_parse_netlink(&a, " \t kobject-uevent \t 10") >= 0);
- assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
- assert_se(a.sockaddr.nl.nl_groups == 10);
- assert_se(a.protocol == NETLINK_KOBJECT_UEVENT);
- assert_se(socket_address_parse_netlink(&a, "kobject-uevent\t10") >= 0);
- assert_se(a.sockaddr.nl.nl_family == AF_NETLINK);
- assert_se(a.sockaddr.nl.nl_groups == 10);
- assert_se(a.protocol == NETLINK_KOBJECT_UEVENT);
-
- /* trailing space is not supported */
- assert_se(socket_address_parse_netlink(&a, "kobject-uevent\t10 ") < 0);
-
- /* Group must be unsigned */
- assert_se(socket_address_parse_netlink(&a, "kobject-uevent -1") < 0);
-
- /* oss-fuzz #6884 */
- assert_se(socket_address_parse_netlink(&a, "\xff") < 0);
-}
-
-static void test_socket_address_equal(void) {
- SocketAddress a, b;
-
- log_info("/* %s */", __func__);
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_parse(&b, "192.168.1.1:888") >= 0);
- assert_se(!socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_parse(&b, "192.16.1.1:8888") >= 0);
- assert_se(!socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_parse(&b, "8888") >= 0);
- assert_se(!socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_parse(&b, "/foo/bar/") >= 0);
- assert_se(!socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_parse(&b, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "/foo/bar") >= 0);
- assert_se(socket_address_parse(&b, "/foo/bar") >= 0);
- assert_se(socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "[::1]:8888") >= 0);
- assert_se(socket_address_parse(&b, "[::1]:8888") >= 0);
- assert_se(socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "@abstract") >= 0);
- assert_se(socket_address_parse(&b, "@abstract") >= 0);
- assert_se(socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse_netlink(&a, "firewall") >= 0);
- assert_se(socket_address_parse_netlink(&b, "firewall") >= 0);
- assert_se(socket_address_equal(&a, &b));
-
- assert_se(socket_address_parse(&a, "vsock:2:1234") >= 0);
- assert_se(socket_address_parse(&b, "vsock:2:1234") >= 0);
- assert_se(socket_address_equal(&a, &b));
- assert_se(socket_address_parse(&b, "vsock:2:1235") >= 0);
- assert_se(!socket_address_equal(&a, &b));
- assert_se(socket_address_parse(&b, "vsock:3:1234") >= 0);
- assert_se(!socket_address_equal(&a, &b));
-}
-
-static void test_socket_address_get_path(void) {
- SocketAddress a;
-
- log_info("/* %s */", __func__);
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(!socket_address_get_path(&a));
-
- assert_se(socket_address_parse(&a, "@abstract") >= 0);
- assert_se(!socket_address_get_path(&a));
-
- assert_se(socket_address_parse(&a, "[::1]:8888") >= 0);
- assert_se(!socket_address_get_path(&a));
-
- assert_se(socket_address_parse(&a, "/foo/bar") >= 0);
- assert_se(streq(socket_address_get_path(&a), "/foo/bar"));
-
- assert_se(socket_address_parse(&a, "vsock:2:1234") >= 0);
- assert_se(!socket_address_get_path(&a));
-}
-
-static void test_socket_address_is(void) {
- SocketAddress a;
-
- log_info("/* %s */", __func__);
-
- assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
- assert_se(socket_address_is(&a, "192.168.1.1:8888", SOCK_STREAM));
- assert_se(!socket_address_is(&a, "route", SOCK_STREAM));
- assert_se(!socket_address_is(&a, "192.168.1.1:8888", SOCK_RAW));
-}
-
-static void test_socket_address_is_netlink(void) {
- SocketAddress a;
-
- log_info("/* %s */", __func__);
-
- assert_se(socket_address_parse_netlink(&a, "route 10") >= 0);
- assert_se(socket_address_is_netlink(&a, "route 10"));
- assert_se(!socket_address_is_netlink(&a, "192.168.1.1:8888"));
- assert_se(!socket_address_is_netlink(&a, "route 1"));
-}
-
static void test_in_addr_is_null(void) {
union in_addr_union i = {};
test_ifname_valid();
- test_socket_address_parse();
test_socket_print_unix();
- test_socket_address_parse_netlink();
- test_socket_address_equal();
- test_socket_address_get_path();
- test_socket_address_is();
- test_socket_address_is_netlink();
test_in_addr_is_null();
test_in_addr_prefix_intersect();
return 0;
}
-static int parse_ifindex_bus(sd_bus *bus, const char *str, int *ret) {
+static int parse_ifindex_bus(sd_bus *bus, const char *str) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
int32_t i;
assert(bus);
assert(str);
- assert(ret);
- r = parse_ifindex(str, ret);
- if (r >= 0)
- return 0;
+ r = parse_ifindex(str);
+ if (r > 0)
+ return r;
+ assert(r < 0);
r = sd_bus_call_method(
bus,
if (r < 0)
return bus_log_create_error(r);
- *ret = i;
- return 0;
+ return i;
}
static int verb_ntp_servers(int argc, char **argv, void *userdata) {
assert(bus);
- r = parse_ifindex_bus(bus, argv[1], &ifindex);
- if (r < 0)
- return r;
+ ifindex = parse_ifindex_bus(bus, argv[1]);
+ if (ifindex < 0)
+ return ifindex;
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
assert(bus);
- r = parse_ifindex_bus(bus, argv[1], &ifindex);
- if (r < 0)
- return r;
+ ifindex = parse_ifindex_bus(bus, argv[1]);
+ if (ifindex < 0)
+ return ifindex;
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
projects / thirdparty / systemd.git / commitdiff
