*/
#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.15 1994/08/22 00:40:48 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.23 1995/05/19 03:26:25 paulus Exp $";
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <errno.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 <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 <net/if.h>
-#include "ppp.h"
+#include "pppd.h"
#include "magic.h"
#include "fsm.h"
#include "lcp.h"
#include "upap.h"
#include "chap.h"
#include "ccp.h"
-
-#include "pppd.h"
#include "pathnames.h"
#include "patchlevel.h"
-
-#ifndef TRUE
-#define TRUE (1)
-#endif /*TRUE*/
-
-#ifndef FALSE
-#define FALSE (0)
-#endif /*FALSE*/
-
-#ifdef PIDPATH
-static char *pidpath = PIDPATH; /* filename in which pid will be stored */
-#else
-static char *pidpath = _PATH_PIDFILE;
-#endif /* PIDFILE */
+/*
+ * If REQ_SYSOPTIONS is defined to 1, pppd will not run unless
+ * /etc/ppp/options exists.
+ */
+#ifndef REQ_SYSOPTIONS
+#define REQ_SYSOPTIONS 1
+#endif
/* interface vars */
char ifname[IFNAMSIZ]; /* Interface name */
char *progname; /* Name of this program */
char hostname[MAXNAMELEN]; /* Our hostname */
-char our_name[MAXNAMELEN];
-char remote_name[MAXNAMELEN];
-static char pidfilename[MAXPATHLEN];
-
+static char pidfilename[MAXPATHLEN]; /* name of pid file */
+static char default_devnam[MAXPATHLEN]; /* name of default device */
static pid_t pid; /* Our pid */
static pid_t pgrpid; /* Process Group ID */
-uid_t uid; /* Our real user-id */
-
-char devnam[MAXPATHLEN] = "/dev/tty"; /* Device name */
-int default_device = TRUE; /* use default device (stdin/out) */
+static uid_t uid; /* Our real user-id */
int fd = -1; /* Device file descriptor */
-int s; /* Socket file descriptor */
int phase; /* where the link is at */
int kill_link;
-
-#ifdef SGTTY
-static struct sgttyb initsgttyb; /* Initial TTY sgttyb */
-#else
-static struct termios inittermios; /* Initial TTY termios */
-#endif
+int open_ccp_flag;
static int initfdflags = -1; /* Initial file descriptor flags */
-int restore_term; /* 1 => we've munged the terminal */
-
-u_char outpacket_buf[MTU+DLLHEADERLEN]; /* buffer for outgoing packet */
-static u_char inpacket_buf[MTU+DLLHEADERLEN]; /* buffer for incoming packet */
+u_char outpacket_buf[PPP_MRU+PPP_HDRLEN]; /* buffer for outgoing packet */
+static 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 */
-/* 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 */
-
+int baud_rate;
/* prototypes */
-static void hup __ARGS((int));
-static void term __ARGS((int));
-static void chld __ARGS((int));
-static void incdebug __ARGS((int));
-static void nodebug __ARGS((int));
-
-static void get_input __ARGS((void));
-void establish_ppp __ARGS((void));
-void calltimeout __ARGS((void));
-struct timeval *timeleft __ARGS((struct timeval *));
-void reap_kids __ARGS((void));
-void cleanup __ARGS((int, caddr_t));
-void close_fd __ARGS((void));
-void die __ARGS((int));
-void novm __ARGS((char *));
-
-void log_packet __ARGS((u_char *, int, char *));
-void format_packet __ARGS((u_char *, 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 get_input __P((void));
+void establish_ppp __P((void));
+void calltimeout __P((void));
+struct timeval *timeleft __P((struct timeval *));
+void reap_kids __P((void));
+void cleanup __P((int, caddr_t));
+void close_fd __P((void));
+void die __P((int));
+void novm __P((char *));
+
+void log_packet __P((u_char *, int, char *));
+void format_packet __P((u_char *, int,
void (*) (void *, char *, ...), void *));
-void pr_log __ARGS((void *, char *, ...));
+void pr_log __P((void *, char *, ...));
-extern char *ttyname __ARGS((int));
-extern char *getlogin __ARGS((void));
+extern char *ttyname __P((int));
+extern char *getlogin __P((void));
+
+#ifdef ultrix
+#undef O_NONBLOCK
+#define O_NONBLOCK O_NDELAY
+#endif
/*
* PPP Data Link Layer "protocol" table.
void (*datainput)();
char *name;
} prottbl[] = {
- { LCP, lcp_init, lcp_input, lcp_protrej, lcp_printpkt, NULL, "LCP" },
- { IPCP, ipcp_init, ipcp_input, ipcp_protrej, ipcp_printpkt, NULL, "IPCP" },
- { UPAP, upap_init, upap_input, upap_protrej, upap_printpkt, NULL, "PAP" },
- { CHAP, ChapInit, ChapInput, ChapProtocolReject, ChapPrintPkt, NULL, "CHAP" },
- { CCP, ccp_init, ccp_input, ccp_protrej, ccp_printpkt, ccp_datainput, "CCP" },
+ { PPP_LCP, lcp_init, lcp_input, lcp_protrej,
+ lcp_printpkt, NULL, "LCP" },
+ { PPP_IPCP, ipcp_init, ipcp_input, ipcp_protrej,
+ ipcp_printpkt, NULL, "IPCP" },
+ { PPP_PAP, upap_init, upap_input, upap_protrej,
+ upap_printpkt, NULL, "PAP" },
+ { PPP_CHAP, ChapInit, ChapInput, ChapProtocolReject,
+ ChapPrintPkt, NULL, "CHAP" },
+ { PPP_CCP, ccp_init, ccp_input, ccp_protrej,
+ ccp_printpkt, ccp_datainput, "CCP" },
};
#define N_PROTO (sizeof(prottbl) / sizeof(prottbl[0]))
int argc;
char *argv[];
{
- int mask, i;
+ int i, nonblock;
struct sigaction sa;
struct cmd *cmdp;
FILE *pidfile;
char *p;
struct passwd *pw;
struct timeval timo;
+ sigset_t mask;
p = ttyname(0);
if (p)
strcpy(devnam, p);
-
+ strcpy(default_devnam, devnam);
+
if (gethostname(hostname, MAXNAMELEN) < 0 ) {
perror("couldn't get hostname");
die(1);
setipdefault();
/*
- * Initialize syslog system and magic number package.
+ * If the user has specified the default device name explicitly,
+ * pretend they hadn't.
*/
-#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 (debug)
- setlogmask(LOG_UPTO(LOG_DEBUG));
+ if (!default_device && strcmp(devnam, default_devnam) == 0)
+ default_device = 1;
+ /*
+ * Initialize system-dependent stuff and magic number package.
+ */
+ sys_init();
magic_init();
/*
* and identify who is running us.
*/
if (!default_device && !nodetach && daemon(0, 0) < 0) {
- perror("daemon");
+ perror("Couldn't detach from controlling terminal");
exit(1);
}
pid = getpid();
}
syslog(LOG_NOTICE, "pppd %s.%d started by %s, uid %d",
VERSION, PATCHLEVEL, p, uid);
-
- /* 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);
- }
/*
* Compute mask of all interesting signals and install signal handlers
#define SIGNAL(s, handler) { \
sa.sa_handler = handler; \
if (sigaction(s, &sa, NULL) < 0) { \
- syslog(LOG_ERR, "sigaction(%d): %m", s); \
+ syslog(LOG_ERR, "Couldn't establish signal handler (%d): %m", s); \
die(1); \
} \
}
SIGNAL(SIGTERM, term); /* Terminate */
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 */
/*
* Lock the device if we've been asked to.
/*
* Open the serial device and set it up to be the ppp interface.
+ * If we're dialling out, or we don't want to use the modem lines,
+ * we open it in non-blocking mode, but then we need to clear
+ * the non-blocking I/O bit.
*/
- if ((fd = open(devnam, O_RDWR, 0)) < 0) {
- syslog(LOG_ERR, "open(%s): %m", devnam);
+ nonblock = (connector || !modem)? O_NONBLOCK: 0;
+ if ((fd = open(devnam, nonblock | O_RDWR, 0)) < 0) {
+ syslog(LOG_ERR, "Failed to open %s: %m", devnam);
+ die(1);
+ }
+ if ((initfdflags = fcntl(fd, F_GETFL)) == -1) {
+ syslog(LOG_ERR, "Couldn't get device fd flags: %m");
die(1);
}
+ if (nonblock) {
+ initfdflags &= ~O_NONBLOCK;
+ fcntl(fd, F_SETFL, initfdflags);
+ }
hungup = 0;
kill_link = 0;
/* run connection script */
- if (connector) {
+ if (connector && connector[0]) {
MAINDEBUG((LOG_INFO, "Connecting with <%s>", connector));
/* set line speed, flow control, etc.; set CLOCAL for now */
}
if (device_script(connector, fd, fd) < 0) {
- syslog(LOG_ERR, "could not set up connection");
+ syslog(LOG_ERR, "Connect script failed");
setdtr(fd, FALSE);
die(1);
}
(void) sprintf(ifname, "ppp%d", ifunit);
/* write pid to file */
- (void) sprintf(pidfilename, "%s/%s.pid", pidpath, ifname);
+ (void) sprintf(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");
+ syslog(LOG_ERR, "Failed to create pid file %s: %m", pidfilename);
pidfilename[0] = 0;
}
/*
- * Record initial device flags, then set device for
- * non-blocking reads.
+ * Set device for non-blocking reads.
*/
- if ((initfdflags = fcntl(fd, F_GETFL)) == -1) {
- syslog(LOG_ERR, "fcntl(F_GETFL): %m");
- die(1);
- }
- if (fcntl(fd, F_SETFL, FNDELAY) == -1) {
- syslog(LOG_ERR, "fcntl(F_SETFL, FNDELAY): %m");
+ if (fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) {
+ syslog(LOG_ERR, "Couldn't set device to non-blocking mode: %m");
die(1);
}
lcp_close(0);
kill_link = 0;
}
+ if (open_ccp_flag) {
+ if (phase == PHASE_NETWORK) {
+ ccp_fsm[0].flags = OPT_RESTART; /* clears OPT_SILENT */
+ ccp_open(0);
+ }
+ open_ccp_flag = 0;
+ }
get_input();
reap_kids(); /* Don't leave dead kids lying around */
}
/*
- * Run disconnector script, if requested
+ * Run disconnector script, if requested.
+ * First we need to reset non-blocking mode.
*/
+ if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) >= 0)
+ initfdflags = -1;
+ disestablish_ppp();
if (disconnector) {
+ set_up_tty(fd, 1);
if (device_script(disconnector, fd, fd) < 0) {
syslog(LOG_WARNING, "disconnect script failed");
die(1);
}
close_fd();
- if (unlink(pidfilename) < 0)
- syslog(LOG_WARNING, "unable to unlink pid file: %m");
+ if (unlink(pidfilename) < 0 && errno != ENOENT)
+ syslog(LOG_WARNING, "unable to delete pid file: %m");
pidfilename[0] = 0;
} while (persist);
- if (lockflag && !default_device)
- unlock();
-
- exit(0);
+ die(0);
}
u_char *p;
u_short protocol;
- for (;;) { /* Read all available packets */
- p = inpacket_buf; /* point to beginning of packet buffer */
-
- len = read_packet(inpacket_buf);
- if (len < 0)
- return;
+ p = inpacket_buf; /* point to beginning of packet buffer */
- if (len == 0) {
- MAINDEBUG((LOG_DEBUG, "End of file on fd!"));
- hungup = 1;
- lcp_lowerdown(0); /* serial link is no longer available */
- phase = PHASE_DEAD;
- return;
- }
+ len = read_packet(inpacket_buf);
+ if (len < 0)
+ return;
- if (debug /*&& (debugflags & DBG_INPACKET)*/)
- log_packet(p, len, "rcvd ");
+ if (len == 0) {
+ syslog(LOG_NOTICE, "Modem hangup");
+ hungup = 1;
+ lcp_lowerdown(0); /* serial link is no longer available */
+ phase = PHASE_DEAD;
+ return;
+ }
- if (len < DLLHEADERLEN) {
- MAINDEBUG((LOG_INFO, "io(): Received short packet."));
- return;
- }
+ if (debug /*&& (debugflags & DBG_INPACKET)*/)
+ log_packet(p, len, "rcvd ");
- p += 2; /* Skip address and control */
- GETSHORT(protocol, p);
- len -= DLLHEADERLEN;
+ if (len < PPP_HDRLEN) {
+ MAINDEBUG((LOG_INFO, "io(): Received short packet."));
+ return;
+ }
- /*
- * 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;
- }
+ p += 2; /* Skip address and control */
+ GETSHORT(protocol, p);
+ len -= PPP_HDRLEN;
- /*
- * 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;
- } else if (protocol == (prottbl[i].protocol & ~0x8000)
- && prottbl[i].datainput != NULL) {
- (*prottbl[i].datainput)(0, p, len);
- break;
- }
+ /*
+ * Toss all non-LCP packets unless LCP is OPEN.
+ */
+ if (protocol != PPP_LCP && lcp_fsm[0].state != OPENED) {
+ MAINDEBUG((LOG_INFO,
+ "io(): Received non-LCP packet when LCP not open."));
+ return;
+ }
- if (i == sizeof (prottbl) / sizeof (struct protent)) {
- syslog(LOG_WARNING, "input: Unknown protocol (%x) received!",
- protocol);
- lcp_sprotrej(0, p - DLLHEADERLEN, len + DLLHEADERLEN);
+ /*
+ * 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;
+ } else if (protocol == (prottbl[i].protocol & ~0x8000)
+ && prottbl[i].datainput != NULL) {
+ (*prottbl[i].datainput)(0, p, len);
+ break;
}
+
+ if (i == sizeof (prottbl) / sizeof (struct protent)) {
+ if (debug)
+ syslog(LOG_WARNING, "Unknown protocol (0x%x) received", protocol);
+ lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
}
}
}
syslog(LOG_WARNING,
- "demuxprotrej: Unrecognized Protocol-Reject for protocol %d!",
+ "demuxprotrej: Unrecognized Protocol-Reject for protocol 0x%x",
protocol);
}
-#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.
- */
-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 }
-};
-
-/*
- * Translate from bits/second to a speed_t.
- */
-int
-translate_speed(bps)
- int bps;
-{
- 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;
-}
-
-/*
- * Translate from a speed_t to bits/second.
- */
-int
-baud_rate_of(speed)
- int speed;
-{
- struct speed *speedp;
-
- if (speed == 0)
- return 0;
- for (speedp = speeds; speedp->speed_int; speedp++)
- if (speed == speedp->speed_val)
- return speedp->speed_int;
- return 0;
-}
-#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.
- */
-set_up_tty(fd, local)
- int fd, local;
-{
-#ifndef SGTTY
- int speed, x;
- struct termios tios;
-
- if (tcgetattr(fd, &tios) < 0) {
- syslog(LOG_ERR, "tcgetattr: %m");
- die(1);
- }
-
- 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 */
- }
-
- speed = translate_speed(inspeed);
- if (speed) {
- cfsetospeed(&tios, speed);
- cfsetispeed(&tios, speed);
- } else {
- speed = cfgetospeed(&tios);
- }
-
- if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) {
- syslog(LOG_ERR, "tcsetattr: %m");
- die(1);
- }
-
-#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
-
-#else /* SGTTY */
- int speed;
- struct sgttyb sgttyb;
-
- /*
- * Put the tty in raw mode.
- */
- if (ioctl(fd, TIOCGETP, &sgttyb) < 0) {
- syslog(LOG_ERR, "ioctl(TIOCGETP): %m");
- die(1);
- }
-
- 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;
-
- if (ioctl(fd, TIOCSETP, &sgttyb) < 0) {
- syslog(LOG_ERR, "ioctl(TIOCSETP): %m");
- die(1);
- }
-#endif
-
- baud_rate = inspeed = baud_rate_of(speed);
- restore_term = TRUE;
-}
-
-/*
- * setdtr - control the DTR line on the serial port.
- * This is called from die(), so it shouldn't call die().
- */
-setdtr(fd, on)
-int fd, on;
-{
- int modembits = TIOCM_DTR;
-
- ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits);
-}
-
-
/*
* quit - Clean up state and exit.
*/
if (fd >= 0)
close_fd();
- if (pidfilename[0] != 0 && unlink(pidfilename) < 0)
- syslog(LOG_WARNING, "unable to unlink pid file: %m");
+ if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT)
+ syslog(LOG_WARNING, "unable to delete pid file: %m");
pidfilename[0] = 0;
if (lockflag && !default_device)
setdtr(fd, FALSE);
if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)
- syslog(LOG_WARNING, "fcntl(F_SETFL, fdflags): %m");
+ syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
initfdflags = -1;
disestablish_ppp();
- if (restore_term) {
-#ifndef SGTTY
- if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
- if (errno != ENXIO)
- syslog(LOG_WARNING, "tcsetattr: %m");
-#else
- if (ioctl(fd, TIOCSETP, &initsgttyb) < 0)
- syslog(LOG_WARNING, "ioctl(TIOCSETP): %m");
-#endif
- }
+ restore_tty();
close(fd);
fd = -1;
struct callout {
- struct timeval c_time; /* time at which to call routine */
- caddr_t c_arg; /* argument to routine */
- void (*c_func)(); /* routine */
- struct callout *c_next;
+ struct timeval c_time; /* time at which to call routine */
+ caddr_t c_arg; /* argument to routine */
+ void (*c_func)(); /* routine */
+ struct callout *c_next;
};
static struct callout *callout = NULL; /* Callout list */
{
struct callout *newp, *p, **pp;
- MAINDEBUG((LOG_DEBUG, "Timeout %x:%x in %d seconds.",
- (int) func, (int) arg, time));
+ MAINDEBUG((LOG_DEBUG, "Timeout %lx:%lx in %d seconds.",
+ (long) func, (long) arg, time));
/*
* Allocate timeout.
* Find correct place and link it in.
*/
for (pp = &callout; (p = *pp); pp = &p->c_next)
- if (p->c_time.tv_sec < newp->c_time.tv_sec
- || (p->c_time.tv_sec == newp->c_time.tv_sec
- && p->c_time.tv_usec <= newp->c_time.tv_sec))
+ 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_sec))
break;
newp->c_next = p;
*pp = newp;
struct callout **copp, *freep;
int reschedule = 0;
- MAINDEBUG((LOG_DEBUG, "Untimeout %x:%x.", (int) func, (int) arg));
+ MAINDEBUG((LOG_DEBUG, "Untimeout %lx:%lx.", (long) func, (long) arg));
/*
* Find first matching timeout and remove it from the list.
p = callout;
if (gettimeofday(&timenow, NULL) < 0) {
- syslog(LOG_ERR, "gettimeofday: %m");
+ syslog(LOG_ERR, "Failed to get time of day: %m");
die(1);
}
if (!(p->c_time.tv_sec < timenow.tv_sec
/*
- * incdebug - Catch SIGUSR1 signal.
+ * toggle_debug - Catch SIGUSR1 signal.
*
- * Increment debug flag.
+ * Toggle debug flag.
*/
/*ARGSUSED*/
static void
-incdebug(sig)
+toggle_debug(sig)
int sig;
{
- syslog(LOG_INFO, "Debug turned ON, Level %d", debug);
- setlogmask(LOG_UPTO(LOG_DEBUG));
- debug++;
+ debug = !debug;
+ note_debug_level();
}
/*
- * nodebug - Catch SIGUSR2 signal.
+ * open_ccp - Catch SIGUSR2 signal.
*
- * Turn off debugging.
+ * Try to (re)negotiate compression.
*/
/*ARGSUSED*/
static void
-nodebug(sig)
+open_ccp(sig)
int sig;
{
- setlogmask(LOG_UPTO(LOG_WARNING));
- debug = 0;
+ open_ccp_flag = 1;
}
{
int pid;
int status;
- sigset_t mask;
-
- sigemptyset(&mask);
- sigaddset(&mask, SIGINT);
- sigaddset(&mask, SIGHUP);
- sigprocmask(SIG_BLOCK, &mask, &mask);
pid = fork();
if (pid < 0) {
- syslog(LOG_ERR, "fork: %m");
+ syslog(LOG_ERR, "Failed to create child process: %m");
die(1);
}
if (pid == 0) {
- setreuid(getuid(), getuid());
- setregid(getgid(), getgid());
- sigprocmask(SIG_SETMASK, &mask, NULL);
+ setuid(getuid());
+ setgid(getgid());
dup2(in, 0);
dup2(out, 1);
execl("/bin/sh", "sh", "-c", program, (char *)0);
while (waitpid(pid, &status, 0) < 0) {
if (errno == EINTR)
continue;
- syslog(LOG_ERR, "waiting for (dis)connection process: %m");
+ syslog(LOG_ERR, "error waiting for (dis)connection process: %m");
die(1);
}
- sigprocmask(SIG_SETMASK, &mask, NULL);
return (status == 0 ? 0 : -1);
}
int must_exist;
{
int pid;
+ char *nullenv[1];
pid = fork();
if (pid == -1) {
- syslog(LOG_ERR, "can't fork to run %s: %m", prog);
+ syslog(LOG_ERR, "Failed to create child process for %s: %m", prog);
return -1;
}
if (pid == 0) {
- execv(prog, args);
+ int new_fd;
+
+ /* Leave the current location */
+ (void) setsid(); /* No controlling tty. */
+ (void) umask (S_IRWXG|S_IRWXO);
+ (void) chdir ("/"); /* no current directory. */
+ setuid(geteuid());
+ setgid(getegid());
+
+ /* Ensure that nothing of our device environment is inherited. */
+ close (0);
+ close (1);
+ close (2);
+ close (fd); /* tty interface to the ppp device */
+ /* XXX should call sysdep cleanup procedure here */
+
+ /* Don't pass handles to the PPP device, even by accident. */
+ new_fd = open (_PATH_DEVNULL, O_RDWR);
+ if (new_fd >= 0) {
+ if (new_fd != 0) {
+ dup2 (new_fd, 0); /* stdin <- /dev/null */
+ close (new_fd);
+ }
+ dup2 (0, 1); /* stdout -> /dev/null */
+ dup2 (0, 2); /* stderr -> /dev/null */
+ }
+
+#ifdef BSD
+ /* Force the priority back to zero if pppd is running higher. */
+ if (setpriority (PRIO_PROCESS, 0, 0) < 0)
+ syslog (LOG_WARNING, "can't reset priority to 0: %m");
+#endif
+
+ /* SysV recommends a second fork at this point. */
+
+ /* run the program; give it a null environment */
+ nullenv[0] = NULL;
+ execve(prog, args, nullenv);
if (must_exist || errno != ENOENT)
- syslog(LOG_WARNING, "can't execute %s: %m", prog);
+ syslog(LOG_WARNING, "Can't execute %s: %m", prog);
_exit(-1);
}
MAINDEBUG((LOG_DEBUG, "Script %s started; pid = %d", prog, pid));
return;
if ((pid = waitpid(-1, &status, WNOHANG)) == -1) {
if (errno != ECHILD)
- syslog(LOG_ERR, "waitpid: %m");
+ syslog(LOG_ERR, "Error waiting for child process: %m");
return;
}
if (pid > 0) {
--n_children;
if (WIFSIGNALED(status)) {
- syslog(LOG_WARNING, "child process %d terminated with signal %d",
+ syslog(LOG_WARNING, "Child process %d terminated with signal %d",
pid, WTERMSIG(status));
}
}
format_packet(p, len, printer, arg)
u_char *p;
int len;
- void (*printer) __ARGS((void *, char *, ...));
+ void (*printer) __P((void *, char *, ...));
void *arg;
{
int i, n;
u_short proto;
u_char x;
- if (len >= DLLHEADERLEN && p[0] == ALLSTATIONS && p[1] == UI) {
+ if (len >= PPP_HDRLEN && p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) {
p += 2;
GETSHORT(proto, p);
- len -= DLLHEADERLEN;
+ len -= PPP_HDRLEN;
for (i = 0; i < N_PROTO; ++i)
if (proto == prottbl[i].protocol)
break;
print_string(p, len, printer, arg)
char *p;
int len;
- void (*printer) __ARGS((void *, char *, ...));
+ void (*printer) __P((void *, char *, ...));
void *arg;
{
int c;
projects / ppp.git / blobdiff