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

dhcp: use NMIPConfig type for argument of nm_dhcp_client_set_state()

Browse source
This commit is contained in:
Thomas Haller 2018-05-25 11:15:43 +02:00
parent ef8782127f
commit 181cf5c709
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/dhcp/nm-dhcp-client.c
View file

@ -359,26 +359,25 @@ stop (NMDhcpClient *self, gboolean release, GBytes *duid)
void
nm_dhcp_client_set_state (NMDhcpClient *self,
NMDhcpState new_state,
GObject *ip_config,
NMIPConfig *ip_config,
GHashTable *options)
{
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
gs_free char *event_id = NULL;
if (new_state == NM_DHCP_STATE_BOUND) {
g_return_if_fail (NM_IS_IP_CONFIG (ip_config, priv->addr_family));
g_return_if_fail (options);
} else {
g_return_if_fail (!ip_config);
g_return_if_fail (!options);
}
if (new_state >= NM_DHCP_STATE_BOUND)
timeout_cleanup (self);
if (new_state >= NM_DHCP_STATE_TIMEOUT)
watch_cleanup (self);
if (new_state == NM_DHCP_STATE_BOUND) {
g_assert ( (priv->addr_family == AF_INET && NM_IS_IP4_CONFIG (ip_config))
|| (priv->addr_family == AF_INET6 && NM_IS_IP6_CONFIG (ip_config)));
g_assert (options);
} else {
g_assert (ip_config == NULL);
g_assert (options == NULL);
}
/* The client may send same-state transitions for RENEW/REBIND events and
* the lease may have changed, so handle same-state transitions for the
* BOUND state. Ignore same-state transitions for other events since
@ -851,7 +850,7 @@ nm_dhcp_client_handle_event (gpointer unused,
g_clear_pointer (&str_options, g_hash_table_unref);
}
nm_dhcp_client_set_state (self, new_state, G_OBJECT (ip_config), str_options);
nm_dhcp_client_set_state (self, new_state, ip_config, str_options);
}
return TRUE;

2
src/dhcp/nm-dhcp-client.h
View file

@ -168,7 +168,7 @@ void nm_dhcp_client_watch_child (NMDhcpClient *self, pid_t pid);
void nm_dhcp_client_set_state (NMDhcpClient *self,
NMDhcpState new_state,
GObject *ip_config, /* NMIP4Config or NMIP6Config */
NMIPConfig *ip_config,
GHashTable *options); /* str:str hash */
gboolean nm_dhcp_client_handle_event (gpointer unused,

4
src/dhcp/nm-dhcp-systemd.c
View file

@ -513,7 +513,7 @@ bound4_handle (NMDhcpSystemd *self)
nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
NM_DHCP_STATE_BOUND,
G_OBJECT (ip4_config),
NM_IP_CONFIG_CAST (ip4_config),
options);
} else {
_LOGW ("%s", error->message);
@ -822,7 +822,7 @@ bound6_handle (NMDhcpSystemd *self)
if (ip6_config) {
nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
NM_DHCP_STATE_BOUND,
G_OBJECT (ip6_config),
NM_IP_CONFIG_CAST (ip6_config),
options);
} else {
_LOGW ("%s", error->message);