GitLab

This change syncs external/ppp with upstream. Specifically it's based on
upstream's 6e8eaa7a78b31cdab2edf140a9c8afdb02ffaca5.

In order to do this without blowing away the Android-specific changes, I
ran a script to try and find a matching revision in upstream's git tree
to the initial commit in external/ppp.

Based on the contents of *.c and *.h files in pppd/, upstream's
f8583676904957554c5a8bd14ede415688835f6c matches with the local revision
82c907af.

I diffed upstream's f8583676 with upstream's HEAD and removed chunks
from the result that applied to files that aren't present in Android. In
some places, the diff didn't apply cleanly because of Android-specific
changes:

  1) Local change 8ad0dd2a added two "return UPAP_AUTHNAK;" statements
     in "#if 1" blocks in auth.c. They have been reflected into
     session.c/session_start by always returning SESSION_FAILED.
     (Additionally, new code to query the local password db has been
     disabled via #if !defined(__ANDROID__).)

  2) Upstream now always defines INET6 for Linux so I've pulled IPv6
     support in. (Otherwise sys-linux.c has compile errors.)

  3) linux/ipv6_route.h needed to be included explicitly.

  4) I defined HAVE_LOGWTMP to avoid calling some wtmp functions that
     aren't implemented in Android. A dummy logwtmp is defined.

All the above changes are in __ANDROID__ tags to highlight them.
Additionally I've ensured that all the pre-existing changes are also now
in __ANDROID__ tags.

Change-Id: Ia5abe677d6ba4d5e9f4fbcd4fa03d8911b8bed12

* commit '2e50db22':
  Fix pppd to build with both old and uapi headers.

Bug: 11559337

(cherry picked from commit 5e0738a2)

Change-Id: I7a25195e22b3b244e75c9f615c1233e34d92dc4d

* commit '03bccb2a':

* commit '70dfaee6':

* commit '530e669b':
  Fix pppd to build with both old and uapi headers.

Bug: 11559337
Change-Id: Id94bdc78a523067e9cd214b255c6cc3f333adaa3

Change-Id: Iaf128867dd892b6756d4d0523c97caadf67d0e0f

Bug: 8580410
Change-Id: I89a92f329d721a07a2ae1410b4b86894d4eb9537

* commit 'fc562d20':
  Get rid of strlcat / strlcpy

Android already has a version of strlcat / strlcpy. There's
no need for pppd to duplicate it.

Change-Id: Ie094cccc2d2b8553cf3c6629c6a79bf3b8db9d06

Android already has a version of strlcat / strlcpy. There's
no need for pppd to duplicate it.

Change-Id: Ie094cccc2d2b8553cf3c6629c6a79bf3b8db9d06

Change-Id: I2e991872e297363d2e0a08e92d7fcebdea96a472

Change-Id: I43241717cf25cf713a59bc7c4bbb9ddca10377a7

They will be generated by LegacyVpnRunner.

Change-Id: I85a087440b6214aa9ada5db9c3ecc4e18f042313

Add NOTICE file for ip-up-vpn.
Remove GPLed code from pppd (wasn't being compiled in), and
fix up pppd/NOTICE to reflect.

Change-Id: I44b7b2680f65013f96f0043e40e8deeebabe2ec4

"am a96c501e: Mark ip-up-vpn as optional"

Change-Id: I6bb8a4ac696ebb2ba24895698ff0a853117ab769

Merge commit 'a96c501e' into gingerbread-plus-aosp

* commit 'a96c501e':
  Mark ip-up-vpn as optional

Change-Id: If584a830f59f259dd1206bd88df59463c850cb70

Change-Id: I8c23f6f2bf984f794758ec27700d5fed4548ac09

Change-Id: Iede478bc19d5979417492d172288e6b1267ca5f1

This fixes running ppp through adb as sockets, that are connected
to a pipe with the help of nc. Further, the path construction now
corresponds to other versions of pppd.

Change-Id: Ib810dc69cbdf08b58cde65210b31cd7bd1427721

Change-Id: I4683e60ae455b68496aff88734a065ca50c56ef2

Bug: 2325838
Change-Id: I2e1df5a71aead40063f82cc0dda222f370ad4043

Merge commit '6e2a095b'

* commit '6e2a095b':
  pppd: Implement ip-up-vpn to modify routing table when vpn is up.

Merge commit 'dffa1806'

* commit 'dffa1806':
  pppd: Remove the UID check to allow running as a non-root user.