agent: Unify request input callback for passphrase and login based input.

diff --git a/src/agent.c b/src/agent.c
index 3a8674e..56217ef 100644 (file)
--- a/src/agent.c
+++ b/src/agent.c
@@ -87,7 +87,7 @@ int __connman_agent_unregister(const char *sender, const char *path)
 
 struct request_input_reply {
        struct connman_service *service;
-       passphrase_cb_t callback;
+       authentication_cb_t callback;
        void *user_data;
 };
 
@@ -258,7 +258,7 @@ static void request_input_append_wps(DBusMessageIter *iter, void *user_data)
 }
 
 int __connman_agent_request_input(struct connman_service *service,
-                               passphrase_cb_t callback, void *user_data)
+                               authentication_cb_t callback, void *user_data)
 {
        DBusMessage *message;
        const char *path;

diff --git a/src/connman.h b/src/connman.h
index b48ff53..2faeb1b 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -82,13 +82,13 @@ void __connman_counter_cleanup(void);
 
 struct connman_service;
 
-typedef void (* passphrase_cb_t) (struct connman_service *service,
-                               const char *identity, const char *passphrase,
+typedef void (* authentication_cb_t) (struct connman_service *service,
+                               const char *identifier, const char *secret,
                                void *user_data);
 typedef void (* report_error_cb_t) (struct connman_service *service,
                                gboolean retry, void *user_data);
 int __connman_agent_request_input(struct connman_service *service,
-                               passphrase_cb_t callback, void *user_data);
+                               authentication_cb_t callback, void *user_data);
 int __connman_agent_report_error(struct connman_service *service,
                                const char *error,
                                report_error_cb_t callback, void *user_data);