Merge commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5'
* commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5':
Fix stopping all vpn daemons before connect and more.
* move DaemonHelper out from VpnService to VpnDaemons for better
managing native daemons.
* check connectivity and dns less frequently to save battery.
* 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.
Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7'
* commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7':
Fix a bug in getSocketError() in VpnService.
Merge commit 'c22e0c8012828474e8aa2e29b441ef02728b0842'
* commit 'c22e0c8012828474e8aa2e29b441ef02728b0842':
Fix order of setting/saving state in VpnService.
+ Add new error code CONNECTION_LOST to VpnManager.
+ Make VpnService call onError() instead of onDisconnect() when
connection is lost.
+ Make VpnService broadcast CONNECTION_LOST when that happens.
Also...
+ stop daemons before getting server IP;
+ remove setForeground();
+ add the DBG flag for Log.d calls.
PatchSet 3:
+ add CHALLENGE_ERROR and REMOTE_HUNG_UP to VpnManager
+ broadcast new error codes in VpnService
+ check local IP change instead of dns change
+ move removeStates() to VpnService.onFinalCleanUp()
PatchSet 7:
+ add encryption flag to PptpProfile
+ PptpService and MtpdHelper are revised accordingly
+ Remove NormalProcessProxy and ProcessProxy as they are not used
anymore.
+ Rename AndroidServiceProxy to DaemonProxy and simplify its
implementation as it does not extend to ProcessProxy anymore.
+ Execute connect() in VpnService in one thread, which simplifies socket
and error handling.
+ Modify service subclasses accordingly.
+ Execute connect() and disconnect() in VpnServiceBinder so that the
operations do not block the UI thread. Mark service as foreground only upon
connecting.
* Changes:
+ As title.
+ Add two new states to VpnState: UNKNOWN and UNUSABLE.
+ Add more debug messages when stopping a service and when DNS being
overridden.
* Changes
+ Add VpnConnectingError.java.
+ Broadcast the error returned by daemons.
+ Add error codes to VpnManager.java.
+ Add error code to VpnManager.broadcastConnectivity().
Patch Set 4:
+ Replace VPN_UP with VPN_STATUS in response to ip-up-vpn changes.
+ Make VpnServiceBinder a foreground service so that it won't be
interrupted by the system.
Patch Set 5:
+ Remove the support of returning 0 from daemon and restart socket in
AndroidServiceProxy.
* Changes
+ Make VpnService get dns info from vpn.dns1/dns2 and set
net.dns1/dns2.
+ Make VpnService wait on vpn.up instead of monitoring on ip-up-vpn.
+ Change commands sent to racoon.
+ Remove original sendCommand() from AndroidServiceProxy and rename
sendCommand2() to sendCommand().
+ Add L2tpIpsecPskService.java.
+ Add short stop after sending ipsec command.
* Changes
+ Add PptpProfile.java, PptpService.java.
+ Add L2tpIpsecPskProfile.java
+ Add PPTP and L2TP_IPSEC_PSK entries in VpnType.java.
+ Add the secret option to L2tpProfile.java and have L2tpIpsecProfile
extend it.
+ Add MtpdHelper to send common PPP options.
+ Add getGatewayIp() to VpnService().
+ Revise VpnService.reallyGetHostIp().
Patch Set 6, 7, 8:
+ Add L2TP secret flag in L2tpProfile.
Patch Set 9:
+ Add description to VpnType.
Patch Set 11:
+ Pass ipparam to mtpd.
Patch Set 12:
+ Add L2TP secret support
+ Fix string constants
+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.
Also add android.security.Keystore. This is a quick solution. Will be
evolved to a more mature implementation.
PATCH SET 2:
+ Add VpnServiceBinder to hide VpnService and its subclasses.
+ Add sendCommand2() to AndroidServiceProxy to work with the latest mtpd.
PATCH SET 3:
+ Rebase to catch up with new commits; no changes made.
PATCH SET 4:
+ Remove/comment out @Override on interface methods to be compilable for Java 1.5.
PATCH SET 5:
+ Add L2tpService.java.
+ Make VpnService to work on SingleServerProfile; add serverIp to
connect(); set system property "net.vpn.server_ip"; and move
getPppOptionFilePath() from L2tpIpsecService to VpnService
+ Revise VpnManager to start VpnService without worrying about which
type (as the type info is in VpnProfile)
+ Remove installation stuff from VpnManager
PATCH SET 6:
+ Fix PATCH SET 5 (the patch was messed up). Please ignore PATCH SET 5.
PATCH SET 7:
+ Fix styles.
PATCH SET 8:
+ Add CANCELLED to VpnState.
PATCH SET 9:
+ Make VpnProfile serializable (in order to save them to persistent storage)
PATCH SET 10:
+ Remove Keystore.java as it's added in another CL.
