From 069cb5c3a525ebcc19cc2927964258acaca87b13 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 17 Jun 2018 14:54:10 +0200 Subject: New upstream version 1.11.90 --- libnm/libnm.ver | 7 ++++++ libnm/nm-checkpoint.c | 6 +++-- libnm/nm-device-wifi.c | 45 +++++++++++++++++++++++++++++++++++++ libnm/nm-device-wifi.h | 4 ++++ libnm/nm-object.c | 4 ++-- libnm/nm-property-docs.xml | 13 ++++++----- libnm/nm-remote-connection.c | 37 ++++++++++++++++++++++++++++++ libnm/nm-remote-connection.h | 4 ++++ libnm/nm-settings-docs.xml | 13 ++++++----- libnm/nm-settings-ifcfg-rh-docs.xml | 4 ++++ libnm/nm-vpn-connection.c | 9 +------- 11 files changed, 124 insertions(+), 22 deletions(-) (limited to 'libnm') diff --git a/libnm/libnm.ver b/libnm/libnm.ver index ec1b91da..5011906c 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1350,15 +1350,22 @@ global: nm_client_get_checkpoints; nm_connection_get_setting_tc_config; nm_device_ip_tunnel_get_flags; + nm_device_wifi_get_last_scan; nm_ip_tunnel_flags_get_type; + nm_remote_connection_get_filename; nm_remote_connection_get_flags; nm_setting_connection_get_mdns; nm_setting_connection_mdns_get_type; nm_setting_ip_tunnel_get_flags; + nm_setting_ip6_config_get_dhcp_duid; + nm_setting_macsec_get_send_sci; nm_setting_vpn_get_data_keys; nm_setting_vpn_get_secret_keys; nm_setting_wireless_security_get_fils; nm_setting_wireless_security_fils_get_type; + nm_setting_wireless_get_wake_on_wlan; + nm_setting_wireless_wake_on_wlan_get_type; nm_settings_connection_flags_get_type; + nm_utils_get_timestamp_msec; nm_vpn_service_plugin_shutdown; } libnm_1_10_0; diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c index 153a7104..ce15d087 100644 --- a/libnm/nm-checkpoint.c +++ b/libnm/nm-checkpoint.c @@ -70,8 +70,10 @@ nm_checkpoint_get_devices (NMCheckpoint *checkpoint) * nm_checkpoint_get_created: * @checkpoint: a #NMCheckpoint * - * Gets the timestamp (in CLOCK_BOOTTIME milliseconds) - * of checkpoint creation. + * Gets the timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation. + * + * Use nm_utils_get_timestamp_msec() to obtain current time value suitable for + * comparing to this value. * * Returns: the timestamp of checkpoint creation. * diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 1f2118fa..848e297c 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -59,6 +59,7 @@ typedef struct { NMAccessPoint *active_ap; NMDeviceWifiCapabilities wireless_caps; GPtrArray *aps; + gint64 last_scan; RequestScanInfo *scan_info; } NMDeviceWifiPrivate; @@ -72,6 +73,7 @@ enum { PROP_ACTIVE_ACCESS_POINT, PROP_WIRELESS_CAPABILITIES, PROP_ACCESS_POINTS, + PROP_LAST_SCAN, LAST_PROP }; @@ -267,6 +269,28 @@ nm_device_wifi_get_access_point_by_path (NMDeviceWifi *device, return ap; } +/** + * nm_device_wifi_get_last_scan: + * @device: a #NMDeviceWifi + * + * Returns the timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished + * network scan. A value of -1 means the device never scanned for access points. + * + * Use nm_utils_get_timestamp_msec() to obtain current time value suitable for + * comparing to this value. + * + * Returns: the last scan time in seconds + * + * Since: 1.12 + **/ +gint64 +nm_device_wifi_get_last_scan (NMDeviceWifi *device) +{ + g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), -1); + + return NM_DEVICE_WIFI_GET_PRIVATE (device)->last_scan; +} + static GVariant * prepare_scan_options (GVariant *options) { @@ -666,6 +690,7 @@ nm_device_wifi_init (NMDeviceWifi *device) NULL); priv->aps = g_ptr_array_new (); + priv->last_scan = -1; } static void @@ -698,6 +723,9 @@ get_property (GObject *object, case PROP_ACCESS_POINTS: g_value_take_boxed (value, _nm_utils_copy_object_array (nm_device_wifi_get_access_points (self))); break; + case PROP_LAST_SCAN: + g_value_set_int64 (value, nm_device_wifi_get_last_scan (self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -739,6 +767,7 @@ init_dbus (NMObject *object) { NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, &priv->active_ap, NULL, NM_TYPE_ACCESS_POINT }, { NM_DEVICE_WIFI_CAPABILITIES, &priv->wireless_caps }, { NM_DEVICE_WIFI_ACCESS_POINTS, &priv->aps, NULL, NM_TYPE_ACCESS_POINT, "access-point" }, + { NM_DEVICE_WIFI_LAST_SCAN, &priv->last_scan }, { NULL }, }; @@ -898,6 +927,22 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * NMDeviceWifi:last-scan: + * + * The timestamp (in CLOCK_BOOTTIME seconds) for the last finished + * network scan. A value of -1 means the device never scanned for + * access points. + * + * Since: 1.12 + **/ + g_object_class_install_property + (object_class, PROP_LAST_SCAN, + g_param_spec_int64 (NM_DEVICE_WIFI_LAST_SCAN, "", "", + -1, G_MAXINT64, -1, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + /* signals */ /** diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h index 8cfea1f3..8448acfe 100644 --- a/libnm/nm-device-wifi.h +++ b/libnm/nm-device-wifi.h @@ -44,6 +44,7 @@ G_BEGIN_DECLS #define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point" #define NM_DEVICE_WIFI_CAPABILITIES "wireless-capabilities" #define NM_DEVICE_WIFI_ACCESS_POINTS "access-points" +#define NM_DEVICE_WIFI_LAST_SCAN "last-scan" /** * NMDeviceWifi: @@ -77,6 +78,9 @@ NMAccessPoint * nm_device_wifi_get_access_point_by_path (NMDeviceWifi * const GPtrArray * nm_device_wifi_get_access_points (NMDeviceWifi *device); +NM_AVAILABLE_IN_1_12 +gint64 nm_device_wifi_get_last_scan (NMDeviceWifi *device); + gboolean nm_device_wifi_request_scan (NMDeviceWifi *device, GCancellable *cancellable, GError **error); diff --git a/libnm/nm-object.c b/libnm/nm-object.c index f162b15d..da2fbb79 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -900,9 +900,9 @@ demarshal_generic (NMObject *object, else if (pspec->value_type == G_TYPE_UINT) HANDLE_TYPE (G_VARIANT_TYPE_UINT32, guint, g_variant_get_uint32); else if (pspec->value_type == G_TYPE_INT64) - HANDLE_TYPE (G_VARIANT_TYPE_INT64, gint, g_variant_get_int64); + HANDLE_TYPE (G_VARIANT_TYPE_INT64, gint64, g_variant_get_int64); else if (pspec->value_type == G_TYPE_UINT64) - HANDLE_TYPE (G_VARIANT_TYPE_UINT64, guint, g_variant_get_uint64); + HANDLE_TYPE (G_VARIANT_TYPE_UINT64, guint64, g_variant_get_uint64); else if (pspec->value_type == G_TYPE_LONG) HANDLE_TYPE (G_VARIANT_TYPE_INT64, glong, g_variant_get_int64); else if (pspec->value_type == G_TYPE_ULONG) diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml index a8b809bd..a857f633 100644 --- a/libnm/nm-property-docs.xml +++ b/libnm/nm-property-docs.xml @@ -21,7 +21,7 @@ - + @@ -194,6 +194,7 @@ + @@ -239,6 +240,7 @@ + @@ -335,7 +337,7 @@ - + @@ -411,9 +413,9 @@ - + - + @@ -423,7 +425,7 @@ - + @@ -445,6 +447,7 @@ + diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index bd60c413..45b804f1 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -51,6 +51,7 @@ enum { PROP_0, PROP_UNSAVED, PROP_FLAGS, + PROP_FILENAME, PROP_VISIBLE, LAST_PROP @@ -61,6 +62,7 @@ typedef struct { gboolean unsaved; guint32 flags; + const char *filename; gboolean visible; } NMRemoteConnectionPrivate; @@ -669,6 +671,22 @@ nm_remote_connection_get_flags (NMRemoteConnection *connection) return (NMSettingsConnectionFlags) NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->flags; } +/** + * nm_remote_connection_get_filename: + * @connection: the #NMRemoteConnection + * + * Returns: file that stores the connection in case the connection is file-backed. + * + * Since: 1.12 + **/ +const char * +nm_remote_connection_get_filename (NMRemoteConnection *connection) +{ + g_return_val_if_fail (NM_IS_REMOTE_CONNECTION (connection), NULL); + + return NM_REMOTE_CONNECTION_GET_PRIVATE (connection)->filename; +} + /** * nm_remote_connection_get_visible: * @connection: the #NMRemoteConnection @@ -760,6 +778,7 @@ init_dbus (NMObject *object) const NMPropertiesInfo property_info[] = { { NM_REMOTE_CONNECTION_UNSAVED, &priv->unsaved }, { NM_REMOTE_CONNECTION_FLAGS, &priv->flags }, + { NM_REMOTE_CONNECTION_FILENAME, &priv->filename }, { NULL }, }; @@ -893,6 +912,9 @@ get_property (GObject *object, guint prop_id, case PROP_FLAGS: g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags); break; + case PROP_FILENAME: + g_value_set_string (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->filename); + break; case PROP_VISIBLE: g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->visible); break; @@ -965,6 +987,21 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + /** + * NMRemoteConnection:filename: + * + * File that stores the connection in case the connection is + * file-backed. + * + * Since: 1.12 + **/ + g_object_class_install_property + (object_class, PROP_FILENAME, + g_param_spec_string (NM_REMOTE_CONNECTION_FILENAME, "", "", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + /** * NMRemoteConnection:visible: * diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index d5b6a8c4..834b52d8 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -42,6 +42,7 @@ G_BEGIN_DECLS #define NM_REMOTE_CONNECTION_PATH "path" #define NM_REMOTE_CONNECTION_UNSAVED "unsaved" #define NM_REMOTE_CONNECTION_FLAGS "flags" +#define NM_REMOTE_CONNECTION_FILENAME "filename" #define NM_REMOTE_CONNECTION_VISIBLE "visible" /** @@ -126,6 +127,9 @@ gboolean nm_remote_connection_get_unsaved (NMRemoteConnection *connection); NM_AVAILABLE_IN_1_12 NMSettingsConnectionFlags nm_remote_connection_get_flags (NMRemoteConnection *connection); +NM_AVAILABLE_IN_1_12 +const char *nm_remote_connection_get_filename (NMRemoteConnection *connection); + gboolean nm_remote_connection_get_visible (NMRemoteConnection *connection); G_END_DECLS diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml index 5334b658..f5d7b688 100644 --- a/libnm/nm-settings-docs.xml +++ b/libnm/nm-settings-docs.xml @@ -21,7 +21,7 @@ - + @@ -199,6 +199,7 @@ + @@ -245,6 +246,7 @@ + @@ -342,7 +344,7 @@ - + @@ -420,9 +422,9 @@ - + - + @@ -432,7 +434,7 @@ - + @@ -456,6 +458,7 @@ + diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml index 03d935ea..bf041ab2 100644 --- a/libnm/nm-settings-ifcfg-rh-docs.xml +++ b/libnm/nm-settings-ifcfg-rh-docs.xml @@ -217,6 +217,10 @@ A negative value prevents DNS from other connections with greater values to be u IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no" default="no" example="IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes" description="Configure IPv6 Privacy Extensions for SLAAC (RFC4941)."/> + diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index 5a3c4e56..bc26d0b9 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -71,16 +71,9 @@ static guint signals[LAST_SIGNAL] = { 0 }; const char * nm_vpn_connection_get_banner (NMVpnConnection *vpn) { - NMVpnConnectionPrivate *priv; - g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NULL); - priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn); - - if (priv->vpn_state != NM_VPN_CONNECTION_STATE_ACTIVATED) - return NULL; - - return nm_str_not_empty (priv->banner); + return nm_str_not_empty (NM_VPN_CONNECTION_GET_PRIVATE (vpn)->banner); } /** -- cgit 1.3.0-6-gf8a5