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

platform: fix return value for do_delete_object()

Browse Source 
The return value for the delete methods checks whether the object
is actually deleted. That is questionable behavior, because if the netlink
request succeeds, there is little point in checking with the platform cache.
As it is, it is racy.

Anyway, the previous value was totally wrong.

But it also uncovers another platform bug, which currently breaks
route tests. Will be fixed next.
This commit is contained in:
Thomas Haller
2017-07-11 16:38:49 +02:00
parent 5fcca9ba3e
commit 5b09f7151b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/nm-linux-platform.c
View File

@@ -4032,7 +4032,7 @@ out:
/* such an object still exists in the cache. To be sure, refetch it (and /* such an object still exists in the cache. To be sure, refetch it (and
* hope it's gone) */ * hope it's gone) */
do_request_one_type (platform, NMP_OBJECT_GET_TYPE (obj_id)); do_request_one_type (platform, NMP_OBJECT_GET_TYPE (obj_id));
return !!nmp_cache_lookup_obj (cache, obj_id); return !nmp_cache_lookup_obj (cache, obj_id);
} }
static WaitForNlResponseResult static WaitForNlResponseResult

3
src/platform/tests/test-route.c
View File

@@ -441,7 +441,8 @@ test_ip4_route_options (void)
g_ptr_array_unref (routes); g_ptr_array_unref (routes);
/* Remove route */ /* Remove route */
g_assert (nm_platform_ip4_route_delete (NM_PLATFORM_GET, ifindex, network, 24, 20)); /*FIXME */
//g_assert (nm_platform_ip4_route_delete (NM_PLATFORM_GET, ifindex, network, 24, 20));
} }