fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 20:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: merge branch 'th/device-ip-config-on-link-up-rh1309899'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1309899

(cherry picked from commit 05010747b2)
(cherry picked from commit 0c3dc9d326)
This commit is contained in:
Thomas Haller 2016-05-12 15:03:32 +02:00
commit e7c70c4ab2
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/devices/nm-device.c
View file

@ -370,6 +370,9 @@ static gboolean nm_device_set_ip6_config (NMDevice *self,
gboolean commit,
gboolean routes_full_sync,
NMDeviceStateReason *reason);
static gboolean ip6_config_merge_and_apply (NMDevice *self,
gboolean commit,
NMDeviceStateReason *out_reason);
static gboolean nm_device_master_add_slave (NMDevice *self, NMDevice *slave, gboolean configure);
static void nm_device_slave_notify_enslave (NMDevice *self, gboolean success);
@ -1516,6 +1519,19 @@ device_link_changed (NMDevice *self)
}
}
if (priv->up && !was_up) {
/* the link was down and just came up. That happens for example, while changing MTU.
* We must restore IP configuration. */
if (priv->ip4_state == IP_DONE) {
if (!ip4_config_merge_and_apply (self, NULL, TRUE, NULL))
_LOGW (LOGD_IP4, "failed applying IP4 config after link comes up again");
}
if (priv->ip6_state == IP_DONE) {
if (!ip6_config_merge_and_apply (self, TRUE, NULL))
_LOGW (LOGD_IP6, "failed applying IP6 config after link comes up again");
}
}
return G_SOURCE_REMOVE;
}
@ -6544,6 +6560,9 @@ nm_device_set_ip4_config (NMDevice *self,
g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
_LOGD (LOGD_IP4, "ip4-config: update (commit=%d, routes-full-sync=%d, new-config=%p)",
commit, routes_full_sync, new_config);
priv = NM_DEVICE_GET_PRIVATE (self);
ip_ifindex = nm_device_get_ip_ifindex (self);
@ -6571,7 +6590,7 @@ nm_device_set_ip4_config (NMDevice *self,
* this causes a re-read and reset. This should only happen for relevant changes */
nm_ip4_config_replace (old_config, new_config, &has_changes);
if (has_changes) {
_LOGD (LOGD_IP4, "update IP4Config instance (%s)",
_LOGD (LOGD_IP4, "ip4-config: update IP4Config instance (%s)",
nm_ip4_config_get_dbus_path (old_config));
}
} else {
@ -6583,13 +6602,13 @@ nm_device_set_ip4_config (NMDevice *self,
nm_ip4_config_export (new_config);
}
_LOGD (LOGD_IP4, "set IP4Config instance (%s)",
_LOGD (LOGD_IP4, "ip4-config: set IP4Config instance (%s)",
nm_ip4_config_get_dbus_path (new_config));
}
} else if (old_config) {
has_changes = TRUE;
priv->ip4_config = NULL;
_LOGD (LOGD_IP4, "clear IP4Config instance (%s)",
_LOGD (LOGD_IP4, "ip4-config: clear IP4Config instance (%s)",
nm_ip4_config_get_dbus_path (old_config));
/* Device config is invalid if combined config is invalid */
g_clear_object (&priv->dev_ip4_config);
@ -6677,6 +6696,9 @@ nm_device_set_ip6_config (NMDevice *self,
g_return_val_if_fail (NM_IS_DEVICE (self), FALSE);
_LOGD (LOGD_IP6, "ip6-config: update (commit=%d, routes-full-sync=%d, new-config=%p)",
commit, routes_full_sync, new_config);
priv = NM_DEVICE_GET_PRIVATE (self);
ip_ifindex = nm_device_get_ip_ifindex (self);
@ -6698,7 +6720,7 @@ nm_device_set_ip6_config (NMDevice *self,
* this causes a re-read and reset. This should only happen for relevant changes */
nm_ip6_config_replace (old_config, new_config, &has_changes);
if (has_changes) {
_LOGD (LOGD_IP6, "update IP6Config instance (%s)",
_LOGD (LOGD_IP6, "ip6-config: update IP6Config instance (%s)",
nm_ip6_config_get_dbus_path (old_config));
}
} else {
@ -6710,13 +6732,13 @@ nm_device_set_ip6_config (NMDevice *self,
nm_ip6_config_export (new_config);
}
_LOGD (LOGD_IP6, "set IP6Config instance (%s)",
_LOGD (LOGD_IP6, "ip6-config: set IP6Config instance (%s)",
nm_ip6_config_get_dbus_path (new_config));
}
} else if (old_config) {
has_changes = TRUE;
priv->ip6_config = NULL;
_LOGD (LOGD_IP6, "clear IP6Config instance (%s)",
_LOGD (LOGD_IP6, "ip6-config: clear IP6Config instance (%s)",
nm_ip6_config_get_dbus_path (old_config));
}

9
src/platform/nm-linux-platform.c
View file

@ -1887,9 +1887,14 @@ cache_pre_hook (NMPCache *cache, const NMPObject *old, const NMPObject *new, NMP
if ( ops_type == NMP_CACHE_OPS_UPDATED
&& old && new /* <-- nonsensical, make coverity happy */
&& old->_link.netlink.is_in_netlink
&& NM_FLAGS_HAS (old->link.flags, IFF_LOWER_UP)
&& new->_link.netlink.is_in_netlink
&& !NM_FLAGS_HAS (new->link.flags, IFF_LOWER_UP)) {
&& ( ( NM_FLAGS_HAS (old->link.flags, IFF_UP)
&& !NM_FLAGS_HAS (new->link.flags, IFF_UP))
|| ( NM_FLAGS_HAS (old->link.flags, IFF_LOWER_UP)
&& !NM_FLAGS_HAS (new->link.flags, IFF_LOWER_UP)))) {
/* FIXME: I suspect that IFF_LOWER_UP must not be considered, and I
* think kernel does send RTM_DELROUTE events for IPv6 routes, so
* we might not need to refresh IPv6 routes. */
delayed_action_schedule (platform,
DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES |
DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES,