New upstream version 1.39.90 upstream/1.39.90

10 files changed, 201 insertions, 32 deletions

diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h
index 94622793..a980f5aa 100644
--- a/src/libnm-core-public/nm-dbus-interface.h
+++ b/src/libnm-core-public/nm-dbus-interface.h
@@ -1315,4 +1315,49 @@ typedef enum /*< flags >*/ {
     NM_RADIO_FLAG_WWAN_AVAILABLE = 0x2,
 } NMRadioFlags;
 
+/**
+ * NMMptcpFlags:
+ * @NM_MPTCP_FLAGS_NONE: The default, meaning that no MPTCP flags are set.
+ * @NM_MPTCP_FLAGS_DISABLED: don't configure MPTCP endpoints on the device.
+ * @NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE: MPTCP handling is enabled
+ *   or disabled depending on whether a /0 default route (either IPv4 or IPv6) is
+ *   configured in the main routing table.
+ * @NM_MPTCP_FLAGS_ENABLED: MPTCP is enabled and endpoints will be configured.
+ *   This flag is implied if any of the other flags indicate that
+ *   MPTCP is enabled and therefore in most cases unnecessary.
+ * @NM_MPTCP_FLAGS_SIGNAL: Flag for the MPTCP endpoint. The endpoint will be
+ *   announced/signaled to each peer via an MPTCP ADD_ADDR sub-option.
+ * @NM_MPTCP_FLAGS_SUBFLOW: Flag for the MPTCP endpoint. If additional subflow creation
+ *   is allowed by the MPTCP limits, the MPTCP path manager will try to create an
+ *   additional subflow using this endpoint as the source address after the MPTCP connection
+ *   is established.
+ * @NM_MPTCP_FLAGS_BACKUP: Flag for the MPTCP endpoint. If this is a subflow endpoint, the
+ *   subflows created using this endpoint will have the backup flag set during the connection
+ *   process. This flag instructs the peer to only send data on a given subflow when all
+ *   non-backup subflows are unavailable. This does not affect outgoing data,
+ *   where subflow priority is determined by the backup/non-backup flag received
+ *   from the peer
+ * @NM_MPTCP_FLAGS_FULLMESH: Flag for the MPTCP endpoint. If this is a subflow endpoint and additional
+ *   subflow creation is allowed by the MPTCP limits, the MPTCP path manager will try to create an
+ *   additional subflow for each known peer address, using this endpoint as the source address.
+ *   This will occur after the MPTCP connection is established. If the peer did not announce
+ *   any additional addresses using the MPTCP ADD_ADDR sub-option, this will behave the same
+ *   as a plain subflow endpoint. When the peer does announce addresses, each received ADD_ADDR
+ *   sub-option will trigger creation of an additional subflow to generate a full mesh topology.
+ *
+ * Since: 1.40
+ */
+typedef enum /*< flags >*/ {
+    NM_MPTCP_FLAGS_NONE = 0,
+
+    NM_MPTCP_FLAGS_DISABLED                = 0x1,
+    NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE = 0x2,
+    NM_MPTCP_FLAGS_ENABLED                 = 0x4,
+
+    NM_MPTCP_FLAGS_SIGNAL   = 0x10,
+    NM_MPTCP_FLAGS_SUBFLOW  = 0x20,
+    NM_MPTCP_FLAGS_BACKUP   = 0x40,
+    NM_MPTCP_FLAGS_FULLMESH = 0x80,
+} NMMptcpFlags;
+
 #endif /* __NM_DBUS_INTERFACE_H__ */
diff --git a/src/libnm-core-public/nm-dbus-types.xml b/src/libnm-core-public/nm-dbus-types.xml
index f28ac4cc..0c8425ef 100644
--- a/src/libnm-core-public/nm-dbus-types.xml
+++ b/src/libnm-core-public/nm-dbus-types.xml
@@ -2223,4 +2223,64 @@
     </refsect3>
   </refsect2>
 
