From 13059ff7847e09e697d2bceef2ec420968613bf6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 16:09:05 +0100 Subject: [PATCH 1/7] device: don't make NM_DEVICE_IP4_ADDRESS property writable It's not necessary nor used. --- src/devices/nm-device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 52054ac45..235bfa8f6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -17288,9 +17288,6 @@ set_property (GObject *object, guint prop_id, /* construct-only */ priv->firmware_version = g_value_dup_string (value); break; - case PROP_IP4_ADDRESS: - priv->ip4_address = g_value_get_uint (value); - break; case PROP_MANAGED: if (nm_device_is_real (self)) { gboolean managed; @@ -17752,7 +17749,7 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_IP4_ADDRESS] = g_param_spec_uint (NM_DEVICE_IP4_ADDRESS, "", "", 0, G_MAXUINT32, 0, /* FIXME */ - G_PARAM_READWRITE | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_IP4_CONFIG] = g_param_spec_string (NM_DEVICE_IP4_CONFIG, "", "", From 8d5c4b26e40e8894cd112229957dc34031eb748e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 16:09:05 +0100 Subject: [PATCH 2/7] device: don't make NM_DEVICE_FIRMWARE_MISSING property writable It's not necessary nor used. --- src/devices/nm-device.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 235bfa8f6..40b3651e6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -17317,10 +17317,6 @@ set_property (GObject *object, guint prop_id, else nm_device_autoconnect_blocked_set (self, NM_DEVICE_AUTOCONNECT_BLOCKED_USER); break; - case PROP_FIRMWARE_MISSING: - /* construct-only */ - priv->firmware_missing = g_value_get_boolean (value); - break; case PROP_NM_PLUGIN_MISSING: /* construct-only */ priv->nm_plugin_missing = g_value_get_boolean (value); @@ -17810,7 +17806,7 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_FIRMWARE_MISSING] = g_param_spec_boolean (NM_DEVICE_FIRMWARE_MISSING, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_NM_PLUGIN_MISSING] = g_param_spec_boolean (NM_DEVICE_NM_PLUGIN_MISSING, "", "", From e347886a5ff1b212051beeeae9f2baee6d691db5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 17:39:33 +0100 Subject: [PATCH 3/7] device: don't make NM_DEVICE_FIRMWARE_VERSION property writable --- src/devices/nm-device.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 40b3651e6..c094918c2 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -17284,10 +17284,6 @@ set_property (GObject *object, guint prop_id, /* construct-only */ priv->driver_version = g_value_dup_string (value); break; - case PROP_FIRMWARE_VERSION: - /* construct-only */ - priv->firmware_version = g_value_dup_string (value); - break; case PROP_MANAGED: if (nm_device_is_real (self)) { gboolean managed; @@ -17725,7 +17721,7 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_FIRMWARE_VERSION] = g_param_spec_string (NM_DEVICE_FIRMWARE_VERSION, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_CAPABILITIES] = g_param_spec_uint (NM_DEVICE_CAPABILITIES, "", "", From 5c00980c1303c9e1f2ac22b5f962baa5f70e6e61 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 17:40:50 +0100 Subject: [PATCH 4/7] device: don't make NM_DEVICE_DRIVER_VERSION property writable --- src/devices/nm-device.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c094918c2..746f84130 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -17280,10 +17280,6 @@ set_property (GObject *object, guint prop_id, /* construct-only */ priv->driver = g_value_dup_string (value); break; - case PROP_DRIVER_VERSION: - /* construct-only */ - priv->driver_version = g_value_dup_string (value); - break; case PROP_MANAGED: if (nm_device_is_real (self)) { gboolean managed; @@ -17716,7 +17712,7 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_DRIVER_VERSION] = g_param_spec_string (NM_DEVICE_DRIVER_VERSION, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_FIRMWARE_VERSION] = g_param_spec_string (NM_DEVICE_FIRMWARE_VERSION, "", "", From acb9615060f480b9f44e4da6014cb5427d63064e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 16:13:15 +0100 Subject: [PATCH 5/7] device: don't make NM_DEVICE_(IP|DHCP)(4|6)_CONFIG properties writable It's not necessary, nor used, nor actually implemented. --- src/devices/nm-device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 746f84130..8e79e1348 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -17742,22 +17742,22 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_IP4_CONFIG] = g_param_spec_string (NM_DEVICE_IP4_CONFIG, "", "", NULL, - G_PARAM_READWRITE | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_DHCP4_CONFIG] = g_param_spec_string (NM_DEVICE_DHCP4_CONFIG, "", "", NULL, - G_PARAM_READWRITE | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_IP6_CONFIG] = g_param_spec_string (NM_DEVICE_IP6_CONFIG, "", "", NULL, - G_PARAM_READWRITE | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_DHCP6_CONFIG] = g_param_spec_string (NM_DEVICE_DHCP6_CONFIG, "", "", NULL, - G_PARAM_READWRITE | + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_STATE] = g_param_spec_uint (NM_DEVICE_STATE, "", "", From 4bff811b75a361df9e78c3f06d3a8fe721504a9b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 16:20:33 +0100 Subject: [PATCH 6/7] device/trivial: add comment about NMDevice properties writable from D-Bus These are special. Their setter gets called via D-Bus' SetProperty. Mark them with a comment. --- src/devices/nm-device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 8e79e1348..28a3c1038 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -17281,6 +17281,7 @@ set_property (GObject *object, guint prop_id, priv->driver = g_value_dup_string (value); break; case PROP_MANAGED: + /* via D-Bus */ if (nm_device_is_real (self)) { gboolean managed; NMDeviceStateReason reason; @@ -17304,6 +17305,7 @@ set_property (GObject *object, guint prop_id, } break; case PROP_AUTOCONNECT: + /* via D-Bus */ if (g_value_get_boolean (value)) nm_device_autoconnect_blocked_unset (self, NM_DEVICE_AUTOCONNECT_BLOCKED_ALL); else @@ -17338,6 +17340,7 @@ set_property (GObject *object, guint prop_id, priv->hw_addr_perm = g_value_dup_string (value); break; case PROP_REFRESH_RATE_MS: + /* via D-Bus */ _stats_set_refresh_rate (self, g_value_get_uint (value)); break; default: @@ -17788,12 +17791,12 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_MANAGED] = g_param_spec_boolean (NM_DEVICE_MANAGED, "", "", FALSE, - G_PARAM_READWRITE | + G_PARAM_READWRITE | /* via D-Bus */ G_PARAM_STATIC_STRINGS); obj_properties[PROP_AUTOCONNECT] = g_param_spec_boolean (NM_DEVICE_AUTOCONNECT, "", "", DEFAULT_AUTOCONNECT, - G_PARAM_READWRITE | + G_PARAM_READWRITE | /* via D-Bus */ G_PARAM_STATIC_STRINGS); obj_properties[PROP_FIRMWARE_MISSING] = g_param_spec_boolean (NM_DEVICE_FIRMWARE_MISSING, "", "", @@ -17882,7 +17885,7 @@ nm_device_class_init (NMDeviceClass *klass) obj_properties[PROP_REFRESH_RATE_MS] = g_param_spec_uint (NM_DEVICE_STATISTICS_REFRESH_RATE_MS, "", "", 0, UINT32_MAX, 0, - G_PARAM_READWRITE | + G_PARAM_READWRITE | /* via D-Bus */ G_PARAM_STATIC_STRINGS); obj_properties[PROP_TX_BYTES] = g_param_spec_uint64 (NM_DEVICE_STATISTICS_TX_BYTES, "", "", From 0622ad5a91b3e8ff1da063494043a429f20c4f55 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 Feb 2020 16:48:29 +0100 Subject: [PATCH 7/7] device/trivial: rename property enums for statistics properties of NMDevice The name of the property name should resemble the define for the name. --- src/devices/nm-device.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 28a3c1038..6205ba6ad 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -241,9 +241,9 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDevice, PROP_LLDP_NEIGHBORS, PROP_REAL, PROP_SLAVES, - PROP_REFRESH_RATE_MS, - PROP_TX_BYTES, - PROP_RX_BYTES, + PROP_STATISTICS_REFRESH_RATE_MS, + PROP_STATISTICS_TX_BYTES, + PROP_STATISTICS_RX_BYTES, PROP_IP4_CONNECTIVITY, PROP_IP6_CONNECTIVITY, PROP_INTERFACE_FLAGS, @@ -1868,11 +1868,11 @@ _stats_update_counters (NMDevice *self, if (priv->stats.tx_bytes != tx_bytes) { priv->stats.tx_bytes = tx_bytes; - _notify (self, PROP_TX_BYTES); + _notify (self, PROP_STATISTICS_TX_BYTES); } if (priv->stats.rx_bytes != rx_bytes) { priv->stats.rx_bytes = rx_bytes; - _notify (self, PROP_RX_BYTES); + _notify (self, PROP_STATISTICS_RX_BYTES); } } @@ -1929,7 +1929,7 @@ _stats_set_refresh_rate (NMDevice *self, guint refresh_rate_ms) old_rate = priv->stats.refresh_rate_ms; priv->stats.refresh_rate_ms = refresh_rate_ms; - _notify (self, PROP_REFRESH_RATE_MS); + _notify (self, PROP_STATISTICS_REFRESH_RATE_MS); _LOGD (LOGD_DEVICE, "stats: set refresh to %u ms", priv->stats.refresh_rate_ms); @@ -17339,7 +17339,7 @@ set_property (GObject *object, guint prop_id, /* construct-only */ priv->hw_addr_perm = g_value_dup_string (value); break; - case PROP_REFRESH_RATE_MS: + case PROP_STATISTICS_REFRESH_RATE_MS: /* via D-Bus */ _stats_set_refresh_rate (self, g_value_get_uint (value)); break; @@ -17525,13 +17525,13 @@ get_property (GObject *object, guint prop_id, g_value_take_boxed (value, slave_list); break; } - case PROP_REFRESH_RATE_MS: + case PROP_STATISTICS_REFRESH_RATE_MS: g_value_set_uint (value, priv->stats.refresh_rate_ms); break; - case PROP_TX_BYTES: + case PROP_STATISTICS_TX_BYTES: g_value_set_uint64 (value, priv->stats.tx_bytes); break; - case PROP_RX_BYTES: + case PROP_STATISTICS_RX_BYTES: g_value_set_uint64 (value, priv->stats.rx_bytes); break; case PROP_IP4_CONNECTIVITY: @@ -17882,17 +17882,17 @@ nm_device_class_init (NMDeviceClass *klass) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_REFRESH_RATE_MS] = + obj_properties[PROP_STATISTICS_REFRESH_RATE_MS] = g_param_spec_uint (NM_DEVICE_STATISTICS_REFRESH_RATE_MS, "", "", 0, UINT32_MAX, 0, G_PARAM_READWRITE | /* via D-Bus */ G_PARAM_STATIC_STRINGS); - obj_properties[PROP_TX_BYTES] = + obj_properties[PROP_STATISTICS_TX_BYTES] = g_param_spec_uint64 (NM_DEVICE_STATISTICS_TX_BYTES, "", "", 0, UINT64_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_RX_BYTES] = + obj_properties[PROP_STATISTICS_RX_BYTES] = g_param_spec_uint64 (NM_DEVICE_STATISTICS_RX_BYTES, "", "", 0, UINT64_MAX, 0, G_PARAM_READABLE |