diff options
| -rw-r--r-- | cmds/keystore/netkeystore.c | 5 | ||||
| -rw-r--r-- | vpn/java/android/net/vpn/VpnManager.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmds/keystore/netkeystore.c b/cmds/keystore/netkeystore.c index eac455e0c5..637e0d8760 100644 --- a/cmds/keystore/netkeystore.c +++ b/cmds/keystore/netkeystore.c @@ -37,6 +37,7 @@ #include "netkeystore.h" #include "keymgmt.h" +#define DBG 1 #define CMD_PUT_WITH_FILE "putfile" typedef void CMD_FUNC(LPC_MARSHAL *cmd, LPC_MARSHAL *reply); @@ -397,12 +398,12 @@ int main(const int argc, const char *argv[]) // read the command, execute and send the result back. if(read_marshal(s, &cmd)) goto err; - LOGI("new connection\n"); + if (DBG) LOGD("new connection\n"); execute(&cmd, &reply); write_marshal(s, &reply); err: memset(&reply, 0, sizeof(LPC_MARSHAL)); - LOGI("closing connection\n"); + if (DBG) LOGD("closing connection\n"); close(s); } diff --git a/vpn/java/android/net/vpn/VpnManager.java b/vpn/java/android/net/vpn/VpnManager.java index e448e5a58b..f71bbea0bf 100644 --- a/vpn/java/android/net/vpn/VpnManager.java +++ b/vpn/java/android/net/vpn/VpnManager.java @@ -54,6 +54,8 @@ public class VpnManager { public static final int VPN_ERROR_CHALLENGE = 4; /** Error code to indicate an error of remote server hanging up. */ public static final int VPN_ERROR_REMOTE_HUNG_UP = 5; + /** Error code to indicate an error of losing connectivity. */ + public static final int VPN_ERROR_CONNECTION_LOST = 6; private static final int VPN_ERROR_NO_ERROR = 0; public static final String PROFILES_PATH = "/data/misc/vpn/profiles"; |