From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- src/NetworkManagerUtils.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/NetworkManagerUtils.h') diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index b26d08bd..efbd9037 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -50,6 +50,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); -- cgit 1.3.0-6-gf8a5 From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:25:23 +0100 Subject: New upstream version 1.16.0 --- src/NetworkManagerUtils.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/NetworkManagerUtils.h') diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index efbd9037..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, @@ -70,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 @@ -87,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 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- src/NetworkManagerUtils.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/NetworkManagerUtils.h') diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 5e701224..2b1f5ed8 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -24,6 +24,9 @@ #include "nm-core-utils.h" +#include "nm-setting-ip-config.h" +#include "platform/nm-platform.h" + /*****************************************************************************/ const char *nm_utils_get_ip_config_method (NMConnection *connection, @@ -60,6 +63,11 @@ int nm_match_spec_device_by_pllink (const NMPlatformLink *pllink, /*****************************************************************************/ +NMPlatformRoutingRule *nm_ip_routing_rule_to_platform (const NMIPRoutingRule *rule, + NMPlatformRoutingRule *out_pl); + +/*****************************************************************************/ + /* during shutdown, there are two relevant timeouts. One is * NM_SHUTDOWN_TIMEOUT_MS which is plenty of time, that we give for all * actions to complete. Of course, during shutdown components should hurry -- cgit 1.3.0-6-gf8a5