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

arping-manager: failure to get a device name should not be fatal

Browse Source 
The device could just be removed mid-flight.
This commit is contained in:
Lubomir Rintel
2016-02-26 13:30:56 +01:00
parent aae6f07fe5
commit 02278d3b8f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/nm-arping-manager.c
View File

@@ -193,7 +193,12 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er
g_return_val_if_fail (priv->state == STATE_INIT, FALSE); g_return_val_if_fail (priv->state == STATE_INIT, FALSE);
argv[4] = nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex); argv[4] = nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex);
g_return_val_if_fail (argv[4], FALSE); if (!argv[4]) {
/* The device was probably just removed. */
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
"can't find a name for ifindex %d", priv->ifindex);
return FALSE;
}
priv->completed = 0; priv->completed = 0;
@@ -306,7 +311,11 @@ send_announcements (NMArpingManager *self, const char *mode_arg)
AddressInfo *info; AddressInfo *info;
argv[4] = nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex); argv[4] = nm_platform_link_get_name (NM_PLATFORM_GET, priv->ifindex);
g_return_if_fail (argv[4]); if (!argv[4]) {
/* The device was probably just removed. */
_LOGW ("can't find a name for ifindex %d", priv->ifindex);
return;
}
argv[0] = nm_utils_find_helper ("arping", NULL, NULL); argv[0] = nm_utils_find_helper ("arping", NULL, NULL);
if (!argv[0]) { if (!argv[0]) {