From 5eb9eeb1308661c4527103b930bdf63b73b3aeef Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 24 Jun 2010 13:41:07 +0200 Subject: [PATCH] Use the same error code constants as in the Java frontend. --- src/libcharon/plugins/android/android_service.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libcharon/plugins/android/android_service.c b/src/libcharon/plugins/android/android_service.c index 8eeb3b877..e5ff7588c 100644 --- a/src/libcharon/plugins/android/android_service.c +++ b/src/libcharon/plugins/android/android_service.c @@ -57,6 +57,20 @@ struct private_android_service_t { }; +/** + * Some of the error codes defined in VpnManager.java + */ +typedef enum { + /** Error code to indicate an error from authentication. */ + VPN_ERROR_AUTH = 51, + /** Error code to indicate the connection attempt failed. */ + VPN_ERROR_CONNECTION_FAILED = 101, + /** Error code to indicate an error of remote server hanging up. */ + VPN_ERROR_REMOTE_HUNG_UP = 7, + /** Error code to indicate an error of losing connectivity. */ + VPN_ERROR_CONNECTION_LOST = 103, +} android_vpn_errors_t; + /** * Read a string argument from the Android control socket */ @@ -209,7 +223,7 @@ static job_requeue_t initiate(private_android_service_t *this) controller_cb_empty, NULL) != SUCCESS) { DBG1(DBG_CFG, "failed to initiate tunnel"); - code = 0x33; /* FIXME: this indicates an AUTH error, which might not be the case */ + code = VPN_ERROR_CONNECTION_FAILED; send(fd, &code, 1, 0); return JOB_REQUEUE_NONE; }