libnm: actually export a lot of routines that were supposed to be public

Add them to @libnm_1_40_4 as opposed to @libnm_1_42_0 because we now know
this is going to be backported to 1.40.4 first.
This commit is contained in:
Lubomir Rintel 2022-11-07 20:29:12 +01:00
parent d78000d921
commit 45d9f1c01c
32 changed files with 76 additions and 49 deletions

View file

@ -1847,11 +1847,36 @@ global:
libnm_1_40_4 {
global:
nm_device_6lowpan_get_parent;
nm_device_macsec_get_parent;
nm_device_veth_get_peer;
nm_device_vxlan_get_carrier;
nm_device_vxlan_get_rsc;
nm_device_wifi_p2p_get_peer_by_path;
nm_setting_6lowpan_get_parent;
nm_setting_6lowpan_new;
nm_setting_connection_get_mptcp_flags;
nm_setting_hostname_new;
nm_setting_ip4_config_get_link_local;
nm_setting_ip_config_get_dhcp_iaid;
nm_setting_ip_tunnel_get_encapsulation_limit;
nm_setting_ip_tunnel_get_flow_label;
nm_setting_ovs_bridge_get_datapath_type;
nm_setting_vpn_get_persistent;
nm_setting_wpan_get_channel;
nm_setting_wpan_get_mac_address;
nm_setting_wpan_get_page;
nm_setting_wpan_get_pan_id;
nm_setting_wpan_get_short_address;
nm_setting_wpan_new;
nm_sriov_vf_attribute_validate;
nm_tc_tfilter_get_action;
nm_tc_tfilter_set_action;
nm_utils_ip_addresses_from_variant;
nm_utils_ip_addresses_to_variant;
nm_utils_ip_routes_from_variant;
nm_utils_ip_routes_to_variant;
nm_vpn_plugin_info_supports_multiple;
} libnm_1_40_0;
libnm_1_42_0 {

View file

@ -39,7 +39,7 @@ G_DEFINE_TYPE(NMDevice6Lowpan, nm_device_6lowpan, NM_TYPE_DEVICE)
*
* Returns: (transfer none): the device's parent device
*
* Since: 1.14
* Since: 1.42
**/
NMDevice *
nm_device_6lowpan_get_parent(NMDevice6Lowpan *device)

View file

@ -65,7 +65,7 @@ G_DEFINE_TYPE(NMDeviceMacsec, nm_device_macsec, NM_TYPE_DEVICE)
*
* Returns: (transfer none): the device's parent device
*
* Since: 1.6
* Since: 1.42
**/
NMDevice *
nm_device_macsec_get_parent(NMDeviceMacsec *device)

View file

@ -44,7 +44,7 @@ G_DEFINE_TYPE(NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET)
*
* Returns: (transfer none): the device's peer device
*
* Since: 1.30
* Since: 1.42
**/
NMDevice *
nm_device_veth_get_peer(NMDeviceVeth *device)

View file

@ -99,7 +99,7 @@ nm_device_vxlan_get_hw_address(NMDeviceVxlan *device)
* This property is not implemented yet, and the function always returns
* FALSE.
*
* Since: 1.2
* Since: 1.42
**/
gboolean
nm_device_vxlan_get_carrier(NMDeviceVxlan *device)
@ -325,7 +325,7 @@ nm_device_vxlan_get_proxy(NMDeviceVxlan *device)
*
* Returns: whether route short circuit is turned on
*
* Since: 1.2
* Since: 1.42
**/
gboolean
nm_device_vxlan_get_rsc(NMDeviceVxlan *device)

View file

@ -100,7 +100,7 @@ nm_device_wifi_p2p_get_peers(NMDeviceWifiP2P *device)
*
* Returns: (transfer none): the peer or %NULL if none is found.
*
* Since: 1.16
* Since: 1.42
**/
NMWifiP2PPeer *
nm_device_wifi_p2p_get_peer_by_path(NMDeviceWifiP2P *device, const char *path)

View file

@ -38,7 +38,7 @@ typedef struct _NMDevice6LowpanClass NMDevice6LowpanClass;
NM_AVAILABLE_IN_1_14
GType nm_device_6lowpan_get_type(void);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
NMDevice *nm_device_6lowpan_get_parent(NMDevice6Lowpan *device);
G_END_DECLS

View file

@ -50,7 +50,7 @@ typedef struct _NMDeviceMacsecClass NMDeviceMacsecClass;
NM_AVAILABLE_IN_1_6
GType nm_device_macsec_get_type(void);
NM_AVAILABLE_IN_1_6
NM_AVAILABLE_IN_1_42
NMDevice *nm_device_macsec_get_parent(NMDeviceMacsec *device);
NM_AVAILABLE_IN_1_6

View file

@ -36,7 +36,7 @@ typedef struct _NMDeviceVethClass NMDeviceVethClass;
NM_AVAILABLE_IN_1_30
GType nm_device_veth_get_type(void);
NM_AVAILABLE_IN_1_30
NM_AVAILABLE_IN_1_42
NMDevice *nm_device_veth_get_peer(NMDeviceVeth *device);
G_END_DECLS

View file

@ -58,7 +58,7 @@ NM_AVAILABLE_IN_1_2
NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address)
const char *nm_device_vxlan_get_hw_address(NMDeviceVxlan *device);
NM_AVAILABLE_IN_1_2
NM_AVAILABLE_IN_1_42
gboolean nm_device_vxlan_get_carrier(NMDeviceVxlan *device);
NM_AVAILABLE_IN_1_2
NMDevice *nm_device_vxlan_get_parent(NMDeviceVxlan *device);
@ -86,7 +86,7 @@ NM_AVAILABLE_IN_1_2
guint nm_device_vxlan_get_limit(NMDeviceVxlan *device);
NM_AVAILABLE_IN_1_2
gboolean nm_device_vxlan_get_proxy(NMDeviceVxlan *device);
NM_AVAILABLE_IN_1_2
NM_AVAILABLE_IN_1_42
gboolean nm_device_vxlan_get_rsc(NMDeviceVxlan *device);
NM_AVAILABLE_IN_1_2
gboolean nm_device_vxlan_get_l2miss(NMDeviceVxlan *device);

