colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "systemd/dhcp: make sd_dhcp_lease_*() functions public again"

Browse Source 
Upstream systemd made a previously "public" API internal. In commit
e82f430eae I fixed that up by reverting
the upstream patch. Revise that, and instead adjust our usage of the
API to use the internal API.

After all, we anyway make use of systemd API that is not (currently)
intended to become part of the public API. Before the systemd library
happens, we must revisit this.

This reverts commit e82f430eae.
This commit is contained in:
Thomas Haller
2015-09-16 17:06:08 +02:00
parent 2ca1021168
commit 597efc7687
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dhcp-manager/nm-dhcp-systemd.c
View File

@@ -390,7 +390,7 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
return NULL;
path = get_leasefile_path (iface, uuid, FALSE);
r = sd_dhcp_lease_load (&lease, path);
r = dhcp_lease_load (&lease, path);
if (r == 0 && lease) {
ip4_config = lease_to_ip4_config (iface, ifindex, lease, NULL, default_route_metric, FALSE, NULL);
if (ip4_config)
@@ -458,7 +458,7 @@ bound4_handle (NMDhcpSystemd *self)
uint8_t type = 0;
add_requests_to_options (options, dhcp4_requests);
sd_dhcp_lease_save (lease, priv->lease_file);
dhcp_lease_save (lease, priv->lease_file);
sd_dhcp_client_get_client_id(priv->client4, &type, &client_id, &client_id_len);
if (client_id)
@@ -581,7 +581,7 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
goto error;
}
sd_dhcp_lease_load (&lease, priv->lease_file);
dhcp_lease_load (&lease, priv->lease_file);
if (last_ip4_address)
inet_pton (AF_INET, last_ip4_address, &last_addr);