fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 12:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: simplify nm_dhcp_client_set_effective_client_id()

Browse source 
The "take" parameter of _set_effective_client_id() was always "FALSE". Drop it.
Also, drop _set_effective_client_id() and just call nm_dhcp_client_set_effective_client_id()
directly.
This commit is contained in:
Thomas Haller 2022-03-21 13:09:20 +01:00
parent 874403b588
commit 6b191d6ea7
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/core/dhcp/nm-dhcp-client.c
View file

@ -109,22 +109,22 @@ nm_dhcp_client_get_pid(NMDhcpClient *self)
return NM_DHCP_CLIENT_GET_PRIVATE(self)->pid;
}
static void
_set_effective_client_id(NMDhcpClient *self, GBytes *client_id, gboolean take)
void
nm_dhcp_client_set_effective_client_id(NMDhcpClient *self, GBytes *client_id)
{
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
nm_assert(!client_id || g_bytes_get_size(client_id) >= 2);
g_return_if_fail(NM_IS_DHCP_CLIENT(self));
g_return_if_fail(!client_id || g_bytes_get_size(client_id) >= 2);
if (nm_g_bytes_equal0(priv->effective_client_id, client_id)) {
if (take && client_id)
g_bytes_unref(client_id);
priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
if (nm_g_bytes_equal0(priv->effective_client_id, client_id))
return;
}
g_bytes_unref(priv->effective_client_id);
priv->effective_client_id = client_id;
if (!take && client_id)
if (client_id)
g_bytes_ref(client_id);
{
@ -138,15 +138,6 @@ _set_effective_client_id(NMDhcpClient *self, GBytes *client_id, gboolean take)
}
}
void
nm_dhcp_client_set_effective_client_id(NMDhcpClient *self, GBytes *client_id)
{
g_return_if_fail(NM_IS_DHCP_CLIENT(self));
g_return_if_fail(!client_id || g_bytes_get_size(client_id) >= 2);
_set_effective_client_id(self, client_id, FALSE);
}
/*****************************************************************************/
NM_UTILS_LOOKUP_STR_DEFINE(nm_dhcp_state_to_string,
@ -675,7 +666,7 @@ nm_dhcp_client_start_ip6(NMDhcpClient *self, GError **error)
if (!priv->config.v6.enforce_duid)
own_client_id = NM_DHCP_CLIENT_GET_CLASS(self)->get_duid(self);
_set_effective_client_id(self, own_client_id ?: priv->config.client_id, FALSE);
nm_dhcp_client_set_effective_client_id(self, own_client_id ?: priv->config.client_id);
addr = ipv6_lladdr_find(self);
if (!addr) {