chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp-lease: expose load/save functions
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index dcbe38a90a6089857180813293a9312ecde886e0..fcfbd3e12373f95a948780d60543f8698d12427f 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-344,15
+344,6
@@
static int link_stop_clients(Link *link) {
}
}
}
}
- if (link->dhcp_server) {
- k = sd_dhcp_server_stop(link->dhcp_server);
- if (k < 0) {
- log_warning_link(link, "Could not stop DHCPv4 server: %s",
- strerror(-r));
- r = k;
- }
- }
-
if(link->icmp6_router_discovery) {
if (link->dhcp6_client) {
if(link->icmp6_router_discovery) {
if (link->dhcp6_client) {
@@
-909,7
+900,9
@@
static void icmp6_router_handler(sd_icmp6_nd *nd, int event, void *userdata) {
return;
}
return;
}
- r = sd_dhcp6_client_set_mac(link->dhcp6_client, &link->mac);
+ r = sd_dhcp6_client_set_mac(link->dhcp6_client,
+ (const uint8_t *) &link->mac,
+ sizeof (link->mac), ARPHRD_ETHER);
if (r < 0) {
link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client);
return;
if (r < 0) {
link->dhcp6_client = sd_dhcp6_client_unref(link->dhcp6_client);
return;
@@
-1647,7
+1640,9
@@
int link_update(Link *link, sd_rtnl_message *m) {
if (link->dhcp_client) {
r = sd_dhcp_client_set_mac(link->dhcp_client,
if (link->dhcp_client) {
r = sd_dhcp_client_set_mac(link->dhcp_client,
- &link->mac);
+ (const uint8_t *) &link->mac,
+ sizeof (link->mac),
+ ARPHRD_ETHER);
if (r < 0) {
log_warning_link(link,
"Could not update MAC address in DHCP client: %s",
if (r < 0) {
log_warning_link(link,
"Could not update MAC address in DHCP client: %s",
@@
-1658,7
+1653,9
@@
int link_update(Link *link, sd_rtnl_message *m) {
if (link->dhcp6_client) {
r = sd_dhcp6_client_set_mac(link->dhcp6_client,
if (link->dhcp6_client) {
r = sd_dhcp6_client_set_mac(link->dhcp6_client,
- &link->mac);
+ (const uint8_t *) &link->mac,
+ sizeof (link->mac),
+ ARPHRD_ETHER);
if (r < 0) {
log_warning_link(link,
"Could not update MAC address in DHCPv6 client: %s",
if (r < 0) {
log_warning_link(link,
"Could not update MAC address in DHCPv6 client: %s",
@@
-1860,7
+1857,7
@@
int link_save(Link *link) {
if (link->dhcp_lease) {
assert(link->network);
if (link->dhcp_lease) {
assert(link->network);
- r = dhcp_lease_save(link->dhcp_lease, link->lease_file);
+ r =
sd_
dhcp_lease_save(link->dhcp_lease, link->lease_file);
if (r < 0)
goto fail;
if (r < 0)
goto fail;