From 1372848511cb896b80b51ed1a3e9606bd9816631 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 10 Feb 2023 11:50:34 +0100 Subject: New upstream version 1.42.0 --- src/libnm-base/nm-base.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/libnm-base/nm-base.h') diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h index ff062a18..74e8142f 100644 --- a/src/libnm-base/nm-base.h +++ b/src/libnm-base/nm-base.h @@ -393,6 +393,12 @@ typedef struct { #define NM_BOND_PORT_QUEUE_ID_DEF 0 +/****************************************************************************/ + +/* ifindex generation is per-net namespace, and loopback is always the first + * device in the network namespace, thus any loopback device should get ifindex 1. */ +#define NM_LOOPBACK_IFINDEX 1 + /*****************************************************************************/ /* NM_CRYPTO_ERROR is part of public API in libnm (implemented in libnm-core). @@ -409,4 +415,12 @@ typedef struct { #define _NM_CRYPTO_ERROR _nm_crypto_error_quark() GQuark _nm_crypto_error_quark(void); +typedef enum { + NM_DNS_IP_CONFIG_TYPE_REMOVED = -1, + + NM_DNS_IP_CONFIG_TYPE_DEFAULT = 0, + NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE, + NM_DNS_IP_CONFIG_TYPE_VPN, +} NMDnsIPConfigType; + #endif /* __NM_LIBNM_BASE_H__ */ -- cgit 1.3.0-6-gf8a5 From b22a7b55d0bc5a7999dccaeacdde745f5ace9d66 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 23 Feb 2023 17:11:22 +0100 Subject: New upstream version 1.42.2 --- src/libnm-base/nm-base.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/libnm-base/nm-base.h') diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h index 74e8142f..77d2ef0a 100644 --- a/src/libnm-base/nm-base.h +++ b/src/libnm-base/nm-base.h @@ -423,4 +423,12 @@ typedef enum { NM_DNS_IP_CONFIG_TYPE_VPN, } NMDnsIPConfigType; +/*****************************************************************************/ + +#define NM_DHCP_IAID_TO_HEXSTR_BUF_LEN (3 * sizeof(guint32)) + +char *nm_dhcp_iaid_to_hexstr(guint32 iaid, char buf[static NM_DHCP_IAID_TO_HEXSTR_BUF_LEN]); + +gboolean nm_dhcp_iaid_from_hexstr(const char *str, guint32 *out_value); + #endif /* __NM_LIBNM_BASE_H__ */ -- cgit 1.3.0-6-gf8a5