mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
network: introduce bus method forcerenew for DHCP server
This commit is contained in:
parent
ad5555b42e
commit
90867f6a3a
@ -572,6 +572,35 @@ int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_e
|
|||||||
return sd_bus_reply_method_return(message, NULL);
|
return sd_bus_reply_method_return(message, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
||||||
|
Link *l = 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",
|
||||||
|
l->ifname);
|
||||||
|
|
||||||
|
r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
|
||||||
|
"org.freedesktop.network1.forcerenew",
|
||||||
|
NULL, true, UID_INVALID,
|
||||||
|
&l->manager->polkit_registry, error);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
if (r == 0)
|
||||||
|
return 1; /* Polkit will call us back */
|
||||||
|
|
||||||
|
if (l->dhcp_server) {
|
||||||
|
r = sd_dhcp_server_forcerenew(l->dhcp_server);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sd_bus_reply_method_return(message, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
||||||
Link *l = userdata;
|
Link *l = userdata;
|
||||||
int r;
|
int r;
|
||||||
@ -651,6 +680,7 @@ const sd_bus_vtable link_vtable[] = {
|
|||||||
SD_BUS_METHOD("RevertNTP", NULL, NULL, bus_link_method_revert_ntp, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("RevertNTP", NULL, NULL, bus_link_method_revert_ntp, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("RevertDNS", NULL, NULL, bus_link_method_revert_dns, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("RevertDNS", NULL, NULL, bus_link_method_revert_dns, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("Renew", NULL, NULL, bus_link_method_renew, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("Renew", NULL, NULL, bus_link_method_renew, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
|
SD_BUS_METHOD("ForceRenew", NULL, NULL, bus_link_method_force_renew, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("Reconfigure", NULL, NULL, bus_link_method_reconfigure, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("Reconfigure", NULL, NULL, bus_link_method_reconfigure, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
|
|
||||||
SD_BUS_VTABLE_END
|
SD_BUS_VTABLE_END
|
||||||
|
@ -31,4 +31,5 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v
|
|||||||
int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
int bus_link_method_revert_ntp(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||||
int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
int bus_link_method_revert_dns(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||||
int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
int bus_link_method_renew(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||||
|
int bus_link_method_force_renew(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||||
int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
int bus_link_method_reconfigure(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||||
|
@ -191,6 +191,10 @@ static int bus_method_renew_link(sd_bus_message *message, void *userdata, sd_bus
|
|||||||
return call_link_method(userdata, message, bus_link_method_renew, error);
|
return call_link_method(userdata, message, bus_link_method_renew, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int bus_method_force_renew_link(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
||||||
|
return call_link_method(userdata, message, bus_link_method_force_renew, error);
|
||||||
|
}
|
||||||
|
|
||||||
static int bus_method_reconfigure_link(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
static int bus_method_reconfigure_link(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
||||||
return call_link_method(userdata, message, bus_link_method_reconfigure, error);
|
return call_link_method(userdata, message, bus_link_method_reconfigure, error);
|
||||||
}
|
}
|
||||||
@ -249,6 +253,7 @@ const sd_bus_vtable manager_vtable[] = {
|
|||||||
SD_BUS_METHOD("RevertLinkNTP", "i", NULL, bus_method_revert_link_ntp, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("RevertLinkNTP", "i", NULL, bus_method_revert_link_ntp, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("RevertLinkDNS", "i", NULL, bus_method_revert_link_dns, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("RevertLinkDNS", "i", NULL, bus_method_revert_link_dns, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("RenewLink", "i", NULL, bus_method_renew_link, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("RenewLink", "i", NULL, bus_method_renew_link, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
|
SD_BUS_METHOD("ForceRenewLink", "i", NULL, bus_method_force_renew_link, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("ReconfigureLink", "i", NULL, bus_method_reconfigure_link, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("ReconfigureLink", "i", NULL, bus_method_reconfigure_link, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
SD_BUS_METHOD("Reload", NULL, NULL, bus_method_reload, SD_BUS_VTABLE_UNPRIVILEGED),
|
SD_BUS_METHOD("Reload", NULL, NULL, bus_method_reload, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user