/*
* main.c - Point-to-Point Protocol main module
*
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Copyright (c) 1999-2004 Paul Mackerras. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. The name(s) of the authors of this software must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission.
+ *
+ * 3. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Paul Mackerras
+ * <paulus@samba.org>".
+ *
+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.77 1999/04/28 02:45:44 paulus Exp $";
-#endif
+#define RCSID "$Id: main.c,v 1.141 2004/11/04 10:02:26 paulus Exp $"
#include <stdio.h>
#include <ctype.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"
+#ifdef INET6
+#include "ipv6cp.h"
+#endif
#include "upap.h"
-#include "chap.h"
+#include "chap-new.h"
+#include "eap.h"
#include "ccp.h"
+#include "ecp.h"
#include "pathnames.h"
-#include "patchlevel.h"
-#ifdef CBCP_SUPPORT
-#include "cbcp.h"
+#ifdef USE_TDB
+#include "tdb.h"
#endif
-#if defined(SUNOS4)
-extern char *strerror();
+#ifdef CBCP_SUPPORT
+#include "cbcp.h"
#endif
#ifdef IPX_CHANGE
#include "atcp.h"
#endif
+static const char rcsid[] = RCSID;
+
/* interface vars */
char ifname[32]; /* Interface name */
int ifunit; /* Interface unit number */
+struct channel *the_channel;
+
char *progname; /* Name of this program */
char hostname[MAXNAMELEN]; /* Our hostname */
static char pidfilename[MAXPATHLEN]; /* name of 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 */
+static char linkpidfile[MAXPATHLEN]; /* name of linkname pid file */
+char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
+uid_t uid; /* Our real user-id */
+struct notifier *pidchange = NULL;
+struct notifier *phasechange = NULL;
+struct notifier *exitnotify = NULL;
+struct notifier *sigreceived = NULL;
+struct notifier *fork_notifier = NULL;
-int ttyfd; /* Serial port file descriptor */
-mode_t tty_mode = -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 log_to_fd; /* send log messages to this fd too */
+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 */
+int ppp_session_number; /* Session number, for channels with such a
+ concept (eg PPPoE) */
+int childwait_done; /* have timed out waiting for children */
+
+#ifdef USE_TDB
+TDB_CONTEXT *pppdb; /* database for storing status etc. */
+#endif
+char db_key[32];
+
+int (*holdoff_hook) __P((void)) = NULL;
+int (*new_phase_hook) __P((int)) = NULL;
+void (*snoop_recv_hook) __P((unsigned char *p, int len)) = NULL;
+void (*snoop_send_hook) __P((unsigned char *p, int len)) = NULL;
+
+static int conn_running; /* we have a [dis]connector running */
+static int devfd; /* fd of underlying device */
static int fd_ppp = -1; /* fd for talking PPP */
static int fd_loop; /* fd for getting demand-dial packets */
-static int pty_master; /* fd for master side of pty */
-static int pty_slave; /* fd for slave side of pty */
-static int real_ttyfd; /* fd for actual serial port (not pty) */
+static int fd_devnull; /* fd for /dev/null */
int phase; /* where the link is at */
int kill_link;
int open_ccp_flag;
+int listen_time;
+int got_sigusr2;
+int got_sigterm;
+int got_sighup;
+static sigset_t signals_handled;
static int waiting;
static sigjmp_buf sigjmp;
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 */
+int privopen; /* don't lock, open device as root */
char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
static struct timeval start_time; /* Time when link was started. */
+static struct pppd_stats old_link_stats;
struct pppd_stats link_stats;
+unsigned link_connect_time;
int link_stats_valid;
-static int charshunt_pid; /* Process ID for charshunt */
+int error_count;
/*
* We maintain a list of child process pids and
/* Prototypes for procedures local to this file. */
-static void create_pidfile __P((void));
+static void setup_signals __P((void));
+static void create_pidfile __P((int pid));
+static void create_linkpidfile __P((int pid));
static void cleanup __P((void));
-static void close_tty __P((void));
static void get_input __P((void));
static void calltimeout __P((void));
static struct timeval *timeleft __P((struct timeval *));
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 reap_kids __P((int waitfor));
-static void record_child __P((int, char *, void (*) (void *), void *));
-static int start_charshunt __P((int, int));
-static void charshunt_done __P((void *));
-static void charshunt __P((int, int, char *));
-static int record_write __P((FILE *, int code, u_char *buf, int nb,
- struct timeval *));
+static int reap_kids __P((void));
+static void childwait_end __P((void *));
+
+#ifdef USE_TDB
+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));
+#endif
+
+static void handle_events __P((void));
+void print_link_stats __P((void));
extern char *ttyname __P((int));
extern char *getlogin __P((void));
&cbcp_protent,
#endif
&ipcp_protent,
+#ifdef INET6
+ &ipv6cp_protent,
+#endif
&ccp_protent,
+ &ecp_protent,
#ifdef IPX_CHANGE
&ipxcp_protent,
#endif
#ifdef AT_CHANGE
&atcp_protent,
#endif
+ &eap_protent,
NULL
};
+/*
+ * If PPP_DRV_NAME is not defined, use the default "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 i, fdflags;
- struct sigaction sa;
+ int i, t;
char *p;
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;
- /*
- * 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);
- }
+ link_stats_valid = 0;
+ new_phase(PHASE_INITIALIZE);
script_env = NULL;
}
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);
- script_setenv("ORIG_UID", numbuf);
+ script_setenv("ORIG_UID", numbuf, 0);
ngroups = getgroups(NGROUPS_MAX, groups);
/*
- * Initialize to the standard option set, then parse, in order,
- * the system options file, the user's options file,
- * the tty's options file, and the command line arguments.
+ * Initialize magic number generator now so that protocols may
+ * use magic numbers in initialization.
+ */
+ magic_init();
+
+ /*
+ * Initialize each protocol.
*/
for (i = 0; (protp = protocols[i]) != NULL; ++i)
(*protp->init)(0);
- progname = *argv;
+ /*
+ * Initialize the default channel.
+ */
+ tty_init();
- 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 */
+ progname = *argv;
/*
- * Work out the device name, if it hasn't already been specified.
+ * Parse, in order, the system options file, the user's options file,
+ * and the command line arguments.
*/
- 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;
- }
- }
+ if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1)
+ || !options_from_user()
+ || !parse_args(argc-1, argv+1))
+ exit(EXIT_OPTION_ERROR);
+ devnam_fixed = 1; /* can no longer change device name */
/*
- * Parse the tty options file and the command line.
+ * Work out the device name, if it hasn't already been specified,
+ * and parse the tty's options file.
*/
- if (!options_for_tty()
- || !parse_args(argc-1, argv+1))
- exit(1);
+ if (the_channel->process_extra_options)
+ (*the_channel->process_extra_options)();
+
+ if (debug)
+ setlogmask(LOG_UPTO(LOG_DEBUG));
/*
* Check that we are running as root.
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);
- exit(1);
+ option_error("%s", no_ppp_msg);
+ exit(EXIT_NO_KERNEL_SUPPORT);
}
/*
* Check that the options given are valid and consistent.
*/
+ check_options();
if (!sys_check_options())
- exit(1);
+ exit(EXIT_OPTION_ERROR);
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)();
- if (demand && connector == 0) {
- option_error("connect script is required for demand-dialling\n");
- exit(1);
- }
+ if (the_channel->check_options)
+ (*the_channel->check_options)();
- if (using_pty) {
- if (!default_device) {
- option_error("%s option precludes specifying device name",
- notty? "notty": "pty");
- exit(1);
- }
- if (ptycommand != NULL && notty) {
- option_error("pty option is incompatible with notty option");
- exit(1);
- }
- default_device = notty;
- lockflag = 0;
- modem = 0;
- } else {
- if (devnam[0] == 0) {
- option_error("no device specified and stdin is not a tty");
- exit(1);
- }
+
+ if (dump_options || dryrun) {
+ init_pr_log(NULL, LOG_INFO);
+ print_options(pr_log, NULL);
+ end_pr_log();
}
- if (default_device)
- nodetach = 1;
- else
- log_to_fd = 1; /* default to stdout */
- script_setenv("DEVICE", devnam);
+ if (dryrun)
+ die(0);
/*
- * Initialize system-dependent stuff and magic number package.
+ * Initialize system-dependent stuff.
*/
sys_init();
- magic_init();
- if (debug)
- setlogmask(LOG_UPTO(LOG_DEBUG));
+
+ /* Make sure fds 0, 1, 2 are open to somewhere. */
+ fd_devnull = open(_PATH_DEVNULL, O_RDWR);
+ if (fd_devnull < 0)
+ fatal("Couldn't open %s: %m", _PATH_DEVNULL);
+ while (fd_devnull <= 2) {
+ i = dup(fd_devnull);
+ if (i < 0)
+ fatal("Critical shortage of file descriptors: dup failed: %m");
+ fd_devnull = i;
+ }
+
+#ifdef USE_TDB
+ 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;
+ }
+ }
+#endif
/*
* Detach ourselves from the terminal, if required,
else
p = "(unknown)";
}
- syslog(LOG_NOTICE, "pppd %s.%d%s started by %s, uid %d",
- VERSION, PATCHLEVEL, IMPLEMENTATION, p, uid);
- script_setenv("PPPLOGNAME", p);
-
- /*
- * 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);
+ syslog(LOG_NOTICE, "pppd %s started by %s, uid %d", VERSION, p, uid);
+ script_setenv("PPPLOGNAME", p, 0);
-#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
+ if (devnam[0])
+ script_setenv("DEVICE", devnam, 1);
+ slprintf(numbuf, sizeof(numbuf), "%d", getpid());
+ script_setenv("PPPD_PID", numbuf, 1);
- /*
- * 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;
/*
* Open the loopback channel and set it up to be the ppp interface.
*/
+#ifdef USE_TDB
+ tdb_writelock(pppdb);
+#endif
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);
+#ifdef USE_TDB
+ tdb_writeunlock(pppdb);
+#endif
/*
* Configure the interface and mark it up, etc.
*/
demand_conf();
+ create_linkpidfile(getpid());
}
+ do_callback = 0;
for (;;) {
+ listen_time = 0;
need_holdoff = 1;
- ttyfd = -1;
- real_ttyfd = -1;
+ devfd = -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;
- phase = PHASE_DORMANT;
+ new_phase(PHASE_DORMANT);
demand_unblock();
add_fd(fd_loop);
for (;;) {
- if (sigsetjmp(sigjmp, 1) == 0) {
- sigprocmask(SIG_BLOCK, &mask, NULL);
- if (kill_link || got_sigchld) {
- sigprocmask(SIG_UNBLOCK, &mask, NULL);
- } else {
- waiting = 1;
- sigprocmask(SIG_UNBLOCK, &mask, NULL);
- wait_input(timeleft(&timo));
- }
- }
- waiting = 0;
- calltimeout();
- if (kill_link) {
- if (!persist)
- break;
- kill_link = 0;
- }
+ handle_events();
+ if (kill_link && !persist)
+ break;
if (get_loop_output())
break;
- if (got_sigchld)
- reap_kids(0);
}
remove_fd(fd_loop);
if (kill_link && !persist)
info("Starting link");
}
- /*
- * Get a pty master/slave pair if the pty, notty, or record
- * options were specified.
- */
- strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
- pty_master = -1;
- pty_slave = -1;
- if (ptycommand != NULL || notty || record_file != NULL) {
- if (!get_pty(&pty_master, &pty_slave, ppp_devnam, uid)) {
- error("Couldn't allocate pseudo-tty");
- goto fail;
- }
- set_up_tty(pty_slave, 1);
- }
+ new_phase(PHASE_SERIALCONN);
- /*
- * Lock the device if we've been asked to.
- */
- if (lockflag && !default_device) {
- if (lock(devnam) < 0)
- goto fail;
- locked = 1;
- }
-
- /*
- * Open the serial device and set it up to be the ppp interface.
- * First we open it in non-blocking mode so we can set the
- * various termios flags appropriately. If we aren't dialling
- * out and we want to use the modem lines, we reopen it later
- * in order to wait for the carrier detect signal from the modem.
- */
- hungup = 0;
- kill_link = 0;
- if (devnam[0] != 0) {
- for (;;) {
- /* If the user specified the device name, become the
- user before opening it. */
- int err;
- if (!devnam_info.priv && !default_device)
- seteuid(uid);
- ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
- err = errno;
- if (!devnam_info.priv && !default_device)
- seteuid(0);
- if (ttyfd >= 0)
- break;
- errno = err;
- if (err != EINTR)
- error("Failed to open %s: %m", devnam);
- if (!persist || err != EINTR)
- goto fail;
- }
- if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1
- || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
- warn("Couldn't reset non-blocking mode on device: %m");
-
- /*
- * Do the equivalent of `mesg n' to stop broadcast messages.
- */
- if (fstat(ttyfd, &statbuf) < 0
- || fchmod(ttyfd, statbuf.st_mode & ~(S_IWGRP | S_IWOTH)) < 0) {
- warn("Couldn't restrict write permissions to %s: %m", devnam);
- } else
- tty_mode = statbuf.st_mode;
-
- /*
- * Set line speed, flow control, etc.
- * If we have a non-null connection 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
- * get to clear CLOCAL below. On systems where we can talk
- * 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));
- real_ttyfd = ttyfd;
- }
-
- /*
- * If the notty and/or record option was specified,
- * start up the character shunt now.
- */
- if (ptycommand != NULL) {
- if (record_file != NULL) {
- int ipipe[2], opipe[2], ok;
-
- if (pipe(ipipe) < 0 || pipe(opipe) < 0)
- fatal("Couldn't create pipes for record option: %m");
- ok = device_script(ptycommand, opipe[0], ipipe[1], 1) == 0
- && start_charshunt(ipipe[0], opipe[1]);
- close(ipipe[0]);
- close(ipipe[1]);
- close(opipe[0]);
- close(opipe[1]);
- if (!ok)
- goto fail;
- } else {
- if (device_script(ptycommand, pty_master, pty_master, 1) < 0)
- goto fail;
- ttyfd = pty_slave;
- close(pty_master);
- pty_master = -1;
- }
- } else if (notty) {
- if (!start_charshunt(0, 1))
- goto fail;
- } else if (record_file != NULL) {
- if (!start_charshunt(ttyfd, ttyfd))
- goto fail;
- }
-
- /* run connection script */
- if (connector && connector[0]) {
- MAINDEBUG(("Connecting with <%s>", connector));
-
- if (real_ttyfd != -1) {
- if (!default_device && modem) {
- setdtr(real_ttyfd, 0); /* in case modem is off hook */
- sleep(1);
- setdtr(real_ttyfd, 1);
- }
- }
-
- if (device_script(connector, ttyfd, ttyfd, 0) < 0) {
- error("Connect script 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);
- }
-
- /* reopen tty if necessary to wait for carrier */
- if (connector == NULL && modem && devnam[0] != 0) {
- for (;;) {
- if ((i = open(devnam, O_RDWR)) >= 0)
- break;
- if (errno != EINTR)
- error("Failed to reopen %s: %m", devnam);
- if (!persist || errno != EINTR || hungup || kill_link)
- goto fail;
- }
- close(i);
- }
-
- slprintf(numbuf, sizeof(numbuf), "%d", baud_rate);
- script_setenv("SPEED", numbuf);
-
- /* run welcome script, if any */
- if (welcomer && welcomer[0]) {
- if (device_script(welcomer, ttyfd, ttyfd, 0) < 0)
- warn("Welcome script failed");
- }
+ devfd = the_channel->connect();
+ if (devfd < 0)
+ goto fail;
/* set up the serial device as a ppp interface */
- fd_ppp = establish_ppp(ttyfd);
- if (fd_ppp < 0)
+#ifdef USE_TDB
+ tdb_writelock(pppdb);
+#endif
+ fd_ppp = the_channel->establish_ppp(devfd);
+ if (fd_ppp < 0) {
+#ifdef USE_TDB
+ tdb_writeunlock(pppdb);
+#endif
+ status = EXIT_FATAL_ERROR;
goto disconnect;
-
- 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 */
}
+ /* create the pid file, now that we've obtained a ppp interface */
+ if (!demand)
+ create_linkpidfile(getpid());
+
+ if (!demand && ifunit >= 0)
+ set_ifunit(1);
+#ifdef USE_TDB
+ tdb_writeunlock(pppdb);
+#endif
/*
* Start opening the connection and wait for
* incoming events (reply, timeout, etc.).
*/
- notice("Connect: %s <--> %s", ifname, ppp_devnam);
+ if (ifunit >= 0)
+ notice("Connect: %s <--> %s", ifname, ppp_devnam);
+ else
+ notice("Starting negotiation on %s", ppp_devnam);
gettimeofday(&start_time, NULL);
+ script_unsetenv("CONNECT_TIME");
+ script_unsetenv("BYTES_SENT");
+ script_unsetenv("BYTES_RCVD");
lcp_lowerup(0);
- /*
- * If we are initiating this connection, wait for a short
- * 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) {
- struct timeval t;
- t.tv_sec = 1;
- t.tv_usec = 0;
- wait_input(&t);
- }
-
- lcp_open(0); /* Start protocol */
- open_ccp_flag = 0;
add_fd(fd_ppp);
- for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; ) {
- if (sigsetjmp(sigjmp, 1) == 0) {
- sigprocmask(SIG_BLOCK, &mask, NULL);
- if (kill_link || open_ccp_flag || got_sigchld) {
- sigprocmask(SIG_UNBLOCK, &mask, NULL);
- } else {
- waiting = 1;
- sigprocmask(SIG_UNBLOCK, &mask, NULL);
- wait_input(timeleft(&timo));
- }
- }
- waiting = 0;
- calltimeout();
+ lcp_open(0); /* Start protocol */
+ status = EXIT_NEGOTIATION_FAILED;
+ new_phase(PHASE_ESTABLISH);
+ while (phase != PHASE_DEAD) {
+ handle_events();
get_input();
- if (kill_link) {
+ if (kill_link)
lcp_close(0, "User request");
- 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);
}
- open_ccp_flag = 0;
}
- if (got_sigchld)
- reap_kids(0); /* Don't leave dead kids lying around */
}
+ print_link_stats();
+
/*
- * Print connect time and statistics.
+ * 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 (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) {
- info("Sent %d bytes, received %d bytes.",
- link_stats.bytes_out, link_stats.bytes_in);
+ if (!demand) {
+ if (pidfilename[0] != 0
+ && unlink(pidfilename) < 0 && errno != ENOENT)
+ warn("unable to delete pid file %s: %m", pidfilename);
+ pidfilename[0] = 0;
}
/*
*/
remove_fd(fd_ppp);
clean_check();
- if (demand)
- restore_loop();
- disestablish_ppp(ttyfd);
+ the_channel->disestablish_ppp(devfd);
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!
*/
disconnect:
- if (disconnector && !hungup) {
- if (real_ttyfd >= 0)
- set_up_tty(real_ttyfd, 1);
- if (device_script(disconnector, ttyfd, ttyfd, 0) < 0) {
- warn("disconnect script failed");
- } else {
- info("Serial link disconnected.");
- }
- }
+ new_phase(PHASE_DISCONNECT);
+ if (the_channel->disconnect)
+ the_channel->disconnect();
fail:
- if (pty_master >= 0)
- close(pty_master);
- if (pty_slave >= 0)
- close(pty_slave);
- if (real_ttyfd >= 0)
- close_tty();
- if (locked) {
- unlock();
- locked = 0;
- }
+ if (the_channel->cleanup)
+ (*the_channel->cleanup)();
if (!demand) {
if (pidfilename[0] != 0
- && unlink(pidfilename) < 0 && errno != ENOENT)
- warn("unable to delete pid file: %m");
+ && unlink(pidfilename) < 0 && errno != ENOENT)
+ warn("unable to delete pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
- if (!persist)
+ if (!persist || (maxfail > 0 && unsuccess >= maxfail))
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);
- if (kill_link || got_sigchld) {
- sigprocmask(SIG_UNBLOCK, &mask, NULL);
- } else {
- waiting = 1;
- sigprocmask(SIG_UNBLOCK, &mask, NULL);
- wait_input(timeleft(&timo));
- }
- }
- waiting = 0;
- calltimeout();
- if (kill_link) {
- kill_link = 0;
- phase = PHASE_DORMANT; /* allow signal to end holdoff */
- }
- if (got_sigchld)
- reap_kids(0);
+ handle_events();
+ if (kill_link)
+ new_phase(PHASE_DORMANT); /* allow signal to end holdoff */
} while (phase == PHASE_HOLDOFF);
if (!persist)
break;
}
/* Wait for scripts to finish */
- while (n_children > 0) {
+ reap_kids();
+ if (n_children > 0) {
+ if (child_wait > 0)
+ TIMEOUT(childwait_end, NULL, child_wait);
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);
}
- reap_kids(1);
+ while (n_children > 0 && !childwait_done) {
+ handle_events();
+ if (kill_link && !childwait_done)
+ childwait_end(NULL);
+ }
}
- die(0);
+ die(status);
return 0;
}
+/*
+ * handle_events - wait for something to happen and respond to it.
+ */
+static void
+handle_events()
+{
+ struct timeval timo;
+
+ kill_link = open_ccp_flag = 0;
+ if (sigsetjmp(sigjmp, 1) == 0) {
+ sigprocmask(SIG_BLOCK, &signals_handled, NULL);
+ if (got_sighup || got_sigterm || got_sigusr2 || got_sigchld) {
+ sigprocmask(SIG_UNBLOCK, &signals_handled, NULL);
+ } else {
+ waiting = 1;
+ sigprocmask(SIG_UNBLOCK, &signals_handled, NULL);
+ wait_input(timeleft(&timo));
+ }
+ }
+ waiting = 0;
+ calltimeout();
+ if (got_sighup) {
+ info("Hangup (SIGHUP)");
+ kill_link = 1;
+ got_sighup = 0;
+ if (status != EXIT_HANGUP)
+ status = EXIT_USER_REQUEST;
+ }
+ if (got_sigterm) {
+ info("Terminating on signal %d", got_sigterm);
+ kill_link = 1;
+ persist = 0;
+ status = EXIT_USER_REQUEST;
+ got_sigterm = 0;
+ }
+ if (got_sigchld) {
+ got_sigchld = 0;
+ reap_kids(); /* Don't leave dead kids lying around */
+ }
+ if (got_sigusr2) {
+ open_ccp_flag = 1;
+ got_sigusr2 = 0;
+ }
+}
+
+/*
+ * setup_signals - initialize signal handling.
+ */
+static void
+setup_signals()
+{
+ struct sigaction sa;
+
+ /*
+ * 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(&signals_handled);
+ sigaddset(&signals_handled, SIGHUP);
+ sigaddset(&signals_handled, SIGINT);
+ sigaddset(&signals_handled, SIGTERM);
+ sigaddset(&signals_handled, SIGCHLD);
+ sigaddset(&signals_handled, 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 = signals_handled;
+ 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), "%s%d", PPP_DRV_NAME, ifunit);
+ script_setenv("IFNAME", ifname, iskey);
+ if (iskey) {
+ create_pidfile(getpid()); /* write pid to file */
+ create_linkpidfile(getpid());
+ }
+}
+
/*
* detach - detach us from the controlling terminal.
*/
detach()
{
int pid;
+ char numbuf[16];
+ int pipefd[2];
if (detached)
return;
+ if (pipe(pipefd) == -1)
+ pipefd[0] = pipefd[1] = -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);
+ notify(pidchange, pid);
+ /* update pid files if they have been written already */
+ if (pidfilename[0])
+ create_pidfile(pid);
+ if (linkpidfile[0])
+ create_linkpidfile(pid);
exit(0); /* parent dies */
}
setsid();
chdir("/");
- close(0);
- close(1);
- close(2);
+ dup2(fd_devnull, 0);
+ dup2(fd_devnull, 1);
+ dup2(fd_devnull, 2);
detached = 1;
- log_to_fd = -1;
- /* update pid file if it has been written already */
- if (pidfilename[0])
- create_pidfile();
+ if (log_default)
+ log_to_fd = -1;
+ slprintf(numbuf, sizeof(numbuf), "%d", getpid());
+ script_setenv("PPPD_PID", numbuf, 1);
+
+ /* wait for parent to finish updating pid & lock files and die */
+ close(pipefd[1]);
+ complete_read(pipefd[0], numbuf, 1);
+ close(pipefd[0]);
}
/*
* Create a file containing our process ID.
*/
static void
-create_pidfile()
+create_pidfile(pid)
+ int pid;
{
FILE *pidfile;
- char numbuf[16];
slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid",
_PATH_VARRUN, ifname);
if ((pidfile = fopen(pidfilename, "w")) != NULL) {
- fprintf(pidfile, "%d\n", getpid());
+ fprintf(pidfile, "%d\n", pid);
(void) fclose(pidfile);
} else {
error("Failed to create pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
- slprintf(numbuf, sizeof(numbuf), "%d", getpid());
- script_setenv("PPPD_PID", numbuf);
+}
+
+static void
+create_linkpidfile(pid)
+ int pid;
+{
+ 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", pid);
+ if (ifname[0])
+ fprintf(pidfile, "%s\n", ifname);
+ (void) fclose(pidfile);
+ } else {
+ error("Failed to create pid file %s: %m", linkpidfile);
+ linkpidfile[0] = 0;
+ }
}
/*
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;
}
/*
if (len == 0) {
notice("Modem hangup");
hungup = 1;
+ status = EXIT_HANGUP;
lcp_lowerdown(0); /* serial link is no longer available */
link_terminated(0);
return;
}
- if (debug /*&& (debugflags & DBG_INPACKET)*/)
- dbglog("rcvd %P", p, len);
-
if (len < PPP_HDRLEN) {
- MAINDEBUG(("io(): Received short packet."));
+ dbglog("received short packet:%.*B", len, p);
return;
}
+ dump_packet("rcvd", p, len);
+ if (snoop_recv_hook) snoop_recv_hook(p, len);
+
p += 2; /* Skip address and control */
GETSHORT(protocol, p);
len -= PPP_HDRLEN;
* Toss all non-LCP packets unless LCP is OPEN.
*/
if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) {
- MAINDEBUG(("get_input: Received non-LCP packet when LCP not open."));
+ dbglog("Discarded non-LCP packet when LCP not open");
return;
}
*/
if (phase <= PHASE_AUTHENTICATE
&& !(protocol == PPP_LCP || protocol == PPP_LQR
- || protocol == PPP_PAP || protocol == PPP_CHAP)) {
- MAINDEBUG(("get_input: discarding proto 0x%x in phase %d",
- protocol, phase));
+ || protocol == PPP_PAP || protocol == PPP_CHAP ||
+ protocol == PPP_EAP)) {
+ dbglog("discarding proto 0x%x in phase %d",
+ protocol, phase);
return;
}
}
}
- 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);
}
+/*
+ * ppp_send_config - configure the transmit-side characteristics of
+ * the ppp interface. Returns -1, indicating an error, if the channel
+ * send_config procedure called error() (or incremented error_count
+ * itself), otherwise 0.
+ */
+int
+ppp_send_config(unit, mtu, accm, pcomp, accomp)
+ int unit, mtu;
+ u_int32_t accm;
+ int pcomp, accomp;
+{
+ int errs;
+
+ if (the_channel->send_config == NULL)
+ return 0;
+ errs = error_count;
+ (*the_channel->send_config)(mtu, accm, pcomp, accomp);
+ return (error_count != errs)? -1: 0;
+}
+
+/*
+ * ppp_recv_config - configure the receive-side characteristics of
+ * the ppp interface. Returns -1, indicating an error, if the channel
+ * recv_config procedure called error() (or incremented error_count
+ * itself), otherwise 0.
+ */
+int
+ppp_recv_config(unit, mru, accm, pcomp, accomp)
+ int unit, mru;
+ u_int32_t accm;
+ int pcomp, accomp;
+{
+ int errs;
+
+ if (the_channel->recv_config == NULL)
+ return 0;
+ errs = error_count;
+ (*the_channel->recv_config)(mru, accm, pcomp, accomp);
+ return (error_count != errs)? -1: 0;
+}
+
+/*
+ * 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);
+ notify(phasechange, p);
+}
/*
* die - clean up state and exit with the specified status.
die(status)
int status;
{
+ print_link_stats();
cleanup();
+ notify(exitnotify, status);
syslog(LOG_INFO, "Exit.");
exit(status);
}
sys_cleanup();
if (fd_ppp >= 0)
- disestablish_ppp(ttyfd);
- if (real_ttyfd >= 0)
- close_tty();
+ the_channel->disestablish_ppp(devfd);
+ if (the_channel->cleanup)
+ (*the_channel->cleanup)();
- if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT)
- warn("unable to delete pid file: %m");
+ if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT)
+ 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;
+
+#ifdef USE_TDB
+ if (pppdb != NULL)
+ cleanup_db();
+#endif
- if (locked)
- unlock();
}
-/*
- * close_tty - restore the terminal device and close it.
- */
-static void
-close_tty()
+void
+print_link_stats()
{
- /* drop dtr to hang up */
- if (!default_device && modem) {
- setdtr(real_ttyfd, 0);
- /*
- * This sleep is in case the serial port has CLOCAL set by default,
- * and consequently will reassert DTR when we close the device.
- */
- sleep(1);
+ /*
+ * Print connect time and statistics.
+ */
+ 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 %u bytes, received %u bytes.",
+ link_stats.bytes_out, link_stats.bytes_in);
+ link_stats_valid = 0;
}
+}
- restore_tty(real_ttyfd);
+/*
+ * reset_link_stats - "reset" stats when link goes up.
+ */
+void
+reset_link_stats(u)
+ int u;
+{
+ if (!get_ppp_stats(u, &old_link_stats))
+ return;
+ gettimeofday(&start_time, NULL);
+}
- if (tty_mode != (mode_t) -1) {
- if (fchmod(real_ttyfd, tty_mode) != 0) {
- /* XXX if devnam is a symlink, this will change the link */
- chmod(devnam, tty_mode);
- }
- }
+/*
+ * update_link_stats - get stats at link termination.
+ */
+void
+update_link_stats(u)
+ int u;
+{
+ struct timeval now;
+ char numbuf[32];
- close(real_ttyfd);
- real_ttyfd = -1;
+ 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;
+
+ link_stats.bytes_in -= old_link_stats.bytes_in;
+ link_stats.bytes_out -= old_link_stats.bytes_out;
+ link_stats.pkts_in -= old_link_stats.pkts_in;
+ link_stats.pkts_out -= old_link_stats.pkts_out;
+
+ slprintf(numbuf, sizeof(numbuf), "%u", link_connect_time);
+ script_setenv("CONNECT_TIME", numbuf, 0);
+ slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_out);
+ script_setenv("BYTES_SENT", numbuf, 0);
+ slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_in);
+ script_setenv("BYTES_RCVD", numbuf, 0);
}
/*
* timeout - Schedule a timeout.
- *
- * Note that this timeout takes the number of seconds, NOT hz (as in
- * the kernel).
*/
void
-timeout(func, arg, time)
+timeout(func, arg, secs, usecs)
void (*func) __P((void *));
void *arg;
- int time;
+ int secs, usecs;
{
struct callout *newp, *p, **pp;
-
- MAINDEBUG(("Timeout %p:%p in %d seconds.", func, arg, time));
-
+
+ MAINDEBUG(("Timeout %p:%p in %d.%03d seconds.", func, arg,
+ secs, usecs/1000));
+
/*
* Allocate timeout.
*/
newp->c_arg = arg;
newp->c_func = func;
gettimeofday(&timenow, NULL);
- newp->c_time.tv_sec = timenow.tv_sec + time;
- newp->c_time.tv_usec = timenow.tv_usec;
-
+ newp->c_time.tv_sec = timenow.tv_sec + secs;
+ newp->c_time.tv_usec = timenow.tv_usec + usecs;
+ if (newp->c_time.tv_usec >= 1000000) {
+ newp->c_time.tv_sec += newp->c_time.tv_usec / 1000000;
+ newp->c_time.tv_usec %= 1000000;
+ }
+
/*
* Find correct place and link it in.
*/
void *arg;
{
struct callout **copp, *freep;
-
+
MAINDEBUG(("Untimeout %p:%p.", func, arg));
-
+
/*
* Find first matching timeout and remove it from the list.
*/
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;
}
}
/*
* kill_my_pg - send a signal to our process group, and ignore it ourselves.
+ * We assume that sig is currently blocked.
*/
static void
kill_my_pg(sig)
{
struct sigaction act, oldact;
+ sigemptyset(&act.sa_mask); /* unnecessary in fact */
act.sa_handler = SIG_IGN;
act.sa_flags = 0;
kill(0, sig);
+ /*
+ * The kill() above made the signal pending for us, as well as
+ * the rest of our process group, but we don't want it delivered
+ * to us. It is blocked at the moment. Setting it to be ignored
+ * will cause the pending signal to be discarded. If we did the
+ * kill() after setting the signal to be ignored, it is unspecified
+ * (by POSIX) whether the signal is immediately discarded or left
+ * pending, and in fact Linux would leave it pending, and so it
+ * would be delivered after the current signal handler exits,
+ * leading to an infinite loop.
+ */
sigaction(sig, &act, &oldact);
sigaction(sig, &oldact, NULL);
}
hup(sig)
int sig;
{
- info("Hangup (SIGHUP)");
- kill_link = 1;
+ /* can't log a message here, it can deadlock */
+ got_sighup = 1;
if (conn_running)
/* Send the signal to the [dis]connector process(es) also */
kill_my_pg(sig);
- if (charshunt_pid)
- kill(charshunt_pid, sig);
+ notify(sigreceived, sig);
if (waiting)
siglongjmp(sigjmp, 1);
}
term(sig)
int sig;
{
- info("Terminating on signal %d.", sig);
- persist = 0; /* don't try to restart */
- kill_link = 1;
+ /* can't log a message here, it can deadlock */
+ got_sigterm = sig;
if (conn_running)
/* Send the signal to the [dis]connector process(es) also */
kill_my_pg(sig);
- if (charshunt_pid)
- kill(charshunt_pid, sig);
+ notify(sigreceived, sig);
if (waiting)
siglongjmp(sigjmp, 1);
}
open_ccp(sig)
int sig;
{
- open_ccp_flag = 1;
+ got_sigusr2 = 1;
if (waiting)
siglongjmp(sigjmp, 1);
}
error("Fatal signal %d", sig);
if (conn_running)
kill_my_pg(SIGTERM);
- if (charshunt_pid)
- kill(charshunt_pid, SIGTERM);
- die(1);
+ notify(sigreceived, sig);
+ die(127);
}
+/*
+ * safe_fork - Create a child process. The child closes all the
+ * file descriptors that we don't want to leak to a script.
+ * The parent waits for the child to do this before returning.
+ */
+pid_t
+safe_fork()
+{
+ pid_t pid;
+ int pipefd[2];
+ char buf[1];
+
+ if (pipe(pipefd) == -1)
+ pipefd[0] = pipefd[1] = -1;
+ pid = fork();
+ if (pid < 0)
+ return -1;
+ if (pid > 0) {
+ close(pipefd[1]);
+ /* this read() blocks until the close(pipefd[1]) below */
+ complete_read(pipefd[0], buf, 1);
+ close(pipefd[0]);
+ return pid;
+ }
+ sys_close();
+#ifdef USE_TDB
+ tdb_close(pppdb);
+#endif
+ notify(fork_notifier, 0);
+ close(pipefd[0]);
+ /* this close unblocks the read() call above in the parent */
+ close(pipefd[1]);
+ return 0;
+}
/*
- * device_script - run a program to talk to the serial device
+ * device_script - run a program to talk to the specified fds
* (e.g. to run the connector or disconnector script).
+ * stderr gets connected to the log fd or to the _PATH_CONNERRS file.
*/
-static int
+int
device_script(program, in, out, dont_wait)
char *program;
int in, out;
int pid;
int status = -1;
int errfd;
+ int fd;
++conn_running;
- pid = fork();
+ pid = safe_fork();
if (pid < 0) {
--conn_running;
return -1;
}
- if (pid == 0) {
- sys_close();
- closelog();
- if (in == 2) {
- /* aargh!!! */
- int newin = dup(in);
- if (in == out)
- out = newin;
- in = newin;
- } else if (out == 2) {
- out = dup(out);
- }
- if (log_to_fd >= 0) {
- if (log_to_fd != 2)
- dup2(log_to_fd, 2);
+ if (pid != 0) {
+ if (dont_wait) {
+ record_child(pid, program, NULL, NULL);
+ status = 0;
} else {
- close(2);
- errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
- if (errfd >= 0 && errfd != 2) {
- dup2(errfd, 2);
- close(errfd);
+ while (waitpid(pid, &status, 0) < 0) {
+ if (errno == EINTR)
+ continue;
+ fatal("error waiting for (dis)connection process: %m");
}
+ --conn_running;
}
- if (in != 0) {
- if (out == 0)
- out = dup(out);
- dup2(in, 0);
- }
- if (out != 1) {
- dup2(out, 1);
- }
- if (real_ttyfd > 2)
- close(real_ttyfd);
- if (pty_master > 2)
- close(pty_master);
- if (pty_slave > 2)
- close(pty_slave);
- setuid(uid);
- if (getuid() != uid) {
- error("setuid failed");
- exit(1);
+ return (status == 0 ? 0 : -1);
+ }
+
+ /* here we are executing in the child */
+
+ /* make sure fds 0, 1, 2 are occupied */
+ while ((fd = dup(in)) >= 0) {
+ if (fd > 2) {
+ close(fd);
+ break;
}
- setgid(getgid());
- execl("/bin/sh", "sh", "-c", program, (char *)0);
- error("could not exec /bin/sh: %m");
- exit(99);
- /* NOTREACHED */
}
- if (dont_wait) {
- record_child(pid, program, NULL, NULL);
- status = 0;
- } else {
- while (waitpid(pid, &status, 0) < 0) {
- if (errno == EINTR)
- continue;
- fatal("error waiting for (dis)connection process: %m");
+ /* dup in and out to fds > 2 */
+ {
+ int fd1 = in, fd2 = out, fd3 = log_to_fd;
+
+ in = dup(in);
+ out = dup(out);
+ if (log_to_fd >= 0) {
+ errfd = dup(log_to_fd);
+ } else {
+ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
}
- --conn_running;
+ close(fd1);
+ close(fd2);
+ close(fd3);
+ }
+
+ /* close fds 0 - 2 and any others we can think of */
+ close(0);
+ close(1);
+ close(2);
+ if (the_channel->close)
+ (*the_channel->close)();
+ else
+ close(devfd); /* some plugins don't have a close function */
+ closelog();
+ close(fd_devnull);
+
+ /* dup the in, out, err fds to 0, 1, 2 */
+ dup2(in, 0);
+ close(in);
+ dup2(out, 1);
+ close(out);
+ if (errfd >= 0) {
+ dup2(errfd, 2);
+ close(errfd);
}
- return (status == 0 ? 0 : -1);
+ setuid(uid);
+ if (getuid() != uid) {
+ error("setuid failed");
+ exit(1);
+ }
+ setgid(getgid());
+ execl("/bin/sh", "sh", "-c", program, (char *)0);
+ error("could not exec /bin/sh: %m");
+ exit(99);
+ /* NOTREACHED */
}
return 0;
}
- pid = fork();
+ pid = safe_fork();
if (pid == -1) {
error("Failed to create child process for %s: %m", prog);
return -1;
}
- if (pid == 0) {
- int new_fd;
+ if (pid != 0) {
+ if (debug)
+ dbglog("Script %s started (pid %d)", prog, pid);
+ record_child(pid, prog, done, arg);
+ return pid;
+ }
- /* Leave the current location */
- (void) setsid(); /* No controlling tty. */
- (void) umask (S_IRWXG|S_IRWXO);
- (void) chdir ("/"); /* no current directory. */
- setuid(0); /* set real UID = root */
- setgid(getegid());
+ /* Leave the current location */
+ (void) setsid(); /* No controlling tty. */
+ (void) umask (S_IRWXG|S_IRWXO);
+ (void) chdir ("/"); /* no current directory. */
+ setuid(0); /* set real UID = root */
+ setgid(getegid());
- /* Ensure that nothing of our device environment is inherited. */
- sys_close();
- closelog();
- close (0);
- close (1);
- close (2);
- close (ttyfd); /* tty interface to the ppp device */
- if (real_ttyfd >= 0)
- close(real_ttyfd);
-
- /* Don't pass handles to the PPP device, even by accident. */
- new_fd = open (_PATH_DEVNULL, O_RDWR);
- if (new_fd >= 0) {
- if (new_fd != 0) {
- dup2 (new_fd, 0); /* stdin <- /dev/null */
- close (new_fd);
- }
- dup2 (0, 1); /* stdout -> /dev/null */
- dup2 (0, 2); /* stderr -> /dev/null */
- }
+ /* Ensure that nothing of our device environment is inherited. */
+ closelog();
+ if (the_channel->close)
+ (*the_channel->close)();
+
+ /* Don't pass handles to the PPP device, even by accident. */
+ dup2(fd_devnull, 0);
+ dup2(fd_devnull, 1);
+ dup2(fd_devnull, 2);
+ close(fd_devnull);
#ifdef BSD
- /* Force the priority back to zero if pppd is running higher. */
- if (setpriority (PRIO_PROCESS, 0, 0) < 0)
- warn("can't reset priority to 0: %m");
+ /* Force the priority back to zero if pppd is running higher. */
+ if (setpriority (PRIO_PROCESS, 0, 0) < 0)
+ warn("can't reset priority to 0: %m");
#endif
- /* SysV recommends a second fork at this point. */
+ /* SysV recommends a second fork at this point. */
- /* run the program */
- execve(prog, args, script_env);
- if (must_exist || errno != ENOENT) {
- /* have to reopen the log, there's nowhere else
- for the message to go. */
- reopen_log();
- syslog(LOG_ERR, "Can't execute %s: %m", prog);
- closelog();
- }
- _exit(-1);
+ /* run the program */
+ execve(prog, args, script_env);
+ if (must_exist || errno != ENOENT) {
+ /* have to reopen the log, there's nowhere else
+ for the message to go. */
+ reopen_log();
+ syslog(LOG_ERR, "Can't execute %s: %m", prog);
+ closelog();
}
-
- if (debug)
- dbglog("Script %s started (pid %d)", prog, pid);
- record_child(pid, prog, done, arg);
-
- return pid;
+ _exit(-1);
}
* record_child - add a child process to the list for reap_kids
* to use.
*/
-static void
+void
record_child(pid, prog, done, arg)
int pid;
char *prog;
}
}
+/*
+ * childwait_end - we got fed up waiting for the child processes to
+ * exit, send them all a SIGTERM.
+ */
+static void
+childwait_end(arg)
+ void *arg;
+{
+ struct subprocess *chp;
+
+ for (chp = children; chp != NULL; chp = chp->next) {
+ if (debug)
+ dbglog("sending SIGTERM to process %d", chp->pid);
+ kill(chp->pid, SIGTERM);
+ }
+ childwait_done = 1;
+}
/*
* reap_kids - get status from any dead child processes,
* and log a message for abnormal terminations.
*/
-static void
-reap_kids(waitfor)
- int waitfor;
+static int
+reap_kids()
{
int pid, status;
struct subprocess *chp, **prevp;
- got_sigchld = 0;
if (n_children == 0)
- return;
- while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1
- && pid != 0) {
- --n_children;
+ return 0;
+ while ((pid = waitpid(-1, &status, WNOHANG)) != -1 && pid != 0) {
for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) {
if (chp->pid == pid) {
+ --n_children;
*prevp = chp->next;
break;
}
(chp? chp->prog: "??"), pid, WTERMSIG(status));
} else if (debug)
dbglog("Script %s finished (pid %d), status = 0x%x",
- (chp? chp->prog: "??"), pid, status);
+ (chp? chp->prog: "??"), pid,
+ WIFEXITED(status) ? WEXITSTATUS(status) : status);
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");
+ if (pid == -1) {
+ if (errno == ECHILD)
+ return -1;
+ if (errno != EINTR)
+ error("Error waiting for child process: %m");
+ }
+ return 0;
+}
+
+/*
+ * add_notifier - add a new function to be called when something happens.
+ */
+void
+add_notifier(notif, func, arg)
+ struct notifier **notif;
+ notify_func func;
+ void *arg;
+{
+ struct notifier *np;
+
+ np = malloc(sizeof(struct notifier));
+ if (np == 0)
+ novm("notifier struct");
+ np->next = *notif;
+ np->func = func;
+ np->arg = arg;
+ *notif = np;
+}
+
+/*
+ * remove_notifier - remove a function from the list of things to
+ * be called when something happens.
+ */
+void
+remove_notifier(notif, func, arg)
+ struct notifier **notif;
+ notify_func func;
+ void *arg;
+{
+ struct notifier *np;
+
+ for (; (np = *notif) != 0; notif = &np->next) {
+ if (np->func == func && np->arg == arg) {
+ *notif = np->next;
+ free(np);
+ break;
+ }
+ }
}
+/*
+ * notify - call a set of functions registered with add_notifier.
+ */
+void
+notify(notif, val)
+ struct notifier *notif;
+ int val;
+{
+ struct notifier *np;
+
+ while ((np = notif) != 0) {
+ notif = np->next;
+ (*np->func)(np->arg, val);
+ }
+}
/*
* novm - log an error message saying we ran out of memory, and die.
* 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;
+ 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;
- newstring = (char *) malloc(vl);
+ newstring = (char *) malloc(vl+1);
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) {
- if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
- free(p);
+ if (strncmp(p, var, varl) == 0 && p[varl] == '=') {
+#ifdef USE_TDB
+ if (p[-1] && pppdb != NULL)
+ delete_db_key(p);
+#endif
+ free(p-1);
script_env[i] = newstring;
+#ifdef USE_TDB
+ if (iskey && pppdb != NULL)
+ add_db_key(newstring);
+ update_db_entry();
+#endif
return;
}
}
} else {
+ /* no space allocated for script env. ptrs. yet */
i = 0;
script_env = (char **) malloc(16 * sizeof(char *));
if (script_env == 0)
script_env[i] = newstring;
script_env[i+1] = 0;
+
+#ifdef USE_TDB
+ if (pppdb != NULL) {
+ if (iskey)
+ add_db_key(newstring);
+ update_db_entry();
+ }
+#endif
}
/*
return;
for (i = 0; (p = script_env[i]) != 0; ++i) {
if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
- free(p);
+#ifdef USE_TDB
+ if (p[-1] && pppdb != NULL)
+ delete_db_key(p);
+#endif
+ free(p-1);
while ((script_env[i] = script_env[i+1]) != 0)
++i;
break;
}
}
+#ifdef USE_TDB
+ if (pppdb != NULL)
+ update_db_entry();
+#endif
}
+#ifdef USE_TDB
/*
- * start_charshunt - create a child process to run the character shunt.
+ * update_db_entry - update our entry in the database.
*/
-static int
-start_charshunt(ifd, ofd)
- int ifd, ofd;
+static void
+update_db_entry()
{
- int cpid;
+ TDB_DATA key, dbuf;
+ int vlen, i;
+ char *p, *q, *vbuf;
+
+ 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));
+
+ if (vbuf)
+ free(vbuf);
- cpid = fork();
- if (cpid == -1) {
- error("Can't fork process for character shunt: %m");
- return 0;
- }
- if (cpid == 0) {
- /* child */
- close(pty_slave);
- setuid(uid);
- if (getuid() != uid)
- fatal("setuid failed");
- setgid(getgid());
- if (!nodetach)
- log_to_fd = -1;
- charshunt(ifd, ofd, record_file);
- exit(0);
- }
- charshunt_pid = cpid;
- close(pty_master);
- pty_master = -1;
- ttyfd = pty_slave;
- record_child(cpid, "pppd (charshunt)", charshunt_done, NULL);
- return 1;
}
+/*
+ * add_db_key - add a key that we can use to look up our database entry.
+ */
static void
-charshunt_done(arg)
- void *arg;
+add_db_key(str)
+ const char *str;
{
- charshunt_pid = 0;
+ 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));
}
/*
- * charshunt - the character shunt, which passes characters between
- * the pty master side and the serial port (or stdin/stdout).
- * This runs as the user (not as root).
- * (We assume ofd >= ifd which is true the way this gets called. :-).
+ * delete_db_key - delete a key for looking up our database entry.
*/
static void
-charshunt(ifd, ofd, record_file)
- int ifd, ofd;
- char *record_file;
+delete_db_key(str)
+ const char *str;
{
- int n, nfds;
- fd_set ready, writey;
- u_char *ibufp, *obufp;
- int nibuf, nobuf;
- int flags;
- int pty_readable, stdin_readable;
- struct timeval lasttime;
- FILE *recordf = NULL;
-
- /*
- * Reset signal handlers.
- */
- signal(SIGHUP, SIG_IGN); /* Hangup */
- signal(SIGINT, SIG_DFL); /* Interrupt */
- signal(SIGTERM, SIG_DFL); /* Terminate */
- signal(SIGCHLD, SIG_DFL);
- signal(SIGUSR1, SIG_DFL);
- signal(SIGUSR2, SIG_DFL);
- signal(SIGABRT, SIG_DFL);
- signal(SIGALRM, SIG_DFL);
- signal(SIGFPE, SIG_DFL);
- signal(SIGILL, SIG_DFL);
- signal(SIGPIPE, SIG_DFL);
- signal(SIGQUIT, SIG_DFL);
- signal(SIGSEGV, SIG_DFL);
-#ifdef SIGBUS
- signal(SIGBUS, SIG_DFL);
-#endif
-#ifdef SIGEMT
- signal(SIGEMT, SIG_DFL);
-#endif
-#ifdef SIGPOLL
- signal(SIGPOLL, SIG_DFL);
-#endif
-#ifdef SIGPROF
- signal(SIGPROF, SIG_DFL);
-#endif
-#ifdef SIGSYS
- signal(SIGSYS, SIG_DFL);
-#endif
-#ifdef SIGTRAP
- signal(SIGTRAP, SIG_DFL);
-#endif
-#ifdef SIGVTALRM
- signal(SIGVTALRM, SIG_DFL);
-#endif
-#ifdef SIGXCPU
- signal(SIGXCPU, SIG_DFL);
-#endif
-#ifdef SIGXFSZ
- signal(SIGXFSZ, SIG_DFL);
-#endif
-
- /*
- * Open the record file if required.
- */
- if (record_file != NULL) {
- recordf = fopen(record_file, "a");
- if (recordf == NULL)
- error("Couldn't create record file %s: %m", record_file);
- }
-
- /* set all the fds to non-blocking mode */
- flags = fcntl(pty_master, F_GETFL);
- if (flags == -1
- || fcntl(pty_master, F_SETFL, flags | O_NONBLOCK) == -1)
- warn("couldn't set pty master to nonblock: %m");
- flags = fcntl(ifd, F_GETFL);
- if (flags == -1
- || fcntl(ifd, F_SETFL, flags | O_NONBLOCK) == -1)
- warn("couldn't set %s to nonblock: %m", (ifd==0? "stdin": "tty"));
- if (ofd != ifd) {
- flags = fcntl(ofd, F_GETFL);
- if (flags == -1
- || fcntl(ofd, F_SETFL, flags | O_NONBLOCK) == -1)
- warn("couldn't set stdout to nonblock: %m");
- }
-
- nibuf = nobuf = 0;
- ibufp = obufp = NULL;
- pty_readable = stdin_readable = 1;
- nfds = (ofd > pty_master? ofd: pty_master) + 1;
- if (recordf != NULL) {
- gettimeofday(&lasttime, NULL);
- putc(7, recordf); /* put start marker */
- putc(lasttime.tv_sec >> 24, recordf);
- putc(lasttime.tv_sec >> 16, recordf);
- putc(lasttime.tv_sec >> 8, recordf);
- putc(lasttime.tv_sec, recordf);
- lasttime.tv_usec = 0;
- }
+ TDB_DATA key;
- while (nibuf != 0 || nobuf != 0 || pty_readable || stdin_readable) {
- FD_ZERO(&ready);
- FD_ZERO(&writey);
- if (nibuf != 0)
- FD_SET(pty_master, &writey);
- else if (stdin_readable)
- FD_SET(ifd, &ready);
- if (nobuf != 0)
- FD_SET(ofd, &writey);
- else if (pty_readable)
- FD_SET(pty_master, &ready);
- if (select(nfds, &ready, &writey, NULL, NULL) < 0) {
- if (errno != EINTR)
- fatal("select");
- continue;
- }
- if (FD_ISSET(ifd, &ready)) {
- ibufp = inpacket_buf;
- nibuf = read(ifd, ibufp, sizeof(inpacket_buf));
- if (nibuf < 0 && errno == EIO)
- nibuf = 0;
- if (nibuf < 0) {
- if (!(errno == EINTR || errno == EAGAIN)) {
- error("Error reading standard input: %m");
- break;
- }
- nibuf = 0;
- } else if (nibuf == 0) {
- /* end of file from stdin */
- stdin_readable = 0;
- /* do a 0-length write, hopefully this will generate
- an EOF (hangup) on the slave side. */
- write(pty_master, inpacket_buf, 0);
- if (recordf)
- if (!record_write(recordf, 4, NULL, 0, &lasttime))
- recordf = NULL;
- } else {
- FD_SET(pty_master, &writey);
- if (recordf)
- if (!record_write(recordf, 2, ibufp, nibuf, &lasttime))
- recordf = NULL;
- }
- }
- if (FD_ISSET(pty_master, &ready)) {
- obufp = outpacket_buf;
- nobuf = read(pty_master, obufp, sizeof(outpacket_buf));
- if (nobuf < 0 && errno == EIO)
- nobuf = 0;
- if (nobuf < 0) {
- if (!(errno == EINTR || errno == EAGAIN)) {
- error("Error reading pseudo-tty master: %m");
- break;
- }
- nobuf = 0;
- } else if (nobuf == 0) {
- /* end of file from the pty - slave side has closed */
- pty_readable = 0;
- stdin_readable = 0; /* pty is not writable now */
- nibuf = 0;
- close(ofd);
- if (recordf)
- if (!record_write(recordf, 3, NULL, 0, &lasttime))
- recordf = NULL;
- } else {
- FD_SET(ofd, &writey);
- if (recordf)
- if (!record_write(recordf, 1, obufp, nobuf, &lasttime))
- recordf = NULL;
- }
- }
- if (FD_ISSET(ofd, &writey)) {
- n = write(ofd, obufp, nobuf);
- if (n < 0) {
- if (errno != EIO) {
- error("Error writing standard output: %m");
- break;
- }
- pty_readable = 0;
- nobuf = 0;
- } else {
- obufp += n;
- nobuf -= n;
- }
- }
- if (FD_ISSET(pty_master, &writey)) {
- n = write(pty_master, ibufp, nibuf);
- if (n < 0) {
- if (errno != EIO) {
- error("Error writing pseudo-tty master: %m");
- break;
- }
- stdin_readable = 0;
- nibuf = 0;
- } else {
- ibufp += n;
- nibuf -= n;
- }
- }
- }
- exit(0);
+ key.dptr = (char *) str;
+ key.dsize = strlen(str);
+ tdb_delete(pppdb, key);
}
-static int
-record_write(f, code, buf, nb, tp)
- FILE *f;
- int code;
- u_char *buf;
- int nb;
- struct timeval *tp;
+/*
+ * cleanup_db - delete all the entries we put in the database.
+ */
+static void
+cleanup_db()
{
- struct timeval now;
- int diff;
-
- gettimeofday(&now, NULL);
- now.tv_usec /= 100000; /* actually 1/10 s, not usec now */
- diff = (now.tv_sec - tp->tv_sec) * 10 + (now.tv_usec - tp->tv_usec);
- if (diff > 0) {
- if (diff > 255) {
- putc(5, f);
- putc(diff >> 24, f);
- putc(diff >> 16, f);
- putc(diff >> 8, f);
- putc(diff, f);
- } else {
- putc(6, f);
- putc(diff, f);
- }
- *tp = now;
- }
- putc(code, f);
- if (buf != NULL) {
- putc(nb >> 8, f);
- putc(nb, f);
- fwrite(buf, nb, 1, f);
- }
- fflush(f);
- if (ferror(f)) {
- error("Error writing record file: %m");
- return 0;
- }
- return 1;
+ TDB_DATA key;
+ int i;
+ char *p;
+
+ 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);
}
+#endif /* USE_TDB */
projects / ppp.git / blobdiff