From ef7a38b7a8f74315d6546564585c679da1a714ae Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Thu, 21 Jun 2012 16:40:34 +0400 Subject: ppp: fixed unexpected lcp timer start --- accel-pppd/ppp/ppp_lcp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index 5813517..c93c100 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -579,6 +579,9 @@ static int lcp_recv_conf_ack(struct ppp_lcp_t *lcp, uint8_t *data, int size) static void lcp_update_echo_timer(struct ppp_lcp_t *lcp) { + if (!lcp->echo_timer.expire) + return; + if (lcp->echo_timer.period != conf_echo_interval * 1000) { if (!conf_echo_interval) triton_timer_del(&lcp->echo_timer); -- cgit v1.2.3 From 8e46d2416a2e7ab563f6b3b1ff761799ccbcf0f4 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Fri, 29 Jun 2012 21:54:04 +0400 Subject: Fix setting of ACCEL_PPP_VERSION with git coloured output --- accel-pppd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index 30e6c91..97c6034 100644 --- a/accel-pppd/CMakeLists.txt +++ b/accel-pppd/CMakeLists.txt @@ -2,7 +2,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fvisibility=hidden -fno-strict-aliasi IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) EXECUTE_PROCESS( - COMMAND git log + COMMAND git log --no-color COMMAND head -n1 COMMAND awk "{print $2}" WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} -- cgit v1.2.3