View file

@ -44,7 +44,7 @@ NM_AVAILABLE_IN_1_16
NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address)
const char *nm_device_wifi_p2p_get_hw_address(NMDeviceWifiP2P *device);
NM_AVAILABLE_IN_1_16
NM_AVAILABLE_IN_1_42
NMWifiP2PPeer *nm_device_wifi_p2p_get_peer_by_path(NMDeviceWifiP2P *device, const char *path);
NM_AVAILABLE_IN_1_16

View file

@ -53,7 +53,7 @@ G_DEFINE_TYPE(NMSetting6Lowpan, nm_setting_6lowpan, NM_TYPE_SETTING)
*
* Returns: the #NMSetting6Lowpan:parent property of the setting
*
* Since: 1.14
* Since: 1.42
**/
const char *
nm_setting_6lowpan_get_parent(NMSetting6Lowpan *setting)
@ -141,7 +141,7 @@ nm_setting_6lowpan_init(NMSetting6Lowpan *setting)
*
* Returns: (transfer full): the new empty #NMSetting6Lowpan object
*
* Since: 1.14
* Since: 1.42
**/
NMSetting *
nm_setting_6lowpan_new(void)

View file

@ -1023,7 +1023,7 @@ nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting)
*
* Returns: the #NMSettingConnection:mptcp-flags property of the setting.
*
* Since: 1.40
* Since: 1.42
**/
NMMptcpFlags
nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting)

View file

@ -134,7 +134,7 @@ nm_setting_hostname_init(NMSettingHostname *setting)
*
* Returns: (transfer full): the new empty #NMSettingHostname object
*
* Since: 1.30
* Since: 1.42
**/
NMSetting *
nm_setting_hostname_new(void)

View file

@ -240,7 +240,7 @@ nm_setting_ip_tunnel_get_output_key(NMSettingIPTunnel *setting)
*
* Returns: the encapsulation limit value
*
* Since: 1.2
* Since: 1.42
**/
guint
nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting)
@ -258,7 +258,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting)
*
* Returns: the flow label value
*
* Since: 1.2
* Since: 1.42
**/
guint
nm_setting_ip_tunnel_get_flow_label(NMSettingIPTunnel *setting)

View file

