PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VpnSettings: hook up the legacy VPN with IConnectivityManager.

Browse Source 
The status report is not implemented yet.

Change-Id: I266f840371e3698f779124d5e67bafe4d272cd94
This commit is contained in:
Chia-chi Yeh
2011-07-02 17:26:26 -07:00
parent 0082d17ce7
commit d95ec87113
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -37,8 +37,10 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
import com.android.internal.net.VpnConfig;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
public class VpnSettings extends SettingsPreferenceFragment implements public class VpnSettings extends SettingsPreferenceFragment implements
@@ -328,7 +330,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
"name", profile.username, "password", profile.password, "name", profile.username, "password", profile.password,
"linkname", "vpn", "refuse-eap", "nodefaultroute", "linkname", "vpn", "refuse-eap", "nodefaultroute",
"usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400", "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
(profile.mppe ? "+mppe" : "nomppe"), "ipparam", profile.routes, (profile.mppe ? "+mppe" : "nomppe"),
}; };
break; break;
case VpnProfile.TYPE_L2TP_IPSEC_PSK: case VpnProfile.TYPE_L2TP_IPSEC_PSK:
@@ -338,12 +340,20 @@ public class VpnSettings extends SettingsPreferenceFragment implements
"name", profile.username, "password", profile.password, "name", profile.username, "password", profile.password,
"linkname", "vpn", "refuse-eap", "nodefaultroute", "linkname", "vpn", "refuse-eap", "nodefaultroute",
"usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400", "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
"ipparam", profile.routes,
}; };
break; break;
} }
VpnConfig config = new VpnConfig();
config.sessionName = profile.name;
config.routes = profile.routes;
if (!profile.searchDomains.isEmpty()) {
config.searchDomains = Arrays.asList(profile.searchDomains.split(" "));
}
try { try {
// getService().doLegacyVpn(racoon, mtpd); getService().doLegacyVpn(config, racoon, mtpd);
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "connect", e); Log.e(TAG, "connect", e);
} }