+  <refsect2 id="NMMptcpFlags" role="enum">
+    <title>enum NMMptcpFlags</title>
+    <indexterm zone="NMMptcpFlags">
+      <primary>NMMptcpFlags</primary>
+    </indexterm>
+    <para><para>Since: 1.40</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The default, meaning that no MPTCP flags are set.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_DISABLED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>don't configure MPTCP endpoints on the device.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>MPTCP handling is enabled or disabled depending on whether a /0 default route (either IPv4 or IPv6) is configured in the main routing table.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_ENABLED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>MPTCP is enabled and endpoints will be configured. This flag is implied if any of the other flags indicate that MPTCP is enabled and therefore in most cases unnecessary.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_SIGNAL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x10</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Flag for the MPTCP endpoint. The endpoint will be announced/signaled to each peer via an MPTCP ADD_ADDR sub-option.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_SUBFLOW</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x20</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Flag for the MPTCP endpoint. If additional subflow creation is allowed by the MPTCP limits, the MPTCP path manager will try to create an additional subflow using this endpoint as the source address after the MPTCP connection is established.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_BACKUP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x40</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Flag for the MPTCP endpoint. If this is a subflow endpoint, the subflows created using this endpoint will have the backup flag set during the connection process. This flag instructs the peer to only send data on a given subflow when all non-backup subflows are unavailable. This does not affect outgoing data, where subflow priority is determined by the backup/non-backup flag received from the peer</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_MPTCP_FLAGS_FULLMESH</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x80</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Flag for the MPTCP endpoint. If this is a subflow endpoint and additional subflow creation is allowed by the MPTCP limits, the MPTCP path manager will try to create an additional subflow for each known peer address, using this endpoint as the source address. This will occur after the MPTCP connection is established. If the peer did not announce any additional addresses using the MPTCP ADD_ADDR sub-option, this will behave the same as a plain subflow endpoint. When the peer does announce addresses, each received ADD_ADDR sub-option will trigger creation of an additional subflow to generate a full mesh topology.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
 </refentry>
diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h
index 83b5fd34..4b6ce17c 100644
--- a/src/libnm-core-public/nm-setting-connection.h
+++ b/src/libnm-core-public/nm-setting-connection.h
@@ -33,32 +33,34 @@ G_BEGIN_DECLS
 #define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX     999
 #define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT 0
 
