*/
#ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.20 1994/10/22 11:49:46 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.31 1996/01/18 03:21:53 paulus Exp $";
#endif
#include <stdio.h>
#include "pathnames.h"
#include "patchlevel.h"
+#ifdef IPX_CHANGE
+#include "ipxcp.h"
+#endif /* IPX_CHANGE */
+
/*
* If REQ_SYSOPTIONS is defined to 1, pppd will not run unless
* /etc/ppp/options exists.
char *progname; /* Name of this program */
char hostname[MAXNAMELEN]; /* Our hostname */
-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 */
static uid_t uid; /* Our real user-id */
-int fd = -1; /* Device file descriptor */
-int s; /* Socket file descriptor */
+int ttyfd = -1; /* Serial port file descriptor */
int phase; /* where the link is at */
int kill_link;
int open_ccp_flag;
-static int initfdflags = -1; /* Initial file descriptor flags */
+static int loop_fd = -1; /* fd for loopback device */
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 */
+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 */
-int baud_rate;
+int baud_rate; /* Actual bits/second for serial device */
+
+static int locked; /* lock() has succeeded */
-/* prototypes */
+char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
+
+/* Prototypes for procedures local to this file. */
+
+static void cleanup __P((void));
+static void close_tty __P((void));
+static void get_input __P((void));
+static void connect_time_expired __P((caddr_t));
+static void calltimeout __P((void));
+static struct timeval *timeleft __P((struct timeval *));
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 __P((void *, char *, ...));
+static void bad_signal __P((int));
+static void holdoff_end __P((void *));
+static int device_script __P((char *, int, int));
+static void reap_kids __P((void));
+static void pr_log __P((void *, char *, ...));
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.
* 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)();
- void (*datainput)();
- char *name;
-} prottbl[] = {
- { 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" },
+struct protent *protocols[] = {
+ &lcp_protent,
+ &pap_protent,
+ &chap_protent,
+ &ipcp_protent,
+ &ccp_protent,
+#ifdef IPX_CHANGE
+ &ipxcp_protent,
+#endif
+ NULL
};
-#define N_PROTO (sizeof(prottbl) / sizeof(prottbl[0]))
-
main(argc, argv)
int argc;
char *argv[];
{
- int i, nonblock;
+ int i, nonblock, fdflags;
struct sigaction sa;
struct cmd *cmdp;
FILE *pidfile;
struct passwd *pw;
struct timeval timo;
sigset_t mask;
+ struct protent *protp;
p = ttyname(0);
if (p)
strcpy(devnam, p);
+ strcpy(default_devnam, devnam);
if (gethostname(hostname, MAXNAMELEN) < 0 ) {
perror("couldn't get hostname");
uid = getuid();
- if (!ppp_available()) {
- fprintf(stderr, "Sorry - PPP is not available on this system\n");
- exit(1);
- }
-
/*
* Initialize to the standard option set, then parse, in order,
* the system options file, the user's options file, and the command
* line arguments.
*/
- for (i = 0; i < N_PROTO; i++)
- (*prottbl[i].init)(0);
+ for (i = 0; (protp = protocols[i]) != NULL; ++i)
+ (*protp->init)(0);
progname = *argv;
if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS, 0) ||
+ !options_for_tty() ||
!options_from_user() ||
- !parse_args(argc-1, argv+1) ||
- !options_for_tty())
- die(1);
- check_auth_options();
- setipdefault();
+ !parse_args(argc-1, argv+1))
+ exit(1);
+
+ if (!ppp_available()) {
+ fprintf(stderr, no_ppp_msg);
+ exit(1);
+ }
+
+ sys_check_options();
+ auth_check_options();
+ for (i = 0; (protp = protocols[i]) != NULL; ++i)
+ if (protp->check_options != NULL)
+ (*protp->check_options)();
+
+ /*
+ * If the user has specified the default device name explicitly,
+ * pretend they hadn't.
+ */
+ if (!default_device && strcmp(devnam, default_devnam) == 0)
+ default_device = 1;
/*
* Initialize system-dependent stuff and magic number package.
}
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, "Couldn't create IP socket: %m");
- die(1);
- }
/*
* Compute mask of all interesting signals and install signal handlers
SIGNAL(SIGTERM, term); /* Terminate */
SIGNAL(SIGCHLD, chld);
- signal(SIGUSR1, toggle_debug); /* Toggle debug flag */
- signal(SIGUSR2, open_ccp); /* Reopen CCP */
+ SIGNAL(SIGUSR1, toggle_debug); /* Toggle debug flag */
+ SIGNAL(SIGUSR2, open_ccp); /* Reopen CCP */
/*
- * Lock the device if we've been asked to.
+ * Install a handler for other signals which would otherwise
+ * cause pppd to exit without cleaning up.
*/
- if (lockflag && !default_device)
- if (lock(devnam) < 0)
- die(1);
+ SIGNAL(SIGABRT, bad_signal);
+ SIGNAL(SIGALRM, bad_signal);
+ SIGNAL(SIGFPE, bad_signal);
+ SIGNAL(SIGILL, bad_signal);
+ SIGNAL(SIGPIPE, bad_signal);
+ SIGNAL(SIGQUIT, bad_signal);
+ SIGNAL(SIGSEGV, bad_signal);
+#ifdef SIGBUS
+ SIGNAL(SIGBUS, bad_signal);
+#endif
+#ifdef SIGEMT
+ SIGNAL(SIGEMT, bad_signal);
+#endif
+#ifdef SIGPOLL
+ SIGNAL(SIGPOLL, bad_signal);
+#endif
+#ifdef SIGPROF
+ SIGNAL(SIGPROF, bad_signal);
+#endif
+#ifdef SIGSYS
+ SIGNAL(SIGSYS, bad_signal);
+#endif
+#ifdef SIGTRAP
+ SIGNAL(SIGTRAP, bad_signal);
+#endif
+#ifdef SIGVTALRM
+ SIGNAL(SIGVTALRM, bad_signal);
+#endif
+#ifdef SIGXCPU
+ SIGNAL(SIGXCPU, bad_signal);
+#endif
+#ifdef SIGXFSZ
+ SIGNAL(SIGXFSZ, bad_signal);
+#endif
+
+ /*
+ * If we're doing dial-on-demand, set up the interface now.
+ */
+ if (demand) {
+ /*
+ * Open the loopback channel and set it up to be the ppp interface.
+ */
+ open_ppp_loopback();
+
+ syslog(LOG_INFO, "Using interface ppp%d", ifunit);
+ (void) sprintf(ifname, "ppp%d", ifunit);
+
+ /* write pid to file */
+ (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, "Failed to create pid file %s: %m", pidfilename);
+ pidfilename[0] = 0;
+ }
+
+ /*
+ * Configure the interface and mark it up, etc.
+ */
+ demand_conf();
+ }
+
+ for (;;) {
+
+ if (demand) {
+ /*
+ * Don't do anything until we see some activity.
+ */
+ phase = PHASE_DORMANT;
+ kill_link = 0;
+ demand_unblock();
+ for (;;) {
+ wait_loop_output(timeleft(&timo));
+ calltimeout();
+ if (kill_link) {
+ if (!persist)
+ die(0);
+ kill_link = 0;
+ }
+ if (get_loop_output())
+ break;
+ reap_kids();
+ }
+
+ /*
+ * Now we want to bring up the link.
+ */
+ demand_block();
+ syslog(LOG_INFO, "Starting link");
+ }
- do {
+ /*
+ * Lock the device if we've been asked to.
+ */
+ if (lockflag && !default_device) {
+ if (lock(devnam) < 0)
+ goto fail;
+ locked = 1;
+ }
/*
* Open the serial device and set it up to be the ppp interface.
* the non-blocking I/O bit.
*/
nonblock = (connector || !modem)? O_NONBLOCK: 0;
- if ((fd = open(devnam, nonblock | O_RDWR, 0)) < 0) {
+ if ((ttyfd = 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);
+ goto fail;
}
if (nonblock) {
- initfdflags &= ~O_NONBLOCK;
- fcntl(fd, F_SETFL, initfdflags);
+ if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1
+ || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
+ syslog(LOG_WARNING,
+ "Couldn't reset non-blocking mode on device: %m");
}
hungup = 0;
kill_link = 0;
MAINDEBUG((LOG_INFO, "Connecting with <%s>", connector));
/* set line speed, flow control, etc.; set CLOCAL for now */
- set_up_tty(fd, 1);
+ set_up_tty(ttyfd, 1);
/* drop dtr to hang up in case modem is off hook */
if (!default_device && modem) {
- setdtr(fd, FALSE);
+ setdtr(ttyfd, FALSE);
sleep(1);
- setdtr(fd, TRUE);
+ setdtr(ttyfd, TRUE);
}
- if (device_script(connector, fd, fd) < 0) {
+ if (device_script(connector, ttyfd, ttyfd) < 0) {
syslog(LOG_ERR, "Connect script failed");
- setdtr(fd, FALSE);
- die(1);
+ setdtr(ttyfd, FALSE);
+ goto fail;
}
- syslog(LOG_INFO, "Connected...");
+ syslog(LOG_INFO, "Serial connection established.");
sleep(1); /* give it time to set up its terminal */
}
-
- /* set line speed, flow control, etc.; clear CLOCAL if modem option */
- set_up_tty(fd, 0);
- /* set up the serial device as a ppp interface */
- establish_ppp();
+ /* set line speed, flow control, etc.; clear CLOCAL if modem option */
+ set_up_tty(ttyfd, 0);
- syslog(LOG_INFO, "Using interface ppp%d", ifunit);
- (void) sprintf(ifname, "ppp%d", ifunit);
+ /* run welcome script, if any */
+ if (welcomer && welcomer[0]) {
+ if (device_script(welcomer, ttyfd, ttyfd) < 0)
+ syslog(LOG_WARNING, "Welcome script failed");
+ }
- /* write pid to file */
- (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, "Failed to create pid file %s: %m", pidfilename);
- pidfilename[0] = 0;
+ /* set up the serial device as a ppp interface */
+ establish_ppp(ttyfd);
+
+ if (!demand) {
+
+ syslog(LOG_INFO, "Using interface ppp%d", ifunit);
+ (void) sprintf(ifname, "ppp%d", ifunit);
+
+ /* write pid to file */
+ (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, "Failed to create pid file %s: %m",
+ pidfilename);
+ pidfilename[0] = 0;
+ }
}
/*
- * Set device for non-blocking reads.
+ * Set a timeout to close the connection once the maximum
+ * connect time has expired.
*/
- if (fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) {
- syslog(LOG_ERR, "Couldn't set device to non-blocking mode: %m");
- die(1);
- }
-
+ if (maxconnect > 0)
+ TIMEOUT(connect_time_expired, 0, maxconnect);
+
/*
- * Block all signals, start opening the connection, and wait for
+ * Start opening the connection and wait for
* incoming events (reply, timeout, etc.).
*/
syslog(LOG_NOTICE, "Connect: %s <--> %s", ifname, devnam);
for (phase = PHASE_ESTABLISH; phase != PHASE_DEAD; ) {
wait_input(timeleft(&timo));
calltimeout();
+ get_input();
if (kill_link) {
- lcp_close(0);
+ lcp_close(0, "User request");
+ phase = PHASE_TERMINATE;
kill_link = 0;
}
if (open_ccp_flag) {
}
open_ccp_flag = 0;
}
- get_input();
reap_kids(); /* Don't leave dead kids lying around */
}
+ /*
+ * If we may want to bring the link up again, transfer
+ * the ppp unit back to the loopback. Set the
+ * real serial device back to its normal mode of operation.
+ */
+ clean_check();
+ if (demand)
+ restore_loop();
+ disestablish_ppp(ttyfd);
+
/*
* Run disconnector script, if requested.
- * First we need to reset non-blocking mode.
+ * XXX we may not be able to do this if the line has hung up!
*/
- 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) {
+ if (disconnector && !hungup) {
+ set_up_tty(ttyfd, 1);
+ if (device_script(disconnector, ttyfd, ttyfd) < 0) {
syslog(LOG_WARNING, "disconnect script failed");
- die(1);
+ } else {
+ syslog(LOG_INFO, "Serial link disconnected.");
}
+ }
- syslog(LOG_INFO, "Disconnected...");
+ fail:
+ close_tty();
+ if (locked) {
+ unlock();
+ locked = 0;
}
- close_fd();
- if (unlink(pidfilename) < 0 && errno != ENOENT)
- syslog(LOG_WARNING, "unable to delete pid file: %m");
- pidfilename[0] = 0;
+ if (!demand) {
+ if (unlink(pidfilename) < 0 && errno != ENOENT)
+ syslog(LOG_WARNING, "unable to delete pid file: %m");
+ pidfilename[0] = 0;
+ }
- } while (persist);
+ if (!persist)
+ break;
- if (lockflag && !default_device)
- unlock();
+ if (demand)
+ demand_discard();
+ if (holdoff > 0) {
+ phase = PHASE_HOLDOFF;
+ TIMEOUT(holdoff_end, NULL, holdoff);
+ do {
+ wait_time(timeleft(&timo));
+ calltimeout();
+ if (kill_link) {
+ if (!persist)
+ die(0);
+ kill_link = 0;
+ phase = PHASE_DORMANT; /* allow signal to end holdoff */
+ }
+ reap_kids();
+ } while (phase == PHASE_HOLDOFF);
+ }
+ }
- exit(0);
+ die(0);
}
+/*
+ * holdoff_end - called via a timeout when the holdoff period ends.
+ */
+static void
+holdoff_end(arg)
+ void *arg;
+{
+ phase = PHASE_DORMANT;
+}
/*
* get_input - called when incoming data is available.
int len, i;
u_char *p;
u_short protocol;
+ struct protent *protp;
p = inpacket_buf; /* point to beginning of packet buffer */
return;
if (len == 0) {
- MAINDEBUG((LOG_DEBUG, "End of file on fd!"));
+ syslog(LOG_NOTICE, "Modem hangup");
hungup = 1;
lcp_lowerdown(0); /* serial link is no longer available */
- phase = PHASE_DEAD;
+ link_terminated(0);
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;
- } else if (protocol == (prottbl[i].protocol & ~0x8000)
- && prottbl[i].datainput != NULL) {
- (*prottbl[i].datainput)(0, p, len);
- break;
+ for (i = 0; (protp = protocols[i]) != NULL; ++i) {
+ if (protp->protocol == protocol && protp->enabled_flag) {
+ (*protp->input)(0, p, len);
+ return;
}
-
- 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);
- }
-}
-
-
-/*
- * demuxprotrej - Demultiplex a Protocol-Reject.
- */
-void
-demuxprotrej(unit, protocol)
- int unit;
- u_short protocol;
-{
- 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);
+ if (protocol == (protp->protocol & ~0x8000) && protp->enabled_flag
+ && protp->datainput != NULL) {
+ (*protp->datainput)(0, p, len);
return;
}
+ }
- syslog(LOG_WARNING,
- "demuxprotrej: Unrecognized Protocol-Reject for protocol 0x%x",
- protocol);
+ if (debug)
+ syslog(LOG_WARNING, "Unsupported protocol (0x%x) received", protocol);
+ lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
}
/*
- * quit - Clean up state and exit.
+ * quit - Clean up state and exit (with an error indication).
*/
void
quit()
{
- die(0);
+ die(1);
}
/*
die(status)
int status;
{
- cleanup(0, NULL);
+ cleanup();
syslog(LOG_INFO, "Exit.");
exit(status);
}
+/*
+ * connect_time_expired - log a message and close the connection.
+ */
+static void
+connect_time_expired(arg)
+ caddr_t arg;
+{
+ syslog(LOG_INFO, "Connect time expired");
+
+ phase = PHASE_TERMINATE;
+ lcp_close(0, "Connect time expired"); /* Close connection */
+}
+
/*
* 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)
- close_fd();
+ sys_cleanup();
+
+ if (ttyfd >= 0)
+ close_tty();
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)
+ if (locked)
unlock();
}
/*
- * close_fd - restore the terminal device and close it.
+ * close_tty - restore the terminal device and close it.
*/
-void
-close_fd()
+static void
+close_tty()
{
+ disestablish_ppp(ttyfd);
+
/* drop dtr to hang up */
if (modem)
- setdtr(fd, FALSE);
+ setdtr(ttyfd, FALSE);
- if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)
- syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
- initfdflags = -1;
+ restore_tty(ttyfd);
- disestablish_ppp();
-
- restore_tty();
-
- close(fd);
- fd = -1;
+ close(ttyfd);
+ ttyfd = -1;
}
{
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.
/*
* calltimeout - Call any timeout routines which are now due.
*/
-void
+static void
calltimeout()
{
struct callout *p;
/*
* timeleft - return the length of time until the next timeout is due.
*/
-struct timeval *
+static struct timeval *
timeleft(tvp)
struct timeval *tvp;
{
}
+/*
+ * bad_signal - We've caught a fatal signal. Clean up state and exit.
+ */
+static void
+bad_signal(sig)
+ int sig;
+{
+ syslog(LOG_ERR, "Fatal signal %d", sig);
+ die(1);
+}
+
+
/*
* device_script - run a program to connect or disconnect the
* serial device.
*/
-int
+static int
device_script(program, in, out)
char *program;
int in, out;
{
int pid;
int status;
- sigset_t mask;
-
- sigemptyset(&mask);
- sigaddset(&mask, SIGINT);
- sigaddset(&mask, SIGHUP);
- sigprocmask(SIG_BLOCK, &mask, &mask);
+ int errfd;
pid = fork();
}
if (pid == 0) {
- setreuid(getuid(), getuid());
- setregid(getgid(), getgid());
- sigprocmask(SIG_SETMASK, &mask, NULL);
+ sys_close();
dup2(in, 0);
dup2(out, 1);
+ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644);
+ if (errfd >= 0)
+ dup2(errfd, 2);
+ setuid(getuid());
+ setgid(getgid());
execl("/bin/sh", "sh", "-c", program, (char *)0);
syslog(LOG_ERR, "could not exec /bin/sh: %m");
_exit(99);
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) {
return -1;
}
if (pid == 0) {
- int new_fd;
+ int new_fd;
/* Leave the current location */
(void) setsid(); /* No controlling tty. */
- (void) umask (0); /* no umask. Must change in script. */
+ (void) umask (S_IRWXG|S_IRWXO);
(void) chdir ("/"); /* no current directory. */
+ setuid(geteuid());
+ setgid(getegid());
/* Ensure that nothing of our device environment is inherited. */
+ sys_close();
close (0);
close (1);
close (2);
- close (s); /* Socket interface to the ppp device */
- close (fd); /* tty interface to the ppp device */
-
+ close (ttyfd); /* tty interface to the ppp device */
+
/* Don't pass handles to the PPP device, even by accident. */
new_fd = open (_PATH_DEVNULL, O_RDWR);
if (new_fd >= 0) {
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 */
- execv(prog, args);
+ /* 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);
_exit(-1);
* reap_kids - get status from any dead child processes,
* and log a message for abnormal terminations.
*/
-void
+static void
reap_kids()
{
int pid, status;
int i, n;
u_short proto;
u_char x;
+ struct protent *protp;
if (len >= PPP_HDRLEN && p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) {
p += 2;
GETSHORT(proto, p);
len -= PPP_HDRLEN;
- for (i = 0; i < N_PROTO; ++i)
- if (proto == prottbl[i].protocol)
+ for (i = 0; (protp = protocols[i]) != NULL; ++i)
+ if (proto == protp->protocol)
break;
- if (i < N_PROTO) {
- printer(arg, "[%s", prottbl[i].name);
- n = (*prottbl[i].printpkt)(p, len, printer, arg);
+ if (protp != NULL) {
+ printer(arg, "[%s", protp->name);
+ n = (*protp->printpkt)(p, len, printer, arg);
printer(arg, "]");
p += n;
len -= n;
#ifdef __STDC__
#include <stdarg.h>
-void
+static void
pr_log(void *arg, char *fmt, ...)
{
int n;
#else /* __STDC__ */
#include <varargs.h>
-void
+static void
pr_log(arg, fmt, va_alist)
void *arg;
char *fmt;
projects / ppp.git / blobdiff