Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 96 insertions, 116 deletions

diff --git a/src/nm-enum-types.c b/src/nm-enum-types.c
index 1ff95970..1d087f52 100644
--- a/src/nm-enum-types.c
+++ b/src/nm-enum-types.c
@@ -3,13 +3,15 @@
 
 /* Generated by glib-mkenums. Do not edit */
 
+#include "config.h"
+
 #include "nm-enum-types.h"
 
 #include "nm-device-bond.h" 
 #include "nm-device-bridge.h" 
 #include "nm-device-ethernet.h" 
-#include "nm-device-gre.h" 
 #include "nm-device-infiniband.h" 
+#include "nm-device-ip-tunnel.h" 
 #include "nm-device-macvlan.h" 
 #include "nm-device-tun.h" 
 #include "nm-device-veth.h" 
@@ -20,11 +22,11 @@
 #include "nm-dhcp-dhcpcd.h" 
 #include "nm-dhcp-systemd.h" 
 #include "nm-device.h" 
+#include "nm-lldp-listener.h" 
 #include "nm-device-ethernet-utils.h" 
 #include "nm-device-factory.h" 
 #include "nm-device-generic.h" 
 #include "nm-device-logging.h" 
-#include "nm-device-private.h" 
 #include "nm-dhcp-client.h" 
 #include "nm-dhcp-utils.h" 
 #include "nm-dhcp-listener.h" 
@@ -42,21 +44,18 @@
 #include "nm-platform-utils.h" 
 #include "nmp-object.h" 
 #include "wifi-utils-nl80211.h" 
-#include "wifi-utils-private.h" 
 #include "wifi-utils.h" 
 #include "nm-fake-rdisc.h" 
 #include "nm-lndp-rdisc.h" 
 #include "nm-rdisc.h" 
-#include "nm-rdisc-private.h" 
 #include "nm-ppp-manager.h" 
 #include "nm-ppp-status.h" 
 #include "nm-agent-manager.h" 
 #include "nm-inotify-helper.h" 
 #include "nm-secret-agent.h" 
 #include "nm-settings-connection.h" 
+#include "nm-settings-plugin.h" 
 #include "nm-settings.h" 
-#include "nm-system-config-interface.h" 
-#include "common.h" 
 #include "nm-keyfile-connection.h" 
 #include "plugin.h" 
 #include "reader.h" 
@@ -69,20 +68,21 @@
 #include "nm-supplicant-types.h" 
 #include "nm-vpn-connection.h" 
 #include "nm-vpn-manager.h" 
-#include "nm-vpn-service.h" 
 #include "nm-activation-request.h" 
 #include "nm-active-connection.h" 
+#include "nm-audit-manager.h" 
+#include "nm-bus-manager.h" 
 #include "nm-config.h" 
 #include "nm-config-data.h" 
 #include "nm-connection-provider.h" 
 #include "nm-connectivity.h" 
-#include "nm-dbus-manager.h" 
 #include "nm-dcb.h" 
 #include "nm-route-manager.h" 
 #include "nm-default-route-manager.h" 
 #include "nm-dhcp4-config.h" 
 #include "nm-dhcp6-config.h" 
 #include "nm-dispatcher.h" 
+#include "nm-exported-object.h" 
 #include "nm-firewall-manager.h" 
 #include "nm-ip4-config.h" 
 #include "nm-ip6-config.h" 
@@ -93,10 +93,8 @@
 #include "nm-manager.h" 
 #include "nm-multi-index.h" 
 #include "nm-policy.h" 
-#include "nm-properties-changed-signal.h" 
 #include "nm-rfkill-manager.h" 
 #include "nm-session-monitor.h" 
-#include "nm-session-utils.h" 
 #include "nm-sleep-monitor.h" 
 #include "nm-types.h" 
 #include "NetworkManagerUtils.h" 
