Merge "Try OPNS/OLAC before PPTP/L2TP" am: 7ea34f7213

am: c956cf9485

Change-Id: I369894754eb51e02690b75ef4cf0aba29cedc8a5

2 files changed, 12 insertions, 10 deletions

diff --git a/l2tp.c b/l2tp.c
index 1d6171e..ae6088d 100644
--- a/l2tp.c
+++ b/l2tp.c
@@ -354,19 +354,20 @@ static int l2tp_connect(char **arguments)
 }
 
 /**
- * Check if upstream kernel implementation is enabled.
+ * Check if upstream kernel implementation of L2TP should be used.
  *
- * @return true if upstream L2TP is enabled in kernel and false otherwise
+ * @return true If upstream L2TP should be used, which is the case if
+ *              the obsolete OLAC feature is not available.
  */
 static bool check_ol2tp(void)
 {
-    int fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
+    int fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OLAC);
 
     if (fd < 0) {
-        return false;
+        return true;
     } else {
         close(fd);
-        return true;
+        return false;
     }
 }
 
diff --git a/pptp.c b/pptp.c
index 80eb24a..7a58a27 100644
--- a/pptp.c
+++ b/pptp.c
@@ -237,19 +237,20 @@ static int pptp_connect(char **arguments)
 }
 
 /**
- * Check if upstream kernel implementation is enabled.
+ * Check if upstream kernel implementation of PPTP should be used.
  *
- * @return true if upstream PPTP is enabled in kernel and false otherwise
+ * @return true If upstream PPTP should be used, which is the case if
+ *              the obsolete OPNS feature is not available.
  */
 static bool check_pptp(void)
 {
-    int fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_PPTP);
+    int fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OPNS);
 
     if (fd < 0) {
-        return false;
+        return true;
     } else {
         close(fd);
-        return true;
+        return false;
     }
 }