diff options
| -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 777d7e5f..92d7cfba 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 b081e875..0318e54d 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); |