diff options
author | Alistair Strachan <astrachan@google.com> | 2019-05-28 23:48:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-28 23:48:27 -0700 |
commit | ca7860c5d1284f84e77ad850441b8bb00d1f4625 (patch) | |
tree | 5116604d4b0e995537cee174d9174a650307691a | |
parent | 82a02d946a4bf7da11dc0c6be3c4b0b2d52bd378 (diff) | |
parent | a378c558d64867008f4344490e3df4706e965fa7 (diff) | |
download | mtpd-android10-mainline-media-release.tar.gz |
Try OPNS/OLAC before PPTP/L2TPandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release
am: a378c558d6
Change-Id: I6424dfadcd77874edd1095066b1ec612b32eeea1
-rw-r--r-- | l2tp.c | 11 | ||||
-rw-r--r-- | pptp.c | 11 |
2 files changed, 12 insertions, 10 deletions
@@ -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; } } @@ -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; } } |