From 46841db4f2c7360d3b861a816e51f76acca0d677 Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Mon, 6 Jul 2009 23:31:33 +0800
Subject: Add PPTP and L2TP/IPSec PSK service dispatching

---
 .../com/android/server/vpn/VpnServiceBinder.java   | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'packages/VpnServices')

diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
index 63fc858..617875e 100644
--- a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
+++ b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
@@ -20,7 +20,9 @@ import android.app.Service;
 import android.content.Intent;
 import android.net.vpn.IVpnService;
 import android.net.vpn.L2tpIpsecProfile;
+import android.net.vpn.L2tpIpsecPskProfile;
 import android.net.vpn.L2tpProfile;
+import android.net.vpn.PptpProfile;
 import android.net.vpn.VpnManager;
 import android.net.vpn.VpnProfile;
 import android.net.vpn.VpnState;
@@ -83,16 +85,26 @@ public class VpnServiceBinder extends Service {
 
     private VpnService<? extends VpnProfile> createService(VpnProfile p) {
         switch (p.getType()) {
-            case L2TP_IPSEC:
-                L2tpIpsecService l2tpIpsec = new L2tpIpsecService();
-                l2tpIpsec.setContext(this, (L2tpIpsecProfile) p);
-                return l2tpIpsec;
-
             case L2TP:
                 L2tpService l2tp = new L2tpService();
                 l2tp.setContext(this, (L2tpProfile) p);
                 return l2tp;
 
+            case PPTP:
+                PptpService pptp = new PptpService();
+                pptp.setContext(this, (PptpProfile) p);
+                return pptp;
+
+            case L2TP_IPSEC_PSK:
+                L2tpIpsecPskService psk = new L2tpIpsecPskService();
+                psk.setContext(this, (L2tpIpsecPskProfile) p);
+                return psk;
+
+            case L2TP_IPSEC:
+                L2tpIpsecService l2tpIpsec = new L2tpIpsecService();
+                l2tpIpsec.setContext(this, (L2tpIpsecProfile) p);
+                return l2tpIpsec;
+
             default:
                 return null;
         }
-- 
cgit v1.1