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

device: add assertions for queued_ip4_config_change() and queued_ip6_config_change()

Browse Source
This commit is contained in:
Thomas Haller
2016-05-05 11:05:07 +02:00
parent b6a92cbdc3
commit ec2a21702a
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/devices/nm-device.c
View File

@@ -1941,6 +1941,8 @@ realize_start_setup (NMDevice *self, const NMPlatformLink *plink)
g_return_if_fail (nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT));
g_return_if_fail (priv->ip_ifindex <= 0);
g_return_if_fail (priv->ip_iface == NULL);
g_return_if_fail (!priv->queued_ip4_config_id);
g_return_if_fail (!priv->queued_ip6_config_id);
_LOGD (LOGD_DEVICE, "start setup of %s, kernel ifindex %d", G_OBJECT_TYPE_NAME (self), plink ? plink->ifindex : 0);
@@ -9083,8 +9085,12 @@ nm_device_capture_initial_config (NMDevice *self)
static gboolean
queued_ip4_config_change (gpointer user_data)
{
NMDevice *self = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMDevice *self = user_data;
NMDevicePrivate *priv;
g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE);
priv = NM_DEVICE_GET_PRIVATE (self);
/* Wait for any queued state changes */
if (priv->queued_state.id)
@@ -9103,11 +9109,15 @@ queued_ip4_config_change (gpointer user_data)
static gboolean
queued_ip6_config_change (gpointer user_data)
{
NMDevice *self = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMDevice *self = user_data;
NMDevicePrivate *priv;
GSList *iter;
gboolean need_ipv6ll = FALSE;
g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE);
priv = NM_DEVICE_GET_PRIVATE (self);
/* Wait for any queued state changes */
if (priv->queued_state.id)
return TRUE;