diff options
Diffstat (limited to 'src/libnm-core-public')
| -rw-r--r-- | src/libnm-core-public/nm-setting-connection.h | 8 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-setting-ip-config.h | 3 | ||||
| -rw-r--r-- | src/libnm-core-public/nm-version-macros.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h index e21fd3e5..c7ac1659 100644 --- a/src/libnm-core-public/nm-setting-connection.h +++ b/src/libnm-core-public/nm-setting-connection.h @@ -51,6 +51,7 @@ G_BEGIN_DECLS #define NM_SETTING_CONNECTION_SLAVE_TYPE "slave-type" #define NM_SETTING_CONNECTION_PORT_TYPE "port-type" #define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves" +#define NM_SETTING_CONNECTION_AUTOCONNECT_PORTS "autoconnect-ports" #define NM_SETTING_CONNECTION_SECONDARIES "secondaries" #define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout" #define NM_SETTING_CONNECTION_METERED "metered" @@ -77,7 +78,10 @@ G_BEGIN_DECLS * should be activated when master is activated. * * Since: 1.2 + * + * Deprecated: 1.46 */ +NM_DEPRECATED_IN_1_46 typedef enum { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT = -1, NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO = 0, @@ -211,9 +215,13 @@ NM_AVAILABLE_IN_1_46 const char *nm_setting_connection_get_port_type(NMSettingConnection *setting); NM_AVAILABLE_IN_1_2 +NM_DEPRECATED_IN_1_46 NMSettingConnectionAutoconnectSlaves nm_setting_connection_get_autoconnect_slaves(NMSettingConnection *setting); +NM_AVAILABLE_IN_1_46 +NMTernary nm_setting_connection_get_autoconnect_ports(NMSettingConnection *setting); + guint32 nm_setting_connection_get_num_secondaries(NMSettingConnection *setting); const char *nm_setting_connection_get_secondary(NMSettingConnection *setting, guint32 idx); gboolean nm_setting_connection_add_secondary(NMSettingConnection *setting, const char *sec_uuid); diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index aa0d6d71..40609f44 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -332,6 +332,7 @@ char *nm_ip_routing_rule_to_string(const NMIPRoutingRule *self, #define NM_SETTING_IP_CONFIG_DHCP_HOSTNAME "dhcp-hostname" #define NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname" #define NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS "dhcp-hostname-flags" +#define NM_SETTING_IP_CONFIG_DHCP_DSCP "dhcp-dscp" #define NM_SETTING_IP_CONFIG_NEVER_DEFAULT "never-default" #define NM_SETTING_IP_CONFIG_MAY_FAIL "may-fail" #define NM_SETTING_IP_CONFIG_DAD_TIMEOUT "dad-timeout" @@ -478,6 +479,8 @@ gboolean nm_setting_ip_config_get_ignore_auto_dns(NMSettingIPConfig *setting); const char *nm_setting_ip_config_get_dhcp_hostname(NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_dhcp_send_hostname(NMSettingIPConfig *setting); +NM_AVAILABLE_IN_1_46 +const char *nm_setting_ip_config_get_dhcp_dscp(NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_never_default(NMSettingIPConfig *setting); gboolean nm_setting_ip_config_get_may_fail(NMSettingIPConfig *setting); diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index f7880755..4582e9b7 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (90) +#define NM_MICRO_VERSION (91) /** * NM_CHECK_VERSION: |