From b061e4b770edc2eee4a6df7831068a53e61d185d Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Sat, 4 Sep 2021 01:52:28 +0300 Subject: Terminate session by the second PoD when soft-terminate=1 configured --- accel-pppd/session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/accel-pppd/session.c b/accel-pppd/session.c index 1411f24..78d12f9 100644 --- a/accel-pppd/session.c +++ b/accel-pppd/session.c @@ -278,6 +278,8 @@ void __export ap_session_terminate(struct ap_session *ses, int cause, int hard) if (ses->terminating) { if (hard) ses->ctrl->terminate(ses, hard); + else if (ses->state == AP_STATE_FINISHING) + ses->ctrl->terminate(ses, 1); return; } -- cgit v1.2.3 From 2117fb22a60973e773ccf97c17cd2b48e78f6d76 Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Sat, 4 Sep 2021 02:41:36 +0300 Subject: T46: Fix per-user-dir logging --- accel-pppd/logs/log_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel-pppd/logs/log_file.c b/accel-pppd/logs/log_file.c index 42d9f3f..481afa1 100644 --- a/accel-pppd/logs/log_file.c +++ b/accel-pppd/logs/log_file.c @@ -268,7 +268,7 @@ static struct ap_private *find_pd(struct ap_session *ses, void *pd_key) struct list_head *pos, *next; list_for_each_safe(pos, next, &ses->pd_list) { - pd = list_entry(pos->next, typeof(*pd), entry); + pd = list_entry(pos, typeof(*pd), entry); if (pd->key == pd_key) { return pd; } -- cgit v1.2.3