Merge branch 'master' of github.com:accel-ppp/accel-ppp

accel-ppp · Sep 24, 2021 · ff91c73 · ff91c73
2 parents 3b01433 + fb615c9
commit ff91c73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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;
 		}

diff --git 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;
 	}