6:54 a.m.
Use property name "Properties" to indicate that multiple properties are
to be set with a dict. Document this also in the VPN connection API. To
conform with the specification in the VPN connection API handle also
EPERM in src/error.c as PermissionDenied D-Bus error.
Jussi Laakkonen (3):
vpn-provider: Use property name "Properties" to indicate a dict
doc: Mention "Properties" as SetProperty prop name in VPN connection
API
error: Handle EPERM as PermissionDenied D-Bus error
doc/vpn-connection-api.txt | 3 ++-
src/error.c | 1 +
vpn/vpn-provider.c | 6 +-----
3 files changed, 4 insertions(+), 6 deletions(-)
--
2.20.1
6:54 a.m.
New subject: [PATCH 1/3] vpn-provider: Use property name "Properties" to indicate a dict
Property name "Properties" is to be used when multiple properties are to
be set with one D-Bus call. It is better to have the property name
explicitly defined to avoid confusion.
---
vpn/vpn-provider.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index 8a002bd4..d93f5b47 100644
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -654,11 +654,7 @@ static DBusMessage *set_property(DBusConnection *conn, DBusMessage
*msg,
dbus_message_iter_recurse(&iter, &value);
type = dbus_message_iter_get_arg_type(&value);
- /*
- * If message name other than UserRoutes array process it as an array
- * of multiple properties.
- */
- if (type == DBUS_TYPE_ARRAY && !g_str_equal(name, "UserRoutes"))
+ if (type == DBUS_TYPE_ARRAY && g_str_equal(name, "Properties"))
return set_properties(&value, msg, data);
err = set_provider_property(provider, name, &value, type);
--
2.20.1
6:54 a.m.
New subject: [PATCH 2/3] doc: Mention "Properties" as SetProperty prop name in VPN connection API
Mention that "Properties" property name is to be used for a dict when
multiple properties are to be set using SetProperty.
---
doc/vpn-connection-api.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/vpn-connection-api.txt b/doc/vpn-connection-api.txt
index 80080ebe..cb5de69b 100644
--- a/doc/vpn-connection-api.txt
+++ b/doc/vpn-connection-api.txt
@@ -18,7 +18,8 @@ Methods dict GetProperties() [experimental]
properties defined as a dict passed as variant, where
the format is equal to the dict returned by
GetProperties(). Only properties that are listed as
- read-write are changeable. On success a
+ read-write are changeable. Property name "Properties"
+ indicates a dict of properties. On success a
PropertyChanged signal will be emitted for the
specified property or for all changed properties
individually. If there is no change in property value
--
2.20.1
6:54 a.m.
New subject: [PATCH 3/3] error: Handle EPERM as PermissionDenied D-Bus error
PermissionDenied error must be sent also when EPERM is the errorcode.
This is used in vpn-provider.c to indicate that property to be changed
or cleared is immutable and cannot be changed. This change ensures that
the replied error message corresponds to the situation.
---
src/error.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/error.c b/src/error.c
index 660e57d3..a7a8a1de 100644
--- a/src/error.c
+++ b/src/error.c
@@ -39,6 +39,7 @@ DBusMessage *__connman_error_failed(DBusMessage *msg, int errnum)
return __connman_error_not_registered(msg);
case ENXIO:
return __connman_error_not_found(msg);
+ case EPERM:
case EACCES:
return __connman_error_permission_denied(msg);
case EEXIST:
--
2.20.1
7:28 a.m.
New subject: [PATCH 0/3] Explicitly define "Properties" as name for dict of
properties
Hi Jussi,
On Tue, Dec 31, 2019 at 04:54:49PM +0200, Jussi Laakkonen wrote:
Use property name "Properties" to indicate that multiple
properties are
to be set with a dict. Document this also in the VPN connection API. To
conform with the specification in the VPN connection API handle also
EPERM in src/error.c as PermissionDenied D-Bus error.
All patches applied. Thanks!
Daniel
301
days inactive
301
days old
4 comments
2 participants
participants (2)
-
Daniel Wagner -
Jussi Laakkonen