pppd_compat: fixed bug caused fork queue to stall

3 files changed, 9 insertions, 3 deletions

diff --git a/accel-pppd/extra/pppd_compat.c b/accel-pppd/extra/pppd_compat.c
index 0ed8836..c62fabc 100644
--- a/accel-pppd/extra/pppd_compat.c
+++ b/accel-pppd/extra/pppd_compat.c
@@ -385,7 +385,8 @@ static void ev_ses_finished(struct ap_session *ses)
 			log_ppp_warn("pppd_compat: ip-up is not yet finished, killing it ...\n");
 			kill(pd->ip_up_hnd.pid, SIGKILL);
 			pthread_mutex_unlock(&pd->ip_up_hnd.lock);
-			sigchld_unregister_handler(&pd->ip_up_hnd);
+			if (sigchld_unregister_handler(&pd->ip_up_hnd))
+				fork_queue_wakeup();
 		} else
 			pthread_mutex_unlock(&pd->ip_up_hnd.lock);
 	}
diff --git a/accel-pppd/extra/sigchld.c b/accel-pppd/extra/sigchld.c
index cfce2cd..d03a7ff 100644
--- a/accel-pppd/extra/sigchld.c
+++ b/accel-pppd/extra/sigchld.c
@@ -82,16 +82,21 @@ void __export sigchld_register_handler(struct sigchld_handler_t *h)
 	pthread_mutex_unlock(&handlers_lock);
 }
 
-void __export sigchld_unregister_handler(struct sigchld_handler_t *h)
+int __export sigchld_unregister_handler(struct sigchld_handler_t *h)
 {
+	int r = 0;
+
 	pthread_mutex_lock(&handlers_lock);
 	pthread_mutex_lock(&h->lock);
 	if (h->pid) {
 		list_del(&h->entry);
 		h->pid = 0;
+		r = 1;
 	}
 	pthread_mutex_unlock(&h->lock);
 	pthread_mutex_unlock(&handlers_lock);
+
+	return r;
 }
 
 void __export sigchld_lock()
diff --git a/accel-pppd/extra/sigchld.h b/accel-pppd/extra/sigchld.h
index 27d1adf..f06adab 100644
--- a/accel-pppd/extra/sigchld.h
+++ b/accel-pppd/extra/sigchld.h
@@ -13,7 +13,7 @@ struct sigchld_handler_t
 };
 
 void sigchld_register_handler(struct sigchld_handler_t *);
-void sigchld_unregister_handler(struct sigchld_handler_t *);
+int sigchld_unregister_handler(struct sigchld_handler_t *);
 void sigchld_lock();
 void sigchld_unlock();