diff options
author | Robert Buchholz <rbu@gentoo.org> | 2007-08-23 12:42:26 +0000 |
---|---|---|
committer | Robert Buchholz <rbu@gentoo.org> | 2007-08-23 12:42:26 +0000 |
commit | 2e7ff3d3ea710372f9023af14f92185e65ec2d66 (patch) | |
tree | 49ca5deb0beddbae67dc16c99e02af8b46b574fd | |
parent | Going to the tree (diff) | |
download | overlay-2e7ff3d3ea710372f9023af14f92185e65ec2d66.tar.gz overlay-2e7ff3d3ea710372f9023af14f92185e65ec2d66.tar.bz2 overlay-2e7ff3d3ea710372f9023af14f92185e65ec2d66.zip |
Removing nm ebuilds that are in the tree now
svn path=/overlay/; revision=21
16 files changed, 0 insertions, 4128 deletions
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest index cc2b761..17c0f54 100644 --- a/net-misc/networkmanager-openvpn/Manifest +++ b/net-misc/networkmanager-openvpn/Manifest @@ -1,17 +1,8 @@ -AUX networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 RMD160 43736ae448fceebf03511b5c9c94c7ea898d8538 SHA1 b91e195d70383036fb79c59ff99f4fe7fbd2861a SHA256 dd615118e9a2fea251a759a6e49cbaf8da611598e18fd9ab3144f374474252b3 -MD5 53074426f2892d3165e28e70b2a8b412 files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 -RMD160 43736ae448fceebf03511b5c9c94c7ea898d8538 files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 -SHA256 dd615118e9a2fea251a759a6e49cbaf8da611598e18fd9ab3144f374474252b3 files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 AUX networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481 RMD160 adc564b482e0bb2ab4c3722c00e10ca278663a06 SHA1 ce96a94801a6a83ee53890e31827d305780ff2e8 SHA256 fb54195f24205b3163ba8dc9e63686bec3b78abe5709b7f706ef18c0ef2adca3 MD5 1d47c0eea0950800391f683799884b48 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481 RMD160 adc564b482e0bb2ab4c3722c00e10ca278663a06 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481 SHA256 fb54195f24205b3163ba8dc9e63686bec3b78abe5709b7f706ef18c0ef2adca3 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481 -DIST NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 RMD160 8077b3b629e1c003d5ea78ad7c3aa17d4d6a1f15 SHA1 0c9d1ee1db9608ff2fcfc3ae2e1ce3847deb7789 SHA256 e6552cd2180698e304f4a3e0f5db0d945f896931433febac3d88e6e8be2dd22c DIST NetworkManager-openvpn-0.3.3_pre20070621.tar.gz 487858 RMD160 5920a26f5b2814bd14c1221311c32effa75ca208 SHA1 f6dfcd4251874e52613148c615365e7e5ab1e789 SHA256 46300661317924f48b5822346f8f0f3276a2b4d0c8e111855432c93bf4f820ad -EBUILD networkmanager-openvpn-0.3.2_p20070621.ebuild 1395 RMD160 4d0eefb822c764f7644610cd237be566706bf9bf SHA1 15b9c0ec126d29bda6c05721d42acd62bf8bbeaf SHA256 5ad2a5b28ad2659d5cb8c6b1c9367e71ac3139fb99421c478ccfce7af0ee13ed -MD5 5cd7c6693559d9a47d2cbe07f905b63f networkmanager-openvpn-0.3.2_p20070621.ebuild 1395 -RMD160 4d0eefb822c764f7644610cd237be566706bf9bf networkmanager-openvpn-0.3.2_p20070621.ebuild 1395 -SHA256 5ad2a5b28ad2659d5cb8c6b1c9367e71ac3139fb99421c478ccfce7af0ee13ed networkmanager-openvpn-0.3.2_p20070621.ebuild 1395 EBUILD networkmanager-openvpn-0.3.3_pre20070621.ebuild 1396 RMD160 cbe0db1accd3c9e1d49c9bda51c036e23e72607e SHA1 a375b96b88757db6671849685ca2e7710737c675 SHA256 74fe6eaade5871fdc402f8be9c1f2bfb36213fbd262e8a0eeae6fd6ea23b19d7 MD5 5df897073af5a9f40fabff34ea63a8ce networkmanager-openvpn-0.3.3_pre20070621.ebuild 1396 RMD160 cbe0db1accd3c9e1d49c9bda51c036e23e72607e networkmanager-openvpn-0.3.3_pre20070621.ebuild 1396 @@ -20,9 +11,6 @@ MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a MD5 cde19aea2ad5bbd47a8660b625acbd60 metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a metadata.xml 881 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 metadata.xml 881 -MD5 696a3f4c7790a246115d84273003c5e3 files/digest-networkmanager-openvpn-0.3.2_p20070621 316 -RMD160 697ba913d3cde632fca3ffc1995486014544c312 files/digest-networkmanager-openvpn-0.3.2_p20070621 316 -SHA256 8ab6d52ce2d40fa2875d6d0de5ff5ab95c3cfbf85fea2f66fd7312f3aeda0482 files/digest-networkmanager-openvpn-0.3.2_p20070621 316 MD5 42a32cf56071b4cd060cdada3e2e574e files/digest-networkmanager-openvpn-0.3.3_pre20070621 322 RMD160 11d286376f80ee651d320e6adee773b35fccef8b files/digest-networkmanager-openvpn-0.3.3_pre20070621 322 SHA256 614a5b083170697b0d14209c807314422088a8731ca0247a3773b75d498b36d6 files/digest-networkmanager-openvpn-0.3.3_pre20070621 322 diff --git a/net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.2_p20070621 b/net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.2_p20070621 deleted file mode 100644 index ca436bc..0000000 --- a/net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.2_p20070621 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7aa1008bce298af780da2be4b10fc80d NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 -RMD160 8077b3b629e1c003d5ea78ad7c3aa17d4d6a1f15 NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 -SHA256 e6552cd2180698e304f4a3e0f5db0d945f896931433febac3d88e6e8be2dd22c NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch deleted file mode 100644 index 1c127ed..0000000 --- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577 - -Index: openvpn/nm-openvpn-service.name.in -=================================================================== ---- openvpn/nm-openvpn-service.name.in (revision 2653) -+++ openvpn/nm-openvpn-service.name.in (working copy) -@@ -1,8 +1,8 @@ - [VPN Connection] - name=openvpn - service=org.freedesktop.NetworkManager.openvpn --program=@bindir@/nm-openvpn-service -+program=@BINDIR@/nm-openvpn-service - - [GNOME] --auth-dialog=@libexecdir@/nm-openvpn-auth-dialog -+auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog - properties=@prefix@/${LIB}/libnm-openvpn-properties diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild deleted file mode 100644 index 767cc63..0000000 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit gnome2 eutils autotools - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager OpenVPN plugin." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="crypt doc gnome" - -RDEPEND=">=sys-apps/dbus-0.35.2 - >=sys-apps/hal-0.5 - sys-apps/iproute2 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=dev-libs/glib-2.8 - >=net-misc/networkmanager-0.5.1 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - !gnome? ( >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gconf-2 ) - >=net-misc/openvpn-2.0.5 - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" - -src_unpack () { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-service-name.patch" - eautoreconf -} diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest index e63058a..8621248 100644 --- a/net-misc/networkmanager-pptp/Manifest +++ b/net-misc/networkmanager-pptp/Manifest @@ -1,17 +1,4 @@ -AUX networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch 146410 RMD160 0b0db2988614947b3dade2435d65d455c9d6d3de SHA1 611d292f54b755413575b23ba9d44a857c742272 SHA256 2d239b401bc34385f6f807a05700b5c6a5463fea9eeb9d01dfebe334b5ae5eb5 -MD5 61a3bda739ff8b77435435357cf0e896 files/networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch 146410 -RMD160 0b0db2988614947b3dade2435d65d455c9d6d3de files/networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch 146410 -SHA256 2d239b401bc34385f6f807a05700b5c6a5463fea9eeb9d01dfebe334b5ae5eb5 files/networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch 146410 -AUX networkmanager-pptp-0.1.0_p20070726-service-name.patch 626 RMD160 bca8b62ab1c157af0cd6bf0af77e4b1e71f9d613 SHA1 fcefd2e4b2f8f7f57e62cfa8396c6c3bbc7536a1 SHA256 865ba9173bc1bc3ad9c77b0c82915343fae99e05d74e533d53cfcf09ef78e102 -MD5 190202b23fda3fe50d8797e0507542e1 files/networkmanager-pptp-0.1.0_p20070726-service-name.patch 626 -RMD160 bca8b62ab1c157af0cd6bf0af77e4b1e71f9d613 files/networkmanager-pptp-0.1.0_p20070726-service-name.patch 626 -SHA256 865ba9173bc1bc3ad9c77b0c82915343fae99e05d74e533d53cfcf09ef78e102 files/networkmanager-pptp-0.1.0_p20070726-service-name.patch 626 DIST NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 RMD160 30b9dafa41e616460045847b97efd0e4b8dd3824 SHA1 7f29ffeafb3767e2909b20305fab67863a2e8aa5 SHA256 ea934673c57a50b094797c677c6a76dba8042f696d02ab379dcd57d1a1f19999 -DIST NetworkManager-pptp-0.1.0_p20070726.tar.gz 444015 RMD160 bbc67e8461e0df687f43f2aee851429ce206e0dd SHA1 be7d88e126e281fa3119f69854b0534e88deab5c SHA256 b90990ee1c17089341b9e4078ee0ed0f4af3b972a26a6639239588ef07335cc6 -EBUILD networkmanager-pptp-0.1.0_p20070726.ebuild 1451 RMD160 b6dd92282a6bb579e0f1768ac4b74e091e326548 SHA1 bbb594b97d3c047998735f627f985fc62c471868 SHA256 98bd760dc9836ef9040b2cab7230d15ec4e56f3caf3417b796ad26203920602f -MD5 19f2c602e7d54479491e8925f31d8ae7 networkmanager-pptp-0.1.0_p20070726.ebuild 1451 -RMD160 b6dd92282a6bb579e0f1768ac4b74e091e326548 networkmanager-pptp-0.1.0_p20070726.ebuild 1451 -SHA256 98bd760dc9836ef9040b2cab7230d15ec4e56f3caf3417b796ad26203920602f networkmanager-pptp-0.1.0_p20070726.ebuild 1451 EBUILD networkmanager-pptp-0.7.0_pre20070621.ebuild 1263 RMD160 e95b8ed282a7a152b20ab5d7053b9e86624742ca SHA1 9210f25107f091e8b8a036d6e5fba0572b12622a SHA256 17735fb3850feb5a577b774eda44bcbe6e470a5e99a2fd12bafaf40526d85ea4 MD5 677dbfd22b7fdd77079725a49d7bdd1a networkmanager-pptp-0.7.0_pre20070621.ebuild 1263 RMD160 e95b8ed282a7a152b20ab5d7053b9e86624742ca networkmanager-pptp-0.7.0_pre20070621.ebuild 1263 @@ -20,9 +7,6 @@ MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a MD5 cde19aea2ad5bbd47a8660b625acbd60 metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a metadata.xml 881 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 metadata.xml 881 -MD5 43eb9e7f5412abe4e86918713ead95eb files/digest-networkmanager-pptp-0.1.0_p20070726 307 -RMD160 3049b8e091c8344fd166357ad27b10bac7757f36 files/digest-networkmanager-pptp-0.1.0_p20070726 307 -SHA256 93f9aadd6031f89abdc1a22eff05c94f8830ed4124822ebca397b151fff69286 files/digest-networkmanager-pptp-0.1.0_p20070726 307 MD5 229dcb3e57f92f1d6f2c6a8c278fc1db files/digest-networkmanager-pptp-0.7.0_pre20070621 322 RMD160 5ecfc7814dce68826237b98dc2c1cced77ecd376 files/digest-networkmanager-pptp-0.7.0_pre20070621 322 SHA256 c320eef5275bebf0bca000b564c10202339e9ddd6ac43f062ac8cb24e9455e41 files/digest-networkmanager-pptp-0.7.0_pre20070621 322 diff --git a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.1.0_p20070726 b/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.1.0_p20070726 deleted file mode 100644 index 39ce51b..0000000 --- a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.1.0_p20070726 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ac2b46c4ea2f8dcffc6d72c4a6160552 NetworkManager-pptp-0.1.0_p20070726.tar.gz 444015 -RMD160 bbc67e8461e0df687f43f2aee851429ce206e0dd NetworkManager-pptp-0.1.0_p20070726.tar.gz 444015 -SHA256 b90990ee1c17089341b9e4078ee0ed0f4af3b972a26a6639239588ef07335cc6 NetworkManager-pptp-0.1.0_p20070726.tar.gz 444015 diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch deleted file mode 100644 index 488dc19..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch +++ /dev/null @@ -1,3747 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 2712) -+++ configure.in (working copy) -@@ -15,6 +15,10 @@ - AC_PROG_INSTALL - AC_PROG_LIBTOOL - -+if [[ "$prefix" = "NONE" ]]; then -+ prefix=$ac_default_prefix -+fi -+ - dnl - dnl Required headers - dnl -@@ -104,6 +108,62 @@ - AC_MSG_RESULT(no) - fi - -+AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=DIR], [Specify path to pppd.h (and patchlevel.h)])) -+AC_ARG_WITH(pppd-version, AC_HELP_STRING([--with-pppd-version=VERSION], [Version of pppd.h])) -+if test "z$with_pppd" != "z"; then -+ AC_MSG_CHECKING([for $with_pppd/pppd.h]) -+ if test -f "$with_pppd/pppd.h"; then -+ PPPD_CFLAGS="-I $with_pppd" -+ PPPD_VERSION=`grep VERSION $with_pppd/patchlevel.h | awk '{print $3}' | sed -e 's/\s*"\s*//g'` -+ found_pppd_headers=yes -+ AC_MSG_RESULT(found version $PPPD_VERSION) -+ else -+ AC_MSG_ERROR(not found in $with_pppd) -+ fi -+fi -+ -+if test "z$found_pppd_headers" = "z"; then -+ AC_MSG_CHECKING([for pppd.h under $prefix/include]) -+ find_pppd_h=`find $prefix/include -name pppd.h | xargs | awk '{print $1}'` -+ if echo $find_pppd_h | grep pppd.h; then -+ with_pppd=`dirname $find_pppd_h` -+ PPPD_CFLAGS="-I $with_pppd" -+ PPPD_VERSION=`grep VERSION $with_pppd/patchlevel.h | awk '{print $3}' | sed -e 's/\s*"\s*//g'` -+ found_pppd_headers=yes -+ AC_MSG_RESULT(found version $PPPD_VERSION) -+ else -+ AC_MSG_RESULT(not found) -+ fi -+fi -+ -+if test "z$found_pppd_headers" = "z"; then -+ if test "z$PPPD_VERSION" = "z"; then -+ AC_MSG_RESULT(Couldn't find pppd.h trying to determine pppd version to use in tree headers) -+ ##### Find PPPD executable -+ AC_CHECK_PROG(PPPD,pppd,pppd) -+ if test "z$PPPD" = "z"; then -+ AC_MSG_ERROR(Cannot compile without pppd) -+ fi -+ AC_MSG_RESULT(pppd version not found attempting to run 'pppd --version') -+ PPPD_VERSION=`$PPPD --version 2>&1 | awk '{print $3}'` -+ if test "z$PPPD_VERSION" = "z"; then -+ AC_MSG_ERROR(Couldn't determine the version of your pppd package.) -+ fi -+ fi -+ -+ if ! test -d "src/external/$PPPD_VERSION"; then -+ AC_MSG_ERROR(pppd headers could not be found) -+ fi -+ -+ AC_MSG_RESULT(Found in source headers for pppd version $PPPD_VERSION) -+ PPPD_CFLAGS="-I ./external/$PPPD_VERSION" -+fi -+ -+pppdplugindir="$libdir/pppd/$PPPD_VERSION" -+AC_SUBST(pppdplugindir) -+AC_SUBST(PPPD_CFLAGS) -+ -+ - AC_OUTPUT([ - Makefile - src/Makefile -Index: src/external/2.4.3/pppd/ipcp.h -=================================================================== ---- src/external/2.4.3/pppd/ipcp.h (revision 0) -+++ src/external/2.4.3/pppd/ipcp.h (revision 0) -@@ -0,0 +1,96 @@ -+/* -+ * ipcp.h - IP Control Protocol definitions. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: ipcp.h 1930 2006-08-05 21:57:03Z ajmee $ -+ */ -+ -+/* -+ * Options. -+ */ -+#define CI_ADDRS 1 /* IP Addresses */ -+#define CI_COMPRESSTYPE 2 /* Compression Type */ -+#define CI_ADDR 3 -+ -+#define CI_MS_DNS1 129 /* Primary DNS value */ -+#define CI_MS_WINS1 130 /* Primary WINS value */ -+#define CI_MS_DNS2 131 /* Secondary DNS value */ -+#define CI_MS_WINS2 132 /* Secondary WINS value */ -+ -+#define MAX_STATES 16 /* from slcompress.h */ -+ -+#define IPCP_VJMODE_OLD 1 /* "old" mode (option # = 0x0037) */ -+#define IPCP_VJMODE_RFC1172 2 /* "old-rfc"mode (option # = 0x002d) */ -+#define IPCP_VJMODE_RFC1332 3 /* "new-rfc"mode (option # = 0x002d, */ -+ /* maxslot and slot number compression) */ -+ -+#define IPCP_VJ_COMP 0x002d /* current value for VJ compression option*/ -+#define IPCP_VJ_COMP_OLD 0x0037 /* "old" (i.e, broken) value for VJ */ -+ /* compression option*/ -+ -+typedef struct ipcp_options { -+ bool neg_addr; /* Negotiate IP Address? */ -+ bool old_addrs; /* Use old (IP-Addresses) option? */ -+ bool req_addr; /* Ask peer to send IP address? */ -+ bool default_route; /* Assign default route through interface? */ -+ bool proxy_arp; /* Make proxy ARP entry for peer? */ -+ bool neg_vj; /* Van Jacobson Compression? */ -+ bool old_vj; /* use old (short) form of VJ option? */ -+ bool accept_local; /* accept peer's value for ouraddr */ -+ bool accept_remote; /* accept peer's value for hisaddr */ -+ bool req_dns1; /* Ask peer to send primary DNS address? */ -+ bool req_dns2; /* Ask peer to send secondary DNS address? */ -+ int vj_protocol; /* protocol value to use in VJ option */ -+ int maxslotindex; /* values for RFC1332 VJ compression neg. */ -+ bool cflag; -+ u_int32_t ouraddr, hisaddr; /* Addresses in NETWORK BYTE ORDER */ -+ u_int32_t dnsaddr[2]; /* Primary and secondary MS DNS entries */ -+ u_int32_t winsaddr[2]; /* Primary and secondary MS WINS entries */ -+} ipcp_options; -+ -+extern fsm ipcp_fsm[]; -+extern ipcp_options ipcp_wantoptions[]; -+extern ipcp_options ipcp_gotoptions[]; -+extern ipcp_options ipcp_allowoptions[]; -+extern ipcp_options ipcp_hisoptions[]; -+ -+char *ip_ntoa __P((u_int32_t)); -+ -+extern struct protent ipcp_protent; -Index: src/external/2.4.3/pppd/pppd.h -=================================================================== ---- src/external/2.4.3/pppd/pppd.h (revision 0) -+++ src/external/2.4.3/pppd/pppd.h (revision 0) -@@ -0,0 +1,910 @@ -+/* -+ * pppd.h - PPP daemon global declarations. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: pppd.h 1930 2006-08-05 21:57:03Z ajmee $ -+ */ -+ -+/* -+ * TODO: -+ */ -+ -+#ifndef __PPPD_H__ -+#define __PPPD_H__ -+ -+#include <stdio.h> /* for FILE */ -+#include <limits.h> /* for NGROUPS_MAX */ -+#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */ -+#include <sys/types.h> /* for u_int32_t, if defined */ -+#include <sys/time.h> /* for struct timeval */ -+#include <net/ppp_defs.h> -+#include "patchlevel.h" -+ -+#if defined(__STDC__) -+#include <stdarg.h> -+#define __V(x) x -+#else -+#include <varargs.h> -+#define __V(x) (va_alist) va_dcl -+#define const -+#define volatile -+#endif -+ -+#ifdef INET6 -+#include "eui64.h" -+#endif -+ -+/* -+ * Limits. -+ */ -+ -+#define NUM_PPP 1 /* One PPP interface supported (per process) */ -+#define MAXWORDLEN 1024 /* max length of word in file (incl null) */ -+#define MAXARGS 1 /* max # args to a command */ -+#define MAXNAMELEN 256 /* max length of hostname or name for auth */ -+#define MAXSECRETLEN 256 /* max length of password or secret */ -+ -+/* -+ * Option descriptor structure. -+ */ -+ -+typedef unsigned char bool; -+ -+enum opt_type { -+ o_special_noarg = 0, -+ o_special = 1, -+ o_bool, -+ o_int, -+ o_uint32, -+ o_string, -+ o_wild -+}; -+ -+typedef struct { -+ char *name; /* name of the option */ -+ enum opt_type type; -+ void *addr; -+ char *description; -+ unsigned int flags; -+ void *addr2; -+ int upper_limit; -+ int lower_limit; -+ const char *source; -+ short int priority; -+ short int winner; -+} option_t; -+ -+/* Values for flags */ -+#define OPT_VALUE 0xff /* mask for presupplied value */ -+#define OPT_HEX 0x100 /* int option is in hex */ -+#define OPT_NOARG 0x200 /* option doesn't take argument */ -+#define OPT_OR 0x400 /* OR in argument to value */ -+#define OPT_INC 0x800 /* increment value */ -+#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */ -+#define OPT_PRIV 0x1000 /* privileged option */ -+#define OPT_STATIC 0x2000 /* string option goes into static array */ -+#define OPT_LLIMIT 0x4000 /* check value against lower limit */ -+#define OPT_ULIMIT 0x8000 /* check value against upper limit */ -+#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT) -+#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */ -+#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */ -+#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */ -+#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */ -+#define OPT_NOINCR 0x20000 /* value mustn't be increased */ -+#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */ -+#define OPT_PRIO 0x80000 /* process option priorities for this option */ -+#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */ -+#define OPT_ALIAS 0x200000 /* option is alias for previous option */ -+#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */ -+#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */ -+#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */ -+#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */ -+#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */ -+#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */ -+#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV) -+#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */ -+#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */ -+#define OPT_NOPRINT 0x40000000 /* don't print this option at all */ -+ -+#define OPT_VAL(x) ((x) & OPT_VALUE) -+ -+/* Values for priority */ -+#define OPRIO_DEFAULT 0 /* a default value */ -+#define OPRIO_CFGFILE 1 /* value from a configuration file */ -+#define OPRIO_CMDLINE 2 /* value from the command line */ -+#define OPRIO_SECFILE 3 /* value from options in a secrets file */ -+#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */ -+ -+#ifndef GIDSET_TYPE -+#define GIDSET_TYPE gid_t -+#endif -+ -+/* Structure representing a list of permitted IP addresses. */ -+struct permitted_ip { -+ int permit; /* 1 = permit, 0 = forbid */ -+ u_int32_t base; /* match if (addr & mask) == base */ -+ u_int32_t mask; /* base and mask are in network byte order */ -+}; -+ -+/* -+ * Unfortunately, the linux kernel driver uses a different structure -+ * for statistics from the rest of the ports. -+ * This structure serves as a common representation for the bits -+ * pppd needs. -+ */ -+struct pppd_stats { -+ unsigned int bytes_in; -+ unsigned int bytes_out; -+ unsigned int pkts_in; -+ unsigned int pkts_out; -+}; -+ -+/* Used for storing a sequence of words. Usually malloced. */ -+struct wordlist { -+ struct wordlist *next; -+ char *word; -+}; -+ -+/* An endpoint discriminator, used with multilink. */ -+#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */ -+struct epdisc { -+ unsigned char class; -+ unsigned char length; -+ unsigned char value[MAX_ENDP_LEN]; -+}; -+ -+/* values for epdisc.class */ -+#define EPD_NULL 0 /* null discriminator, no data */ -+#define EPD_LOCAL 1 -+#define EPD_IP 2 -+#define EPD_MAC 3 -+#define EPD_MAGIC 4 -+#define EPD_PHONENUM 5 -+ -+typedef void (*notify_func) __P((void *, int)); -+ -+struct notifier { -+ struct notifier *next; -+ notify_func func; -+ void *arg; -+}; -+ -+/* -+ * Global variables. -+ */ -+ -+extern int hungup; /* Physical layer has disconnected */ -+extern int ifunit; /* Interface unit number */ -+extern char ifname[]; /* Interface name */ -+extern char hostname[]; /* Our hostname */ -+extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ -+extern int devfd; /* fd of underlying device */ -+extern int fd_ppp; /* fd for talking PPP */ -+extern int phase; /* Current state of link - see values below */ -+extern int baud_rate; /* Current link speed in bits/sec */ -+extern char *progname; /* Name of this program */ -+extern int redirect_stderr;/* Connector's stderr should go to file */ -+extern char peer_authname[];/* Authenticated name of peer */ -+extern int auth_done[NUM_PPP]; /* Methods actually used for auth */ -+extern int privileged; /* We were run by real-uid root */ -+extern int need_holdoff; /* Need holdoff period after link terminates */ -+extern char **script_env; /* Environment variables for scripts */ -+extern int detached; /* Have detached from controlling tty */ -+extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */ -+extern int ngroups; /* How many groups valid in groups */ -+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */ -+extern int link_stats_valid; /* set if link_stats is valid */ -+extern unsigned link_connect_time; /* time the link was up for */ -+extern int using_pty; /* using pty as device (notty or pty opt.) */ -+extern int log_to_fd; /* logging to this fd as well as syslog */ -+extern bool log_default; /* log_to_fd is default (stdout) */ -+extern char *no_ppp_msg; /* message to print if ppp not in kernel */ -+extern volatile int status; /* exit status for pppd */ -+extern bool devnam_fixed; /* can no longer change devnam */ -+extern int unsuccess; /* # unsuccessful connection attempts */ -+extern int do_callback; /* set if we want to do callback next */ -+extern int doing_callback; /* set if this is a callback */ -+extern int error_count; /* # of times error() has been called */ -+extern char ppp_devnam[MAXPATHLEN]; -+extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */ -+extern int ppp_session_number; /* Session number (eg PPPoE session) */ -+extern int fd_devnull; /* fd open to /dev/null */ -+ -+extern int listen_time; /* time to listen first (ms) */ -+extern bool doing_multilink; -+extern bool multilink_master; -+extern bool bundle_eof; -+extern bool bundle_terminating; -+ -+extern struct notifier *pidchange; /* for notifications of pid changing */ -+extern struct notifier *phasechange; /* for notifications of phase changes */ -+extern struct notifier *exitnotify; /* for notification that we're exiting */ -+extern struct notifier *sigreceived; /* notification of received signal */ -+extern struct notifier *ip_up_notifier; /* IPCP has come up */ -+extern struct notifier *ip_down_notifier; /* IPCP has gone down */ -+extern struct notifier *auth_up_notifier; /* peer has authenticated */ -+extern struct notifier *link_down_notifier; /* link has gone down */ -+extern struct notifier *fork_notifier; /* we are a new child process */ -+ -+/* Values for do_callback and doing_callback */ -+#define CALLBACK_DIALIN 1 /* we are expecting the call back */ -+#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */ -+ -+/* -+ * Variables set by command-line options. -+ */ -+ -+extern int debug; /* Debug flag */ -+extern int kdebugflag; /* Tell kernel to print debug messages */ -+extern int default_device; /* Using /dev/tty or equivalent */ -+extern char devnam[MAXPATHLEN]; /* Device name */ -+extern int crtscts; /* Use hardware flow control */ -+extern bool modem; /* Use modem control lines */ -+extern int inspeed; /* Input/Output speed requested */ -+extern u_int32_t netmask; /* IP netmask to set on interface */ -+extern bool lockflag; /* Create lock file to lock the serial dev */ -+extern bool nodetach; /* Don't detach from controlling tty */ -+extern bool updetach; /* Detach from controlling tty when link up */ -+extern char *initializer; /* Script to initialize physical link */ -+extern char *connect_script; /* Script to establish physical link */ -+extern char *disconnect_script; /* Script to disestablish physical link */ -+extern char *welcomer; /* Script to welcome client after connection */ -+extern char *ptycommand; /* Command to run on other side of pty */ -+extern int maxconnect; /* Maximum connect time (seconds) */ -+extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */ -+extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */ -+extern bool auth_required; /* Peer is required to authenticate */ -+extern bool persist; /* Reopen link after it goes down */ -+extern bool uselogin; /* Use /etc/passwd for checking PAP */ -+extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */ -+extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ -+extern bool explicit_remote;/* remote_name specified with remotename opt */ -+extern bool demand; /* Do dial-on-demand */ -+extern bool killoldaddr; /* If our IP is reassigned on -+ reconnect, kill active TCP -+ connections using the old IP. */ -+extern char *ipparam; /* Extra parameter for ip up/down scripts */ -+extern bool cryptpap; /* Others' PAP passwords are encrypted */ -+extern int idle_time_limit;/* Shut down link if idle for this long */ -+extern int holdoff; /* Dead time before restarting */ -+extern bool holdoff_specified; /* true if user gave a holdoff value */ -+extern bool notty; /* Stdin/out is not a tty */ -+extern char *pty_socket; /* Socket to connect to pty */ -+extern char *record_file; /* File to record chars sent/received */ -+extern bool sync_serial; /* Device is synchronous serial device */ -+extern int maxfail; /* Max # of unsuccessful connection attempts */ -+extern char linkname[MAXPATHLEN]; /* logical name for link */ -+extern bool tune_kernel; /* May alter kernel settings as necessary */ -+extern int connect_delay; /* Time to delay after connect script */ -+extern int max_data_rate; /* max bytes/sec through charshunt */ -+extern int req_unit; /* interface unit number to use */ -+extern bool multilink; /* enable multilink operation */ -+extern bool noendpoint; /* don't send or accept endpt. discrim. */ -+extern char *bundle_name; /* bundle name for multilink */ -+extern bool dump_options; /* print out option values */ -+extern bool dryrun; /* check everything, print options, exit */ -+extern int child_wait; /* # seconds to wait for children at end */ -+ -+#ifdef MAXOCTETS -+extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ -+extern int maxoctets_dir; /* Direction : -+ 0 - in+out (default) -+ 1 - in -+ 2 - out -+ 3 - max(in,out) */ -+extern int maxoctets_timeout; /* Timeout for check of octets limit */ -+#define PPP_OCTETS_DIRECTION_SUM 0 -+#define PPP_OCTETS_DIRECTION_IN 1 -+#define PPP_OCTETS_DIRECTION_OUT 2 -+#define PPP_OCTETS_DIRECTION_MAXOVERAL 3 -+/* same as previos, but little different on RADIUS side */ -+#define PPP_OCTETS_DIRECTION_MAXSESSION 4 -+#endif -+ -+#ifdef PPP_FILTER -+extern struct bpf_program pass_filter; /* Filter for pkts to pass */ -+extern struct bpf_program active_filter; /* Filter for link-active pkts */ -+#endif -+ -+#ifdef MSLANMAN -+extern bool ms_lanman; /* Use LanMan password instead of NT */ -+ /* Has meaning only with MS-CHAP challenges */ -+#endif -+ -+/* Values for auth_pending, auth_done */ -+#define PAP_WITHPEER 0x1 -+#define PAP_PEER 0x2 -+#define CHAP_WITHPEER 0x4 -+#define CHAP_PEER 0x8 -+#define EAP_WITHPEER 0x10 -+#define EAP_PEER 0x20 -+ -+/* Values for auth_done only */ -+#define CHAP_MD5_WITHPEER 0x40 -+#define CHAP_MD5_PEER 0x80 -+#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */ -+#define CHAP_MS_WITHPEER 0x100 -+#define CHAP_MS_PEER 0x200 -+#define CHAP_MS2_WITHPEER 0x400 -+#define CHAP_MS2_PEER 0x800 -+ -+extern char *current_option; /* the name of the option being parsed */ -+extern int privileged_option; /* set iff the current option came from root */ -+extern char *option_source; /* string saying where the option came from */ -+extern int option_priority; /* priority of current options */ -+ -+/* -+ * Values for phase. -+ */ -+#define PHASE_DEAD 0 -+#define PHASE_INITIALIZE 1 -+#define PHASE_SERIALCONN 2 -+#define PHASE_DORMANT 3 -+#define PHASE_ESTABLISH 4 -+#define PHASE_AUTHENTICATE 5 -+#define PHASE_CALLBACK 6 -+#define PHASE_NETWORK 7 -+#define PHASE_RUNNING 8 -+#define PHASE_TERMINATE 9 -+#define PHASE_DISCONNECT 10 -+#define PHASE_HOLDOFF 11 -+#define PHASE_MASTER 12 -+ -+/* -+ * The following struct gives the addresses of procedures to call -+ * for a particular protocol. -+ */ -+struct protent { -+ u_short protocol; /* PPP protocol number */ -+ /* Initialization procedure */ -+ void (*init) __P((int unit)); -+ /* Process a received packet */ -+ void (*input) __P((int unit, u_char *pkt, int len)); -+ /* Process a received protocol-reject */ -+ void (*protrej) __P((int unit)); -+ /* Lower layer has come up */ -+ void (*lowerup) __P((int unit)); -+ /* Lower layer has gone down */ -+ void (*lowerdown) __P((int unit)); -+ /* Open the protocol */ -+ void (*open) __P((int unit)); -+ /* Close the protocol */ -+ void (*close) __P((int unit, char *reason)); -+ /* Print a packet in readable form */ -+ int (*printpkt) __P((u_char *pkt, int len, -+ void (*printer) __P((void *, char *, ...)), -+ void *arg)); -+ /* Process a received data packet */ -+ void (*datainput) __P((int unit, u_char *pkt, int len)); -+ bool enabled_flag; /* 0 iff protocol is disabled */ -+ char *name; /* Text name of protocol */ -+ char *data_name; /* Text name of corresponding data protocol */ -+ option_t *options; /* List of command-line options */ -+ /* Check requested options, assign defaults */ -+ void (*check_options) __P((void)); -+ /* Configure interface for demand-dial */ -+ int (*demand_conf) __P((int unit)); -+ /* Say whether to bring up link for this pkt */ -+ int (*active_pkt) __P((u_char *pkt, int len)); -+}; -+ -+/* Table of pointers to supported protocols */ -+extern struct protent *protocols[]; -+ -+/* -+ * This struct contains pointers to a set of procedures for -+ * doing operations on a "channel". A channel provides a way -+ * to send and receive PPP packets - the canonical example is -+ * a serial port device in PPP line discipline (or equivalently -+ * with PPP STREAMS modules pushed onto it). -+ */ -+struct channel { -+ /* set of options for this channel */ -+ option_t *options; -+ /* find and process a per-channel options file */ -+ void (*process_extra_options) __P((void)); -+ /* check all the options that have been given */ -+ void (*check_options) __P((void)); -+ /* get the channel ready to do PPP, return a file descriptor */ -+ int (*connect) __P((void)); -+ /* we're finished with the channel */ -+ void (*disconnect) __P((void)); -+ /* put the channel into PPP `mode' */ -+ int (*establish_ppp) __P((int)); -+ /* take the channel out of PPP `mode', restore loopback if demand */ -+ void (*disestablish_ppp) __P((int)); -+ /* set the transmit-side PPP parameters of the channel */ -+ void (*send_config) __P((int, u_int32_t, int, int)); -+ /* set the receive-side PPP parameters of the channel */ -+ void (*recv_config) __P((int, u_int32_t, int, int)); -+ /* cleanup on error or normal exit */ -+ void (*cleanup) __P((void)); -+ /* close the device, called in children after fork */ -+ void (*close) __P((void)); -+}; -+ -+extern struct channel *the_channel; -+ -+/* -+ * Prototypes. -+ */ -+ -+/* Procedures exported from main.c. */ -+void set_ifunit __P((int)); /* set stuff that depends on ifunit */ -+void detach __P((void)); /* Detach from controlling tty */ -+void die __P((int)); /* Cleanup and exit */ -+void quit __P((void)); /* like die(1) */ -+void novm __P((char *)); /* Say we ran out of memory, and die */ -+void timeout __P((void (*func)(void *), void *arg, int s, int us)); -+ /* Call func(arg) after s.us seconds */ -+void untimeout __P((void (*func)(void *), void *arg)); -+ /* Cancel call to func(arg) */ -+void record_child __P((int, char *, void (*) (void *), void *)); -+pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */ -+int device_script __P((char *cmd, int in, int out, int dont_wait)); -+ /* Run `cmd' with given stdin and stdout */ -+pid_t run_program __P((char *prog, char **args, int must_exist, -+ void (*done)(void *), void *arg)); -+ /* Run program prog with args in child */ -+void reopen_log __P((void)); /* (re)open the connection to syslog */ -+void print_link_stats __P((void)); /* Print stats, if available */ -+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */ -+void update_link_stats __P((int)); /* Get stats at link termination */ -+void script_setenv __P((char *, char *, int)); /* set script env var */ -+void script_unsetenv __P((char *)); /* unset script env var */ -+void new_phase __P((int)); /* signal start of new phase */ -+void add_notifier __P((struct notifier **, notify_func, void *)); -+void remove_notifier __P((struct notifier **, notify_func, void *)); -+void notify __P((struct notifier *, int)); -+int ppp_send_config __P((int, int, u_int32_t, int, int)); -+int ppp_recv_config __P((int, int, u_int32_t, int, int)); -+const char *protocol_name __P((int)); -+void remove_pidfiles __P((void)); -+void lock_db __P((void)); -+void unlock_db __P((void)); -+ -+/* Procedures exported from tty.c. */ -+void tty_init __P((void)); -+ -+/* Procedures exported from utils.c. */ -+void log_packet __P((u_char *, int, char *, int)); -+ /* Format a packet and log it with syslog */ -+void print_string __P((char *, int, void (*) (void *, char *, ...), -+ void *)); /* Format a string for output */ -+int slprintf __P((char *, int, char *, ...)); /* sprintf++ */ -+int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */ -+size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */ -+size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */ -+void dbglog __P((char *, ...)); /* log a debug message */ -+void info __P((char *, ...)); /* log an informational message */ -+void notice __P((char *, ...)); /* log a notice-level message */ -+void warn __P((char *, ...)); /* log a warning message */ -+void error __P((char *, ...)); /* log an error message */ -+void fatal __P((char *, ...)); /* log an error message and die(1) */ -+void init_pr_log __P((char *, int)); /* initialize for using pr_log */ -+void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */ -+void end_pr_log __P((void)); /* finish up after using pr_log */ -+void dump_packet __P((const char *, u_char *, int)); -+ /* dump packet to debug log if interesting */ -+ssize_t complete_read __P((int, void *, size_t)); -+ /* read a complete buffer */ -+ -+/* Procedures exported from auth.c */ -+void link_required __P((int)); /* we are starting to use the link */ -+void start_link __P((int)); /* bring the link up now */ -+void link_terminated __P((int)); /* we are finished with the link */ -+void link_down __P((int)); /* the LCP layer has left the Opened state */ -+void upper_layers_down __P((int));/* take all NCPs down */ -+void link_established __P((int)); /* the link is up; authenticate now */ -+void start_networks __P((int)); /* start all the network control protos */ -+void continue_networks __P((int)); /* start network [ip, etc] control protos */ -+void np_up __P((int, int)); /* a network protocol has come up */ -+void np_down __P((int, int)); /* a network protocol has gone down */ -+void np_finished __P((int, int)); /* a network protocol no longer needs link */ -+void auth_peer_fail __P((int, int)); -+ /* peer failed to authenticate itself */ -+void auth_peer_success __P((int, int, int, char *, int)); -+ /* peer successfully authenticated itself */ -+void auth_withpeer_fail __P((int, int)); -+ /* we failed to authenticate ourselves */ -+void auth_withpeer_success __P((int, int, int)); -+ /* we successfully authenticated ourselves */ -+void auth_check_options __P((void)); -+ /* check authentication options supplied */ -+void auth_reset __P((int)); /* check what secrets we have */ -+int check_passwd __P((int, char *, int, char *, int, char **)); -+ /* Check peer-supplied username/password */ -+int get_secret __P((int, char *, char *, char *, int *, int)); -+ /* get "secret" for chap */ -+int get_srp_secret __P((int unit, char *client, char *server, char *secret, -+ int am_server)); -+int auth_ip_addr __P((int, u_int32_t)); -+ /* check if IP address is authorized */ -+int auth_number __P((void)); /* check if remote number is authorized */ -+int bad_ip_adrs __P((u_int32_t)); -+ /* check if IP address is unreasonable */ -+ -+/* Procedures exported from demand.c */ -+void demand_conf __P((void)); /* config interface(s) for demand-dial */ -+void demand_block __P((void)); /* set all NPs to queue up packets */ -+void demand_unblock __P((void)); /* set all NPs to pass packets */ -+void demand_discard __P((void)); /* set all NPs to discard packets */ -+void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ -+int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ -+int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ -+ -+/* Procedures exported from multilink.c */ -+#ifdef HAVE_MULTILINK -+void mp_check_options __P((void)); /* Check multilink-related options */ -+int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */ -+void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */ -+void mp_bundle_terminated __P((void)); -+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */ -+int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */ -+#else -+#define mp_bundle_terminated() /* nothing */ -+#define mp_exit_bundle() /* nothing */ -+#define doing_multilink 0 -+#define multilink_master 0 -+#endif -+ -+/* Procedures exported from sys-*.c */ -+void sys_init __P((void)); /* Do system-dependent initialization */ -+void sys_cleanup __P((void)); /* Restore system state before exiting */ -+int sys_check_options __P((void)); /* Check options specified */ -+void sys_close __P((void)); /* Clean up in a child before execing */ -+int ppp_available __P((void)); /* Test whether ppp kernel support exists */ -+int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */ -+int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ -+int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */ -+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */ -+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */ -+int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */ -+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */ -+int bundle_attach __P((int)); /* Attach link to existing bundle */ -+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */ -+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */ -+void clean_check __P((void)); /* Check if line was 8-bit clean */ -+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ -+void restore_tty __P((int)); /* Restore port's original parameters */ -+void setdtr __P((int, int)); /* Raise or lower port's DTR line */ -+void output __P((int, u_char *, int)); /* Output a PPP packet */ -+void wait_input __P((struct timeval *)); -+ /* Wait for input, with timeout */ -+void add_fd __P((int)); /* Add fd to set to wait for */ -+void remove_fd __P((int)); /* Remove fd from set to wait for */ -+int read_packet __P((u_char *)); /* Read PPP packet */ -+int get_loop_output __P((void)); /* Read pkts from loopback */ -+void tty_send_config __P((int, u_int32_t, int, int)); -+ /* Configure i/f transmit parameters */ -+void tty_set_xaccm __P((ext_accm)); -+ /* Set extended transmit ACCM */ -+void tty_recv_config __P((int, u_int32_t, int, int)); -+ /* Configure i/f receive parameters */ -+int ccp_test __P((int, u_char *, int, int)); -+ /* Test support for compression scheme */ -+void ccp_flags_set __P((int, int, int)); -+ /* Set kernel CCP state */ -+int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ -+int get_idle_time __P((int, struct ppp_idle *)); -+ /* Find out how long link has been idle */ -+int get_ppp_stats __P((int, struct pppd_stats *)); -+ /* Return link statistics */ -+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */ -+int netif_get_mtu __P((int)); /* Get PPP interface MTU */ -+int sifvjcomp __P((int, int, int, int)); -+ /* Configure VJ TCP header compression */ -+int sifup __P((int)); /* Configure i/f up for one protocol */ -+int sifnpmode __P((int u, int proto, enum NPmode mode)); -+ /* Set mode for handling packets for proto */ -+int sifdown __P((int)); /* Configure i/f down for one protocol */ -+int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); -+ /* Configure IPv4 addresses for i/f */ -+int cifaddr __P((int, u_int32_t, u_int32_t)); -+ /* Reset i/f IP addresses */ -+#ifdef INET6 -+int sif6addr __P((int, eui64_t, eui64_t)); -+ /* Configure IPv6 addresses for i/f */ -+int cif6addr __P((int, eui64_t, eui64_t)); -+ /* Remove an IPv6 address from i/f */ -+#endif -+int sifdefaultroute __P((int, u_int32_t, u_int32_t)); -+ /* Create default route through i/f */ -+int cifdefaultroute __P((int, u_int32_t, u_int32_t)); -+ /* Delete default route through i/f */ -+int sifproxyarp __P((int, u_int32_t)); -+ /* Add proxy ARP entry for peer */ -+int cifproxyarp __P((int, u_int32_t)); -+ /* Delete proxy ARP entry for peer */ -+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ -+int lock __P((char *)); /* Create lock file for device */ -+int relock __P((int)); /* Rewrite lock file with new pid */ -+void unlock __P((void)); /* Delete previously-created lock file */ -+void logwtmp __P((const char *, const char *, const char *)); -+ /* Write entry to wtmp file */ -+int get_host_seed __P((void)); /* Get host-dependent random number seed */ -+int have_route_to __P((u_int32_t)); /* Check if route to addr exists */ -+#ifdef PPP_FILTER -+int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); -+ /* Set filter programs in kernel */ -+#endif -+#ifdef IPX_CHANGE -+int sipxfaddr __P((int, unsigned long, unsigned char *)); -+int cipxfaddr __P((int)); -+#endif -+int get_if_hwaddr __P((u_char *addr, char *name)); -+char *get_first_ethernet __P((void)); -+ -+/* Procedures exported from options.c */ -+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ -+int parse_args __P((int argc, char **argv)); -+ /* Parse options from arguments given */ -+int options_from_file __P((char *filename, int must_exist, int check_prot, -+ int privileged)); -+ /* Parse options from an options file */ -+int options_from_user __P((void)); /* Parse options from user's .ppprc */ -+int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ -+int options_from_list __P((struct wordlist *, int privileged)); -+ /* Parse options from a wordlist */ -+int getword __P((FILE *f, char *word, int *newlinep, char *filename)); -+ /* Read a word from a file */ -+void option_error __P((char *fmt, ...)); -+ /* Print an error message about an option */ -+int int_option __P((char *, int *)); -+ /* Simplified number_option for decimal ints */ -+void add_options __P((option_t *)); /* Add extra options */ -+void check_options __P((void)); /* check values after all options parsed */ -+int override_value __P((const char *, int, const char *)); -+ /* override value if permitted by priority */ -+void print_options __P((void (*) __P((void *, char *, ...)), void *)); -+ /* print out values of all options */ -+ -+int parse_dotted_ip __P((char *, u_int32_t *)); -+ -+/* -+ * Hooks to enable plugins to change various things. -+ */ -+extern int (*new_phase_hook) __P((int)); -+extern int (*idle_time_hook) __P((struct ppp_idle *)); -+extern int (*holdoff_hook) __P((void)); -+extern int (*pap_check_hook) __P((void)); -+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, -+ struct wordlist **paddrs, -+ struct wordlist **popts)); -+extern void (*pap_logout_hook) __P((void)); -+extern int (*pap_passwd_hook) __P((char *user, char *passwd)); -+extern int (*allowed_address_hook) __P((u_int32_t addr)); -+extern void (*ip_up_hook) __P((void)); -+extern void (*ip_down_hook) __P((void)); -+extern void (*ip_choose_hook) __P((u_int32_t *)); -+ -+extern int (*chap_check_hook) __P((void)); -+extern int (*chap_passwd_hook) __P((char *user, char *passwd)); -+ -+/* Let a plugin snoop sent and received packets. Useful for L2TP */ -+extern void (*snoop_recv_hook) __P((unsigned char *p, int len)); -+extern void (*snoop_send_hook) __P((unsigned char *p, int len)); -+ -+/* -+ * Inline versions of get/put char/short/long. -+ * Pointer is advanced; we assume that both arguments -+ * are lvalues and will already be in registers. -+ * cp MUST be u_char *. -+ */ -+#define GETCHAR(c, cp) { \ -+ (c) = *(cp)++; \ -+} -+#define PUTCHAR(c, cp) { \ -+ *(cp)++ = (u_char) (c); \ -+} -+ -+ -+#define GETSHORT(s, cp) { \ -+ (s) = *(cp)++ << 8; \ -+ (s) |= *(cp)++; \ -+} -+#define PUTSHORT(s, cp) { \ -+ *(cp)++ = (u_char) ((s) >> 8); \ -+ *(cp)++ = (u_char) (s); \ -+} -+ -+#define GETLONG(l, cp) { \ -+ (l) = *(cp)++ << 8; \ -+ (l) |= *(cp)++; (l) <<= 8; \ -+ (l) |= *(cp)++; (l) <<= 8; \ -+ (l) |= *(cp)++; \ -+} -+#define PUTLONG(l, cp) { \ -+ *(cp)++ = (u_char) ((l) >> 24); \ -+ *(cp)++ = (u_char) ((l) >> 16); \ -+ *(cp)++ = (u_char) ((l) >> 8); \ -+ *(cp)++ = (u_char) (l); \ -+} -+ -+#define INCPTR(n, cp) ((cp) += (n)) -+#define DECPTR(n, cp) ((cp) -= (n)) -+ -+/* -+ * System dependent definitions for user-level 4.3BSD UNIX implementation. -+ */ -+ -+#define TIMEOUT(r, f, t) timeout((r), (f), (t), 0) -+#define UNTIMEOUT(r, f) untimeout((r), (f)) -+ -+#define BCOPY(s, d, l) memcpy(d, s, l) -+#define BZERO(s, n) memset(s, 0, n) -+#define BCMP(s1, s2, l) memcmp(s1, s2, l) -+ -+#define PRINTMSG(m, l) { info("Remote message: %0.*v", l, m); } -+ -+/* -+ * MAKEHEADER - Add Header fields to a packet. -+ */ -+#define MAKEHEADER(p, t) { \ -+ PUTCHAR(PPP_ALLSTATIONS, p); \ -+ PUTCHAR(PPP_UI, p); \ -+ PUTSHORT(t, p); } -+ -+/* -+ * Exit status values. -+ */ -+#define EXIT_OK 0 -+#define EXIT_FATAL_ERROR 1 -+#define EXIT_OPTION_ERROR 2 -+#define EXIT_NOT_ROOT 3 -+#define EXIT_NO_KERNEL_SUPPORT 4 -+#define EXIT_USER_REQUEST 5 -+#define EXIT_LOCK_FAILED 6 -+#define EXIT_OPEN_FAILED 7 -+#define EXIT_CONNECT_FAILED 8 -+#define EXIT_PTYCMD_FAILED 9 -+#define EXIT_NEGOTIATION_FAILED 10 -+#define EXIT_PEER_AUTH_FAILED 11 -+#define EXIT_IDLE_TIMEOUT 12 -+#define EXIT_CONNECT_TIME 13 -+#define EXIT_CALLBACK 14 -+#define EXIT_PEER_DEAD 15 -+#define EXIT_HANGUP 16 -+#define EXIT_LOOPBACK 17 -+#define EXIT_INIT_FAILED 18 -+#define EXIT_AUTH_TOPEER_FAILED 19 -+#ifdef MAXOCTETS -+#define EXIT_TRAFFIC_LIMIT 20 -+#endif -+#define EXIT_CNID_AUTH_FAILED 21 -+ -+/* -+ * Debug macros. Slightly useful for finding bugs in pppd, not particularly -+ * useful for finding out why your connection isn't being established. -+ */ -+#ifdef DEBUGALL -+#define DEBUGMAIN 1 -+#define DEBUGFSM 1 -+#define DEBUGLCP 1 -+#define DEBUGIPCP 1 -+#define DEBUGIPV6CP 1 -+#define DEBUGUPAP 1 -+#define DEBUGCHAP 1 -+#endif -+ -+#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */ -+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \ -+ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \ -+ || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) -+#define LOG_PPP LOG_LOCAL2 -+#else -+#define LOG_PPP LOG_DAEMON -+#endif -+#endif /* LOG_PPP */ -+ -+#ifdef DEBUGMAIN -+#define MAINDEBUG(x) if (debug) dbglog x -+#else -+#define MAINDEBUG(x) -+#endif -+ -+#ifdef DEBUGSYS -+#define SYSDEBUG(x) if (debug) dbglog x -+#else -+#define SYSDEBUG(x) -+#endif -+ -+#ifdef DEBUGFSM -+#define FSMDEBUG(x) if (debug) dbglog x -+#else -+#define FSMDEBUG(x) -+#endif -+ -+#ifdef DEBUGLCP -+#define LCPDEBUG(x) if (debug) dbglog x -+#else -+#define LCPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPCP -+#define IPCPDEBUG(x) if (debug) dbglog x -+#else -+#define IPCPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPV6CP -+#define IPV6CPDEBUG(x) if (debug) dbglog x -+#else -+#define IPV6CPDEBUG(x) -+#endif -+ -+#ifdef DEBUGUPAP -+#define UPAPDEBUG(x) if (debug) dbglog x -+#else -+#define UPAPDEBUG(x) -+#endif -+ -+#ifdef DEBUGCHAP -+#define CHAPDEBUG(x) if (debug) dbglog x -+#else -+#define CHAPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPXCP -+#define IPXCPDEBUG(x) if (debug) dbglog x -+#else -+#define IPXCPDEBUG(x) -+#endif -+ -+#ifndef SIGTYPE -+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) -+#define SIGTYPE void -+#else -+#define SIGTYPE int -+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */ -+#endif /* SIGTYPE */ -+ -+#ifndef MIN -+#define MIN(a, b) ((a) < (b)? (a): (b)) -+#endif -+#ifndef MAX -+#define MAX(a, b) ((a) > (b)? (a): (b)) -+#endif -+ -+#ifndef offsetof -+#define offsetof(type, member) ((size_t) &((type *)0)->member) -+#endif -+ -+#endif /* __PPP_H__ */ -Index: src/external/2.4.3/pppd/fsm.h -=================================================================== ---- src/external/2.4.3/pppd/fsm.h (revision 0) -+++ src/external/2.4.3/pppd/fsm.h (revision 0) -@@ -0,0 +1,168 @@ -+/* -+ * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: fsm.h 1930 2006-08-05 21:57:03Z ajmee $ -+ */ -+ -+/* -+ * Packet header = Code, id, length. -+ */ -+#define HEADERLEN 4 -+ -+ -+/* -+ * CP (LCP, IPCP, etc.) codes. -+ */ -+#define CONFREQ 1 /* Configuration Request */ -+#define CONFACK 2 /* Configuration Ack */ -+#define CONFNAK 3 /* Configuration Nak */ -+#define CONFREJ 4 /* Configuration Reject */ -+#define TERMREQ 5 /* Termination Request */ -+#define TERMACK 6 /* Termination Ack */ -+#define CODEREJ 7 /* Code Reject */ -+ -+ -+/* -+ * Each FSM is described by an fsm structure and fsm callbacks. -+ */ -+typedef struct fsm { -+ int unit; /* Interface unit number */ -+ int protocol; /* Data Link Layer Protocol field value */ -+ int state; /* State */ -+ int flags; /* Contains option bits */ -+ u_char id; /* Current id */ -+ u_char reqid; /* Current request id */ -+ u_char seen_ack; /* Have received valid Ack/Nak/Rej to Req */ -+ int timeouttime; /* Timeout time in milliseconds */ -+ int maxconfreqtransmits; /* Maximum Configure-Request transmissions */ -+ int retransmits; /* Number of retransmissions left */ -+ int maxtermtransmits; /* Maximum Terminate-Request transmissions */ -+ int nakloops; /* Number of nak loops since last ack */ -+ int rnakloops; /* Number of naks received */ -+ int maxnakloops; /* Maximum number of nak loops tolerated */ -+ struct fsm_callbacks *callbacks; /* Callback routines */ -+ char *term_reason; /* Reason for closing protocol */ -+ int term_reason_len; /* Length of term_reason */ -+} fsm; -+ -+ -+typedef struct fsm_callbacks { -+ void (*resetci) /* Reset our Configuration Information */ -+ __P((fsm *)); -+ int (*cilen) /* Length of our Configuration Information */ -+ __P((fsm *)); -+ void (*addci) /* Add our Configuration Information */ -+ __P((fsm *, u_char *, int *)); -+ int (*ackci) /* ACK our Configuration Information */ -+ __P((fsm *, u_char *, int)); -+ int (*nakci) /* NAK our Configuration Information */ -+ __P((fsm *, u_char *, int, int)); -+ int (*rejci) /* Reject our Configuration Information */ -+ __P((fsm *, u_char *, int)); -+ int (*reqci) /* Request peer's Configuration Information */ -+ __P((fsm *, u_char *, int *, int)); -+ void (*up) /* Called when fsm reaches OPENED state */ -+ __P((fsm *)); -+ void (*down) /* Called when fsm leaves OPENED state */ -+ __P((fsm *)); -+ void (*starting) /* Called when we want the lower layer */ -+ __P((fsm *)); -+ void (*finished) /* Called when we don't want the lower layer */ -+ __P((fsm *)); -+ void (*protreject) /* Called when Protocol-Reject received */ -+ __P((int)); -+ void (*retransmit) /* Retransmission is necessary */ -+ __P((fsm *)); -+ int (*extcode) /* Called when unknown code received */ -+ __P((fsm *, int, int, u_char *, int)); -+ char *proto_name; /* String name for protocol (for messages) */ -+} fsm_callbacks; -+ -+ -+/* -+ * Link states. -+ */ -+#define INITIAL 0 /* Down, hasn't been opened */ -+#define STARTING 1 /* Down, been opened */ -+#define CLOSED 2 /* Up, hasn't been opened */ -+#define STOPPED 3 /* Open, waiting for down event */ -+#define CLOSING 4 /* Terminating the connection, not open */ -+#define STOPPING 5 /* Terminating, but open */ -+#define REQSENT 6 /* We've sent a Config Request */ -+#define ACKRCVD 7 /* We've received a Config Ack */ -+#define ACKSENT 8 /* We've sent a Config Ack */ -+#define OPENED 9 /* Connection available */ -+ -+ -+/* -+ * Flags - indicate options controlling FSM operation -+ */ -+#define OPT_PASSIVE 1 /* Don't die if we don't get a response */ -+#define OPT_RESTART 2 /* Treat 2nd OPEN as DOWN, UP */ -+#define OPT_SILENT 4 /* Wait for peer to speak first */ -+ -+ -+/* -+ * Timeouts. -+ */ -+#define DEFTIMEOUT 3 /* Timeout time in seconds */ -+#define DEFMAXTERMREQS 2 /* Maximum Terminate-Request transmissions */ -+#define DEFMAXCONFREQS 10 /* Maximum Configure-Request transmissions */ -+#define DEFMAXNAKLOOPS 5 /* Maximum number of nak loops */ -+ -+ -+/* -+ * Prototypes -+ */ -+void fsm_init __P((fsm *)); -+void fsm_lowerup __P((fsm *)); -+void fsm_lowerdown __P((fsm *)); -+void fsm_open __P((fsm *)); -+void fsm_close __P((fsm *, char *)); -+void fsm_input __P((fsm *, u_char *, int)); -+void fsm_protreject __P((fsm *)); -+void fsm_sdata __P((fsm *, int, int, u_char *, int)); -+ -+ -+/* -+ * Variables -+ */ -+extern int peer_mru[]; /* currently negotiated peer MRU (per unit) */ -Index: src/external/2.4.3/pppd/patchlevel.h -=================================================================== ---- src/external/2.4.3/pppd/patchlevel.h (revision 0) -+++ src/external/2.4.3/pppd/patchlevel.h (revision 0) -@@ -0,0 +1,4 @@ -+/* $Id: patchlevel.h 1946 2006-08-10 10:10:17Z ajmee $ */ -+ -+#define VERSION "2.4.3" -+#define DATE "13 November 2004" -Index: src/external/2.4.4/pppd/ipcp.h -=================================================================== ---- src/external/2.4.4/pppd/ipcp.h (revision 0) -+++ src/external/2.4.4/pppd/ipcp.h (revision 0) -@@ -0,0 +1,96 @@ -+/* -+ * ipcp.h - IP Control Protocol definitions. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: ipcp.h 1946 2006-08-10 10:10:17Z ajmee $ -+ */ -+ -+/* -+ * Options. -+ */ -+#define CI_ADDRS 1 /* IP Addresses */ -+#define CI_COMPRESSTYPE 2 /* Compression Type */ -+#define CI_ADDR 3 -+ -+#define CI_MS_DNS1 129 /* Primary DNS value */ -+#define CI_MS_WINS1 130 /* Primary WINS value */ -+#define CI_MS_DNS2 131 /* Secondary DNS value */ -+#define CI_MS_WINS2 132 /* Secondary WINS value */ -+ -+#define MAX_STATES 16 /* from slcompress.h */ -+ -+#define IPCP_VJMODE_OLD 1 /* "old" mode (option # = 0x0037) */ -+#define IPCP_VJMODE_RFC1172 2 /* "old-rfc"mode (option # = 0x002d) */ -+#define IPCP_VJMODE_RFC1332 3 /* "new-rfc"mode (option # = 0x002d, */ -+ /* maxslot and slot number compression) */ -+ -+#define IPCP_VJ_COMP 0x002d /* current value for VJ compression option*/ -+#define IPCP_VJ_COMP_OLD 0x0037 /* "old" (i.e, broken) value for VJ */ -+ /* compression option*/ -+ -+typedef struct ipcp_options { -+ bool neg_addr; /* Negotiate IP Address? */ -+ bool old_addrs; /* Use old (IP-Addresses) option? */ -+ bool req_addr; /* Ask peer to send IP address? */ -+ bool default_route; /* Assign default route through interface? */ -+ bool proxy_arp; /* Make proxy ARP entry for peer? */ -+ bool neg_vj; /* Van Jacobson Compression? */ -+ bool old_vj; /* use old (short) form of VJ option? */ -+ bool accept_local; /* accept peer's value for ouraddr */ -+ bool accept_remote; /* accept peer's value for hisaddr */ -+ bool req_dns1; /* Ask peer to send primary DNS address? */ -+ bool req_dns2; /* Ask peer to send secondary DNS address? */ -+ int vj_protocol; /* protocol value to use in VJ option */ -+ int maxslotindex; /* values for RFC1332 VJ compression neg. */ -+ bool cflag; -+ u_int32_t ouraddr, hisaddr; /* Addresses in NETWORK BYTE ORDER */ -+ u_int32_t dnsaddr[2]; /* Primary and secondary MS DNS entries */ -+ u_int32_t winsaddr[2]; /* Primary and secondary MS WINS entries */ -+} ipcp_options; -+ -+extern fsm ipcp_fsm[]; -+extern ipcp_options ipcp_wantoptions[]; -+extern ipcp_options ipcp_gotoptions[]; -+extern ipcp_options ipcp_allowoptions[]; -+extern ipcp_options ipcp_hisoptions[]; -+ -+char *ip_ntoa __P((u_int32_t)); -+ -+extern struct protent ipcp_protent; -Index: src/external/2.4.4/pppd/pppd.h -=================================================================== ---- src/external/2.4.4/pppd/pppd.h (revision 0) -+++ src/external/2.4.4/pppd/pppd.h (revision 0) -@@ -0,0 +1,907 @@ -+/* -+ * pppd.h - PPP daemon global declarations. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: pppd.h 1946 2006-08-10 10:10:17Z ajmee $ -+ */ -+ -+/* -+ * TODO: -+ */ -+ -+#ifndef __PPPD_H__ -+#define __PPPD_H__ -+ -+#include <stdio.h> /* for FILE */ -+#include <limits.h> /* for NGROUPS_MAX */ -+#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */ -+#include <sys/types.h> /* for u_int32_t, if defined */ -+#include <sys/time.h> /* for struct timeval */ -+#include <net/ppp_defs.h> -+#include "patchlevel.h" -+ -+#if defined(__STDC__) -+#include <stdarg.h> -+#define __V(x) x -+#else -+#include <varargs.h> -+#define __V(x) (va_alist) va_dcl -+#define const -+#define volatile -+#endif -+ -+#ifdef INET6 -+#include "eui64.h" -+#endif -+ -+/* -+ * Limits. -+ */ -+ -+#define NUM_PPP 1 /* One PPP interface supported (per process) */ -+#define MAXWORDLEN 1024 /* max length of word in file (incl null) */ -+#define MAXARGS 1 /* max # args to a command */ -+#define MAXNAMELEN 256 /* max length of hostname or name for auth */ -+#define MAXSECRETLEN 256 /* max length of password or secret */ -+ -+/* -+ * Option descriptor structure. -+ */ -+ -+typedef unsigned char bool; -+ -+enum opt_type { -+ o_special_noarg = 0, -+ o_special = 1, -+ o_bool, -+ o_int, -+ o_uint32, -+ o_string, -+ o_wild -+}; -+ -+typedef struct { -+ char *name; /* name of the option */ -+ enum opt_type type; -+ void *addr; -+ char *description; -+ unsigned int flags; -+ void *addr2; -+ int upper_limit; -+ int lower_limit; -+ const char *source; -+ short int priority; -+ short int winner; -+} option_t; -+ -+/* Values for flags */ -+#define OPT_VALUE 0xff /* mask for presupplied value */ -+#define OPT_HEX 0x100 /* int option is in hex */ -+#define OPT_NOARG 0x200 /* option doesn't take argument */ -+#define OPT_OR 0x400 /* OR in argument to value */ -+#define OPT_INC 0x800 /* increment value */ -+#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */ -+#define OPT_PRIV 0x1000 /* privileged option */ -+#define OPT_STATIC 0x2000 /* string option goes into static array */ -+#define OPT_LLIMIT 0x4000 /* check value against lower limit */ -+#define OPT_ULIMIT 0x8000 /* check value against upper limit */ -+#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT) -+#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */ -+#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */ -+#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */ -+#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */ -+#define OPT_NOINCR 0x20000 /* value mustn't be increased */ -+#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */ -+#define OPT_PRIO 0x80000 /* process option priorities for this option */ -+#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */ -+#define OPT_ALIAS 0x200000 /* option is alias for previous option */ -+#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */ -+#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */ -+#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */ -+#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */ -+#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */ -+#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */ -+#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV) -+#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */ -+#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */ -+#define OPT_NOPRINT 0x40000000 /* don't print this option at all */ -+ -+#define OPT_VAL(x) ((x) & OPT_VALUE) -+ -+/* Values for priority */ -+#define OPRIO_DEFAULT 0 /* a default value */ -+#define OPRIO_CFGFILE 1 /* value from a configuration file */ -+#define OPRIO_CMDLINE 2 /* value from the command line */ -+#define OPRIO_SECFILE 3 /* value from options in a secrets file */ -+#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */ -+ -+#ifndef GIDSET_TYPE -+#define GIDSET_TYPE gid_t -+#endif -+ -+/* Structure representing a list of permitted IP addresses. */ -+struct permitted_ip { -+ int permit; /* 1 = permit, 0 = forbid */ -+ u_int32_t base; /* match if (addr & mask) == base */ -+ u_int32_t mask; /* base and mask are in network byte order */ -+}; -+ -+/* -+ * Unfortunately, the linux kernel driver uses a different structure -+ * for statistics from the rest of the ports. -+ * This structure serves as a common representation for the bits -+ * pppd needs. -+ */ -+struct pppd_stats { -+ unsigned int bytes_in; -+ unsigned int bytes_out; -+ unsigned int pkts_in; -+ unsigned int pkts_out; -+}; -+ -+/* Used for storing a sequence of words. Usually malloced. */ -+struct wordlist { -+ struct wordlist *next; -+ char *word; -+}; -+ -+/* An endpoint discriminator, used with multilink. */ -+#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */ -+struct epdisc { -+ unsigned char class; -+ unsigned char length; -+ unsigned char value[MAX_ENDP_LEN]; -+}; -+ -+/* values for epdisc.class */ -+#define EPD_NULL 0 /* null discriminator, no data */ -+#define EPD_LOCAL 1 -+#define EPD_IP 2 -+#define EPD_MAC 3 -+#define EPD_MAGIC 4 -+#define EPD_PHONENUM 5 -+ -+typedef void (*notify_func) __P((void *, int)); -+ -+struct notifier { -+ struct notifier *next; -+ notify_func func; -+ void *arg; -+}; -+ -+/* -+ * Global variables. -+ */ -+ -+extern int hungup; /* Physical layer has disconnected */ -+extern int ifunit; /* Interface unit number */ -+extern char ifname[]; /* Interface name */ -+extern char hostname[]; /* Our hostname */ -+extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ -+extern int devfd; /* fd of underlying device */ -+extern int fd_ppp; /* fd for talking PPP */ -+extern int phase; /* Current state of link - see values below */ -+extern int baud_rate; /* Current link speed in bits/sec */ -+extern char *progname; /* Name of this program */ -+extern int redirect_stderr;/* Connector's stderr should go to file */ -+extern char peer_authname[];/* Authenticated name of peer */ -+extern int auth_done[NUM_PPP]; /* Methods actually used for auth */ -+extern int privileged; /* We were run by real-uid root */ -+extern int need_holdoff; /* Need holdoff period after link terminates */ -+extern char **script_env; /* Environment variables for scripts */ -+extern int detached; /* Have detached from controlling tty */ -+extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */ -+extern int ngroups; /* How many groups valid in groups */ -+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */ -+extern int link_stats_valid; /* set if link_stats is valid */ -+extern unsigned link_connect_time; /* time the link was up for */ -+extern int using_pty; /* using pty as device (notty or pty opt.) */ -+extern int log_to_fd; /* logging to this fd as well as syslog */ -+extern bool log_default; /* log_to_fd is default (stdout) */ -+extern char *no_ppp_msg; /* message to print if ppp not in kernel */ -+extern volatile int status; /* exit status for pppd */ -+extern bool devnam_fixed; /* can no longer change devnam */ -+extern int unsuccess; /* # unsuccessful connection attempts */ -+extern int do_callback; /* set if we want to do callback next */ -+extern int doing_callback; /* set if this is a callback */ -+extern int error_count; /* # of times error() has been called */ -+extern char ppp_devnam[MAXPATHLEN]; -+extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */ -+extern int ppp_session_number; /* Session number (eg PPPoE session) */ -+extern int fd_devnull; /* fd open to /dev/null */ -+ -+extern int listen_time; /* time to listen first (ms) */ -+extern bool doing_multilink; -+extern bool multilink_master; -+extern bool bundle_eof; -+extern bool bundle_terminating; -+ -+extern struct notifier *pidchange; /* for notifications of pid changing */ -+extern struct notifier *phasechange; /* for notifications of phase changes */ -+extern struct notifier *exitnotify; /* for notification that we're exiting */ -+extern struct notifier *sigreceived; /* notification of received signal */ -+extern struct notifier *ip_up_notifier; /* IPCP has come up */ -+extern struct notifier *ip_down_notifier; /* IPCP has gone down */ -+extern struct notifier *auth_up_notifier; /* peer has authenticated */ -+extern struct notifier *link_down_notifier; /* link has gone down */ -+extern struct notifier *fork_notifier; /* we are a new child process */ -+ -+/* Values for do_callback and doing_callback */ -+#define CALLBACK_DIALIN 1 /* we are expecting the call back */ -+#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */ -+ -+/* -+ * Variables set by command-line options. -+ */ -+ -+extern int debug; /* Debug flag */ -+extern int kdebugflag; /* Tell kernel to print debug messages */ -+extern int default_device; /* Using /dev/tty or equivalent */ -+extern char devnam[MAXPATHLEN]; /* Device name */ -+extern int crtscts; /* Use hardware flow control */ -+extern bool modem; /* Use modem control lines */ -+extern int inspeed; /* Input/Output speed requested */ -+extern u_int32_t netmask; /* IP netmask to set on interface */ -+extern bool lockflag; /* Create lock file to lock the serial dev */ -+extern bool nodetach; /* Don't detach from controlling tty */ -+extern bool updetach; /* Detach from controlling tty when link up */ -+extern char *initializer; /* Script to initialize physical link */ -+extern char *connect_script; /* Script to establish physical link */ -+extern char *disconnect_script; /* Script to disestablish physical link */ -+extern char *welcomer; /* Script to welcome client after connection */ -+extern char *ptycommand; /* Command to run on other side of pty */ -+extern int maxconnect; /* Maximum connect time (seconds) */ -+extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */ -+extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */ -+extern bool auth_required; /* Peer is required to authenticate */ -+extern bool persist; /* Reopen link after it goes down */ -+extern bool uselogin; /* Use /etc/passwd for checking PAP */ -+extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */ -+extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ -+extern bool explicit_remote;/* remote_name specified with remotename opt */ -+extern bool demand; /* Do dial-on-demand */ -+extern char *ipparam; /* Extra parameter for ip up/down scripts */ -+extern bool cryptpap; /* Others' PAP passwords are encrypted */ -+extern int idle_time_limit;/* Shut down link if idle for this long */ -+extern int holdoff; /* Dead time before restarting */ -+extern bool holdoff_specified; /* true if user gave a holdoff value */ -+extern bool notty; /* Stdin/out is not a tty */ -+extern char *pty_socket; /* Socket to connect to pty */ -+extern char *record_file; /* File to record chars sent/received */ -+extern bool sync_serial; /* Device is synchronous serial device */ -+extern int maxfail; /* Max # of unsuccessful connection attempts */ -+extern char linkname[MAXPATHLEN]; /* logical name for link */ -+extern bool tune_kernel; /* May alter kernel settings as necessary */ -+extern int connect_delay; /* Time to delay after connect script */ -+extern int max_data_rate; /* max bytes/sec through charshunt */ -+extern int req_unit; /* interface unit number to use */ -+extern bool multilink; /* enable multilink operation */ -+extern bool noendpoint; /* don't send or accept endpt. discrim. */ -+extern char *bundle_name; /* bundle name for multilink */ -+extern bool dump_options; /* print out option values */ -+extern bool dryrun; /* check everything, print options, exit */ -+extern int child_wait; /* # seconds to wait for children at end */ -+ -+#ifdef MAXOCTETS -+extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ -+extern int maxoctets_dir; /* Direction : -+ 0 - in+out (default) -+ 1 - in -+ 2 - out -+ 3 - max(in,out) */ -+extern int maxoctets_timeout; /* Timeout for check of octets limit */ -+#define PPP_OCTETS_DIRECTION_SUM 0 -+#define PPP_OCTETS_DIRECTION_IN 1 -+#define PPP_OCTETS_DIRECTION_OUT 2 -+#define PPP_OCTETS_DIRECTION_MAXOVERAL 3 -+/* same as previos, but little different on RADIUS side */ -+#define PPP_OCTETS_DIRECTION_MAXSESSION 4 -+#endif -+ -+#ifdef PPP_FILTER -+extern struct bpf_program pass_filter; /* Filter for pkts to pass */ -+extern struct bpf_program active_filter; /* Filter for link-active pkts */ -+#endif -+ -+#ifdef MSLANMAN -+extern bool ms_lanman; /* Use LanMan password instead of NT */ -+ /* Has meaning only with MS-CHAP challenges */ -+#endif -+ -+/* Values for auth_pending, auth_done */ -+#define PAP_WITHPEER 0x1 -+#define PAP_PEER 0x2 -+#define CHAP_WITHPEER 0x4 -+#define CHAP_PEER 0x8 -+#define EAP_WITHPEER 0x10 -+#define EAP_PEER 0x20 -+ -+/* Values for auth_done only */ -+#define CHAP_MD5_WITHPEER 0x40 -+#define CHAP_MD5_PEER 0x80 -+#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */ -+#define CHAP_MS_WITHPEER 0x100 -+#define CHAP_MS_PEER 0x200 -+#define CHAP_MS2_WITHPEER 0x400 -+#define CHAP_MS2_PEER 0x800 -+ -+extern char *current_option; /* the name of the option being parsed */ -+extern int privileged_option; /* set iff the current option came from root */ -+extern char *option_source; /* string saying where the option came from */ -+extern int option_priority; /* priority of current options */ -+ -+/* -+ * Values for phase. -+ */ -+#define PHASE_DEAD 0 -+#define PHASE_INITIALIZE 1 -+#define PHASE_SERIALCONN 2 -+#define PHASE_DORMANT 3 -+#define PHASE_ESTABLISH 4 -+#define PHASE_AUTHENTICATE 5 -+#define PHASE_CALLBACK 6 -+#define PHASE_NETWORK 7 -+#define PHASE_RUNNING 8 -+#define PHASE_TERMINATE 9 -+#define PHASE_DISCONNECT 10 -+#define PHASE_HOLDOFF 11 -+#define PHASE_MASTER 12 -+ -+/* -+ * The following struct gives the addresses of procedures to call -+ * for a particular protocol. -+ */ -+struct protent { -+ u_short protocol; /* PPP protocol number */ -+ /* Initialization procedure */ -+ void (*init) __P((int unit)); -+ /* Process a received packet */ -+ void (*input) __P((int unit, u_char *pkt, int len)); -+ /* Process a received protocol-reject */ -+ void (*protrej) __P((int unit)); -+ /* Lower layer has come up */ -+ void (*lowerup) __P((int unit)); -+ /* Lower layer has gone down */ -+ void (*lowerdown) __P((int unit)); -+ /* Open the protocol */ -+ void (*open) __P((int unit)); -+ /* Close the protocol */ -+ void (*close) __P((int unit, char *reason)); -+ /* Print a packet in readable form */ -+ int (*printpkt) __P((u_char *pkt, int len, -+ void (*printer) __P((void *, char *, ...)), -+ void *arg)); -+ /* Process a received data packet */ -+ void (*datainput) __P((int unit, u_char *pkt, int len)); -+ bool enabled_flag; /* 0 iff protocol is disabled */ -+ char *name; /* Text name of protocol */ -+ char *data_name; /* Text name of corresponding data protocol */ -+ option_t *options; /* List of command-line options */ -+ /* Check requested options, assign defaults */ -+ void (*check_options) __P((void)); -+ /* Configure interface for demand-dial */ -+ int (*demand_conf) __P((int unit)); -+ /* Say whether to bring up link for this pkt */ -+ int (*active_pkt) __P((u_char *pkt, int len)); -+}; -+ -+/* Table of pointers to supported protocols */ -+extern struct protent *protocols[]; -+ -+/* -+ * This struct contains pointers to a set of procedures for -+ * doing operations on a "channel". A channel provides a way -+ * to send and receive PPP packets - the canonical example is -+ * a serial port device in PPP line discipline (or equivalently -+ * with PPP STREAMS modules pushed onto it). -+ */ -+struct channel { -+ /* set of options for this channel */ -+ option_t *options; -+ /* find and process a per-channel options file */ -+ void (*process_extra_options) __P((void)); -+ /* check all the options that have been given */ -+ void (*check_options) __P((void)); -+ /* get the channel ready to do PPP, return a file descriptor */ -+ int (*connect) __P((void)); -+ /* we're finished with the channel */ -+ void (*disconnect) __P((void)); -+ /* put the channel into PPP `mode' */ -+ int (*establish_ppp) __P((int)); -+ /* take the channel out of PPP `mode', restore loopback if demand */ -+ void (*disestablish_ppp) __P((int)); -+ /* set the transmit-side PPP parameters of the channel */ -+ void (*send_config) __P((int, u_int32_t, int, int)); -+ /* set the receive-side PPP parameters of the channel */ -+ void (*recv_config) __P((int, u_int32_t, int, int)); -+ /* cleanup on error or normal exit */ -+ void (*cleanup) __P((void)); -+ /* close the device, called in children after fork */ -+ void (*close) __P((void)); -+}; -+ -+extern struct channel *the_channel; -+ -+/* -+ * Prototypes. -+ */ -+ -+/* Procedures exported from main.c. */ -+void set_ifunit __P((int)); /* set stuff that depends on ifunit */ -+void detach __P((void)); /* Detach from controlling tty */ -+void die __P((int)); /* Cleanup and exit */ -+void quit __P((void)); /* like die(1) */ -+void novm __P((char *)); /* Say we ran out of memory, and die */ -+void timeout __P((void (*func)(void *), void *arg, int s, int us)); -+ /* Call func(arg) after s.us seconds */ -+void untimeout __P((void (*func)(void *), void *arg)); -+ /* Cancel call to func(arg) */ -+void record_child __P((int, char *, void (*) (void *), void *)); -+pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */ -+int device_script __P((char *cmd, int in, int out, int dont_wait)); -+ /* Run `cmd' with given stdin and stdout */ -+pid_t run_program __P((char *prog, char **args, int must_exist, -+ void (*done)(void *), void *arg, int wait)); -+ /* Run program prog with args in child */ -+void reopen_log __P((void)); /* (re)open the connection to syslog */ -+void print_link_stats __P((void)); /* Print stats, if available */ -+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */ -+void update_link_stats __P((int)); /* Get stats at link termination */ -+void script_setenv __P((char *, char *, int)); /* set script env var */ -+void script_unsetenv __P((char *)); /* unset script env var */ -+void new_phase __P((int)); /* signal start of new phase */ -+void add_notifier __P((struct notifier **, notify_func, void *)); -+void remove_notifier __P((struct notifier **, notify_func, void *)); -+void notify __P((struct notifier *, int)); -+int ppp_send_config __P((int, int, u_int32_t, int, int)); -+int ppp_recv_config __P((int, int, u_int32_t, int, int)); -+const char *protocol_name __P((int)); -+void remove_pidfiles __P((void)); -+void lock_db __P((void)); -+void unlock_db __P((void)); -+ -+/* Procedures exported from tty.c. */ -+void tty_init __P((void)); -+ -+/* Procedures exported from utils.c. */ -+void log_packet __P((u_char *, int, char *, int)); -+ /* Format a packet and log it with syslog */ -+void print_string __P((char *, int, void (*) (void *, char *, ...), -+ void *)); /* Format a string for output */ -+int slprintf __P((char *, int, char *, ...)); /* sprintf++ */ -+int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */ -+size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */ -+size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */ -+void dbglog __P((char *, ...)); /* log a debug message */ -+void info __P((char *, ...)); /* log an informational message */ -+void notice __P((char *, ...)); /* log a notice-level message */ -+void warn __P((char *, ...)); /* log a warning message */ -+void error __P((char *, ...)); /* log an error message */ -+void fatal __P((char *, ...)); /* log an error message and die(1) */ -+void init_pr_log __P((char *, int)); /* initialize for using pr_log */ -+void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */ -+void end_pr_log __P((void)); /* finish up after using pr_log */ -+void dump_packet __P((const char *, u_char *, int)); -+ /* dump packet to debug log if interesting */ -+ssize_t complete_read __P((int, void *, size_t)); -+ /* read a complete buffer */ -+ -+/* Procedures exported from auth.c */ -+void link_required __P((int)); /* we are starting to use the link */ -+void start_link __P((int)); /* bring the link up now */ -+void link_terminated __P((int)); /* we are finished with the link */ -+void link_down __P((int)); /* the LCP layer has left the Opened state */ -+void upper_layers_down __P((int));/* take all NCPs down */ -+void link_established __P((int)); /* the link is up; authenticate now */ -+void start_networks __P((int)); /* start all the network control protos */ -+void continue_networks __P((int)); /* start network [ip, etc] control protos */ -+void np_up __P((int, int)); /* a network protocol has come up */ -+void np_down __P((int, int)); /* a network protocol has gone down */ -+void np_finished __P((int, int)); /* a network protocol no longer needs link */ -+void auth_peer_fail __P((int, int)); -+ /* peer failed to authenticate itself */ -+void auth_peer_success __P((int, int, int, char *, int)); -+ /* peer successfully authenticated itself */ -+void auth_withpeer_fail __P((int, int)); -+ /* we failed to authenticate ourselves */ -+void auth_withpeer_success __P((int, int, int)); -+ /* we successfully authenticated ourselves */ -+void auth_check_options __P((void)); -+ /* check authentication options supplied */ -+void auth_reset __P((int)); /* check what secrets we have */ -+int check_passwd __P((int, char *, int, char *, int, char **)); -+ /* Check peer-supplied username/password */ -+int get_secret __P((int, char *, char *, char *, int *, int)); -+ /* get "secret" for chap */ -+int get_srp_secret __P((int unit, char *client, char *server, char *secret, -+ int am_server)); -+int auth_ip_addr __P((int, u_int32_t)); -+ /* check if IP address is authorized */ -+int auth_number __P((void)); /* check if remote number is authorized */ -+int bad_ip_adrs __P((u_int32_t)); -+ /* check if IP address is unreasonable */ -+ -+/* Procedures exported from demand.c */ -+void demand_conf __P((void)); /* config interface(s) for demand-dial */ -+void demand_block __P((void)); /* set all NPs to queue up packets */ -+void demand_unblock __P((void)); /* set all NPs to pass packets */ -+void demand_discard __P((void)); /* set all NPs to discard packets */ -+void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ -+int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ -+int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ -+ -+/* Procedures exported from multilink.c */ -+#ifdef HAVE_MULTILINK -+void mp_check_options __P((void)); /* Check multilink-related options */ -+int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */ -+void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */ -+void mp_bundle_terminated __P((void)); -+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */ -+int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */ -+#else -+#define mp_bundle_terminated() /* nothing */ -+#define mp_exit_bundle() /* nothing */ -+#define doing_multilink 0 -+#define multilink_master 0 -+#endif -+ -+/* Procedures exported from sys-*.c */ -+void sys_init __P((void)); /* Do system-dependent initialization */ -+void sys_cleanup __P((void)); /* Restore system state before exiting */ -+int sys_check_options __P((void)); /* Check options specified */ -+void sys_close __P((void)); /* Clean up in a child before execing */ -+int ppp_available __P((void)); /* Test whether ppp kernel support exists */ -+int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */ -+int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ -+int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */ -+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */ -+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */ -+int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */ -+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */ -+int bundle_attach __P((int)); /* Attach link to existing bundle */ -+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */ -+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */ -+void clean_check __P((void)); /* Check if line was 8-bit clean */ -+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ -+void restore_tty __P((int)); /* Restore port's original parameters */ -+void setdtr __P((int, int)); /* Raise or lower port's DTR line */ -+void output __P((int, u_char *, int)); /* Output a PPP packet */ -+void wait_input __P((struct timeval *)); -+ /* Wait for input, with timeout */ -+void add_fd __P((int)); /* Add fd to set to wait for */ -+void remove_fd __P((int)); /* Remove fd from set to wait for */ -+int read_packet __P((u_char *)); /* Read PPP packet */ -+int get_loop_output __P((void)); /* Read pkts from loopback */ -+void tty_send_config __P((int, u_int32_t, int, int)); -+ /* Configure i/f transmit parameters */ -+void tty_set_xaccm __P((ext_accm)); -+ /* Set extended transmit ACCM */ -+void tty_recv_config __P((int, u_int32_t, int, int)); -+ /* Configure i/f receive parameters */ -+int ccp_test __P((int, u_char *, int, int)); -+ /* Test support for compression scheme */ -+void ccp_flags_set __P((int, int, int)); -+ /* Set kernel CCP state */ -+int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ -+int get_idle_time __P((int, struct ppp_idle *)); -+ /* Find out how long link has been idle */ -+int get_ppp_stats __P((int, struct pppd_stats *)); -+ /* Return link statistics */ -+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */ -+int netif_get_mtu __P((int)); /* Get PPP interface MTU */ -+int sifvjcomp __P((int, int, int, int)); -+ /* Configure VJ TCP header compression */ -+int sifup __P((int)); /* Configure i/f up for one protocol */ -+int sifnpmode __P((int u, int proto, enum NPmode mode)); -+ /* Set mode for handling packets for proto */ -+int sifdown __P((int)); /* Configure i/f down for one protocol */ -+int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); -+ /* Configure IPv4 addresses for i/f */ -+int cifaddr __P((int, u_int32_t, u_int32_t)); -+ /* Reset i/f IP addresses */ -+#ifdef INET6 -+int sif6addr __P((int, eui64_t, eui64_t)); -+ /* Configure IPv6 addresses for i/f */ -+int cif6addr __P((int, eui64_t, eui64_t)); -+ /* Remove an IPv6 address from i/f */ -+#endif -+int sifdefaultroute __P((int, u_int32_t, u_int32_t)); -+ /* Create default route through i/f */ -+int cifdefaultroute __P((int, u_int32_t, u_int32_t)); -+ /* Delete default route through i/f */ -+int sifproxyarp __P((int, u_int32_t)); -+ /* Add proxy ARP entry for peer */ -+int cifproxyarp __P((int, u_int32_t)); -+ /* Delete proxy ARP entry for peer */ -+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ -+int lock __P((char *)); /* Create lock file for device */ -+int relock __P((int)); /* Rewrite lock file with new pid */ -+void unlock __P((void)); /* Delete previously-created lock file */ -+void logwtmp __P((const char *, const char *, const char *)); -+ /* Write entry to wtmp file */ -+int get_host_seed __P((void)); /* Get host-dependent random number seed */ -+int have_route_to __P((u_int32_t)); /* Check if route to addr exists */ -+#ifdef PPP_FILTER -+int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); -+ /* Set filter programs in kernel */ -+#endif -+#ifdef IPX_CHANGE -+int sipxfaddr __P((int, unsigned long, unsigned char *)); -+int cipxfaddr __P((int)); -+#endif -+int get_if_hwaddr __P((u_char *addr, char *name)); -+char *get_first_ethernet __P((void)); -+ -+/* Procedures exported from options.c */ -+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ -+int parse_args __P((int argc, char **argv)); -+ /* Parse options from arguments given */ -+int options_from_file __P((char *filename, int must_exist, int check_prot, -+ int privileged)); -+ /* Parse options from an options file */ -+int options_from_user __P((void)); /* Parse options from user's .ppprc */ -+int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ -+int options_from_list __P((struct wordlist *, int privileged)); -+ /* Parse options from a wordlist */ -+int getword __P((FILE *f, char *word, int *newlinep, char *filename)); -+ /* Read a word from a file */ -+void option_error __P((char *fmt, ...)); -+ /* Print an error message about an option */ -+int int_option __P((char *, int *)); -+ /* Simplified number_option for decimal ints */ -+void add_options __P((option_t *)); /* Add extra options */ -+void check_options __P((void)); /* check values after all options parsed */ -+int override_value __P((const char *, int, const char *)); -+ /* override value if permitted by priority */ -+void print_options __P((void (*) __P((void *, char *, ...)), void *)); -+ /* print out values of all options */ -+ -+int parse_dotted_ip __P((char *, u_int32_t *)); -+ -+/* -+ * Hooks to enable plugins to change various things. -+ */ -+extern int (*new_phase_hook) __P((int)); -+extern int (*idle_time_hook) __P((struct ppp_idle *)); -+extern int (*holdoff_hook) __P((void)); -+extern int (*pap_check_hook) __P((void)); -+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, -+ struct wordlist **paddrs, -+ struct wordlist **popts)); -+extern void (*pap_logout_hook) __P((void)); -+extern int (*pap_passwd_hook) __P((char *user, char *passwd)); -+extern int (*allowed_address_hook) __P((u_int32_t addr)); -+extern void (*ip_up_hook) __P((void)); -+extern void (*ip_down_hook) __P((void)); -+extern void (*ip_choose_hook) __P((u_int32_t *)); -+ -+extern int (*chap_check_hook) __P((void)); -+extern int (*chap_passwd_hook) __P((char *user, char *passwd)); -+ -+/* Let a plugin snoop sent and received packets. Useful for L2TP */ -+extern void (*snoop_recv_hook) __P((unsigned char *p, int len)); -+extern void (*snoop_send_hook) __P((unsigned char *p, int len)); -+ -+/* -+ * Inline versions of get/put char/short/long. -+ * Pointer is advanced; we assume that both arguments -+ * are lvalues and will already be in registers. -+ * cp MUST be u_char *. -+ */ -+#define GETCHAR(c, cp) { \ -+ (c) = *(cp)++; \ -+} -+#define PUTCHAR(c, cp) { \ -+ *(cp)++ = (u_char) (c); \ -+} -+ -+ -+#define GETSHORT(s, cp) { \ -+ (s) = *(cp)++ << 8; \ -+ (s) |= *(cp)++; \ -+} -+#define PUTSHORT(s, cp) { \ -+ *(cp)++ = (u_char) ((s) >> 8); \ -+ *(cp)++ = (u_char) (s); \ -+} -+ -+#define GETLONG(l, cp) { \ -+ (l) = *(cp)++ << 8; \ -+ (l) |= *(cp)++; (l) <<= 8; \ -+ (l) |= *(cp)++; (l) <<= 8; \ -+ (l) |= *(cp)++; \ -+} -+#define PUTLONG(l, cp) { \ -+ *(cp)++ = (u_char) ((l) >> 24); \ -+ *(cp)++ = (u_char) ((l) >> 16); \ -+ *(cp)++ = (u_char) ((l) >> 8); \ -+ *(cp)++ = (u_char) (l); \ -+} -+ -+#define INCPTR(n, cp) ((cp) += (n)) -+#define DECPTR(n, cp) ((cp) -= (n)) -+ -+/* -+ * System dependent definitions for user-level 4.3BSD UNIX implementation. -+ */ -+ -+#define TIMEOUT(r, f, t) timeout((r), (f), (t), 0) -+#define UNTIMEOUT(r, f) untimeout((r), (f)) -+ -+#define BCOPY(s, d, l) memcpy(d, s, l) -+#define BZERO(s, n) memset(s, 0, n) -+#define BCMP(s1, s2, l) memcmp(s1, s2, l) -+ -+#define PRINTMSG(m, l) { info("Remote message: %0.*v", l, m); } -+ -+/* -+ * MAKEHEADER - Add Header fields to a packet. -+ */ -+#define MAKEHEADER(p, t) { \ -+ PUTCHAR(PPP_ALLSTATIONS, p); \ -+ PUTCHAR(PPP_UI, p); \ -+ PUTSHORT(t, p); } -+ -+/* -+ * Exit status values. -+ */ -+#define EXIT_OK 0 -+#define EXIT_FATAL_ERROR 1 -+#define EXIT_OPTION_ERROR 2 -+#define EXIT_NOT_ROOT 3 -+#define EXIT_NO_KERNEL_SUPPORT 4 -+#define EXIT_USER_REQUEST 5 -+#define EXIT_LOCK_FAILED 6 -+#define EXIT_OPEN_FAILED 7 -+#define EXIT_CONNECT_FAILED 8 -+#define EXIT_PTYCMD_FAILED 9 -+#define EXIT_NEGOTIATION_FAILED 10 -+#define EXIT_PEER_AUTH_FAILED 11 -+#define EXIT_IDLE_TIMEOUT 12 -+#define EXIT_CONNECT_TIME 13 -+#define EXIT_CALLBACK 14 -+#define EXIT_PEER_DEAD 15 -+#define EXIT_HANGUP 16 -+#define EXIT_LOOPBACK 17 -+#define EXIT_INIT_FAILED 18 -+#define EXIT_AUTH_TOPEER_FAILED 19 -+#ifdef MAXOCTETS -+#define EXIT_TRAFFIC_LIMIT 20 -+#endif -+#define EXIT_CNID_AUTH_FAILED 21 -+ -+/* -+ * Debug macros. Slightly useful for finding bugs in pppd, not particularly -+ * useful for finding out why your connection isn't being established. -+ */ -+#ifdef DEBUGALL -+#define DEBUGMAIN 1 -+#define DEBUGFSM 1 -+#define DEBUGLCP 1 -+#define DEBUGIPCP 1 -+#define DEBUGIPV6CP 1 -+#define DEBUGUPAP 1 -+#define DEBUGCHAP 1 -+#endif -+ -+#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */ -+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \ -+ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \ -+ || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) -+#define LOG_PPP LOG_LOCAL2 -+#else -+#define LOG_PPP LOG_DAEMON -+#endif -+#endif /* LOG_PPP */ -+ -+#ifdef DEBUGMAIN -+#define MAINDEBUG(x) if (debug) dbglog x -+#else -+#define MAINDEBUG(x) -+#endif -+ -+#ifdef DEBUGSYS -+#define SYSDEBUG(x) if (debug) dbglog x -+#else -+#define SYSDEBUG(x) -+#endif -+ -+#ifdef DEBUGFSM -+#define FSMDEBUG(x) if (debug) dbglog x -+#else -+#define FSMDEBUG(x) -+#endif -+ -+#ifdef DEBUGLCP -+#define LCPDEBUG(x) if (debug) dbglog x -+#else -+#define LCPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPCP -+#define IPCPDEBUG(x) if (debug) dbglog x -+#else -+#define IPCPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPV6CP -+#define IPV6CPDEBUG(x) if (debug) dbglog x -+#else -+#define IPV6CPDEBUG(x) -+#endif -+ -+#ifdef DEBUGUPAP -+#define UPAPDEBUG(x) if (debug) dbglog x -+#else -+#define UPAPDEBUG(x) -+#endif -+ -+#ifdef DEBUGCHAP -+#define CHAPDEBUG(x) if (debug) dbglog x -+#else -+#define CHAPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPXCP -+#define IPXCPDEBUG(x) if (debug) dbglog x -+#else -+#define IPXCPDEBUG(x) -+#endif -+ -+#ifndef SIGTYPE -+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) -+#define SIGTYPE void -+#else -+#define SIGTYPE int -+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */ -+#endif /* SIGTYPE */ -+ -+#ifndef MIN -+#define MIN(a, b) ((a) < (b)? (a): (b)) -+#endif -+#ifndef MAX -+#define MAX(a, b) ((a) > (b)? (a): (b)) -+#endif -+ -+#ifndef offsetof -+#define offsetof(type, member) ((size_t) &((type *)0)->member) -+#endif -+ -+#endif /* __PPP_H__ */ -Index: src/external/2.4.4/pppd/fsm.h -=================================================================== ---- src/external/2.4.4/pppd/fsm.h (revision 0) -+++ src/external/2.4.4/pppd/fsm.h (revision 0) -@@ -0,0 +1,168 @@ -+/* -+ * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: fsm.h 1946 2006-08-10 10:10:17Z ajmee $ -+ */ -+ -+/* -+ * Packet header = Code, id, length. -+ */ -+#define HEADERLEN 4 -+ -+ -+/* -+ * CP (LCP, IPCP, etc.) codes. -+ */ -+#define CONFREQ 1 /* Configuration Request */ -+#define CONFACK 2 /* Configuration Ack */ -+#define CONFNAK 3 /* Configuration Nak */ -+#define CONFREJ 4 /* Configuration Reject */ -+#define TERMREQ 5 /* Termination Request */ -+#define TERMACK 6 /* Termination Ack */ -+#define CODEREJ 7 /* Code Reject */ -+ -+ -+/* -+ * Each FSM is described by an fsm structure and fsm callbacks. -+ */ -+typedef struct fsm { -+ int unit; /* Interface unit number */ -+ int protocol; /* Data Link Layer Protocol field value */ -+ int state; /* State */ -+ int flags; /* Contains option bits */ -+ u_char id; /* Current id */ -+ u_char reqid; /* Current request id */ -+ u_char seen_ack; /* Have received valid Ack/Nak/Rej to Req */ -+ int timeouttime; /* Timeout time in milliseconds */ -+ int maxconfreqtransmits; /* Maximum Configure-Request transmissions */ -+ int retransmits; /* Number of retransmissions left */ -+ int maxtermtransmits; /* Maximum Terminate-Request transmissions */ -+ int nakloops; /* Number of nak loops since last ack */ -+ int rnakloops; /* Number of naks received */ -+ int maxnakloops; /* Maximum number of nak loops tolerated */ -+ struct fsm_callbacks *callbacks; /* Callback routines */ -+ char *term_reason; /* Reason for closing protocol */ -+ int term_reason_len; /* Length of term_reason */ -+} fsm; -+ -+ -+typedef struct fsm_callbacks { -+ void (*resetci) /* Reset our Configuration Information */ -+ __P((fsm *)); -+ int (*cilen) /* Length of our Configuration Information */ -+ __P((fsm *)); -+ void (*addci) /* Add our Configuration Information */ -+ __P((fsm *, u_char *, int *)); -+ int (*ackci) /* ACK our Configuration Information */ -+ __P((fsm *, u_char *, int)); -+ int (*nakci) /* NAK our Configuration Information */ -+ __P((fsm *, u_char *, int, int)); -+ int (*rejci) /* Reject our Configuration Information */ -+ __P((fsm *, u_char *, int)); -+ int (*reqci) /* Request peer's Configuration Information */ -+ __P((fsm *, u_char *, int *, int)); -+ void (*up) /* Called when fsm reaches OPENED state */ -+ __P((fsm *)); -+ void (*down) /* Called when fsm leaves OPENED state */ -+ __P((fsm *)); -+ void (*starting) /* Called when we want the lower layer */ -+ __P((fsm *)); -+ void (*finished) /* Called when we don't want the lower layer */ -+ __P((fsm *)); -+ void (*protreject) /* Called when Protocol-Reject received */ -+ __P((int)); -+ void (*retransmit) /* Retransmission is necessary */ -+ __P((fsm *)); -+ int (*extcode) /* Called when unknown code received */ -+ __P((fsm *, int, int, u_char *, int)); -+ char *proto_name; /* String name for protocol (for messages) */ -+} fsm_callbacks; -+ -+ -+/* -+ * Link states. -+ */ -+#define INITIAL 0 /* Down, hasn't been opened */ -+#define STARTING 1 /* Down, been opened */ -+#define CLOSED 2 /* Up, hasn't been opened */ -+#define STOPPED 3 /* Open, waiting for down event */ -+#define CLOSING 4 /* Terminating the connection, not open */ -+#define STOPPING 5 /* Terminating, but open */ -+#define REQSENT 6 /* We've sent a Config Request */ -+#define ACKRCVD 7 /* We've received a Config Ack */ -+#define ACKSENT 8 /* We've sent a Config Ack */ -+#define OPENED 9 /* Connection available */ -+ -+ -+/* -+ * Flags - indicate options controlling FSM operation -+ */ -+#define OPT_PASSIVE 1 /* Don't die if we don't get a response */ -+#define OPT_RESTART 2 /* Treat 2nd OPEN as DOWN, UP */ -+#define OPT_SILENT 4 /* Wait for peer to speak first */ -+ -+ -+/* -+ * Timeouts. -+ */ -+#define DEFTIMEOUT 3 /* Timeout time in seconds */ -+#define DEFMAXTERMREQS 2 /* Maximum Terminate-Request transmissions */ -+#define DEFMAXCONFREQS 10 /* Maximum Configure-Request transmissions */ -+#define DEFMAXNAKLOOPS 5 /* Maximum number of nak loops */ -+ -+ -+/* -+ * Prototypes -+ */ -+void fsm_init __P((fsm *)); -+void fsm_lowerup __P((fsm *)); -+void fsm_lowerdown __P((fsm *)); -+void fsm_open __P((fsm *)); -+void fsm_close __P((fsm *, char *)); -+void fsm_input __P((fsm *, u_char *, int)); -+void fsm_protreject __P((fsm *)); -+void fsm_sdata __P((fsm *, int, int, u_char *, int)); -+ -+ -+/* -+ * Variables -+ */ -+extern int peer_mru[]; /* currently negotiated peer MRU (per unit) */ -Index: src/external/2.4.4/pppd/patchlevel.h -=================================================================== ---- src/external/2.4.4/pppd/patchlevel.h (revision 0) -+++ src/external/2.4.4/pppd/patchlevel.h (revision 0) -@@ -0,0 +1,4 @@ -+/* $Id: patchlevel.h 1946 2006-08-10 10:10:17Z ajmee $ */ -+ -+#define VERSION "2.4.4" -+#define DATE "28 June 2006" -Index: src/external/2.4.4b1/pppd/ipcp.h -=================================================================== ---- src/external/2.4.4b1/pppd/ipcp.h (revision 0) -+++ src/external/2.4.4b1/pppd/ipcp.h (revision 0) -@@ -0,0 +1,96 @@ -+/* -+ * ipcp.h - IP Control Protocol definitions. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: ipcp.h 1930 2006-08-05 21:57:03Z ajmee $ -+ */ -+ -+/* -+ * Options. -+ */ -+#define CI_ADDRS 1 /* IP Addresses */ -+#define CI_COMPRESSTYPE 2 /* Compression Type */ -+#define CI_ADDR 3 -+ -+#define CI_MS_DNS1 129 /* Primary DNS value */ -+#define CI_MS_WINS1 130 /* Primary WINS value */ -+#define CI_MS_DNS2 131 /* Secondary DNS value */ -+#define CI_MS_WINS2 132 /* Secondary WINS value */ -+ -+#define MAX_STATES 16 /* from slcompress.h */ -+ -+#define IPCP_VJMODE_OLD 1 /* "old" mode (option # = 0x0037) */ -+#define IPCP_VJMODE_RFC1172 2 /* "old-rfc"mode (option # = 0x002d) */ -+#define IPCP_VJMODE_RFC1332 3 /* "new-rfc"mode (option # = 0x002d, */ -+ /* maxslot and slot number compression) */ -+ -+#define IPCP_VJ_COMP 0x002d /* current value for VJ compression option*/ -+#define IPCP_VJ_COMP_OLD 0x0037 /* "old" (i.e, broken) value for VJ */ -+ /* compression option*/ -+ -+typedef struct ipcp_options { -+ bool neg_addr; /* Negotiate IP Address? */ -+ bool old_addrs; /* Use old (IP-Addresses) option? */ -+ bool req_addr; /* Ask peer to send IP address? */ -+ bool default_route; /* Assign default route through interface? */ -+ bool proxy_arp; /* Make proxy ARP entry for peer? */ -+ bool neg_vj; /* Van Jacobson Compression? */ -+ bool old_vj; /* use old (short) form of VJ option? */ -+ bool accept_local; /* accept peer's value for ouraddr */ -+ bool accept_remote; /* accept peer's value for hisaddr */ -+ bool req_dns1; /* Ask peer to send primary DNS address? */ -+ bool req_dns2; /* Ask peer to send secondary DNS address? */ -+ int vj_protocol; /* protocol value to use in VJ option */ -+ int maxslotindex; /* values for RFC1332 VJ compression neg. */ -+ bool cflag; -+ u_int32_t ouraddr, hisaddr; /* Addresses in NETWORK BYTE ORDER */ -+ u_int32_t dnsaddr[2]; /* Primary and secondary MS DNS entries */ -+ u_int32_t winsaddr[2]; /* Primary and secondary MS WINS entries */ -+} ipcp_options; -+ -+extern fsm ipcp_fsm[]; -+extern ipcp_options ipcp_wantoptions[]; -+extern ipcp_options ipcp_gotoptions[]; -+extern ipcp_options ipcp_allowoptions[]; -+extern ipcp_options ipcp_hisoptions[]; -+ -+char *ip_ntoa __P((u_int32_t)); -+ -+extern struct protent ipcp_protent; -Index: src/external/2.4.4b1/pppd/pppd.h -=================================================================== ---- src/external/2.4.4b1/pppd/pppd.h (revision 0) -+++ src/external/2.4.4b1/pppd/pppd.h (revision 0) -@@ -0,0 +1,907 @@ -+/* -+ * pppd.h - PPP daemon global declarations. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: pppd.h 1930 2006-08-05 21:57:03Z ajmee $ -+ */ -+ -+/* -+ * TODO: -+ */ -+ -+#ifndef __PPPD_H__ -+#define __PPPD_H__ -+ -+#include <stdio.h> /* for FILE */ -+#include <limits.h> /* for NGROUPS_MAX */ -+#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */ -+#include <sys/types.h> /* for u_int32_t, if defined */ -+#include <sys/time.h> /* for struct timeval */ -+#include <net/ppp_defs.h> -+#include "patchlevel.h" -+ -+#if defined(__STDC__) -+#include <stdarg.h> -+#define __V(x) x -+#else -+#include <varargs.h> -+#define __V(x) (va_alist) va_dcl -+#define const -+#define volatile -+#endif -+ -+#ifdef INET6 -+#include "eui64.h" -+#endif -+ -+/* -+ * Limits. -+ */ -+ -+#define NUM_PPP 1 /* One PPP interface supported (per process) */ -+#define MAXWORDLEN 1024 /* max length of word in file (incl null) */ -+#define MAXARGS 1 /* max # args to a command */ -+#define MAXNAMELEN 256 /* max length of hostname or name for auth */ -+#define MAXSECRETLEN 256 /* max length of password or secret */ -+ -+/* -+ * Option descriptor structure. -+ */ -+ -+typedef unsigned char bool; -+ -+enum opt_type { -+ o_special_noarg = 0, -+ o_special = 1, -+ o_bool, -+ o_int, -+ o_uint32, -+ o_string, -+ o_wild -+}; -+ -+typedef struct { -+ char *name; /* name of the option */ -+ enum opt_type type; -+ void *addr; -+ char *description; -+ unsigned int flags; -+ void *addr2; -+ int upper_limit; -+ int lower_limit; -+ const char *source; -+ short int priority; -+ short int winner; -+} option_t; -+ -+/* Values for flags */ -+#define OPT_VALUE 0xff /* mask for presupplied value */ -+#define OPT_HEX 0x100 /* int option is in hex */ -+#define OPT_NOARG 0x200 /* option doesn't take argument */ -+#define OPT_OR 0x400 /* OR in argument to value */ -+#define OPT_INC 0x800 /* increment value */ -+#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */ -+#define OPT_PRIV 0x1000 /* privileged option */ -+#define OPT_STATIC 0x2000 /* string option goes into static array */ -+#define OPT_LLIMIT 0x4000 /* check value against lower limit */ -+#define OPT_ULIMIT 0x8000 /* check value against upper limit */ -+#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT) -+#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */ -+#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */ -+#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */ -+#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */ -+#define OPT_NOINCR 0x20000 /* value mustn't be increased */ -+#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */ -+#define OPT_PRIO 0x80000 /* process option priorities for this option */ -+#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */ -+#define OPT_ALIAS 0x200000 /* option is alias for previous option */ -+#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */ -+#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */ -+#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */ -+#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */ -+#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */ -+#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */ -+#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV) -+#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */ -+#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */ -+#define OPT_NOPRINT 0x40000000 /* don't print this option at all */ -+ -+#define OPT_VAL(x) ((x) & OPT_VALUE) -+ -+/* Values for priority */ -+#define OPRIO_DEFAULT 0 /* a default value */ -+#define OPRIO_CFGFILE 1 /* value from a configuration file */ -+#define OPRIO_CMDLINE 2 /* value from the command line */ -+#define OPRIO_SECFILE 3 /* value from options in a secrets file */ -+#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */ -+ -+#ifndef GIDSET_TYPE -+#define GIDSET_TYPE gid_t -+#endif -+ -+/* Structure representing a list of permitted IP addresses. */ -+struct permitted_ip { -+ int permit; /* 1 = permit, 0 = forbid */ -+ u_int32_t base; /* match if (addr & mask) == base */ -+ u_int32_t mask; /* base and mask are in network byte order */ -+}; -+ -+/* -+ * Unfortunately, the linux kernel driver uses a different structure -+ * for statistics from the rest of the ports. -+ * This structure serves as a common representation for the bits -+ * pppd needs. -+ */ -+struct pppd_stats { -+ unsigned int bytes_in; -+ unsigned int bytes_out; -+ unsigned int pkts_in; -+ unsigned int pkts_out; -+}; -+ -+/* Used for storing a sequence of words. Usually malloced. */ -+struct wordlist { -+ struct wordlist *next; -+ char *word; -+}; -+ -+/* An endpoint discriminator, used with multilink. */ -+#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */ -+struct epdisc { -+ unsigned char class; -+ unsigned char length; -+ unsigned char value[MAX_ENDP_LEN]; -+}; -+ -+/* values for epdisc.class */ -+#define EPD_NULL 0 /* null discriminator, no data */ -+#define EPD_LOCAL 1 -+#define EPD_IP 2 -+#define EPD_MAC 3 -+#define EPD_MAGIC 4 -+#define EPD_PHONENUM 5 -+ -+typedef void (*notify_func) __P((void *, int)); -+ -+struct notifier { -+ struct notifier *next; -+ notify_func func; -+ void *arg; -+}; -+ -+/* -+ * Global variables. -+ */ -+ -+extern int hungup; /* Physical layer has disconnected */ -+extern int ifunit; /* Interface unit number */ -+extern char ifname[]; /* Interface name */ -+extern char hostname[]; /* Our hostname */ -+extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ -+extern int devfd; /* fd of underlying device */ -+extern int fd_ppp; /* fd for talking PPP */ -+extern int phase; /* Current state of link - see values below */ -+extern int baud_rate; /* Current link speed in bits/sec */ -+extern char *progname; /* Name of this program */ -+extern int redirect_stderr;/* Connector's stderr should go to file */ -+extern char peer_authname[];/* Authenticated name of peer */ -+extern int auth_done[NUM_PPP]; /* Methods actually used for auth */ -+extern int privileged; /* We were run by real-uid root */ -+extern int need_holdoff; /* Need holdoff period after link terminates */ -+extern char **script_env; /* Environment variables for scripts */ -+extern int detached; /* Have detached from controlling tty */ -+extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */ -+extern int ngroups; /* How many groups valid in groups */ -+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */ -+extern int link_stats_valid; /* set if link_stats is valid */ -+extern unsigned link_connect_time; /* time the link was up for */ -+extern int using_pty; /* using pty as device (notty or pty opt.) */ -+extern int log_to_fd; /* logging to this fd as well as syslog */ -+extern bool log_default; /* log_to_fd is default (stdout) */ -+extern char *no_ppp_msg; /* message to print if ppp not in kernel */ -+extern volatile int status; /* exit status for pppd */ -+extern bool devnam_fixed; /* can no longer change devnam */ -+extern int unsuccess; /* # unsuccessful connection attempts */ -+extern int do_callback; /* set if we want to do callback next */ -+extern int doing_callback; /* set if this is a callback */ -+extern int error_count; /* # of times error() has been called */ -+extern char ppp_devnam[MAXPATHLEN]; -+extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */ -+extern int ppp_session_number; /* Session number (eg PPPoE session) */ -+extern int fd_devnull; /* fd open to /dev/null */ -+ -+extern int listen_time; /* time to listen first (ms) */ -+extern bool doing_multilink; -+extern bool multilink_master; -+extern bool bundle_eof; -+extern bool bundle_terminating; -+ -+extern struct notifier *pidchange; /* for notifications of pid changing */ -+extern struct notifier *phasechange; /* for notifications of phase changes */ -+extern struct notifier *exitnotify; /* for notification that we're exiting */ -+extern struct notifier *sigreceived; /* notification of received signal */ -+extern struct notifier *ip_up_notifier; /* IPCP has come up */ -+extern struct notifier *ip_down_notifier; /* IPCP has gone down */ -+extern struct notifier *auth_up_notifier; /* peer has authenticated */ -+extern struct notifier *link_down_notifier; /* link has gone down */ -+extern struct notifier *fork_notifier; /* we are a new child process */ -+ -+/* Values for do_callback and doing_callback */ -+#define CALLBACK_DIALIN 1 /* we are expecting the call back */ -+#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */ -+ -+/* -+ * Variables set by command-line options. -+ */ -+ -+extern int debug; /* Debug flag */ -+extern int kdebugflag; /* Tell kernel to print debug messages */ -+extern int default_device; /* Using /dev/tty or equivalent */ -+extern char devnam[MAXPATHLEN]; /* Device name */ -+extern int crtscts; /* Use hardware flow control */ -+extern bool modem; /* Use modem control lines */ -+extern int inspeed; /* Input/Output speed requested */ -+extern u_int32_t netmask; /* IP netmask to set on interface */ -+extern bool lockflag; /* Create lock file to lock the serial dev */ -+extern bool nodetach; /* Don't detach from controlling tty */ -+extern bool updetach; /* Detach from controlling tty when link up */ -+extern char *initializer; /* Script to initialize physical link */ -+extern char *connect_script; /* Script to establish physical link */ -+extern char *disconnect_script; /* Script to disestablish physical link */ -+extern char *welcomer; /* Script to welcome client after connection */ -+extern char *ptycommand; /* Command to run on other side of pty */ -+extern int maxconnect; /* Maximum connect time (seconds) */ -+extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */ -+extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */ -+extern bool auth_required; /* Peer is required to authenticate */ -+extern bool persist; /* Reopen link after it goes down */ -+extern bool uselogin; /* Use /etc/passwd for checking PAP */ -+extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */ -+extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ -+extern bool explicit_remote;/* remote_name specified with remotename opt */ -+extern bool demand; /* Do dial-on-demand */ -+extern char *ipparam; /* Extra parameter for ip up/down scripts */ -+extern bool cryptpap; /* Others' PAP passwords are encrypted */ -+extern int idle_time_limit;/* Shut down link if idle for this long */ -+extern int holdoff; /* Dead time before restarting */ -+extern bool holdoff_specified; /* true if user gave a holdoff value */ -+extern bool notty; /* Stdin/out is not a tty */ -+extern char *pty_socket; /* Socket to connect to pty */ -+extern char *record_file; /* File to record chars sent/received */ -+extern bool sync_serial; /* Device is synchronous serial device */ -+extern int maxfail; /* Max # of unsuccessful connection attempts */ -+extern char linkname[MAXPATHLEN]; /* logical name for link */ -+extern bool tune_kernel; /* May alter kernel settings as necessary */ -+extern int connect_delay; /* Time to delay after connect script */ -+extern int max_data_rate; /* max bytes/sec through charshunt */ -+extern int req_unit; /* interface unit number to use */ -+extern bool multilink; /* enable multilink operation */ -+extern bool noendpoint; /* don't send or accept endpt. discrim. */ -+extern char *bundle_name; /* bundle name for multilink */ -+extern bool dump_options; /* print out option values */ -+extern bool dryrun; /* check everything, print options, exit */ -+extern int child_wait; /* # seconds to wait for children at end */ -+ -+#ifdef MAXOCTETS -+extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ -+extern int maxoctets_dir; /* Direction : -+ 0 - in+out (default) -+ 1 - in -+ 2 - out -+ 3 - max(in,out) */ -+extern int maxoctets_timeout; /* Timeout for check of octets limit */ -+#define PPP_OCTETS_DIRECTION_SUM 0 -+#define PPP_OCTETS_DIRECTION_IN 1 -+#define PPP_OCTETS_DIRECTION_OUT 2 -+#define PPP_OCTETS_DIRECTION_MAXOVERAL 3 -+/* same as previos, but little different on RADIUS side */ -+#define PPP_OCTETS_DIRECTION_MAXSESSION 4 -+#endif -+ -+#ifdef PPP_FILTER -+extern struct bpf_program pass_filter; /* Filter for pkts to pass */ -+extern struct bpf_program active_filter; /* Filter for link-active pkts */ -+#endif -+ -+#ifdef MSLANMAN -+extern bool ms_lanman; /* Use LanMan password instead of NT */ -+ /* Has meaning only with MS-CHAP challenges */ -+#endif -+ -+/* Values for auth_pending, auth_done */ -+#define PAP_WITHPEER 0x1 -+#define PAP_PEER 0x2 -+#define CHAP_WITHPEER 0x4 -+#define CHAP_PEER 0x8 -+#define EAP_WITHPEER 0x10 -+#define EAP_PEER 0x20 -+ -+/* Values for auth_done only */ -+#define CHAP_MD5_WITHPEER 0x40 -+#define CHAP_MD5_PEER 0x80 -+#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */ -+#define CHAP_MS_WITHPEER 0x100 -+#define CHAP_MS_PEER 0x200 -+#define CHAP_MS2_WITHPEER 0x400 -+#define CHAP_MS2_PEER 0x800 -+ -+extern char *current_option; /* the name of the option being parsed */ -+extern int privileged_option; /* set iff the current option came from root */ -+extern char *option_source; /* string saying where the option came from */ -+extern int option_priority; /* priority of current options */ -+ -+/* -+ * Values for phase. -+ */ -+#define PHASE_DEAD 0 -+#define PHASE_INITIALIZE 1 -+#define PHASE_SERIALCONN 2 -+#define PHASE_DORMANT 3 -+#define PHASE_ESTABLISH 4 -+#define PHASE_AUTHENTICATE 5 -+#define PHASE_CALLBACK 6 -+#define PHASE_NETWORK 7 -+#define PHASE_RUNNING 8 -+#define PHASE_TERMINATE 9 -+#define PHASE_DISCONNECT 10 -+#define PHASE_HOLDOFF 11 -+#define PHASE_MASTER 12 -+ -+/* -+ * The following struct gives the addresses of procedures to call -+ * for a particular protocol. -+ */ -+struct protent { -+ u_short protocol; /* PPP protocol number */ -+ /* Initialization procedure */ -+ void (*init) __P((int unit)); -+ /* Process a received packet */ -+ void (*input) __P((int unit, u_char *pkt, int len)); -+ /* Process a received protocol-reject */ -+ void (*protrej) __P((int unit)); -+ /* Lower layer has come up */ -+ void (*lowerup) __P((int unit)); -+ /* Lower layer has gone down */ -+ void (*lowerdown) __P((int unit)); -+ /* Open the protocol */ -+ void (*open) __P((int unit)); -+ /* Close the protocol */ -+ void (*close) __P((int unit, char *reason)); -+ /* Print a packet in readable form */ -+ int (*printpkt) __P((u_char *pkt, int len, -+ void (*printer) __P((void *, char *, ...)), -+ void *arg)); -+ /* Process a received data packet */ -+ void (*datainput) __P((int unit, u_char *pkt, int len)); -+ bool enabled_flag; /* 0 iff protocol is disabled */ -+ char *name; /* Text name of protocol */ -+ char *data_name; /* Text name of corresponding data protocol */ -+ option_t *options; /* List of command-line options */ -+ /* Check requested options, assign defaults */ -+ void (*check_options) __P((void)); -+ /* Configure interface for demand-dial */ -+ int (*demand_conf) __P((int unit)); -+ /* Say whether to bring up link for this pkt */ -+ int (*active_pkt) __P((u_char *pkt, int len)); -+}; -+ -+/* Table of pointers to supported protocols */ -+extern struct protent *protocols[]; -+ -+/* -+ * This struct contains pointers to a set of procedures for -+ * doing operations on a "channel". A channel provides a way -+ * to send and receive PPP packets - the canonical example is -+ * a serial port device in PPP line discipline (or equivalently -+ * with PPP STREAMS modules pushed onto it). -+ */ -+struct channel { -+ /* set of options for this channel */ -+ option_t *options; -+ /* find and process a per-channel options file */ -+ void (*process_extra_options) __P((void)); -+ /* check all the options that have been given */ -+ void (*check_options) __P((void)); -+ /* get the channel ready to do PPP, return a file descriptor */ -+ int (*connect) __P((void)); -+ /* we're finished with the channel */ -+ void (*disconnect) __P((void)); -+ /* put the channel into PPP `mode' */ -+ int (*establish_ppp) __P((int)); -+ /* take the channel out of PPP `mode', restore loopback if demand */ -+ void (*disestablish_ppp) __P((int)); -+ /* set the transmit-side PPP parameters of the channel */ -+ void (*send_config) __P((int, u_int32_t, int, int)); -+ /* set the receive-side PPP parameters of the channel */ -+ void (*recv_config) __P((int, u_int32_t, int, int)); -+ /* cleanup on error or normal exit */ -+ void (*cleanup) __P((void)); -+ /* close the device, called in children after fork */ -+ void (*close) __P((void)); -+}; -+ -+extern struct channel *the_channel; -+ -+/* -+ * Prototypes. -+ */ -+ -+/* Procedures exported from main.c. */ -+void set_ifunit __P((int)); /* set stuff that depends on ifunit */ -+void detach __P((void)); /* Detach from controlling tty */ -+void die __P((int)); /* Cleanup and exit */ -+void quit __P((void)); /* like die(1) */ -+void novm __P((char *)); /* Say we ran out of memory, and die */ -+void timeout __P((void (*func)(void *), void *arg, int s, int us)); -+ /* Call func(arg) after s.us seconds */ -+void untimeout __P((void (*func)(void *), void *arg)); -+ /* Cancel call to func(arg) */ -+void record_child __P((int, char *, void (*) (void *), void *)); -+pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */ -+int device_script __P((char *cmd, int in, int out, int dont_wait)); -+ /* Run `cmd' with given stdin and stdout */ -+pid_t run_program __P((char *prog, char **args, int must_exist, -+ void (*done)(void *), void *arg, int wait)); -+ /* Run program prog with args in child */ -+void reopen_log __P((void)); /* (re)open the connection to syslog */ -+void print_link_stats __P((void)); /* Print stats, if available */ -+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */ -+void update_link_stats __P((int)); /* Get stats at link termination */ -+void script_setenv __P((char *, char *, int)); /* set script env var */ -+void script_unsetenv __P((char *)); /* unset script env var */ -+void new_phase __P((int)); /* signal start of new phase */ -+void add_notifier __P((struct notifier **, notify_func, void *)); -+void remove_notifier __P((struct notifier **, notify_func, void *)); -+void notify __P((struct notifier *, int)); -+int ppp_send_config __P((int, int, u_int32_t, int, int)); -+int ppp_recv_config __P((int, int, u_int32_t, int, int)); -+const char *protocol_name __P((int)); -+void remove_pidfiles __P((void)); -+void lock_db __P((void)); -+void unlock_db __P((void)); -+ -+/* Procedures exported from tty.c. */ -+void tty_init __P((void)); -+ -+/* Procedures exported from utils.c. */ -+void log_packet __P((u_char *, int, char *, int)); -+ /* Format a packet and log it with syslog */ -+void print_string __P((char *, int, void (*) (void *, char *, ...), -+ void *)); /* Format a string for output */ -+int slprintf __P((char *, int, char *, ...)); /* sprintf++ */ -+int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */ -+size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */ -+size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */ -+void dbglog __P((char *, ...)); /* log a debug message */ -+void info __P((char *, ...)); /* log an informational message */ -+void notice __P((char *, ...)); /* log a notice-level message */ -+void warn __P((char *, ...)); /* log a warning message */ -+void error __P((char *, ...)); /* log an error message */ -+void fatal __P((char *, ...)); /* log an error message and die(1) */ -+void init_pr_log __P((char *, int)); /* initialize for using pr_log */ -+void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */ -+void end_pr_log __P((void)); /* finish up after using pr_log */ -+void dump_packet __P((const char *, u_char *, int)); -+ /* dump packet to debug log if interesting */ -+ssize_t complete_read __P((int, void *, size_t)); -+ /* read a complete buffer */ -+ -+/* Procedures exported from auth.c */ -+void link_required __P((int)); /* we are starting to use the link */ -+void start_link __P((int)); /* bring the link up now */ -+void link_terminated __P((int)); /* we are finished with the link */ -+void link_down __P((int)); /* the LCP layer has left the Opened state */ -+void upper_layers_down __P((int));/* take all NCPs down */ -+void link_established __P((int)); /* the link is up; authenticate now */ -+void start_networks __P((int)); /* start all the network control protos */ -+void continue_networks __P((int)); /* start network [ip, etc] control protos */ -+void np_up __P((int, int)); /* a network protocol has come up */ -+void np_down __P((int, int)); /* a network protocol has gone down */ -+void np_finished __P((int, int)); /* a network protocol no longer needs link */ -+void auth_peer_fail __P((int, int)); -+ /* peer failed to authenticate itself */ -+void auth_peer_success __P((int, int, int, char *, int)); -+ /* peer successfully authenticated itself */ -+void auth_withpeer_fail __P((int, int)); -+ /* we failed to authenticate ourselves */ -+void auth_withpeer_success __P((int, int, int)); -+ /* we successfully authenticated ourselves */ -+void auth_check_options __P((void)); -+ /* check authentication options supplied */ -+void auth_reset __P((int)); /* check what secrets we have */ -+int check_passwd __P((int, char *, int, char *, int, char **)); -+ /* Check peer-supplied username/password */ -+int get_secret __P((int, char *, char *, char *, int *, int)); -+ /* get "secret" for chap */ -+int get_srp_secret __P((int unit, char *client, char *server, char *secret, -+ int am_server)); -+int auth_ip_addr __P((int, u_int32_t)); -+ /* check if IP address is authorized */ -+int auth_number __P((void)); /* check if remote number is authorized */ -+int bad_ip_adrs __P((u_int32_t)); -+ /* check if IP address is unreasonable */ -+ -+/* Procedures exported from demand.c */ -+void demand_conf __P((void)); /* config interface(s) for demand-dial */ -+void demand_block __P((void)); /* set all NPs to queue up packets */ -+void demand_unblock __P((void)); /* set all NPs to pass packets */ -+void demand_discard __P((void)); /* set all NPs to discard packets */ -+void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ -+int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ -+int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ -+ -+/* Procedures exported from multilink.c */ -+#ifdef HAVE_MULTILINK -+void mp_check_options __P((void)); /* Check multilink-related options */ -+int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */ -+void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */ -+void mp_bundle_terminated __P((void)); -+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */ -+int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */ -+#else -+#define mp_bundle_terminated() /* nothing */ -+#define mp_exit_bundle() /* nothing */ -+#define doing_multilink 0 -+#define multilink_master 0 -+#endif -+ -+/* Procedures exported from sys-*.c */ -+void sys_init __P((void)); /* Do system-dependent initialization */ -+void sys_cleanup __P((void)); /* Restore system state before exiting */ -+int sys_check_options __P((void)); /* Check options specified */ -+void sys_close __P((void)); /* Clean up in a child before execing */ -+int ppp_available __P((void)); /* Test whether ppp kernel support exists */ -+int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */ -+int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ -+int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */ -+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */ -+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */ -+int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */ -+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */ -+int bundle_attach __P((int)); /* Attach link to existing bundle */ -+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */ -+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */ -+void clean_check __P((void)); /* Check if line was 8-bit clean */ -+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ -+void restore_tty __P((int)); /* Restore port's original parameters */ -+void setdtr __P((int, int)); /* Raise or lower port's DTR line */ -+void output __P((int, u_char *, int)); /* Output a PPP packet */ -+void wait_input __P((struct timeval *)); -+ /* Wait for input, with timeout */ -+void add_fd __P((int)); /* Add fd to set to wait for */ -+void remove_fd __P((int)); /* Remove fd from set to wait for */ -+int read_packet __P((u_char *)); /* Read PPP packet */ -+int get_loop_output __P((void)); /* Read pkts from loopback */ -+void tty_send_config __P((int, u_int32_t, int, int)); -+ /* Configure i/f transmit parameters */ -+void tty_set_xaccm __P((ext_accm)); -+ /* Set extended transmit ACCM */ -+void tty_recv_config __P((int, u_int32_t, int, int)); -+ /* Configure i/f receive parameters */ -+int ccp_test __P((int, u_char *, int, int)); -+ /* Test support for compression scheme */ -+void ccp_flags_set __P((int, int, int)); -+ /* Set kernel CCP state */ -+int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ -+int get_idle_time __P((int, struct ppp_idle *)); -+ /* Find out how long link has been idle */ -+int get_ppp_stats __P((int, struct pppd_stats *)); -+ /* Return link statistics */ -+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */ -+int netif_get_mtu __P((int)); /* Get PPP interface MTU */ -+int sifvjcomp __P((int, int, int, int)); -+ /* Configure VJ TCP header compression */ -+int sifup __P((int)); /* Configure i/f up for one protocol */ -+int sifnpmode __P((int u, int proto, enum NPmode mode)); -+ /* Set mode for handling packets for proto */ -+int sifdown __P((int)); /* Configure i/f down for one protocol */ -+int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); -+ /* Configure IPv4 addresses for i/f */ -+int cifaddr __P((int, u_int32_t, u_int32_t)); -+ /* Reset i/f IP addresses */ -+#ifdef INET6 -+int sif6addr __P((int, eui64_t, eui64_t)); -+ /* Configure IPv6 addresses for i/f */ -+int cif6addr __P((int, eui64_t, eui64_t)); -+ /* Remove an IPv6 address from i/f */ -+#endif -+int sifdefaultroute __P((int, u_int32_t, u_int32_t)); -+ /* Create default route through i/f */ -+int cifdefaultroute __P((int, u_int32_t, u_int32_t)); -+ /* Delete default route through i/f */ -+int sifproxyarp __P((int, u_int32_t)); -+ /* Add proxy ARP entry for peer */ -+int cifproxyarp __P((int, u_int32_t)); -+ /* Delete proxy ARP entry for peer */ -+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ -+int lock __P((char *)); /* Create lock file for device */ -+int relock __P((int)); /* Rewrite lock file with new pid */ -+void unlock __P((void)); /* Delete previously-created lock file */ -+void logwtmp __P((const char *, const char *, const char *)); -+ /* Write entry to wtmp file */ -+int get_host_seed __P((void)); /* Get host-dependent random number seed */ -+int have_route_to __P((u_int32_t)); /* Check if route to addr exists */ -+#ifdef PPP_FILTER -+int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); -+ /* Set filter programs in kernel */ -+#endif -+#ifdef IPX_CHANGE -+int sipxfaddr __P((int, unsigned long, unsigned char *)); -+int cipxfaddr __P((int)); -+#endif -+int get_if_hwaddr __P((u_char *addr, char *name)); -+char *get_first_ethernet __P((void)); -+ -+/* Procedures exported from options.c */ -+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ -+int parse_args __P((int argc, char **argv)); -+ /* Parse options from arguments given */ -+int options_from_file __P((char *filename, int must_exist, int check_prot, -+ int privileged)); -+ /* Parse options from an options file */ -+int options_from_user __P((void)); /* Parse options from user's .ppprc */ -+int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ -+int options_from_list __P((struct wordlist *, int privileged)); -+ /* Parse options from a wordlist */ -+int getword __P((FILE *f, char *word, int *newlinep, char *filename)); -+ /* Read a word from a file */ -+void option_error __P((char *fmt, ...)); -+ /* Print an error message about an option */ -+int int_option __P((char *, int *)); -+ /* Simplified number_option for decimal ints */ -+void add_options __P((option_t *)); /* Add extra options */ -+void check_options __P((void)); /* check values after all options parsed */ -+int override_value __P((const char *, int, const char *)); -+ /* override value if permitted by priority */ -+void print_options __P((void (*) __P((void *, char *, ...)), void *)); -+ /* print out values of all options */ -+ -+int parse_dotted_ip __P((char *, u_int32_t *)); -+ -+/* -+ * Hooks to enable plugins to change various things. -+ */ -+extern int (*new_phase_hook) __P((int)); -+extern int (*idle_time_hook) __P((struct ppp_idle *)); -+extern int (*holdoff_hook) __P((void)); -+extern int (*pap_check_hook) __P((void)); -+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, -+ struct wordlist **paddrs, -+ struct wordlist **popts)); -+extern void (*pap_logout_hook) __P((void)); -+extern int (*pap_passwd_hook) __P((char *user, char *passwd)); -+extern int (*allowed_address_hook) __P((u_int32_t addr)); -+extern void (*ip_up_hook) __P((void)); -+extern void (*ip_down_hook) __P((void)); -+extern void (*ip_choose_hook) __P((u_int32_t *)); -+ -+extern int (*chap_check_hook) __P((void)); -+extern int (*chap_passwd_hook) __P((char *user, char *passwd)); -+ -+/* Let a plugin snoop sent and received packets. Useful for L2TP */ -+extern void (*snoop_recv_hook) __P((unsigned char *p, int len)); -+extern void (*snoop_send_hook) __P((unsigned char *p, int len)); -+ -+/* -+ * Inline versions of get/put char/short/long. -+ * Pointer is advanced; we assume that both arguments -+ * are lvalues and will already be in registers. -+ * cp MUST be u_char *. -+ */ -+#define GETCHAR(c, cp) { \ -+ (c) = *(cp)++; \ -+} -+#define PUTCHAR(c, cp) { \ -+ *(cp)++ = (u_char) (c); \ -+} -+ -+ -+#define GETSHORT(s, cp) { \ -+ (s) = *(cp)++ << 8; \ -+ (s) |= *(cp)++; \ -+} -+#define PUTSHORT(s, cp) { \ -+ *(cp)++ = (u_char) ((s) >> 8); \ -+ *(cp)++ = (u_char) (s); \ -+} -+ -+#define GETLONG(l, cp) { \ -+ (l) = *(cp)++ << 8; \ -+ (l) |= *(cp)++; (l) <<= 8; \ -+ (l) |= *(cp)++; (l) <<= 8; \ -+ (l) |= *(cp)++; \ -+} -+#define PUTLONG(l, cp) { \ -+ *(cp)++ = (u_char) ((l) >> 24); \ -+ *(cp)++ = (u_char) ((l) >> 16); \ -+ *(cp)++ = (u_char) ((l) >> 8); \ -+ *(cp)++ = (u_char) (l); \ -+} -+ -+#define INCPTR(n, cp) ((cp) += (n)) -+#define DECPTR(n, cp) ((cp) -= (n)) -+ -+/* -+ * System dependent definitions for user-level 4.3BSD UNIX implementation. -+ */ -+ -+#define TIMEOUT(r, f, t) timeout((r), (f), (t), 0) -+#define UNTIMEOUT(r, f) untimeout((r), (f)) -+ -+#define BCOPY(s, d, l) memcpy(d, s, l) -+#define BZERO(s, n) memset(s, 0, n) -+#define BCMP(s1, s2, l) memcmp(s1, s2, l) -+ -+#define PRINTMSG(m, l) { info("Remote message: %0.*v", l, m); } -+ -+/* -+ * MAKEHEADER - Add Header fields to a packet. -+ */ -+#define MAKEHEADER(p, t) { \ -+ PUTCHAR(PPP_ALLSTATIONS, p); \ -+ PUTCHAR(PPP_UI, p); \ -+ PUTSHORT(t, p); } -+ -+/* -+ * Exit status values. -+ */ -+#define EXIT_OK 0 -+#define EXIT_FATAL_ERROR 1 -+#define EXIT_OPTION_ERROR 2 -+#define EXIT_NOT_ROOT 3 -+#define EXIT_NO_KERNEL_SUPPORT 4 -+#define EXIT_USER_REQUEST 5 -+#define EXIT_LOCK_FAILED 6 -+#define EXIT_OPEN_FAILED 7 -+#define EXIT_CONNECT_FAILED 8 -+#define EXIT_PTYCMD_FAILED 9 -+#define EXIT_NEGOTIATION_FAILED 10 -+#define EXIT_PEER_AUTH_FAILED 11 -+#define EXIT_IDLE_TIMEOUT 12 -+#define EXIT_CONNECT_TIME 13 -+#define EXIT_CALLBACK 14 -+#define EXIT_PEER_DEAD 15 -+#define EXIT_HANGUP 16 -+#define EXIT_LOOPBACK 17 -+#define EXIT_INIT_FAILED 18 -+#define EXIT_AUTH_TOPEER_FAILED 19 -+#ifdef MAXOCTETS -+#define EXIT_TRAFFIC_LIMIT 20 -+#endif -+#define EXIT_CNID_AUTH_FAILED 21 -+ -+/* -+ * Debug macros. Slightly useful for finding bugs in pppd, not particularly -+ * useful for finding out why your connection isn't being established. -+ */ -+#ifdef DEBUGALL -+#define DEBUGMAIN 1 -+#define DEBUGFSM 1 -+#define DEBUGLCP 1 -+#define DEBUGIPCP 1 -+#define DEBUGIPV6CP 1 -+#define DEBUGUPAP 1 -+#define DEBUGCHAP 1 -+#endif -+ -+#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */ -+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \ -+ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \ -+ || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) -+#define LOG_PPP LOG_LOCAL2 -+#else -+#define LOG_PPP LOG_DAEMON -+#endif -+#endif /* LOG_PPP */ -+ -+#ifdef DEBUGMAIN -+#define MAINDEBUG(x) if (debug) dbglog x -+#else -+#define MAINDEBUG(x) -+#endif -+ -+#ifdef DEBUGSYS -+#define SYSDEBUG(x) if (debug) dbglog x -+#else -+#define SYSDEBUG(x) -+#endif -+ -+#ifdef DEBUGFSM -+#define FSMDEBUG(x) if (debug) dbglog x -+#else -+#define FSMDEBUG(x) -+#endif -+ -+#ifdef DEBUGLCP -+#define LCPDEBUG(x) if (debug) dbglog x -+#else -+#define LCPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPCP -+#define IPCPDEBUG(x) if (debug) dbglog x -+#else -+#define IPCPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPV6CP -+#define IPV6CPDEBUG(x) if (debug) dbglog x -+#else -+#define IPV6CPDEBUG(x) -+#endif -+ -+#ifdef DEBUGUPAP -+#define UPAPDEBUG(x) if (debug) dbglog x -+#else -+#define UPAPDEBUG(x) -+#endif -+ -+#ifdef DEBUGCHAP -+#define CHAPDEBUG(x) if (debug) dbglog x -+#else -+#define CHAPDEBUG(x) -+#endif -+ -+#ifdef DEBUGIPXCP -+#define IPXCPDEBUG(x) if (debug) dbglog x -+#else -+#define IPXCPDEBUG(x) -+#endif -+ -+#ifndef SIGTYPE -+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) -+#define SIGTYPE void -+#else -+#define SIGTYPE int -+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */ -+#endif /* SIGTYPE */ -+ -+#ifndef MIN -+#define MIN(a, b) ((a) < (b)? (a): (b)) -+#endif -+#ifndef MAX -+#define MAX(a, b) ((a) > (b)? (a): (b)) -+#endif -+ -+#ifndef offsetof -+#define offsetof(type, member) ((size_t) &((type *)0)->member) -+#endif -+ -+#endif /* __PPP_H__ */ -Index: src/external/2.4.4b1/pppd/fsm.h -=================================================================== ---- src/external/2.4.4b1/pppd/fsm.h (revision 0) -+++ src/external/2.4.4b1/pppd/fsm.h (revision 0) -@@ -0,0 +1,168 @@ -+/* -+ * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions. -+ * -+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * 3. The name "Carnegie Mellon University" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For permission or any legal -+ * details, please contact -+ * Office of Technology Transfer -+ * Carnegie Mellon University -+ * 5000 Forbes Avenue -+ * Pittsburgh, PA 15213-3890 -+ * (412) 268-4387, fax: (412) 268-7395 -+ * tech-transfer@andrew.cmu.edu -+ * -+ * 4. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by Computing Services -+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." -+ * -+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO -+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE -+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * $Id: fsm.h 1930 2006-08-05 21:57:03Z ajmee $ -+ */ -+ -+/* -+ * Packet header = Code, id, length. -+ */ -+#define HEADERLEN 4 -+ -+ -+/* -+ * CP (LCP, IPCP, etc.) codes. -+ */ -+#define CONFREQ 1 /* Configuration Request */ -+#define CONFACK 2 /* Configuration Ack */ -+#define CONFNAK 3 /* Configuration Nak */ -+#define CONFREJ 4 /* Configuration Reject */ -+#define TERMREQ 5 /* Termination Request */ -+#define TERMACK 6 /* Termination Ack */ -+#define CODEREJ 7 /* Code Reject */ -+ -+ -+/* -+ * Each FSM is described by an fsm structure and fsm callbacks. -+ */ -+typedef struct fsm { -+ int unit; /* Interface unit number */ -+ int protocol; /* Data Link Layer Protocol field value */ -+ int state; /* State */ -+ int flags; /* Contains option bits */ -+ u_char id; /* Current id */ -+ u_char reqid; /* Current request id */ -+ u_char seen_ack; /* Have received valid Ack/Nak/Rej to Req */ -+ int timeouttime; /* Timeout time in milliseconds */ -+ int maxconfreqtransmits; /* Maximum Configure-Request transmissions */ -+ int retransmits; /* Number of retransmissions left */ -+ int maxtermtransmits; /* Maximum Terminate-Request transmissions */ -+ int nakloops; /* Number of nak loops since last ack */ -+ int rnakloops; /* Number of naks received */ -+ int maxnakloops; /* Maximum number of nak loops tolerated */ -+ struct fsm_callbacks *callbacks; /* Callback routines */ -+ char *term_reason; /* Reason for closing protocol */ -+ int term_reason_len; /* Length of term_reason */ -+} fsm; -+ -+ -+typedef struct fsm_callbacks { -+ void (*resetci) /* Reset our Configuration Information */ -+ __P((fsm *)); -+ int (*cilen) /* Length of our Configuration Information */ -+ __P((fsm *)); -+ void (*addci) /* Add our Configuration Information */ -+ __P((fsm *, u_char *, int *)); -+ int (*ackci) /* ACK our Configuration Information */ -+ __P((fsm *, u_char *, int)); -+ int (*nakci) /* NAK our Configuration Information */ -+ __P((fsm *, u_char *, int, int)); -+ int (*rejci) /* Reject our Configuration Information */ -+ __P((fsm *, u_char *, int)); -+ int (*reqci) /* Request peer's Configuration Information */ -+ __P((fsm *, u_char *, int *, int)); -+ void (*up) /* Called when fsm reaches OPENED state */ -+ __P((fsm *)); -+ void (*down) /* Called when fsm leaves OPENED state */ -+ __P((fsm *)); -+ void (*starting) /* Called when we want the lower layer */ -+ __P((fsm *)); -+ void (*finished) /* Called when we don't want the lower layer */ -+ __P((fsm *)); -+ void (*protreject) /* Called when Protocol-Reject received */ -+ __P((int)); -+ void (*retransmit) /* Retransmission is necessary */ -+ __P((fsm *)); -+ int (*extcode) /* Called when unknown code received */ -+ __P((fsm *, int, int, u_char *, int)); -+ char *proto_name; /* String name for protocol (for messages) */ -+} fsm_callbacks; -+ -+ -+/* -+ * Link states. -+ */ -+#define INITIAL 0 /* Down, hasn't been opened */ -+#define STARTING 1 /* Down, been opened */ -+#define CLOSED 2 /* Up, hasn't been opened */ -+#define STOPPED 3 /* Open, waiting for down event */ -+#define CLOSING 4 /* Terminating the connection, not open */ -+#define STOPPING 5 /* Terminating, but open */ -+#define REQSENT 6 /* We've sent a Config Request */ -+#define ACKRCVD 7 /* We've received a Config Ack */ -+#define ACKSENT 8 /* We've sent a Config Ack */ -+#define OPENED 9 /* Connection available */ -+ -+ -+/* -+ * Flags - indicate options controlling FSM operation -+ */ -+#define OPT_PASSIVE 1 /* Don't die if we don't get a response */ -+#define OPT_RESTART 2 /* Treat 2nd OPEN as DOWN, UP */ -+#define OPT_SILENT 4 /* Wait for peer to speak first */ -+ -+ -+/* -+ * Timeouts. -+ */ -+#define DEFTIMEOUT 3 /* Timeout time in seconds */ -+#define DEFMAXTERMREQS 2 /* Maximum Terminate-Request transmissions */ -+#define DEFMAXCONFREQS 10 /* Maximum Configure-Request transmissions */ -+#define DEFMAXNAKLOOPS 5 /* Maximum number of nak loops */ -+ -+ -+/* -+ * Prototypes -+ */ -+void fsm_init __P((fsm *)); -+void fsm_lowerup __P((fsm *)); -+void fsm_lowerdown __P((fsm *)); -+void fsm_open __P((fsm *)); -+void fsm_close __P((fsm *, char *)); -+void fsm_input __P((fsm *, u_char *, int)); -+void fsm_protreject __P((fsm *)); -+void fsm_sdata __P((fsm *, int, int, u_char *, int)); -+ -+ -+/* -+ * Variables -+ */ -+extern int peer_mru[]; /* currently negotiated peer MRU (per unit) */ -Index: src/external/2.4.4b1/pppd/patchlevel.h -=================================================================== ---- src/external/2.4.4b1/pppd/patchlevel.h (revision 0) -+++ src/external/2.4.4b1/pppd/patchlevel.h (revision 0) -@@ -0,0 +1,4 @@ -+/* $Id: patchlevel.h 1930 2006-08-05 21:57:03Z ajmee $ */ -+ -+#define VERSION "2.4.4b1" -+#define DATE "28 August 2005" -Index: src/nm-pptp-service-pppd-plugin.c -=================================================================== ---- src/nm-pptp-service-pppd-plugin.c (revision 2712) -+++ src/nm-pptp-service-pppd-plugin.c (working copy) -@@ -22,6 +22,11 @@ - #include "pppd/pppd.h" - #include "pppd/fsm.h" - #include "pppd/ipcp.h" -+#ifndef PPPD_VERSION -+ #ifdef VERSION -+ #define PPPD_VERSION VERSION -+ #endif -+#endif - - #include <glib.h> - #include <stdlib.h> -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am (revision 2712) -+++ src/Makefile.am (working copy) -@@ -4,6 +4,7 @@ - $(DBUS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(NETWORK_MANAGER_CFLAGS) \ -+ $(PPPD_CFLAGS) \ - -Wall \ - -DDBUS_API_SUBJECT_TO_CHANGE \ - -DG_DISABLE_DEPRECATED \ -@@ -14,27 +15,34 @@ - -DLIBDIR=\""$(libdir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DLOCALSTATEDIR=\""$(localstatedir)"\" \ -- -DDATADIR=\"$(datadir)\" \ -- -fPIC -+ -DDATADIR=\"$(datadir)\" - --bin_PROGRAMS = nm-pptp-service nm-pptp-service-pppd-plugin.so -+bin_PROGRAMS = nm-pptp-service - - nm_pptp_service_SOURCES = \ - nm-pptp-service.c \ - nm-pptp-service.h \ - nm-utils.c \ - nm-utils.h \ -- pppd/fsm.h \ -- pppd/ipcp.h \ -- pppd/patchlevel.h \ -- pppd/pppd.h -+ external/2.4.3/pppd/patchlevel.h \ -+ external/2.4.3/pppd/ipcp.h \ -+ external/2.4.3/pppd/pppd.h \ -+ external/2.4.3/pppd/fsm.h \ -+ external/2.4.4/pppd/patchlevel.h \ -+ external/2.4.4/pppd/ipcp.h \ -+ external/2.4.4/pppd/pppd.h \ -+ external/2.4.4/pppd/fsm.h \ -+ external/2.4.4b1/pppd/patchlevel.h \ -+ external/2.4.4b1/pppd/ipcp.h \ -+ external/2.4.4b1/pppd/pppd.h \ -+ external/2.4.4b1/pppd/fsm.h - -- - nm_pptp_service_LDADD = \ - $(DBUS_LIBS) \ - $(GTHREAD_LIBS) \ - $(NETWORK_MANAGER_LIBS) - -+pppdplugin_PROGRAMS = nm-pptp-service-pppd-plugin.so - - nm_pptp_service_pppd_plugin_so_SOURCES = \ - nm-pptp-service-pppd-plugin.c -@@ -42,6 +50,9 @@ - nm_pptp_service_pppd_plugin_so_LDFLAGS = \ - -shared - -+nm_pptp_service_pppd_plugin_so_CFLAGS = \ -+ -fPIC -+ - nm_pptp_service_pppd_plugin_so_LDADD = \ - $(DBUS_LIBS) \ - $(GTHREAD_LIBS) \ diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-service-name.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-service-name.patch deleted file mode 100644 index 0981356..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-service-name.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577 - -Index: pptp/nm-pptp-service.name.in -=================================================================== ---- pptp/nm-pptp-service.name.in (revision 2653) -+++ pptp/nm-pptp-service.name.in (working copy) -@@ -1,8 +1,8 @@ - [VPN Connection] - name=pptp - service=org.freedesktop.NetworkManager.pptp --program=@bindir@/nm-pptp-service -+program=@BINDIR@/nm-pptp-service - - [GNOME] --auth-dialog=@libexecdir@/nm-pptp-auth-dialog -+auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog - properties=@prefix@/${LIB}/libnm-pptp-properties -Index: openvpn/nm-openvpn-service.name.in
\ No newline at end of file diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild deleted file mode 100644 index f57adba..0000000 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit gnome2 eutils autotools - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="crypt debug doc gnome" - -RDEPEND=">=sys-apps/dbus-0.35.2 - >=dev-libs/glib-2.8 - >=net-misc/networkmanager-0.6 - net-dialup/ppp - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - !gnome? ( >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gconf-2 ) - >=net-misc/openvpn-2.0.5 - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" -RDEPEND="net-dialup/pptpclient" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" - -src_unpack () { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-service-name.patch" - epatch "${FILESDIR}/${P}-pppd-plugindir.patch" - rm -rf "${S}/src/pppd" - eautoreconf -} diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest index 829ee77..6470347 100644 --- a/net-misc/networkmanager-vpnc/Manifest +++ b/net-misc/networkmanager-vpnc/Manifest @@ -1,7 +1,3 @@ -AUX networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585 RMD160 75379b2000169189f1a8e179d041e71d39151326 SHA1 3a228568089d9906f707f95c47aaf7a8cda2146a SHA256 d440538dbbaa226ceebff4661b508c03ed812f30d4efe72dedc54c6576c23963 -MD5 069739897ceb1c35cf7edee0312ce8bc files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585 -RMD160 75379b2000169189f1a8e179d041e71d39151326 files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585 -SHA256 d440538dbbaa226ceebff4661b508c03ed812f30d4efe72dedc54c6576c23963 files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585 AUX nm-vpnc-dbus_conf.patch 715 RMD160 ba8ee121d330cd704272a9f220b1f2c3983b329c SHA1 0e2799e9f9a8d56ee882af8afc6afe0d3e5a12e1 SHA256 1d4f08479ef0bf5f222f18717f5d3ed7329fb2f09f1118c95a576c995bfee02d MD5 9ddbcbc13c483a8c115828a7408a0e4f files/nm-vpnc-dbus_conf.patch 715 RMD160 ba8ee121d330cd704272a9f220b1f2c3983b329c files/nm-vpnc-dbus_conf.patch 715 @@ -10,12 +6,7 @@ AUX nm-vpnc-path.patch 418 RMD160 cf6138d9847db1310e095e559822f13956a9fc6b SHA1 MD5 065e0e8aee1b047cdebc0da98a0c3bb3 files/nm-vpnc-path.patch 418 RMD160 cf6138d9847db1310e095e559822f13956a9fc6b files/nm-vpnc-path.patch 418 SHA256 5557a9956d3dd9921b2722045d5dbb675f8e17dca1de8603cf6adb7fc3fa3672 files/nm-vpnc-path.patch 418 -DIST NetworkManager-vpnc-0.6.4_p20070621.tar.gz 435524 RMD160 0849848fe6311eb1ec0b18d64607fe5388370fb6 SHA1 16c7697598ef76a3b338bbb75693d800b96862a0 SHA256 bff3d3ef3f9140095554b0aa57db7f6fe12176675f5016f51e247a9c4990f979 DIST NetworkManager-vpnc-0.7.0_pre20070621.tar.gz 452352 RMD160 bdd360b2ba1bdabf9c46ca17e80e5352f720a81f SHA1 60763c9614920bfb87b526d23dc9b967befec759 SHA256 9a0e68e580911ba75fcdc0aff833aa2d3f62d7b28b1f850696b082c8d140e7fd -EBUILD networkmanager-vpnc-0.6.4_p20070621.ebuild 1620 RMD160 8f4e1d014d253c86cae80d74b36159425ec875c1 SHA1 49f7d7a48fb9a5b23f9eeff8967596f4a7e9798b SHA256 eaad656575ab0742b3fad86f440bfa999de0f9026f385772d2a263ca0c7f4809 -MD5 a70ee05f271459ad3e385e133bd142dc networkmanager-vpnc-0.6.4_p20070621.ebuild 1620 -RMD160 8f4e1d014d253c86cae80d74b36159425ec875c1 networkmanager-vpnc-0.6.4_p20070621.ebuild 1620 -SHA256 eaad656575ab0742b3fad86f440bfa999de0f9026f385772d2a263ca0c7f4809 networkmanager-vpnc-0.6.4_p20070621.ebuild 1620 EBUILD networkmanager-vpnc-0.7.0_pre20070621.ebuild 1551 RMD160 13e7d7ca90c9c42f0b23db7d9dab0907cac7bd43 SHA1 84ab4f66a8bf9d7ce2276a7c87d2cd0305802114 SHA256 7db1075ebc61173d764d817a8f82a93b4182f9ec54504b23a1ed38d972e74da5 MD5 87c81cb4c518a7025fc68e8cc5ccfe28 networkmanager-vpnc-0.7.0_pre20070621.ebuild 1551 RMD160 13e7d7ca90c9c42f0b23db7d9dab0907cac7bd43 networkmanager-vpnc-0.7.0_pre20070621.ebuild 1551 @@ -24,9 +15,6 @@ MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a MD5 cde19aea2ad5bbd47a8660b625acbd60 metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a metadata.xml 881 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 metadata.xml 881 -MD5 8b5fa806c082bf8a8f6e07f57f9f8221 files/digest-networkmanager-vpnc-0.6.4_p20070621 307 -RMD160 5c72a504241e52a45dc7b85005249bb130f4d38f files/digest-networkmanager-vpnc-0.6.4_p20070621 307 -SHA256 de305389abd172a32735fd85ba0f91db95ed8fc15eebcf10a7dd3aee9f5e4be8 files/digest-networkmanager-vpnc-0.6.4_p20070621 307 MD5 91f2dcb189b00ce6d815a8b0d60a5320 files/digest-networkmanager-vpnc-0.7.0_pre20070621 313 RMD160 77012e254a12ecda755415ea9593081cf036cb24 files/digest-networkmanager-vpnc-0.7.0_pre20070621 313 SHA256 a08e4e5599aba2f9108e264be95a3ffb393d22fb0b6ac2751026ef408d45ceb5 files/digest-networkmanager-vpnc-0.7.0_pre20070621 313 diff --git a/net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.6.4_p20070621 b/net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.6.4_p20070621 deleted file mode 100644 index cbf524b..0000000 --- a/net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.6.4_p20070621 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a2a4c84bb6943db212f8764f1b62cd28 NetworkManager-vpnc-0.6.4_p20070621.tar.gz 435524 -RMD160 0849848fe6311eb1ec0b18d64607fe5388370fb6 NetworkManager-vpnc-0.6.4_p20070621.tar.gz 435524 -SHA256 bff3d3ef3f9140095554b0aa57db7f6fe12176675f5016f51e247a9c4990f979 NetworkManager-vpnc-0.6.4_p20070621.tar.gz 435524 diff --git a/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch b/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch deleted file mode 100644 index 83b2a7b..0000000 --- a/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577 - -Index: vpnc/nm-vpnc-service.name.in -=================================================================== ---- vpnc/nm-vpnc-service.name.in (revision 2653) -+++ vpnc/nm-vpnc-service.name.in (working copy) -@@ -1,8 +1,8 @@ - [VPN Connection] - name=vpnc - service=org.freedesktop.NetworkManager.vpnc --program=@bindir@/nm-vpnc-service -+program=@BINDIR@/nm-vpnc-service - - [GNOME] --auth-dialog=@libexecdir@/nm-vpnc-auth-dialog -+auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog - properties=@prefix@/${LIB}/libnm-vpnc-properties diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild deleted file mode 100644 index f611cd4..0000000 --- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit gnome2 eutils autotools - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="crypt doc gnome" - -RDEPEND=">=sys-apps/dbus-0.60 - >=sys-apps/hal-0.5 - sys-apps/iproute2 - >=dev-libs/libnl-1.0_pre6 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.4.8 - >=net-misc/networkmanager-0.6.2 - >=net-misc/vpnc-0.3.3 - >=dev-libs/glib-2.8 - >=x11-libs/libnotify-0.3.2 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" - -src_unpack () { - unpack ${A} - cd "${S}" - # Gentoo puts vpnc somewhere that the source doesn't expect. - epatch ${FILESDIR}/nm-vpnc-path.patch - # Match the same dbus permissions as NetworkManager - epatch ${FILESDIR}/nm-vpnc-dbus_conf.patch - - epatch "${FILESDIR}/${P}-service-name.patch" - eautoreconf -} diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index d2ffc6f..ba1be88 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -18,12 +18,7 @@ AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b8 MD5 e9879921dd5b0669337e27ca2196cfd4 files/networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 files/networkmanager-use-kernel-headers.patch 466 SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402 files/networkmanager-use-kernel-headers.patch 466 -DIST NetworkManager-0.6.5_p20070726.tar.gz 962168 RMD160 1bf911081dea52e05cbf4afd80ca09331ba5b43a SHA1 0008e7fab140e8bb134c6421760feb09b94dcda7 SHA256 ad43d02c2d072da63817bff5e070609f255a086ce290ac9af01523f82ae1f2d7 DIST NetworkManager-0.7.0_pre20070627.tar.gz 1056932 RMD160 088ecbf8ca416bfece76dd1e4d85afd9e389848b SHA1 bf7edf6070fc8036096006e82f0101add2deefdf SHA256 f831920a7b8c5e3c6ed9af63a66f22edf41c34eac0846773324e74544610f316 -EBUILD networkmanager-0.6.5_p20070726.ebuild 2475 RMD160 5a932ff46e2ca7673c32454b043d74019bfb0215 SHA1 3283e3d84ce96bb8c93975ab93501bc1895811d9 SHA256 342de9858801ac82fa7d35675246f0efb5428a67a57169a1c4f2b29e60e5e0c1 -MD5 0a8803bb0bea9ab17cda6007469180bc networkmanager-0.6.5_p20070726.ebuild 2475 -RMD160 5a932ff46e2ca7673c32454b043d74019bfb0215 networkmanager-0.6.5_p20070726.ebuild 2475 -SHA256 342de9858801ac82fa7d35675246f0efb5428a67a57169a1c4f2b29e60e5e0c1 networkmanager-0.6.5_p20070726.ebuild 2475 EBUILD networkmanager-0.7.0_pre20070627.ebuild 2457 RMD160 db1d70a037764e40203277716d84203ff64044b9 SHA1 1b5ca55ec4dca1872601867c5b23a5d3d25ce53a SHA256 9ab745a07f23f30a4a3a8aec56637bfa7cc2bd3636a50122117542fe0cf9f380 MD5 f57586de1a98af00dce2c600f00a6163 networkmanager-0.7.0_pre20070627.ebuild 2457 RMD160 db1d70a037764e40203277716d84203ff64044b9 networkmanager-0.7.0_pre20070627.ebuild 2457 @@ -32,9 +27,6 @@ MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a MD5 cde19aea2ad5bbd47a8660b625acbd60 metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a metadata.xml 881 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 metadata.xml 881 -MD5 915cc07a6cb148b9f6421f490240d767 files/digest-networkmanager-0.6.5_p20070726 292 -RMD160 6bcb3fb0148c2bdaa0206af4d46bd536c71072c6 files/digest-networkmanager-0.6.5_p20070726 292 -SHA256 b4f5803e23f1fa4fb21673307f4b678dbb9969e266a4ea9faceaaaf00839b09a files/digest-networkmanager-0.6.5_p20070726 292 MD5 ca1329ea43ac13dfaff35a2ea2a28e76 files/digest-networkmanager-0.7.0_pre20070627 301 RMD160 4be01818633f5fb780084696ecde6e4ca5c984b0 files/digest-networkmanager-0.7.0_pre20070627 301 SHA256 fcf59a00a4ee405da77597895d7df804c29dc4384f5bd5765ce65fcf00eb4a13 files/digest-networkmanager-0.7.0_pre20070627 301 diff --git a/net-misc/networkmanager/files/digest-networkmanager-0.6.5_p20070726 b/net-misc/networkmanager/files/digest-networkmanager-0.6.5_p20070726 deleted file mode 100644 index 63f739a..0000000 --- a/net-misc/networkmanager/files/digest-networkmanager-0.6.5_p20070726 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e3ca543da94483bda6bde722f089e3de NetworkManager-0.6.5_p20070726.tar.gz 962168 -RMD160 1bf911081dea52e05cbf4afd80ca09331ba5b43a NetworkManager-0.6.5_p20070726.tar.gz 962168 -SHA256 ad43d02c2d072da63817bff5e070609f255a086ce290ac9af01523f82ae1f2d7 NetworkManager-0.6.5_p20070726.tar.gz 962168 diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20070726.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20070726.ebuild deleted file mode 100644 index 7233358..0000000 --- a/net-misc/networkmanager/networkmanager-0.6.5_p20070726.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5.ebuild,v 1.4 2007/05/14 16:33:39 steev Exp $ - -inherit gnome2 eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -#http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.6/ -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="crypt doc gnome" - -RDEPEND=">=sys-apps/dbus-0.60 - >=sys-apps/hal-0.5 - sys-apps/iproute2 - >=dev-libs/libnl-1.0_pre6 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.4.8 - >=dev-libs/glib-2.8 - >=x11-libs/libnotify-0.3.2 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - crypt? ( dev-libs/libgcrypt )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" -PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.6.5 )" - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --localstatedir=/var \ - --with-distro=gentoo \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" - -S=${WORKDIR}/${MY_P} - -src_unpack () { - - unpack ${A} - cd ${S} - # Update to use our backend - #epatch ${FILESDIR}/${PN}-updatedbackend.patch - # Use the kernel headers - epatch ${FILESDIR}/${PN}-use-kernel-headers.patch - # Fix the resolv.conf permissions - epatch ${FILESDIR}/${PN}-resolvconf-perms.patch - # Fix up the dbus conf file to use plugdev group - epatch ${FILESDIR}/${PN}-0.6.5-confchanges.patch -} - -src_install() { - gnome2_src_install - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager -} -pkg_postinst() { - gnome2_icon_cache_update - elog "You need to be in the plugdev group in order to use NetworkManager" - elog "Problems with your hostname getting changed?" - elog "" - elog "Add the following to /etc/dhcp/dhclient.conf" - elog 'send host-name "YOURHOSTNAME";' - elog 'supersede host-name "YOURHOSTNAME";' - - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." -} |