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

dhcp: make nm_dhcp_client_set_state() available to subclasses

Browse source 
Not all state changes will be done in the base NMDHCPClient class
anymore, especially with non-subprocess DHCP clients.
This commit is contained in:
Dan Williams 2014-05-30 17:11:49 -05:00
parent a7a84d7f76
commit 180d298dea
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dhcp-manager/nm-dhcp-client.c
View file

@ -183,11 +183,11 @@ signal_remove (gpointer user_data)
return FALSE;
}
static void
dhcp_client_set_state (NMDHCPClient *self,
NMDhcpState state,
gboolean emit_state,
gboolean remove_now)
void
nm_dhcp_client_set_state (NMDHCPClient *self,
NMDhcpState state,
gboolean emit_state,
gboolean remove_now)
{
NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
@ -218,7 +218,7 @@ daemon_timeout (gpointer user_data)
"(%s): DHCPv%c request timed out.",
priv->iface,
priv->ipv6 ? '6' : '4');
dhcp_client_set_state (self, NM_DHCP_STATE_TIMEOUT, TRUE, FALSE);
nm_dhcp_client_set_state (self, NM_DHCP_STATE_TIMEOUT, TRUE, FALSE);
return G_SOURCE_REMOVE;
}
@ -249,7 +249,7 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data)
timeout_cleanup (self);
priv->pid = -1;
dhcp_client_set_state (self, new_state, TRUE, FALSE);
nm_dhcp_client_set_state (self, new_state, TRUE, FALSE);
}
void
@ -517,11 +517,9 @@ nm_dhcp_client_stop (NMDHCPClient *self, gboolean release)
g_assert (priv->pid == -1);
/* And clean stuff up */
dhcp_client_set_state (self, NM_DHCP_STATE_DONE, FALSE, TRUE);
nm_dhcp_client_set_state (self, NM_DHCP_STATE_DONE, FALSE, TRUE);
g_hash_table_remove_all (priv->options);
timeout_cleanup (self);
watch_cleanup (self);
}
@ -663,7 +661,7 @@ nm_dhcp_client_new_options (NMDHCPClient *self,
state_to_string (old_state),
state_to_string (new_state));
dhcp_client_set_state (self, new_state, TRUE, FALSE);
nm_dhcp_client_set_state (self, new_state, TRUE, FALSE);
}
#define NEW_TAG "new_"

7
src/dhcp-manager/nm-dhcp-client.h
View file

@ -131,12 +131,17 @@ NMIP4Config *nm_dhcp_client_get_ip4_config (NMDHCPClient *self, gboolean test)
NMIP6Config *nm_dhcp_client_get_ip6_config (NMDHCPClient *self, gboolean test);
/* Backend helpers */
/* Backend helpers for subclasses */
void nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name);
void nm_dhcp_client_stop_pid (pid_t pid, const char *iface);
void nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid);
void nm_dhcp_client_set_state (NMDHCPClient *self,
NMDhcpState state,
gboolean emit_state,
gboolean remove_now);
#endif /* NM_DHCP_CLIENT_H */