@@ -123,33 +121,6 @@ nm_vlan_error_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_unmanaged_flags_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const GFlagsValue values[] = {
-        { NM_UNMANAGED_NONE, "NM_UNMANAGED_NONE", "nm-unmanaged-none" },
-        { NM_UNMANAGED_DEFAULT, "NM_UNMANAGED_DEFAULT", "nm-unmanaged-default" },
-        { NM_UNMANAGED_INTERNAL, "NM_UNMANAGED_INTERNAL", "nm-unmanaged-internal" },
-        { NM_UNMANAGED_USER, "NM_UNMANAGED_USER", "nm-unmanaged-user" },
-        { NM_UNMANAGED_PARENT, "NM_UNMANAGED_PARENT", "nm-unmanaged-parent" },
-        { NM_UNMANAGED_EXTERNAL_DOWN, "NM_UNMANAGED_EXTERNAL_DOWN", "nm-unmanaged-external-down" },
-        { NM_UNMANAGED_PLATFORM_INIT, "NM_UNMANAGED_PLATFORM_INIT", "nm-unmanaged-platform-init" },
-        { __NM_UNMANAGED_LAST, "__NM_UNMANAGED_LAST", "--nm-unmanaged-last" },
-        { NM_UNMANAGED_LAST, "NM_UNMANAGED_LAST", "nm-unmanaged-last" },
-        { NM_UNMANAGED_ALL, "NM_UNMANAGED_ALL", "nm-unmanaged-all" },
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_flags_register_static (g_intern_static_string ("NMUnmanagedFlags"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
-GType
 nm_dhcp_state_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
@@ -215,42 +186,40 @@ nm_dns_manager_resolv_conf_mode_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_dns_masq_status_get_type (void)
+nm_dns_manager_resolv_conf_manager_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_DNSMASQ_STATUS_UNKNOWN, "NM_DNSMASQ_STATUS_UNKNOWN", "unknown" },
-        { NM_DNSMASQ_STATUS_DEAD, "NM_DNSMASQ_STATUS_DEAD", "dead" },
-        { NM_DNSMASQ_STATUS_RUNNING, "NM_DNSMASQ_STATUS_RUNNING", "running" },
+        { NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE, "NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE", "none" },
+        { NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF, "NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF", "resolvconf" },
+        { NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG, "NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG", "netconfig" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMDnsMasqStatus"), values);
+        g_enum_register_static (g_intern_static_string ("NMDnsManagerResolvConfManager"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_platform_reason_get_type (void)
+nm_dns_masq_status_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_PLATFORM_REASON_NONE, "NM_PLATFORM_REASON_NONE", "nm-platform-reason-none" },
-        { NM_PLATFORM_REASON_INTERNAL, "NM_PLATFORM_REASON_INTERNAL", "nm-platform-reason-internal" },
-        { NM_PLATFORM_REASON_EXTERNAL, "NM_PLATFORM_REASON_EXTERNAL", "nm-platform-reason-external" },
-        { NM_PLATFORM_REASON_CACHE_CHECK, "NM_PLATFORM_REASON_CACHE_CHECK", "nm-platform-reason-cache-check" },
-        { _NM_PLATFORM_REASON_CACHE_CHECK_INTERNAL, "_NM_PLATFORM_REASON_CACHE_CHECK_INTERNAL", "-nm-platform-reason-cache-check-internal" },
+        { NM_DNSMASQ_STATUS_UNKNOWN, "NM_DNSMASQ_STATUS_UNKNOWN", "unknown" },
+        { NM_DNSMASQ_STATUS_DEAD, "NM_DNSMASQ_STATUS_DEAD", "dead" },
+        { NM_DNSMASQ_STATUS_RUNNING, "NM_DNSMASQ_STATUS_RUNNING", "running" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMPlatformReason"), values);
+        g_enum_register_static (g_intern_static_string ("NMDnsMasqStatus"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -399,85 +368,102 @@ nm_settings_connection_flags_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_system_config_interface_capabilities_get_type (void)
+nm_settings_plugin_capabilities_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE, "NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE", "none" },
-        { NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_CONNECTIONS, "NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_CONNECTIONS", "modify-connections" },
-        { NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME, "NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME", "modify-hostname" },
+        { NM_SETTINGS_PLUGIN_CAP_NONE, "NM_SETTINGS_PLUGIN_CAP_NONE", "none" },
+        { NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS, "NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS", "modify-connections" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMSystemConfigInterfaceCapabilities"), values);
+        g_enum_register_static (g_intern_static_string ("NMSettingsPluginCapabilities"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_system_config_interface_prop_get_type (void)
+nm_settings_plugin_prop_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_SYSTEM_CONFIG_INTERFACE_PROP_FIRST, "NM_SYSTEM_CONFIG_INTERFACE_PROP_FIRST", "first" },
-        { NM_SYSTEM_CONFIG_INTERFACE_PROP_NAME, "NM_SYSTEM_CONFIG_INTERFACE_PROP_NAME", "name" },
-        { NM_SYSTEM_CONFIG_INTERFACE_PROP_INFO, "NM_SYSTEM_CONFIG_INTERFACE_PROP_INFO", "info" },
-        { NM_SYSTEM_CONFIG_INTERFACE_PROP_CAPABILITIES, "NM_SYSTEM_CONFIG_INTERFACE_PROP_CAPABILITIES", "capabilities" },
-        { NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME, "NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME", "hostname" },
+        { NM_SETTINGS_PLUGIN_PROP_FIRST, "NM_SETTINGS_PLUGIN_PROP_FIRST", "first" },
+        { NM_SETTINGS_PLUGIN_PROP_NAME, "NM_SETTINGS_PLUGIN_PROP_NAME", "name" },
+        { NM_SETTINGS_PLUGIN_PROP_INFO, "NM_SETTINGS_PLUGIN_PROP_INFO", "info" },
+        { NM_SETTINGS_PLUGIN_PROP_CAPABILITIES, "NM_SETTINGS_PLUGIN_PROP_CAPABILITIES", "capabilities" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMSystemConfigInterfaceProp"), values);
+        g_enum_register_static (g_intern_static_string ("NMSettingsPluginProp"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_ap_support_get_type (void)
+nm_opt_type_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { AP_SUPPORT_UNKNOWN, "AP_SUPPORT_UNKNOWN", "unknown" },
-        { AP_SUPPORT_NO, "AP_SUPPORT_NO", "no" },
-        { AP_SUPPORT_YES, "AP_SUPPORT_YES", "yes" },
+        { TYPE_INVALID, "TYPE_INVALID", "invalid" },
+        { TYPE_INT, "TYPE_INT", "int" },
+        { TYPE_BYTES, "TYPE_BYTES", "bytes" },
+        { TYPE_UTF8, "TYPE_UTF8", "utf8" },
+        { TYPE_KEYWORD, "TYPE_KEYWORD", "keyword" },
+        { TYPE_STRING, "TYPE_STRING", "string" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("ApSupport"), values);
+        g_enum_register_static (g_intern_static_string ("OptType"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_opt_type_get_type (void)
+nm_supplicant_feature_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { TYPE_INVALID, "TYPE_INVALID", "invalid" },
-        { TYPE_INT, "TYPE_INT", "int" },
-        { TYPE_BYTES, "TYPE_BYTES", "bytes" },
-        { TYPE_UTF8, "TYPE_UTF8", "utf8" },
-        { TYPE_KEYWORD, "TYPE_KEYWORD", "keyword" },
-        { TYPE_STRING, "TYPE_STRING", "string" },
+        { NM_SUPPLICANT_FEATURE_UNKNOWN, "NM_SUPPLICANT_FEATURE_UNKNOWN", "unknown" },
+        { NM_SUPPLICANT_FEATURE_NO, "NM_SUPPLICANT_FEATURE_NO", "no" },
+        { NM_SUPPLICANT_FEATURE_YES, "NM_SUPPLICANT_FEATURE_YES", "yes" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("OptType"), values);
+        g_enum_register_static (g_intern_static_string ("NMSupplicantFeature"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
+nm_supplicant_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_SUPPLICANT_ERROR_UNKNOWN, "NM_SUPPLICANT_ERROR_UNKNOWN", "Unknown" },
+        { NM_SUPPLICANT_ERROR_CONFIG, "NM_SUPPLICANT_ERROR_CONFIG", "Config" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMSupplicantError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -519,9 +505,13 @@ nm_config_change_flags_get_type (void)
         { NM_CONFIG_CHANGE_SIGUSR2, "NM_CONFIG_CHANGE_SIGUSR2", "nm-config-change-sigusr2" },
         { NM_CONFIG_CHANGE_CONFIG_FILES, "NM_CONFIG_CHANGE_CONFIG_FILES", "nm-config-change-config-files" },
         { NM_CONFIG_CHANGE_VALUES, "NM_CONFIG_CHANGE_VALUES", "nm-config-change-values" },
+        { NM_CONFIG_CHANGE_VALUES_USER, "NM_CONFIG_CHANGE_VALUES_USER", "nm-config-change-values-user" },
+        { NM_CONFIG_CHANGE_VALUES_INTERN, "NM_CONFIG_CHANGE_VALUES_INTERN", "nm-config-change-values-intern" },
         { NM_CONFIG_CHANGE_CONNECTIVITY, "NM_CONFIG_CHANGE_CONNECTIVITY", "nm-config-change-connectivity" },
         { NM_CONFIG_CHANGE_NO_AUTO_DEFAULT, "NM_CONFIG_CHANGE_NO_AUTO_DEFAULT", "nm-config-change-no-auto-default" },
         { NM_CONFIG_CHANGE_DNS_MODE, "NM_CONFIG_CHANGE_DNS_MODE", "nm-config-change-dns-mode" },
+        { NM_CONFIG_CHANGE_RC_MANAGER, "NM_CONFIG_CHANGE_RC_MANAGER", "nm-config-change-rc-manager" },
+        { NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG, "NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG", "nm-config-change-global-dns-config" },
         { _NM_CONFIG_CHANGE_LAST, "_NM_CONFIG_CHANGE_LAST", "-nm-config-change-last" },
         { NM_CONFIG_CHANGE_ALL, "NM_CONFIG_CHANGE_ALL", "nm-config-change-all" },
         { 0, NULL, NULL }
@@ -603,48 +593,6 @@ nm_auth_call_result_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
-nm_rf_kill_state_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const GEnumValue values[] = {
-        { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
-        { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
-        { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("RfKillState"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
-GType
-nm_rf_kill_type_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const GEnumValue values[] = {
-        { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
-        { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
-        { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
-        { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
-        { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("RfKillType"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
-GType
 nm_ip_config_source_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
@@ -693,10 +641,13 @@ nm_link_type_get_type (void)
         { NM_LINK_TYPE_GRE, "NM_LINK_TYPE_GRE", "gre" },
         { NM_LINK_TYPE_GRETAP, "NM_LINK_TYPE_GRETAP", "gretap" },
         { NM_LINK_TYPE_IFB, "NM_LINK_TYPE_IFB", "ifb" },
+        { NM_LINK_TYPE_IP6TNL, "NM_LINK_TYPE_IP6TNL", "ip6tnl" },
+        { NM_LINK_TYPE_IPIP, "NM_LINK_TYPE_IPIP", "ipip" },
         { NM_LINK_TYPE_LOOPBACK, "NM_LINK_TYPE_LOOPBACK", "loopback" },
         { NM_LINK_TYPE_MACVLAN, "NM_LINK_TYPE_MACVLAN", "macvlan" },
         { NM_LINK_TYPE_MACVTAP, "NM_LINK_TYPE_MACVTAP", "macvtap" },
         { NM_LINK_TYPE_OPENVSWITCH, "NM_LINK_TYPE_OPENVSWITCH", "openvswitch" },
+        { NM_LINK_TYPE_SIT, "NM_LINK_TYPE_SIT", "sit" },
         { NM_LINK_TYPE_TAP, "NM_LINK_TYPE_TAP", "tap" },
         { NM_LINK_TYPE_TUN, "NM_LINK_TYPE_TUN", "tun" },
         { NM_LINK_TYPE_VETH, "NM_LINK_TYPE_VETH", "veth" },
@@ -706,6 +657,7 @@ nm_link_type_get_type (void)
         { NM_LINK_TYPE_BRIDGE, "NM_LINK_TYPE_BRIDGE", "bridge" },
         { NM_LINK_TYPE_BOND, "NM_LINK_TYPE_BOND", "bond" },
         { NM_LINK_TYPE_TEAM, "NM_LINK_TYPE_TEAM", "team" },
+        { NM_LINK_TYPE_ANY, "NM_LINK_TYPE_ANY", "any" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
@@ -729,6 +681,15 @@ nm_pobject_type_get_type (void)
         { NMP_OBJECT_TYPE_IP6_ADDRESS, "NMP_OBJECT_TYPE_IP6_ADDRESS", "nmp-object-type-ip6-address" },
         { NMP_OBJECT_TYPE_IP4_ROUTE, "NMP_OBJECT_TYPE_IP4_ROUTE", "nmp-object-type-ip4-route" },
         { NMP_OBJECT_TYPE_IP6_ROUTE, "NMP_OBJECT_TYPE_IP6_ROUTE", "nmp-object-type-ip6-route" },
+        { NMP_OBJECT_TYPE_LNK_GRE, "NMP_OBJECT_TYPE_LNK_GRE", "nmp-object-type-lnk-gre" },
+        { NMP_OBJECT_TYPE_LNK_INFINIBAND, "NMP_OBJECT_TYPE_LNK_INFINIBAND", "nmp-object-type-lnk-infiniband" },
+        { NMP_OBJECT_TYPE_LNK_IP6TNL, "NMP_OBJECT_TYPE_LNK_IP6TNL", "nmp-object-type-lnk-ip6tnl" },
+        { NMP_OBJECT_TYPE_LNK_IPIP, "NMP_OBJECT_TYPE_LNK_IPIP", "nmp-object-type-lnk-ipip" },
+        { NMP_OBJECT_TYPE_LNK_MACVLAN, "NMP_OBJECT_TYPE_LNK_MACVLAN", "nmp-object-type-lnk-macvlan" },
+        { NMP_OBJECT_TYPE_LNK_MACVTAP, "NMP_OBJECT_TYPE_LNK_MACVTAP", "nmp-object-type-lnk-macvtap" },
+        { NMP_OBJECT_TYPE_LNK_SIT, "NMP_OBJECT_TYPE_LNK_SIT", "nmp-object-type-lnk-sit" },
+        { NMP_OBJECT_TYPE_LNK_VLAN, "NMP_OBJECT_TYPE_LNK_VLAN", "nmp-object-type-lnk-vlan" },
+        { NMP_OBJECT_TYPE_LNK_VXLAN, "NMP_OBJECT_TYPE_LNK_VXLAN", "nmp-object-type-lnk-vxlan" },
         { __NMP_OBJECT_TYPE_LAST, "__NMP_OBJECT_TYPE_LAST", "--nmp-object-type-last" },
         { NMP_OBJECT_TYPE_MAX, "NMP_OBJECT_TYPE_MAX", "nmp-object-type-max" },
         { 0, NULL, NULL }
@@ -761,6 +722,25 @@ nm_ip_config_merge_flags_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_utils_error_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_UTILS_ERROR_UNKNOWN, "NM_UTILS_ERROR_UNKNOWN", "Unknown" },
+        { NM_UTILS_ERROR_CANCELLED_DISPOSING, "NM_UTILS_ERROR_CANCELLED_DISPOSING", "CancelledDisposing" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMUtilsError"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_match_spec_match_type_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;