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

dhcp/systemd: disable callback before stopping the client

Browse Source 
Otherwise the call to stop() would generate a new unwanted state
transition.
This commit is contained in:
Beniamino Galvani
2016-01-25 09:47:02 +01:00
parent 37d0833a15
commit 3eb5037e1f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,10 +815,13 @@ stop (NMDhcpClient *client, gboolean release, const GByteArray *duid)
NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client); NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
int r = 0; int r = 0;
if (priv->client4) if (priv->client4) {
sd_dhcp_client_set_callback (priv->client4, NULL, NULL);
r = sd_dhcp_client_stop (priv->client4); r = sd_dhcp_client_stop (priv->client4);
else if (priv->client6) } else if (priv->client6) {
sd_dhcp6_client_set_callback (priv->client6, NULL, NULL);
r = sd_dhcp6_client_stop (priv->client6); r = sd_dhcp6_client_stop (priv->client6);
}
if (r) { if (r) {
nm_log_warn (priv->client6 ? LOGD_DHCP6 : LOGD_DHCP4, nm_log_warn (priv->client6 ? LOGD_DHCP6 : LOGD_DHCP4,