agent: Add network name and name length to authentication_cb_t
authorPatrik Flykt <patrik.flykt@linux.intel.com>
Fri, 2 Dec 2011 14:18:29 +0000 (16:18 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 12 Dec 2011 09:44:40 +0000 (10:44 +0100)
src/agent.c
src/connman.h
src/service.c

index 62710d4..9c789cf 100644 (file)
@@ -101,7 +101,7 @@ static void request_input_passphrase_reply(DBusPendingCall *call, void *user_dat
        char *wpspin = NULL;
        char *key;
        char *name = NULL;
-       int name_len;
+       int name_len = 0;
        DBusMessageIter iter, dict;
        DBusMessage *reply = dbus_pending_call_steal_reply(call);
 
@@ -192,6 +192,7 @@ static void request_input_passphrase_reply(DBusPendingCall *call, void *user_dat
 
 done:
        passphrase_reply->callback(passphrase_reply->service, values_received,
+                               name, name_len,
                                identity, passphrase,
                                passphrase_reply->user_data);
        connman_service_unref(passphrase_reply->service);
@@ -368,7 +369,7 @@ static void request_input_login_reply(DBusPendingCall *call, void *user_data)
 
 done:
        username_password_reply->callback(username_password_reply->service,
-                                       TRUE,
+                                       TRUE, NULL, 0,
                                        username, password,
                                        username_password_reply->user_data);
        connman_service_unref(username_password_reply->service);
index 8787ff5..e46fbe2 100644 (file)
@@ -84,6 +84,7 @@ struct connman_service;
 
 typedef void (* authentication_cb_t) (struct connman_service *service,
                                connman_bool_t values_received,
+                               const char *name, int name_len,
                                const char *identifier, const char *secret,
                                void *user_data);
 typedef void (* report_error_cb_t) (struct connman_service *service,
index c151ef0..464c681 100644 (file)
@@ -3957,6 +3957,7 @@ static void report_error_cb(struct connman_service *service,
 
 static void request_input_cb (struct connman_service *service,
                        connman_bool_t values_received,
+                       const char *name, int name_len,
                        const char *identity, const char *passphrase,
                        void *user_data)
 {