don't fall over in the charshunt if we get an EAGAIN or EINTR

[ppp.git] / pppd / main.c

diff --git a/pppd/main.c b/pppd/main.c
index c618a2616f600367aa134b59e33086f07b071bdc..0722e9104076417b68500f16058a98f31f1e8f2d 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -17,9 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.70 1999/03/31 05:39:42 paulus Exp $";
-#endif
+#define RCSID  "$Id: main.c,v 1.98 2000/04/29 12:32:59 paulus Exp $"

 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>


@@ -42,26 +40,27 @@ static char rcsid[] = "$Id: main.c,v 1.70 1999/03/31 05:39:42 paulus Exp $";
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

+#include <arpa/inet.h>

 
 #include "pppd.h"
 #include "magic.h"
 #include "fsm.h"
 #include "lcp.h"
 #include "ipcp.h"
 
 #include "pppd.h"
 #include "magic.h"
 #include "fsm.h"
 #include "lcp.h"
 #include "ipcp.h"

+#ifdef INET6
+#include "ipv6cp.h"
+#endif

 #include "upap.h"
 #include "chap.h"
 #include "ccp.h"
 #include "pathnames.h"
 #include "patchlevel.h"
 #include "upap.h"
 #include "chap.h"
 #include "ccp.h"
 #include "pathnames.h"
 #include "patchlevel.h"

+#include "tdb.h"

 
 #ifdef CBCP_SUPPORT
 #include "cbcp.h"
 #endif
 
 
 #ifdef CBCP_SUPPORT
 #include "cbcp.h"
 #endif
 

-#if defined(SUNOS4)
-extern char *strerror();
-#endif
-

 #ifdef IPX_CHANGE
 #include "ipxcp.h"
 #endif /* IPX_CHANGE */
 #ifdef IPX_CHANGE
 #include "ipxcp.h"
 #endif /* IPX_CHANGE */


@@ -69,6 +68,8 @@ extern char *strerror();
 #include "atcp.h"
 #endif
 
 #include "atcp.h"
 #endif
 

+static const char rcsid[] = RCSID;
+

 /* interface vars */
 char ifname[32];               /* Interface name */
 int ifunit;                    /* Interface unit number */
 /* interface vars */
 char ifname[32];               /* Interface name */
 int ifunit;                    /* Interface unit number */


@@ -76,19 +77,31 @@ int ifunit;                 /* Interface unit number */
 char *progname;                        /* Name of this program */
 char hostname[MAXNAMELEN];     /* Our hostname */
 static char pidfilename[MAXPATHLEN];   /* name of pid file */
 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 char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */

-static pid_t pid;              /* Our pid */

 static uid_t uid;              /* Our real user-id */
 static int conn_running;       /* we have a [dis]connector running */
 
 int ttyfd;                     /* Serial port file descriptor */
 static uid_t uid;              /* Our real user-id */
 static int conn_running;       /* we have a [dis]connector running */
 
 int ttyfd;                     /* Serial port file descriptor */

-mode_t tty_mode = -1;          /* Original access permissions to tty */
+mode_t tty_mode = (mode_t)-1;  /* Original access permissions to tty */

 int baud_rate;                 /* Actual bits/second for serial device */
 int hungup;                    /* terminal has been hung up */
 int privileged;                        /* we're running as real uid root */
 int need_holdoff;              /* need holdoff period before restarting */
 int detached;                  /* have detached from terminal */
 int baud_rate;                 /* Actual bits/second for serial device */
 int hungup;                    /* terminal has been hung up */
 int privileged;                        /* we're running as real uid root */
 int need_holdoff;              /* need holdoff period before restarting */
 int detached;                  /* have detached from terminal */

-int log_to_fd;                 /* send log messages to this fd too */
+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 */
+int do_callback;               /* != 0 if we should do callback next */
+int doing_callback;            /* != 0 if we are doing callback */
+char *callback_script;         /* script for doing callback */
+TDB_CONTEXT *pppdb;            /* database for storing status etc. */
+char db_key[32];
+
+int (*holdoff_hook) __P((void)) = NULL;
+int (*new_phase_hook) __P((int)) = NULL;

 
 static int fd_ppp = -1;                /* fd for talking PPP */
 static int fd_loop;            /* fd for getting demand-dial packets */
 
 static int fd_ppp = -1;                /* fd for talking PPP */
 static int fd_loop;            /* fd for getting demand-dial packets */


@@ -113,6 +126,7 @@ static int n_children;              /* # child processes still running */
 static int got_sigchld;                /* set if we have received a SIGCHLD */
 
 static int locked;             /* lock() has succeeded */
 static int got_sigchld;                /* set if we have received a SIGCHLD */
 
 static int locked;             /* lock() has succeeded */

+static int privopen;           /* don't lock, open device as root */

 
 char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
 
 
 char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
 


@@ -122,13 +136,30 @@ int ngroups;                      /* How many groups valid in groups */
 static struct timeval start_time;      /* Time when link was started. */
 
 struct pppd_stats link_stats;
 static struct timeval start_time;      /* Time when link was started. */
 
 struct pppd_stats link_stats;

+int link_connect_time;

 int link_stats_valid;
 
 static int charshunt_pid;      /* Process ID for charshunt */
 
 int link_stats_valid;
 
 static int charshunt_pid;      /* Process ID for charshunt */
 

+/*
+ * We maintain a list of child process pids and
+ * functions to call when they exit.
+ */
+struct subprocess {
+    pid_t      pid;
+    char       *prog;
+    void       (*done) __P((void *));
+    void       *arg;
+    struct subprocess *next;
+};
+
+static struct subprocess *children;
+

 /* Prototypes for procedures local to this file. */
 
 /* Prototypes for procedures local to this file. */
 

+static void setup_signals __P((void));

 static void create_pidfile __P((void));
 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));
 static void cleanup __P((void));
 static void close_tty __P((void));
 static void get_input __P((void));


@@ -143,18 +174,18 @@ static void open_ccp __P((int));
 static void bad_signal __P((int));
 static void holdoff_end __P((void *));
 static int device_script __P((char *, int, int, int));
 static void bad_signal __P((int));
 static void holdoff_end __P((void *));
 static int device_script __P((char *, int, int, int));

-static void reap_kids __P((int waitfor));
-static void pr_log __P((void *, char *, ...));
-static void logit __P((int, char *, va_list));
-static void vslp_printer __P((void *, char *, ...));
-static void format_packet __P((u_char *, int, void (*) (void *, char *, ...),
-                              void *));
+static int reap_kids __P((int waitfor));

 static void record_child __P((int, char *, void (*) (void *), void *));
 static void record_child __P((int, char *, void (*) (void *), void *));

+static void update_db_entry __P((void));
+static void add_db_key __P((const char *));
+static void delete_db_key __P((const char *));
+static void cleanup_db __P((void));
+static int open_socket __P((char *));

 static int start_charshunt __P((int, int));
 static void charshunt_done __P((void *));
 static void charshunt __P((int, int, char *));
 static int start_charshunt __P((int, int));
 static void charshunt_done __P((void *));
 static void charshunt __P((int, int, char *));

-static int record_write(FILE *, int code, u_char *buf, int nb,
-                       struct timeval *);
+static int record_write __P((FILE *, int code, u_char *buf, int nb,
+                            struct timeval *));

 
 extern char    *ttyname __P((int));
 extern char    *getlogin __P((void));
 
 extern char    *ttyname __P((int));
 extern char    *getlogin __P((void));


@@ -182,6 +213,9 @@ struct protent *protocols[] = {
     &cbcp_protent,
 #endif
     &ipcp_protent,
     &cbcp_protent,
 #endif
     &ipcp_protent,

+#ifdef INET6
+    &ipv6cp_protent,
+#endif

     &ccp_protent,
 #ifdef IPX_CHANGE
     &ipxcp_protent,
     &ccp_protent,
 #ifdef IPX_CHANGE
     &ipxcp_protent,


@@ -192,24 +226,41 @@ struct protent *protocols[] = {
     NULL
 };
 
     NULL
 };
 

+/*
+ * If PPP_DRV_NAME is not defined, use the legacy "ppp" as the
+ * device name.
+ */
+#if !defined(PPP_DRV_NAME)
+#define PPP_DRV_NAME   "ppp"
+#endif /* !defined(PPP_DRV_NAME) */
+

 int
 main(argc, argv)
     int argc;
     char *argv[];
 {
 int
 main(argc, argv)
     int argc;
     char *argv[];
 {

-    int i, fdflags;
-    struct sigaction sa;
-    char *p;
+    int i, fdflags, t;
+    char *p, *connector;

     struct passwd *pw;
     struct timeval timo;
     sigset_t mask;
     struct protent *protp;
     struct stat statbuf;
     char numbuf[16];
     struct passwd *pw;
     struct timeval timo;
     sigset_t mask;
     struct protent *protp;
     struct stat statbuf;
     char numbuf[16];

-    struct timeval now;

 
 

-    phase = PHASE_INITIALIZE;
-    log_to_fd = -1;
+    new_phase(PHASE_INITIALIZE);
+
+    /*
+     * Ensure that fds 0, 1, 2 are open, to /dev/null if nowhere else.
+     * This way we can close 0, 1, 2 in detach() without clobbering
+     * a fd that we are using.
+     */
+    if ((i = open("/dev/null", O_RDWR)) >= 0) {
+       while (0 <= i && i <= 2)
+           i = dup(i);
+       if (i >= 0)
+           close(i);
+    }

 
     script_env = NULL;
 
 
     script_env = NULL;
 


@@ -222,13 +273,22 @@ main(argc, argv)
     }
     hostname[MAXNAMELEN-1] = 0;
 
     }
     hostname[MAXNAMELEN-1] = 0;
 

+    /* make sure we don't create world or group writable files. */
+    umask(umask(0777) | 022);
+

     uid = getuid();
     privileged = uid == 0;
     slprintf(numbuf, sizeof(numbuf), "%d", uid);
     uid = getuid();
     privileged = uid == 0;
     slprintf(numbuf, sizeof(numbuf), "%d", uid);

-    script_setenv("ORIG_UID", numbuf);
+    script_setenv("ORIG_UID", numbuf, 0);

 
     ngroups = getgroups(NGROUPS_MAX, groups);
 
 
     ngroups = getgroups(NGROUPS_MAX, groups);
 

+    /*
+     * Initialize magic number generator now so that protocols may
+     * use magic numbers in initialization.
+     */
+    magic_init();
+

     /*
      * Initialize to the standard option set, then parse, in order,
      * the system options file, the user's options file,
     /*
      * Initialize to the standard option set, then parse, in order,
      * the system options file, the user's options file,


@@ -239,31 +299,45 @@ main(argc, argv)
 
     progname = *argv;
 
 
     progname = *argv;
 

+    prepass = 0;

     if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1)
        || !options_from_user())
     if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1)
        || !options_from_user())

-       exit(1);
-    using_pty = notty || ptycommand != NULL;
-    scan_args(argc-1, argv+1); /* look for tty name on command line */
+       exit(EXIT_OPTION_ERROR);
+
+    /* scan command line and options files to find device name */
+    prepass = 1;
+    parse_args(argc-1, argv+1);
+    prepass = 0;

 
     /*
      * Work out the device name, if it hasn't already been specified.
      */
 
     /*
      * Work out the device name, if it hasn't already been specified.
      */

