#include "bus-message-util.h"
#include "bus-polkit.h"
#include "dns-domain.h"
+#include "networkd-json.h"
#include "networkd-link-bus.h"
#include "networkd-link.h"
#include "networkd-manager.h"
+#include "networkd-state-file.h"
#include "parse-util.h"
#include "resolve-util.h"
#include "socket-netlink.h"
BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
BUS_DEFINE_PROPERTY_GET_ENUM(property_get_carrier_state, link_carrier_state, LinkCarrierState);
BUS_DEFINE_PROPERTY_GET_ENUM(property_get_address_state, link_address_state, LinkAddressState);
+BUS_DEFINE_PROPERTY_GET_ENUM(property_get_online_state, link_online_state, LinkOnlineState);
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState);
static int property_get_bit_rates(
void *userdata,
sd_bus_error *error) {
- Link *link = userdata;
+ Link *link = ASSERT_PTR(userdata);
Manager *manager;
double interval_sec;
uint64_t tx, rx;
assert(bus);
assert(reply);
- assert(userdata);
manager = link->manager;
int bus_link_method_set_ntp_servers(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_strv_free_ char **ntp = NULL;
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
- char **i;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
static int bus_link_method_set_dns_servers_internal(sd_bus_message *message, void *userdata, sd_bus_error *error, bool extended) {
struct in_addr_full **dns;
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
size_t n;
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
goto finalize;
}
- if (l->n_dns != (unsigned) -1)
+ if (l->n_dns != UINT_MAX)
for (unsigned i = 0; i < l->n_dns; i++)
in_addr_full_free(l->dns[i]);
}
int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- _cleanup_(ordered_set_freep) OrderedSet *search_domains = NULL, *route_domains = NULL;
- Link *l = userdata;
+ _cleanup_ordered_set_free_ OrderedSet *search_domains = NULL, *route_domains = NULL;
+ Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
if (r < 0)
return r;
+ search_domains = ordered_set_new(&string_hash_ops_free);
+ if (!search_domains)
+ return -ENOMEM;
+
+ route_domains = ordered_set_new(&string_hash_ops_free);
+ if (!route_domains)
+ return -ENOMEM;
+
for (;;) {
_cleanup_free_ char *str = NULL;
- OrderedSet **domains;
const char *name;
int route_only;
if (r == 0)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid search domain %s", name);
if (!route_only && dns_name_is_root(name))
- return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Root domain is not suitable as search domain");
+ return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Root domain is not suitable as search domain");
r = dns_name_normalize(name, 0, &str);
if (r < 0)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid search domain %s", name);
- domains = route_only ? &route_domains : &search_domains;
- r = ordered_set_ensure_allocated(domains, &string_hash_ops);
+ r = ordered_set_consume(route_only ? route_domains : search_domains, TAKE_PTR(str));
+ if (r == -EEXIST)
+ continue;
if (r < 0)
return r;
-
- r = ordered_set_put(*domains, str);
- if (r < 0)
- return r;
-
- TAKE_PTR(str);
}
r = sd_bus_message_exit_container(message);
if (r == 0)
return 1; /* Polkit will call us back */
- ordered_set_free_free(l->search_domains);
- ordered_set_free_free(l->route_domains);
+ ordered_set_free(l->search_domains);
+ ordered_set_free(l->route_domains);
l->search_domains = TAKE_PTR(search_domains);
l->route_domains = TAKE_PTR(route_domains);
}
int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r, b;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
ResolveSupport mode;
const char *llmnr;
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
ResolveSupport mode;
const char *mdns;
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
const char *dns_over_tls;
DnsOverTlsMode mode;
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
const char *dnssec;
DnssecMode mode;
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_set_free_free_ Set *ns = NULL;
_cleanup_strv_free_ char **ntas = NULL;
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
- char **i;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(l);
r = verify_managed_link(l, error);
if (r < 0)
}
int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
- assert(l);
-
if (!l->network)
return sd_bus_error_setf(error, BUS_ERROR_UNMANAGED_INTERFACE,
"Interface %s is not managed by systemd-networkd",
}
int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
- assert(l);
-
if (!l->network)
return sd_bus_error_setf(error, BUS_ERROR_UNMANAGED_INTERFACE,
"Interface %s is not managed by systemd-networkd",
}
int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_error *error) {
- Link *l = userdata;
+ Link *l = ASSERT_PTR(userdata);
int r;
assert(message);
- assert(l);
r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
"org.freedesktop.network1.reconfigure",
if (r == 0)
return 1; /* Polkit will call us back */
- r = link_reconfigure(l, true);
+ r = link_reconfigure(l, /* force = */ true);
if (r < 0)
return r;
if (r > 0) {
return sd_bus_reply_method_return(message, NULL);
}
-const sd_bus_vtable link_vtable[] = {
+int bus_link_method_describe(sd_bus_message *message, void *userdata, sd_bus_error *error) {
+ _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
+ _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
+ _cleanup_free_ char *text = NULL;
+ Link *link = ASSERT_PTR(userdata);
+ int r;
+
+ assert(message);
+
+ r = link_build_json(link, &v);
+ if (r < 0)
+ return log_link_error_errno(link, r, "Failed to build JSON data: %m");
+
+ r = json_variant_format(v, 0, &text);
+ if (r < 0)
+ return log_link_error_errno(link, r, "Failed to format JSON data: %m");
+
+ r = sd_bus_message_new_method_return(message, &reply);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_append(reply, "s", text);
+ if (r < 0)
+ return r;
+
+ return sd_bus_send(NULL, reply, NULL);
+}
+
+static const sd_bus_vtable link_vtable[] = {
SD_BUS_VTABLE_START(0),
SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Link, operstate), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("CarrierState", "s", property_get_carrier_state, offsetof(Link, carrier_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("AddressState", "s", property_get_address_state, offsetof(Link, address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("IPv4AddressState", "s", property_get_address_state, offsetof(Link, ipv4_address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("IPv6AddressState", "s", property_get_address_state, offsetof(Link, ipv6_address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("OnlineState", "s", property_get_online_state, offsetof(Link, online_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("AdministrativeState", "s", property_get_administrative_state, offsetof(Link, state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("BitRates", "(tt)", property_get_bit_rates, 0, 0),
SD_BUS_NO_RESULT,
bus_link_method_reconfigure,
SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD_WITH_ARGS("Describe",
+ SD_BUS_NO_ARGS,
+ SD_BUS_RESULT("s", json),
+ bus_link_method_describe,
+ SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END
};
int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
_cleanup_strv_free_ char **l = NULL;
- Manager *m = userdata;
+ Manager *m = ASSERT_PTR(userdata);
unsigned c = 0;
Link *link;
assert(bus);
assert(path);
- assert(m);
assert(nodes);
- l = new0(char*, hashmap_size(m->links) + 1);
+ l = new0(char*, hashmap_size(m->links_by_index) + 1);
if (!l)
return -ENOMEM;
- HASHMAP_FOREACH(link, m->links) {
+ HASHMAP_FOREACH(link, m->links_by_index) {
char *p;
p = link_bus_path(link);
int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
_cleanup_free_ char *identifier = NULL;
- Manager *m = userdata;
+ Manager *m = ASSERT_PTR(userdata);
Link *link;
int ifindex, r;
assert(bus);
assert(path);
assert(interface);
- assert(m);
assert(found);
r = sd_bus_path_decode(path, "/org/freedesktop/network1/link", &identifier);
if (ifindex < 0)
return 0;
- r = link_get(m, ifindex, &link);
+ r = link_get_by_index(m, ifindex, &link);
if (r < 0)
return 0;
assert(link->manager);
assert(properties);
- if (!link->manager->bus)
+ if (sd_bus_is_ready(link->manager->bus) <= 0)
return 0;
p = link_bus_path(link);
return link_send_changed_strv(link, properties);
}
+
+const BusObjectImplementation link_object = {
+ "/org/freedesktop/network1/link",
+ "org.freedesktop.network1.Link",
+ .fallback_vtables = BUS_FALLBACK_VTABLES({link_vtable, link_object_find}),
+ .node_enumerator = link_node_enumerator,
+};
projects / thirdparty / systemd.git / blobdiff