From 01548ef15e0f41f9f6af33860fb459a7f578f004 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Tue, 4 Mar 1997 03:41:17 +0000
Subject: [PATCH] connect time stuff gone to auth.c, don't die on EINTR from
 opening tty, ignore NCP packets during authentication, fix recursive signal
 problem in kill_my_pg

---
 pppd/main.c | 64 +++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/pppd/main.c b/pppd/main.c
index e462420..0225511 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.39 1996/10/08 06:43:49 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.40 1997/03/04 03:41:17 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -63,6 +63,9 @@ extern char *strerror();
 #ifdef IPX_CHANGE
 #include "ipxcp.h"
 #endif /* IPX_CHANGE */
+#ifdef AT_CHANGE
+#include "atcp.h"
+#endif
 
 /* interface vars */
 char ifname[IFNAMSIZ];		/* Interface name */
@@ -102,7 +105,6 @@ char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
 static void cleanup __P((void));
 static void close_tty __P((void));
 static void get_input __P((void));
-static void connect_time_expired __P((caddr_t));
 static void calltimeout __P((void));
 static struct timeval *timeleft __P((struct timeval *));
 static void hup __P((int));
@@ -144,6 +146,9 @@ struct protent *protocols[] = {
     &ccp_protent,
 #ifdef IPX_CHANGE
     &ipxcp_protent,
+#endif
+#ifdef AT_CHANGE
+    &atcp_protent,
 #endif
     NULL
 };
@@ -204,11 +209,6 @@ main(argc, argv)
 	|| !parse_args(argc-1, argv+1))
 	exit(1);
 
-    if (!ppp_available()) {
-	option_error(no_ppp_msg);
-	exit(1);
-    }
-
     /*
      * Check that we are running as root.
      */
@@ -218,6 +218,11 @@ main(argc, argv)
 	die(1);
     }
 
+    if (!ppp_available()) {
+	option_error(no_ppp_msg);
+	exit(1);
+    }
+
     /*
      * Check that the options given are valid and consistent.
      */
@@ -417,9 +422,11 @@ main(argc, argv)
 	 * the non-blocking I/O bit.
 	 */
 	nonblock = (connector || !modem)? O_NONBLOCK: 0;
-	if ((ttyfd = open(devnam, nonblock | O_RDWR, 0)) < 0) {
-	    syslog(LOG_ERR, "Failed to open %s: %m", devnam);
-	    goto fail;
+	while ((ttyfd = open(devnam, nonblock | O_RDWR, 0)) < 0) {
+	    if (errno != EINTR)
+		syslog(LOG_ERR, "Failed to open %s: %m", devnam);
+	    if (!persist || errno != EINTR)
+		goto fail;
 	}
 	if (nonblock) {
 	    if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1
@@ -493,13 +500,6 @@ main(argc, argv)
 	    }
 	}
 
-	/*
-	 * Set a timeout to close the connection once the maximum
-	 * connect time has expired.
-	 */
-	if (maxconnect > 0)
-	    TIMEOUT(connect_time_expired, 0, maxconnect);
-
 	/*
 	 * Start opening the connection and wait for
 	 * incoming events (reply, timeout, etc.).
@@ -549,7 +549,8 @@ main(argc, argv)
 	}
 
     fail:
-	close_tty();
+	if (ttyfd >= 0)
+	    close_tty();
 	if (locked) {
 	    unlock();
 	    locked = 0;
@@ -639,7 +640,19 @@ get_input()
      */
     if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) {
 	MAINDEBUG((LOG_INFO,
-		   "io(): Received non-LCP packet when LCP not open."));
+		   "get_input: Received non-LCP packet when LCP not open."));
+	return;
+    }
+
+    /*
+     * Until we get past the authentication phase, toss all packets
+     * except LCP, LQR and authentication packets.
+     */
+    if (phase <= PHASE_AUTHENTICATE
+	&& !(protocol == PPP_LCP || protocol == PPP_LQR
+	     || protocol == PPP_PAP || protocol == PPP_CHAP)) {
+	MAINDEBUG((LOG_INFO, "get_input: discarding proto 0x%x in phase %d",
+		   protocol, phase));
 	return;
     }
 
@@ -685,17 +698,6 @@ die(status)
     exit(status);
 }
 
-/*
- * connect_time_expired - log a message and close the connection.
- */
-static void
-connect_time_expired(arg)
-    caddr_t arg;
-{
-    syslog(LOG_INFO, "Connect time expired");
-    lcp_close(0, "Connect time expired");	/* Close connection */
-}
-
 /*
  * cleanup - restore anything which needs to be restored before we exit
  */
@@ -884,8 +886,8 @@ kill_my_pg(sig)
 
     act.sa_handler = SIG_IGN;
     act.sa_flags = 0;
+    kill(0, sig);
     sigaction(sig, &act, &oldact);
-    kill(-getpgrp(), sig);
     sigaction(sig, &oldact, NULL);
 }
 
-- 
2.39.2