diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pptp/pptp.c | 3 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 9 |
3 files changed, 13 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe8ac94..dd45777 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,6 @@ endif () project(accel-ppp C) -include(cmake/cpack.cmake) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing -D_GNU_SOURCE -fPIC -rdynamic -Wno-unused-result") IF (NOT DEFINED LIB_SUFFIX) @@ -40,9 +38,7 @@ ENDIF(NOT PCRE_LIBRARY) IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) EXECUTE_PROCESS( - COMMAND git log --no-color - COMMAND head -n1 - COMMAND awk "{print $2}" + COMMAND git describe --tags --always WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} OUTPUT_VARIABLE ACCEL_PPP_VERSION ) @@ -51,6 +47,9 @@ ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) SET (ACCEL_PPP_VERSION 1.12.0) ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) +# we must include cpack.cmake after generating the ACCEL_PPP_VERSION variable +include(cmake/cpack.cmake) + ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) @@ -62,7 +61,7 @@ if (NOT BUILD_DRIVER_ONLY) if (NOT DEFINED CRYPTO) set(CRYPTO OPENSSL) endif (NOT DEFINED CRYPTO) - + if (CRYPTO STREQUAL OPENSSL) find_library(CRYPTO_LIBRARY ssl HINTS ${CMAKE_SOURCE_DIR}/lib/linux/gcc/${BIT}/lib @@ -83,7 +82,7 @@ if (NOT BUILD_DRIVER_ONLY) else (CRYPTO STREQUAL OPENSSL) message(FATAL_ERROR "unknown CRYPTO type") endif (CRYPTO STREQUAL OPENSSL) - + add_subdirectory(accel-pppd) add_subdirectory(crypto) add_subdirectory(accel-cmd) diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c index 3b90139..881fa9a 100644 --- a/accel-pppd/ctrl/pptp/pptp.c +++ b/accel-pppd/ctrl/pptp/pptp.c @@ -253,7 +253,8 @@ static int pptp_start_ctrl_conn_rqst(struct pptp_conn_t *conn) if (send_pptp_start_ctrl_conn_rply(conn, PPTP_CONN_RES_SUCCESS, 0)) return -1; - triton_timer_mod(&conn->timeout_timer, 0); + if (conn->timeout_timer.tpd) + triton_timer_mod(&conn->timeout_timer, 0); conn->state = STATE_ESTB; diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 0f270cf..ffb5395 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -1,12 +1,13 @@ INCLUDE(InstallRequiredSystemLibraries) -SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "12") -SET(CPACK_PACKAGE_VERSION_PATCH "0") +string(REPLACE "." ";" VERSION_LIST ${ACCEL_PPP_VERSION}) +list(GET VERSION_LIST 0 CPACK_PACKAGE_VERSION_MAJOR) +list(GET VERSION_LIST 1 CPACK_PACKAGE_VERSION_MINOR) +list(GET VERSION_LIST 2 CPACK_PACKAGE_VERSION_PATCH) SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PPtP/L2TP/PPPoE server for Linux") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PPtP/L2TP/PPPoE/SSTP server for Linux") SET(CPACK_PACKAGE_VENDOR "Dmitry Kozlov") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") |