-#define NM_SETTING_CONNECTION_ID                   "id"
-#define NM_SETTING_CONNECTION_UUID                 "uuid"
-#define NM_SETTING_CONNECTION_STABLE_ID            "stable-id"
-#define NM_SETTING_CONNECTION_INTERFACE_NAME       "interface-name"
-#define NM_SETTING_CONNECTION_TYPE                 "type"
-#define NM_SETTING_CONNECTION_AUTOCONNECT          "autoconnect"
-#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY "autoconnect-priority"
-#define NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES  "autoconnect-retries"
-#define NM_SETTING_CONNECTION_MULTI_CONNECT        "multi-connect"
-#define NM_SETTING_CONNECTION_TIMESTAMP            "timestamp"
-#define NM_SETTING_CONNECTION_READ_ONLY            "read-only"
-#define NM_SETTING_CONNECTION_PERMISSIONS          "permissions"
-#define NM_SETTING_CONNECTION_ZONE                 "zone"
-#define NM_SETTING_CONNECTION_MASTER               "master"
-#define NM_SETTING_CONNECTION_SLAVE_TYPE           "slave-type"
-#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES   "autoconnect-slaves"
-#define NM_SETTING_CONNECTION_SECONDARIES          "secondaries"
-#define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout"
-#define NM_SETTING_CONNECTION_METERED              "metered"
-#define NM_SETTING_CONNECTION_LLDP                 "lldp"
-#define NM_SETTING_CONNECTION_AUTH_RETRIES         "auth-retries"
-#define NM_SETTING_CONNECTION_MDNS                 "mdns"
-#define NM_SETTING_CONNECTION_LLMNR                "llmnr"
-#define NM_SETTING_CONNECTION_DNS_OVER_TLS         "dns-over-tls"
-#define NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT  "wait-device-timeout"
-#define NM_SETTING_CONNECTION_MUD_URL              "mud-url"
+#define NM_SETTING_CONNECTION_ID                    "id"
+#define NM_SETTING_CONNECTION_UUID                  "uuid"
+#define NM_SETTING_CONNECTION_STABLE_ID             "stable-id"
+#define NM_SETTING_CONNECTION_INTERFACE_NAME        "interface-name"
+#define NM_SETTING_CONNECTION_TYPE                  "type"
+#define NM_SETTING_CONNECTION_AUTOCONNECT           "autoconnect"
+#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY  "autoconnect-priority"
+#define NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES   "autoconnect-retries"
+#define NM_SETTING_CONNECTION_MULTI_CONNECT         "multi-connect"
+#define NM_SETTING_CONNECTION_TIMESTAMP             "timestamp"
+#define NM_SETTING_CONNECTION_READ_ONLY             "read-only"
+#define NM_SETTING_CONNECTION_PERMISSIONS           "permissions"
+#define NM_SETTING_CONNECTION_ZONE                  "zone"
+#define NM_SETTING_CONNECTION_MASTER                "master"
+#define NM_SETTING_CONNECTION_SLAVE_TYPE            "slave-type"
+#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES    "autoconnect-slaves"
+#define NM_SETTING_CONNECTION_SECONDARIES           "secondaries"
+#define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT  "gateway-ping-timeout"
+#define NM_SETTING_CONNECTION_METERED               "metered"
+#define NM_SETTING_CONNECTION_LLDP                  "lldp"
+#define NM_SETTING_CONNECTION_AUTH_RETRIES          "auth-retries"
+#define NM_SETTING_CONNECTION_MDNS                  "mdns"
+#define NM_SETTING_CONNECTION_LLMNR                 "llmnr"
+#define NM_SETTING_CONNECTION_DNS_OVER_TLS          "dns-over-tls"
+#define NM_SETTING_CONNECTION_MPTCP_FLAGS           "mptcp-flags"
+#define NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT   "wait-device-timeout"
+#define NM_SETTING_CONNECTION_MUD_URL               "mud-url"
+#define NM_SETTING_CONNECTION_WAIT_ACTIVATION_DELAY "wait-activation-delay"
 
 /* Types for property values */
 /**
@@ -215,9 +217,15 @@ NMSettingConnectionLlmnr nm_setting_connection_get_llmnr(NMSettingConnection *se
 NM_AVAILABLE_IN_1_34
 NMSettingConnectionDnsOverTls nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting);
 
+NM_AVAILABLE_IN_1_40
+NMMptcpFlags nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting);
+
 NM_AVAILABLE_IN_1_20
 gint32 nm_setting_connection_get_wait_device_timeout(NMSettingConnection *setting);
 
+NM_AVAILABLE_IN_1_40
+gint32 nm_setting_connection_get_wait_activation_delay(NMSettingConnection *setting);
+
 NM_AVAILABLE_IN_1_26
 const char *nm_setting_connection_get_mud_url(NMSettingConnection *setting);
 
diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h
index 257a687a..6283ecc9 100644
--- a/src/libnm-core-public/nm-setting-ip-config.h
+++ b/src/libnm-core-public/nm-setting-ip-config.h
@@ -123,10 +123,12 @@ gboolean nm_ip_route_attribute_validate(const char *name,
                                         gboolean   *known,
                                         GError    **error);
 
+#define NM_IP_ROUTE_ATTRIBUTE_ADVMSS        "advmss"
 #define NM_IP_ROUTE_ATTRIBUTE_CWND          "cwnd"
 #define NM_IP_ROUTE_ATTRIBUTE_FROM          "from"
 #define NM_IP_ROUTE_ATTRIBUTE_INITCWND      "initcwnd"
 #define NM_IP_ROUTE_ATTRIBUTE_INITRWND      "initrwnd"
+#define NM_IP_ROUTE_ATTRIBUTE_LOCK_ADVMSS   "lock-advmss"
 #define NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND     "lock-cwnd"
 #define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND "lock-initcwnd"
 #define NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND "lock-initrwnd"
@@ -134,6 +136,8 @@ gboolean nm_ip_route_attribute_validate(const char *name,
 #define NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW   "lock-window"
 #define NM_IP_ROUTE_ATTRIBUTE_MTU           "mtu"
 #define NM_IP_ROUTE_ATTRIBUTE_ONLINK        "onlink"
+#define NM_IP_ROUTE_ATTRIBUTE_QUICKACK      "quickack"
+#define NM_IP_ROUTE_ATTRIBUTE_RTO_MIN       "rto_min"
 #define NM_IP_ROUTE_ATTRIBUTE_SCOPE         "scope"
 #define NM_IP_ROUTE_ATTRIBUTE_SRC           "src"
 #define NM_IP_ROUTE_ATTRIBUTE_TABLE         "table"
diff --git a/src/libnm-core-public/nm-setting-ip4-config.h b/src/libnm-core-public/nm-setting-ip4-config.h
index d0bd836d..7991d682 100644
--- a/src/libnm-core-public/nm-setting-ip4-config.h
+++ b/src/libnm-core-public/nm-setting-ip4-config.h
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
 #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"
+#define NM_SETTING_IP4_CONFIG_LINK_LOCAL                   "link-local"
 
 /**
  * NM_SETTING_IP4_CONFIG_METHOD_AUTO:
@@ -77,6 +78,28 @@ G_BEGIN_DECLS
  */
 #define NM_SETTING_IP4_CONFIG_METHOD_DISABLED "disabled"
 
