diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-30 03:14:52 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-30 03:14:52 +0000 |
commit | c12dd96f7694e098fbd2fd4e1d0f15869f349d49 (patch) | |
tree | 5116604d4b0e995537cee174d9174a650307691a | |
parent | aaaf68eb9ed857eae9173c663dd2553c2021d991 (diff) | |
parent | a378c558d64867008f4344490e3df4706e965fa7 (diff) | |
download | mtpd-android-security-10.0.0_r58.tar.gz |
Snap for 5616629 from a378c558d64867008f4344490e3df4706e965fa7 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: Id343996117a1be061a237fe728e6c0e83e233ee8
-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; } } |