@ -138,7 +138,7 @@ nm_setting_ip4_config_get_dhcp_vendor_class_identifier(NMSettingIP4Config *setti
*
* Returns: the link-local configuration
*
* Since: 1.40
* Since: 1.42
**/
NMSettingIP4LinkLocal
nm_setting_ip4_config_get_link_local(NMSettingIP4Config *setting)

View file

@ -120,7 +120,7 @@ nm_setting_ovs_bridge_get_stp_enable(NMSettingOvsBridge *self)
*
* Returns: the #NMSettingOvsBridge:datapath_type property of the setting
*
* Since: 1.20
* Since: 1.42
**/
const char *
nm_setting_ovs_bridge_get_datapath_type(NMSettingOvsBridge *self)

View file

@ -372,7 +372,7 @@ const NMVariantAttributeSpec *const _nm_sriov_vf_attribute_spec[] = {
*
* Returns: %TRUE if the attribute is valid, %FALSE otherwise
*
* Since: 1.14
* Since: 1.42
*/
gboolean
nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *known, GError **error)

View file

@ -935,7 +935,7 @@ nm_tc_tfilter_get_parent(NMTCTfilter *tfilter)
*
* Returns: the action associated with a traffic filter.
*
* Since: 1.12
* Since: 1.42
**/
NMTCAction *
nm_tc_tfilter_get_action(NMTCTfilter *tfilter)
@ -956,7 +956,7 @@ nm_tc_tfilter_get_action(NMTCTfilter *tfilter)
*
* Sets the action associated with a traffic filter.
*
* Since: 1.12
* Since: 1.42
**/
void
nm_tc_tfilter_set_action(NMTCTfilter *tfilter, NMTCAction *action)

View file

@ -77,7 +77,7 @@ G_DEFINE_TYPE(NMSettingWpan, nm_setting_wpan, NM_TYPE_SETTING)
*
* Returns: the #NMSettingWpan:mac-address property of the setting
*
* Since: 1.14
* Since: 1.42
**/
const char *
nm_setting_wpan_get_mac_address(NMSettingWpan *setting)
@ -93,7 +93,7 @@ nm_setting_wpan_get_mac_address(NMSettingWpan *setting)
*
* Returns: the #NMSettingWpan:pan-id property of the setting
*
* Since: 1.14
* Since: 1.42
**/
guint16
nm_setting_wpan_get_pan_id(NMSettingWpan *setting)
@ -109,7 +109,7 @@ nm_setting_wpan_get_pan_id(NMSettingWpan *setting)
*
* Returns: the #NMSettingWpan:short-address property of the setting
*
* Since: 1.14
* Since: 1.42
**/
guint16
nm_setting_wpan_get_short_address(NMSettingWpan *setting)
@ -125,7 +125,7 @@ nm_setting_wpan_get_short_address(NMSettingWpan *setting)
*
* Returns: the #NMSettingWpan:page property of the setting
*
* Since: 1.16
* Since: 1.42
**/
gint16
nm_setting_wpan_get_page(NMSettingWpan *setting)
@ -141,7 +141,7 @@ nm_setting_wpan_get_page(NMSettingWpan *setting)
*
* Returns: the #NMSettingWpan:channel property of the setting
*
* Since: 1.16
* Since: 1.42
**/
gint16
nm_setting_wpan_get_channel(NMSettingWpan *setting)
@ -213,7 +213,7 @@ nm_setting_wpan_init(NMSettingWpan *setting)
*
* Returns: (transfer full): the new empty #NMSettingWpan object
*
* Since: 1.14
* Since: 1.42
**/
NMSetting *
nm_setting_wpan_new(void)

View file

@ -898,7 +898,7 @@ nm_vpn_plugin_info_get_program(NMVpnPluginInfo *self)
*
* Returns: %TRUE if the service supports multiple instances with different bus names, otherwise %FALSE
*
* Since: 1.2
* Since: 1.42
*/
gboolean
nm_vpn_plugin_info_supports_multiple(NMVpnPluginInfo *self)

View file

@ -33,10 +33,10 @@ typedef struct _NMSetting6LowpanClass NMSetting6LowpanClass;
NM_AVAILABLE_IN_1_14
GType nm_setting_6lowpan_get_type(void);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
NMSetting *nm_setting_6lowpan_new(void);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
const char *nm_setting_6lowpan_get_parent(NMSetting6Lowpan *setting);
G_END_DECLS

View file

@ -221,7 +221,7 @@ 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
NM_AVAILABLE_IN_1_42
NMMptcpFlags nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting);
NM_AVAILABLE_IN_1_20

View file

@ -36,7 +36,7 @@ typedef struct _NMSettingHostnameClass NMSettingHostnameClass;
NM_AVAILABLE_IN_1_30
GType nm_setting_hostname_get_type(void);
NM_AVAILABLE_IN_1_30
NM_AVAILABLE_IN_1_42
NMSetting *nm_setting_hostname_new(void);
NM_AVAILABLE_IN_1_30

View file

