Move the call to TimerService() into main.c - just after the select()

call.  The SIGALRM just sets a flag now, preventing the possibility of
any nasty recursivness in the handler itself.

1 files changed, 10 insertions, 0 deletions

diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index e70c110..ac8657f 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -818,12 +818,22 @@ DoLoop()
     tp = (dial_up && RedialTimer.state != TIMER_RUNNING) ? &timeout : NULL;
     i = select(tun_in+10, &rfds, &wfds, &efds, tp);
 #endif
+
     if ( i == 0 ) {
         continue;
     }
 
     if ( i < 0 ) {
        if ( errno == EINTR ) {
+          if( TimerServiceRequest > 0 ) {
+#ifdef DEBUG
+             logprintf( "Invoking TimerService\n" );
+#endif
+             /* Maybe a bit cautious.... */
+             TimerServiceRequest = -1;
+             TimerService();
+             TimerServiceRequest = 0;
+          }
           continue;            /* Got SIGALRM, Do check a queue for dialing */
        }
        perror("select");