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

core: ensure proper handling of sysctl paths in NMDevice (set NULL on dispose)

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-01-31 14:52:14 +01:00
parent 61efa27cac
commit 2e1db48e71
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4700,9 +4700,12 @@ nm_device_deactivate (NMDevice *self, NMDeviceStateReason reason)
aipd_cleanup (self);
/* Turn off kernel IPv6 */
nm_platform_sysctl_set (priv->ip6_disable_ipv6_path, "1");
nm_platform_sysctl_set (priv->ip6_accept_ra_path, "0");
nm_platform_sysctl_set (priv->ip6_use_tempaddr_path, "0");
if (priv->ip6_disable_ipv6_path)
nm_platform_sysctl_set (priv->ip6_disable_ipv6_path, "1");
if (priv->ip6_accept_ra_path)
nm_platform_sysctl_set (priv->ip6_accept_ra_path, "0");
if (priv->ip6_use_tempaddr_path)
nm_platform_sysctl_set (priv->ip6_use_tempaddr_path, "0");
/* Call device type-specific deactivation */
if (NM_DEVICE_GET_CLASS (self)->deactivate)
@@ -5480,9 +5483,9 @@ dispose (GObject *object)
g_clear_object (&priv->vpn6_config);
g_clear_object (&priv->ext_ip6_config);
g_free (priv->ip6_disable_ipv6_path);
g_free (priv->ip6_accept_ra_path);
g_free (priv->ip6_use_tempaddr_path);
g_clear_pointer (&priv->ip6_disable_ipv6_path, g_free);
g_clear_pointer (&priv->ip6_accept_ra_path, g_free);
g_clear_pointer (&priv->ip6_use_tempaddr_path, g_free);
if (priv->carrier_defer_id) {
g_source_remove (priv->carrier_defer_id);