+/**
+ * NMSettingIP4LinkLocal:
+ * @NM_SETTING_IP4_LL_DEFAULT: Allow fallback to a globally configured default. If unspecified,
+ *   fallback to "auto". Note that if "ipv4.method" is "disabled", this always implies link-local
+ *   addresses disabled too.
+ * @NM_SETTING_IP4_LL_AUTO: Special value which enables LL if "ipv4.method" is set to
+ *   "link-local".
+ * @NM_SETTING_IP4_LL_DISABLED: Disable IPv4 link-local protocol.
+ * @NM_SETTING_IP4_LL_ENABLED: Enable the IPv4 link-local protocol regardless what other protocols
+ * such as DHCP or manually assigned IP addresses might be active.
+ *
+ * #NMSettingIP4LinkLocal values indicate whether IPv4 link-local address protocol should be enabled.
+ *
+ * Since: 1.40
+ */
+typedef enum {
+    NM_SETTING_IP4_LL_DEFAULT  = 0,
+    NM_SETTING_IP4_LL_AUTO     = 1,
+    NM_SETTING_IP4_LL_DISABLED = 2,
+    NM_SETTING_IP4_LL_ENABLED  = 3,
+} NMSettingIP4LinkLocal;
+
 typedef struct _NMSettingIP4ConfigClass NMSettingIP4ConfigClass;
 
 GType nm_setting_ip4_config_get_type(void);
@@ -90,6 +113,9 @@ 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);
 
