1 files changed, 108 insertions, 0 deletions
diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.h b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
index eb30c931..5c827c01 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.h
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
@@ -58,6 +58,102 @@ void _nm_setting_bond_remove_options_miimon(NMSettingBond *s_bond);
 void _nm_setting_bond_remove_options_arp_interval(NMSettingBond *s_bond);
 
 typedef enum {
+    NM_BOND_AD_SELECT_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_AD_SELECT_STABLE    = 0,
+    NM_BOND_AD_SELECT_BANDWIDTH = 1,
+    NM_BOND_AD_SELECT_COUNT     = 2,
+
+    _NM_BOND_AD_SELECT_NUM,
+} NMBondAdSelect;
+
+NMBondAdSelect _nm_setting_bond_ad_select_from_string(const char *str);
+
+typedef enum {
+    NM_BOND_ARP_ALL_TARGETS_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_ARP_ALL_TARGETS_ANY = 0,
+    NM_BOND_ARP_ALL_TARGETS_ALL = 1,
+
+    _NM_BOND_ARP_ALL_TARGETS_NUM,
+} NMBondArpAllTargets;
+
+NMBondArpAllTargets _nm_setting_bond_arp_all_targets_from_string(const char *str);
+
+typedef enum {
+    NM_BOND_FAIL_OVER_MAC_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_FAIL_OVER_MAC_NONE   = 0,
+    NM_BOND_FAIL_OVER_MAC_ACTIVE = 1,
+    NM_BOND_FAIL_OVER_MAC_FOLLOW = 2,
+
+    _NM_BOND_FAIL_OVER_MAC_NUM,
+} NMBondFailOverMac;
+
+NMBondFailOverMac _nm_setting_bond_fail_over_mac_from_string(const char *str);
+
+typedef enum {
+    NM_BOND_LACP_RATE_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_LACP_RATE_SLOW = 0,
+    NM_BOND_LACP_RATE_FAST = 1,
+
+    _NM_BOND_LACP_RATE_NUM,
+} NMBondLacpRate;
+
+NMBondLacpRate _nm_setting_bond_lacp_rate_from_string(const char *str);
+
+typedef enum {
+    NM_BOND_ARP_VALIDATE_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_ARP_VALIDATE_NONE          = 0,
+    NM_BOND_ARP_VALIDATE_ACTIVE        = 1,
+    NM_BOND_ARP_VALIDATE_BACKUP        = 2,
+    NM_BOND_ARP_VALIDATE_ALL           = 3,
+    NM_BOND_ARP_VALIDATE_FILTER        = 4,
+    NM_BOND_ARP_VALIDATE_FILTER_ACTIVE = 5,
+    NM_BOND_ARP_VALIDATE_FILTER_BACKUP = 6,
+
+    _NM_BOND_ARP_VALIDATE_NUM,
+} NMBondArpValidate;
+
+NMBondArpValidate _nm_setting_bond_arp_validate_from_string(const char *str);
+
+typedef enum {
+    NM_BOND_PRIMARY_RESELECT_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_PRIMARY_RESELECT_ALWAYS  = 0,
+    NM_BOND_PRIMARY_RESELECT_BETTER  = 1,
+    NM_BOND_PRIMARY_RESELECT_FAILURE = 2,
+
+    _NM_BOND_PRIMARY_RESELECT_NUM,
+} NMBondPrimaryReselect;
+
+NMBondPrimaryReselect _nm_setting_bond_primary_reselect_from_string(const char *str);
+
+typedef enum {
+    NM_BOND_XMIT_HASH_POLICY_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering. */
+    NM_BOND_XMIT_HASH_POLICY_LAYER2      = 0,
+    NM_BOND_XMIT_HASH_POLICY_LAYER3_4    = 1,
+    NM_BOND_XMIT_HASH_POLICY_LAYER2_3    = 2,
+    NM_BOND_XMIT_HASH_POLICY_ENCAP2_3    = 3,
+    NM_BOND_XMIT_HASH_POLICY_ENCAP3_4    = 4,
+    NM_BOND_XMIT_HASH_POLICY_VLAN_SRCMAC = 5,
+
+    _NM_BOND_XMIT_HASH_POLICY_NUM,
+} NMBondXmitHashPolicy;
+
+NMBondXmitHashPolicy _nm_setting_bond_xmit_hash_policy_from_string(const char *str);
+
+typedef enum {
     NM_BOND_MODE_UNKNOWN = -1,
 
     /* The numeric values correspond to kernel's numbering of the modes. */
@@ -171,4 +267,16 @@ gboolean nm_settings_connection_validate_permission_user(const char *item, gssiz
 gpointer _nm_connection_ensure_setting(NMConnection *connection, GType gtype);
 gpointer _nm_connection_new_setting(NMConnection *connection, GType gtype);
 
+/*****************************************************************************/
+
+#define _NM_MPTCP_FLAGS_ALL                                                                    \
+    ((NMMptcpFlags) (NM_MPTCP_FLAGS_DISABLED | NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE          \
+                     | NM_MPTCP_FLAGS_ENABLED | NM_MPTCP_FLAGS_SIGNAL | NM_MPTCP_FLAGS_SUBFLOW \
+                     | NM_MPTCP_FLAGS_BACKUP | NM_MPTCP_FLAGS_FULLMESH))
+
+#define _NM_MPTCP_FLAGS_DEFAULT \
+    ((NMMptcpFlags) (NM_MPTCP_FLAGS_ENABLED_ON_GLOBAL_IFACE | NM_MPTCP_FLAGS_SUBFLOW))
+
+NMMptcpFlags nm_mptcp_flags_normalize(NMMptcpFlags flags);
+
 #endif /* __NM_LIBNM_SHARED_UTILS_H__ */