Track and report VPN providers states

1 files changed, 30 insertions, 4 deletions

diff --git a/plugins/openconnect.c b/plugins/openconnect.c
index c860f27a..9232781d 100644
--- a/plugins/openconnect.c
+++ b/plugins/openconnect.c
@@ -52,10 +52,20 @@
 
 #include "inet.h"
 
+enum oc_state {
+	OC_STATE_UNKNOWN       = 0,
+	OC_STATE_IDLE          = 1,
+	OC_STATE_CONNECT       = 2,
+	OC_STATE_READY         = 3,
+	OC_STATE_DISCONNECT    = 4,
+	OC_STATE_FAILURE       = 5,
+};
+
 struct oc_data {
 	char *if_name;
 	unsigned flags;
 	unsigned int watch;
+	unsigned int state;
 	struct connman_task *task;
 };
 
@@ -100,6 +110,7 @@ static void openconnect_died(struct connman_task *task, void *user_data)
 {
 	struct connman_provider *provider = user_data;
 	struct oc_data *data = connman_provider_get_data(provider);
+	int state = data->state;
 
 	DBG("provider %p data %p", provider, data);
 
@@ -112,7 +123,13 @@ static void openconnect_died(struct connman_task *task, void *user_data)
 	g_free(data);
 
  oc_exit:
-	connman_provider_set_connected(provider, FALSE);
+	if (state != OC_STATE_READY && state != OC_STATE_DISCONNECT)
+		connman_provider_set_state(provider,
+						CONNMAN_PROVIDER_STATE_FAILURE);
+	else
+		connman_provider_set_state(provider,
+						CONNMAN_PROVIDER_STATE_IDLE);
+
 	connman_provider_set_index(provider, -1);
 	connman_provider_unref(provider);
 	connman_task_destroy(task);
@@ -124,8 +141,11 @@ static void vpn_newlink(unsigned flags, unsigned change, void *user_data)
 	struct oc_data *data = connman_provider_get_data(provider);
 
 	if ((data->flags & IFF_UP) != (flags & IFF_UP)) {
-		if (flags & IFF_UP)
-			connman_provider_set_connected(provider, TRUE);
+		if (flags & IFF_UP) {
+			data->state = OC_STATE_READY;
+			connman_provider_set_state(provider,
+					CONNMAN_PROVIDER_STATE_READY);
+		}
 	}
 	data->flags = flags;
 }
@@ -157,7 +177,8 @@ static void openconnect_task_notify(struct connman_task *task,
 	}
 
 	if (strcmp(reason, "connect")) {
-		connman_provider_set_connected(provider, FALSE);
+		connman_provider_set_state(provider,
+					CONNMAN_PROVIDER_STATE_DISCONNECT);
 		return;
 	}
 
@@ -223,6 +244,7 @@ static int oc_connect(struct connman_provider *provider)
 	data->watch = 0;
 	data->flags = 0;
 	data->task = NULL;
+	data->state = OC_STATE_IDLE;
 
 	connman_provider_set_data(provider, data);
 
@@ -352,6 +374,9 @@ static int oc_connect(struct connman_provider *provider)
 	}
 
 	connman_provider_ref(provider);
+
+	data->state = OC_STATE_CONNECT;
+
 	return -EINPROGRESS;
 
  exist_err:
@@ -380,6 +405,7 @@ static int oc_disconnect(struct connman_provider *provider)
 		connman_rtnl_remove_watch(data->watch);
 
 	data->watch = 0;
+	data->state = OC_STATE_DISCONNECT;
 	connman_task_stop(data->task);
 
 	connman_provider_unref(provider);