diff options
| author | Antti Kaijanmäki <antti@kaijanmaki.net> | 2008-08-18 08:30:28 +0000 |
|---|---|---|
| committer | Antti Kaijanmäki <antti@kaijanmaki.net> | 2008-08-18 08:30:28 +0000 |
| commit | 2c21a2fe6b0498585fba0beb003ac8aa6351803c (patch) | |
| tree | 9544edfe2ed9a6c96eda933c35fb5110f1d666c6 /src/NetworkManagerSystem.c | |
| parent | e04934d93efba622123809cc767488af673b2967 (diff) | |
| download | NetworkManager-mbca.tar.gz | |
keep up with trunkmbca
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/mbca@3981 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/NetworkManagerSystem.c')
| -rw-r--r-- | src/NetworkManagerSystem.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c index bf6b11d792..c97d18ded2 100644 --- a/src/NetworkManagerSystem.c +++ b/src/NetworkManagerSystem.c @@ -385,7 +385,7 @@ nm_system_vpn_device_set_from_ip4_config (NMDevice *active_device, out: named_mgr = nm_named_manager_get (); - nm_named_manager_add_ip4_config (named_mgr, config, NM_NAMED_IP_CONFIG_TYPE_VPN); + nm_named_manager_add_ip4_config (named_mgr, iface, config, NM_NAMED_IP_CONFIG_TYPE_VPN); g_object_unref (named_mgr); return TRUE; @@ -406,7 +406,7 @@ gboolean nm_system_vpn_device_unset_from_ip4_config (NMDevice *active_device, co g_return_val_if_fail (config != NULL, FALSE); named_mgr = nm_named_manager_get (); - nm_named_manager_remove_ip4_config (named_mgr, config); + nm_named_manager_remove_ip4_config (named_mgr, iface, config); g_object_unref (named_mgr); return TRUE; @@ -428,10 +428,10 @@ gboolean nm_system_device_set_up_down (NMDevice *dev, gboolean up) gboolean nm_system_device_set_up_down_with_iface (const char *iface, gboolean up) { + struct rtnl_link *request = NULL, *old = NULL; + struct nl_handle *nlh; gboolean success = FALSE; guint32 idx; - struct rtnl_link * request = NULL; - struct rtnl_link * old = NULL; g_return_val_if_fail (iface != NULL, FALSE); @@ -446,16 +446,13 @@ gboolean nm_system_device_set_up_down_with_iface (const char *iface, gboolean up idx = nm_netlink_iface_to_index (iface); old = nm_netlink_index_to_rtnl_link (idx); if (old) { - struct nl_handle *nlh; - nlh = nm_netlink_get_default_handle (); if (nlh) - rtnl_link_change (nlh, old, request, 0); + success = (rtnl_link_change (nlh, old, request, 0) == 0) ? TRUE : FALSE; } rtnl_link_put (old); rtnl_link_put (request); - success = TRUE; out: return success; @@ -483,6 +480,7 @@ nm_system_device_is_up_with_iface (const char *iface) } /* Get device's flags */ + memset (&ifr, 0, sizeof (ifr)); strncpy (ifr.ifr_name, iface, IFNAMSIZ); if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0) { if (errno != ENODEV) { |