2:44 p.m.
Two more WPS patches for D-Bus client signaling and documentation.
Robert Tiemann (2):
service: Generate PropertyChanged signal on WPS changes
doc: Update Security values for services
doc/service-api.txt | 11 +++++++++--
src/service.c | 42 ++++++++++++++++++++++++++++++++----------
2 files changed, 41 insertions(+), 12 deletions(-)
--
1.9.1
2:45 p.m.
New subject: [PATCH 1/2] service: Generate PropertyChanged signal on WPS changes
D-Bus clients get notified whenever a WiFi service's WPS capability or
WPS advertising state changes.
---
src/service.c | 42 ++++++++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/service.c b/src/service.c
index 9951cce..79dfd68 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1674,6 +1674,19 @@ static void append_security(DBusMessageIter *iter, void
*user_data)
}
}
+static void security_changed(struct connman_service *service)
+{
+ if (!service->path)
+ return;
+
+ if (!allow_property_changed(service))
+ return;
+
+ connman_dbus_property_changed_array(service->path,
+ CONNMAN_SERVICE_INTERFACE, "Security",
+ DBUS_TYPE_STRING, append_security, service);
+}
+
static void append_ethernet(DBusMessageIter *iter, void *user_data)
{
struct connman_service *service = user_data;
@@ -6991,6 +7004,21 @@ static enum connman_service_security convert_wifi_security(const
char *security)
return CONNMAN_SERVICE_SECURITY_UNKNOWN;
}
+static void update_wps_values(struct connman_service *service,
+ struct connman_network *network)
+{
+ bool wps = connman_network_get_bool(network, "WiFi.WPS");
+ bool wps_advertising = connman_network_get_bool(network,
+ "WiFi.WPSAdvertising");
+
+ if (service->wps != wps ||
+ service->wps_advertizing != wps_advertising) {
+ service->wps = wps;
+ service->wps_advertizing = wps_advertising;
+ security_changed(service);
+ }
+}
+
static void update_from_network(struct connman_service *service,
struct connman_network *network)
{
@@ -7030,11 +7058,8 @@ static void update_from_network(struct connman_service *service,
str = connman_network_get_string(network, "WiFi.Security");
service->security = convert_wifi_security(str);
- if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
- service->wps = connman_network_get_bool(network, "WiFi.WPS");
- service->wps_advertizing = connman_network_get_bool(network,
- "WiFi.WPSAdvertising");
- }
+ if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+ update_wps_values(service, network);
if (service->strength > strength && service->network) {
connman_network_unref(service->network);
@@ -7202,11 +7227,8 @@ void __connman_service_update_from_network(struct connman_network
*network)
DBUS_TYPE_STRING, &service->name);
}
- if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
- service->wps = connman_network_get_bool(network, "WiFi.WPS");
- service->wps_advertizing = connman_network_get_bool(network,
- "WiFi.WPSAdvertising");
- }
+ if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+ update_wps_values(service, network);
strength = connman_network_get_strength(service->network);
if (strength == service->strength)
--
1.9.1
2:46 p.m.
New subject: [PATCH 2/2] doc: Update Security values for services
---
doc/service-api.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/doc/service-api.txt b/doc/service-api.txt
index b5b4fab..4026e7e 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -187,8 +187,15 @@ Properties string State [readonly]
present and contains the list of security methods
or key management settings.
- Possible values are "none", "wep", "psk",
"ieee8021x"
- and also "wps".
+ Possible values are "none", "wep", "psk",
"ieee8021x",
+ and also "wps" and "wps_advertising".
+
+ Value "wps" means that the service supports WPS. A
+ service advertising itself as WPS registrar contains
+ the additional value "wps_advertising" for as long as
+ it is advertising. That is, while "wps_advertising" is
+ listed, WPS is active and it should be possible to
+ connect to the corresponding service via WPS.
This property might be only present for WiFi
services.
--
1.9.1
10:09 a.m.
New subject: [PATCH 2/2] doc: Update Security values for services
Hi,
On 01/23/2018 02:46 PM, Robert Tiemann wrote:
---
doc/service-api.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/doc/service-api.txt b/doc/service-api.txt
index b5b4fab..4026e7e 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -187,8 +187,15 @@ Properties string State [readonly]
present and contains the list of security methods
or key management settings.
- Possible values are "none", "wep", "psk",
"ieee8021x"
- and also "wps".
+ Possible values are "none", "wep", "psk",
"ieee8021x",
+ and also "wps" and "wps_advertising".
+
+ Value "wps" means that the service supports WPS. A
+ service advertising itself as WPS registrar contains
+ the additional value "wps_advertising" for as long as
+ it is advertising. That is, while "wps_advertising" is
+ listed, WPS is active and it should be possible to
+ connect to the corresponding service via WPS.
This looks quite sane to me. Jose, if don't have any objections, I am
going to apply both patches.
Thanks,
Daniel
10:03 p.m.
New subject: [PATCH 2/2] doc: Update Security values for services
Hi Robert, Daniel,
Sorry the delay.
On Wed, Jan 24, 2018 at 10:09 AM, Daniel Wagner <wagi(a)monom.org> wrote:
On 01/23/2018 02:46 PM, Robert Tiemann wrote:
This looks quite sane to me. Jose, if don't have any objections, I am
going to apply both patches.
Unfortunately I have no way to test the path right now but it looks fine for me.
Thanks,
Jose
9:25 a.m.
New subject: [PATCH 2/2] doc: Update Security values for services
On 01/24/2018 10:09 AM, Daniel Wagner wrote:
This looks quite sane to me. Jose, if don't have any objections,
I am
going to apply both patches.
Hi,
these patches have not been merged yet. Is there anything left I need
to do about them?
Thanks,
Daniel
Cheers,
Robert
9:58 a.m.
New subject: [PATCH 2/2] doc: Update Security values for services
Hi Robert,
On 04/18/2018 09:25 AM, Robert Tiemann wrote:
On 01/24/2018 10:09 AM, Daniel Wagner wrote:
> This looks quite sane to me. Jose, if don't have any objections, I am
> going to apply both patches.
Hi,
these patches have not been merged yet. Is there anything left I need
to do about them?
Yes, you need to remind me to apply them :)
I forgot about them. I'll marked them to apply them later. Sorry about it.
Thanks,
Daniel
Daniel
1004
days inactive
1090
days old
7 comments
3 participants
participants (3)
-
Daniel Wagner -
Jose Blanquicet -
Robert Tiemann