diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-07-11 16:58:26 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-07-11 16:58:26 +0400 |
| commit | 7b4edf7fe4bd0e20979fdb39ff851b13b55d1acf (patch) | |
| tree | 2ffdb1c9a712aecd9011547486c67055c8894662 /accel-pppd | |
| parent | 783fd56a74c277c3c0482d126460cf0b2dd5a290 (diff) | |
| parent | 8e46d2416a2e7ab563f6b3b1ff761799ccbcf0f4 (diff) | |
| download | accel-ppp-7b4edf7fe4bd0e20979fdb39ff851b13b55d1acf.tar.gz accel-ppp-7b4edf7fe4bd0e20979fdb39ff851b13b55d1acf.zip | |
Merge commit '8e46d2416a2e7ab563f6b3b1ff761799ccbcf0f4'
Diffstat (limited to 'accel-pppd')
| -rw-r--r-- | accel-pppd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index 777d7e5..92d7cfb 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} diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index b081e87..0318e54 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); |