New upstream version 1.32.12 upstream/1.32.12

1 files changed, 69 insertions, 53 deletions

diff --git a/src/core/nm-config-data.h b/src/core/nm-config-data.h
index 07cffb43..fa58d869 100644
--- a/src/core/nm-config-data.h
+++ b/src/core/nm-config-data.h
@@ -6,6 +6,8 @@
 #ifndef NM_CONFIG_DATA_H
 #define NM_CONFIG_DATA_H
 
+#include "libnm-platform/nmp-base.h"
+
 /*****************************************************************************/
 
 typedef enum {
@@ -48,71 +50,71 @@ typedef enum {
 #define NM_CONFIG_DATA_NO_AUTO_DEFAULT       "no-auto-default"
 #define NM_CONFIG_DATA_DNS_MODE              "dns"
 
-typedef enum { /*< flags >*/
-               NM_CONFIG_GET_VALUE_NONE = 0,
+typedef enum {
+    NM_CONFIG_GET_VALUE_NONE = 0,
 
-               /* use g_key_file_get_value() instead of g_key_file_get_string(). */
-               NM_CONFIG_GET_VALUE_RAW = (1LL << 0),
+    /* use g_key_file_get_value() instead of g_key_file_get_string(). */
+    NM_CONFIG_GET_VALUE_RAW = (1LL << 0),
 
-               /* strip whitespaces */
-               NM_CONFIG_GET_VALUE_STRIP = (1LL << 1),
+    /* strip whitespaces */
+    NM_CONFIG_GET_VALUE_STRIP = (1LL << 1),
 
-               /* if the returned string would be the empty word, return NULL. */
-               NM_CONFIG_GET_VALUE_NO_EMPTY = (1LL << 2),
+    /* if the returned string would be the empty word, return NULL. */
+    NM_CONFIG_GET_VALUE_NO_EMPTY = (1LL << 2),
 
-               /* special flag to read device spec. You want to use this before passing the
+    /* special flag to read device spec. You want to use this before passing the
      * value to nm_match_spec_split(). */
-               NM_CONFIG_GET_VALUE_TYPE_SPEC = NM_CONFIG_GET_VALUE_RAW,
+    NM_CONFIG_GET_VALUE_TYPE_SPEC = NM_CONFIG_GET_VALUE_RAW,
 } NMConfigGetValueFlags;
 
-typedef enum { /*< flags >*/
-               NM_CONFIG_CHANGE_NONE = 0,
+typedef enum {
+    NM_CONFIG_CHANGE_NONE = 0,
 
-               /**************************************************************************
+    /**************************************************************************
      * The external cause which triggered the reload/configuration-change
      *************************************************************************/
 
-               NM_CONFIG_CHANGE_CAUSE_SIGHUP          = (1L << 0),
-               NM_CONFIG_CHANGE_CAUSE_SIGUSR1         = (1L << 1),
-               NM_CONFIG_CHANGE_CAUSE_SIGUSR2         = (1L << 2),
-               NM_CONFIG_CHANGE_CAUSE_NO_AUTO_DEFAULT = (1L << 3),
-               NM_CONFIG_CHANGE_CAUSE_SET_VALUES      = (1L << 4),
-               NM_CONFIG_CHANGE_CAUSE_CONF            = (1L << 5),
-               NM_CONFIG_CHANGE_CAUSE_DNS_RC          = (1L << 6),
-               NM_CONFIG_CHANGE_CAUSE_DNS_FULL        = (1L << 7),
+    NM_CONFIG_CHANGE_CAUSE_SIGHUP          = (1L << 0),
+    NM_CONFIG_CHANGE_CAUSE_SIGUSR1         = (1L << 1),
+    NM_CONFIG_CHANGE_CAUSE_SIGUSR2         = (1L << 2),
+    NM_CONFIG_CHANGE_CAUSE_NO_AUTO_DEFAULT = (1L << 3),
+    NM_CONFIG_CHANGE_CAUSE_SET_VALUES      = (1L << 4),
+    NM_CONFIG_CHANGE_CAUSE_CONF            = (1L << 5),
+    NM_CONFIG_CHANGE_CAUSE_DNS_RC          = (1L << 6),
+    NM_CONFIG_CHANGE_CAUSE_DNS_FULL        = (1L << 7),
 
-               NM_CONFIG_CHANGE_CAUSES = ((1L << 8) - 1),
+    NM_CONFIG_CHANGE_CAUSES = ((1L << 8) - 1),
 
-               /**************************************************************************
+    /**************************************************************************
      * Following flags describe which property of the configuration changed:
      *************************************************************************/
 
-               /* main-file or config-description changed */
-               NM_CONFIG_CHANGE_CONFIG_FILES = (1L << 10),
+    /* main-file or config-description changed */
+    NM_CONFIG_CHANGE_CONFIG_FILES = (1L << 10),
 
-               /* any configuration on disk changed */
-               NM_CONFIG_CHANGE_VALUES = (1L << 11),
+    /* any configuration on disk changed */
+    NM_CONFIG_CHANGE_VALUES = (1L << 11),
 
-               /* any user configuration on disk changed (NetworkManager.conf) */
-               NM_CONFIG_CHANGE_VALUES_USER = (1L << 12),
+    /* any user configuration on disk changed (NetworkManager.conf) */
+    NM_CONFIG_CHANGE_VALUES_USER = (1L << 12),
 
-               /* any internal configuration on disk changed (NetworkManager-intern.conf) */
-               NM_CONFIG_CHANGE_VALUES_INTERN = (1L << 13),
+    /* any internal configuration on disk changed (NetworkManager-intern.conf) */
+    NM_CONFIG_CHANGE_VALUES_INTERN = (1L << 13),
 
-               /* configuration regarding connectivity changed */
-               NM_CONFIG_CHANGE_CONNECTIVITY = (1L << 14),
+    /* configuration regarding connectivity changed */
+    NM_CONFIG_CHANGE_CONNECTIVITY = (1L << 14),
 
-               /* configuration regarding no-auto-default changed */
-               NM_CONFIG_CHANGE_NO_AUTO_DEFAULT = (1L << 15),
+    /* configuration regarding no-auto-default changed */
+    NM_CONFIG_CHANGE_NO_AUTO_DEFAULT = (1L << 15),
 
-               /* configuration regarding dns-mode changed */
-               NM_CONFIG_CHANGE_DNS_MODE = (1L << 16),
+    /* configuration regarding dns-mode changed */
+    NM_CONFIG_CHANGE_DNS_MODE = (1L << 16),
 
-               /* configuration regarding rc-manager changed */
-               NM_CONFIG_CHANGE_RC_MANAGER = (1L << 17),
+    /* configuration regarding rc-manager changed */
+    NM_CONFIG_CHANGE_RC_MANAGER = (1L << 17),
 
-               /* configuration regarding global dns-config changed */
-               NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG = (1L << 18),
+    /* configuration regarding global dns-config changed */
+    NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG = (1L << 18),
 
 } NMConfigChangeFlags;
 
@@ -188,6 +190,8 @@ int      nm_config_data_get_sriov_num_vfs(const NMConfigData *self, NMDevice *de
 
 NMGlobalDnsConfig *nm_config_data_get_global_dns_config(const NMConfigData *self);
 
+const char *nm_config_data_get_iwd_config_path(const NMConfigData *self);
+
 extern const char *__start_connection_defaults[];
 extern const char *__stop_connection_defaults[];
 
@@ -203,9 +207,9 @@ extern const char *__stop_connection_defaults[];
         name;                                                                               \
     })
 
-char *nm_config_data_get_connection_default(const NMConfigData *self,
-                                            const char *        property,
-                                            NMDevice *          device);
+const char *nm_config_data_get_connection_default(const NMConfigData *self,
+                                                  const char *        property,
+                                                  NMDevice *          device);
 
 gint64 nm_config_data_get_connection_default_int64(const NMConfigData *self,
                                                    const char *        property,
@@ -214,22 +218,34 @@ gint64 nm_config_data_get_connection_default_int64(const NMConfigData *self,
                                                    gint64              max,
                                                    gint64              fallback);
 
-char *nm_config_data_get_device_config(const NMConfigData *self,
-                                       const char *        property,
-                                       NMDevice *          device,
-                                       gboolean *          has_match);
+const char *nm_config_data_get_device_config(const NMConfigData *self,
+                                             const char *        property,
+                                             NMDevice *          device,
+                                             gboolean *          has_match);
 
-char *nm_config_data_get_device_config_by_pllink(const NMConfigData *  self,
-                                                 const char *          property,
-                                                 const NMPlatformLink *pllink,
-                                                 const char *          match_device_type,
-                                                 gboolean *            has_match);
+const char *nm_config_data_get_device_config_by_pllink(const NMConfigData *  self,
+                                                       const char *          property,
+                                                       const NMPlatformLink *pllink,
+                                                       const char *          match_device_type,
+                                                       gboolean *            has_match);
 
 gboolean nm_config_data_get_device_config_boolean(const NMConfigData *self,
                                                   const char *        property,
                                                   NMDevice *          device,
                                                   int                 val_no_match,
                                                   int                 val_invalid);
+gint64   nm_config_data_get_device_config_int64(const NMConfigData *self,
+                                                const char *        property,
+                                                NMDevice *          device,
+                                                int                 base,
+                                                gint64              min,
+                                                gint64              max,
+                                                gint64              val_no_match,
+                                                gint64              val_invalid);
+
+const GSList *nm_config_data_get_device_allowed_connections_specs(const NMConfigData *self,
+                                                                  NMDevice *          device,
+                                                                  gboolean *          has_match);
 
 char **  nm_config_data_get_groups(const NMConfigData *self);
 char **  nm_config_data_get_keys(const NMConfigData *self, const char *group);