+NM_AVAILABLE_IN_1_40
+NMSettingIP4LinkLocal nm_setting_ip4_config_get_link_local(NMSettingIP4Config *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_IP4_CONFIG_H__ */
diff --git a/src/libnm-core-public/nm-setting-ip6-config.h b/src/libnm-core-public/nm-setting-ip6-config.h
index c51a7438..5abc173d 100644
--- a/src/libnm-core-public/nm-setting-ip6-config.h
+++ b/src/libnm-core-public/nm-setting-ip6-config.h
@@ -38,6 +38,8 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_IP6_CONFIG_RA_TIMEOUT "ra-timeout"
 
+#define NM_SETTING_IP6_CONFIG_MTU "mtu"
+
 /**
  * NM_SETTING_IP6_CONFIG_METHOD_IGNORE:
  *
@@ -128,6 +130,10 @@ typedef enum {
  * is created by using a cryptographically secure hash of a secret host-specific
  * key along with the connection identification and the network address as
  * specified by RFC7217.
+ * @NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_DEFAULT_OR_EUI64: Fallback to the global
+ *   default, and if unspecified use "eui64". Since: 1.40.
+ * @NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_DEFAULT: Fallback to the global
+ *   default, and if unspecified use "stable-privacy". Since: 1.40.
  *
  * #NMSettingIP6ConfigAddrGenMode controls how the Interface Identifier for
  * RFC4862 Stateless Address Autoconfiguration is created.
@@ -135,8 +141,10 @@ typedef enum {
  * Since: 1.2
  */
 typedef enum {
-    NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64          = 0,
-    NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY = 1,
+    NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64            = 0,
+    NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY   = 1,
+    NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_DEFAULT_OR_EUI64 = 2,
+    NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_DEFAULT          = 3,
 } NMSettingIP6ConfigAddrGenMode;
 
 typedef struct _NMSettingIP6ConfigClass NMSettingIP6ConfigClass;
@@ -154,6 +162,8 @@ NM_AVAILABLE_IN_1_12
 const char *nm_setting_ip6_config_get_dhcp_duid(NMSettingIP6Config *setting);
 NM_AVAILABLE_IN_1_24
 gint32 nm_setting_ip6_config_get_ra_timeout(NMSettingIP6Config *setting);
+NM_AVAILABLE_IN_1_40
+guint32 nm_setting_ip6_config_get_mtu(NMSettingIP6Config *setting);
 
 G_END_DECLS
 
diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h
index dc226441..f61f68b7 100644
--- a/src/libnm-core-public/nm-version-macros.h
+++ b/src/libnm-core-public/nm-version-macros.h
@@ -22,7 +22,7 @@
  * Evaluates to the minor version number of NetworkManager which this source
  * is compiled against.
  */
-#define NM_MINOR_VERSION (38)
+#define NM_MINOR_VERSION (39)
 
 /**
  * NM_MICRO_VERSION:
@@ -30,7 +30,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (4)
+#define NM_MICRO_VERSION (90)
 
 /**
  * NM_CHECK_VERSION:
@@ -71,6 +71,7 @@
 #define NM_VERSION_1_34   (NM_ENCODE_VERSION (1, 34, 0))
 #define NM_VERSION_1_36   (NM_ENCODE_VERSION (1, 36, 0))
 #define NM_VERSION_1_38   (NM_ENCODE_VERSION (1, 38, 0))
+#define NM_VERSION_1_40   (NM_ENCODE_VERSION (1, 40, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in
index 516aded5..07e79899 100644
--- a/src/libnm-core-public/nm-version-macros.h.in
+++ b/src/libnm-core-public/nm-version-macros.h.in
@@ -71,6 +71,7 @@
 #define NM_VERSION_1_34   (NM_ENCODE_VERSION (1, 34, 0))
 #define NM_VERSION_1_36   (NM_ENCODE_VERSION (1, 36, 0))
 #define NM_VERSION_1_38   (NM_ENCODE_VERSION (1, 38, 0))
+#define NM_VERSION_1_40   (NM_ENCODE_VERSION (1, 40, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/libnm-core-public/nm-version.h b/src/libnm-core-public/nm-version.h
index ac98f868..9f6e3e78 100644
--- a/src/libnm-core-public/nm-version.h
+++ b/src/libnm-core-public/nm-version.h
@@ -327,9 +327,23 @@
 #define NM_AVAILABLE_IN_1_38
 #endif
 
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_40
+#define NM_DEPRECATED_IN_1_40        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_40_FOR(f) G_DEPRECATED_FOR(f)
+#else
+#define NM_DEPRECATED_IN_1_40
+#define NM_DEPRECATED_IN_1_40_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_40
+#define NM_AVAILABLE_IN_1_40 G_UNAVAILABLE(1, 40)
+#else
+#define NM_AVAILABLE_IN_1_40
+#endif
+
 /*
  * Synchronous API for calling D-Bus in libnm is deprecated. See
- * https://developer.gnome.org/libnm/stable/usage.html#sync-api
+ * https://networkmanager.dev/docs/libnm/latest/usage.html#sync-api
  *
  * Note that "deprecated" here does not really mean that the API is going
  * to be removed. We don't break API. Just comment that it is awkward and
diff --git a/src/libnm-core-public/nm-vpn-dbus-interface.h b/src/libnm-core-public/nm-vpn-dbus-interface.h
index 518999dd..423a9212 100644
--- a/src/libnm-core-public/nm-vpn-dbus-interface.h
+++ b/src/libnm-core-public/nm-vpn-dbus-interface.h
@@ -273,7 +273,7 @@ typedef enum {
  */
 #define NM_VPN_PLUGIN_IP6_CONFIG_PTP "ptp"
 
-/* uint32: prefix length of the VPN interface; 1 - 128 inclusive */
+/* uint32: prefix length of the VPN interface; 0 - 128 inclusive */
 #define NM_VPN_PLUGIN_IP6_CONFIG_PREFIX "prefix"
 
 /* array of array of uint8: IP addresses of DNS servers for the VPN (network byte order) */