X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fmain.c;h=4da0b9af4bc73b2eaf9dea34abcea2ec18368938;hb=a3630de20e34796f434a728bfd9cf1a961380c82;hp=7eee19215e5439dc6aea01d3cb5cb01d92c728e3;hpb=10d17d19d3f7fe61e3b1f46a97198c521b535589;p=ppp.git

diff --git a/pppd/main.c b/pppd/main.c
index 7eee192..4da0b9a 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -17,9 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.79 1999/05/13 00:35:23 paulus Exp $";
-#endif
+#define RCSID	"$Id: main.c,v 1.83 1999/08/13 06:46:15 paulus Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -65,6 +63,8 @@ static char rcsid[] = "$Id: main.c,v 1.79 1999/05/13 00:35:23 paulus Exp $";
 #include "atcp.h"
 #endif
 
+static const char rcsid[] = RCSID;
+
 /* interface vars */
 char ifname[32];		/* Interface name */
 int ifunit;			/* Interface unit number */
@@ -72,6 +72,7 @@ int ifunit;			/* Interface unit number */
 char *progname;			/* Name of this program */
 char hostname[MAXNAMELEN];	/* Our hostname */
 static char pidfilename[MAXPATHLEN];	/* name of pid file */
+static char linkpidfile[MAXPATHLEN];	/* name of linkname pid file */
 static char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
 static uid_t uid;		/* Our real user-id */
 static int conn_running;	/* we have a [dis]connector running */
@@ -85,7 +86,9 @@ int need_holdoff;		/* need holdoff period before restarting */
 int detached;			/* have detached from terminal */
 struct stat devstat;		/* result of stat() on devnam */
 int prepass = 0;		/* doing prepass to find device name */
+int devnam_fixed;		/* set while in options.ttyxx file */
 volatile int status;		/* exit status for pppd */
+int unsuccess;			/* # unsuccessful connection attempts */
 
 static int fd_ppp = -1;		/* fd for talking PPP */
 static int fd_loop;		/* fd for getting demand-dial packets */
@@ -142,6 +145,7 @@ static struct subprocess *children;
 /* Prototypes for procedures local to this file. */
 
 static void create_pidfile __P((void));
+static void create_linkpidfile __P((void));
 static void cleanup __P((void));
 static void close_tty __P((void));
 static void get_input __P((void));
@@ -287,24 +291,13 @@ main(argc, argv)
      * The per-tty options file should not change
      * ptycommand, notty or devnam.
      */
+    devnam_fixed = 1;
     if (!using_pty) {
-	int save_defdev = default_device;
-
-	default_device = 1;
 	if (!options_for_tty())
 	    exit(EXIT_OPTION_ERROR);
-	if (notty || ptycommand != NULL) {
-	    option_error("%s option may not be used in per-tty options file",
-			 notty? "notty": "pty");
-	    exit(EXIT_OPTION_ERROR);
-	}
-	if (!default_device) {
-	    option_error("per-tty options file may not specify device name");
-	    exit(EXIT_OPTION_ERROR);
-	}
-	default_device = save_defdev;
     }
 
+    devnam_fixed = 0;
     if (!parse_args(argc-1, argv+1))
 	exit(EXIT_OPTION_ERROR);
 
@@ -481,6 +474,8 @@ main(argc, argv)
 
     waiting = 0;
 
+    create_linkpidfile();
+
     /*
      * If we're doing dial-on-demand, set up the interface now.
      */
@@ -508,6 +503,7 @@ main(argc, argv)
 	ttyfd = -1;
 	real_ttyfd = -1;
 	status = EXIT_OK;
+	++unsuccess;
 
 	if (demand) {
 	    /*
@@ -551,6 +547,8 @@ main(argc, argv)
 	    info("Starting link");
 	}
 
+	phase = PHASE_SERIALCONN;
+
 	/*
 	 * Get a pty master/slave pair if the pty, notty, or record
 	 * options were specified.
@@ -622,7 +620,7 @@ main(argc, argv)
 
 	    /*
 	     * Set line speed, flow control, etc.
-	     * If we have a non-null connection script,
+	     * If we have a non-null connection or initializer script,
 	     * on most systems we set CLOCAL for now so that we can talk
 	     * to the modem before carrier comes up.  But this has the
 	     * side effect that we might miss it if CD drops before we
@@ -630,7 +628,8 @@ main(argc, argv)
 	     * successfully to the modem with CLOCAL clear and CD down,
 	     * we could clear CLOCAL at this point.
 	     */
-	    set_up_tty(ttyfd, (connector != NULL && connector[0] != 0));
+	    set_up_tty(ttyfd, ((connector != NULL && connector[0] != 0)
+			       || initializer != NULL));
 	    real_ttyfd = ttyfd;
 	}
 
