1.7.4 release

* fixed various bugs
* introduced accel-cmd program
* ippool: impelented persistance
* radius: implemented default-realm option
* radius: proper handling of Framed-IP-Address=255.255.255.254
* shaper: time range and other fixes
* shaper: implemented mtu option
* net-snmp: fixed run out of FD_SETSIZE

6 files changed, 21 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbd9294..af3f34a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT)
 	)
 	STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION)
 ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT)
-	SET (ACCEL_PPP_VERSION 1.7.3)
+	SET (ACCEL_PPP_VERSION 1.7.4)
 ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT)
 
 ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}")
diff --git a/accel-pppd/extra/net-snmp/sessionTable_data_access.c b/accel-pppd/extra/net-snmp/sessionTable_data_access.c
index 0d38e5d..0e804e2 100644
--- a/accel-pppd/extra/net-snmp/sessionTable_data_access.c
+++ b/accel-pppd/extra/net-snmp/sessionTable_data_access.c
@@ -17,6 +17,7 @@
 
 #include "ppp.h"
 #include "ipdb.h"
+#include "memdebug.h"
 
 /** @ingroup interface
  * @addtogroup data_access data_access: Routines to access data
@@ -224,16 +225,16 @@ sessionTable_container_load(netsnmp_container *container)
 				strcpy(rowreq_ctx->data->ifname, ppp->ifname);
 
 				if (ppp->username)
-					rowreq_ctx->data->username = strdup(ppp->username);
+					rowreq_ctx->data->username = _strdup(ppp->username);
 				else
-					ppp->username = strdup("");
+					rowreq_ctx->data->username = _strdup("");
 
 				rowreq_ctx->data->peer_addr = ppp->ipv4 ? ppp->ipv4->peer_addr : 0;
 				rowreq_ctx->data->type = ppp->ctrl->type;
 				rowreq_ctx->data->state = ppp->state;
 				rowreq_ctx->data->uptime = (ppp->stop_time ? ppp->stop_time : t) - ppp->start_time;
-				rowreq_ctx->data->calling_sid = strdup(ppp->ctrl->calling_station_id);
-				rowreq_ctx->data->called_sid = strdup(ppp->ctrl->called_station_id);
+				rowreq_ctx->data->calling_sid = _strdup(ppp->ctrl->calling_station_id);
+				rowreq_ctx->data->called_sid = _strdup(ppp->ctrl->called_station_id);
 
         CONTAINER_INSERT(container, rowreq_ctx);
         ++count;
diff --git a/accel-pppd/extra/net-snmp/sessionTable_data_get.c b/accel-pppd/extra/net-snmp/sessionTable_data_get.c
index 1dcea1e..d467ad0 100644
--- a/accel-pppd/extra/net-snmp/sessionTable_data_get.c
+++ b/accel-pppd/extra/net-snmp/sessionTable_data_get.c
@@ -12,6 +12,7 @@
 /* include our parent header */
 #include "sessionTable.h"
 
+#include "memdebug.h"
 
 /** @defgroup data_get data_get: Routines to get data
  *
@@ -73,13 +74,13 @@ sessionTable_release_data(sessionTable_data *data)
     DEBUGMSGTL(("verbose:sessionTable:sessionTable_release_data","called\n"));
 
 		if (data->username)
-			free(data->username);
+			_free(data->username);
 
 		if (data->calling_sid)
-			free(data->calling_sid);
+			_free(data->calling_sid);
 
 		if (data->called_sid)
-			free(data->called_sid);
+			_free(data->called_sid);
 
     free(data);
 } /* sessionTable_release_data */
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
index f4d57e4..54158f5 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 "7")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "4")
 
 SET(CPACK_PACKAGE_NAME "accel-ppp")
 SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>")
@@ -22,4 +22,9 @@ IF(CPACK_TYPE STREQUAL Debian6)
 	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
 ENDIF(CPACK_TYPE STREQUAL Debian6)
 
+IF(CPACK_TYPE STREQUAL Debian7)
+	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.13), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.30)")
+	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
+ENDIF(CPACK_TYPE STREQUAL Debian7)
+
 INCLUDE(CPack)
diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake
index 0fcc2d5..c4adbca 100644
--- a/cmake/debian/debian.cmake
+++ b/cmake/debian/debian.cmake
@@ -13,13 +13,10 @@ if (BUILD_DRIVER_ONLY)
 	#INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra)
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION lib/modules/${DEBIAN_KDIR}/extra)
 	#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})")
-else (BUILD_DRIVER_ONLY)
-	#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)")
-	
+else (BUILD_DRIVER_ONLY)	
 	SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/conffiles")
 
-	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc RENAME accel-ppp.conf.dist)
-	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/init.d RENAME accel-ppp)
-	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/default RENAME accel-ppp)
-
+	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist)
+	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION /etc/init.d RENAME accel-ppp)
+	INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION /etc/default RENAME accel-ppp)
 endif (BUILD_DRIVER_ONLY)
diff --git a/contrib/debian/accel-ppp-init b/contrib/debian/accel-ppp-init
index 08120cd..c763970 100755
--- a/contrib/debian/accel-ppp-init
+++ b/contrib/debian/accel-ppp-init
@@ -18,7 +18,7 @@ if test -f /etc/default/accel-ppp; then
     . /etc/default/accel-ppp
 fi
 
-if [ -z $ACCEL_PPPD_OPTS ]; then
+if [ -z "${ACCEL_PPPD_OPTS}" ]; then
   ACCEL_PPPD_OPTS="-c /etc/accel-ppp.conf"
 fi