* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define RCSID "$Id: main.c,v 1.97 2000/04/24 02:54:16 masputra Exp $"
+#define RCSID "$Id: main.c,v 1.113 2002/05/21 17:26:49 dfs Exp $"
#include <stdio.h>
#include <ctype.h>
#include "upap.h"
#include "chap.h"
#include "ccp.h"
+#include "ecp.h"
#include "pathnames.h"
-#include "patchlevel.h"
+
+#ifdef USE_TDB
#include "tdb.h"
+#endif
#ifdef CBCP_SUPPORT
#include "cbcp.h"
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 linkpidfile[MAXPATHLEN]; /* name of linkname pid file */
-static char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
-static uid_t uid; /* Our real user-id */
-static int conn_running; /* we have a [dis]connector running */
+char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
+char remote_number[MAXNAMELEN]; /* Remote telephone number, if available */
+uid_t uid; /* Our real user-id */
+struct notifier *pidchange = NULL;
+struct notifier *phasechange = NULL;
+struct notifier *exitnotify = NULL;
+struct notifier *sigreceived = NULL;
-int ttyfd; /* Serial port file descriptor */
-mode_t tty_mode = (mode_t)-1; /* Original access permissions to tty */
-int baud_rate; /* Actual bits/second for serial device */
int hungup; /* terminal has been hung up */
int privileged; /* we're running as real uid root */
int need_holdoff; /* need holdoff period before restarting */
int detached; /* have detached from terminal */
-struct stat devstat; /* result of stat() on devnam */
-int prepass = 0; /* doing prepass to find device name */
-int devnam_fixed; /* set while in options.ttyxx file */
volatile int status; /* exit status for pppd */
int unsuccess; /* # unsuccessful connection attempts */
int do_callback; /* != 0 if we should do callback next */
int doing_callback; /* != 0 if we are doing callback */
-char *callback_script; /* script for doing callback */
+int ppp_session_number; /* Session number, for channels with such a
+ concept (eg PPPoE) */
+#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) */
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 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 */
-static int privopen; /* don't lock, open device as root */
+int privopen; /* don't lock, open device as root */
char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
int link_connect_time;
int link_stats_valid;
-static int charshunt_pid; /* Process ID for charshunt */
-
/*
* We maintain a list of child process pids and
* functions to call when they exit.
static void create_pidfile __P((void));
static void create_linkpidfile __P((void));
static void cleanup __P((void));
-static void close_tty __P((void));
static void get_input __P((void));
static void 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 int reap_kids __P((int waitfor));
-static void record_child __P((int, char *, void (*) (void *), 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));
-static int open_socket __P((char *));
-static int start_charshunt __P((int, int));
-static void charshunt_done __P((void *));
-static void charshunt __P((int, int, char *));
-static int record_write __P((FILE *, int code, u_char *buf, int nb,
- struct timeval *));
+#endif
+
+static void handle_events __P((void));
+static void print_link_stats __P((void));
extern char *ttyname __P((int));
extern char *getlogin __P((void));
&ipv6cp_protent,
#endif
&ccp_protent,
+ &ecp_protent,
#ifdef IPX_CHANGE
&ipxcp_protent,
#endif
};
/*
- * If PPP_DRV_NAME is not defined, use the legacy "ppp" as the
- * device name.
+ * 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"
int argc;
char *argv[];
{
- int i, fdflags, t;
- char *p, *connector;
+ int i, t;
+ char *p;
struct passwd *pw;
- struct timeval timo;
- sigset_t mask;
struct protent *protp;
- struct stat statbuf;
char numbuf[16];
+ link_stats_valid = 0;
new_phase(PHASE_INITIALIZE);
/*
magic_init();
/*
- * 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 each protocol.
*/
for (i = 0; (protp = protocols[i]) != NULL; ++i)
(*protp->init)(0);
- progname = *argv;
-
- prepass = 0;
- if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1)
- || !options_from_user())
- exit(EXIT_OPTION_ERROR);
+ /*
+ * Initialize the default channel.
+ */
+ tty_init();
- /* scan command line and options files to find device name */
- prepass = 1;
- parse_args(argc-1, argv+1);
- prepass = 0;
+ 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.
*/
- using_pty = notty || ptycommand != NULL || pty_socket != NULL;
- if (!using_pty && default_device) {
- char *p;
- if (!isatty(0) || (p = ttyname(0)) == NULL) {
- option_error("no device specified and stdin is not a tty");
- exit(EXIT_OPTION_ERROR);
- }
- strlcpy(devnam, p, sizeof(devnam));
- if (stat(devnam, &devstat) < 0)
- fatal("Couldn't stat default device %s: %m", devnam);
- }
+ 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.
- * The per-tty options file should not change
- * ptycommand, pty_socket, notty or devnam.
+ * Work out the device name, if it hasn't already been specified,
+ * and parse the tty's options file.
*/
- devnam_fixed = 1;
- if (!using_pty) {
- if (!options_for_tty())
- exit(EXIT_OPTION_ERROR);
- }
+ if (the_channel->process_extra_options)
+ (*the_channel->process_extra_options)();
- devnam_fixed = 0;
- if (!parse_args(argc-1, argv+1))
- exit(EXIT_OPTION_ERROR);
+ if (debug)
+ setlogmask(LOG_UPTO(LOG_DEBUG));
/*
* Check that we are running as root.
}
if (!ppp_available()) {
- option_error(no_ppp_msg);
+ 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();
for (i = 0; (protp = protocols[i]) != NULL; ++i)
if (protp->check_options != NULL)
(*protp->check_options)();
- if (demand && connect_script == 0) {
- option_error("connect script is required for demand-dialling\n");
- exit(EXIT_OPTION_ERROR);
- }
- /* default holdoff to 0 if no connect script has been given */
- if (connect_script == 0 && !holdoff_specified)
- holdoff = 0;
-
- if (using_pty) {
- if (!default_device) {
- option_error("%s option precludes specifying device name",
- notty? "notty": "pty");
- exit(EXIT_OPTION_ERROR);
- }
- if (ptycommand != NULL && notty) {
- option_error("pty option is incompatible with notty option");
- exit(EXIT_OPTION_ERROR);
- }
- if (pty_socket != NULL && (ptycommand != NULL || notty)) {
- option_error("socket option is incompatible with pty and notty");
- exit(EXIT_OPTION_ERROR);
- }
- default_device = notty;
- lockflag = 0;
- modem = 0;
- if (notty && log_to_fd <= 1)
- log_to_fd = -1;
- } else {
- /*
- * If the user has specified a device which is the same as
- * the one on stdin, pretend they didn't specify any.
- * If the device is already open read/write on stdin,
- * we assume we don't need to lock it, and we can open it as root.
- */
- if (fstat(0, &statbuf) >= 0 && S_ISCHR(statbuf.st_mode)
- && statbuf.st_rdev == devstat.st_rdev) {
- default_device = 1;
- fdflags = fcntl(0, F_GETFL);
- if (fdflags != -1 && (fdflags & O_ACCMODE) == O_RDWR)
- privopen = 1;
- }
- }
- if (default_device)
- nodetach = 1;
+ if (the_channel->check_options)
+ (*the_channel->check_options)();
- /*
- * Don't send log messages to the serial port, it tends to
- * confuse the peer. :-)
- */
- if (log_to_fd >= 0 && fstat(log_to_fd, &statbuf) >= 0
- && S_ISCHR(statbuf.st_mode) && statbuf.st_rdev == devstat.st_rdev)
- log_to_fd = -1;
+
+ if (dump_options || dryrun) {
+ init_pr_log(NULL, LOG_INFO);
+ print_options(pr_log, NULL);
+ end_pr_log();
+ if (dryrun)
+ die(0);
+ }
/*
* Initialize system-dependent stuff.
*/
sys_init();
- if (debug)
- setlogmask(LOG_UPTO(LOG_DEBUG));
+#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());
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);
+ syslog(LOG_NOTICE, "pppd %s started by %s, uid %d", VERSION, p, uid);
script_setenv("PPPLOGNAME", p, 0);
if (devnam[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();
set_ifunit(1);
+#ifdef USE_TDB
tdb_writeunlock(pppdb);
-
+#endif
/*
* Configure the interface and mark it up, etc.
*/
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;
/*
* Don't do anything until we see some activity.
*/
- kill_link = 0;
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)
new_phase(PHASE_SERIALCONN);
- /*
- * Get a pty master/slave pair if the pty, notty, socket,
- * or record options were specified.
- */
- strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
- pty_master = -1;
- pty_slave = -1;
- if (using_pty || record_file != NULL) {
- if (!get_pty(&pty_master, &pty_slave, ppp_devnam, uid)) {
- error("Couldn't allocate pseudo-tty");
- status = EXIT_FATAL_ERROR;
- goto fail;
- }
- set_up_tty(pty_slave, 1);
- }
-
- /*
- * Lock the device if we've been asked to.
- */
- status = EXIT_LOCK_FAILED;
- if (lockflag && !privopen) {
- 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;
- connector = doing_callback? callback_script: connect_script;
- if (devnam[0] != 0) {
- for (;;) {
- /* If the user specified the device name, become the
- user before opening it. */
- int err;
- if (!devnam_info.priv && !privopen)
- seteuid(uid);
- ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
- err = errno;
- if (!devnam_info.priv && !privopen)
- seteuid(0);
- if (ttyfd >= 0)
- break;
- errno = err;
- if (err != EINTR) {
- error("Failed to open %s: %m", devnam);
- status = EXIT_OPEN_FAILED;
- }
- 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 or initializer script,
- * on most systems we set CLOCAL for now so that we can talk
- * to the modem before carrier comes up. But this has the
- * side effect that we might miss it if CD drops before we
- * 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)
- || initializer != NULL));
- real_ttyfd = ttyfd;
- }
-
- /*
- * If the pty, socket, notty and/or record option was specified,
- * start up the character shunt now.
- */
- status = EXIT_PTYCMD_FAILED;
- 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 (pty_socket != NULL) {
- int fd = open_socket(pty_socket);
- if (fd < 0)
- goto fail;
- if (!start_charshunt(fd, fd))
- goto fail;
- } else if (notty) {
- if (!start_charshunt(0, 1))
- goto fail;
- } else if (record_file != NULL) {
- if (!start_charshunt(ttyfd, ttyfd))
- goto fail;
- }
-
- /* run connection script */
- if ((connector && connector[0]) || initializer) {
- if (real_ttyfd != -1) {
- /* XXX do this if doing_callback == CALLBACK_DIALIN? */
- if (!default_device && modem) {
- setdtr(real_ttyfd, 0); /* in case modem is off hook */
- sleep(1);
- setdtr(real_ttyfd, 1);
- }
- }
-
- if (initializer && initializer[0]) {
- if (device_script(initializer, ttyfd, ttyfd, 0) < 0) {
- error("Initializer script failed");
- status = EXIT_INIT_FAILED;
- goto fail;
- }
- if (kill_link)
- goto disconnect;
-
- info("Serial port initialized.");
- }
-
- if (connector && connector[0]) {
- if (device_script(connector, ttyfd, ttyfd, 0) < 0) {
- error("Connect script failed");
- status = EXIT_CONNECT_FAILED;
- goto fail;
- }
- if (kill_link)
- goto disconnect;
-
- info("Serial connection established.");
- }
-
- /* set line speed, flow control, etc.;
- clear CLOCAL if modem option */
- if (real_ttyfd != -1)
- set_up_tty(real_ttyfd, 0);
-
- if (doing_callback == CALLBACK_DIALIN)
- connector = NULL;
- }
-
- /* 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);
- status = EXIT_OPEN_FAILED;
- }
- if (!persist || errno != EINTR || hungup || kill_link)
- goto fail;
- }
- close(i);
- }
-
- slprintf(numbuf, sizeof(numbuf), "%d", baud_rate);
- script_setenv("SPEED", numbuf, 0);
-
- /* 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 */
+#ifdef USE_TDB
tdb_writelock(pppdb);
- fd_ppp = establish_ppp(ttyfd);
+#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 && 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);
- link_stats_valid = 0;
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.
- */
add_fd(fd_ppp);
- if (connect_delay != 0 && (connector != NULL || ptycommand != NULL)) {
- struct timeval t;
- t.tv_sec = connect_delay / 1000;
- t.tv_usec = connect_delay % 1000;
- wait_input(&t);
- }
-
lcp_open(0); /* Start protocol */
- open_ccp_flag = 0;
status = EXIT_NEGOTIATION_FAILED;
new_phase(PHASE_ESTABLISH);
while (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();
+ 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 || 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 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 %d bytes, received %d bytes.",
- link_stats.bytes_out, link_stats.bytes_in);
- }
+ print_link_stats();
/*
* Delete pid file before disestablishing ppp. Otherwise it
*/
if (!demand) {
if (pidfilename[0] != 0
- && unlink(pidfilename) < 0 && errno != ENOENT)
+ && 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);
* XXX we may not be able to do this if the line has hung up!
*/
disconnect:
- if (disconnect_script && !hungup) {
- new_phase(PHASE_DISCONNECT);
- if (real_ttyfd >= 0)
- set_up_tty(real_ttyfd, 1);
- if (device_script(disconnect_script, ttyfd, ttyfd, 0) < 0) {
- warn("disconnect script failed");
- } else {
- info("Serial link disconnected.");
- }
- }
+ new_phase(PHASE_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)
+ && unlink(pidfilename) < 0 && errno != ENOENT)
warn("unable to delete pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
if (!persist || (maxfail > 0 && unsuccess >= maxfail))
break;
- kill_link = 0;
if (demand)
demand_discard();
t = need_holdoff? holdoff: 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;
+ handle_events();
+ if (kill_link)
new_phase(PHASE_DORMANT); /* allow signal to end holdoff */
- }
- if (got_sigchld)
- reap_kids(0);
} while (phase == PHASE_HOLDOFF);
if (!persist)
break;
return 0;
}
+/*
+ * handle_events - wait for something to happen and respond to it.
+ */
+static void
+handle_events()
+{
+ struct timeval timo;
+ sigset_t mask;
+
+ kill_link = open_ccp_flag = 0;
+ if (sigsetjmp(sigjmp, 1) == 0) {
+ sigprocmask(SIG_BLOCK, &mask, NULL);
+ if (got_sighup || got_sigterm || got_sigusr2 || got_sigchld) {
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+ } else {
+ waiting = 1;
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
+ wait_input(timeleft(&timo));
+ }
+ }
+ waiting = 0;
+ calltimeout();
+ if (got_sighup) {
+ kill_link = 1;
+ got_sighup = 0;
+ if (status != EXIT_HANGUP)
+ status = EXIT_USER_REQUEST;
+ }
+ if (got_sigterm) {
+ kill_link = 1;
+ persist = 0;
+ status = EXIT_USER_REQUEST;
+ got_sigterm = 0;
+ }
+ if (got_sigchld) {
+ reap_kids(0); /* Don't leave dead kids lying around */
+ got_sigchld = 0;
+ }
+ if (got_sigusr2) {
+ open_ccp_flag = 1;
+ got_sigusr2 = 0;
+ }
+}
+
/*
* setup_signals - initialize signal handling.
*/
int iskey;
{
info("Using interface %s%d", PPP_DRV_NAME, ifunit);
- slprintf(ifname, sizeof(ifname), PPP_DRV_NAME "%d", ifunit);
+ slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
script_setenv("IFNAME", ifname, iskey);
if (iskey) {
create_pidfile(); /* write pid to file */
}
if (pid != 0) {
/* parent */
- if (locked)
- relock(pid);
+ notify(pidchange, pid);
exit(0); /* parent dies */
}
setsid();
close(1);
close(2);
detached = 1;
- if (!log_to_file && !log_to_specific_fd)
+ if (log_default)
log_to_fd = -1;
/* update pid files if they have been written already */
if (pidfilename[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;
phase = p;
if (new_phase_hook)
(*new_phase_hook)(p);
+ notify(phasechange, p);
}
/*
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)
+ 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)
+ if (linkpidfile[0] != 0 && unlink(linkpidfile) < 0 && errno != ENOENT)
warn("unable to delete pid file %s: %m", linkpidfile);
linkpidfile[0] = 0;
- if (locked)
- unlock();
-
+#ifdef USE_TDB
if (pppdb != NULL)
cleanup_db();
+#endif
+
}
-/*
- * 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);
- }
-
- restore_tty(real_ttyfd);
-
- 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);
- }
+ /*
+ * 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);
}
-
- close(real_ttyfd);
- real_ttyfd = -1;
}
/*
/*
* 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.
*/
int sig;
{
info("Hangup (SIGHUP)");
- kill_link = 1;
- if (status != EXIT_HANGUP)
- status = EXIT_USER_REQUEST;
+ 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);
}
int sig;
{
info("Terminating on signal %d.", sig);
- persist = 0; /* don't try to restart */
- kill_link = 1;
- status = EXIT_USER_REQUEST;
+ got_sigterm = 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);
}
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);
+ notify(sigreceived, sig);
die(127);
}
/*
- * 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 dont_wait;
{
- int pid;
+ int pid, fd;
int status = -1;
int errfd;
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;
+ /* dup in and out to fds > 2 */
+ in = dup(in);
+ out = dup(out);
+ if (log_to_fd >= 0) {
+ errfd = dup(log_to_fd);
} else {
- while (waitpid(pid, &status, 0) < 0) {
- if (errno == EINTR)
- continue;
- fatal("error waiting for (dis)connection process: %m");
- }
- --conn_running;
+ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
+ }
+
+ /* close fds 0 - 2 and any others we can think of */
+ close(0);
+ close(1);
+ close(2);
+ sys_close();
+ if (the_channel->close)
+ (*the_channel->close)();
+ closelog();
+
+ /* 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 */
}
close (0);
close (1);
close (2);
- close (ttyfd); /* tty interface to the ppp device */
- if (real_ttyfd >= 0)
- close(real_ttyfd);
+ if (the_channel->close)
+ (*the_channel->close)();
/* Don't pass handles to the PPP device, even by accident. */
new_fd = open (_PATH_DEVNULL, O_RDWR);
#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");
+ warn("can't reset priority to 0: %m");
#endif
/* SysV recommends a second fork at this point. */
* 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;
int pid, status;
struct subprocess *chp, **prevp;
- got_sigchld = 0;
if (n_children == 0)
return 0;
while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1
(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)
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.
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;
}
}
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] == '=') {
+#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
/*
* update_db_entry - update our entry in the database.
*/
if (tdb_store(pppdb, key, dbuf, TDB_REPLACE))
error("tdb_store failed: %s", tdb_error(pppdb));
+ if (vbuf)
+ free(vbuf);
+
}
/*
if (p[-1])
delete_db_key(p);
}
-
-/*
- * open_socket - establish a stream socket connection to the nominated
- * host and port.
- */
-static int
-open_socket(dest)
- char *dest;
-{
- char *sep, *endp = NULL;
- int sock, port = -1;
- u_int32_t host;
- struct hostent *hent;
- struct sockaddr_in sad;
-
- /* parse host:port and resolve host to an IP address */
- sep = strchr(dest, ':');
- if (sep != NULL)
- port = strtol(sep+1, &endp, 10);
- if (port < 0 || endp == sep+1 || sep == dest) {
- error("Can't parse host:port for socket destination");
- return -1;
- }
- *sep = 0;
- host = inet_addr(dest);
- if (host == (u_int32_t) -1) {
- hent = gethostbyname(dest);
- if (hent == NULL) {
- error("%s: unknown host in socket option", dest);
- *sep = ':';
- return -1;
- }
- host = *(u_int32_t *)(hent->h_addr_list[0]);
- }
- *sep = ':';
-
- /* get a socket and connect it to the other end */
- sock = socket(PF_INET, SOCK_STREAM, 0);
- if (sock < 0) {
- error("Can't create socket: %m");
- return -1;
- }
- memset(&sad, 0, sizeof(sad));
- sad.sin_family = AF_INET;
- sad.sin_port = htons(port);
- sad.sin_addr.s_addr = host;
- if (connect(sock, (struct sockaddr *)&sad, sizeof(sad)) < 0) {
- error("Can't connect to %s: %m", dest);
- close(sock);
- return -1;
- }
-
- return sock;
-}
-
-/*
- * start_charshunt - create a child process to run the character shunt.
- */
-static int
-start_charshunt(ifd, ofd)
- int ifd, ofd;
-{
- int cpid;
-
- 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;
-}
-
-static void
-charshunt_done(arg)
- void *arg;
-{
- charshunt_pid = 0;
-}
-
-/*
- * 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. :-).
- */
-static void
-charshunt(ifd, ofd, record_file)
- int ifd, ofd;
- char *record_file;
-{
- 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;
- int ilevel, olevel, max_level;
- struct timeval levelt, tout, *top;
-
- /*
- * 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;
-
- ilevel = olevel = 0;
- gettimeofday(&levelt, NULL);
- if (max_data_rate) {
- max_level = max_data_rate / 10;
- if (max_level < 100)
- max_level = 100;
- } else
- max_level = sizeof(inpacket_buf) + 1;
-
- nfds = (ofd > pty_master? ofd: pty_master) + 1;
- if (recordf != NULL) {
- gettimeofday(&lasttime, NULL);
- 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;
- }
-
- while (nibuf != 0 || nobuf != 0 || pty_readable || stdin_readable) {
- top = 0;
- tout.tv_sec = 0;
- tout.tv_usec = 10000;
- FD_ZERO(&ready);
- FD_ZERO(&writey);
- if (nibuf != 0) {
- if (ilevel >= max_level)
- top = &tout;
- else
- FD_SET(pty_master, &writey);
- } else if (stdin_readable)
- FD_SET(ifd, &ready);
- if (nobuf != 0) {
- if (olevel >= max_level)
- top = &tout;
- else
- FD_SET(ofd, &writey);
- } else if (pty_readable)
- FD_SET(pty_master, &ready);
- if (select(nfds, &ready, &writey, NULL, top) < 0) {
- if (errno != EINTR)
- fatal("select");
- continue;
- }
- if (max_data_rate) {
- double dt;
- int nbt;
- struct timeval now;
-
- gettimeofday(&now, NULL);
- dt = (now.tv_sec - levelt.tv_sec
- + (now.tv_usec - levelt.tv_usec) / 1e6);
- nbt = (int)(dt * max_data_rate);
- ilevel = (nbt < 0 || nbt > ilevel)? 0: ilevel - nbt;
- olevel = (nbt < 0 || nbt > olevel)? 0: olevel - nbt;
- levelt = now;
- } else
- ilevel = olevel = 0;
- if (FD_ISSET(ifd, &ready)) {
- ibufp = inpacket_buf;
- nibuf = read(ifd, ibufp, sizeof(inpacket_buf));
- if (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 = nobuf;
- if (olevel + n > max_level)
- n = max_level - olevel;
- n = write(ofd, obufp, n);
- if (n < 0) {
- if (errno != EIO) {
- error("Error writing standard output: %m");
- break;
- }
- pty_readable = 0;
- nobuf = 0;
- } else {
- obufp += n;
- nobuf -= n;
- olevel += n;
- }
- }
- if (FD_ISSET(pty_master, &writey)) {
- n = nibuf;
- if (ilevel + n > max_level)
- n = max_level - ilevel;
- n = write(pty_master, ibufp, n);
- if (n < 0) {
- if (errno != EIO) {
- error("Error writing pseudo-tty master: %m");
- break;
- }
- stdin_readable = 0;
- nibuf = 0;
- } else {
- ibufp += n;
- nibuf -= n;
- ilevel += n;
- }
- }
- }
- exit(0);
-}
-
-static int
-record_write(f, code, buf, nb, tp)
- FILE *f;
- int code;
- u_char *buf;
- int nb;
- struct timeval *tp;
-{
- 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;
-}
+#endif /* USE_TDB */