@ -94,9 +94,9 @@ NM_AVAILABLE_IN_1_2
const char *nm_setting_ip_tunnel_get_input_key(NMSettingIPTunnel *setting);
NM_AVAILABLE_IN_1_2
const char *nm_setting_ip_tunnel_get_output_key(NMSettingIPTunnel *setting);
NM_AVAILABLE_IN_1_2
NM_AVAILABLE_IN_1_42
guint nm_setting_ip_tunnel_get_encapsulation_limit(NMSettingIPTunnel *setting);
NM_AVAILABLE_IN_1_2
NM_AVAILABLE_IN_1_42
guint nm_setting_ip_tunnel_get_flow_label(NMSettingIPTunnel *setting);
NM_AVAILABLE_IN_1_2
guint nm_setting_ip_tunnel_get_mtu(NMSettingIPTunnel *setting);

View file

@ -113,7 +113,7 @@ 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
NM_AVAILABLE_IN_1_42
NMSettingIP4LinkLocal nm_setting_ip4_config_get_link_local(NMSettingIP4Config *setting);
G_END_DECLS

View file

@ -49,7 +49,7 @@ NM_AVAILABLE_IN_1_10
gboolean nm_setting_ovs_bridge_get_rstp_enable(NMSettingOvsBridge *self);
NM_AVAILABLE_IN_1_10
gboolean nm_setting_ovs_bridge_get_stp_enable(NMSettingOvsBridge *self);
NM_AVAILABLE_IN_1_20
NM_AVAILABLE_IN_1_42
const char *nm_setting_ovs_bridge_get_datapath_type(NMSettingOvsBridge *self);
G_END_DECLS

View file

@ -109,7 +109,7 @@ NM_AVAILABLE_IN_1_14
const char **nm_sriov_vf_get_attribute_names(const NMSriovVF *vf);
NM_AVAILABLE_IN_1_14
GVariant *nm_sriov_vf_get_attribute(const NMSriovVF *vf, const char *name);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
gboolean
nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *known, GError **error);

View file

@ -102,9 +102,9 @@ NM_AVAILABLE_IN_1_12
void nm_tc_tfilter_set_handle(NMTCTfilter *tfilter, guint32 handle);
NM_AVAILABLE_IN_1_12
guint32 nm_tc_tfilter_get_parent(NMTCTfilter *tfilter);
NM_AVAILABLE_IN_1_12
NM_AVAILABLE_IN_1_42
NMTCAction *nm_tc_tfilter_get_action(NMTCTfilter *tfilter);
NM_AVAILABLE_IN_1_12
NM_AVAILABLE_IN_1_42
void nm_tc_tfilter_set_action(NMTCTfilter *tfilter, NMTCAction *action);
#define NM_TYPE_SETTING_TC_CONFIG (nm_setting_tc_config_get_type())

View file

@ -49,7 +49,9 @@ GType nm_setting_vpn_get_type(void);
NMSetting *nm_setting_vpn_new(void);
const char *nm_setting_vpn_get_service_type(NMSettingVpn *setting);
const char *nm_setting_vpn_get_user_name(NMSettingVpn *setting);
gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting);
NM_AVAILABLE_IN_1_42
gboolean nm_setting_vpn_get_persistent(NMSettingVpn *setting);
guint32 nm_setting_vpn_get_num_data_items(NMSettingVpn *setting);
void nm_setting_vpn_add_data_item(NMSettingVpn *setting, const char *key, const char *item);

View file

@ -38,18 +38,18 @@ typedef struct _NMSettingWpanClass NMSettingWpanClass;
NM_AVAILABLE_IN_1_14
GType nm_setting_wpan_get_type(void);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
NMSetting *nm_setting_wpan_new(void);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
const char *nm_setting_wpan_get_mac_address(NMSettingWpan *setting);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
guint16 nm_setting_wpan_get_pan_id(NMSettingWpan *setting);
NM_AVAILABLE_IN_1_14
NM_AVAILABLE_IN_1_42
guint16 nm_setting_wpan_get_short_address(NMSettingWpan *setting);
NM_AVAILABLE_IN_1_16
NM_AVAILABLE_IN_1_42
gint16 nm_setting_wpan_get_page(NMSettingWpan *setting);
NM_AVAILABLE_IN_1_16
NM_AVAILABLE_IN_1_42
gint16 nm_setting_wpan_get_channel(NMSettingWpan *setting);
G_END_DECLS

View file

@ -62,7 +62,7 @@ NM_AVAILABLE_IN_1_4
const char *nm_vpn_plugin_info_get_auth_dialog(NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_4
gboolean nm_vpn_plugin_info_supports_hints(NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_2
NM_AVAILABLE_IN_1_42
gboolean nm_vpn_plugin_info_supports_multiple(NMVpnPluginInfo *self);
NM_AVAILABLE_IN_1_4
const char *const *nm_vpn_plugin_info_get_aliases(NMVpnPluginInfo *self);