-    if (!using_pty) {
-       p = isatty(0)? ttyname(0): NULL;
-       if (p != NULL) {
-           if (default_device)
-               strlcpy(devnam, p, sizeof(devnam));
-           else if (strcmp(devnam, p) == 0)
-               default_device = 1;
+    using_pty = notty || ptycommand != NULL || pty_socket != NULL;
+    if (!using_pty && default_device) {
+       char *p;
+       if (!isatty(0) || (p = ttyname(0)) == NULL) {
+           option_error("no device specified and stdin is not a tty");
+           exit(EXIT_OPTION_ERROR);

        }
        }

+       strlcpy(devnam, p, sizeof(devnam));
+       if (stat(devnam, &devstat) < 0)
+           fatal("Couldn't stat default device %s: %m", devnam);

     }
 
     /*
      * Parse the tty options file and the command line.
     }
 
     /*
      * Parse the tty options file and the command line.

+     * The per-tty options file should not change
+     * ptycommand, pty_socket, notty or devnam.

      */
      */

-    if (!options_for_tty()
-       || !parse_args(argc-1, argv+1))
-       exit(1);
+    devnam_fixed = 1;
+    if (!using_pty) {
+       if (!options_for_tty())
+           exit(EXIT_OPTION_ERROR);
+    }
+
+    devnam_fixed = 0;
+    if (!parse_args(argc-1, argv+1))
+       exit(EXIT_OPTION_ERROR);

 
     /*
      * Check that we are running as root.
 
     /*
      * Check that we are running as root.


@@ -271,69 +345,104 @@ main(argc, argv)
     if (geteuid() != 0) {
        option_error("must be root to run %s, since it is not setuid-root",
                     argv[0]);
     if (geteuid() != 0) {
        option_error("must be root to run %s, since it is not setuid-root",
                     argv[0]);

-       exit(1);
+       exit(EXIT_NOT_ROOT);

     }
 
     if (!ppp_available()) {
        option_error(no_ppp_msg);
     }
 
     if (!ppp_available()) {
        option_error(no_ppp_msg);

-       exit(1);
+       exit(EXIT_NO_KERNEL_SUPPORT);

     }
 
     /*
      * Check that the options given are valid and consistent.
      */
     if (!sys_check_options())
     }
 
     /*
      * Check that the options given are valid and consistent.
      */
     if (!sys_check_options())

-       exit(1);
+       exit(EXIT_OPTION_ERROR);

     auth_check_options();
     auth_check_options();

+#ifdef HAVE_MULTILINK
+    mp_check_options();
+#endif

     for (i = 0; (protp = protocols[i]) != NULL; ++i)
        if (protp->check_options != NULL)
            (*protp->check_options)();
     for (i = 0; (protp = protocols[i]) != NULL; ++i)
        if (protp->check_options != NULL)
            (*protp->check_options)();

-    if (demand && connector == 0) {
+    if (demand && connect_script == 0) {

        option_error("connect script is required for demand-dialling\n");
        option_error("connect script is required for demand-dialling\n");

-       exit(1);
+       exit(EXIT_OPTION_ERROR);

     }
     }

+    /* default holdoff to 0 if no connect script has been given */
+    if (connect_script == 0 && !holdoff_specified)
+       holdoff = 0;

 
     if (using_pty) {
        if (!default_device) {
            option_error("%s option precludes specifying device name",
                         notty? "notty": "pty");
 
     if (using_pty) {
        if (!default_device) {
            option_error("%s option precludes specifying device name",
                         notty? "notty": "pty");

-           exit(1);
+           exit(EXIT_OPTION_ERROR);

        }
        if (ptycommand != NULL && notty) {
            option_error("pty option is incompatible with notty option");
        }
        if (ptycommand != NULL && notty) {
            option_error("pty option is incompatible with notty option");

-           exit(1);
+           exit(EXIT_OPTION_ERROR);
+       }
+       if (pty_socket != NULL && (ptycommand != NULL || notty)) {
+           option_error("socket option is incompatible with pty and notty");
+           exit(EXIT_OPTION_ERROR);

        }
        default_device = notty;
        lockflag = 0;
        modem = 0;
        }
        default_device = notty;
        lockflag = 0;
        modem = 0;

+       if (notty && log_to_fd <= 1)
+           log_to_fd = -1;

     } else {
     } else {

-       if (devnam[0] == 0) {
-           option_error("no device specified and stdin is not a tty");
-           exit(1);
+       /*
+        * If the user has specified a device which is the same as
+        * the one on stdin, pretend they didn't specify any.
+        * If the device is already open read/write on stdin,
+        * we assume we don't need to lock it, and we can open it as root.
+        */
+       if (fstat(0, &statbuf) >= 0 && S_ISCHR(statbuf.st_mode)
+           && statbuf.st_rdev == devstat.st_rdev) {
+           default_device = 1;
+           fdflags = fcntl(0, F_GETFL);
+           if (fdflags != -1 && (fdflags & O_ACCMODE) == O_RDWR)
+               privopen = 1;

        }
     }
     if (default_device)
        nodetach = 1;
        }
     }
     if (default_device)
        nodetach = 1;

-    else
-       log_to_fd = 1;          /* default to stdout */

 
 

-    script_setenv("DEVICE", devnam);
+    /*
+     * Don't send log messages to the serial port, it tends to
+     * confuse the peer. :-)
+     */
+    if (log_to_fd >= 0 && fstat(log_to_fd, &statbuf) >= 0
+       && S_ISCHR(statbuf.st_mode) && statbuf.st_rdev == devstat.st_rdev)
+       log_to_fd = -1;

 
     /*
 
     /*

-     * Initialize system-dependent stuff and magic number package.
+     * Initialize system-dependent stuff.

      */
     sys_init();
      */
     sys_init();

-    magic_init();

     if (debug)
        setlogmask(LOG_UPTO(LOG_DEBUG));
 
     if (debug)
        setlogmask(LOG_UPTO(LOG_DEBUG));
 

+    pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644);
+    if (pppdb != NULL) {
+       slprintf(db_key, sizeof(db_key), "pppd%d", getpid());
+       update_db_entry();
+    } else {
+       warn("Warning: couldn't open ppp database %s", _PATH_PPPDB);
+       if (multilink) {
+           warn("Warning: disabling multilink");
+           multilink = 0;
+       }
+    }
+

     /*
      * Detach ourselves from the terminal, if required,
      * and identify who is running us.
      */
     if (!nodetach && !updetach)
        detach();
     /*
      * Detach ourselves from the terminal, if required,
      * and identify who is running us.
      */
     if (!nodetach && !updetach)
        detach();

-    pid = getpid();

     p = getlogin();
     if (p == NULL) {
        pw = getpwuid(uid);
     p = getlogin();
     if (p == NULL) {
        pw = getpwuid(uid);


@@ -344,83 +453,19 @@ main(argc, argv)
     }
     syslog(LOG_NOTICE, "pppd %s.%d%s started by %s, uid %d",
           VERSION, PATCHLEVEL, IMPLEMENTATION, p, uid);
     }
     syslog(LOG_NOTICE, "pppd %s.%d%s started by %s, uid %d",
           VERSION, PATCHLEVEL, IMPLEMENTATION, p, uid);

-  
-    /*
-     * Compute mask of all interesting signals and install signal handlers
-     * for each.  Only one signal handler may be active at a time.  Therefore,
-     * all other signals should be masked when any handler is executing.
-     */
-    sigemptyset(&mask);
-    sigaddset(&mask, SIGHUP);
-    sigaddset(&mask, SIGINT);
-    sigaddset(&mask, SIGTERM);
-    sigaddset(&mask, SIGCHLD);
-    sigaddset(&mask, SIGUSR2);
-
-#define SIGNAL(s, handler)     do { \
-       sa.sa_handler = handler; \
-       if (sigaction(s, &sa, NULL) < 0) \
-           fatal("Couldn't establish signal handler (%d): %m", s); \
-    } while (0)
+    script_setenv("PPPLOGNAME", p, 0);

 
 

-    sa.sa_mask = mask;
-    sa.sa_flags = 0;
-    SIGNAL(SIGHUP, hup);               /* Hangup */
-    SIGNAL(SIGINT, term);              /* Interrupt */
-    SIGNAL(SIGTERM, term);             /* Terminate */
-    SIGNAL(SIGCHLD, chld);
+    if (devnam[0])
+       script_setenv("DEVICE", devnam, 1);
+    slprintf(numbuf, sizeof(numbuf), "%d", getpid());
+    script_setenv("PPPD_PID", numbuf, 1);

 
 

-    SIGNAL(SIGUSR1, toggle_debug);     /* Toggle debug flag */
-    SIGNAL(SIGUSR2, open_ccp);         /* Reopen CCP */
-
-    /*
-     * Install a handler for other signals which would otherwise
-     * cause pppd to exit without cleaning up.
-     */
-    SIGNAL(SIGABRT, bad_signal);
-    SIGNAL(SIGALRM, bad_signal);
-    SIGNAL(SIGFPE, bad_signal);
-    SIGNAL(SIGILL, bad_signal);
-    SIGNAL(SIGPIPE, bad_signal);
-    SIGNAL(SIGQUIT, bad_signal);
-    SIGNAL(SIGSEGV, bad_signal);
-#ifdef SIGBUS
-    SIGNAL(SIGBUS, bad_signal);
-#endif
-#ifdef SIGEMT
-    SIGNAL(SIGEMT, bad_signal);
-#endif
-#ifdef SIGPOLL
-    SIGNAL(SIGPOLL, bad_signal);
-#endif
-#ifdef SIGPROF
-    SIGNAL(SIGPROF, bad_signal);
-#endif
-#ifdef SIGSYS
-    SIGNAL(SIGSYS, bad_signal);
-#endif
-#ifdef SIGTRAP
-    SIGNAL(SIGTRAP, bad_signal);
-#endif
-#ifdef SIGVTALRM
-    SIGNAL(SIGVTALRM, bad_signal);
-#endif
-#ifdef SIGXCPU
-    SIGNAL(SIGXCPU, bad_signal);
-#endif
-#ifdef SIGXFSZ
-    SIGNAL(SIGXFSZ, bad_signal);
-#endif
-
-    /*
-     * Apparently we can get a SIGPIPE when we call syslog, if
-     * syslogd has died and been restarted.  Ignoring it seems
-     * be sufficient.
-     */
-    signal(SIGPIPE, SIG_IGN);
+    setup_signals();

 
     waiting = 0;
 
 
     waiting = 0;
 

+    create_linkpidfile();
+

     /*
      * If we're doing dial-on-demand, set up the interface now.
      */
     /*
      * If we're doing dial-on-demand, set up the interface now.
      */


@@ -428,13 +473,10 @@ main(argc, argv)
        /*
         * Open the loopback channel and set it up to be the ppp interface.
         */
        /*
         * Open the loopback channel and set it up to be the ppp interface.
         */

+       tdb_writelock(pppdb);

        fd_loop = open_ppp_loopback();
        fd_loop = open_ppp_loopback();

