diff options
Diffstat (limited to 'src/platform/tests/test-common.c')
| -rw-r--r-- | src/platform/tests/test-common.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 18076712..9a12f8f9 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2016 Red Hat, Inc. + * Copyright 2016 - 2017 Red Hat, Inc. */ #include "nm-default.h" @@ -78,9 +78,9 @@ _ipx_address_get_all (NMPlatform *self, int ifindex, NMPObjectType obj_type) g_assert (NM_IS_PLATFORM (self)); g_assert (ifindex > 0); g_assert (NM_IN_SET (obj_type, NMP_OBJECT_TYPE_IP4_ADDRESS, NMP_OBJECT_TYPE_IP6_ADDRESS)); - nmp_lookup_init_addrroute (&lookup, - obj_type, - ifindex); + nmp_lookup_init_object (&lookup, + obj_type, + ifindex); return nmp_cache_lookup_to_array (nm_platform_lookup (self, &lookup), obj_type, FALSE /*addresses are always visible. */); @@ -108,9 +108,9 @@ nmtstp_platform_ip4_route_delete (NMPlatform *platform, int ifindex, in_addr_t n nm_platform_process_events (platform); nm_dedup_multi_iter_for_each (&iter, - nm_platform_lookup_addrroute (platform, - NMP_OBJECT_TYPE_IP4_ROUTE, - ifindex)) { + nm_platform_lookup_object (platform, + NMP_OBJECT_TYPE_IP4_ROUTE, + ifindex)) { const NMPlatformIP4Route *r = NMP_OBJECT_CAST_IP4_ROUTE (iter.current->obj); if ( r->ifindex != ifindex @@ -120,7 +120,7 @@ nmtstp_platform_ip4_route_delete (NMPlatform *platform, int ifindex, in_addr_t n continue; } - return nm_platform_ip_route_delete (platform, NMP_OBJECT_UP_CAST (r)); + return nm_platform_object_delete (platform, NMP_OBJECT_UP_CAST (r)); } return TRUE; @@ -134,9 +134,9 @@ nmtstp_platform_ip6_route_delete (NMPlatform *platform, int ifindex, struct in6_ nm_platform_process_events (platform); nm_dedup_multi_iter_for_each (&iter, - nm_platform_lookup_addrroute (platform, - NMP_OBJECT_TYPE_IP6_ROUTE, - ifindex)) { + nm_platform_lookup_object (platform, + NMP_OBJECT_TYPE_IP6_ROUTE, + ifindex)) { const NMPlatformIP6Route *r = NMP_OBJECT_CAST_IP6_ROUTE (iter.current->obj); if ( r->ifindex != ifindex @@ -146,7 +146,7 @@ nmtstp_platform_ip6_route_delete (NMPlatform *platform, int ifindex, struct in6_ continue; } - return nm_platform_ip_route_delete (platform, NMP_OBJECT_UP_CAST (r)); + return nm_platform_object_delete (platform, NMP_OBJECT_UP_CAST (r)); } return TRUE; @@ -1703,8 +1703,8 @@ nmtstp_namespace_create (int unshare_flags, GError **error) errsv = errno; g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, "pipe() failed with %d (%s)", errsv, strerror (errsv)); - close (pipefd_c2p[0]); - close (pipefd_c2p[1]); + nm_close (pipefd_c2p[0]); + nm_close (pipefd_c2p[1]); return FALSE; } @@ -1713,18 +1713,18 @@ nmtstp_namespace_create (int unshare_flags, GError **error) errsv = errno; g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, "fork() failed with %d (%s)", errsv, strerror (errsv)); - close (pipefd_c2p[0]); - close (pipefd_c2p[1]); - close (pipefd_p2c[0]); - close (pipefd_p2c[1]); + nm_close (pipefd_c2p[0]); + nm_close (pipefd_c2p[1]); + nm_close (pipefd_p2c[0]); + nm_close (pipefd_p2c[1]); return FALSE; } if (pid == 0) { char read_buf[1]; - close (pipefd_c2p[0]); /* close read-end */ - close (pipefd_p2c[1]); /* close write-end */ + nm_close (pipefd_c2p[0]); /* close read-end */ + nm_close (pipefd_p2c[1]); /* close write-end */ if (unshare (unshare_flags) != 0) { errsv = errno; @@ -1742,7 +1742,7 @@ nmtstp_namespace_create (int unshare_flags, GError **error) if (errsv == 0) errsv = -2; } - close (pipefd_c2p[1]); + nm_close (pipefd_c2p[1]); /* wait until parent process terminates (or kills us). */ if (errsv == 0) { @@ -1750,19 +1750,19 @@ nmtstp_namespace_create (int unshare_flags, GError **error) r = read (pipefd_p2c[0], read_buf, sizeof (read_buf)); } while (r < 0 && errno == EINTR); } - close (pipefd_p2c[0]); + nm_close (pipefd_p2c[0]); _exit (0); } - close (pipefd_c2p[1]); /* close write-end */ - close (pipefd_p2c[0]); /* close read-end */ + nm_close (pipefd_c2p[1]); /* close write-end */ + nm_close (pipefd_p2c[0]); /* close read-end */ /* sync with child process. */ do { r = read (pipefd_c2p[0], &errsv, sizeof (errsv)); } while (r < 0 && errno == EINTR); - close (pipefd_c2p[0]); + nm_close (pipefd_c2p[0]); if ( r != sizeof (errsv) || errsv != 0) { @@ -1775,7 +1775,7 @@ nmtstp_namespace_create (int unshare_flags, GError **error) g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, "child process signaled failure %d (%s)", errsv, strerror (errsv)); } - close (pipefd_p2c[1]); + nm_close (pipefd_p2c[1]); kill (pid, SIGKILL); do { pid2 = waitpid (pid, &status, 0); @@ -1809,7 +1809,7 @@ nmtstp_namespace_handle_release (NMTstpNamespaceHandle *ns_handle) g_return_if_fail (ns_handle->pid > 0); - close (ns_handle->pipe_fd); + nm_close (ns_handle->pipe_fd); ns_handle->pipe_fd = 0; kill (ns_handle->pid, SIGKILL); |