@@ -669,9 +668,7 @@ main(argc, argv)
 	}
 
 	/* run connection script */
-	if (connector && connector[0]) {
-	    MAINDEBUG(("Connecting with <%s>", connector));
-
+	if ((connector && connector[0]) || initializer) {
 	    if (real_ttyfd != -1) {
 		if (!default_device && modem) {
 		    setdtr(real_ttyfd, 0);	/* in case modem is off hook */
@@ -680,15 +677,29 @@ main(argc, argv)
 		}
 	    }
 
-	    if (device_script(connector, ttyfd, ttyfd, 0) < 0) {
-		error("Connect script failed");
-		status = EXIT_CONNECT_FAILED;
-		goto fail;
+	    if (initializer && initializer[0]) {
+		if (device_script(initializer, ttyfd, ttyfd, 0) < 0) {
+		    error("Initializer script failed");
+		    status = EXIT_INIT_FAILED;
+		    goto fail;
+		}
+		if (kill_link)
+		    goto disconnect;
+
+		info("Serial port initialized.");
 	    }
-	    if (kill_link)
-		goto disconnect;
 
-	    info("Serial connection established.");
+	    if (connector && connector[0]) {
+		if (device_script(connector, ttyfd, ttyfd, 0) < 0) {
+		    error("Connect script failed");
+		    status = EXIT_CONNECT_FAILED;
+		    goto fail;
+		}
+		if (kill_link)
+		    goto disconnect;
+
+		info("Serial connection established.");
+	    }
 
 	    /* set line speed, flow control, etc.;
 	       clear CLOCAL if modem option */
@@ -847,11 +858,11 @@ main(argc, argv)
 	if (!demand) {
 	    if (pidfilename[0] != 0
 		&& unlink(pidfilename) < 0 && errno != ENOENT) 
-		warn("unable to delete pid file: %m");
+		warn("unable to delete pid file %s: %m", pidfilename);
 	    pidfilename[0] = 0;
 	}
 
-	if (!persist)
+	if (!persist || (maxfail > 0 && unsuccess >= maxfail))
 	    break;
 
 	kill_link = 0;
@@ -886,6 +897,7 @@ main(argc, argv)
     }
 
     /* Wait for scripts to finish */
+    /* XXX should have a timeout here */
     while (n_children > 0) {
 	if (debug) {
 	    struct subprocess *chp;
@@ -927,9 +939,11 @@ detach()
     close(2);
     detached = 1;
     log_to_fd = -1;
-    /* update pid file if it has been written already */
+    /* update pid files if they have been written already */
     if (pidfilename[0])
 	create_pidfile();
+    if (linkpidfile[0])
+	create_linkpidfile();
 }
 
 /*
@@ -966,6 +980,29 @@ create_pidfile()
     }
     slprintf(numbuf, sizeof(numbuf), "%d", getpid());
     script_setenv("PPPD_PID", numbuf);
+    if (linkpidfile[0])
+	create_linkpidfile();
+}
+
+static void
+create_linkpidfile()
+{
+    FILE *pidfile;
+
+    if (linkname[0] == 0)
+	return;
+    slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid",
+	     _PATH_VARRUN, linkname);
+    if ((pidfile = fopen(linkpidfile, "w")) != NULL) {
+	fprintf(pidfile, "%d\n", getpid());
+	if (pidfilename[0])
+	    fprintf(pidfile, "%s\n", ifname);
+	(void) fclose(pidfile);
+    } else {
+	error("Failed to create pid file %s: %m", linkpidfile);
+	linkpidfile[0] = 0;
+    }
+    script_setenv("LINKNAME", linkname);
 }
 
 /*
@@ -1084,8 +1121,11 @@ cleanup()
 	close_tty();
 
     if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) 
-	warn("unable to delete pid file: %m");
+	warn("unable to delete pid file %s: %m", pidfilename);
     pidfilename[0] = 0;
+    if (linkpidfile[0] != 0 && unlink(linkpidfile) < 0 && errno != ENOENT) 
+	warn("unable to delete pid file %s: %m", linkpidfile);
+    linkpidfile[0] = 0;
 
     if (locked)
 	unlock();