New upstream version 1.27.90 upstream/1.27.90

1 files changed, 32 insertions, 23 deletions

diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h
index fedec334..8102b9f4 100644
--- a/libnm-core/nm-setting-ip4-config.h
+++ b/libnm-core/nm-setting-ip4-config.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2007 - 2014 Red Hat, Inc.
  * Copyright (C) 2007 - 2008 Novell, Inc.
@@ -7,25 +7,31 @@
 #ifndef __NM_SETTING_IP4_CONFIG_H__
 #define __NM_SETTING_IP4_CONFIG_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting-ip-config.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_SETTING_IP4_CONFIG            (nm_setting_ip4_config_get_type ())
-#define NM_SETTING_IP4_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4Config))
-#define NM_SETTING_IP4_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_IP4CONFIG, NMSettingIP4ConfigClass))
-#define NM_IS_SETTING_IP4_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_IP4_CONFIG))
-#define NM_IS_SETTING_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_IP4_CONFIG))
-#define NM_SETTING_IP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigClass))
+#define NM_TYPE_SETTING_IP4_CONFIG (nm_setting_ip4_config_get_type())
+#define NM_SETTING_IP4_CONFIG(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4Config))
+#define NM_SETTING_IP4_CONFIG_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_IP4CONFIG, NMSettingIP4ConfigClass))
+#define NM_IS_SETTING_IP4_CONFIG(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_IP4_CONFIG))
+#define NM_IS_SETTING_IP4_CONFIG_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_IP4_CONFIG))
+#define NM_SETTING_IP4_CONFIG_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigClass))
 
 #define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 
-#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
-#define NM_SETTING_IP4_CONFIG_DHCP_FQDN          "dhcp-fqdn"
+#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID               "dhcp-client-id"
+#define NM_SETTING_IP4_CONFIG_DHCP_FQDN                    "dhcp-fqdn"
+#define NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER "dhcp-vendor-class-identifier"
 
 /**
  * NM_SETTING_IP4_CONFIG_METHOD_AUTO:
@@ -34,7 +40,7 @@ G_BEGIN_DECLS
  * for the hardware interface, ie DHCP or PPP or some other device-specific
  * manner.
  */
-#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+#define NM_SETTING_IP4_CONFIG_METHOD_AUTO "auto"
 
 /**
  * NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL:
@@ -50,7 +56,7 @@ G_BEGIN_DECLS
  * All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
  * in the setting's properties.
  */
-#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
+#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL "manual"
 
 /**
  * NM_SETTING_IP4_CONFIG_METHOD_SHARED:
@@ -62,14 +68,14 @@ G_BEGIN_DECLS
  * be started on this connection's interface to allow other devices to connect
  * through that interface to the default network.
  */
-#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
+#define NM_SETTING_IP4_CONFIG_METHOD_SHARED "shared"
 
 /**
  * NM_SETTING_IP4_CONFIG_METHOD_DISABLED:
  *
  * This connection does not use or require IPv4 address and it should be disabled.
  */
-#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
+#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED "disabled"
 
 /**
  * NMSettingIP4Config:
@@ -77,23 +83,26 @@ G_BEGIN_DECLS
  * IPv4 Settings
  */
 struct _NMSettingIP4Config {
-	NMSettingIPConfig parent;
+    NMSettingIPConfig parent;
 };
 
 typedef struct {
-	NMSettingIPConfigClass parent;
+    NMSettingIPConfigClass parent;
 
-	/*< private >*/
-	gpointer padding[4];
+    /*< private >*/
+    gpointer padding[4];
 } NMSettingIP4ConfigClass;
 
-GType nm_setting_ip4_config_get_type (void);
+GType nm_setting_ip4_config_get_type(void);
 
-NMSetting *nm_setting_ip4_config_new (void);
+NMSetting *nm_setting_ip4_config_new(void);
 
-const char *nm_setting_ip4_config_get_dhcp_client_id     (NMSettingIP4Config *setting);
+const char *nm_setting_ip4_config_get_dhcp_client_id(NMSettingIP4Config *setting);
 NM_AVAILABLE_IN_1_2
-const char *nm_setting_ip4_config_get_dhcp_fqdn          (NMSettingIP4Config *setting);
+const char *nm_setting_ip4_config_get_dhcp_fqdn(NMSettingIP4Config *setting);
+
+NM_AVAILABLE_IN_1_28
+const char *nm_setting_ip4_config_get_dhcp_vendor_class_identifier(NMSettingIP4Config *setting);
 
 G_END_DECLS