Move handle_signals() to before the FD_SETs. handle_signals()

may result in a our modem closing after it's made its way into
the fd_set, resulting in a program exit (with select(): bad file
descriptor) rather than a dropped link.

1 files changed, 6 insertions, 3 deletions

diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index e0672ed03eb..ac2bb15af0c 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.17 1998/01/29 00:35:33 brian Exp $
+ * $Id: main.c,v 1.18 1998/02/11 19:45:03 brian Exp $
  *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
@@ -885,6 +885,11 @@ DoLoop(void)
       IpStartOutput();
       qlen = ModemQlen();
     }
+
+#ifdef SIGALRM
+    handle_signals();
+#endif
+
     if (modem >= 0) {
       if (modem + 1 > nfds)
 	nfds = modem + 1;
@@ -910,8 +915,6 @@ DoLoop(void)
      */
     usleep(TICKUNIT);
     TimerService();
-#else
-    handle_signals();
 #endif
 
     /* If there are aren't many packets queued, look for some more. */