/*
* 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.11 1994/05/24 11:25:33 paulus Exp $";
-#endif
-
-#define SETSID
+#define RCSID "$Id: main.c,v 1.155 2006/12/19 10:22:11 paulus Exp $"
#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <signal.h>
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
#include <utmp.h>
#include <pwd.h>
-#include <sys/wait.h>
-
-/*
- * If REQ_SYSOPTIONS is defined to 1, pppd will not run unless
- * /etc/ppp/options exists.
- */
-#ifndef REQ_SYSOPTIONS
-#define REQ_SYSOPTIONS 1
-#endif
-
-#ifdef SGTTY
-#include <sgtty.h>
-#else
-#ifndef sun
-#include <sys/ioctl.h>
-#endif
-#include <termios.h>
-#endif
-
+#include <setjmp.h>
#include <sys/param.h>
#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/socket.h>
-#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
-#include "callout.h"
-
-#include <net/if.h>
-#include <net/if_ppp.h>
-
-#include <string.h>
-
-#include "ppp.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 "pppd.h"
+#include "chap-new.h"
+#include "eap.h"
+#include "ccp.h"
+#include "ecp.h"
#include "pathnames.h"
-#include "patchlevel.h"
+#ifdef USE_TDB
+#include "tdb.h"
+#endif
-#ifndef TRUE
-#define TRUE (1)
-#endif /*TRUE*/
+#ifdef CBCP_SUPPORT
+#include "cbcp.h"
+#endif
-#ifndef FALSE
-#define FALSE (0)
-#endif /*FALSE*/
+#ifdef IPX_CHANGE
+#include "ipxcp.h"
+#endif /* IPX_CHANGE */
+#ifdef AT_CHANGE
+#include "atcp.h"
+#endif
-#ifdef PIDPATH
-static char *pidpath = PIDPATH; /* filename in which pid will be stored */
-#else
-static char *pidpath = _PATH_PIDFILE;
-#endif /* PIDFILE */
+static const char rcsid[] = RCSID;
/* interface vars */
-char ifname[IFNAMSIZ]; /* Interface name */
+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 */
-char our_name[MAXNAMELEN];
-char remote_name[MAXNAMELEN];
-static char pidfilename[MAXPATHLEN];
-
-static pid_t pid; /* Our pid */
-static pid_t pgrpid; /* Process Group ID */
+static char pidfilename[MAXPATHLEN]; /* name of pid file */
+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;
-char devname[MAXPATHLEN] = "/dev/tty"; /* Device name */
-int default_device = TRUE; /* use default device (stdin/out) */
+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 */
+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
-int fd = -1; /* Device file descriptor */
-int s; /* Socket file descriptor */
+char db_key[32];
-int phase; /* where the link is at */
+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;
-#ifdef SGTTY
-static struct sgttyb initsgttyb; /* Initial TTY sgttyb */
-#else
-static struct termios inittermios; /* Initial TTY termios */
-#endif
+static int conn_running; /* we have a [dis]connector running */
+static int fd_loop; /* fd for getting demand-dial packets */
-static int initfdflags = -1; /* Initial file descriptor flags */
+int fd_devnull; /* fd for /dev/null */
+int devfd = -1; /* fd of underlying device */
+int fd_ppp = -1; /* fd for talking PPP */
+int phase; /* where the link is at */
+int kill_link;
+int asked_to_quit;
+int open_ccp_flag;
+int listen_time;
+int got_sigusr2;
+int got_sigterm;
+int got_sighup;
-static int restore_term; /* 1 => we've munged the terminal */
+static sigset_t signals_handled;
+static int waiting;
+static sigjmp_buf sigjmp;
-u_char outpacket_buf[MTU+DLLHEADERLEN]; /* buffer for outgoing packet */
-static u_char inpacket_buf[MTU+DLLHEADERLEN]; /* buffer for incoming packet */
+char **script_env; /* Env. variable values for scripts */
+int s_env_nalloc; /* # words avail at script_env */
+
+u_char outpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for outgoing packet */
+u_char inpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for incoming packet */
-int hungup; /* terminal has been hung up */
static int n_children; /* # child processes still running */
+static int got_sigchld; /* set if we have received a SIGCHLD */
+
+int privopen; /* don't lock, open device as root */
+
+char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
+
+GIDSET_TYPE groups[NGROUPS_MAX];/* groups the user is in */
+int ngroups; /* How many groups valid in groups */
+
+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;
-/* configured variables */
-
-int debug = 0; /* Debug flag */
-int kdebugflag = 0; /* Kernel debugging flag */
-char user[MAXNAMELEN]; /* username for PAP */
-char passwd[MAXSECRETLEN]; /* password for PAP */
-char *connector = NULL; /* "connect" command */
-char *disconnector = NULL; /* "disconnect" command */
-int inspeed = 0; /* Input/Output speed requested */
-int baud_rate; /* bits/sec currently used */
-u_long netmask = 0; /* netmask to use on ppp interface */
-int crtscts = 0; /* use h/w flow control */
-int nodetach = 0; /* don't fork */
-int modem = 0; /* use modem control lines */
-int auth_required = 0; /* require peer to authenticate */
-int defaultroute = 0; /* assign default route through interface */
-int proxyarp = 0; /* set entry in arp table */
-int persist = 0; /* re-initiate on termination */
-int answer = 0; /* wait for incoming call */
-int uselogin = 0; /* check PAP info against /etc/passwd */
-int lockflag = 0; /* lock the serial device */
-
-
-/* prototypes */
-static void hup __ARGS((int));
-static void intr __ARGS((int));
-static void term __ARGS((int));
-static void alrm __ARGS((int));
-static void io __ARGS((int));
-static void chld __ARGS((int));
-static void incdebug __ARGS((int));
-static void nodebug __ARGS((int));
-void establish_ppp __ARGS((void));
-
-void reap_kids __ARGS((void));
-void cleanup __ARGS((int, caddr_t));
-void die __ARGS((int));
-void novm __ARGS((char *));
-
-void log_packet __ARGS((u_char *, int, char *));
-void format_packet __ARGS((u_char *, int,
- void (*) (void *, char *, ...), void *));
-void pr_log __ARGS((void *, char *, ...));
-
-extern char *ttyname __ARGS((int));
-extern char *getlogin __ARGS((void));
+int error_count;
+
+bool bundle_eof;
+bool bundle_terminating;
+
+/*
+ * 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. */
+
+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 get_input __P((void));
+static void calltimeout __P((void));
+static struct timeval *timeleft __P((struct timeval *));
+static void kill_my_pg __P((int));
+static void hup __P((int));
+static void term __P((int));
+static void chld __P((int));
+static void toggle_debug __P((int));
+static void open_ccp __P((int));
+static void bad_signal __P((int));
+static void holdoff_end __P((void *));
+static void forget_child __P((int pid, int status));
+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));
+int main __P((int, char *[]));
+
+#ifdef ultrix
+#undef O_NONBLOCK
+#define O_NONBLOCK O_NDELAY
+#endif
+
+#ifdef ULTRIX
+#define setlogmask(x)
+#endif
/*
* PPP Data Link Layer "protocol" table.
* One entry per supported protocol.
+ * The last entry must be NULL.
*/
-static struct protent {
- u_short protocol;
- void (*init)();
- void (*input)();
- void (*protrej)();
- int (*printpkt)();
- char *name;
-} prottbl[] = {
- { LCP, lcp_init, lcp_input, lcp_protrej, lcp_printpkt, "LCP" },
- { IPCP, ipcp_init, ipcp_input, ipcp_protrej, ipcp_printpkt, "IPCP" },
- { UPAP, upap_init, upap_input, upap_protrej, upap_printpkt, "PAP" },
- { CHAP, ChapInit, ChapInput, ChapProtocolReject, ChapPrintPkt, "CHAP" },
+struct protent *protocols[] = {
+ &lcp_protent,
+ &pap_protent,
+ &chap_protent,
+#ifdef CBCP_SUPPORT
+ &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
};
-#define N_PROTO (sizeof(prottbl) / sizeof(prottbl[0]))
+/*
+ * 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 mask, i;
- struct sigaction sa;
- struct cmd *cmdp;
- FILE *pidfile;
+ int i, t;
char *p;
struct passwd *pw;
+ struct protent *protp;
+ char numbuf[16];
+
+ link_stats_valid = 0;
+ new_phase(PHASE_INITIALIZE);
+
+ script_env = NULL;
+
+ /* Initialize syslog facilities */
+ reopen_log();
- p = ttyname(0);
- if (p)
- strcpy(devname, p);
-
if (gethostname(hostname, MAXNAMELEN) < 0 ) {
- perror("couldn't get hostname");
- die(1);
+ option_error("Couldn't get hostname: %m");
+ exit(1);
}
hostname[MAXNAMELEN-1] = 0;
- pid = getpid();
+ /* 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, 0);
- if (!ppp_available()) {
- fprintf(stderr, "Sorry - PPP is not available on this system\n");
- exit(1);
- }
+ ngroups = getgroups(NGROUPS_MAX, groups);
/*
- * Initialize to the standard option set, then parse, in order,
- * the system options file, the user's options file, and the command
- * line arguments.
+ * Initialize magic number generator now so that protocols may
+ * use magic numbers in initialization.
*/
- for (i = 0; i < N_PROTO; i++)
- (*prottbl[i].init)(0);
-
+ magic_init();
+
+ /*
+ * Initialize each protocol.
+ */
+ for (i = 0; (protp = protocols[i]) != NULL; ++i)
+ (*protp->init)(0);
+
+ /*
+ * Initialize the default channel.
+ */
+ tty_init();
+
progname = *argv;
- if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS, 0) ||
- !options_from_user() ||
- !parse_args(argc-1, argv+1) ||
- !options_for_tty())
- die(1);
- check_auth_options();
- setipdefault();
+ /*
+ * Parse, in order, the system options file, the user's options file,
+ * and the command line arguments.
+ */
+ 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 */
/*
- * Initialize syslog system and magic number package.
+ * Work out the device name, if it hasn't already been specified,
+ * and parse the tty's options file.
*/
-#if !defined(ultrix)
- openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
- setlogmask(LOG_UPTO(LOG_INFO));
-#else
- openlog("pppd", LOG_PID);
-#define LOG_UPTO(x) (x)
-#define setlogmask(x) (x)
-#endif
+ if (the_channel->process_extra_options)
+ (*the_channel->process_extra_options)();
+
if (debug)
setlogmask(LOG_UPTO(LOG_DEBUG));
- magic_init();
+ /*
+ * 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(EXIT_NOT_ROOT);
+ }
+ if (!ppp_available()) {
+ 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(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 (the_channel->check_options)
+ (*the_channel->check_options)();
+
+
+ if (dump_options || dryrun) {
+ init_pr_log(NULL, LOG_INFO);
+ print_options(pr_log, NULL);
+ end_pr_log();
+ }
+
+ if (dryrun)
+ die(0);
+
+ /* 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;
+ }
+
+ /*
+ * Initialize system-dependent stuff.
+ */
+ sys_init();
+
+#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,
+ * and identify who is running us.
+ */
+ if (!nodetach && !updetach)
+ detach();
p = getlogin();
if (p == NULL) {
pw = getpwuid(uid);
else
p = "(unknown)";
}
- syslog(LOG_NOTICE, "pppd %s.%d started by %s, uid %d",
- VERSION, PATCHLEVEL, p, uid);
+ syslog(LOG_NOTICE, "pppd %s started by %s, uid %d", VERSION, p, uid);
+ script_setenv("PPPLOGNAME", p, 0);
+
+ if (devnam[0])
+ script_setenv("DEVICE", devnam, 1);
+ slprintf(numbuf, sizeof(numbuf), "%d", getpid());
+ script_setenv("PPPD_PID", numbuf, 1);
+
+ setup_signals();
+
+ create_linkpidfile(getpid());
+
+ waiting = 0;
-#ifdef SETSID
/*
- * Make sure we can set the serial device to be our controlling terminal.
+ * If we're doing dial-on-demand, set up the interface now.
*/
- if (default_device) {
+ if (demand) {
/*
- * No device name was specified:
- * we are in the device's session already.
+ * Open the loopback channel and set it up to be the ppp interface.
*/
- if ((pgrpid = getpgrp(0)) < 0) {
- syslog(LOG_ERR, "getpgrp(0): %m");
- die(1);
- }
-
- } else {
+ fd_loop = open_ppp_loopback();
+ set_ifunit(1);
/*
- * Not default device: make sure we're not a process group leader,
- * then become session leader of a new session (so we can make
- * our device its controlling terminal and thus get SIGHUPs).
+ * Configure the interface and mark it up, etc.
*/
- if (!nodetach) {
- /* fork so we're not a process group leader */
- if (pid = fork()) {
- exit(0); /* parent is finished */
- }
- if (pid < 0) {
- syslog(LOG_ERR, "fork: %m");
- die(1);
+ demand_conf();
+ }
+
+ do_callback = 0;
+ for (;;) {
+
+ bundle_eof = 0;
+ bundle_terminating = 0;
+ listen_time = 0;
+ need_holdoff = 1;
+ devfd = -1;
+ status = EXIT_OK;
+ ++unsuccess;
+ doing_callback = do_callback;
+ do_callback = 0;
+
+ if (demand && !doing_callback) {
+ /*
+ * Don't do anything until we see some activity.
+ */
+ new_phase(PHASE_DORMANT);
+ demand_unblock();
+ add_fd(fd_loop);
+ for (;;) {
+ handle_events();
+ if (asked_to_quit)
+ break;
+ if (get_loop_output())
+ break;
}
- pid = getpid(); /* otherwise pid is 0 in child */
- } else {
+ remove_fd(fd_loop);
+ if (asked_to_quit)
+ break;
+
/*
- * try to put ourself into our parent's process group,
- * so we're not a process group leader
+ * Now we want to bring up the link.
*/
- if (setpgrp(pid, getppid()) < 0)
- syslog(LOG_WARNING, "setpgrp: %m");
+ demand_block();
+ info("Starting link");
+ }
+
+ gettimeofday(&start_time, NULL);
+ script_unsetenv("CONNECT_TIME");
+ script_unsetenv("BYTES_SENT");
+ script_unsetenv("BYTES_RCVD");
+
+ lcp_open(0); /* Start protocol */
+ start_link(0);
+ while (phase != PHASE_DEAD) {
+ handle_events();
+ get_input();
+ if (kill_link)
+ lcp_close(0, "User request");
+ if (asked_to_quit) {
+ bundle_terminating = 1;
+ if (phase == PHASE_MASTER)
+ mp_bundle_terminated();
+ }
+ if (open_ccp_flag) {
+ if (phase == PHASE_NETWORK || phase == PHASE_RUNNING) {
+ ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */
+ (*ccp_protent.open)(0);
+ }
+ }
}
+ /* restore FSMs to original state */
+ lcp_close(0, "");
+
+ if (!persist || asked_to_quit || (maxfail > 0 && unsuccess >= maxfail))
+ break;
- /* create new session */
- if ((pgrpid = setsid()) < 0) {
- syslog(LOG_ERR, "setsid(): %m");
- die(1);
+ if (demand)
+ demand_discard();
+ t = need_holdoff? holdoff: 0;
+ if (holdoff_hook)
+ t = (*holdoff_hook)();
+ if (t > 0) {
+ new_phase(PHASE_HOLDOFF);
+ TIMEOUT(holdoff_end, NULL, t);
+ do {
+ 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 */
+ 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);
+ }
+ while (n_children > 0 && !childwait_done) {
+ handle_events();
+ if (kill_link && !childwait_done)
+ childwait_end(NULL);
}
}
-#endif
- if (lockflag && !default_device)
- if (lock(devname) < 0)
- die(1);
+ die(status);
+ return 0;
+}
- /* Get an internet socket for doing socket ioctl's on. */
- if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
- syslog(LOG_ERR, "socket : %m");
- die(1);
+/*
+ * 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;
+ asked_to_quit = 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(&mask);
- sigaddset(&mask, SIGHUP);
- sigaddset(&mask, SIGINT);
- sigaddset(&mask, SIGALRM);
- sigaddset(&mask, SIGIO);
- sigaddset(&mask, SIGCHLD);
-#ifdef STREAMS
- sigaddset(&mask, SIGPOLL);
-#endif
-
-#define SIGNAL(s, handler) { \
+ 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) { \
- syslog(LOG_ERR, "sigaction(%d): %m", s); \
- die(1); \
- } \
- }
+ if (sigaction(s, &sa, NULL) < 0) \
+ fatal("Couldn't establish signal handler (%d): %m", s); \
+ } while (0)
- sa.sa_mask = mask;
+ sa.sa_mask = signals_handled;
sa.sa_flags = 0;
SIGNAL(SIGHUP, hup); /* Hangup */
- SIGNAL(SIGINT, intr); /* Interrupt */
+ SIGNAL(SIGINT, term); /* Interrupt */
SIGNAL(SIGTERM, term); /* Terminate */
- SIGNAL(SIGALRM, alrm); /* Timeout */
- SIGNAL(SIGIO, io); /* Input available */
- SIGNAL(SIGCHLD, chld); /* Death of child process */
-#ifdef STREAMS
- SIGNAL(SIGPOLL, io); /* Input available */
-#endif
+ SIGNAL(SIGCHLD, chld);
- signal(SIGUSR1, incdebug); /* Increment debug flag */
- signal(SIGUSR2, nodebug); /* Reset debug flag */
+ SIGNAL(SIGUSR1, toggle_debug); /* Toggle debug flag */
+ SIGNAL(SIGUSR2, open_ccp); /* Reopen CCP */
/*
- * Block SIGIOs and SIGPOLLs for now
+ * Install a handler for other signals which would otherwise
+ * cause pppd to exit without cleaning up.
*/
- sigemptyset(&mask);
- sigaddset(&mask, SIGIO);
-#ifdef STREAMS
- sigaddset(&mask, SIGPOLL);
+ 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
- sigprocmask(SIG_BLOCK, &mask, NULL);
/*
- * Open the serial device and set it up to be the ppp interface.
+ * Apparently we can get a SIGPIPE when we call syslog, if
+ * syslogd has died and been restarted. Ignoring it seems
+ * be sufficient.
*/
- if ((fd = open(devname, O_RDWR /*| O_NDELAY*/)) < 0) {
- syslog(LOG_ERR, "open(%s): %m", devname);
- die(1);
- }
- hungup = 0;
+ signal(SIGPIPE, SIG_IGN);
+}
-#ifdef TIOCSCTTY
- /* set device to be controlling tty */
- if (!default_device && ioctl(fd, TIOCSCTTY) < 0) {
- syslog(LOG_ERR, "ioctl(TIOCSCTTY): %m");
- die(1);
+/*
+ * 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());
}
-#endif /* TIOCSCTTY */
-
- /* run connection script */
- if (connector) {
- MAINDEBUG((LOG_INFO, "Connecting with <%s>", connector));
-
- /* set line speed, flow control, etc.; set CLOCAL for now */
- set_up_tty(fd, 1);
-
- /* drop dtr to hang up in case modem is off hook */
- if (!default_device && modem) {
- setdtr(fd, FALSE);
- sleep(1);
- setdtr(fd, TRUE);
- }
+}
- if (device_script(connector, fd, fd) < 0) {
- syslog(LOG_ERR, "could not set up connection");
- setdtr(fd, FALSE);
- die(1);
- }
+/*
+ * detach - detach us from the controlling terminal.
+ */
+void
+detach()
+{
+ int pid;
+ char numbuf[16];
+ int pipefd[2];
- syslog(LOG_INFO, "Connected...");
- sleep(1); /* give it time to set up its terminal */
+ 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 */
+ 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 */
}
-
- /* set line speed, flow control, etc.; clear CLOCAL if modem option */
- set_up_tty(fd, 0);
+ setsid();
+ chdir("/");
+ dup2(fd_devnull, 0);
+ dup2(fd_devnull, 1);
+ dup2(fd_devnull, 2);
+ detached = 1;
+ 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]);
+}
- /* set up the serial device as a ppp interface */
- establish_ppp();
+/*
+ * reopen_log - (re)open our connection to syslog.
+ */
+void
+reopen_log()
+{
+ openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
+ setlogmask(LOG_UPTO(LOG_INFO));
+}
- syslog(LOG_INFO, "Using interface ppp%d", ifunit);
- (void) sprintf(ifname, "ppp%d", ifunit);
+/*
+ * Create a file containing our process ID.
+ */
+static void
+create_pidfile(pid)
+ int pid;
+{
+ FILE *pidfile;
- /* write pid to file */
- (void) sprintf(pidfilename, "%s/%s.pid", pidpath, ifname);
+ slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid",
+ _PATH_VARRUN, ifname);
if ((pidfile = fopen(pidfilename, "w")) != NULL) {
fprintf(pidfile, "%d\n", pid);
(void) fclose(pidfile);
} else {
- syslog(LOG_ERR, "unable to create pid file: %m");
+ error("Failed to create pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
+}
- /*
- * Set process group of device to our process group so we can get
- * SIGIOs and SIGHUPs.
- */
-#ifdef SETSID
- if (default_device) {
- int id = tcgetpgrp(fd);
- if (id != pgrpid) {
- syslog(LOG_WARNING, "warning: not in tty's process group");
- }
- } else {
- if (tcsetpgrp(fd, pgrpid) < 0) {
- syslog(LOG_ERR, "tcsetpgrp(): %m");
- die(1);
- }
- }
-#else
- /* set process group on tty so we get SIGIO's */
- if (ioctl(fd, TIOCSPGRP, &pgrpid) < 0) {
- syslog(LOG_ERR, "ioctl(TIOCSPGRP): %m");
- die(1);
- }
-#endif
-
- /*
- * Record initial device flags, then set device to cause SIGIO
- * signals to be generated.
- */
- if ((initfdflags = fcntl(fd, F_GETFL)) == -1) {
- syslog(LOG_ERR, "fcntl(F_GETFL): %m");
- die(1);
- }
-
-#ifdef _linux_ /* This is a kludge for Linux. FIXME !!! -- later. */
-#undef FASYNC
-#define FASYNC 0
- {
- int sig = SIGIO;
- if (ioctl(fd, PPPIOCSINPSIG, &sig) == -1) {
- syslog(LOG_ERR, "ioctl(PPPIOCSINPSIG): %m");
- die(1);
- }
- }
-#endif
-
- if (fcntl(fd, F_SETFL, FNDELAY | FASYNC) == -1) {
- syslog(LOG_ERR, "fcntl(F_SETFL, FNDELAY | FASYNC): %m");
- die(1);
- }
-
- /*
- * Block all signals, start opening the connection, and wait for
- * incoming signals (reply, timeout, etc.).
- */
- syslog(LOG_NOTICE, "Connect: %s <--> %s", ifname, devname);
- sigprocmask(SIG_BLOCK, &mask, NULL); /* Block signals now */
- lcp_lowerup(0); /* XXX Well, sort of... */
- lcp_open(0); /* Start protocol */
- for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; )
- sigpause(0); /* Wait for next signal */
-
- /*
- * Run disconnector script, if requested
- */
- if (disconnector) {
- if (device_script(disconnector, fd, fd) < 0) {
- syslog(LOG_WARNING, "disconnect script failed");
- die(1);
- }
+void
+create_linkpidfile(pid)
+ int pid;
+{
+ FILE *pidfile;
- syslog(LOG_INFO, "Disconnected...");
+ 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;
}
-
- quit();
}
-#if B9600 == 9600
-/*
- * XXX assume speed_t values numerically equal bits per second
- * (so we can ask for any speed).
- */
-#define translate_speed(bps) (bps)
-#define baud_rate_of(speed) (speed)
-
-#else
/*
- * List of valid speeds.
+ * remove_pidfile - remove our pid files
*/
-struct speed {
- int speed_int, speed_val;
-} speeds[] = {
-#ifdef B50
- { 50, B50 },
-#endif
-#ifdef B75
- { 75, B75 },
-#endif
-#ifdef B110
- { 110, B110 },
-#endif
-#ifdef B134
- { 134, B134 },
-#endif
-#ifdef B150
- { 150, B150 },
-#endif
-#ifdef B200
- { 200, B200 },
-#endif
-#ifdef B300
- { 300, B300 },
-#endif
-#ifdef B600
- { 600, B600 },
-#endif
-#ifdef B1200
- { 1200, B1200 },
-#endif
-#ifdef B1800
- { 1800, B1800 },
-#endif
-#ifdef B2000
- { 2000, B2000 },
-#endif
-#ifdef B2400
- { 2400, B2400 },
-#endif
-#ifdef B3600
- { 3600, B3600 },
-#endif
-#ifdef B4800
- { 4800, B4800 },
-#endif
-#ifdef B7200
- { 7200, B7200 },
-#endif
-#ifdef B9600
- { 9600, B9600 },
-#endif
-#ifdef B19200
- { 19200, B19200 },
-#endif
-#ifdef B38400
- { 38400, B38400 },
-#endif
-#ifdef EXTA
- { 19200, EXTA },
-#endif
-#ifdef EXTB
- { 38400, EXTB },
-#endif
-#ifdef B57600
- { 57600, B57600 },
-#endif
-#ifdef B115200
- { 115200, B115200 },
-#endif
- { 0, 0 }
-};
+void remove_pidfiles()
+{
+ 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;
+}
/*
- * Translate from bits/second to a speed_t.
+ * holdoff_end - called via a timeout when the holdoff period ends.
*/
-int
-translate_speed(bps)
- int bps;
+static void
+holdoff_end(arg)
+ void *arg;
{
- struct speed *speedp;
-
- if (bps == 0)
- return 0;
- for (speedp = speeds; speedp->speed_int; speedp++)
- if (bps == speedp->speed_int)
- return speedp->speed_val;
- syslog(LOG_WARNING, "speed %d not supported", bps);
- return 0;
+ 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" },
+ { 0x51, "KNX Bridging Data" },
+ { 0x53, "Encryption" },
+ { 0x55, "Individual Link Encryption" },
+ { 0x57, "IPv6" },
+ { 0x59, "PPP Muxing" },
+ { 0x5b, "Vendor-Specific Network Protocol" },
+ { 0x61, "RTP IPHC Full Header" },
+ { 0x63, "RTP IPHC Compressed TCP" },
+ { 0x65, "RTP IPHC Compressed non-TCP" },
+ { 0x67, "RTP IPHC Compressed UDP 8" },
+ { 0x69, "RTP IPHC Compressed RTP 8" },
+ { 0x6f, "Stampede Bridging" },
+ { 0x73, "MP+" },
+ { 0xc1, "NTCITS IPI" },
+ { 0xfb, "single-link compression" },
+ { 0xfd, "Compressed Datagram" },
+ { 0x0201, "802.1d Hello Packets" },
+ { 0x0203, "IBM Source Routing BPDU" },
+ { 0x0205, "DEC LANBridge100 Spanning Tree" },
+ { 0x0207, "Cisco Discovery Protocol" },
+ { 0x0209, "Netcs Twin Routing" },
+ { 0x020b, "STP - Scheduled Transfer Protocol" },
+ { 0x020d, "EDP - Extreme Discovery Protocol" },
+ { 0x0211, "Optical Supervisory Channel Protocol" },
+ { 0x0213, "Optical Supervisory Channel Protocol" },
+ { 0x0231, "Luxcom" },
+ { 0x0233, "Sigma Network Systems" },
+ { 0x0235, "Apple Client Server Protocol" },
+ { 0x0281, "MPLS Unicast" },
+ { 0x0283, "MPLS Multicast" },
+ { 0x0285, "IEEE p1284.4 standard - data packets" },
+ { 0x0287, "ETSI TETRA Network Protocol Type 1" },
+ { 0x0289, "Multichannel Flow Treatment Protocol" },
+ { 0x2063, "RTP IPHC Compressed TCP No Delta" },
+ { 0x2065, "RTP IPHC Context State" },
+ { 0x2067, "RTP IPHC Compressed UDP 16" },
+ { 0x2069, "RTP IPHC Compressed RTP 16" },
+ { 0x4001, "Cray Communications Control Protocol" },
+ { 0x4003, "CDPD Mobile Network Registration Protocol" },
+ { 0x4005, "Expand accelerator protocol" },
+ { 0x4007, "ODSICP NCP" },
+ { 0x4009, "DOCSIS DLL" },
+ { 0x400B, "Cetacean Network Detection Protocol" },
+ { 0x4021, "Stacker LZS" },
+ { 0x4023, "RefTek Protocol" },
+ { 0x4025, "Fibre Channel" },
+ { 0x4027, "EMIT Protocols" },
+ { 0x405b, "Vendor-Specific Protocol (VSP)" },
+ { 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" },
+ { 0x8051, "KNX Bridging Control Protocol" },
+ { 0x8053, "Encryption Control Protocol" },
+ { 0x8055, "Individual Link Encryption Control Protocol" },
+ { 0x8057, "IPv6 Control Protovol" },
+ { 0x8059, "PPP Muxing Control Protocol" },
+ { 0x805b, "Vendor-Specific Network Control Protocol (VSNCP)" },
+ { 0x806f, "Stampede Bridging Control Protocol" },
+ { 0x8073, "MP+ Control Protocol" },
+ { 0x80c1, "NTCITS IPI Control Protocol" },
+ { 0x80fb, "Single Link Compression Control Protocol" },
+ { 0x80fd, "Compression Control Protocol" },
+ { 0x8207, "Cisco Discovery Protocol Control" },
+ { 0x8209, "Netcs Twin Routing" },
+ { 0x820b, "STP - Control Protocol" },
+ { 0x820d, "EDPCP - Extreme Discovery Protocol Ctrl Prtcl" },
+ { 0x8235, "Apple Client Server Protocol Control" },
+ { 0x8281, "MPLSCP" },
+ { 0x8285, "IEEE p1284.4 standard - Protocol Control" },
+ { 0x8287, "ETSI TETRA TNP1 Control Protocol" },
+ { 0x8289, "Multichannel Flow Treatment Protocol" },
+ { 0xc021, "Link Control Protocol" },
+ { 0xc023, "Password Authentication Protocol" },
+ { 0xc025, "Link Quality Report" },
+ { 0xc027, "Shiva Password Authentication Protocol" },
+ { 0xc029, "CallBack Control Protocol (CBCP)" },
+ { 0xc02b, "BACP Bandwidth Allocation Control Protocol" },
+ { 0xc02d, "BAP" },
+ { 0xc05b, "Vendor-Specific Authentication Protocol (VSAP)" },
+ { 0xc081, "Container Control Protocol" },
+ { 0xc223, "Challenge Handshake Authentication Protocol" },
+ { 0xc225, "RSA Authentication Protocol" },
+ { 0xc227, "Extensible Authentication Protocol" },
+ { 0xc229, "Mitsubishi Security Info Exch Ptcl (SIEP)" },
+ { 0xc26f, "Stampede Bridging Authorization Protocol" },
+ { 0xc281, "Proprietary Authentication Protocol" },
+ { 0xc283, "Proprietary Authentication Protocol" },
+ { 0xc481, "Proprietary Node ID Authentication Protocol" },
+ { 0, NULL },
+};
+
/*
- * Translate from a speed_t to bits/second.
+ * protocol_name - find a name for a PPP protocol.
*/
-int
-baud_rate_of(speed)
- int speed;
+const char *
+protocol_name(proto)
+ int proto;
{
- struct speed *speedp;
+ struct protocol_list *lp;
- if (speed == 0)
- return 0;
- for (speedp = speeds; speedp->speed_int; speedp++)
- if (speed == speedp->speed_val)
- return speedp->speed_int;
- return 0;
+ for (lp = protocol_list; lp->proto != 0; ++lp)
+ if (proto == lp->proto)
+ return lp->name;
+ return NULL;
}
-#endif
/*
- * set_up_tty: Set up the serial port on `fd' for 8 bits, no parity,
- * at the requested speed, etc. If `local' is true, set CLOCAL
- * regardless of whether the modem option was specified.
+ * get_input - called when incoming data is available.
*/
-set_up_tty(fd, local)
- int fd, local;
+static void
+get_input()
{
-#ifndef SGTTY
- int speed, x;
- struct termios tios;
+ int len, i;
+ u_char *p;
+ u_short protocol;
+ struct protent *protp;
- if (tcgetattr(fd, &tios) < 0) {
- syslog(LOG_ERR, "tcgetattr: %m");
- die(1);
- }
+ p = inpacket_buf; /* point to beginning of packet buffer */
- if (!restore_term)
- inittermios = tios;
-
-#ifdef CRTSCTS
- tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL | CRTSCTS);
- if (crtscts == 1)
- tios.c_cflag |= CRTSCTS;
-#else
- tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL);
-#endif /* CRTSCTS */
-
- tios.c_cflag |= CS8 | CREAD | HUPCL;
- if (local || !modem)
- tios.c_cflag |= CLOCAL;
- tios.c_iflag = IGNBRK | IGNPAR;
- tios.c_oflag = 0;
- tios.c_lflag = 0;
- tios.c_cc[VMIN] = 1;
- tios.c_cc[VTIME] = 0;
-
- if (crtscts == 2) {
- tios.c_iflag |= IXOFF;
- tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */
- tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */
- }
+ len = read_packet(inpacket_buf);
+ if (len < 0)
+ return;
- speed = translate_speed(inspeed);
- if (speed) {
- cfsetospeed(&tios, speed);
- cfsetispeed(&tios, speed);
- } else {
- speed = cfgetospeed(&tios);
+ if (len == 0) {
+ if (bundle_eof && multilink_master) {
+ notice("Last channel has disconnected");
+ mp_bundle_terminated();
+ return;
+ }
+ notice("Modem hangup");
+ hungup = 1;
+ status = EXIT_HANGUP;
+ lcp_lowerdown(0); /* serial link is no longer available */
+ link_terminated(0);
+ return;
}
- if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) {
- syslog(LOG_ERR, "tcsetattr: %m");
- die(1);
+ if (len < PPP_HDRLEN) {
+ dbglog("received short packet:%.*B", len, p);
+ return;
}
-#ifdef ultrix
- x = 0;
- if (ioctl(fd, (crtscts || modem)? TIOCMODEM: TIOCNMODEM, &x) < 0)
- syslog(LOG_WARNING, "TIOC(N)MODEM: %m");
- if (ioctl(fd, (local || !modem)? TIOCNCAR: TIOCCAR) < 0)
- syslog(LOG_WARNING, "TIOC(N)CAR: %m");
-#endif
+ dump_packet("rcvd", p, len);
+ if (snoop_recv_hook) snoop_recv_hook(p, len);
-#else /* SGTTY */
- int speed;
- struct sgttyb sgttyb;
+ p += 2; /* Skip address and control */
+ GETSHORT(protocol, p);
+ len -= PPP_HDRLEN;
/*
- * Put the tty in raw mode.
+ * Toss all non-LCP packets unless LCP is OPEN.
*/
- if (ioctl(fd, TIOCGETP, &sgttyb) < 0) {
- syslog(LOG_ERR, "ioctl(TIOCGETP): %m");
- die(1);
+ if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) {
+ dbglog("Discarded non-LCP packet when LCP not open");
+ return;
}
- if (!restore_term)
- initsgttyb = sgttyb;
-
- sgttyb.sg_flags = RAW | ANYP;
- speed = translate_speed(inspeed);
- if (speed)
- sgttyb.sg_ispeed = speed;
- else
- speed = sgttyb.sg_ispeed;
+ /*
+ * Until we get past the authentication phase, toss all packets
+ * except LCP, LQR and authentication packets.
+ */
+ if (phase <= PHASE_AUTHENTICATE
+ && !(protocol == PPP_LCP || protocol == PPP_LQR
+ || protocol == PPP_PAP || protocol == PPP_CHAP ||
+ protocol == PPP_EAP)) {
+ dbglog("discarding proto 0x%x in phase %d",
+ protocol, phase);
+ return;
+ }
- if (ioctl(fd, TIOCSETP, &sgttyb) < 0) {
- syslog(LOG_ERR, "ioctl(TIOCSETP): %m");
- die(1);
+ /*
+ * Upcall the proper protocol input routine.
+ */
+ for (i = 0; (protp = protocols[i]) != NULL; ++i) {
+ if (protp->protocol == protocol && protp->enabled_flag) {
+ (*protp->input)(0, p, len);
+ return;
+ }
+ if (protocol == (protp->protocol & ~0x8000) && protp->enabled_flag
+ && protp->datainput != NULL) {
+ (*protp->datainput)(0, p, len);
+ return;
+ }
}
-#endif
- baud_rate = baud_rate_of(speed);
- restore_term = TRUE;
+ 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);
}
/*
- * setdtr - control the DTR line on the serial port.
- * This is called from die(), so it shouldn't call die().
+ * 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.
*/
-setdtr(fd, on)
-int fd, on;
+int
+ppp_send_config(unit, mtu, accm, pcomp, accomp)
+ int unit, mtu;
+ u_int32_t accm;
+ int pcomp, accomp;
{
- int modembits = TIOCM_DTR;
+ int errs;
- ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits);
+ 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;
+}
/*
- * quit - Clean up state and exit.
+ * new_phase - signal the start of a new phase of pppd's operation.
*/
-void
-quit()
+void
+new_phase(p)
+ int p;
{
- die(0);
+ phase = p;
+ if (new_phase_hook)
+ (*new_phase_hook)(p);
+ notify(phasechange, p);
}
/*
- * die - like quit, except we can specify an exit status.
+ * die - clean up state and exit with the specified status.
*/
void
die(status)
int status;
{
- cleanup(0, NULL);
+ if (!doing_multilink || multilink_master)
+ print_link_stats();
+ cleanup();
+ notify(exitnotify, status);
syslog(LOG_INFO, "Exit.");
exit(status);
}
* cleanup - restore anything which needs to be restored before we exit
*/
/* ARGSUSED */
-void
-cleanup(status, arg)
- int status;
- caddr_t arg;
+static void
+cleanup()
{
- if (fd >= 0) {
- /* drop dtr to hang up */
- if (modem)
- setdtr(fd, FALSE);
-
- if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)
- syslog(LOG_WARNING, "fcntl(F_SETFL, fdflags): %m");
- initfdflags = -1;
-
- disestablish_ppp();
-
- if (restore_term) {
-#ifndef SGTTY
- if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
- syslog(LOG_WARNING, "tcsetattr: %m");
-#else
- if (ioctl(fd, TIOCSETP, &initsgttyb) < 0)
- syslog(LOG_WARNING, "ioctl(TIOCSETP): %m");
+ sys_cleanup();
+
+ if (fd_ppp >= 0)
+ the_channel->disestablish_ppp(devfd);
+ if (the_channel->cleanup)
+ (*the_channel->cleanup)();
+ remove_pidfiles();
+
+#ifdef USE_TDB
+ if (pppdb != NULL)
+ cleanup_db();
#endif
- }
- close(fd);
- fd = -1;
+}
+
+void
+print_link_stats()
+{
+ /*
+ * 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;
}
+}
- if (pidfilename[0] != 0 && unlink(pidfilename) < 0)
- syslog(LOG_WARNING, "unable to unlink pid file: %m");
- pidfilename[0] = 0;
+/*
+ * 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 (lockflag && !default_device)
- unlock();
+/*
+ * 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;
+
+ 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);
}
-static struct callout *callout = NULL; /* Callout list */
-static struct timeval schedtime; /* Time last timeout was set */
+struct callout {
+ struct timeval c_time; /* time at which to call routine */
+ void *c_arg; /* argument to routine */
+ void (*c_func) __P((void *)); /* routine */
+ struct callout *c_next;
+};
+
+static struct callout *callout = NULL; /* Callout list */
+static struct timeval timenow; /* Current time */
/*
* timeout - Schedule a timeout.
- *
- * Note that this timeout takes the number of seconds, NOT hz (as in
- * the kernel).
*/
void
-timeout(func, arg, time)
- void (*func)();
- caddr_t arg;
- int time;
+timeout(func, arg, secs, usecs)
+ void (*func) __P((void *));
+ void *arg;
+ int secs, usecs;
{
- struct itimerval itv;
- struct callout *newp, **oldpp;
-
- MAINDEBUG((LOG_DEBUG, "Timeout %x:%x in %d seconds.",
- (int) func, (int) arg, time));
-
+ struct callout *newp, *p, **pp;
+
/*
* Allocate timeout.
*/
- if ((newp = (struct callout *) malloc(sizeof(struct callout))) == NULL) {
- syslog(LOG_ERR, "Out of memory in timeout()!");
- die(1);
- }
+ if ((newp = (struct callout *) malloc(sizeof(struct callout))) == NULL)
+ fatal("Out of memory in timeout()!");
newp->c_arg = arg;
newp->c_func = func;
-
- /*
- * Find correct place to link it in and decrement its time by the
- * amount of time used by preceding timeouts.
- */
- for (oldpp = &callout;
- *oldpp && (*oldpp)->c_time <= time;
- oldpp = &(*oldpp)->c_next)
- time -= (*oldpp)->c_time;
- newp->c_time = time;
- newp->c_next = *oldpp;
- if (*oldpp)
- (*oldpp)->c_time -= time;
- *oldpp = newp;
-
+ gettimeofday(&timenow, NULL);
+ 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;
+ }
+
/*
- * If this is now the first callout then we have to set a new
- * itimer.
+ * Find correct place and link it in.
*/
- if (callout == newp) {
- itv.it_interval.tv_sec = itv.it_interval.tv_usec =
- itv.it_value.tv_usec = 0;
- itv.it_value.tv_sec = callout->c_time;
- MAINDEBUG((LOG_DEBUG, "Setting itimer for %d seconds in timeout.",
- itv.it_value.tv_sec));
- if (setitimer(ITIMER_REAL, &itv, NULL)) {
- syslog(LOG_ERR, "setitimer(ITIMER_REAL): %m");
- die(1);
- }
- if (gettimeofday(&schedtime, NULL)) {
- syslog(LOG_ERR, "gettimeofday: %m");
- die(1);
- }
- }
+ for (pp = &callout; (p = *pp); pp = &p->c_next)
+ if (newp->c_time.tv_sec < p->c_time.tv_sec
+ || (newp->c_time.tv_sec == p->c_time.tv_sec
+ && newp->c_time.tv_usec < p->c_time.tv_usec))
+ break;
+ newp->c_next = p;
+ *pp = newp;
}
*/
void
untimeout(func, arg)
- void (*func)();
- caddr_t arg;
+ void (*func) __P((void *));
+ void *arg;
{
- struct itimerval itv;
struct callout **copp, *freep;
- int reschedule = 0;
-
- MAINDEBUG((LOG_DEBUG, "Untimeout %x:%x.", (int) func, (int) arg));
-
- /*
- * If the first callout is unscheduled then we have to set a new
- * itimer.
- */
- if (callout &&
- callout->c_func == func &&
- callout->c_arg == arg)
- reschedule = 1;
-
+
/*
- * Find first matching timeout. Add its time to the next timeouts
- * time.
+ * Find first matching timeout and remove it from the list.
*/
- for (copp = &callout; *copp; copp = &(*copp)->c_next)
- if ((*copp)->c_func == func &&
- (*copp)->c_arg == arg) {
- freep = *copp;
+ for (copp = &callout; (freep = *copp); copp = &freep->c_next)
+ if (freep->c_func == func && freep->c_arg == arg) {
*copp = freep->c_next;
- if (*copp)
- (*copp)->c_time += freep->c_time;
- (void) free((char *) freep);
+ free((char *) freep);
break;
}
-
- if (reschedule) {
- itv.it_interval.tv_sec = itv.it_interval.tv_usec =
- itv.it_value.tv_usec = 0;
- itv.it_value.tv_sec = callout ? callout->c_time : 0;
- MAINDEBUG((LOG_DEBUG, "Setting itimer for %d seconds in untimeout.",
- itv.it_value.tv_sec));
- if (setitimer(ITIMER_REAL, &itv, NULL)) {
- syslog(LOG_ERR, "setitimer(ITIMER_REAL): %m");
- die(1);
- }
- if (gettimeofday(&schedtime, NULL)) {
- syslog(LOG_ERR, "gettimeofday: %m");
- die(1);
- }
+}
+
+
+/*
+ * calltimeout - Call any timeout routines which are now due.
+ */
+static void
+calltimeout()
+{
+ struct callout *p;
+
+ while (callout != NULL) {
+ p = callout;
+
+ if (gettimeofday(&timenow, NULL) < 0)
+ fatal("Failed to get time of day: %m");
+ if (!(p->c_time.tv_sec < timenow.tv_sec
+ || (p->c_time.tv_sec == timenow.tv_sec
+ && p->c_time.tv_usec <= timenow.tv_usec)))
+ break; /* no, it's not time yet */
+
+ callout = p->c_next;
+ (*p->c_func)(p->c_arg);
+
+ free((char *) p);
}
}
/*
- * adjtimeout - Decrement the first timeout by the amount of time since
- * it was scheduled.
+ * timeleft - return the length of time until the next timeout is due.
*/
-void
-adjtimeout()
+static struct timeval *
+timeleft(tvp)
+ struct timeval *tvp;
{
- struct timeval tv;
- int timediff;
-
if (callout == NULL)
- return;
+ return NULL;
+
+ gettimeofday(&timenow, NULL);
+ tvp->tv_sec = callout->c_time.tv_sec - timenow.tv_sec;
+ tvp->tv_usec = callout->c_time.tv_usec - timenow.tv_usec;
+ if (tvp->tv_usec < 0) {
+ tvp->tv_usec += 1000000;
+ tvp->tv_sec -= 1;
+ }
+ if (tvp->tv_sec < 0)
+ tvp->tv_sec = tvp->tv_usec = 0;
+
+ return tvp;
+}
+
+
+/*
+ * 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)
+ int sig;
+{
+ struct sigaction act, oldact;
+
+ sigemptyset(&act.sa_mask); /* unnecessary in fact */
+ act.sa_handler = SIG_IGN;
+ act.sa_flags = 0;
+ kill(0, sig);
/*
- * Make sure that the clock hasn't been warped dramatically.
- * Account for recently expired, but blocked timer by adding
- * small fudge factor.
+ * 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.
*/
- if (gettimeofday(&tv, NULL)) {
- syslog(LOG_ERR, "gettimeofday: %m");
- die(1);
- }
- timediff = tv.tv_sec - schedtime.tv_sec;
- if (timediff < 0 ||
- timediff > callout->c_time + 1)
- return;
-
- callout->c_time -= timediff; /* OK, Adjust time */
+ sigaction(sig, &act, &oldact);
+ sigaction(sig, &oldact, NULL);
}
* hup - Catch SIGHUP signal.
*
* Indicates that the physical layer has been disconnected.
+ * We don't rely on this indication; if the user has sent this
+ * signal, we just take the link down.
*/
static void
hup(sig)
int sig;
{
- syslog(LOG_INFO, "Hangup (SIGHUP)");
-
- hungup = 1; /* they hung up on us! */
- persist = 0; /* don't try to restart */
- adjtimeout(); /* Adjust timeouts */
- lcp_lowerdown(0); /* Reset connection */
- quit(); /* and die */
+ /* 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);
+ notify(sigreceived, sig);
+ if (waiting)
+ siglongjmp(sigjmp, 1);
}
/*
- * term - Catch SIGTERM signal.
+ * term - Catch SIGTERM signal and SIGINT signal (^C/del).
*
* Indicates that we should initiate a graceful disconnect and exit.
*/
+/*ARGSUSED*/
static void
term(sig)
int sig;
{
- syslog(LOG_INFO, "Terminating link.");
- persist = 0; /* don't try to restart */
- adjtimeout(); /* Adjust timeouts */
- lcp_close(0); /* Close connection */
+ /* 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);
+ notify(sigreceived, sig);
+ if (waiting)
+ siglongjmp(sigjmp, 1);
}
/*
- * intr - Catch SIGINT signal (DEL/^C).
- *
- * Indicates that we should initiate a graceful disconnect and exit.
+ * chld - Catch SIGCHLD signal.
+ * Sets a flag so we will call reap_kids in the mainline.
*/
static void
-intr(sig)
+chld(sig)
int sig;
{
- syslog(LOG_INFO, "Interrupt received: terminating link");
- persist = 0; /* don't try to restart */
- adjtimeout(); /* Adjust timeouts */
- lcp_close(0); /* Close connection */
+ got_sigchld = 1;
+ if (waiting)
+ siglongjmp(sigjmp, 1);
}
/*
- * alrm - Catch SIGALRM signal.
+ * toggle_debug - Catch SIGUSR1 signal.
*
- * Indicates a timeout.
+ * Toggle debug flag.
*/
+/*ARGSUSED*/
static void
-alrm(sig)
+toggle_debug(sig)
int sig;
{
- struct itimerval itv;
- struct callout *freep, *list, *last;
-
- MAINDEBUG((LOG_DEBUG, "Alarm"));
-
- if (callout == NULL)
- return;
- /*
- * Get the first scheduled timeout and any that were scheduled
- * for the same time as a list, and remove them all from callout
- * list.
- */
- list = last = callout;
- while (last->c_next != NULL && last->c_next->c_time == 0)
- last = last->c_next;
- callout = last->c_next;
- last->c_next = NULL;
-
- /*
- * Set a new itimer if there are more timeouts scheduled.
- */
- if (callout) {
- itv.it_interval.tv_sec = itv.it_interval.tv_usec = 0;
- itv.it_value.tv_usec = 0;
- itv.it_value.tv_sec = callout->c_time;
- MAINDEBUG((LOG_DEBUG, "Setting itimer for %d seconds in alrm.",
- itv.it_value.tv_sec));
- if (setitimer(ITIMER_REAL, &itv, NULL)) {
- syslog(LOG_ERR, "setitimer(ITIMER_REAL): %m");
- die(1);
- }
- if (gettimeofday(&schedtime, NULL)) {
- syslog(LOG_ERR, "gettimeofday: %m");
- die(1);
- }
- }
-
- /*
- * Now call all the timeout routines scheduled for this time.
- */
- while (list) {
- (*list->c_func)(list->c_arg);
- freep = list;
- list = list->c_next;
- (void) free((char *) freep);
+ debug = !debug;
+ if (debug) {
+ setlogmask(LOG_UPTO(LOG_DEBUG));
+ } else {
+ setlogmask(LOG_UPTO(LOG_WARNING));
}
-
}
/*
- * chld - Catch SIGCHLD signal.
- * Calls reap_kids to get status for any dead kids.
+ * open_ccp - Catch SIGUSR2 signal.
+ *
+ * Try to (re)negotiate compression.
*/
+/*ARGSUSED*/
static void
-chld(sig)
+open_ccp(sig)
int sig;
{
- reap_kids();
+ got_sigusr2 = 1;
+ if (waiting)
+ siglongjmp(sigjmp, 1);
}
/*
- * io - Catch SIGIO signal.
- *
- * Indicates that incoming data is available.
+ * bad_signal - We've caught a fatal signal. Clean up state and exit.
*/
static void
-io(sig)
+bad_signal(sig)
int sig;
{
- int len, i;
- u_char *p;
- u_short protocol;
- fd_set fdset;
- struct timeval notime;
- int ready;
-
- MAINDEBUG((LOG_DEBUG, "IO signal received"));
- adjtimeout(); /* Adjust timeouts */
-
- /* Yup, this is for real */
- for (;;) { /* Read all available packets */
- p = inpacket_buf; /* point to beginning of packet buffer */
-
- len = read_packet(inpacket_buf);
- if (len < 0)
- return;
-
- if (len == 0) {
- MAINDEBUG((LOG_DEBUG, "End of file on fd!"));
- lcp_lowerdown(0);
- return;
- }
-
- if (debug /*&& (debugflags & DBG_INPACKET)*/)
- log_packet(p, len, "rcvd ");
-
- if (len < DLLHEADERLEN) {
- MAINDEBUG((LOG_INFO, "io(): Received short packet."));
- return;
- }
-
- p += 2; /* Skip address and control */
- GETSHORT(protocol, p);
- len -= DLLHEADERLEN;
-
- /*
- * Toss all non-LCP packets unless LCP is OPEN.
- */
- if (protocol != LCP && lcp_fsm[0].state != OPENED) {
- MAINDEBUG((LOG_INFO,
- "io(): Received non-LCP packet when LCP not open."));
- return;
- }
-
- /*
- * Upcall the proper protocol input routine.
- */
- for (i = 0; i < sizeof (prottbl) / sizeof (struct protent); i++)
- if (prottbl[i].protocol == protocol) {
- (*prottbl[i].input)(0, p, len);
- break;
- }
-
- if (i == sizeof (prottbl) / sizeof (struct protent)) {
- syslog(LOG_WARNING, "input: Unknown protocol (%x) received!",
- protocol);
- lcp_sprotrej(0, p - DLLHEADERLEN, len + DLLHEADERLEN);
- }
- }
+ static int crashed = 0;
+
+ if (crashed)
+ _exit(127);
+ crashed = 1;
+ error("Fatal signal %d", sig);
+ if (conn_running)
+ kill_my_pg(SIGTERM);
+ notify(sigreceived, sig);
+ die(127);
}
/*
- * demuxprotrej - Demultiplex a Protocol-Reject.
+ * 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.
+ * This also arranges for the specified fds to be dup'd to
+ * fds 0, 1, 2 in the child.
*/
-void
-demuxprotrej(unit, protocol)
- int unit;
- u_short protocol;
+pid_t
+safe_fork(int infd, int outfd, int errfd)
{
- int i;
-
- /*
- * Upcall the proper Protocol-Reject routine.
- */
- for (i = 0; i < sizeof (prottbl) / sizeof (struct protent); i++)
- if (prottbl[i].protocol == protocol) {
- (*prottbl[i].protrej)(unit);
- return;
+ pid_t pid;
+ int fd, pipefd[2];
+ char buf[1];
+
+ /* make sure fds 0, 1, 2 are occupied (probably not necessary) */
+ while ((fd = dup(fd_devnull)) >= 0) {
+ if (fd > 2) {
+ close(fd);
+ break;
+ }
}
- syslog(LOG_WARNING,
- "demuxprotrej: Unrecognized Protocol-Reject for protocol %d!",
- protocol);
-}
-
+ if (pipe(pipefd) == -1)
+ pipefd[0] = pipefd[1] = -1;
+ pid = fork();
+ if (pid < 0) {
+ error("fork failed: %m");
+ return -1;
+ }
+ if (pid > 0) {
+ /* parent */
+ close(pipefd[1]);
+ /* this read() blocks until the close(pipefd[1]) below */
+ complete_read(pipefd[0], buf, 1);
+ close(pipefd[0]);
+ return pid;
+ }
-/*
- * incdebug - Catch SIGUSR1 signal.
- *
- * Increment debug flag.
- */
-/*ARGSUSED*/
-static void
-incdebug(sig)
- int sig;
-{
- syslog(LOG_INFO, "Debug turned ON, Level %d", debug);
- setlogmask(LOG_UPTO(LOG_DEBUG));
- debug++;
-}
+ /* Executing in the child */
+ sys_close();
+#ifdef USE_TDB
+ tdb_close(pppdb);
+#endif
+ /* make sure infd, outfd and errfd won't get tromped on below */
+ if (infd == 1 || infd == 2)
+ infd = dup(infd);
+ if (outfd == 0 || outfd == 2)
+ outfd = dup(outfd);
+ if (errfd == 0 || errfd == 1)
+ errfd = dup(errfd);
+
+ closelog();
+
+ /* dup the in, out, err fds to 0, 1, 2 */
+ if (infd != 0)
+ dup2(infd, 0);
+ if (outfd != 1)
+ dup2(outfd, 1);
+ if (errfd != 2)
+ dup2(errfd, 2);
+
+ if (log_to_fd > 2)
+ close(log_to_fd);
+ if (the_channel->close)
+ (*the_channel->close)();
+ else
+ close(devfd); /* some plugins don't have a close function */
+ close(fd_ppp);
+ close(fd_devnull);
+ if (infd != 0)
+ close(infd);
+ if (outfd != 1)
+ close(outfd);
+ if (errfd != 2)
+ close(errfd);
+
+ notify(fork_notifier, 0);
+ close(pipefd[0]);
+ /* this close unblocks the read() call above in the parent */
+ close(pipefd[1]);
-/*
- * nodebug - Catch SIGUSR2 signal.
- *
- * Turn off debugging.
- */
-/*ARGSUSED*/
-static void
-nodebug(sig)
- int sig;
-{
- setlogmask(LOG_UPTO(LOG_WARNING));
- debug = 0;
+ return 0;
}
-
/*
- * device_script - run a program to connect or disconnect 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.
*/
int
-device_script(program, in, out)
+device_script(program, in, out, dont_wait)
char *program;
int in, out;
+ int dont_wait;
{
int pid;
- int status;
- sigset_t mask;
+ int status = -1;
+ int errfd;
+
+ if (log_to_fd >= 0)
+ errfd = log_to_fd;
+ else
+ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
- sigemptyset(&mask);
- sigaddset(&mask, SIGINT);
- sigaddset(&mask, SIGHUP);
- sigprocmask(SIG_BLOCK, &mask, &mask);
+ ++conn_running;
+ pid = safe_fork(in, out, errfd);
- pid = fork();
+ if (pid != 0 && log_to_fd < 0)
+ close(errfd);
if (pid < 0) {
- syslog(LOG_ERR, "fork: %m");
- die(1);
+ --conn_running;
+ error("Failed to create child process: %m");
+ return -1;
}
- if (pid == 0) {
- setreuid(getuid(), getuid());
- setregid(getgid(), getgid());
- sigprocmask(SIG_SETMASK, &mask, NULL);
- dup2(in, 0);
- dup2(out, 1);
- execl("/bin/sh", "sh", "-c", program, (char *)0);
- syslog(LOG_ERR, "could not exec /bin/sh: %m");
- _exit(99);
- /* NOTREACHED */
+ if (pid != 0) {
+ 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");
+ }
+ --conn_running;
+ }
+ return (status == 0 ? 0 : -1);
}
- while (waitpid(pid, &status, 0) < 0) {
- if (errno == EINTR)
- continue;
- syslog(LOG_ERR, "waiting for (dis)connection process: %m");
- die(1);
- }
- sigprocmask(SIG_SETMASK, &mask, NULL);
+ /* here we are executing in the child */
- return (status == 0 ? 0 : -1);
+ setgid(getgid());
+ setuid(uid);
+ if (getuid() != uid) {
+ fprintf(stderr, "pppd: setuid failed\n");
+ exit(1);
+ }
+ execl("/bin/sh", "sh", "-c", program, (char *)0);
+ perror("pppd: could not exec /bin/sh");
+ exit(99);
+ /* NOTREACHED */
}
/*
* run-program - execute a program with given arguments,
- * but don't wait for it.
+ * but don't wait for it unless wait is non-zero.
* If the program can't be executed, logs an error unless
* must_exist is 0 and the program file doesn't exist.
+ * Returns -1 if it couldn't fork, 0 if the file doesn't exist
+ * or isn't an executable plain file, or the process ID of the child.
+ * If done != NULL, (*done)(arg) will be called later (within
+ * reap_kids) iff the return value is > 0.
*/
-int
-run_program(prog, args, must_exist)
+pid_t
+run_program(prog, args, must_exist, done, arg, wait)
char *prog;
char **args;
int must_exist;
+ void (*done) __P((void *));
+ void *arg;
+ int wait;
{
- int pid;
+ int pid, status;
+ struct stat sbuf;
- pid = fork();
+ /*
+ * First check if the file exists and is executable.
+ * We don't use access() because that would use the
+ * real user-id, which might not be root, and the script
+ * might be accessible only to root.
+ */
+ errno = EINVAL;
+ if (stat(prog, &sbuf) < 0 || !S_ISREG(sbuf.st_mode)
+ || (sbuf.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0) {
+ if (must_exist || errno != ENOENT)
+ warn("Can't execute %s: %m", prog);
+ return 0;
+ }
+
+ pid = safe_fork(fd_devnull, fd_devnull, fd_devnull);
if (pid == -1) {
- syslog(LOG_ERR, "can't fork to run %s: %m", prog);
+ error("Failed to create child process for %s: %m", prog);
return -1;
}
- if (pid == 0) {
- execv(prog, args);
- if (must_exist || errno != ENOENT)
- syslog(LOG_WARNING, "can't execute %s: %m", prog);
- _exit(-1);
+ if (pid != 0) {
+ if (debug)
+ dbglog("Script %s started (pid %d)", prog, pid);
+ record_child(pid, prog, done, arg);
+ if (wait) {
+ while (waitpid(pid, &status, 0) < 0) {
+ if (errno == EINTR)
+ continue;
+ fatal("error waiting for script %s: %m", prog);
+ }
+ forget_child(pid, status);
+ }
+ 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());
+
+#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");
+#endif
+
+ /* 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();
}
- MAINDEBUG((LOG_DEBUG, "Script %s started; pid = %d", prog, pid));
+ _exit(-1);
+}
+
+
+/*
+ * record_child - add a child process to the list for reap_kids
+ * to use.
+ */
+void
+record_child(pid, prog, done, arg)
+ int pid;
+ char *prog;
+ void (*done) __P((void *));
+ void *arg;
+{
+ struct subprocess *chp;
+
++n_children;
- return 0;
+
+ chp = (struct subprocess *) malloc(sizeof(struct subprocess));
+ if (chp == NULL) {
+ warn("losing track of %s process", prog);
+ } else {
+ chp->pid = pid;
+ chp->prog = prog;
+ chp->done = done;
+ chp->arg = arg;
+ chp->next = children;
+ children = chp;
+ }
+}
+
+/*
+ * 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;
}
+/*
+ * forget_child - clean up after a dead child
+ */
+static void
+forget_child(pid, status)
+ int pid, status;
+{
+ struct subprocess *chp, **prevp;
+
+ for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) {
+ if (chp->pid == pid) {
+ --n_children;
+ *prevp = chp->next;
+ break;
+ }
+ }
+ if (WIFSIGNALED(status)) {
+ warn("Child process %s (pid %d) terminated with signal %d",
+ (chp? chp->prog: "??"), pid, WTERMSIG(status));
+ } else if (debug)
+ dbglog("Script %s finished (pid %d), status = 0x%x",
+ (chp? chp->prog: "??"), pid,
+ WIFEXITED(status) ? WEXITSTATUS(status) : status);
+ if (chp && chp->done)
+ (*chp->done)(chp->arg);
+ if (chp)
+ free(chp);
+}
/*
* reap_kids - get status from any dead child processes,
* and log a message for abnormal terminations.
*/
-void
+static int
reap_kids()
{
int pid, status;
if (n_children == 0)
- return;
- if ((pid = waitpid(-1, &status, WNOHANG)) == -1) {
- if (errno != ECHILD)
- syslog(LOG_ERR, "waitpid: %m");
- return;
+ return 0;
+ while ((pid = waitpid(-1, &status, WNOHANG)) != -1 && pid != 0) {
+ forget_child(pid, status);
}
- if (pid > 0) {
- --n_children;
- if (WIFSIGNALED(status)) {
- syslog(LOG_WARNING, "child process %d terminated with signal %d",
- pid, WTERMSIG(status));
- }
+ if (pid == -1) {
+ if (errno == ECHILD)
+ return -1;
+ if (errno != EINTR)
+ error("Error waiting for child process: %m");
}
+ return 0;
}
-
/*
- * log_packet - format a packet and log it.
+ * add_notifier - add a new function to be called when something happens.
*/
-
-char line[256]; /* line to be logged accumulated here */
-char *linep;
-
void
-log_packet(p, len, prefix)
- u_char *p;
- int len;
- char *prefix;
+add_notifier(notif, func, arg)
+ struct notifier **notif;
+ notify_func func;
+ void *arg;
{
- strcpy(line, prefix);
- linep = line + strlen(line);
- format_packet(p, len, pr_log, NULL);
- if (linep != line)
- syslog(LOG_DEBUG, "%s", line);
+ 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;
}
/*
- * format_packet - make a readable representation of a packet,
- * calling `printer(arg, format, ...)' to output it.
+ * remove_notifier - remove a function from the list of things to
+ * be called when something happens.
*/
void
-format_packet(p, len, printer, arg)
- u_char *p;
- int len;
- void (*printer) __ARGS((void *, char *, ...));
+remove_notifier(notif, func, arg)
+ struct notifier **notif;
+ notify_func func;
void *arg;
{
- int i, n;
- u_short proto;
- u_char x;
-
- if (len >= DLLHEADERLEN && p[0] == ALLSTATIONS && p[1] == UI) {
- p += 2;
- GETSHORT(proto, p);
- len -= DLLHEADERLEN;
- for (i = 0; i < N_PROTO; ++i)
- if (proto == prottbl[i].protocol)
- break;
- if (i < N_PROTO) {
- printer(arg, "[%s", prottbl[i].name);
- n = (*prottbl[i].printpkt)(p, len, printer, arg);
- printer(arg, "]");
- p += n;
- len -= n;
- } else {
- printer(arg, "[proto=0x%x]", proto);
+ 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;
- for (; len > 0; --len) {
- GETCHAR(x, p);
- printer(arg, " %.2x", x);
+ while ((np = notif) != 0) {
+ notif = np->next;
+ (*np->func)(np->arg, val);
}
}
-#ifdef __STDC__
-#include <stdarg.h>
+/*
+ * novm - log an error message saying we ran out of memory, and die.
+ */
+void
+novm(msg)
+ char *msg;
+{
+ fatal("Virtual memory exhausted allocating %s\n", msg);
+}
+/*
+ * script_setenv - set an environment variable value to be used
+ * for scripts that we run (e.g. ip-up, auth-up, etc.)
+ */
void
-pr_log(void *arg, char *fmt, ...)
+script_setenv(var, value, iskey)
+ char *var, *value;
+ int iskey;
{
- int n;
- va_list pvar;
- char buf[256];
-
- va_start(pvar, fmt);
- vsprintf(buf, fmt, pvar);
- va_end(pvar);
-
- n = strlen(buf);
- if (linep + n + 1 > line + sizeof(line)) {
- syslog(LOG_DEBUG, "%s", line);
- linep = line;
+ size_t varl = strlen(var);
+ size_t vl = varl + strlen(value) + 2;
+ int i;
+ char *p, *newstring;
+
+ 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, 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)
+ return;
+ s_env_nalloc = 16;
}
- strcpy(linep, buf);
- linep += n;
-}
-#else /* __STDC__ */
-#include <varargs.h>
+ /* reallocate script_env with more space if needed */
+ if (i + 1 >= s_env_nalloc) {
+ int new_n = i + 17;
+ char **newenv = (char **) realloc((void *)script_env,
+ new_n * sizeof(char *));
+ if (newenv == 0)
+ return;
+ script_env = newenv;
+ s_env_nalloc = new_n;
+ }
+
+ 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
+}
+/*
+ * script_unsetenv - remove a variable from the environment
+ * for scripts.
+ */
void
-pr_log(arg, fmt, va_alist)
-void *arg;
-char *fmt;
-va_dcl
+script_unsetenv(var)
+ char *var;
{
- int n;
- va_list pvar;
- char buf[256];
-
- va_start(pvar);
- vsprintf(buf, fmt, pvar);
- va_end(pvar);
-
- n = strlen(buf);
- if (linep + n + 1 > line + sizeof(line)) {
- syslog(LOG_DEBUG, "%s", line);
- linep = line;
+ int vl = strlen(var);
+ int i;
+ char *p;
+
+ if (script_env == 0)
+ return;
+ for (i = 0; (p = script_env[i]) != 0; ++i) {
+ if (strncmp(p, var, vl) == 0 && p[vl] == '=') {
+#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;
+ }
}
- strcpy(linep, buf);
- linep += n;
+#ifdef USE_TDB
+ if (pppdb != NULL)
+ update_db_entry();
+#endif
}
+
+/*
+ * Any arbitrary string used as a key for locking the database.
+ * It doesn't matter what it is as long as all pppds use the same string.
+ */
+#define PPPD_LOCK_KEY "pppd lock"
+
+/*
+ * lock_db - get an exclusive lock on the TDB database.
+ * Used to ensure atomicity of various lookup/modify operations.
+ */
+void lock_db()
+{
+#ifdef USE_TDB
+ TDB_DATA key;
+
+ key.dptr = PPPD_LOCK_KEY;
+ key.dsize = strlen(key.dptr);
+ tdb_chainlock(pppdb, key);
#endif
+}
/*
- * print_string - print a readable representation of a string using
- * printer.
+ * unlock_db - remove the exclusive lock obtained by lock_db.
*/
-void
-print_string(p, len, printer, arg)
- char *p;
- int len;
- void (*printer) __ARGS((void *, char *, ...));
- void *arg;
+void unlock_db()
{
- int c;
+#ifdef USE_TDB
+ TDB_DATA key;
- printer(arg, "\"");
- for (; len > 0; --len) {
- c = *p++;
- if (' ' <= c && c <= '~')
- printer(arg, "%c", c);
- else
- printer(arg, "\\%.3o", c);
- }
- printer(arg, "\"");
+ key.dptr = PPPD_LOCK_KEY;
+ key.dsize = strlen(key.dptr);
+ tdb_chainunlock(pppdb, key);
+#endif
}
+#ifdef USE_TDB
/*
- * novm - log an error message saying we ran out of memory, and die.
+ * update_db_entry - update our entry in the database.
*/
-void
-novm(msg)
- char *msg;
+static void
+update_db_entry()
+{
+ 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 + 1);
+ 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_errorstr(pppdb));
+
+ if (vbuf)
+ free(vbuf);
+
+}
+
+/*
+ * add_db_key - add a key that we can use to look up our database entry.
+ */
+static void
+add_db_key(str)
+ const char *str;
{
- syslog(LOG_ERR, "Virtual memory exhausted allocating %s\n", msg);
- die(1);
+ 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_errorstr(pppdb));
+}
+
+/*
+ * delete_db_key - delete a key for looking up our database entry.
+ */
+static void
+delete_db_key(str)
+ const char *str;
+{
+ TDB_DATA key;
+
+ key.dptr = (char *) str;
+ key.dsize = strlen(str);
+ tdb_delete(pppdb, key);
+}
+
+/*
+ * cleanup_db - delete all the entries we put in the database.
+ */
+static void
+cleanup_db()
+{
+ 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 */