Files
systemd/src/shared/bus-message-util.c
T
Lennart Poettering 319a4f4bc4 alloc-util: simplify GREEDY_REALLOC() logic by relying on malloc_usable_size()
We recently started making more use of malloc_usable_size() and rely on
it (see the string_erase() story). Given that we don't really support
sytems where malloc_usable_size() cannot be trusted beyond statistics
anyway, let's go fully in and rework GREEDY_REALLOC() on top of it:
instead of passing around and maintaining the currenly allocated size
everywhere, let's just derive it automatically from
malloc_usable_size().

I am mostly after this for the simplicity this brings. It also brings
minor efficiency improvements I guess, but things become so much nicer
to look at if we can avoid these allocation size variables everywhere.

Note that the malloc_usable_size() man page says relying on it wasn't
"good programming practice", but I think it does this for reasons that
don't apply here: the greedy realloc logic specifically doesn't rely on
the returned extra size, beyond the fact that it is equal or larger than
what was requested.

(This commit was supposed to be a quick patch btw, but apparently we use
the greedy realloc stuff quite a bit across the codebase, so this ends
up touching *a*lot* of code.)
2021-05-19 16:42:37 +02:00

186 lines
5.1 KiB
C

/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "bus-message-util.h"
#include "resolve-util.h"
int bus_message_read_ifindex(sd_bus_message *message, sd_bus_error *error, int *ret) {
int ifindex, r;
assert(message);
assert(ret);
assert_cc(sizeof(int) == sizeof(int32_t));
r = sd_bus_message_read(message, "i", &ifindex);
if (r < 0)
return r;
if (ifindex <= 0)
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index");
*ret = ifindex;
return 0;
}
int bus_message_read_family(sd_bus_message *message, sd_bus_error *error, int *ret) {
int family, r;
assert(message);
assert(ret);
assert_cc(sizeof(int) == sizeof(int32_t));
r = sd_bus_message_read(message, "i", &family);
if (r < 0)
return r;
if (!IN_SET(family, AF_INET, AF_INET6))
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family);
*ret = family;
return 0;
}
int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error, int *ret_family, union in_addr_union *ret_addr) {
int family, r;
const void *d;
size_t sz;
assert(message);
r = sd_bus_message_read(message, "i", &family);
if (r < 0)
return r;
r = sd_bus_message_read_array(message, 'y', &d, &sz);
if (r < 0)
return r;
if (!IN_SET(family, AF_INET, AF_INET6))
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family);
if (sz != FAMILY_ADDRESS_SIZE(family))
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size");
if (ret_family)
*ret_family = family;
if (ret_addr)
memcpy(ret_addr, d, sz);
return 0;
}
static int bus_message_read_dns_one(
sd_bus_message *message,
sd_bus_error *error,
bool extended,
int *ret_family,
union in_addr_union *ret_address,
uint16_t *ret_port,
const char **ret_server_name) {
const char *server_name = NULL;
union in_addr_union a;
uint16_t port = 0;
int family, r;
assert(message);
assert(ret_family);
assert(ret_address);
assert(ret_port);
assert(ret_server_name);
r = sd_bus_message_enter_container(message, 'r', extended ? "iayqs" : "iay");
if (r <= 0)
return r;
r = bus_message_read_in_addr_auto(message, error, &family, &a);
if (r < 0)
return r;
if (!dns_server_address_valid(family, &a)) {
r = sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNS server address");
assert(r < 0);
return r;
}
if (extended) {
r = sd_bus_message_read(message, "q", &port);
if (r < 0)
return r;
if (IN_SET(port, 53, 853))
port = 0;
r = sd_bus_message_read(message, "s", &server_name);
if (r < 0)
return r;
}
r = sd_bus_message_exit_container(message);
if (r < 0)
return r;
*ret_family = family;
*ret_address = a;
*ret_port = port;
*ret_server_name = server_name;
return 1;
}
int bus_message_read_dns_servers(
sd_bus_message *message,
sd_bus_error *error,
bool extended,
struct in_addr_full ***ret_dns,
size_t *ret_n_dns) {
struct in_addr_full **dns = NULL;
size_t n = 0;
int r;
assert(message);
assert(ret_dns);
assert(ret_n_dns);
r = sd_bus_message_enter_container(message, 'a', extended ? "(iayqs)" : "(iay)");
if (r < 0)
return r;
for (;;) {
const char *server_name;
union in_addr_union a;
uint16_t port;
int family;
r = bus_message_read_dns_one(message, error, extended, &family, &a, &port, &server_name);
if (r < 0)
goto clear;
if (r == 0)
break;
if (!GREEDY_REALLOC(dns, n+1)) {
r = -ENOMEM;
goto clear;
}
r = in_addr_full_new(family, &a, port, 0, server_name, dns + n);
if (r < 0)
goto clear;
n++;
}
*ret_dns = TAKE_PTR(dns);
*ret_n_dns = n;
return 0;
clear:
for (size_t i = 0; i < n; i++)
in_addr_full_free(dns[i]);
free(dns);
return r;
}