vpn: Make VPN plugin connection function async

This is needed as we want to ask user the passwords etc.

1 files changed, 22 insertions, 7 deletions

diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index a5980e6f..c6b86de2 100644
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -440,11 +440,11 @@ static DBusMessage *do_connect(DBusConnection *conn, DBusMessage *msg,
 
 	DBG("conn %p provider %p", conn, provider);
 
-	err = __vpn_provider_connect(provider);
+	err = __vpn_provider_connect(provider, msg);
 	if (err < 0)
 		return __connman_error_failed(msg, -err);
 
-	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+	return NULL;
 }
 
 static DBusMessage *do_disconnect(DBusConnection *conn, DBusMessage *msg,
@@ -978,19 +978,34 @@ int __vpn_provider_disconnect(struct vpn_provider *provider)
 static void connect_cb(struct vpn_provider *provider, void *user_data,
 								int error)
 {
+	DBusMessage *pending = user_data;
+
 	DBG("provider %p user %p error %d", provider, user_data, error);
+
+	if (error != 0) {
+		DBusMessage *reply = __connman_error_failed(pending, error);
+		if (reply != NULL)
+			g_dbus_send_message(connection, reply);
+
+		vpn_provider_indicate_error(provider,
+					VPN_PROVIDER_ERROR_CONNECT_FAILED);
+		vpn_provider_set_state(provider, VPN_PROVIDER_STATE_FAILURE);
+	} else
+		g_dbus_send_reply(connection, pending, DBUS_TYPE_INVALID);
+
+	dbus_message_unref(pending);
 }
 
-int __vpn_provider_connect(struct vpn_provider *provider)
+int __vpn_provider_connect(struct vpn_provider *provider, DBusMessage *msg)
 {
 	int err;
 
 	DBG("provider %p", provider);
 
-	if (provider->driver != NULL && provider->driver->connect != NULL)
-		err = provider->driver->connect(provider,
-						connect_cb, NULL);
-	else
+	if (provider->driver != NULL && provider->driver->connect != NULL) {
+		dbus_message_ref(msg);
+		err = provider->driver->connect(provider, connect_cb, msg);
+	} else
 		return -EOPNOTSUPP;
 
 	return err;