Merge pull request #40 from 6WIND/bugfixes

Bugfixes

4 files changed, 27 insertions, 15 deletions

diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt
index 23a1d0ad..ab8a3508 100644
--- a/accel-pppd/CMakeLists.txt
+++ b/accel-pppd/CMakeLists.txt
@@ -1,6 +1,8 @@
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
 ADD_DEFINITIONS(-DPTHREAD_SPINLOCK)
 
+include(GNUInstallDirs)
+
 INCLUDE_DIRECTORIES(include)
 
 IF (MEMDEBUG)
@@ -134,9 +136,9 @@ INSTALL(TARGETS accel-pppd
 INSTALL(FILES accel-ppp.conf.5 DESTINATION share/man/man5)
 
 IF (NOT DEFINED CPACK_TYPE)
-	INSTALL(FILES accel-ppp.conf DESTINATION ${CMAKE_FIND_ROOT_PATH}/etc RENAME accel-ppp.conf.dist)
+	INSTALL(FILES accel-ppp.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}" RENAME accel-ppp.conf.dist)
 
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${CMAKE_FIND_ROOT_PATH}/var/log/accel-ppp)")
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${CMAKE_FIND_ROOT_PATH}/var/lib/accel-ppp)")
+	INSTALL(DIRECTORY DESTINATION "${CMAKE_INSTALL_LOCALSTATEDIR}/log/accel-ppp")
+	INSTALL(DIRECTORY DESTINATION "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/accel-ppp")
 ENDIF (NOT DEFINED CPACK_TYPE)
 
diff --git a/accel-pppd/auth/auth_chap_md5.c b/accel-pppd/auth/auth_chap_md5.c
index c0d78c8d..d3982334 100644
--- a/accel-pppd/auth/auth_chap_md5.c
+++ b/accel-pppd/auth/auth_chap_md5.c
@@ -220,26 +220,31 @@ static void chap_send_success(struct chap_auth_data *ad, int id)
 
 static void chap_send_challenge(struct chap_auth_data *ad, int new)
 {
-	struct chap_challenge msg =	{
-		.hdr.proto = htons(PPP_CHAP),
-		.hdr.code = CHAP_CHALLENGE,
-		.hdr.id = ad->id,
-		.hdr.len = htons(sizeof(msg) - 2),
-		.val_size = VALUE_SIZE,
+#define CHAP_CHALLENGE_NAME "accel-ppp"
+	struct {
+		struct chap_challenge m;
+		char name[sizeof(CHAP_CHALLENGE_NAME)];
+	} __attribute__((packed)) msg = {
+		.m.hdr.proto = htons(PPP_CHAP),
+		.m.hdr.code = CHAP_CHALLENGE,
+		.m.hdr.id = ad->id,
+		.m.hdr.len = htons(sizeof(struct chap_challenge) - 2 + strlen(CHAP_CHALLENGE_NAME)),
+		.m.val_size = VALUE_SIZE,
+		.name = CHAP_CHALLENGE_NAME,
 	};
 
 	if (new)
 		read(urandom_fd, ad->val, VALUE_SIZE);
 
-	memcpy(msg.val, ad->val, VALUE_SIZE);
+	memcpy(msg.m.val, ad->val, VALUE_SIZE);
 
 	if (conf_ppp_verbose) {
-		log_ppp_info2("send [CHAP Challenge id=%x <", msg.hdr.id);
-		print_buf(msg.val, VALUE_SIZE);
+		log_ppp_info2("send [CHAP Challenge id=%x <", msg.m.hdr.id);
+		print_buf(msg.m.val, VALUE_SIZE);
 		log_ppp_info2(">]\n");
 	}
 
-	ppp_chan_send(ad->ppp, &msg, ntohs(msg.hdr.len) + 2);
+	ppp_chan_send(ad->ppp, &msg, ntohs(msg.m.hdr.len) + 2);
 
 	if (conf_timeout && !ad->timeout.tpd)
 		triton_timer_add(ad->ppp->ses.ctrl->ctx, &ad->timeout, 0);
diff --git a/accel-pppd/ppp/ppp.c b/accel-pppd/ppp/ppp.c
index 49b53b1a..8a4cce7c 100644
--- a/accel-pppd/ppp/ppp.c
+++ b/accel-pppd/ppp/ppp.c
@@ -430,6 +430,11 @@ cont:
 			}
 		}
 
+                list_for_each_entry(ppp_h, &ppp->unit_handlers, entry) {
+                        if (ppp_h->proto == proto)
+                                goto cont;
+                }
+
 		lcp_send_proto_rej(ppp, proto);
 		//log_ppp_warn("ppp_chan_read: discarding unknown packet %x\n", proto);
 	}
diff --git a/accel-pppd/triton/timer.c b/accel-pppd/triton/timer.c
index 744b10b3..5b5d9535 100644
--- a/accel-pppd/triton/timer.c
+++ b/accel-pppd/triton/timer.c
@@ -108,6 +108,8 @@ void *timer_thread(void *arg)
 
 		while (!list_empty(&freed_list2)) {
 			t = list_entry(freed_list2.next, typeof(*t), entry);
+			epoll_ctl(epoll_fd,EPOLL_CTL_DEL, t->fd, &t->epoll_event);
+			close(t->fd);
 			list_del(&t->entry);
 			triton_context_release(t->ctx);
 			mempool_free(t);
@@ -199,8 +201,6 @@ void __export triton_timer_del(struct triton_timer_t *ud)
 {
 	struct _triton_timer_t *t = (struct _triton_timer_t *)ud->tpd;
 
-	close(t->fd);
-
 	spin_lock(&t->ctx->lock);
 	t->ud = NULL;
 	list_del(&t->entry);