log-tcp: fixed incorrect queue overflow handling

ppp: fixed memory leak when ipcp raises error at ConfReq

3 files changed, 4 insertions, 2 deletions

diff --git a/accel-pptpd/cli/std_cmd.c b/accel-pptpd/cli/std_cmd.c
index 9a5747e8..47604df8 100644
--- a/accel-pptpd/cli/std_cmd.c
+++ b/accel-pptpd/cli/std_cmd.c
@@ -112,12 +112,12 @@ static void show_ses_help(char * const *fields, int fields_cnt, void *client)
 
 static void ppp_terminate_soft(struct ppp_t *ppp)
 {
-	ppp_terminate(ppp, 0, TERM_ADMIN_RESET);
+	ppp_terminate(ppp, TERM_ADMIN_RESET, 0);
 }
 
 static void ppp_terminate_hard(struct ppp_t *ppp)
 {
-	ppp_terminate(ppp, 1, TERM_ADMIN_RESET);
+	ppp_terminate(ppp, TERM_ADMIN_RESET, 1);
 }
 
 static void terminate_help(char * const *fields, int fields_cnt, void *client);
diff --git a/accel-pptpd/cli/tcp.c b/accel-pptpd/cli/tcp.c
index 582c1752..f6d2011e 100644
--- a/accel-pptpd/cli/tcp.c
+++ b/accel-pptpd/cli/tcp.c
@@ -332,6 +332,7 @@ static void start_server(const char *host, int port)
 	addr.sin_addr.s_addr = inet_addr(host);
 
 	triton_context_register(&serv_ctx, NULL);
+	triton_context_set_priority(&serv_ctx, 1);
 	triton_md_register_handler(&serv_ctx, &serv_hnd);
 	triton_md_enable_handler(&serv_hnd, MD_MODE_READ);
 	triton_context_wakeup(&serv_ctx);
diff --git a/accel-pptpd/cli/telnet.c b/accel-pptpd/cli/telnet.c
index d38e056b..fef9b0a0 100644
--- a/accel-pptpd/cli/telnet.c
+++ b/accel-pptpd/cli/telnet.c
@@ -621,6 +621,7 @@ static void start_server(const char *host, int port)
 	addr.sin_addr.s_addr = inet_addr(host);
 
 	triton_context_register(&serv_ctx, NULL);
+	triton_context_set_priority(&serv_ctx, 1);
 	triton_md_register_handler(&serv_ctx, &serv_hnd);
 	triton_md_enable_handler(&serv_hnd, MD_MODE_READ);
 	triton_context_wakeup(&serv_ctx);