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

3
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
View File

@@ -103,5 +103,8 @@ int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease);
int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const void *client_id, size_t client_id_len); int dhcp_lease_set_client_id(sd_dhcp_lease *lease, const void *client_id, size_t client_id_len);
int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file);
int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file);
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_lease*, sd_dhcp_lease_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(sd_dhcp_lease*, sd_dhcp_lease_unref);
#define _cleanup_dhcp_lease_unref_ _cleanup_(sd_dhcp_lease_unrefp) #define _cleanup_dhcp_lease_unref_ _cleanup_(sd_dhcp_lease_unrefp)

4
src/systemd/src/libsystemd-network/sd-dhcp-lease.c
View File

@@ -704,7 +704,7 @@ int dhcp_lease_new(sd_dhcp_lease **ret) {
return 0; return 0;
} }
int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
_cleanup_free_ char *temp_path = NULL; _cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL; _cleanup_fclose_ FILE *f = NULL;
struct sd_dhcp_raw_option *option; struct sd_dhcp_raw_option *option;
@@ -855,7 +855,7 @@ fail:
return log_error_errno(r, "Failed to save lease data %s: %m", lease_file); return log_error_errno(r, "Failed to save lease data %s: %m", lease_file);
} }
int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) { int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) {
_cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL; _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
_cleanup_free_ char _cleanup_free_ char

3
src/systemd/src/systemd/sd-dhcp-lease.h
View File

@@ -54,7 +54,4 @@ int sd_dhcp_lease_get_vendor_specific(sd_dhcp_lease *lease, const void **data, s
int sd_dhcp_lease_get_client_id(sd_dhcp_lease *lease, const void **client_id, size_t *client_id_len); int sd_dhcp_lease_get_client_id(sd_dhcp_lease *lease, const void **client_id, size_t *client_id_len);
int sd_dhcp_lease_get_timezone(sd_dhcp_lease *lease, const char **timezone); int sd_dhcp_lease_get_timezone(sd_dhcp_lease *lease, const char **timezone);
int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file);
int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file);
#endif #endif