From bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 25 Jan 2019 11:24:41 +0100 Subject: New upstream version 1.15.2 --- src/NetworkManagerUtils.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/NetworkManagerUtils.h') diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index b26d08bd..5e701224 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -26,6 +26,9 @@ /*****************************************************************************/ +const char *nm_utils_get_ip_config_method (NMConnection *connection, + int addr_family); + const char *nm_utils_get_shared_wifi_permission (NMConnection *connection); void nm_utils_complete_generic (NMPlatform *platform, @@ -50,6 +53,7 @@ NMConnection *nm_utils_match_connection (NMConnection *const*connections, int nm_match_spec_device_by_pllink (const NMPlatformLink *pllink, const char *match_device_type, + const char *match_dhcp_plugin, const GSList *specs, int no_match_value); @@ -69,7 +73,7 @@ int nm_match_spec_device_by_pllink (const NMPlatformLink *pllink, * away. It iterates the mainloop for another NM_SHUTDOWN_TIMEOUT_MS_EXTRA. This * should give time to reap the child process (after SIGKILL). * - * So, the maxiumum time we should wait before sending SIGKILL should be at most + * So, the maximum time we should wait before sending SIGKILL should be at most * NM_SHUTDOWN_TIMEOUT_MS. */ #define NM_SHUTDOWN_TIMEOUT_MS 1500 @@ -86,4 +90,10 @@ void nm_shutdown_wait_obj_unregister (NMShutdownWaitObjHandle *handle); /*****************************************************************************/ +const char * +nm_utils_file_is_in_path (const char *abs_filename, + const char *abs_path); + +/*****************************************************************************/ + #endif /* __NETWORKMANAGER_UTILS_H__ */ -- cgit 1.3.0-6-gf8a5