-
-       syslog(LOG_INFO, "Using interface ppp%d", ifunit);
-       slprintf(ifname, sizeof(ifname), "ppp%d", ifunit);
-       script_setenv("IFNAME", ifname);
-
-       create_pidfile();       /* write pid to file */
+       set_ifunit(1);
+       tdb_writeunlock(pppdb);

 
        /*
         * Configure the interface and mark it up, etc.
 
        /*
         * Configure the interface and mark it up, etc.


@@ -442,24 +484,29 @@ main(argc, argv)
        demand_conf();
     }
 
        demand_conf();
     }
 

+    do_callback = 0;

     for (;;) {
 
        need_holdoff = 1;
        ttyfd = -1;
        real_ttyfd = -1;
     for (;;) {
 
        need_holdoff = 1;
        ttyfd = -1;
        real_ttyfd = -1;

+       status = EXIT_OK;
+       ++unsuccess;
+       doing_callback = do_callback;
+       do_callback = 0;

 
 

-       if (demand) {
+       if (demand && !doing_callback) {

            /*
             * Don't do anything until we see some activity.
             */
            kill_link = 0;
            /*
             * Don't do anything until we see some activity.
             */
            kill_link = 0;

-           phase = PHASE_DORMANT;
+           new_phase(PHASE_DORMANT);

            demand_unblock();
            add_fd(fd_loop);
            for (;;) {
                if (sigsetjmp(sigjmp, 1) == 0) {
                    sigprocmask(SIG_BLOCK, &mask, NULL);
            demand_unblock();
            add_fd(fd_loop);
            for (;;) {
                if (sigsetjmp(sigjmp, 1) == 0) {
                    sigprocmask(SIG_BLOCK, &mask, NULL);

-                   if (kill_link) {
+                   if (kill_link || got_sigchld) {

                        sigprocmask(SIG_UNBLOCK, &mask, NULL);
                    } else {
                        waiting = 1;
                        sigprocmask(SIG_UNBLOCK, &mask, NULL);
                    } else {
                        waiting = 1;


@@ -490,16 +537,19 @@ main(argc, argv)
            info("Starting link");
        }
 
            info("Starting link");
        }
 

+       new_phase(PHASE_SERIALCONN);
+

        /*
        /*

-        * Get a pty master/slave pair if the pty, notty, or record
-        * options were specified.
+        * Get a pty master/slave pair if the pty, notty, socket,
+        * or record options were specified.

         */
        strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
        pty_master = -1;
        pty_slave = -1;
         */
        strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
        pty_master = -1;
        pty_slave = -1;

-       if (ptycommand != NULL || notty || record_file != NULL) {
+       if (using_pty || record_file != NULL) {

            if (!get_pty(&pty_master, &pty_slave, ppp_devnam, uid)) {
                error("Couldn't allocate pseudo-tty");
            if (!get_pty(&pty_master, &pty_slave, ppp_devnam, uid)) {
                error("Couldn't allocate pseudo-tty");

+               status = EXIT_FATAL_ERROR;

                goto fail;
            }
            set_up_tty(pty_slave, 1);
                goto fail;
            }
            set_up_tty(pty_slave, 1);


@@ -508,7 +558,8 @@ main(argc, argv)
        /*
         * Lock the device if we've been asked to.
         */
        /*
         * Lock the device if we've been asked to.
         */

-       if (lockflag && !default_device) {
+       status = EXIT_LOCK_FAILED;
+       if (lockflag && !privopen) {

            if (lock(devnam) < 0)
                goto fail;
            locked = 1;
            if (lock(devnam) < 0)
                goto fail;
            locked = 1;


@@ -523,20 +574,26 @@ main(argc, argv)
         */
        hungup = 0;
        kill_link = 0;
         */
        hungup = 0;
        kill_link = 0;

+       connector = doing_callback? callback_script: connect_script;

        if (devnam[0] != 0) {
            for (;;) {
                /* If the user specified the device name, become the
                   user before opening it. */
        if (devnam[0] != 0) {
            for (;;) {
                /* If the user specified the device name, become the
                   user before opening it. */

-               if (!devnam_info.priv && !default_device)
+               int err;
+               if (!devnam_info.priv && !privopen)

                    seteuid(uid);
                ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
                    seteuid(uid);
                ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);

-               if (!devnam_info.priv && !default_device)
+               err = errno;
+               if (!devnam_info.priv && !privopen)

                    seteuid(0);
                if (ttyfd >= 0)
                    break;
                    seteuid(0);
                if (ttyfd >= 0)
                    break;

-               if (errno != EINTR)
+               errno = err;
+               if (err != EINTR) {

                    error("Failed to open %s: %m", devnam);
                    error("Failed to open %s: %m", devnam);

-               if (!persist || errno != EINTR)
+                   status = EXIT_OPEN_FAILED;
+               }
+               if (!persist || err != EINTR)

                    goto fail;
            }
            if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1
                    goto fail;
            }
            if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1


@@ -554,7 +611,7 @@ main(argc, argv)
 
            /*
             * Set line speed, flow control, etc.
 
            /*
             * 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
             * 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


@@ -562,14 +619,16 @@ main(argc, argv)
             * successfully to the modem with CLOCAL clear and CD down,
             * we could clear CLOCAL at this point.
             */
             * 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;
        }
 
        /*
            real_ttyfd = ttyfd;
        }
 
        /*

-        * If the notty and/or record option was specified,
+        * If the pty, socket, notty and/or record option was specified,

         * start up the character shunt now.
         */
         * start up the character shunt now.
         */

+       status = EXIT_PTYCMD_FAILED;

        if (ptycommand != NULL) {
            if (record_file != NULL) {
                int ipipe[2], opipe[2], ok;
        if (ptycommand != NULL) {
            if (record_file != NULL) {
                int ipipe[2], opipe[2], ok;


@@ -591,6 +650,12 @@ main(argc, argv)
                close(pty_master);
                pty_master = -1;
            }
                close(pty_master);
                pty_master = -1;
            }

+       } else if (pty_socket != NULL) {
+           int fd = open_socket(pty_socket);
+           if (fd < 0)
+               goto fail;
+           if (!start_charshunt(fd, fd))
+               goto fail;

        } else if (notty) {
            if (!start_charshunt(0, 1))
                goto fail;
        } else if (notty) {
            if (!start_charshunt(0, 1))
                goto fail;


@@ -600,10 +665,9 @@ main(argc, argv)
        }
 
        /* run connection script */
        }
 
        /* run connection script */

-       if (connector && connector[0]) {
-           MAINDEBUG(("Connecting with <%s>", connector));
-
+       if ((connector && connector[0]) || initializer) {

            if (real_ttyfd != -1) {
            if (real_ttyfd != -1) {

+               /* XXX do this if doing_callback == CALLBACK_DIALIN? */

                if (!default_device && modem) {
                    setdtr(real_ttyfd, 0);      /* in case modem is off hook */
                    sleep(1);
                if (!default_device && modem) {
                    setdtr(real_ttyfd, 0);      /* in case modem is off hook */
                    sleep(1);


@@ -611,17 +675,37 @@ main(argc, argv)
                }
            }
 
                }
            }
 

-           if (device_script(connector, ttyfd, ttyfd, 0) < 0) {
-               error("Connect script 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.");

            }
 
            }
 

-           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 */
            if (real_ttyfd != -1)
                set_up_tty(real_ttyfd, 0);
 
            /* set line speed, flow control, etc.;
               clear CLOCAL if modem option */
            if (real_ttyfd != -1)
                set_up_tty(real_ttyfd, 0);

+
+           if (doing_callback == CALLBACK_DIALIN)
+               connector = NULL;

        }
 
        /* reopen tty if necessary to wait for carrier */
        }
 
        /* reopen tty if necessary to wait for carrier */


@@ -629,8 +713,10 @@ main(argc, argv)
            for (;;) {
                if ((i = open(devnam, O_RDWR)) >= 0)
                    break;
            for (;;) {
                if ((i = open(devnam, O_RDWR)) >= 0)
                    break;

-               if (errno != EINTR)
+               if (errno != EINTR) {

                    error("Failed to reopen %s: %m", devnam);
                    error("Failed to reopen %s: %m", devnam);

+                   status = EXIT_OPEN_FAILED;
+               }

                if (!persist || errno != EINTR || hungup || kill_link)
                    goto fail;
            }
                if (!persist || errno != EINTR || hungup || kill_link)
                    goto fail;
            }


@@ -638,7 +724,7 @@ main(argc, argv)
        }
 
        slprintf(numbuf, sizeof(numbuf), "%d", baud_rate);
        }
 
        slprintf(numbuf, sizeof(numbuf), "%d", baud_rate);

-       script_setenv("SPEED", numbuf);
+       script_setenv("SPEED", numbuf, 0);

 
        /* run welcome script, if any */
        if (welcomer && welcomer[0]) {
 
        /* run welcome script, if any */
        if (welcomer && welcomer[0]) {


@@ -647,25 +733,28 @@ main(argc, argv)
        }
 
        /* set up the serial device as a ppp interface */
        }
 
        /* set up the serial device as a ppp interface */

+       tdb_writelock(pppdb);

        fd_ppp = establish_ppp(ttyfd);
        fd_ppp = establish_ppp(ttyfd);

-       if (fd_ppp < 0)
-           goto fail;
-
-       if (!demand) {
-           
-           info("Using interface ppp%d", ifunit);
-           slprintf(ifname, sizeof(ifname), "ppp%d", ifunit);
-           script_setenv("IFNAME", ifname);
-
-           create_pidfile();   /* write pid to file */
+       if (fd_ppp < 0) {
+           tdb_writeunlock(pppdb);
+           status = EXIT_FATAL_ERROR;
+           goto disconnect;

        }
 
        }
 

+       if (!demand && ifunit >= 0)
+           set_ifunit(1);
+       tdb_writeunlock(pppdb);
+

        /*
         * Start opening the connection and wait for
         * incoming events (reply, timeout, etc.).
         */
        notice("Connect: %s <--> %s", ifname, ppp_devnam);
        gettimeofday(&start_time, NULL);
        /*
         * Start opening the connection and wait for
         * incoming events (reply, timeout, etc.).
         */
        notice("Connect: %s <--> %s", ifname, ppp_devnam);
        gettimeofday(&start_time, NULL);

+       link_stats_valid = 0;
+       script_unsetenv("CONNECT_TIME");
+       script_unsetenv("BYTES_SENT");
+       script_unsetenv("BYTES_RCVD");

        lcp_lowerup(0);
 
        /*
        lcp_lowerup(0);
 
        /*


@@ -673,20 +762,22 @@ main(argc, argv)
         * time for something from the peer.  This can avoid bouncing
         * our packets off his tty before he has it set up.
         */
         * time for something from the peer.  This can avoid bouncing
         * our packets off his tty before he has it set up.
         */

-       if (connector != NULL || ptycommand != NULL) {
+       add_fd(fd_ppp);
+       if (connect_delay != 0 && (connector != NULL || ptycommand != NULL)) {

            struct timeval t;
            struct timeval t;

-           t.tv_sec = 1;
-           t.tv_usec = 0;
+           t.tv_sec = connect_delay / 1000;
+           t.tv_usec = connect_delay % 1000;

            wait_input(&t);
        }
 
        lcp_open(0);            /* Start protocol */
        open_ccp_flag = 0;
            wait_input(&t);
        }
 
        lcp_open(0);            /* Start protocol */
        open_ccp_flag = 0;

-       add_fd(fd_ppp);
-       for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; ) {
+       status = EXIT_NEGOTIATION_FAILED;
+       new_phase(PHASE_ESTABLISH);
+       while (phase != PHASE_DEAD) {

            if (sigsetjmp(sigjmp, 1) == 0) {
                sigprocmask(SIG_BLOCK, &mask, NULL);
            if (sigsetjmp(sigjmp, 1) == 0) {
                sigprocmask(SIG_BLOCK, &mask, NULL);

-               if (kill_link || open_ccp_flag) {
+               if (kill_link || open_ccp_flag || got_sigchld) {

                    sigprocmask(SIG_UNBLOCK, &mask, NULL);
                } else {
                    waiting = 1;
                    sigprocmask(SIG_UNBLOCK, &mask, NULL);
                } else {
                    waiting = 1;


@@ -702,7 +793,7 @@ main(argc, argv)
                kill_link = 0;
            }
            if (open_ccp_flag) {
                kill_link = 0;
            }
            if (open_ccp_flag) {

-               if (phase == PHASE_NETWORK) {
+               if (phase == PHASE_NETWORK || phase == PHASE_RUNNING) {

                    ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */
                    (*ccp_protent.open)(0);
                }
                    ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */
                    (*ccp_protent.open)(0);
                }


@@ -715,16 +806,25 @@ main(argc, argv)
        /*
         * Print connect time and statistics.
         */
        /*
         * Print connect time and statistics.
         */

-       if (gettimeofday(&now, NULL) >= 0) {
-           int t = now.tv_sec - start_time.tv_sec;
-           t = (t + 5) / 6;    /* now in 1/10ths of minutes */
-           info("Connect time %d.%d minutes.", t/10, t%10);
-       }

        if (link_stats_valid) {
        if (link_stats_valid) {

+           int t = (link_connect_time + 5) / 6;    /* 1/10ths of minutes */
+           info("Connect time %d.%d minutes.", t/10, t%10);

            info("Sent %d bytes, received %d bytes.",
                 link_stats.bytes_out, link_stats.bytes_in);
        }
 
            info("Sent %d bytes, received %d bytes.",
                 link_stats.bytes_out, link_stats.bytes_in);
        }
 

+       /*
+        * Delete pid file before disestablishing ppp.  Otherwise it
+        * can happen that another pppd gets the same unit and then
+        * we delete its pid file.
+        */
+       if (!demand) {
+           if (pidfilename[0] != 0
+               && unlink(pidfilename) < 0 && errno != ENOENT) 
+               warn("unable to delete pid file %s: %m", pidfilename);
+           pidfilename[0] = 0;
+       }
+

        /*
         * If we may want to bring the link up again, transfer
         * the ppp unit back to the loopback.  Set the
        /*
         * If we may want to bring the link up again, transfer
         * the ppp unit back to the loopback.  Set the


@@ -736,22 +836,26 @@ main(argc, argv)
            restore_loop();
        disestablish_ppp(ttyfd);
        fd_ppp = -1;
            restore_loop();
        disestablish_ppp(ttyfd);
        fd_ppp = -1;

+       if (!hungup)
+           lcp_lowerdown(0);
+       if (!demand)
+           script_unsetenv("IFNAME");

 
        /*
         * Run disconnector script, if requested.
         * XXX we may not be able to do this if the line has hung up!
         */
 
        /*
         * Run disconnector script, if requested.
         * XXX we may not be able to do this if the line has hung up!
         */

-       if (disconnector && !hungup) {
+    disconnect:
+       if (disconnect_script && !hungup) {
+           new_phase(PHASE_DISCONNECT);

            if (real_ttyfd >= 0)
                set_up_tty(real_ttyfd, 1);
            if (real_ttyfd >= 0)
                set_up_tty(real_ttyfd, 1);

-           if (device_script(disconnector, ttyfd, ttyfd, 0) < 0) {
+           if (device_script(disconnect_script, ttyfd, ttyfd, 0) < 0) {

                warn("disconnect script failed");
            } else {
                info("Serial link disconnected.");
            }
        }
                warn("disconnect script failed");
            } else {
                info("Serial link disconnected.");
            }
        }

-       if (!hungup)
-           lcp_lowerdown(0);

 
     fail:
        if (pty_master >= 0)
 
     fail:
        if (pty_master >= 0)


@@ -768,23 +872,26 @@ main(argc, argv)
        if (!demand) {
            if (pidfilename[0] != 0
                && unlink(pidfilename) < 0 && errno != ENOENT) 
        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;
        }
 
            pidfilename[0] = 0;
        }
 

-       if (!persist)
+       if (!persist || (maxfail > 0 && unsuccess >= maxfail))

            break;
 
        kill_link = 0;
        if (demand)
            demand_discard();
            break;
 
        kill_link = 0;
        if (demand)
            demand_discard();

-       if (holdoff > 0 && need_holdoff) {
-           phase = PHASE_HOLDOFF;
-           TIMEOUT(holdoff_end, NULL, holdoff);
+       t = need_holdoff? holdoff: 0;
+       if (holdoff_hook)
+           t = (*holdoff_hook)();
+       if (t > 0) {
+           new_phase(PHASE_HOLDOFF);
+           TIMEOUT(holdoff_end, NULL, t);

            do {
                if (sigsetjmp(sigjmp, 1) == 0) {
                    sigprocmask(SIG_BLOCK, &mask, NULL);
            do {
                if (sigsetjmp(sigjmp, 1) == 0) {
                    sigprocmask(SIG_BLOCK, &mask, NULL);

-                   if (kill_link) {
+                   if (kill_link || got_sigchld) {

                        sigprocmask(SIG_UNBLOCK, &mask, NULL);
                    } else {
                        waiting = 1;
                        sigprocmask(SIG_UNBLOCK, &mask, NULL);
                    } else {
                        waiting = 1;


@@ -796,7 +903,7 @@ main(argc, argv)
                calltimeout();
                if (kill_link) {
                    kill_link = 0;
                calltimeout();
                if (kill_link) {
                    kill_link = 0;

-                   phase = PHASE_DORMANT; /* allow signal to end holdoff */
+                   new_phase(PHASE_DORMANT); /* allow signal to end holdoff */

                }
                if (got_sigchld)
                    reap_kids(0);
                }
                if (got_sigchld)
                    reap_kids(0);


@@ -807,31 +914,159 @@ main(argc, argv)
     }
 
     /* Wait for scripts to finish */
     }
 
     /* Wait for scripts to finish */

-    while (n_children > 0)
-       reap_kids(1);
+    /* XXX should have a timeout here */
+    while (n_children > 0) {
+       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);
+       }
+       if (reap_kids(1) < 0)
+           break;
+    }

 
 

-    die(0);
+    die(status);

     return 0;
 }
 
     return 0;
 }
 

+/*
+ * setup_signals - initialize signal handling.
+ */
+static void
+setup_signals()
+{
+    struct sigaction sa;
+    sigset_t mask;
+
+    /*
+     * Compute mask of all interesting signals and install signal handlers
+     * for each.  Only one signal handler may be active at a time.  Therefore,
+     * all other signals should be masked when any handler is executing.
+     */
+    sigemptyset(&mask);
+    sigaddset(&mask, SIGHUP);
+    sigaddset(&mask, SIGINT);
+    sigaddset(&mask, SIGTERM);
+    sigaddset(&mask, SIGCHLD);
+    sigaddset(&mask, SIGUSR2);
+
+#define SIGNAL(s, handler)     do { \
+       sa.sa_handler = handler; \
+       if (sigaction(s, &sa, NULL) < 0) \
+           fatal("Couldn't establish signal handler (%d): %m", s); \
+    } while (0)
+
+    sa.sa_mask = mask;
+    sa.sa_flags = 0;
+    SIGNAL(SIGHUP, hup);               /* Hangup */
+    SIGNAL(SIGINT, term);              /* Interrupt */
+    SIGNAL(SIGTERM, term);             /* Terminate */
+    SIGNAL(SIGCHLD, chld);
+
+    SIGNAL(SIGUSR1, toggle_debug);     /* Toggle debug flag */
+    SIGNAL(SIGUSR2, open_ccp);         /* Reopen CCP */
+
+    /*
+     * Install a handler for other signals which would otherwise
+     * cause pppd to exit without cleaning up.
+     */
+    SIGNAL(SIGABRT, bad_signal);
+    SIGNAL(SIGALRM, bad_signal);
+    SIGNAL(SIGFPE, bad_signal);
+    SIGNAL(SIGILL, bad_signal);
+    SIGNAL(SIGPIPE, bad_signal);
+    SIGNAL(SIGQUIT, bad_signal);
+    SIGNAL(SIGSEGV, bad_signal);
+#ifdef SIGBUS
+    SIGNAL(SIGBUS, bad_signal);
+#endif
+#ifdef SIGEMT
+    SIGNAL(SIGEMT, bad_signal);
+#endif
+#ifdef SIGPOLL
+    SIGNAL(SIGPOLL, bad_signal);
+#endif
+#ifdef SIGPROF
+    SIGNAL(SIGPROF, bad_signal);
+#endif
+#ifdef SIGSYS
+    SIGNAL(SIGSYS, bad_signal);
+#endif
+#ifdef SIGTRAP
+    SIGNAL(SIGTRAP, bad_signal);
+#endif
+#ifdef SIGVTALRM
+    SIGNAL(SIGVTALRM, bad_signal);
+#endif
+#ifdef SIGXCPU
+    SIGNAL(SIGXCPU, bad_signal);
+#endif
+#ifdef SIGXFSZ
+    SIGNAL(SIGXFSZ, bad_signal);
+#endif
+
+    /*
+     * Apparently we can get a SIGPIPE when we call syslog, if
+     * syslogd has died and been restarted.  Ignoring it seems
+     * be sufficient.
+     */
+    signal(SIGPIPE, SIG_IGN);
+}
+
+/*
+ * set_ifunit - do things we need to do once we know which ppp
+ * unit we are using.
+ */
+void
+set_ifunit(iskey)
+    int iskey;
+{
+    info("Using interface %s%d", PPP_DRV_NAME, ifunit);
+    slprintf(ifname, sizeof(ifname), PPP_DRV_NAME "%d", ifunit);
+    script_setenv("IFNAME", ifname, iskey);
+    if (iskey) {
+       create_pidfile();       /* write pid to file */
+       create_linkpidfile();
+    }
+}
+

 /*
  * detach - detach us from the controlling terminal.
  */
 void
 detach()
 {
 /*
  * detach - detach us from the controlling terminal.
  */
 void
 detach()
 {

+    int pid;
+    char numbuf[16];
+

     if (detached)
        return;
     if (detached)
        return;

-    if (daemon(0, 0) < 0) {
-       perror("Couldn't detach from controlling terminal");
-       die(1);
+    if ((pid = fork()) < 0) {
+       error("Couldn't detach (fork failed: %m)");
+       die(1);                 /* or just return? */

     }
     }

+    if (pid != 0) {
+       /* parent */
+       if (locked)
+           relock(pid);
+       exit(0);                /* parent dies */
+    }
+    setsid();
+    chdir("/");
+    close(0);
+    close(1);
+    close(2);

     detached = 1;
     detached = 1;

-    log_to_fd = -1;
-    pid = getpid();
-    /* update pid file if it has been written already */
+    if (!log_to_file && !log_to_specific_fd)
+       log_to_fd = -1;
+    /* update pid files if they have been written already */

     if (pidfilename[0])
        create_pidfile();
     if (pidfilename[0])
        create_pidfile();

+    if (linkpidfile[0])
+       create_linkpidfile();
+    slprintf(numbuf, sizeof(numbuf), "%d", getpid());
+    script_setenv("PPPD_PID", numbuf, 1);

 }
 
 /*
 }
 
 /*


@@ -855,19 +1090,37 @@ static void
 create_pidfile()
 {
     FILE *pidfile;
 create_pidfile()
 {
     FILE *pidfile;

-    char numbuf[16];

 
     slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid",
             _PATH_VARRUN, ifname);
     if ((pidfile = fopen(pidfilename, "w")) != NULL) {
 
     slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid",
             _PATH_VARRUN, ifname);
     if ((pidfile = fopen(pidfilename, "w")) != NULL) {

-       fprintf(pidfile, "%d\n", pid);
+       fprintf(pidfile, "%d\n", getpid());
+       (void) fclose(pidfile);
+    } else {
+       error("Failed to create pid file %s: %m", pidfilename);
+       pidfilename[0] = 0;
+    }
+}
+
+static void
+create_linkpidfile()
+{
+    FILE *pidfile;
+
+    if (linkname[0] == 0)
+       return;
+    script_setenv("LINKNAME", linkname, 1);
+    slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid",
+            _PATH_VARRUN, linkname);
+    if ((pidfile = fopen(linkpidfile, "w")) != NULL) {
+       fprintf(pidfile, "%d\n", getpid());
+       if (ifname[0])
+           fprintf(pidfile, "%s\n", ifname);

        (void) fclose(pidfile);
     } else {
        (void) fclose(pidfile);
     } else {

-       error("Failed to create pid file %s: %m", pidfilename);
-       pidfilename[0] = 0;
+       error("Failed to create pid file %s: %m", linkpidfile);
+       linkpidfile[0] = 0;

     }
     }

-    slprintf(numbuf, sizeof(numbuf), "%d", pid);
-    script_setenv("PPPD_PID", numbuf);

 }
 
 /*
 }
 
 /*


@@ -877,7 +1130,91 @@ static void
 holdoff_end(arg)
     void *arg;
 {
 holdoff_end(arg)
     void *arg;
 {

-    phase = PHASE_DORMANT;
+    new_phase(PHASE_DORMANT);
+}
+
+/* List of protocol names, to make our messages a little more informative. */
+struct protocol_list {
+    u_short    proto;
+    const char *name;
+} protocol_list[] = {
+    { 0x21,    "IP" },
+    { 0x23,    "OSI Network Layer" },
+    { 0x25,    "Xerox NS IDP" },
+    { 0x27,    "DECnet Phase IV" },
+    { 0x29,    "Appletalk" },
+    { 0x2b,    "Novell IPX" },
+    { 0x2d,    "VJ compressed TCP/IP" },
+    { 0x2f,    "VJ uncompressed TCP/IP" },
+    { 0x31,    "Bridging PDU" },
+    { 0x33,    "Stream Protocol ST-II" },
+    { 0x35,    "Banyan Vines" },
+    { 0x39,    "AppleTalk EDDP" },
+    { 0x3b,    "AppleTalk SmartBuffered" },
+    { 0x3d,    "Multi-Link" },
+    { 0x3f,    "NETBIOS Framing" },
+    { 0x41,    "Cisco Systems" },
+    { 0x43,    "Ascom Timeplex" },
+    { 0x45,    "Fujitsu Link Backup and Load Balancing (LBLB)" },
+    { 0x47,    "DCA Remote Lan" },
+    { 0x49,    "Serial Data Transport Protocol (PPP-SDTP)" },
+    { 0x4b,    "SNA over 802.2" },
+    { 0x4d,    "SNA" },
+    { 0x4f,    "IP6 Header Compression" },
+    { 0x6f,    "Stampede Bridging" },
+    { 0xfb,    "single-link compression" },
+    { 0xfd,    "1st choice compression" },
+    { 0x0201,  "802.1d Hello Packets" },
+    { 0x0203,  "IBM Source Routing BPDU" },
+    { 0x0205,  "DEC LANBridge100 Spanning Tree" },
+    { 0x0231,  "Luxcom" },
+    { 0x0233,  "Sigma Network Systems" },
+    { 0x8021,  "Internet Protocol Control Protocol" },
+    { 0x8023,  "OSI Network Layer Control Protocol" },
+    { 0x8025,  "Xerox NS IDP Control Protocol" },
+    { 0x8027,  "DECnet Phase IV Control Protocol" },
+    { 0x8029,  "Appletalk Control Protocol" },
+    { 0x802b,  "Novell IPX Control Protocol" },
+    { 0x8031,  "Bridging NCP" },
+    { 0x8033,  "Stream Protocol Control Protocol" },
+    { 0x8035,  "Banyan Vines Control Protocol" },
+    { 0x803d,  "Multi-Link Control Protocol" },
+    { 0x803f,  "NETBIOS Framing Control Protocol" },
+    { 0x8041,  "Cisco Systems Control Protocol" },
+    { 0x8043,  "Ascom Timeplex" },
+    { 0x8045,  "Fujitsu LBLB Control Protocol" },
+    { 0x8047,  "DCA Remote Lan Network Control Protocol (RLNCP)" },
+    { 0x8049,  "Serial Data Control Protocol (PPP-SDCP)" },
+    { 0x804b,  "SNA over 802.2 Control Protocol" },
+    { 0x804d,  "SNA Control Protocol" },
+    { 0x804f,  "IP6 Header Compression Control Protocol" },
+    { 0x006f,  "Stampede Bridging Control Protocol" },
+    { 0x80fb,  "Single Link Compression Control Protocol" },
+    { 0x80fd,  "Compression Control Protocol" },
+    { 0xc021,  "Link Control Protocol" },
+    { 0xc023,  "Password Authentication Protocol" },
+    { 0xc025,  "Link Quality Report" },
+    { 0xc027,  "Shiva Password Authentication Protocol" },
+    { 0xc029,  "CallBack Control Protocol (CBCP)" },
+    { 0xc081,  "Container Control Protocol" },
+    { 0xc223,  "Challenge Handshake Authentication Protocol" },
+    { 0xc281,  "Proprietary Authentication Protocol" },
+    { 0,       NULL },
+};
+
+/*
+ * protocol_name - find a name for a PPP protocol.
+ */
+const char *
+protocol_name(proto)
+    int proto;
+{
+    struct protocol_list *lp;
+
+    for (lp = protocol_list; lp->proto != 0; ++lp)
+       if (proto == lp->proto)
+           return lp->name;
+    return NULL;

 }
 
 /*
 }
 
 /*


@@ -900,6 +1237,7 @@ get_input()
     if (len == 0) {
        notice("Modem hangup");
        hungup = 1;
     if (len == 0) {
        notice("Modem hangup");
        hungup = 1;

+       status = EXIT_HANGUP;

        lcp_lowerdown(0);       /* serial link is no longer available */
        link_terminated(0);
        return;
        lcp_lowerdown(0);       /* serial link is no longer available */
        link_terminated(0);
        return;


@@ -952,11 +1290,27 @@ get_input()
        }
     }
 
        }
     }
 

-    if (debug)
-       warn("Unsupported protocol (0x%x) received", protocol);
+    if (debug) {
+       const char *pname = protocol_name(protocol);
+       if (pname != NULL)
+           warn("Unsupported protocol '%s' (0x%x) received", pname, protocol);
+       else
+           warn("Unsupported protocol 0x%x received", protocol);
+    }

     lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
 }
 
     lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
 }
 

+/*
+ * new_phase - signal the start of a new phase of pppd's operation.
+ */
+void
+new_phase(p)
+    int p;
+{
+    phase = p;
+    if (new_phase_hook)
+       (*new_phase_hook)(p);
+}

 
 /*
  * die - clean up state and exit with the specified status.
 
 /*
  * die - clean up state and exit with the specified status.


@@ -985,11 +1339,17 @@ cleanup()
        close_tty();
 
     if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) 
        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;
     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();
 
     if (locked)
        unlock();

+
+    if (pppdb != NULL)
+       cleanup_db();

 }
 
 /*
 }
 
 /*


@@ -1021,6 +1381,30 @@ close_tty()
     real_ttyfd = -1;
 }
 
     real_ttyfd = -1;
 }
 

+/*
+ * update_link_stats - get stats at link termination.
+ */
+void
+update_link_stats(u)
+    int u;
+{
+    struct timeval now;
+    char numbuf[32];
+
+    if (!get_ppp_stats(u, &link_stats)
+       || gettimeofday(&now, NULL) < 0)
+       return;
+    link_connect_time = now.tv_sec - start_time.tv_sec;
+    link_stats_valid = 1;
+
+    slprintf(numbuf, sizeof(numbuf), "%d", link_connect_time);
+    script_setenv("CONNECT_TIME", numbuf, 0);
+    slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_out);
+    script_setenv("BYTES_SENT", numbuf, 0);
+    slprintf(numbuf, sizeof(numbuf), "%d", link_stats.bytes_in);
+    script_setenv("BYTES_RCVD", numbuf, 0);
+}
+

 
 struct callout {
     struct timeval     c_time;         /* time at which to call routine */
 
 struct callout {
     struct timeval     c_time;         /* time at which to call routine */


@@ -1090,7 +1474,7 @@ untimeout(func, arg)
     for (copp = &callout; (freep = *copp); copp = &freep->c_next)
        if (freep->c_func == func && freep->c_arg == arg) {
            *copp = freep->c_next;
     for (copp = &callout; (freep = *copp); copp = &freep->c_next)
        if (freep->c_func == func && freep->c_arg == arg) {
            *copp = freep->c_next;

-           (void) free((char *) freep);
+           free((char *) freep);

            break;
        }
 }
            break;
        }
 }


@@ -1176,6 +1560,8 @@ hup(sig)
 {
     info("Hangup (SIGHUP)");
     kill_link = 1;
 {
     info("Hangup (SIGHUP)");
     kill_link = 1;

+    if (status != EXIT_HANGUP)
+       status = EXIT_USER_REQUEST;

     if (conn_running)
        /* Send the signal to the [dis]connector process(es) also */
        kill_my_pg(sig);
     if (conn_running)
        /* Send the signal to the [dis]connector process(es) also */
        kill_my_pg(sig);


@@ -1199,6 +1585,7 @@ term(sig)
     info("Terminating on signal %d.", sig);
     persist = 0;               /* don't try to restart */
     kill_link = 1;
     info("Terminating on signal %d.", sig);
     persist = 0;               /* don't try to restart */
     kill_link = 1;

+    status = EXIT_USER_REQUEST;

     if (conn_running)
        /* Send the signal to the [dis]connector process(es) also */
        kill_my_pg(sig);
     if (conn_running)
        /* Send the signal to the [dis]connector process(es) also */
        kill_my_pg(sig);


@@ -1275,7 +1662,7 @@ bad_signal(sig)
        kill_my_pg(SIGTERM);
     if (charshunt_pid)
        kill(charshunt_pid, SIGTERM);
        kill_my_pg(SIGTERM);
     if (charshunt_pid)
        kill(charshunt_pid, SIGTERM);

-    die(1);
+    die(127);

 }
 
 
 }
 
 


@@ -1290,7 +1677,7 @@ device_script(program, in, out, dont_wait)
     int dont_wait;
 {
     int pid;
     int dont_wait;
 {
     int pid;

-    int status = 0;
+    int status = -1;

     int errfd;
 
     ++conn_running;
     int errfd;
 
     ++conn_running;


@@ -1329,13 +1716,9 @@ device_script(program, in, out, dont_wait)
            if (out == 0)
                out = dup(out);
            dup2(in, 0);
            if (out == 0)
                out = dup(out);
            dup2(in, 0);

-           if (in > 2)
-               close(in);

        }
        if (out != 1) {
            dup2(out, 1);
        }
        if (out != 1) {
            dup2(out, 1);

-           if (out > 2)
-               close(out);

        }
        if (real_ttyfd > 2)
            close(real_ttyfd);
        }
        if (real_ttyfd > 2)
            close(real_ttyfd);


@@ -1357,6 +1740,7 @@ device_script(program, in, out, dont_wait)
 
     if (dont_wait) {
        record_child(pid, program, NULL, NULL);
 
     if (dont_wait) {
        record_child(pid, program, NULL, NULL);

+       status = 0;

     } else {
        while (waitpid(pid, &status, 0) < 0) {
            if (errno == EINTR)
     } else {
        while (waitpid(pid, &status, 0) < 0) {
            if (errno == EINTR)


@@ -1370,20 +1754,6 @@ device_script(program, in, out, dont_wait)
 }
 
 
 }
 
 

-/*
- * We maintain a list of child process pids and
- * functions to call when they exit.
- */
-struct subprocess {
-    pid_t      pid;
-    char       *prog;
-    void       (*done) __P((void *));
-    void       *arg;
-    struct subprocess *next;
-};
-
-struct subprocess *children;
-

 /*
  * run-program - execute a program with given arguments,
  * but don't wait for it.
 /*
  * run-program - execute a program with given arguments,
  * but don't wait for it.


@@ -1476,7 +1846,7 @@ run_program(prog, args, must_exist, done, arg)
     }
 
     if (debug)
     }
 
     if (debug)

-       dbglog("Script %s started; pid = %d", prog, pid);
+       dbglog("Script %s started (pid %d)", prog, pid);

     record_child(pid, prog, done, arg);
 
     return pid;
     record_child(pid, prog, done, arg);
 
     return pid;


@@ -1516,7 +1886,7 @@ record_child(pid, prog, done, arg)
  * reap_kids - get status from any dead child processes,
  * and log a message for abnormal terminations.
  */
  * reap_kids - get status from any dead child processes,
  * and log a message for abnormal terminations.
  */

-static void
+static int

 reap_kids(waitfor)
     int waitfor;
 {
 reap_kids(waitfor)
     int waitfor;
 {


@@ -1525,197 +1895,36 @@ reap_kids(waitfor)
 
     got_sigchld = 0;
     if (n_children == 0)
 
     got_sigchld = 0;
     if (n_children == 0)

-       return;
+       return 0;

     while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1
           && pid != 0) {
     while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1
           && pid != 0) {

-       --n_children;
-       for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next)
-           if (chp->pid == pid)
+       for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) {
+           if (chp->pid == pid) {
+               --n_children;
+               *prevp = chp->next;

                break;
                break;

+           }
+       }

        if (WIFSIGNALED(status)) {
            warn("Child process %s (pid %d) terminated with signal %d",
                 (chp? chp->prog: "??"), pid, WTERMSIG(status));
        } else if (debug)
        if (WIFSIGNALED(status)) {
            warn("Child process %s (pid %d) terminated with signal %d",
                 (chp? chp->prog: "??"), pid, WTERMSIG(status));
        } else if (debug)

-           dbglog("process %d (%s) finished, status = 0x%x",
-                  pid, (chp? chp->prog: "??"), status);
+           dbglog("Script %s finished (pid %d), status = 0x%x",
+                  (chp? chp->prog: "??"), pid, status);

        if (chp && chp->done)
            (*chp->done)(chp->arg);
        if (chp && chp->done)
            (*chp->done)(chp->arg);

+       if (chp)
+           free(chp);

     }
     }

-    if (pid == -1 && errno != ECHILD && errno != EINTR)
-       error("Error waiting for child process: %m");
-}
-
-
-/*
- * log_packet - format a packet and log it.
- */
-
-char line[256];                        /* line to be logged accumulated here */
-char *linep;
-
-void
-log_packet(p, len, prefix, level)
-    u_char *p;
-    int len;
-    char *prefix;
-    int level;
-{
-    strlcpy(line, prefix, sizeof(line));
-    linep = line + strlen(line);
-    format_packet(p, len, pr_log, NULL);
-    if (linep != line)
-       syslog(level, "%s", line);
-}
-
-/*
- * format_packet - make a readable representation of a packet,
- * calling `printer(arg, format, ...)' to output it.
- */
-static void
-format_packet(p, len, printer, arg)
-    u_char *p;
-    int len;
-    void (*printer) __P((void *, char *, ...));
-    void *arg;
-{
-    int i, n;
-    u_short proto;
-    struct protent *protp;
-
-    if (len >= PPP_HDRLEN && p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) {
-       p += 2;
-       GETSHORT(proto, p);
-       len -= PPP_HDRLEN;
-       for (i = 0; (protp = protocols[i]) != NULL; ++i)
-           if (proto == protp->protocol)
-               break;
-       if (protp != NULL) {
-           printer(arg, "[%s", protp->name);
-           n = (*protp->printpkt)(p, len, printer, arg);
-           printer(arg, "]");
-           p += n;
-           len -= n;
-       } else {
-           for (i = 0; (protp = protocols[i]) != NULL; ++i)
-               if (proto == (protp->protocol & ~0x8000))
-                   break;
-           if (protp != 0 && protp->data_name != 0) {
-               printer(arg, "[%s data]", protp->data_name);
-               if (len > 8)
-                   printer(arg, "%.8B ...", p);
-               else
-                   printer(arg, "%.*B", len, p);
-               len = 0;
-           } else
-               printer(arg, "[proto=0x%x]", proto);
-       }
-    }
-
-    if (len > 32)
-       printer(arg, "%.32B ...", p);
-    else
-       printer(arg, "%.*B", len, p);
-}
-
-static void
-pr_log __V((void *arg, char *fmt, ...))
-{
-    int n;
-    va_list pvar;
-    char buf[256];
-
-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    void *arg;
-    char *fmt;
-    va_start(pvar);
-    arg = va_arg(pvar, void *);
-    fmt = va_arg(pvar, char *);
-#endif
-
-    n = vslprintf(buf, sizeof(buf), fmt, pvar);
-    va_end(pvar);
-
-    if (linep + n + 1 > line + sizeof(line)) {
-       syslog(LOG_DEBUG, "%s", line);
-       linep = line;
+    if (pid == -1) {
+       if (errno == ECHILD)
+           return -1;
+       if (errno != EINTR)
+           error("Error waiting for child process: %m");

     }
     }

-    strlcpy(linep, buf, line + sizeof(line) - linep);
-    linep += n;
-}
-
-/*
- * vslp_printer - used in processing a %P format
- */
-struct buffer_info {
-    char *ptr;
-    int len;
-};
-
-static void
-vslp_printer __V((void *arg, char *fmt, ...))
-{
-    int n;
-    va_list pvar;
-    struct buffer_info *bi;
-
-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    void *arg;
-    char *fmt;
-    va_start(pvar);
-    arg = va_arg(pvar, void *);
-    fmt = va_arg(pvar, char *);
-#endif
-
-    bi = (struct buffer_info *) arg;
-    n = vslprintf(bi->ptr, bi->len, fmt, pvar);
-    va_end(pvar);
-
-    bi->ptr += n;
-    bi->len -= n;
+    return 0;

 }
 
 }
 

-/*
- * print_string - print a readable representation of a string using
- * printer.
- */
-void
-print_string(p, len, printer, arg)
-    char *p;
-    int len;
-    void (*printer) __P((void *, char *, ...));
-    void *arg;
-{
-    int c;
-
-    printer(arg, "\"");
-    for (; len > 0; --len) {
-       c = *p++;
-       if (' ' <= c && c <= '~') {
-           if (c == '\\' || c == '"')
-               printer(arg, "\\");
-           printer(arg, "%c", c);
-       } else {
-           switch (c) {
-           case '\n':
-               printer(arg, "\\n");
-               break;
-           case '\r':
-               printer(arg, "\\r");
-               break;
-           case '\t':
-               printer(arg, "\\t");
-               break;
-           default:
-               printer(arg, "\\%.3o", c);
-           }
-       }
-    }
-    printer(arg, "\"");
-}

 
 /*
  * novm - log an error message saying we ran out of memory, and die.
 
 /*
  * novm - log an error message saying we ran out of memory, and die.


@@ -1727,309 +1936,42 @@ novm(msg)
     fatal("Virtual memory exhausted allocating %s\n", msg);
 }
 
     fatal("Virtual memory exhausted allocating %s\n", msg);
 }
 

-/*
- * slprintf - format a message into a buffer.  Like sprintf except we
- * also specify the length of the output buffer, and we handle
- * %r (recursive format), %m (error message), %v (visible string),
- * %q (quoted string), %t (current time) and %I (IP address) formats.
- * Doesn't do floating-point formats.
- * Returns the number of chars put into buf.
- */
-int
-slprintf __V((char *buf, int buflen, char *fmt, ...))
-{
-    va_list args;
-    int n;
-
-#if __STDC__
-    va_start(args, fmt);
-#else
-    char *buf;
-    int buflen;
-    char *fmt;
-    va_start(args);
-    buf = va_arg(args, char *);
-    buflen = va_arg(args, int);
-    fmt = va_arg(args, char *);
-#endif
-    n = vslprintf(buf, buflen, fmt, args);
-    va_end(args);
-    return n;
-}
-
-/*
- * vslprintf - like slprintf, takes a va_list instead of a list of args.
- */
-#define OUTCHAR(c)     (buflen > 0? (--buflen, *buf++ = (c)): 0)
-
-int
-vslprintf(buf, buflen, fmt, args)
-    char *buf;
-    int buflen;
-    char *fmt;
-    va_list args;
-{
-    int c, i, n;
-    int width, prec, fillch;
-    int base, len, neg, quoted;
-    unsigned long val = 0;
-    char *str, *f, *buf0;
-    unsigned char *p;
-    char num[32];
-    time_t t;
-    u_int32_t ip;
-    static char hexchars[] = "0123456789abcdef";
-    struct buffer_info bufinfo;
-
-    buf0 = buf;
-    --buflen;
-    while (buflen > 0) {
-       for (f = fmt; *f != '%' && *f != 0; ++f)
-           ;
-       if (f > fmt) {
-           len = f - fmt;
-           if (len > buflen)
-               len = buflen;
-           memcpy(buf, fmt, len);
-           buf += len;
-           buflen -= len;
-           fmt = f;
-       }
-       if (*fmt == 0)
-           break;
-       c = *++fmt;
-       width = prec = 0;
-       fillch = ' ';
-       if (c == '0') {
-           fillch = '0';
-           c = *++fmt;
-       }
-       if (c == '*') {
-           width = va_arg(args, int);
-           c = *++fmt;
-       } else {
-           while (isdigit(c)) {
-               width = width * 10 + c - '0';
-               c = *++fmt;
-           }
-       }
-       if (c == '.') {
-           c = *++fmt;
-           if (c == '*') {
-               prec = va_arg(args, int);
-               c = *++fmt;
-           } else {
-               while (isdigit(c)) {
-                   prec = prec * 10 + c - '0';
-                   c = *++fmt;
-               }
-           }
-       }
-       str = 0;
-       base = 0;
-       neg = 0;
-       ++fmt;
-       switch (c) {
-       case 'd':
-           i = va_arg(args, int);
-           if (i < 0) {
-               neg = 1;
-               val = -i;
-           } else
-               val = i;
-           base = 10;
-           break;
-       case 'o':
-           val = va_arg(args, unsigned int);
-           base = 8;
-           break;
-       case 'x':
-       case 'X':
-           val = va_arg(args, unsigned int);
-           base = 16;
-           break;
-       case 'p':
-           val = (unsigned long) va_arg(args, void *);
-           base = 16;
-           neg = 2;
-           break;
-       case 's':
-           str = va_arg(args, char *);
-           break;
-       case 'c':
-           num[0] = va_arg(args, int);
-           num[1] = 0;
-           str = num;
-           break;
-       case 'm':
-           str = strerror(errno);
-           break;
-       case 'I':
-           ip = va_arg(args, u_int32_t);
-           ip = ntohl(ip);
-           slprintf(num, sizeof(num), "%d.%d.%d.%d", (ip >> 24) & 0xff,
-                    (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
-           str = num;
-           break;
-       case 'r':
-           f = va_arg(args, char *);
-#ifndef __powerpc__
-           n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
-#else
-           /* On the powerpc, a va_list is an array of 1 structure */
-           n = vslprintf(buf, buflen + 1, f, va_arg(args, void *));
-#endif
-           buf += n;
-           buflen -= n;
-           continue;
-       case 't':
-           time(&t);
-           str = ctime(&t);
-           str += 4;           /* chop off the day name */
-           str[15] = 0;        /* chop off year and newline */
-           break;
-       case 'v':               /* "visible" string */
-       case 'q':               /* quoted string */
-           quoted = c == 'q';
-           p = va_arg(args, unsigned char *);
-           if (fillch == '0' && prec > 0) {
-               n = prec;
-           } else {
-               n = strlen((char *)p);
-               if (prec > 0 && prec < n)
-                   n = prec;
-           }
-           while (n > 0 && buflen > 0) {
-               c = *p++;
-               --n;
-               if (!quoted && c >= 0x80) {
-                   OUTCHAR('M');
-                   OUTCHAR('-');
-                   c -= 0x80;
-               }
-               if (quoted && (c == '"' || c == '\\'))
-                   OUTCHAR('\\');
-               if (c < 0x20 || (0x7f <= c && c < 0xa0)) {
-                   if (quoted) {
-                       OUTCHAR('\\');
-                       switch (c) {
-                       case '\t':      OUTCHAR('t');   break;
-                       case '\n':      OUTCHAR('n');   break;
-                       case '\b':      OUTCHAR('b');   break;
-                       case '\f':      OUTCHAR('f');   break;
-                       default:
-                           OUTCHAR('x');
-                           OUTCHAR(hexchars[c >> 4]);
-                           OUTCHAR(hexchars[c & 0xf]);
-                       }
-                   } else {
-                       if (c == '\t')
-                           OUTCHAR(c);
-                       else {
-                           OUTCHAR('^');
-                           OUTCHAR(c ^ 0x40);
-                       }
-                   }
-               } else
-                   OUTCHAR(c);
-           }
-           continue;
-       case 'P':               /* print PPP packet */
-           bufinfo.ptr = buf;
-           bufinfo.len = buflen + 1;
-           p = va_arg(args, unsigned char *);
-           n = va_arg(args, int);
-           format_packet(p, n, vslp_printer, &bufinfo);
-           buf = bufinfo.ptr;
-           buflen = bufinfo.len - 1;
-           continue;
-       case 'B':
-           p = va_arg(args, unsigned char *);
-           for (n = prec; n > 0; --n) {
-               c = *p++;
-               if (fillch == ' ')
-                   OUTCHAR(' ');
-               OUTCHAR(hexchars[(c >> 4) & 0xf]);
-               OUTCHAR(hexchars[c & 0xf]);
-           }
-           continue;
-       default:
-           *buf++ = '%';
-           if (c != '%')
-               --fmt;          /* so %z outputs %z etc. */
-           --buflen;
-           continue;
-       }
-       if (base != 0) {
-           str = num + sizeof(num);
-           *--str = 0;
-           while (str > num + neg) {
-               *--str = hexchars[val % base];
-               val = val / base;
-               if (--prec <= 0 && val == 0)
-                   break;
-           }
-           switch (neg) {
-           case 1:
-               *--str = '-';
-               break;
-           case 2:
-               *--str = 'x';
-               *--str = '0';
-               break;
-           }
-           len = num + sizeof(num) - 1 - str;
-       } else {
-           len = strlen(str);
-           if (prec > 0 && len > prec)
-               len = prec;
-       }
-       if (width > 0) {
-           if (width > buflen)
-               width = buflen;
-           if ((n = width - len) > 0) {
-               buflen -= n;
-               for (; n > 0; --n)
-                   *buf++ = fillch;
-           }
-       }
-       if (len > buflen)
-           len = buflen;
-       memcpy(buf, str, len);
-       buf += len;
-       buflen -= len;
-    }
-    *buf = 0;
-    return buf - buf0;
-}
-

 /*
  * script_setenv - set an environment variable value to be used
  * for scripts that we run (e.g. ip-up, auth-up, etc.)
  */
 void
 /*
  * script_setenv - set an environment variable value to be used
  * for scripts that we run (e.g. ip-up, auth-up, etc.)
  */
 void

-script_setenv(var, value)
+script_setenv(var, value, iskey)

     char *var, *value;
     char *var, *value;

+    int iskey;

 {
 {

-    size_t vl = strlen(var) + strlen(value) + 2;
+    size_t varl = strlen(var);
+    size_t vl = varl + strlen(value) + 2;

     int i;
     char *p, *newstring;
 
     int i;
     char *p, *newstring;
 

-    newstring = (char *) malloc(vl);
+    newstring = (char *) malloc(vl+1);

     if (newstring == 0)
        return;
     if (newstring == 0)
        return;

+    *newstring++ = iskey;

     slprintf(newstring, vl, "%s=%s", var, value);
 
     /* check if this variable is already set */
     if (script_env != 0) {
        for (i = 0; (p = script_env[i]) != 0; ++i) {
     slprintf(newstring, vl, "%s=%s", var, value);
 
     /* check if this variable is already set */
     if (script_env != 0) {
        for (i = 0; (p = script_env[i]) != 0; ++i) {

-           if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
-               free(p);
+           if (strncmp(p, var, varl) == 0 && p[varl] == '=') {
+               if (p[-1] && pppdb != NULL)
+                   delete_db_key(p);
+               free(p-1);

                script_env[i] = newstring;
                script_env[i] = newstring;

+               if (iskey && pppdb != NULL)
+                   add_db_key(newstring);
+               update_db_entry();

                return;
            }
        }
     } else {
                return;
            }
        }
     } else {

+       /* no space allocated for script env. ptrs. yet */

        i = 0;
        script_env = (char **) malloc(16 * sizeof(char *));
        if (script_env == 0)
        i = 0;
        script_env = (char **) malloc(16 * sizeof(char *));
        if (script_env == 0)


@@ -2050,6 +1992,12 @@ script_setenv(var, value)
 
     script_env[i] = newstring;
     script_env[i+1] = 0;
 
     script_env[i] = newstring;
     script_env[i+1] = 0;

+
+    if (pppdb != NULL) {
+       if (iskey)
+           add_db_key(newstring);
+       update_db_entry();
+    }

 }
 
 /*
 }
 
 /*


@@ -2068,194 +2016,150 @@ script_unsetenv(var)
        return;
     for (i = 0; (p = script_env[i]) != 0; ++i) {
        if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
        return;
     for (i = 0; (p = script_env[i]) != 0; ++i) {
        if (strncmp(p, var, vl) == 0 && p[vl] == '=') {

-           free(p);
+           if (p[-1] && pppdb != NULL)
+               delete_db_key(p);
+           free(p-1);

            while ((script_env[i] = script_env[i+1]) != 0)
                ++i;
            break;
        }
     }
            while ((script_env[i] = script_env[i+1]) != 0)
                ++i;
            break;
        }
     }

+    if (pppdb != NULL)
+       update_db_entry();

 }
 
 /*
 }
 
 /*

- * strlcpy - like strcpy/strncpy, doesn't overflow destination buffer,
- * always leaves destination null-terminated (for len > 0).
- */
-size_t
-strlcpy(dest, src, len)
-    char *dest;
-    const char *src;
-    size_t len;
-{
-    size_t ret = strlen(src);
-
-    if (len != 0) {
-       if (ret < len)
-           strcpy(dest, src);
-       else {
-           strncpy(dest, src, len - 1);
-           dest[len-1] = 0;
-       }
-    }
-    return ret;
-}
-
-/*
- * strlcat - like strcat/strncat, doesn't overflow destination buffer,
- * always leaves destination null-terminated (for len > 0).
- */
-size_t
-strlcat(dest, src, len)
-    char *dest;
-    const char *src;
-    size_t len;
-{
-    size_t dlen = strlen(dest);
-
-    return dlen + strlcpy(dest + dlen, src, (len > dlen? len - dlen: 0));
-}
-
-/*
- * logit - does the hard work for fatal et al.
+ * update_db_entry - update our entry in the database.

  */
 static void
  */
 static void

-logit(level, fmt, args)
-    int level;
-    char *fmt;
-    va_list args;
-{
-    int n;
-    char buf[256];
-
-    n = vslprintf(buf, sizeof(buf), fmt, args);
-    syslog(level, "%s", buf);
-    if (log_to_fd >= 0 && (level != LOG_DEBUG || debug)) {
-       if (buf[n-1] != '\n')
-           buf[n++] = '\n';
-       if (write(log_to_fd, buf, n) != n)
-           log_to_fd = -1;
-    }
-}
-
-/*
- * fatal - log an error message and die horribly.
- */
-void
-fatal __V((char *fmt, ...))
-{
-    va_list pvar;
-
-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    char *fmt;
-    va_start(pvar);
-    fmt = va_arg(pvar, char *);
-#endif
-
-    logit(LOG_ERR, fmt, pvar);
-    va_end(pvar);
-
-    die(1);                    /* as promised */
-}
-
-/*
- * error - log an error message.
- */
-void
-error __V((char *fmt, ...))
+update_db_entry()

 {
 {

-    va_list pvar;
+    TDB_DATA key, dbuf;
+    int vlen, i;
+    char *p, *q, *vbuf;

 
 

-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    char *fmt;
-    va_start(pvar);
-    fmt = va_arg(pvar, char *);
-#endif
+    if (script_env == NULL)
+       return;
+    vlen = 0;
+    for (i = 0; (p = script_env[i]) != 0; ++i)
+       vlen += strlen(p) + 1;
+    vbuf = malloc(vlen);
+    if (vbuf == 0)
+       novm("database entry");
+    q = vbuf;
+    for (i = 0; (p = script_env[i]) != 0; ++i)
+       q += slprintf(q, vbuf + vlen - q, "%s;", p);
+
+    key.dptr = db_key;
+    key.dsize = strlen(db_key);
+    dbuf.dptr = vbuf;
+    dbuf.dsize = vlen;
+    if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
+       error("tdb_store failed: %s", tdb_error(pppdb));

 
 

-    logit(LOG_ERR, fmt, pvar);
-    va_end(pvar);

 }
 
 /*
 }
 
 /*

- * warn - log a warning message.
+ * add_db_key - add a key that we can use to look up our database entry.

  */
  */

-void
-warn __V((char *fmt, ...))
+static void
+add_db_key(str)
+    const char *str;

 {
 {

-    va_list pvar;
-
-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    char *fmt;
-    va_start(pvar);
-    fmt = va_arg(pvar, char *);
-#endif
-
-    logit(LOG_WARNING, fmt, pvar);
-    va_end(pvar);
+    TDB_DATA key, dbuf;
+
+    key.dptr = (char *) str;
+    key.dsize = strlen(str);
+    dbuf.dptr = db_key;
+    dbuf.dsize = strlen(db_key);
+    if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
+       error("tdb_store key failed: %s", tdb_error(pppdb));

 }
 
 /*
 }
 
 /*

- * notice - log a notice-level message.
+ * delete_db_key - delete a key for looking up our database entry.

  */
  */

-void
-notice __V((char *fmt, ...))
+static void
+delete_db_key(str)
+    const char *str;

 {
 {

-    va_list pvar;
-
-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    char *fmt;
-    va_start(pvar);
-    fmt = va_arg(pvar, char *);
-#endif
+    TDB_DATA key;

 
 

-    logit(LOG_NOTICE, fmt, pvar);
-    va_end(pvar);
+    key.dptr = (char *) str;
+    key.dsize = strlen(str);
+    tdb_delete(pppdb, key);

 }
 
 /*
 }
 
 /*

- * info - log an informational message.
+ * cleanup_db - delete all the entries we put in the database.

  */
  */

-void
-info __V((char *fmt, ...))
+static void
+cleanup_db()

 {
 {

-    va_list pvar;
-
-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    char *fmt;
-    va_start(pvar);
-    fmt = va_arg(pvar, char *);
-#endif
+    TDB_DATA key;
+    int i;
+    char *p;

 
 

-    logit(LOG_INFO, fmt, pvar);
-    va_end(pvar);
+    key.dptr = db_key;
+    key.dsize = strlen(db_key);
+    tdb_delete(pppdb, key);
+    for (i = 0; (p = script_env[i]) != 0; ++i)
+       if (p[-1])
+           delete_db_key(p);

 }
 
 /*
 }
 
 /*

- * dbglog - log a debug message.
+ * open_socket - establish a stream socket connection to the nominated
+ * host and port.

  */
  */

-void
-dbglog __V((char *fmt, ...))
+static int
+open_socket(dest)
+    char *dest;

 {
 {

-    va_list pvar;
+    char *sep, *endp = NULL;
+    int sock, port = -1;
+    u_int32_t host;
+    struct hostent *hent;
+    struct sockaddr_in sad;
+
+    /* parse host:port and resolve host to an IP address */
+    sep = strchr(dest, ':');
+    if (sep != NULL)
+       port = strtol(sep+1, &endp, 10);
+    if (port < 0 || endp == sep+1 || sep == dest) {
+       error("Can't parse host:port for socket destination");
+       return -1;
+    }
+    *sep = 0;
+    host = inet_addr(dest);
+    if (host == (u_int32_t) -1) {
+       hent = gethostbyname(dest);
+       if (hent == NULL) {
+           error("%s: unknown host in socket option", dest);
+           *sep = ':';
+           return -1;
+       }
+       host = *(u_int32_t *)(hent->h_addr_list[0]);
+    }
+    *sep = ':';

 
 

-#if __STDC__
-    va_start(pvar, fmt);
-#else
-    char *fmt;
-    va_start(pvar);
-    fmt = va_arg(pvar, char *);
-#endif
+    /* get a socket and connect it to the other end */
+    sock = socket(PF_INET, SOCK_STREAM, 0);
+    if (sock < 0) {
+       error("Can't create socket: %m");
+       return -1;
+    }
+    memset(&sad, 0, sizeof(sad));
+    sad.sin_family = AF_INET;
+    sad.sin_port = htons(port);
+    sad.sin_addr.s_addr = host;
+    if (connect(sock, (struct sockaddr *)&sad, sizeof(sad)) < 0) {
+       error("Can't connect to %s: %m", dest);
+       close(sock);
+       return -1;
+    }

 
 

-    logit(LOG_DEBUG, fmt, pvar);
-    va_end(pvar);
+    return sock;

 }
 
 /*
 }
 
 /*


@@ -2318,6 +2222,8 @@ charshunt(ifd, ofd, record_file)
     int pty_readable, stdin_readable;
     struct timeval lasttime;
     FILE *recordf = NULL;
     int pty_readable, stdin_readable;
     struct timeval lasttime;
     FILE *recordf = NULL;

+    int ilevel, olevel, max_level;
+    struct timeval levelt, tout, *top;

 
     /*
      * Reset signal handlers.
 
     /*
      * Reset signal handlers.


@@ -2391,6 +2297,16 @@ charshunt(ifd, ofd, record_file)
     nibuf = nobuf = 0;
     ibufp = obufp = NULL;
     pty_readable = stdin_readable = 1;
     nibuf = nobuf = 0;
     ibufp = obufp = NULL;
     pty_readable = stdin_readable = 1;

+
+    ilevel = olevel = 0;
+    gettimeofday(&levelt, NULL);
+    if (max_data_rate) {
+       max_level = max_data_rate / 10;
+       if (max_level < 100)
+           max_level = 100;
+    } else
+       max_level = sizeof(inpacket_buf) + 1;
+

     nfds = (ofd > pty_master? ofd: pty_master) + 1;
     if (recordf != NULL) {
        gettimeofday(&lasttime, NULL);
     nfds = (ofd > pty_master? ofd: pty_master) + 1;
     if (recordf != NULL) {
        gettimeofday(&lasttime, NULL);


@@ -2403,21 +2319,44 @@ charshunt(ifd, ofd, record_file)
     }
 
     while (nibuf != 0 || nobuf != 0 || pty_readable || stdin_readable) {
     }
 
     while (nibuf != 0 || nobuf != 0 || pty_readable || stdin_readable) {

+       top = 0;
+       tout.tv_sec = 0;
+       tout.tv_usec = 10000;

        FD_ZERO(&ready);
        FD_ZERO(&writey);
        FD_ZERO(&ready);
        FD_ZERO(&writey);

-       if (nibuf != 0)
-           FD_SET(pty_master, &writey);
-       else if (stdin_readable)
+       if (nibuf != 0) {
+           if (ilevel >= max_level)
+               top = &tout;
+           else
+               FD_SET(pty_master, &writey);
+       } else if (stdin_readable)

            FD_SET(ifd, &ready);
            FD_SET(ifd, &ready);

-       if (nobuf != 0)
-           FD_SET(ofd, &writey);
-       else if (pty_readable)
+       if (nobuf != 0) {
+           if (olevel >= max_level)
+               top = &tout;
+           else
+               FD_SET(ofd, &writey);
+       } else if (pty_readable)

            FD_SET(pty_master, &ready);
            FD_SET(pty_master, &ready);

-       if (select(nfds, &ready, &writey, NULL, NULL) < 0) {
+       if (select(nfds, &ready, &writey, NULL, top) < 0) {

            if (errno != EINTR)
                fatal("select");
            continue;
        }
            if (errno != EINTR)
                fatal("select");
            continue;
        }

+       if (max_data_rate) {
+           double dt;
+           int nbt;
+           struct timeval now;
+
+           gettimeofday(&now, NULL);
+           dt = (now.tv_sec - levelt.tv_sec
+                 + (now.tv_usec - levelt.tv_usec) / 1e6);
+           nbt = (int)(dt * max_data_rate);
+           ilevel = (nbt < 0 || nbt > ilevel)? 0: ilevel - nbt;
+           olevel = (nbt < 0 || nbt > olevel)? 0: olevel - nbt;
+           levelt = now;
+       } else
+           ilevel = olevel = 0;

        if (FD_ISSET(ifd, &ready)) {
            ibufp = inpacket_buf;
            nibuf = read(ifd, ibufp, sizeof(inpacket_buf));
        if (FD_ISSET(ifd, &ready)) {
            ibufp = inpacket_buf;
            nibuf = read(ifd, ibufp, sizeof(inpacket_buf));


@@ -2473,31 +2412,41 @@ charshunt(ifd, ofd, record_file)
            }
        }
        if (FD_ISSET(ofd, &writey)) {
            }
        }
        if (FD_ISSET(ofd, &writey)) {

-           n = write(ofd, obufp, nobuf);
+           n = nobuf;
+           if (olevel + n > max_level)
+               n = max_level - olevel;
+           n = write(ofd, obufp, n);

            if (n < 0) {
            if (n < 0) {

-               if (errno != EIO) {
+               if (errno == EIO) {
+                   pty_readable = 0;
+                   nobuf = 0;
+               } else if (errno != EAGAIN && errno != EINTR) {

                    error("Error writing standard output: %m");
                    break;
                }
                    error("Error writing standard output: %m");
                    break;
                }

-               pty_readable = 0;
-               nobuf = 0;

            } else {
                obufp += n;
                nobuf -= n;
            } else {
                obufp += n;
                nobuf -= n;

+               olevel += n;

            }
        }
        if (FD_ISSET(pty_master, &writey)) {
            }
        }
        if (FD_ISSET(pty_master, &writey)) {

-           n = write(pty_master, ibufp, nibuf);
+           n = nibuf;
+           if (ilevel + n > max_level)
+               n = max_level - ilevel;
+           n = write(pty_master, ibufp, n);

            if (n < 0) {
            if (n < 0) {

-               if (errno != EIO) {
+               if (errno == EIO) {
+                   stdin_readable = 0;
+                   nibuf = 0;
+               } else if (errno != EAGAIN && errno != EINTR) {

                    error("Error writing pseudo-tty master: %m");
                    break;
                }
                    error("Error writing pseudo-tty master: %m");
                    break;
                }

-               stdin_readable = 0;
-               nibuf = 0;

            } else {
                ibufp += n;
                nibuf -= n;
            } else {
                ibufp += n;
                nibuf -= n;

+               ilevel += n;

            }
        }
     }
            }
        }
     }