18 Commits

Author SHA1 Message Date
Hung-ying Tyan
bb22192421 Throw a connecting exception when timed out. 2009-07-22 04:37:39 +08:00
Hung-ying Tyan
2c53de6904 Stop a daemon before starting it
in case the daemon is not cleaned up in last session.
2009-07-19 09:33:56 +08:00
Hung-ying Tyan
000c3ff943 Fix NullPointer in VpnServiceBinder.checkStatus(). 2009-07-18 10:20:10 +08:00
Android (Google) Code Review
3a27b29e41 Merge change 7069 into donut
* changes:
  Make VPN connect even when DNS is not present and other fixes.
2009-07-14 01:53:56 -07:00
Hung-ying Tyan
85646c1df3 Make VPN connect even when DNS is not present and other fixes.
* 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.
2009-07-14 16:29:22 +08:00
Eric Fischer
0560209bcd Import new translations 2009-07-13 15:42:14 -07:00
Hung-ying Tyan
c22ce6a738 Remove host IP from related VPN classes.
...since the daemon (racoon) gets the information by itself.
2009-07-13 19:31:08 +08:00
Hung-ying Tyan
df1aa3359c Add error code in vpn connectivity broadcast.
* 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.
2009-07-13 13:11:36 +08:00
Hung-ying Tyan
296a182dea Move the watchdog timer to a separate thread...
so that it won't block the UI thread.
2009-07-09 14:43:55 +08:00
Hung-ying Tyan
46841db4f2 Add PPTP and L2TP/IPSec PSK service dispatching 2009-07-06 23:38:48 +08:00
Hung-ying Tyan
7d22e15e1b Migrate to new keystore with the CertTool lib. 2009-07-06 17:12:53 +08:00
Hung-ying Tyan
0102dc6b22 Fix strings.
* Changes
  + Remove "Up time:" from ongoing event display.
  + Add hint in disconnected notification.
2009-07-04 00:24:48 +08:00
Hung-ying Tyan
2b04d2980a Revise VpnService to use new vpn.* properties.
* 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.
2009-06-27 16:08:01 +08:00
Hung-ying Tyan
d3aba7f7b6 Add PPTP, L2TP/IPSec preshared key and other fixes.
* 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
2009-06-26 03:02:22 +08:00
Eric Fischer
f204ab3ebc Squashed commit of the following:
commit 8e1a200225b7e4756b83d17d679a71a06a38b696
Author: Eric Fischer <enf@google.com>
Date:   Tue Jun 16 16:32:56 2009 -0700

    Make names of Settings, VPN, Subscribed Feeds providers localizable.
2009-06-17 15:17:29 -07:00
Chung-yih Wang
68fdd3d4cd Use the new keystore API in vpn service. 2009-06-17 18:25:02 +08:00
Hung-ying Tyan
4c424d61c7 On the way of refactoring out SingleServerProfile.java.
+ 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.
2009-06-15 13:06:03 +08:00
Hung-ying Tyan
f94b6444a3 Add the VPN services package, VPN service base classes and L2tpIpsecService.
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.
2009-06-12 15:45:56 +08:00