fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 23:20:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: rename _dev_ipdhcpx_cleanup() "release" argument

Browse source 
The argument might imply that when set to FALSE, the dhcp client won't
send a RELEASE message. This won't be true with the new
dhcp-send-release option that is going to be introduced.

Instead, change the name to "force_release", when set to TRUE it means
we are sending a RELEASE message even if not indicated by the user. When
set to FALSE, it will be up to the user.

(cherry picked from commit 3be44c0aa8)
This commit is contained in:
Fernando Fernandez Mancera 2024-01-30 15:02:38 +01:00 • committed by Wen Liang
parent 28d23c678a
commit f906604e2e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/devices/nm-device.c
View file

@ -10951,7 +10951,7 @@ _dev_ipdhcpx_set_state(NMDevice *self, int addr_family, NMDeviceIPState state)
}
static void
_dev_ipdhcpx_cleanup(NMDevice *self, int addr_family, gboolean full_cleanup, gboolean release)
_dev_ipdhcpx_cleanup(NMDevice *self, int addr_family, gboolean full_cleanup, gboolean force_release)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
const int IS_IPv4 = NM_IS_IPv4(addr_family);
@ -10969,7 +10969,7 @@ _dev_ipdhcpx_cleanup(NMDevice *self, int addr_family, gboolean full_cleanup, gbo
if (priv->ipdhcp_data_x[IS_IPv4].client) {
nm_clear_g_signal_handler(priv->ipdhcp_data_x[IS_IPv4].client,
&priv->ipdhcp_data_x[IS_IPv4].notify_sigid);
nm_dhcp_client_stop(priv->ipdhcp_data_x[IS_IPv4].client, release);
nm_dhcp_client_stop(priv->ipdhcp_data_x[IS_IPv4].client, force_release);
g_clear_object(&priv->ipdhcp_data_x[IS_IPv4].client);
}