started work on L2TPv2 server

4 files changed, 10 insertions, 8 deletions

diff --git a/accel-pptpd/radius/CMakeLists.txt b/accel-pptpd/radius/CMakeLists.txt
index b82512e9..6872ee6b 100644
--- a/accel-pptpd/radius/CMakeLists.txt
+++ b/accel-pptpd/radius/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(sources
 	dm_coa.c
 )
 
-ADD_DEFINITIONS(-DDICT_PATH="${CMAKE_INSTALL_PREFIX}/usr/share/accel-pptp/dictionary")
+ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/usr/share/accel-pptp/radius/dictionary")
 
 ADD_LIBRARY(radius SHARED ${sources})
 
@@ -16,5 +16,5 @@ INSTALL(TARGETS radius
 	LIBRARY DESTINATION usr/lib/accel-pptp
 )
 FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
-INSTALL(FILES ${dict} DESTINATION usr/share/accel-pptp)
+INSTALL(FILES ${dict} DESTINATION usr/share/accel-pptp/radius)
 
diff --git a/accel-pptpd/radius/acct.c b/accel-pptpd/radius/acct.c
index a8346edd..d855d120 100644
--- a/accel-pptpd/radius/acct.c
+++ b/accel-pptpd/radius/acct.c
@@ -4,6 +4,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <linux/if.h>
 #include <linux/if_ppp.h>
 #include <openssl/md5.h>
 
diff --git a/accel-pptpd/radius/dict.c b/accel-pptpd/radius/dict.c
index 54cf895e..0d63a838 100644
--- a/accel-pptpd/radius/dict.c
+++ b/accel-pptpd/radius/dict.c
@@ -79,7 +79,7 @@ static int dict_load(const char *fname)
 
 	f = fopen(fname, "r");
 	if (!f) {
-		log_error("radius: open dictioanary '%s': %s\n", fname, strerror(errno));
+		log_emerg("radius: open dictioanary '%s': %s\n", fname, strerror(errno));
 		return -1;
 	}
 	
@@ -94,7 +94,7 @@ static int dict_load(const char *fname)
 			if (!strcmp(buf, "BEGIN-VENDOR")) {
 				vendor = rad_dict_find_vendor_name(ptr[0]);
 				if (!vendor) {
-					log_error("radius:%s:%i: vendor not found\n", fname, n);
+					log_emerg("radius:%s:%i: vendor not found\n", fname, n);
 					goto out_err;
 				}
 				items = &vendor->items;
@@ -156,13 +156,13 @@ static int dict_load(const char *fname)
 				else if (!strcmp(ptr[2], "octets"))
 					attr->type = ATTR_TYPE_OCTETS;
 				else {
-					log_error("radius:%s:%i: unknown attribute type\n", fname, n);
+					log_emerg("radius:%s:%i: unknown attribute type\n", fname, n);
 					goto out_err;
 				}
 			} else if (!strcmp(buf, "VALUE")) {
 				attr = find_attr(items, ptr[0]);
 				if (!attr) {
-					log_error("radius:%s:%i: unknown attribute\n", fname, n);
+					log_emerg("radius:%s:%i: unknown attribute\n", fname, n);
 					goto out_err;
 				}
 				val = malloc(sizeof(*val));
@@ -200,7 +200,7 @@ static int dict_load(const char *fname)
 	return 0;
 
 out_err_syntax:
-	log_error("radius:%s:%i: syntaxis error\n", fname, n);
+	log_emerg("radius:%s:%i: syntaxis error\n", fname, n);
 out_err:
 	fclose(f);
 	return -1;
diff --git a/accel-pptpd/radius/radius.c b/accel-pptpd/radius/radius.c
index 9f5c7ffc..817071e9 100644
--- a/accel-pptpd/radius/radius.c
+++ b/accel-pptpd/radius/radius.c
@@ -309,7 +309,7 @@ static int parse_server(const char *opt, char **name, int *port, char **secret)
 static void __init radius_init(void)
 {
 	char *opt;
-	char *dict = DICT_PATH;
+	char *dict = DICTIONARY;
 
 	rpd_pool = mempool_create(sizeof(struct radius_pd_t));