[patch] Patch that forces pppd to wait for its childs before trying to reconnect

ppp-2.4.3-child-wait.patch (text/plain), 1.11 KB, created by Alin Năstac (RETIRED) on 2006-02-17 12:53:29 UTC

diff -Nur ppp-2.4.3.orig/pppd/main.c ppp-2.4.3/pppd/main.c
--- ppp-2.4.3.orig/pppd/main.c	2006-02-17 18:30:49.000000000 +0200
+++ ppp-2.4.3/pppd/main.c	2006-02-17 22:45:54.629840750 +0200
@@ -587,6 +587,27 @@
 		if (kill_link)
 		    new_phase(PHASE_DORMANT); /* allow signal to end holdoff */
 	    } while (phase == PHASE_HOLDOFF);
+
+		/* Wait for scripts to finish */
+		reap_kids();
+		if (n_children > 0) {
+			childwait_done = 0;
+			if (child_wait > 0) {
+				TIMEOUT(childwait_end, NULL, child_wait);
+			}
+			if (debug) {
+				struct subprocess *chp;
+				dbglog("Waiting for %d child processes...", n_children);
+				for (chp = children; chp != NULL; chp = chp->next)
+					dbglog("  script %s, pid %d", chp->prog, chp->pid);
+			}
+			while (n_children > 0 && !childwait_done) {
+				handle_events();
+				if (kill_link && !childwait_done)
+					childwait_end(NULL);
+			}
+		}
+
 	    if (!persist)
 		break;
 	}
@@ -595,6 +616,7 @@
     /* Wait for scripts to finish */
     reap_kids();
     if (n_children > 0) {
+	childwait_done = 0;
 	if (child_wait > 0)
 	    TIMEOUT(childwait_end, NULL, child_wait);
 	if (debug) {