Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be8b0fc7 authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

Simplifies err code propagation. 

* Other changes
  + Re-assign err codes in VpnManager.
  + Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
  + Delete the state file only if it exists (to prevent logging an
    unable-to-unlink error).
  + Extend timeout to 40 seconds.
parent 734b2ba8

vpn/java/android/net/vpn/VpnManager.java

+14 −7
Original line number Original line Diff line number Diff line
@@ -45,18 +45,25 @@ public class VpnManager { 
    /** Key to the error code of a connectivity broadcast event. */

    /** Key to the error code of a connectivity broadcast event. */

    public static final String BROADCAST_ERROR_CODE = "err";

    public static final String BROADCAST_ERROR_CODE = "err";

    /** Error code to indicate an error from authentication. */

    /** Error code to indicate an error from authentication. */

    public static final int VPN_ERROR_AUTH = 1;

    public static final int VPN_ERROR_AUTH = 51;

    /** Error code to indicate the connection attempt failed. */

    /** Error code to indicate the connection attempt failed. */

    public static final int VPN_ERROR_CONNECTION_FAILED = 2;

    public static final int VPN_ERROR_CONNECTION_FAILED = 101;

    /** Error code to indicate the server is not known. */

    /** Error code to indicate the server is not known. */

    public static final int VPN_ERROR_UNKNOWN_SERVER = 3;

    public static final int VPN_ERROR_UNKNOWN_SERVER = 102;

    /** Error code to indicate an error from challenge response. */

    /** Error code to indicate an error from challenge response. */

    public static final int VPN_ERROR_CHALLENGE = 4;

    public static final int VPN_ERROR_CHALLENGE = 5;

    /** Error code to indicate an error of remote server hanging up. */

    /** Error code to indicate an error of remote server hanging up. */

    public static final int VPN_ERROR_REMOTE_HUNG_UP = 5;

    public static final int VPN_ERROR_REMOTE_HUNG_UP = 7;

    /** Error code to indicate an error of remote PPP server hanging up. */

    public static final int VPN_ERROR_REMOTE_PPP_HUNG_UP = 48;

    /** Error code to indicate a PPP negotiation error. */

    public static final int VPN_ERROR_PPP_NEGOTIATION_FAILED = 42;

    /** Error code to indicate an error of losing connectivity. */

    /** Error code to indicate an error of losing connectivity. */

    public static final int VPN_ERROR_CONNECTION_LOST = 6;

    public static final int VPN_ERROR_CONNECTION_LOST = 103;

    private static final int VPN_ERROR_NO_ERROR = 0;

    /** Largest error code used by VPN. */

    public static final int VPN_ERROR_LARGEST = 200;

    /** Error code to indicate a successful connection. */

    public static final int VPN_ERROR_NO_ERROR = 0;





    public static final String PROFILES_PATH = "/data/misc/vpn/profiles";

    public static final String PROFILES_PATH = "/data/misc/vpn/profiles";