Add the handler which receive WPS credential and force save information into applicable service. Add new status property for display WPS status. Signed-off-by: n-itaya <Natsuki.Itaya(a)sony.com&gt; --- src/connman.h | 6 ++++++ src/error.c | 16 ++++++++++++++++ src/peer.c | 5 ++--- src/service.c | 21 +++++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/connman.h b/src/connman.h index 82e77d37..16ecbb5a 100644 --- a/src/connman.h +++ b/src/connman.h @@ -54,6 +54,8 @@ DBusMessage *__connman_error_operation_aborted(DBusMessage *msg); DBusMessage *__connman_error_operation_timeout(DBusMessage *msg); DBusMessage *__connman_error_invalid_service(DBusMessage *msg); DBusMessage *__connman_error_invalid_property(DBusMessage *msg); +DBusMessage *__connman_error_pin_rejected(DBusMessage *msg); +DBusMessage *__connman_error_pbc_overlap(DBusMessage *msg); int __connman_manager_init(void); void __connman_manager_cleanup(void); @@ -665,6 +667,8 @@ int __connman_service_init(void); void __connman_service_cleanup(void); int __connman_service_load_modifiable(struct connman_service *service); +void __connman_service_append_struct(struct connman_service *service, + DBusMessageIter *iter); void __connman_service_list_struct(DBusMessageIter *iter); int __connman_service_compare(const struct connman_service *a, @@ -843,6 +847,7 @@ int __connman_peer_service_unregister(const char *owner, int specification_length, const unsigned char *query, int query_length, int version); +enum connman_peer_wps_method __connman_check_wps_method(const char *wpspin); #include <connman/session.h> @@ -853,6 +858,7 @@ int __connman_service_iterate_services(service_iterate_cb cb, void *user_data); void __connman_service_mark_dirty(); void __connman_service_save(struct connman_service *service); +void __connman_service_force_save(struct connman_service *service); #include <connman/notifier.h> diff --git a/src/error.c b/src/error.c index 4f24ae25..f0b35bdc 100644 --- a/src/error.c +++ b/src/error.c @@ -67,6 +67,10 @@ DBusMessage *__connman_error_failed(DBusMessage *msg, int errnum) return __connman_error_in_progress(msg); case ENOKEY: return __connman_error_passphrase_required(msg); + case EKEYREJECTED: + return __connman_error_pin_rejected(msg); + case EAGAIN: + return __connman_error_pbc_overlap(msg); } return g_dbus_create_error(msg, CONNMAN_ERROR_INTERFACE @@ -185,3 +189,15 @@ DBusMessage *__connman_error_invalid_property(DBusMessage *msg) return g_dbus_create_error(msg, CONNMAN_ERROR_INTERFACE ".InvalidProperty", "Invalid property"); } + +DBusMessage *__connman_error_pin_rejected(DBusMessage *msg) +{ + return g_dbus_create_error(msg, CONNMAN_ERROR_INTERFACE + ".PinRejected", "PIN Rejected"); +} + +DBusMessage *__connman_error_pbc_overlap(DBusMessage *msg) +{ + return g_dbus_create_error(msg, CONNMAN_ERROR_INTERFACE + ".PbcOverlap", "PBC Overlap"); +} diff --git a/src/peer.c b/src/peer.c index 1b9b80e3..70ffeab4 100644 --- a/src/peer.c +++ b/src/peer.c @@ -545,8 +545,7 @@ static const char *get_dbus_sender(struct connman_peer *peer) return dbus_message_get_sender(peer->pending); } -static enum connman_peer_wps_method check_wpspin(struct connman_peer *peer, - const char *wpspin) +enum connman_peer_wps_method __connman_check_wps_method(const char *wpspin) { int len, i; @@ -591,7 +590,7 @@ static void request_authorization_cb(struct connman_peer *peer, goto out; } - wps_method = check_wpspin(peer, wpspin); + wps_method = __connman_check_wps_method(wpspin); err = peer_driver->connect(peer, wps_method, wpspin); if (err == -EINPROGRESS) diff --git a/src/service.c b/src/service.c index 733c0728..da323d0d 100644 --- a/src/service.c +++ b/src/service.c @@ -817,6 +817,15 @@ void __connman_service_save(struct connman_service *service) service_save(service); } +void __connman_service_force_save(struct connman_service *service) +{ + if (!service) + return; + + service->new_service = false; + service_save(service); +} + static enum connman_service_state combine_state( enum connman_service_state state_a, enum connman_service_state state_b) @@ -2577,6 +2586,18 @@ static void append_struct(gpointer value, gpointer user_data) append_struct_service(iter, append_dict_properties, service); } +void __connman_service_append_struct(struct connman_service *service, + DBusMessageIter *iter) +{ + if (!service) + return; + + if (!iter) + return; + + append_struct(service, iter); +} + void __connman_service_list_struct(DBusMessageIter *iter) { g_list_foreach(service_list, append_struct, iter); -- 2.17.1