From 5f99604785357de4d0716ef7a85e770be81f6db7 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Mon, 28 Feb 2011 11:55:37 +0300 Subject: 1.3.5 release --- accel-pppd/CMakeLists.txt | 2 +- cmake/cpack.cmake | 2 +- .../net-dialup/accel-ppp/accel-ppp-1.3.5.ebuild | 88 ++++++++++++++++++++++ 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.5.ebuild diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index 8e0af47..7b53d92 100644 --- a/accel-pppd/CMakeLists.txt +++ b/accel-pppd/CMakeLists.txt @@ -24,7 +24,7 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ) STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION) ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) - SET (ACCEL_PPP_VERSION 1.3.4) + SET (ACCEL_PPP_VERSION 1.3.5) ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 3de94d7..10b8e32 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -2,7 +2,7 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "4") +SET(CPACK_PACKAGE_VERSION_PATCH "5") SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov ") diff --git a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.5.ebuild b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.5.ebuild new file mode 100644 index 0000000..395dd6b --- /dev/null +++ b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.5.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=2 + +inherit eutils linux-mod cmake-utils + +DESCRIPTION="PPtP/L2TP/PPPoE Server for Linux" +SRC_URI="http://sourceforge.net/projects/accel-ppp/files/accel-ppp/${P}.tar.bz2" +HOMEPAGE="http://accel-ppp.sourceforge.net/" + +SLOT="0" +LICENSE="GPL" +KEYWORDS="~amd64 ~x86" +IUSE="postgres debug shaper pptp_driver radius" + +DEPEND=">=sys-libs/glibc-2.8 + dev-libs/openssl + dev-libs/libaio + shaper? ( =dev-libs/libnl-2* ) + postgres? ( dev-db/postgresql-base )" + +RDEPEND="$DEPEND + pptp_driver? ( virtual/modutils )" + +BUILD_TARGETS="default" +BUILD_PARAMS="KDIR=${KERNEL_DIR}" +CONFIG_CHECK="PPP PPPOE" +MODULESD_PPTP_ALIASES=("net-pf-24 pptp") +PREFIX="/" +MODULE_NAMES="pptp(extra:${S}/driver/)" + +src_prepare() { + sed -i -e "/mkdir/d" "${S}/accel-pppd/CMakeLists.txt" + sed -i -e "/echo/d" "${S}/accel-pppd/CMakeLists.txt" + sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt" +} + +src_configure() { + if use debug; then + mycmakeargs+=( "-DCMAKE_BUILD_TYPE=Debug" ) + fi + + if use postgres; then + mycmakeargs+=( "-DLOG_PGSQL=TRUE" ) + fi + + if use shaper; then + mycmakeargs+=( "-DSHAPER=TRUE" ) + fi + + if ! use radius; then + mycmakeargs+=( "-DRADIUS=FALSE" ) + fi + + mycmakeargs+=( "-DCMAKE_INSTALL_PREFIX=/usr" ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use pptp_driver; then + cd ${S}/driver + #convert_to_m Makefile + linux-mod_src_compile || die "failed to build driver" + fi +} + +src_install() { + cmake-utils_src_install + + if use pptp_driver; then + cd ${S}/driver + linux-mod_src_install + fi + + exeinto /etc/init.d + newexe "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-init" accel-pppd + + insinto /etc/conf.d + newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd" accel-pppd + + dodir /var/log/accel-ppp + dodir /var/run/accel-ppp + dodir /var/run/radattr +} -- cgit v1.2.3 From f02ea2ef3474d56814ec77a28fa1ea85c8afd31e Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Tue, 1 Mar 2011 15:53:45 +0300 Subject: radius: fixed operation without accounting server --- accel-pppd/radius/acct.c | 6 ++ .../net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild | 88 ---------------------- 2 files changed, 6 insertions(+), 88 deletions(-) delete mode 100644 contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild diff --git a/accel-pppd/radius/acct.c b/accel-pppd/radius/acct.c index 6238793..01e73af 100644 --- a/accel-pppd/radius/acct.c +++ b/accel-pppd/radius/acct.c @@ -187,6 +187,9 @@ int rad_acct_start(struct radius_pd_t *rpd) time_t ts; unsigned int dt; + if (!conf_acct_secret) + return 0; + rpd->acct_req = rad_req_alloc(rpd, CODE_ACCOUNTING_REQUEST, rpd->ppp->username); if (!rpd->acct_req) { log_emerg("radius: out of memory\n"); @@ -278,6 +281,9 @@ void rad_acct_stop(struct radius_pd_t *rpd) time_t ts; unsigned int dt; + if (!conf_acct_secret) + return; + if (rpd->acct_interim_timer.tpd) triton_timer_del(&rpd->acct_interim_timer); diff --git a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild deleted file mode 100644 index 395dd6b..0000000 --- a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 - -inherit eutils linux-mod cmake-utils - -DESCRIPTION="PPtP/L2TP/PPPoE Server for Linux" -SRC_URI="http://sourceforge.net/projects/accel-ppp/files/accel-ppp/${P}.tar.bz2" -HOMEPAGE="http://accel-ppp.sourceforge.net/" - -SLOT="0" -LICENSE="GPL" -KEYWORDS="~amd64 ~x86" -IUSE="postgres debug shaper pptp_driver radius" - -DEPEND=">=sys-libs/glibc-2.8 - dev-libs/openssl - dev-libs/libaio - shaper? ( =dev-libs/libnl-2* ) - postgres? ( dev-db/postgresql-base )" - -RDEPEND="$DEPEND - pptp_driver? ( virtual/modutils )" - -BUILD_TARGETS="default" -BUILD_PARAMS="KDIR=${KERNEL_DIR}" -CONFIG_CHECK="PPP PPPOE" -MODULESD_PPTP_ALIASES=("net-pf-24 pptp") -PREFIX="/" -MODULE_NAMES="pptp(extra:${S}/driver/)" - -src_prepare() { - sed -i -e "/mkdir/d" "${S}/accel-pppd/CMakeLists.txt" - sed -i -e "/echo/d" "${S}/accel-pppd/CMakeLists.txt" - sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt" -} - -src_configure() { - if use debug; then - mycmakeargs+=( "-DCMAKE_BUILD_TYPE=Debug" ) - fi - - if use postgres; then - mycmakeargs+=( "-DLOG_PGSQL=TRUE" ) - fi - - if use shaper; then - mycmakeargs+=( "-DSHAPER=TRUE" ) - fi - - if ! use radius; then - mycmakeargs+=( "-DRADIUS=FALSE" ) - fi - - mycmakeargs+=( "-DCMAKE_INSTALL_PREFIX=/usr" ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use pptp_driver; then - cd ${S}/driver - #convert_to_m Makefile - linux-mod_src_compile || die "failed to build driver" - fi -} - -src_install() { - cmake-utils_src_install - - if use pptp_driver; then - cd ${S}/driver - linux-mod_src_install - fi - - exeinto /etc/init.d - newexe "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-init" accel-pppd - - insinto /etc/conf.d - newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd" accel-pppd - - dodir /var/log/accel-ppp - dodir /var/run/accel-ppp - dodir /var/run/radattr -} -- cgit v1.2.3 From 2c2662e034332ed52c4a31608afab794c00a2ec9 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Fri, 4 Mar 2011 12:34:42 +0300 Subject: ppp: fix incorrect magic in lcp echo reply --- accel-pppd/ppp/ppp_lcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index 1f20abc..1d23ac6 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -592,13 +592,13 @@ static void lcp_recv_echo_repl(struct ppp_lcp_t *lcp, uint8_t *data, int size) static void send_echo_reply(struct ppp_lcp_t *lcp) { struct lcp_hdr_t *hdr = (struct lcp_hdr_t*)lcp->ppp->buf; - uint32_t magic = *(uint32_t *)(hdr + 1); + //uint32_t magic = *(uint32_t *)(hdr + 1); hdr->code = ECHOREP; - *(uint32_t *)(hdr + 1) = lcp->magic; + *(uint32_t *)(hdr + 1) = htonl(lcp->magic); if (conf_ppp_verbose) - log_ppp_debug("send [LCP EchoRep id=%x ]\n", hdr->id, magic); + log_ppp_debug("send [LCP EchoRep id=%x ]\n", hdr->id, htonl(lcp->magic)); ppp_chan_send(lcp->ppp, hdr, ntohs(hdr->len) + 2); } -- cgit v1.2.3 From dfecebb0dab3ade83956e7474408b7897f242b6c Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Sat, 5 Mar 2011 09:13:47 +0300 Subject: bugfix --- accel-pppd/triton/triton.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/accel-pppd/triton/triton.c b/accel-pppd/triton/triton.c index 0740591..63561d8 100644 --- a/accel-pppd/triton/triton.c +++ b/accel-pppd/triton/triton.c @@ -188,7 +188,8 @@ static void ctx_thread(struct _triton_context_t *ctx) spin_unlock(&ctx->lock); __sync_sub_and_fetch(&triton_stat.timer_pending, 1); read(t->fd, &tt, sizeof(tt)); - t->ud->expire(t->ud); + if (t->ud) + t->ud->expire(t->ud); continue; } if (!list_empty(&ctx->pending_handlers)) { -- cgit v1.2.3