diff options
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 56fb983..d3e8ac0 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -37,8 +37,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView.AdapterContextMenuInfo; +import com.android.internal.net.VpnConfig; import com.android.settings.SettingsPreferenceFragment; +import java.util.Arrays; import java.util.HashMap; public class VpnSettings extends SettingsPreferenceFragment implements @@ -328,7 +330,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements "name", profile.username, "password", profile.password, "linkname", "vpn", "refuse-eap", "nodefaultroute", "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400", - (profile.mppe ? "+mppe" : "nomppe"), + "ipparam", profile.routes, (profile.mppe ? "+mppe" : "nomppe"), }; break; case VpnProfile.TYPE_L2TP_IPSEC_PSK: @@ -338,12 +340,20 @@ public class VpnSettings extends SettingsPreferenceFragment implements "name", profile.username, "password", profile.password, "linkname", "vpn", "refuse-eap", "nodefaultroute", "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400", + "ipparam", profile.routes, }; 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 { -// getService().doLegacyVpn(racoon, mtpd); + getService().doLegacyVpn(config, racoon, mtpd); } catch (Exception e) { Log.e(TAG, "connect", e); } |