From: Patrik Flykt <[email protected]>
Clean up the queue and cancel the current message at the agent, if
any. Split out the actual cancel message sending as it will be used
separately from the rest of the code.
---
v2: factor out the cancel message sending
src/agent.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/connman.h | 2 ++
2 files changed, 56 insertions(+)
diff --git a/src/agent.c b/src/agent.c
index b78bc1c..2a9ef13 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -154,6 +154,25 @@ static int agent_send_next_request(void)
return 0;
}
+static int agent_send_cancel(void)
+{
+ DBusMessage *message;
+
+ if (agent_sender == NULL)
+ return 0;
+
+ message = dbus_message_new_method_call(agent_sender, agent_path,
+ CONNMAN_AGENT_INTERFACE, "Cancel");
+ if (message != NULL) {
+ dbus_message_set_no_reply(message, TRUE);
+ g_dbus_send_message(connection, message);
+ return 0;
+ }
+
+ connman_warn("Failed to send Cancel message to agent");
+ return -ESRCH;
+}
+
static void agent_receive_message(DBusPendingCall *call, void *user_data)
{
struct agent_data *queue_data = user_data;
@@ -203,6 +222,41 @@ static int agent_queue_message(struct connman_service
*service,
return agent_send_next_request();
}
+void __connman_agent_cancel(struct connman_service *service)
+{
+ GList *item, *next;
+ struct agent_data *queued_req;
+
+ DBG("service %p", service);
+
+ item = agent_queue;
+
+ while (item != NULL) {
+ next = g_list_next(item);
+ queued_req = item->data;
+
+ if (queued_req->service == service || service == NULL) {
+ agent_request_free(queued_req);
+ agent_queue = g_list_delete_link(agent_queue, item);
+ }
+
+ item = next;
+ }
+
+ if (agent_request == NULL)
+ return;
+
+ if (agent_request->service != service && service != NULL)
+ return;
+
+ agent_request_free(agent_request);
+ agent_request = NULL;
+
+ agent_send_cancel();
+
+ agent_send_next_request();
+}
+
static connman_bool_t check_reply_has_dict(DBusMessage *reply)
{
const char *signature = DBUS_TYPE_ARRAY_AS_STRING
diff --git a/src/connman.h b/src/connman.h
index 305f09f..120de30 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -84,6 +84,8 @@ void __connman_counter_cleanup(void);
struct connman_service;
+void __connman_agent_cancel(struct connman_service *service);
+
int __connman_service_add_passphrase(struct connman_service *service,
const gchar *passphrase);
typedef void (* authentication_cb_t) (struct connman_service *service,
--
1.7.10.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
