X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=c25758ed4a193294d918db76b0c07a8bfb1b1541;hp=af5164fe3e4be1cef3aab5b30a85d8561cdb4af6;hb=31b4bba68d46b38119fd8620ee09ff7f8831f4b5;hpb=892e254c066564ec858769c5eebb02cb21b7c9fe diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index af5164f..c25758e 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -92,6 +92,7 @@ #define RTF_DEFAULT 0 #endif +/* We can get an EIO error on an ioctl if the modem has hung up */ #define ok_error(num) ((num)==EIO) static int tty_disc = N_TTY; /* The TTY discipline */ @@ -101,6 +102,10 @@ static int ppp_fd = -1; /* fd which is set to PPP discipline */ static int sock_fd = -1; /* socket for doing interface ioctls */ static int slave_fd = -1; static int master_fd = -1; +static int ppp_dev_fd = -1; /* fd for /dev/ppp (new style driver) */ + +static fd_set in_fds; /* set of fds that wait_input waits for */ +static int max_in_fd; /* highest fd set in in_fds */ static int has_proxy_arp = 0; static int driver_version = 0; @@ -110,14 +115,15 @@ static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ +static int new_style_driver = 0; + static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ static int if_is_up; /* Interface has been marked up */ static u_int32_t default_route_gateway; /* Gateway for default route added */ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ - -static char *lock_file; +static char proxy_arp_dev[16]; /* Device for proxy arp entry */ static struct utsname utsname; /* for the kernel version */ static int kernel_version; @@ -130,8 +136,8 @@ static int kernel_version; IFF_POINTOPOINT | IFF_LOOPBACK | IFF_NOARP) /* Prototypes for procedures local to this file. */ -static int get_flags (void); -static void set_flags (int flags); +static int get_flags (int fd); +static void set_flags (int fd, int flags); static int translate_speed (int bps); static int baud_rate_of (int speed); static char *path_to_route (void); @@ -140,8 +146,10 @@ static int open_route_table (void); static int read_route_table (struct rtentry *rt); static int defaultroute_exists (struct rtentry *rt); static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr, - char *name); + char *name, int namelen); static void decode_version (char *buf, int *version, int *mod, int *patch); +static int set_kdebugflag(int level); +static int ppp_registered(void); extern u_char inpacket_buf[]; /* borrowed from main.c */ @@ -160,18 +168,19 @@ extern u_char inpacket_buf[]; /* borrowed from main.c */ extern int hungup; -#ifndef LOCK_PREFIX -#define LOCK_PREFIX "/var/lock/LCK.." -#endif - +/* new_fd is the fd of a tty */ static void set_ppp_fd (int new_fd) { SYSDEBUG ((LOG_DEBUG, "setting ppp_fd to %d\n", new_fd)); ppp_fd = new_fd; + if (!new_style_driver) + ppp_dev_fd = new_fd; } static int still_ppp(void) { + if (new_style_driver) + return !hungup && ppp_fd >= 0; if (!hungup || ppp_fd == slave_fd) return 1; if (slave_fd >= 0) { @@ -186,42 +195,32 @@ static int still_ppp(void) * Functions to read and set the flags value in the device driver */ -static int get_flags (void) - { +static int get_flags (int fd) +{ int flags; - if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) - { + if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) { if ( ok_error (errno) ) - { flags = 0; - } else - { - syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m"); - quit(); - } - } + fatal("ioctl(PPPIOCGFLAGS): %m"); + } SYSDEBUG ((LOG_DEBUG, "get flags = %x\n", flags)); return flags; - } +} /********************************************************************/ -static void set_flags (int flags) - { +static void set_flags (int fd, int flags) +{ SYSDEBUG ((LOG_DEBUG, "set flags = %x\n", flags)); - if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) - { + if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) { if (! ok_error (errno) ) - { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m(%d)", flags, errno); - quit(); - } - } - } + fatal("ioctl(PPPIOCSFLAGS, %x): %m", flags, errno); + } +} /******************************************************************** * @@ -229,62 +228,64 @@ static void set_flags (int flags) */ void sys_init(void) - { +{ int osmaj, osmin, ospatch; + int flags; openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); setlogmask(LOG_UPTO(LOG_INFO)); if (debug) - { setlogmask(LOG_UPTO(LOG_DEBUG)); - } - + + if (new_style_driver) { + ppp_dev_fd = open("/dev/ppp", O_RDWR); + if (ppp_dev_fd < 0) + fatal("Couldn't open /dev/ppp: %m"); + flags = fcntl(ppp_dev_fd, F_GETFL); + if (flags == -1 + || fcntl(ppp_dev_fd, F_SETFL, flags | O_NONBLOCK) == -1) + warn("Couldn't set /dev/ppp to nonblock: %m"); + } + /* Get an internet socket for doing socket ioctls. */ sock_fd = socket(AF_INET, SOCK_DGRAM, 0); - if (sock_fd < 0) - { + if (sock_fd < 0) { if ( ! ok_error ( errno )) - { - syslog(LOG_ERR, "Couldn't create IP socket: %m(%d)", errno); - die(1); - } - } + fatal("Couldn't create IP socket: %m(%d)", errno); + } + + FD_ZERO(&in_fds); + max_in_fd = 0; uname(&utsname); osmaj = osmin = ospatch = 0; sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch); kernel_version = KVERSION(osmaj, osmin, ospatch); - } +} /******************************************************************** * * sys_cleanup - restore any system state we modified before exiting: * mark the interface down, delete default route and/or proxy arp entry. - * This should call die() because it's called from die(). + * This shouldn't call die() because it's called from die(). */ void sys_cleanup(void) - { +{ /* * Take down the device */ if (if_is_up) - { sifdown(0); - } /* * Delete any routes through the device. */ if (default_route_gateway != 0) - { cifdefaultroute(0, 0, default_route_gateway); - } if (has_proxy_arp) - { cifproxyarp(0, proxy_arp_addr); - } - } +} /******************************************************************** * @@ -292,58 +293,44 @@ void sys_cleanup(void) */ void sys_close(void) - { - close(sock_fd); - sock_fd = -1; +{ + if (new_style_driver) + close(ppp_dev_fd); + if (sock_fd >= 0) + close(sock_fd); + if (slave_fd >= 0) + close(slave_fd); + if (master_fd >= 0) + close(master_fd); closelog(); - } - -/******************************************************************** - * - * note_debug_level - note a change in the debug level. - */ - -void note_debug_level (void) - { - if (debug) - { - SYSDEBUG ((LOG_INFO, "Debug turned ON, Level %d", debug)); - setlogmask(LOG_UPTO(LOG_DEBUG)); - } - else - { - setlogmask(LOG_UPTO(LOG_WARNING)); - } - } +} /******************************************************************** * * set_kdebugflag - Define the debugging level for the kernel */ -int set_kdebugflag (int requested_level) - { - if (ioctl(ppp_fd, PPPIOCSDEBUG, &requested_level) < 0) - { +static int set_kdebugflag (int requested_level) +{ + if (ioctl(ppp_dev_fd, PPPIOCSDEBUG, &requested_level) < 0) { if ( ! ok_error (errno) ) - { - syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m"); - } + error("ioctl(PPPIOCSDEBUG): %m"); return (0); - } + } SYSDEBUG ((LOG_INFO, "set kernel debugging level to %d", requested_level)); return (1); - } +} /******************************************************************** * * establish_ppp - Turn the serial port into a ppp interface. */ -void establish_ppp (int tty_fd) - { +int establish_ppp (int tty_fd) +{ int x; + /* * The current PPP device will be the tty file. */ @@ -351,83 +338,76 @@ void establish_ppp (int tty_fd) /* * Ensure that the tty device is in exclusive mode. */ - if (ioctl(tty_fd, TIOCEXCL, 0) < 0) - { + if (ioctl(tty_fd, TIOCEXCL, 0) < 0) { if ( ! ok_error ( errno )) - { - syslog (LOG_WARNING, "ioctl(TIOCEXCL): %m"); - } - } + warn("ioctl(TIOCEXCL): %m"); + } /* * Demand mode - prime the old ppp device to relinquish the unit. */ - if (demand && ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0) - { - syslog(LOG_ERR, "ioctl(transfer ppp unit): %m(%d)", errno); - die(1); - } + if (!new_style_driver && demand + && ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0) + fatal("ioctl(transfer ppp unit): %m(%d)", errno); /* * Set the current tty to the PPP discpline */ - if (ioctl(ppp_fd, TIOCSETD, &ppp_disc) < 0) - { + if (ioctl(tty_fd, TIOCSETD, &ppp_disc) < 0) { if ( ! ok_error (errno) ) - { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m(%d)", errno); - die(1); - } - } + fatal("ioctl(TIOCSETD): %m(%d)", errno); + } /* * Find out which interface we were given. */ - if (ioctl(ppp_fd, PPPIOCGUNIT, &x) < 0) - { - if ( ! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m(%d)", errno); - die(1); - } - } -/* - * Check that we got the same unit again. - */ - if (demand) - { - if (x != ifunit) - { - syslog(LOG_ERR, "transfer_ppp failed: wanted unit %d, got %d", - ifunit, x); - die(1); - } - } - - ifunit = x; + if (new_style_driver) { + if (!demand) { + /* allocate ourselves a ppp unit */ + ifunit = -1; + if (ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit) < 0) + fatal("Couldn't create new ppp unit: %m"); + set_kdebugflag(kdebugflag); + } else { + set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) & ~SC_LOOP_TRAFFIC); + } + if (ioctl(tty_fd, PPPIOCATTACH, &ifunit) < 0) { + if (errno == EIO) + return -1; + fatal("Couldn't attach tty to PPP unit %d: %m", ifunit); + } + } else { + if (ioctl(tty_fd, PPPIOCGUNIT, &x) < 0) { + if ( ! ok_error (errno)) + fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); + } + /* Check that we got the same unit again. */ + if (demand && x != ifunit) + fatal("transfer_ppp failed: wanted unit %d, got %d", ifunit, x); + ifunit = x; + } + /* * Enable debug in the driver if requested. */ if (!demand) - set_kdebugflag (kdebugflag); + set_kdebugflag (kdebugflag); - set_flags (get_flags() & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | - SC_RCV_EVNP | SC_RCV_ODDP)); + set_flags(tty_fd, get_flags(tty_fd) & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | + SC_RCV_EVNP | SC_RCV_ODDP)); SYSDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver", driver_version, driver_modification, driver_patch)); + /* * Fetch the initial file flags and reset blocking mode on the file. */ - initfdflags = fcntl(ppp_fd, F_GETFL); - + initfdflags = fcntl(tty_fd, F_GETFL); if (initfdflags == -1 || - fcntl(ppp_fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) - { + fcntl(tty_fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { if ( ! ok_error (errno)) - { - syslog(LOG_WARNING, - "Couldn't set device to non-blocking mode: %m"); - } - } - } + warn("Couldn't set device to non-blocking mode: %m"); + } + + return ppp_dev_fd; +} /******************************************************************** * @@ -436,43 +416,36 @@ void establish_ppp (int tty_fd) */ void disestablish_ppp(int tty_fd) - { +{ + if (!hungup) { /* - * Attempt to restore the previous tty settings + * Flush the tty output buffer so that the TIOCSETD doesn't hang. */ - if (!hungup) - { + if (tcflush(tty_fd, TCIOFLUSH) < 0) + warn("tcflush failed: %m"); /* * Restore the previous line discipline */ - if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0) - { + if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0) { if ( ! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl(TIOCSETD, N_TTY): %m"); - } - } + error("ioctl(TIOCSETD, N_TTY): %m"); + } - if (ioctl(tty_fd, TIOCNXCL, 0) < 0) - { + if (ioctl(tty_fd, TIOCNXCL, 0) < 0) { if ( ! ok_error (errno)) - { - syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m(%d)", errno); - } - } + warn("ioctl(TIOCNXCL): %m(%d)", errno); + } /* Reset non-blocking mode on fd. */ - if (initfdflags != -1 && fcntl(tty_fd, F_SETFL, initfdflags) < 0) - { + if (initfdflags != -1 && fcntl(tty_fd, F_SETFL, initfdflags) < 0) { if ( ! ok_error (errno)) - { - syslog (LOG_WARNING, - "Couldn't restore device fd flags: %m"); - } - } - } + warn("Couldn't restore device fd flags: %m"); + } + } initfdflags = -1; - } + if (new_style_driver) + set_ppp_fd(-1); +} /******************************************************************** * @@ -480,49 +453,38 @@ void disestablish_ppp(int tty_fd) * appropriate error messages. */ void clean_check(void) - { +{ int x; char *s; - if (still_ppp()) - { - if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) == 0) - { + if (still_ppp()) { + if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) == 0) { s = NULL; - switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP)) - { - case SC_RCV_B7_0: - case SC_RCV_B7_0 | SC_RCV_EVNP: - case SC_RCV_B7_0 | SC_RCV_ODDP: - case SC_RCV_B7_0 | SC_RCV_ODDP | SC_RCV_EVNP: + switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP)) { + case SC_RCV_B7_0: s = "all had bit 7 set to 1"; break; - case SC_RCV_B7_1: - case SC_RCV_B7_1 | SC_RCV_EVNP: - case SC_RCV_B7_1 | SC_RCV_ODDP: - case SC_RCV_B7_1 | SC_RCV_ODDP | SC_RCV_EVNP: + case SC_RCV_B7_1: s = "all had bit 7 set to 0"; break; - case SC_RCV_EVNP: + case SC_RCV_EVNP: s = "all had odd parity"; break; - case SC_RCV_ODDP: + case SC_RCV_ODDP: s = "all had even parity"; break; - } + } - if (s != NULL) - { - syslog(LOG_WARNING, "Receive serial link is not" - " 8-bit clean:"); - syslog(LOG_WARNING, "Problem: %s", s); - } - } - } - } + if (s != NULL) { + warn("Receive serial link is not 8-bit clean:"); + warn("Problem: %s", s); + } + } + } +} /* @@ -613,22 +575,18 @@ struct speed { */ static int translate_speed (int bps) - { +{ struct speed *speedp; - if (bps != 0) - { - for (speedp = speeds; speedp->speed_int; speedp++) - { + if (bps != 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); - } + } + warn("speed %d not supported", bps); + } return 0; - } +} /******************************************************************** * @@ -636,21 +594,17 @@ static int translate_speed (int bps) */ static int baud_rate_of (int speed) - { +{ struct speed *speedp; - if (speed != 0) - { - for (speedp = speeds; speedp->speed_int; speedp++) - { + if (speed != 0) { + for (speedp = speeds; speedp->speed_int; speedp++) { if (speed == speedp->speed_val) - { return speedp->speed_int; - } - } - } + } + } return 0; - } +} /******************************************************************** * @@ -660,21 +614,19 @@ static int baud_rate_of (int speed) */ void set_up_tty(int tty_fd, int local) - { +{ int speed; struct termios tios; setdtr(tty_fd, 1); - if (tcgetattr(tty_fd, &tios) < 0) - { - syslog(LOG_ERR, "tcgetattr: %m(%d)", errno); - die(1); - } + if (tcgetattr(tty_fd, &tios) < 0) { + if (!ok_error(errno)) + fatal("tcgetattr: %m(%d)", errno); + return; + } if (!restore_term) - { inittermios = tios; - } tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); tios.c_cflag |= CS8 | CREAD | HUPCL; @@ -686,12 +638,9 @@ void set_up_tty(int tty_fd, int local) tios.c_cc[VTIME] = 0; if (local || !modem) - { tios.c_cflag ^= (CLOCAL | HUPCL); - } - switch (crtscts) - { + switch (crtscts) { case 1: tios.c_cflag |= CRTSCTS; break; @@ -708,45 +657,29 @@ void set_up_tty(int tty_fd, int local) default: break; - } + } speed = translate_speed(inspeed); - if (speed) - { + if (speed) { cfsetospeed (&tios, speed); cfsetispeed (&tios, speed); - } + } /* * We can't proceed if the serial port speed is B0, * since that implies that the serial port is disabled. */ - else - { + else { speed = cfgetospeed(&tios); if (speed == B0) - { - syslog(LOG_ERR, "Baud rate for %s is 0; need explicit baud rate", - devnam); - die (1); - } - } + fatal("Baud rate for %s is 0; need explicit baud rate", devnam); + } if (tcsetattr(tty_fd, TCSAFLUSH, &tios) < 0) - { - syslog(LOG_ERR, "tcsetattr: %m"); - die(1); - } + if (!ok_error(errno)) + fatal("tcsetattr: %m"); baud_rate = baud_rate_of(speed); - restore_term = TRUE; - } - -/* - * hangup_modem - hang up the modem by clearing DTR. - */ -void hangup_modem(int ttyfd) -{ - setdtr(ttyfd, 0); + restore_term = 1; } /******************************************************************** @@ -756,11 +689,11 @@ void hangup_modem(int ttyfd) */ void setdtr (int tty_fd, int on) - { +{ int modembits = TIOCM_DTR; ioctl(tty_fd, (on ? TIOCMBIS : TIOCMBIC), &modembits); - } +} /******************************************************************** * @@ -768,9 +701,8 @@ void setdtr (int tty_fd, int on) */ void restore_tty (int tty_fd) - { - if (restore_term) - { +{ + if (restore_term) { restore_term = 0; /* * Turn off echoing, because otherwise we can get into @@ -779,19 +711,14 @@ void restore_tty (int tty_fd) * when we close it, it will revert to its defaults anyway. */ if (!default_device) - { inittermios.c_lflag &= ~(ECHO | ECHONL); - } - if (tcsetattr(tty_fd, TCSAFLUSH, &inittermios) < 0) - { + if (tcsetattr(tty_fd, TCSAFLUSH, &inittermios) < 0) { if (! ok_error (errno)) - { - syslog(LOG_WARNING, "tcsetattr: %m"); - } - } - } - } + warn("tcsetattr: %m"); + } + } +} /******************************************************************** * @@ -799,110 +726,85 @@ void restore_tty (int tty_fd) */ void output (int unit, unsigned char *p, int len) - { +{ if (debug) - { - log_packet(p, len, "sent ", LOG_DEBUG); - } - - if (write(ppp_fd, p, len) < 0) - { + dbglog("sent %P", p, len); + + if (len < PPP_HDRLEN) + return; + if (new_style_driver) { + p += 2; + len -= 2; + } + if (write(ppp_dev_fd, p, len) < 0) { if (errno == EWOULDBLOCK || errno == ENOBUFS || errno == ENXIO || errno == EIO || errno == EINTR) - { - syslog(LOG_WARNING, "write: warning: %m (%d)", errno); - } + warn("write: warning: %m (%d)", errno); else - { - syslog(LOG_ERR, "write: %m (%d)", errno); - } - } - } + error("write: %m (%d)", errno); + } +} /******************************************************************** * - * wait_input - wait until there is data available on ppp_fd, + * wait_input - wait until there is data available, * for the length of time specified by *timo (indefinite * if timo is NULL). */ -void wait_input (struct timeval *timo) - { +void wait_input(struct timeval *timo) +{ fd_set ready; int n; - - FD_ZERO(&ready); - FD_SET(ppp_fd, &ready); - n = select(ppp_fd + 1, &ready, NULL, &ready, timo); + ready = in_fds; + n = select(max_in_fd + 1, &ready, NULL, &ready, timo); if (n < 0 && errno != EINTR) - { - syslog(LOG_ERR, "select: %m(%d)", errno); - die(1); - } - } + fatal("select: %m(%d)", errno); +} -/******************************************************************** - * - * wait_loop_output - wait until there is data available on the - * loopback, for the length of time specified by *timo (indefinite - * if timo is NULL). +/* + * add_fd - add an fd to the set that wait_input waits for. */ -void wait_loop_output(timo) - struct timeval *timo; - { - fd_set ready; - int n; - - FD_ZERO(&ready); - FD_SET(master_fd, &ready); - n = select(master_fd + 1, &ready, NULL, &ready, timo); - if (n < 0 && errno != EINTR) - { - syslog(LOG_ERR, "select: %m(%d)", errno); - die(1); - } - } +void add_fd(int fd) +{ + FD_SET(fd, &in_fds); + if (fd > max_in_fd) + max_in_fd = fd; +} -/******************************************************************** - * - * wait_time - wait for a given length of time or until a - * signal is received. +/* + * remove_fd - remove an fd from the set that wait_input waits for. */ - -void wait_time(timo) - struct timeval *timo; +void remove_fd(int fd) { - int n; - - n = select(0, NULL, NULL, NULL, timo); - if (n < 0 && errno != EINTR) { - syslog(LOG_ERR, "select: %m(%d)", errno); - die(1); - } + FD_CLR(fd, &in_fds); } + /******************************************************************** * * read_packet - get a PPP packet from the serial device. */ int read_packet (unsigned char *buf) - { +{ int len; - - len = read(ppp_fd, buf, PPP_MTU + PPP_HDRLEN); - if (len < 0) - { - if (errno == EWOULDBLOCK) - { + + len = PPP_MRU + PPP_HDRLEN; + if (new_style_driver) { + *buf++ = PPP_ALLSTATIONS; + *buf++ = PPP_UI; + len -= 2; + } + len = read(ppp_dev_fd, buf, len); + if (len < 0) { + if (errno == EWOULDBLOCK || errno == EIO) return -1; - } - syslog(LOG_ERR, "read: %m(%d)", errno); - die(1); - } - return len; - } + fatal("read: %m(%d)", errno); + } + return new_style_driver? len+2: len; +} /******************************************************************** * @@ -912,33 +814,29 @@ int read_packet (unsigned char *buf) */ int get_loop_output(void) - { +{ int rv = 0; - int n = read(master_fd, inbuf, sizeof(inbuf)); + int n; + + if (new_style_driver) { + while ((n = read_packet(inpacket_buf)) > 0) + if (loop_frame(inpacket_buf, n)) + rv = 1; + return rv; + } - while (n > 0) - { + while ((n = read(master_fd, inbuf, sizeof(inbuf))) > 0) if (loop_chars(inbuf, n)) - { rv = 1; - } - n = read(master_fd, inbuf, sizeof(inbuf)); - } if (n == 0) - { - syslog(LOG_ERR, "eof on loopback"); - die(1); - } + fatal("eof on loopback"); if (errno != EWOULDBLOCK) - { - syslog(LOG_ERR, "read from loopback: %m(%d)", errno); - die(1); - } - + fatal("read from loopback: %m(%d)", errno); + return rv; - } +} /******************************************************************** * @@ -947,42 +845,36 @@ get_loop_output(void) */ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) - { +{ u_int x; struct ifreq ifr; SYSDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu)); -/* - * Ensure that the link is still up. - */ - if (still_ppp()) - { /* * Set the MTU and other parameters for the ppp device */ - memset (&ifr, '\0', sizeof (ifr)); - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - ifr.ifr_mtu = mtu; + memset (&ifr, '\0', sizeof (ifr)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + ifr.ifr_mtu = mtu; - if (ioctl(sock_fd, SIOCSIFMTU, (caddr_t) &ifr) < 0) - { - syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m(%d)", errno); - quit(); - } + if (ioctl(sock_fd, SIOCSIFMTU, (caddr_t) &ifr) < 0) + fatal("ioctl(SIOCSIFMTU): %m(%d)", errno); - SYSDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); - if (ioctl(ppp_fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) - { - syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m(%d)", errno); - quit(); - } + if (!still_ppp()) + return; + SYSDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); + if (ioctl(ppp_fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) { + if (!ok_error(errno)) + fatal("ioctl(PPPIOCSASYNCMAP): %m(%d)", errno); + return; + } - x = get_flags(); - x = pcomp ? x | SC_COMP_PROT : x & ~SC_COMP_PROT; - x = accomp ? x | SC_COMP_AC : x & ~SC_COMP_AC; - set_flags(x); - } - } + x = get_flags(ppp_fd); + x = pcomp ? x | SC_COMP_PROT : x & ~SC_COMP_PROT; + x = accomp ? x | SC_COMP_AC : x & ~SC_COMP_AC; + x = sync_serial ? x | SC_SYNC : x & ~SC_SYNC; + set_flags(ppp_fd, x); +} /******************************************************************** * @@ -990,18 +882,17 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) */ void ppp_set_xaccm (int unit, ext_accm accm) - { +{ SYSDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n", accm[0], accm[1], accm[2], accm[3])); - if (ioctl(ppp_fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) - { + if (!still_ppp()) + return; + if (ioctl(ppp_fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) { if ( ! ok_error (errno)) - { - syslog(LOG_WARNING, "ioctl(set extended ACCM): %m(%d)", errno); - } - } - } + warn("ioctl(set extended ACCM): %m(%d)", errno); + } +} /******************************************************************** * @@ -1010,40 +901,30 @@ void ppp_set_xaccm (int unit, ext_accm accm) */ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) - { - u_int x; - +{ SYSDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru)); /* * If we were called because the link has gone down then there is nothing * which may be done. Just return without incident. */ if (!still_ppp()) - { return; - } /* * Set the receiver parameters */ - if (ioctl(ppp_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) - { + if (ioctl(ppp_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) { if ( ! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m(%d)", errno); - } - } + error("ioctl(PPPIOCSMRU): %m(%d)", errno); + } + if (new_style_driver && ioctl(ppp_dev_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) + error("Couldn't set MRU in generic PPP layer: %m"); SYSDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap)); - if (ioctl(ppp_fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) - { - syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m(%d)", errno); - quit(); - } - - x = get_flags(); - x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC; - set_flags (x); - } + if (ioctl(ppp_fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) { + if (!ok_error(errno)) + error("ioctl(PPPIOCSRASYNCMAP): %m(%d)", errno); + } +} /******************************************************************** * @@ -1052,7 +933,7 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) */ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) - { +{ struct ppp_option_data data; memset (&data, '\0', sizeof (data)); @@ -1060,13 +941,11 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) data.length = opt_len; data.transmit = for_transmit; - if (ioctl(ppp_fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) - { + if (ioctl(ppp_dev_fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) return 1; - } return (errno == ENOBUFS)? 0: -1; - } +} /******************************************************************** * @@ -1074,15 +953,14 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) */ void ccp_flags_set (int unit, int isopen, int isup) - { - if (still_ppp()) - { - int x = get_flags(); +{ + if (still_ppp()) { + int x = get_flags(ppp_dev_fd); x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN; x = isup? x | SC_CCP_UP : x &~ SC_CCP_UP; - set_flags (x); - } - } + set_flags (ppp_dev_fd, x); + } +} /******************************************************************** * @@ -1093,9 +971,33 @@ get_idle_time(u, ip) int u; struct ppp_idle *ip; { - return ioctl(ppp_fd, PPPIOCGIDLE, ip) >= 0; + return ioctl(ppp_dev_fd, PPPIOCGIDLE, ip) >= 0; } +/******************************************************************** + * + * get_ppp_stats - return statistics for the link. + */ +int +get_ppp_stats(u, stats) + int u; + struct pppd_stats *stats; +{ + struct ifpppstatsreq req; + + memset (&req, 0, sizeof (req)); + + req.stats_ptr = (caddr_t) &req.stats; + strlcpy(req.ifr__name, ifname, sizeof(req.ifr__name)); + if (ioctl(sock_fd, SIOCGPPPSTATS, &req) < 0) { + error("Couldn't get PPP statistics: %m"); + return 0; + } + stats->bytes_in = req.stats.p.ppp_ibytes; + stats->bytes_out = req.stats.p.ppp_obytes; + return 1; +} + /******************************************************************** * * ccp_fatal_error - returns 1 if decompression was disabled as a @@ -1105,7 +1007,7 @@ get_idle_time(u, ip) int ccp_fatal_error (int unit) { - int x = get_flags(); + int x = get_flags(ppp_dev_fd); return x & SC_DC_FERROR; } @@ -1130,7 +1032,7 @@ static int read_route_table (struct rtentry *rt); * path_to_procfs - find the path to the proc file system mount point */ -static int path_to_procfs (void) +static int path_to_procfs (const char *tail) { struct mntent *mntent; FILE *fp; @@ -1138,7 +1040,8 @@ static int path_to_procfs (void) fp = fopen(MOUNTED, "r"); if (fp == NULL) { /* Default the mount location of /proc */ - strncpy (route_buffer, "/proc", sizeof (route_buffer)-10); + strlcpy (route_buffer, "/proc", sizeof (route_buffer)); + strlcat (route_buffer, tail, sizeof(route_buffer)); return 1; } @@ -1152,8 +1055,8 @@ static int path_to_procfs (void) if (mntent == 0) return 0; - strncpy(route_buffer, mntent->mnt_dir, sizeof (route_buffer)-10); - route_buffer [sizeof (route_buffer)-10] = '\0'; + strlcpy(route_buffer, mntent->mnt_dir, sizeof (route_buffer)); + strlcat (route_buffer, tail, sizeof(route_buffer)); return 1; } @@ -1164,11 +1067,10 @@ static int path_to_procfs (void) static char *path_to_route (void) { - if (!path_to_procfs()) { - syslog (LOG_ERR, "proc file system not mounted"); + if (!path_to_procfs("/net/route")) { + error("proc file system not mounted"); return 0; } - strcat (route_buffer, "/net/route"); return (route_buffer); } @@ -1203,7 +1105,7 @@ static int open_route_table (void) route_fd = fopen (path, "r"); if (route_fd == NULL) { - syslog (LOG_ERR, "can't open %s: %m (%d)", path, errno); + error("can't open %s: %m (%d)", path, errno); return 0; } @@ -1263,6 +1165,7 @@ static int read_route_table(struct rtentry *rt) cols[col] = strtok(p, route_delims); if (cols[col] == NULL) return 0; /* didn't get enough columns */ + p = NULL; } ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr = @@ -1308,7 +1211,10 @@ static int defaultroute_exists (struct rtentry *rt) /* * have_route_to - determine if the system has any route to - * a given IP address. + * a given IP address. `addr' is in network byte order. + * Return value is 1 if yes, 0 if no, -1 if don't know. + * For demand mode to work properly, we have to ignore routes + * through our own interface. */ int have_route_to(u_int32_t addr) { @@ -1319,10 +1225,10 @@ int have_route_to(u_int32_t addr) return -1; /* don't know */ while (read_route_table(&rt)) { - if ((rt.rt_flags & RTF_UP) == 0) + if ((rt.rt_flags & RTF_UP) == 0 || strcmp(rt.rt_dev, ifname) == 0) continue; if ((addr & ((struct sockaddr_in *)&rt.rt_genmask)->sin_addr.s_addr) - == ((struct sockaddr_in *)&rt.rt_genmask)->sin_addr.s_addr) { + == ((struct sockaddr_in *)&rt.rt_dst)->sin_addr.s_addr) { result = 1; break; } @@ -1338,47 +1244,40 @@ int have_route_to(u_int32_t addr) */ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) - { +{ struct rtentry rt; - if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) - { + if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { struct in_addr old_gateway = ((struct sockaddr_in *) (&rt.rt_gateway))-> sin_addr; if (old_gateway.s_addr != gateway) - { - syslog (LOG_ERR, - "not replacing existing default route to %s [%s]", - rt.rt_dev, inet_ntoa (old_gateway)); - } + error("not replacing existing default route to %s [%I]", + rt.rt_dev, old_gateway); return 0; - } + } memset (&rt, '\0', sizeof (rt)); SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); if (kernel_version > KVERSION(2,1,0)) { - SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; } ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT; - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) - { + if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { if ( ! ok_error ( errno )) - { - syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m(%d)", errno); - } + error("default route ioctl(SIOCADDRT): %m(%d)", errno); return 0; - } + } default_route_gateway = gateway; return 1; - } +} /******************************************************************** * @@ -1386,7 +1285,7 @@ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) */ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) - { +{ struct rtentry rt; default_route_gateway = 0; @@ -1396,28 +1295,23 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) SET_SA_FAMILY (rt.rt_gateway, AF_INET); if (kernel_version > KVERSION(2,1,0)) { - SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; } ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT; - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) - { - if (still_ppp()) - { + if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { + if (still_ppp()) { if ( ! ok_error ( errno )) - { - syslog (LOG_ERR, - "default route ioctl(SIOCDELRT): %m(%d)", errno); - } + error("default route ioctl(SIOCDELRT): %m (%d)", errno); return 0; - } - } + } + } return 1; - } +} /******************************************************************** * @@ -1425,11 +1319,10 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) */ int sifproxyarp (int unit, u_int32_t his_adr) - { +{ struct arpreq arpreq; - if (has_proxy_arp == 0) - { + if (has_proxy_arp == 0) { memset (&arpreq, '\0', sizeof(arpreq)); SET_SA_FAMILY(arpreq.arp_pa, AF_INET); @@ -1439,26 +1332,24 @@ int sifproxyarp (int unit, u_int32_t his_adr) * Get the hardware address of an interface on the same subnet * as our local address. */ - if (!get_ether_addr(his_adr, &arpreq.arp_ha, arpreq.arp_dev)) - { - syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); + if (!get_ether_addr(his_adr, &arpreq.arp_ha, proxy_arp_dev, + sizeof(proxy_arp_dev))) { + error("Cannot determine ethernet address for proxy ARP"); return 0; - } - - if (ioctl(sock_fd, SIOCSARP, (caddr_t)&arpreq) < 0) - { + } + strlcpy(arpreq.arp_dev, proxy_arp_dev, sizeof(arpreq.arp_dev)); + + if (ioctl(sock_fd, SIOCSARP, (caddr_t)&arpreq) < 0) { if ( ! ok_error ( errno )) - { - syslog(LOG_ERR, "ioctl(SIOCSARP): %m(%d)", errno); - } + error("ioctl(SIOCSARP): %m(%d)", errno); return 0; - } - } + } + proxy_arp_addr = his_adr; + has_proxy_arp = 1; + } - proxy_arp_addr = his_adr; - has_proxy_arp = 1; return 1; - } +} /******************************************************************** * @@ -1466,28 +1357,25 @@ int sifproxyarp (int unit, u_int32_t his_adr) */ int cifproxyarp (int unit, u_int32_t his_adr) - { +{ struct arpreq arpreq; - if (has_proxy_arp == 1) - { + if (has_proxy_arp) { + has_proxy_arp = 0; memset (&arpreq, '\0', sizeof(arpreq)); SET_SA_FAMILY(arpreq.arp_pa, AF_INET); ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; + strlcpy(arpreq.arp_dev, proxy_arp_dev, sizeof(arpreq.arp_dev)); - if (ioctl(sock_fd, SIOCDARP, (caddr_t)&arpreq) < 0) - { + if (ioctl(sock_fd, SIOCDARP, (caddr_t)&arpreq) < 0) { if ( ! ok_error ( errno )) - { - syslog(LOG_WARNING, "ioctl(SIOCDARP): %m(%d)", errno); - } + warn("ioctl(SIOCDARP): %m(%d)", errno); return 0; - } - } - has_proxy_arp = 0; + } + } return 1; - } +} /******************************************************************** * @@ -1497,24 +1385,22 @@ int cifproxyarp (int unit, u_int32_t his_adr) static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr, - char *name) - { + char *name, int namelen) +{ struct ifreq *ifr, *ifend; u_int32_t ina, mask; + char *aliasp; struct ifreq ifreq; struct ifconf ifc; struct ifreq ifs[MAX_IFS]; ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; - if (ioctl(sock_fd, SIOCGIFCONF, &ifc) < 0) - { + if (ioctl(sock_fd, SIOCGIFCONF, &ifc) < 0) { if ( ! ok_error ( errno )) - { - syslog(LOG_ERR, "ioctl(SIOCGIFCONF): %m(%d)", errno); - } + error("ioctl(SIOCGIFCONF): %m(%d)", errno); return 0; - } + } SYSDEBUG ((LOG_DEBUG, "proxy arp: scanning %d interfaces for IP %s", ifc.ifc_len / sizeof(struct ifreq), ip_ntoa(ipaddr))); @@ -1523,12 +1409,10 @@ static int get_ether_addr (u_int32_t ipaddr, * address on the same subnet as `ipaddr'. */ ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq)); - for (ifr = ifc.ifc_req; ifr < ifend; ifr++) - { - if (ifr->ifr_addr.sa_family == AF_INET) - { + for (ifr = ifc.ifc_req; ifr < ifend; ifr++) { + if (ifr->ifr_addr.sa_family == AF_INET) { ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; - strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); + strlcpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); SYSDEBUG ((LOG_DEBUG, "proxy arp: examining interface %s", ifreq.ifr_name)); /* @@ -1536,50 +1420,45 @@ static int get_ether_addr (u_int32_t ipaddr, * nor loopback. */ if (ioctl(sock_fd, SIOCGIFFLAGS, &ifreq) < 0) - { continue; - } if (((ifreq.ifr_flags ^ FLAGS_GOOD) & FLAGS_MASK) != 0) - { continue; - } /* * Get its netmask and check that it's on the right subnet. */ if (ioctl(sock_fd, SIOCGIFNETMASK, &ifreq) < 0) - { continue; - } mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr; SYSDEBUG ((LOG_DEBUG, "proxy arp: interface addr %s mask %lx", ip_ntoa(ina), ntohl(mask))); if (((ipaddr ^ ina) & mask) != 0) - { continue; - } break; - } - } + } + } if (ifr >= ifend) - { return 0; - } - memcpy (name, ifreq.ifr_name, sizeof(ifreq.ifr_name)); - syslog(LOG_INFO, "found interface %s for proxy arp", name); + strlcpy(name, ifreq.ifr_name, namelen); + + /* trim off the :1 in eth0:1 */ + aliasp = strchr(name, ':'); + if (aliasp != 0) + *aliasp = 0; + + info("found interface %s for proxy arp", name); /* * Now get the hardware address. */ memset (&ifreq.ifr_hwaddr, 0, sizeof (struct sockaddr)); - if (ioctl (sock_fd, SIOCGIFHWADDR, &ifreq) < 0) - { - syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m(%d)", ifreq.ifr_name, errno); + if (ioctl (sock_fd, SIOCGIFHWADDR, &ifreq) < 0) { + error("SIOCGIFHWADDR(%s): %m(%d)", ifreq.ifr_name, errno); return 0; - } + } memcpy (hwaddr, &ifreq.ifr_hwaddr, @@ -1596,7 +1475,7 @@ static int get_ether_addr (u_int32_t ipaddr, (int) ((unsigned char *) &hwaddr->sa_data)[6], (int) ((unsigned char *) &hwaddr->sa_data)[7])); return 1; - } +} /******************************************************************** * @@ -1609,7 +1488,7 @@ static int get_ether_addr (u_int32_t ipaddr, */ u_int32_t GetMask (u_int32_t addr) - { +{ u_int32_t mask, nmask, ina; struct ifreq *ifr, *ifend, ifreq; struct ifconf ifc; @@ -1618,20 +1497,11 @@ u_int32_t GetMask (u_int32_t addr) addr = ntohl(addr); if (IN_CLASSA(addr)) /* determine network mask for address class */ - { nmask = IN_CLASSA_NET; - } - else - { - if (IN_CLASSB(addr)) - { + else if (IN_CLASSB(addr)) nmask = IN_CLASSB_NET; - } - else - { + else nmask = IN_CLASSC_NET; - } - } /* class D nets are disallowed by bad_ip_adrs */ mask = netmask | htonl(nmask); @@ -1640,55 +1510,41 @@ u_int32_t GetMask (u_int32_t addr) */ ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; - if (ioctl(sock_fd, SIOCGIFCONF, &ifc) < 0) - { + if (ioctl(sock_fd, SIOCGIFCONF, &ifc) < 0) { if ( ! ok_error ( errno )) - { - syslog(LOG_WARNING, "ioctl(SIOCGIFCONF): %m(%d)", errno); - } + warn("ioctl(SIOCGIFCONF): %m(%d)", errno); return mask; - } + } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); - for (ifr = ifc.ifc_req; ifr < ifend; ifr++) - { + for (ifr = ifc.ifc_req; ifr < ifend; ifr++) { /* * Check the interface's internet address. */ if (ifr->ifr_addr.sa_family != AF_INET) - { continue; - } ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr; if (((ntohl(ina) ^ addr) & nmask) != 0) - { continue; - } /* * Check that the interface is up, and not point-to-point nor loopback. */ - strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); + strlcpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); if (ioctl(sock_fd, SIOCGIFFLAGS, &ifreq) < 0) - { continue; - } if (((ifreq.ifr_flags ^ FLAGS_GOOD) & FLAGS_MASK) != 0) - { continue; - } /* * Get its netmask and OR it into our mask. */ if (ioctl(sock_fd, SIOCGIFNETMASK, &ifreq) < 0) - { continue; - } mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr; break; - } + } return mask; - } +} /******************************************************************** * @@ -1697,87 +1553,64 @@ u_int32_t GetMask (u_int32_t addr) static void decode_version (char *buf, int *version, int *modification, int *patch) - { +{ *version = (int) strtoul (buf, &buf, 10); *modification = 0; *patch = 0; - if (*buf == '.') - { + if (*buf == '.') { ++buf; *modification = (int) strtoul (buf, &buf, 10); - if (*buf == '.') - { + if (*buf == '.') { ++buf; *patch = (int) strtoul (buf, &buf, 10); - } - } + } + } - if (*buf != '\0') - { + if (*buf != '\0') { *version = *modification = *patch = 0; - } - } + } +} /******************************************************************** * * Procedure to determine if the PPP line discipline is registered. */ -int +static int ppp_registered(void) - { +{ int local_fd; - int init_disc = -1; - int initfdflags; - - local_fd = open(devnam, O_NONBLOCK | O_RDWR, 0); - if (local_fd < 0) - { - syslog(LOG_ERR, "Failed to open %s: %m(%d)", devnam, errno); - return 0; - } - - initfdflags = fcntl(local_fd, F_GETFL); - if (initfdflags == -1) - { - syslog(LOG_ERR, "Couldn't get device fd flags: %m(%d)", errno); - close (local_fd); + int mfd = -1; + int ret = 0; + char slave[16]; + + /* + * We used to open the serial device and set it to the ppp line + * discipline here, in order to create a ppp unit. But that is + * not a good idea - the user might have specified a device that + * they can't open (permission, or maybe it doesn't really exist). + * So we grab a pty master/slave pair and use that. + */ + if (!get_pty(&mfd, &local_fd, slave, 0)) { + no_ppp_msg = "Couldn't determine if PPP is supported (no free ptys)"; return 0; - } + } - initfdflags &= ~O_NONBLOCK; - fcntl(local_fd, F_SETFL, initfdflags); -/* - * Read the initial line dicipline and try to put the device into the - * PPP dicipline. - */ - if (ioctl(local_fd, TIOCGETD, &init_disc) < 0) - { - syslog(LOG_ERR, "ioctl(TIOCGETD): %m(%d)", errno); - close (local_fd); - return 0; - } - - if (ioctl(local_fd, TIOCSETD, &ppp_disc) < 0) - { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m(%d)", errno); - close (local_fd); - return 0; - } - - if (ioctl(local_fd, TIOCSETD, &init_disc) < 0) - { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m(%d)", errno); - close (local_fd); - return 0; - } + /* + * Try to put the device into the PPP discipline. + */ + if (ioctl(local_fd, TIOCSETD, &ppp_disc) < 0) { + error("ioctl(TIOCSETD(PPP)): %m(%d)", errno); + } else + ret = 1; - close (local_fd); - return 1; - } + close(local_fd); + close(mfd); + return ret; +} /******************************************************************** * @@ -1787,32 +1620,61 @@ ppp_registered(void) int ppp_available(void) { - int s, ok; + int s, ok, fd; struct ifreq ifr; int size; int my_version, my_modification, my_patch; - extern char *no_ppp_msg; + + no_ppp_msg = + "This system lacks kernel support for PPP. This could be because\n" + "the PPP kernel module could not be loaded, or because PPP was not\n" + "included in the kernel configuration. If PPP was included as a\n" + "module, try `/sbin/modprobe -v ppp'. If that fails, check that\n" + "ppp.o exists in /lib/modules/`uname -r`/net.\n" + "See README.linux file in the ppp distribution for more details.\n"; + + fd = open("/dev/ppp", O_RDWR); + if (fd < 0 && errno == ENOENT) { + /* try making it and see if that helps. */ + if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR, + makedev(108, 0)) >= 0) { + fd = open("/dev/ppp", O_RDWR); + if (fd >= 0) + info("Created /dev/ppp device node"); + else + unlink("/dev/ppp"); /* didn't work, undo the mknod */ + } else if (errno == EEXIST) { + fd = open("/dev/ppp", O_RDWR); + } + } + if (fd >= 0) { + new_style_driver = 1; + + /* XXX should get from driver */ + driver_version = 2; + driver_modification = 4; + driver_patch = 0; + close(fd); + return 1; + } + /* * Open a socket for doing the ioctl operations. */ s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) - { return 0; - } - strncpy (ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name)); + strlcpy (ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name)); ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0; /* * If the device did not exist then attempt to create one by putting the * current tty into the PPP discipline. If this works then obtain the * flags for the device again. */ - if (!ok) - { - if (ppp_registered()) - { - strncpy (ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name)); + if (!ok) { + if (ppp_registered()) { + strlcpy (ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name)); ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0; } } @@ -1820,35 +1682,22 @@ int ppp_available(void) * Ensure that the hardware address is for PPP and not something else */ if (ok) - { ok = ioctl (s, SIOCGIFHWADDR, (caddr_t) &ifr) >= 0; - } if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) - { ok = 0; - } - if (!ok) - { - no_ppp_msg = - "This system lacks kernel support for PPP. This could be because\n" - "the PPP kernel module is not loaded, or because the kernel is\n" - "not configured for PPP. See the README.linux file in the\n" - "ppp-2.3.6 distribution.\n"; - } /* * This is the PPP device. Validate the version of the driver at this * point to ensure that this program will work with the driver. */ - else - { + if (ok) { char abBuffer [1024]; ifr.ifr_data = abBuffer; size = ioctl (s, SIOCGPPPVER, (caddr_t) &ifr); if (size < 0) { - syslog(LOG_ERR, "Couldn't read driver version: %m"); + error("Couldn't read driver version: %m"); ok = 0; no_ppp_msg = "Sorry, couldn't verify kernel driver version\n"; @@ -1867,13 +1716,10 @@ int ppp_available(void) /* The version numbers must match */ if (driver_version != my_version) - { ok = 0; - } /* The modification levels must be legal */ - if (driver_modification < 3) - { + if (driver_modification < 3) { if (driver_modification >= 2) { /* we can cope with 2.2.0 and above */ driver_is_old = 1; @@ -1883,9 +1729,8 @@ int ppp_available(void) } close (s); - if (!ok) - { - sprintf (route_buffer, + if (!ok) { + slprintf(route_buffer, sizeof(route_buffer), "Sorry - PPP driver version %d.%d.%d is out of date\n", driver_version, driver_modification, driver_patch); @@ -1902,10 +1747,13 @@ int ppp_available(void) */ void logwtmp (const char *line, const char *name, const char *host) - { - int wtmp; +{ struct utmp ut, *utp; pid_t mypid = getpid(); +#if __GLIBC__ < 2 + int wtmp; +#endif + /* * Update the signon database for users. * Christoph Lameter: Copied from poeigl-1.36 Jan 3, 1996 @@ -1919,19 +1767,13 @@ void logwtmp (const char *line, const char *name, const char *host) endutent(); if (utp) - { memcpy(&ut, utp, sizeof(ut)); - } else - { /* some gettys/telnetds don't initialize utmp... */ memset(&ut, 0, sizeof(ut)); - } if (ut.ut_id[0] == 0) - { strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id)); - } strncpy(ut.ut_user, name, sizeof(ut.ut_user)); strncpy(ut.ut_line, line, sizeof(ut.ut_line)); @@ -1943,227 +1785,63 @@ void logwtmp (const char *line, const char *name, const char *host) /* Insert the host name if one is supplied */ if (*host) - { strncpy (ut.ut_host, host, sizeof(ut.ut_host)); - } /* Insert the IP address of the remote system if IP is enabled */ if (ipcp_protent.enabled_flag && ipcp_hisoptions[0].neg_addr) - { - memcpy (&ut.ut_addr, (char *) &ipcp_hisoptions[0].hisaddr, + memcpy(&ut.ut_addr, (char *) &ipcp_hisoptions[0].hisaddr, sizeof(ut.ut_addr)); - } /* CL: Makes sure that the logout works */ if (*host == 0 && *name==0) - { ut.ut_host[0]=0; - } pututline(&ut); endutent(); /* * Update the wtmp file. */ +#if __GLIBC__ >= 2 + updwtmp(_PATH_WTMP, &ut); +#else wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY); - if (wtmp >= 0) - { + if (wtmp >= 0) { flock(wtmp, LOCK_EX); - /* we really should check for error on the write for a full disk! */ - write (wtmp, (char *)&ut, sizeof(ut)); - close (wtmp); + if (write (wtmp, (char *)&ut, sizeof(ut)) != sizeof(ut)) + warn("error writing %s: %m", _PATH_WTMP); flock(wtmp, LOCK_UN); - } - } - -/******************************************************************** - * Code for locking/unlocking the serial device. - * This code is derived from chat.c. - */ - -/* - * lock - create a lock file for the named device - */ - -int lock (char *dev) - { -#ifdef LOCKLIB - int result; - lock_file = malloc(strlen(dev) + 1); - if (lock_file == NULL) - { - novm("lock file name"); - } - strcpy (lock_file, dev); - result = mklock (dev, (void *) 0); - - if (result > 0) - { - syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, result); - free (lock_file); - lock_file = NULL; - result = -1; - } - else - { - if (result < 0) - { - syslog (LOG_ERR, "Can't create lock file %s", lock_file); - free (lock_file); - lock_file = NULL; - result = -1; - } - } - return (result); -#else - char hdb_lock_buffer[12]; - int fd, n; - int pid = getpid(); - char *p; - - p = strrchr(dev, '/'); - if (p != NULL) - { - dev = ++p; - } - - lock_file = malloc(strlen(LOCK_PREFIX) + strlen(dev) + 1); - if (lock_file == NULL) - { - novm("lock file name"); - } - - strcpy (lock_file, LOCK_PREFIX); - strcat (lock_file, dev); -/* - * Attempt to create the lock file at this point. - */ - while (1) - { - fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644); - if (fd >= 0) - { - pid = getpid(); -#ifndef PID_BINARY - sprintf (hdb_lock_buffer, "%010d\n", pid); - write (fd, hdb_lock_buffer, 11); -#else - write(fd, &pid, sizeof (pid)); -#endif - close(fd); - return 0; - } -/* - * If the file exists then check to see if the pid is stale - */ - if (errno == EEXIST) - { - fd = open(lock_file, O_RDONLY, 0); - if (fd < 0) - { - if (errno == ENOENT) /* This is just a timing problem. */ - { - continue; - } - break; - } - - /* Read the lock file to find out who has the device locked */ - n = read (fd, hdb_lock_buffer, 11); - close (fd); - if (n < 0) - { - syslog(LOG_ERR, "Can't read pid from lock file %s", lock_file); - break; - } - - /* See the process still exists. */ - if (n > 0) - { -#ifndef PID_BINARY - hdb_lock_buffer[n] = '\0'; - sscanf (hdb_lock_buffer, " %d", &pid); -#else - pid = ((int *) hdb_lock_buffer)[0]; -#endif - if (pid == 0 || pid == getpid() - || (kill(pid, 0) == -1 && errno == ESRCH)) - { - n = 0; - } - } - - /* If the process does not exist then try to remove the lock */ - if (n == 0 && unlink (lock_file) == 0) - { - syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)", - dev, pid); - continue; - } - - syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, pid); - break; - } - syslog(LOG_ERR, "Can't create lock file %s: %m(%d)", lock_file, errno); - break; - } - - free(lock_file); - lock_file = NULL; - return -1; + close (wtmp); + } #endif } -/******************************************************************** - * - * unlock - remove our lockfile - */ - -void unlock(void) - { - if (lock_file) - { -#ifdef LOCKLIB - (void) rmlock (lock_file, (void *) 0); -#else - unlink(lock_file); -#endif - free(lock_file); - lock_file = NULL; - } - } - /******************************************************************** * * sifvjcomp - config tcp header compression */ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) - { - u_int x = get_flags(); +{ + u_int x = get_flags(ppp_dev_fd); - if (vjcomp) - { - if (ioctl (ppp_fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) - { + if (vjcomp) { + if (ioctl (ppp_dev_fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { if (! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(PPPIOCSMAXCID): %m(%d)", errno); - } + error("ioctl(PPPIOCSMAXCID): %m(%d)", errno); vjcomp = 0; - } - } + } + } x = vjcomp ? x | SC_COMP_TCP : x &~ SC_COMP_TCP; x = cidcomp ? x & ~SC_NO_TCP_CCID : x | SC_NO_TCP_CCID; - set_flags (x); + set_flags (ppp_dev_fd, x); return 1; - } +} /******************************************************************** * @@ -2171,32 +1849,26 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) */ int sifup (int u) - { +{ struct ifreq ifr; memset (&ifr, '\0', sizeof (ifr)); - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) - { + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + if (ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m(%d)", errno); - } + error("ioctl (SIOCGIFFLAGS): %m(%d)", errno); return 0; - } + } ifr.ifr_flags |= (IFF_UP | IFF_POINTOPOINT); - if (ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) - { + if (ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m(%d)", errno); - } + error("ioctl(SIOCSIFFLAGS): %m(%d)", errno); return 0; - } + } if_is_up = 1; return 1; - } +} /******************************************************************** * @@ -2204,34 +1876,28 @@ int sifup (int u) */ int sifdown (int u) - { +{ struct ifreq ifr; if_is_up = 0; memset (&ifr, '\0', sizeof (ifr)); - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) - { + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + if (ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m(%d)", errno); - } + error("ioctl (SIOCGIFFLAGS): %m(%d)", errno); return 0; - } + } ifr.ifr_flags &= ~IFF_UP; ifr.ifr_flags |= IFF_POINTOPOINT; - if (ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) - { + if (ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m(%d)", errno); - } + error("ioctl(SIOCSIFFLAGS): %m(%d)", errno); return 0; - } + } return 1; - } +} /******************************************************************** * @@ -2240,7 +1906,7 @@ int sifdown (int u) int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, u_int32_t net_mask) - { +{ struct ifreq ifr; struct rtentry rt; @@ -2251,84 +1917,69 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET); SET_SA_FAMILY (ifr.ifr_netmask, AF_INET); - strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); /* * Set our IP address */ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = our_adr; - if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) - { - if (errno != EEXIST) - { + if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { + if (errno != EEXIST) { if (! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCAIFADDR): %m(%d)", errno); - } - } - else - { - syslog (LOG_WARNING, "ioctl(SIOCAIFADDR): Address already exists"); - } + error("ioctl(SIOCSIFADDR): %m(%d)", errno); + } + else { + warn("ioctl(SIOCSIFADDR): Address already exists"); + } return (0); - } + } /* * Set the gateway address */ ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = his_adr; - if (ioctl(sock_fd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) - { + if (ioctl(sock_fd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m(%d)", errno); - } + error("ioctl(SIOCSIFDSTADDR): %m(%d)", errno); return (0); - } + } /* * Set the netmask. * For recent kernels, force the netmask to 255.255.255.255. */ if (kernel_version >= KVERSION(2,1,16)) - net_mask = ~0L; - if (net_mask != 0) - { + net_mask = ~0L; + if (net_mask != 0) { ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = net_mask; - if (ioctl(sock_fd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) - { + if (ioctl(sock_fd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCSIFNETMASK): %m(%d)", errno); - } + error("ioctl(SIOCSIFNETMASK): %m(%d)", errno); return (0); - } - } + } + } /* * Add the device route */ if (kernel_version < KVERSION(2,1,16)) { - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - rt.rt_dev = ifname; + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + rt.rt_dev = ifname; - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0L; - ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; - rt.rt_flags = RTF_UP | RTF_HOST; + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0L; + ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; + rt.rt_flags = RTF_UP | RTF_HOST; - if (kernel_version > KVERSION(2,1,0)) { - SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; - } - - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) - { - if (! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m(%d)", errno); - } - return (0); + if (kernel_version > KVERSION(2,1,0)) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; + } + + if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { + if (! ok_error (errno)) + error("ioctl(SIOCADDRT) device route: %m(%d)", errno); + return (0); } } return 1; - } +} /******************************************************************** * @@ -2337,118 +1988,163 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, */ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) - { +{ struct rtentry rt; if (kernel_version < KVERSION(2,1,16)) { /* * Delete the route through the device */ - memset (&rt, '\0', sizeof (rt)); + memset (&rt, '\0', sizeof (rt)); - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - rt.rt_dev = ifname; + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + rt.rt_dev = ifname; - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; - ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; - rt.rt_flags = RTF_UP | RTF_HOST; + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; + ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; + rt.rt_flags = RTF_UP | RTF_HOST; - if (kernel_version > KVERSION(2,1,0)) { - SET_SA_FAMILY (rt.rt_genmask, AF_INET); - ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; - } - - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) - { - if (still_ppp() && ! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m(%d)", errno); - } - return (0); + if (kernel_version > KVERSION(2,1,0)) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; + } + + if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { + if (still_ppp() && ! ok_error (errno)) + error("ioctl(SIOCDELRT) device route: %m(%d)", errno); + return (0); } } return 1; - } +} -/******************************************************************** - * - * open_loopback - open the device we use for getting packets - * in demand mode. Under Linux, we use our existing fd - * to the ppp driver. +/* + * get_pty - get a pty master/slave pair and chown the slave side + * to the uid given. Assumes slave_name points to >= 16 bytes of space. */ -void -open_ppp_loopback(void) - { - int flags, i; +int +get_pty(master_fdp, slave_fdp, slave_name, uid) + int *master_fdp; + int *slave_fdp; + char *slave_name; + int uid; +{ + int i, mfd, sfd = -1; + char pty_name[16]; struct termios tios; - master_fd = -1; - for (i = 0; i < 64; ++i) { - sprintf(loop_name, "/dev/pty%c%x", 'p' + i / 16, i % 16); - master_fd = open(loop_name, O_RDWR | O_NOCTTY, 0); - if (master_fd >= 0) - break; - } - if (master_fd < 0) { - syslog(LOG_ERR, "No free pty for loopback"); - die(1); +#ifdef TIOCGPTN + /* + * Try the unix98 way first. + */ + mfd = open("/dev/ptmx", O_RDWR); + if (mfd >= 0) { + int ptn; + if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) { + slprintf(pty_name, sizeof(pty_name), "/dev/pts/%d", ptn); + chmod(pty_name, S_IRUSR | S_IWUSR); +#ifdef TIOCSPTLCK + ptn = 0; + if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0) + warn("Couldn't unlock pty slave %s: %m", pty_name); +#endif + if ((sfd = open(pty_name, O_RDWR)) < 0) + warn("Couldn't open pty slave %s: %m", pty_name); + } } - SYSDEBUG((LOG_DEBUG, "using %s for loopback", loop_name)); - loop_name[5] = 't'; - slave_fd = open(loop_name, O_RDWR | O_NOCTTY, 0); - if (slave_fd < 0) { - syslog(LOG_ERR, "Couldn't open %s for loopback: %m", loop_name); - die(1); +#endif /* TIOCGPTN */ + + if (sfd < 0) { + /* the old way - scan through the pty name space */ + for (i = 0; i < 64; ++i) { + slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x", + 'p' + i / 16, i % 16); + mfd = open(pty_name, O_RDWR, 0); + if (mfd >= 0) { + pty_name[5] = 't'; + sfd = open(pty_name, O_RDWR | O_NOCTTY, 0); + if (sfd >= 0) { + fchown(sfd, uid, -1); + fchmod(sfd, S_IRUSR | S_IWUSR); + break; + } + close(mfd); + } + } } - set_ppp_fd(slave_fd); + if (sfd < 0) + return 0; - if (tcgetattr(ppp_fd, &tios) == 0) - { + strlcpy(slave_name, pty_name, 16); + *master_fdp = mfd; + *slave_fdp = sfd; + if (tcgetattr(sfd, &tios) == 0) { tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB); tios.c_cflag |= CS8 | CREAD; tios.c_iflag = IGNPAR | CLOCAL; tios.c_oflag = 0; tios.c_lflag = 0; - if (tcsetattr(ppp_fd, TCSAFLUSH, &tios) < 0) - { - syslog(LOG_WARNING, "couldn't set attributes on loopback: %m(%d)", errno); - } - } + if (tcsetattr(sfd, TCSAFLUSH, &tios) < 0) + warn("couldn't set attributes on pty: %m"); + } else + warn("couldn't get attributes on pty: %m"); + + return 1; +} + +/******************************************************************** + * + * open_loopback - open the device we use for getting packets + * in demand mode. Under Linux, we use a pty master/slave pair. + */ +int +open_ppp_loopback(void) +{ + int flags; + + if (new_style_driver) { + /* allocate ourselves a ppp unit */ + ifunit = -1; + if (ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit) < 0) + fatal("Couldn't create PPP unit: %m"); + set_flags(ppp_dev_fd, SC_LOOP_TRAFFIC); + set_kdebugflag(kdebugflag); + ppp_fd = -1; + return ppp_dev_fd; + } + + if (!get_pty(&master_fd, &slave_fd, loop_name, 0)) + fatal("No free pty for loopback"); + SYSDEBUG(("using %s for loopback", loop_name)); + + set_ppp_fd(slave_fd); flags = fcntl(master_fd, F_GETFL); if (flags == -1 || fcntl(master_fd, F_SETFL, flags | O_NONBLOCK) == -1) - { - syslog(LOG_WARNING, "couldn't set master loopback to nonblock: %m(%d)", errno); - } + warn("couldn't set master loopback to nonblock: %m(%d)", errno); flags = fcntl(ppp_fd, F_GETFL); if (flags == -1 || fcntl(ppp_fd, F_SETFL, flags | O_NONBLOCK) == -1) - { - syslog(LOG_WARNING, "couldn't set slave loopback to nonblock: %m(%d)", errno); - } + warn("couldn't set slave loopback to nonblock: %m(%d)", errno); if (ioctl(ppp_fd, TIOCSETD, &ppp_disc) < 0) - { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m(%d)", errno); - die(1); - } + fatal("ioctl(TIOCSETD): %m(%d)", errno); /* * Find out which interface we were given. */ if (ioctl(ppp_fd, PPPIOCGUNIT, &ifunit) < 0) - { - syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m(%d)", errno); - die(1); - } + fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); /* * Enable debug in the driver if requested. */ set_kdebugflag (kdebugflag); - } + + return master_fd; +} /******************************************************************** * @@ -2465,13 +2161,16 @@ open_ppp_loopback(void) void restore_loop(void) - { - if (ppp_fd != slave_fd) - { +{ + if (new_style_driver) { + set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) & SC_LOOP_TRAFFIC); + return; + } + if (ppp_fd != slave_fd) { (void) ioctl(ppp_fd, TIOCSETD, &tty_disc); set_ppp_fd(slave_fd); - } - } + } +} /******************************************************************** * @@ -2488,18 +2187,16 @@ sifnpmode(u, proto, mode) npi.protocol = proto; npi.mode = mode; - if (ioctl(ppp_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) - { - if (! ok_error (errno)) - { - syslog(LOG_ERR, "ioctl(PPPIOCSNPMODE, %d, %d): %m(%d)", + if (ioctl(ppp_dev_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) { + if (! ok_error (errno)) { + error("ioctl(PPPIOCSNPMODE, %d, %d): %m (%d)", proto, mode, errno); - syslog(LOG_ERR, "ppp_fd=%d slave_fd=%d\n", ppp_fd, slave_fd); - } + error("ppp_dev_fd=%d slave_fd=%d\n", ppp_dev_fd, slave_fd); + } return 0; - } + } return 1; - } +} /******************************************************************** @@ -2508,7 +2205,7 @@ sifnpmode(u, proto, mode) */ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) - { +{ int result = 1; #ifdef IPX_CHANGE @@ -2517,18 +2214,14 @@ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) &ifr.ifr_addr; skfd = socket (AF_IPX, SOCK_DGRAM, 0); - if (skfd < 0) - { + if (skfd < 0) { if (! ok_error (errno)) - { - syslog (LOG_DEBUG, "socket(AF_IPX): %m(%d)", errno); - } + dbglog("socket(AF_IPX): %m (%d)", errno); result = 0; - } - else - { + } + else { memset (&ifr, '\0', sizeof (ifr)); - strcpy (ifr.ifr_name, ifname); + strlcpy (ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); memcpy (sipx->sipx_node, node, IPX_NODE_LEN); sipx->sipx_family = AF_IPX; @@ -2539,28 +2232,21 @@ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) /* * Set the IPX device */ - if (ioctl(skfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) - { + if (ioctl(skfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { result = 0; - if (errno != EEXIST) - { + if (errno != EEXIST) { if (! ok_error (errno)) - { - syslog (LOG_DEBUG, - "ioctl(SIOCAIFADDR, CRTITF): %m(%d)", errno); - } - } - else - { - syslog (LOG_WARNING, - "ioctl(SIOCAIFADDR, CRTITF): Address already exists"); - } - } + dbglog("ioctl(SIOCSIFADDR, CRTITF): %m (%d)", errno); + } + else { + warn("ioctl(SIOCSIFADDR, CRTITF): Address already exists"); + } + } close (skfd); - } + } #endif return result; - } +} /******************************************************************** * @@ -2570,7 +2256,7 @@ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) */ int cipxfaddr (int unit) - { +{ int result = 1; #ifdef IPX_CHANGE @@ -2579,18 +2265,14 @@ int cipxfaddr (int unit) struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) &ifr.ifr_addr; skfd = socket (AF_IPX, SOCK_DGRAM, 0); - if (skfd < 0) - { + if (skfd < 0) { if (! ok_error (errno)) - { - syslog (LOG_DEBUG, "socket(AF_IPX): %m(%d)", errno); - } + dbglog("socket(AF_IPX): %m (%d)", errno); result = 0; - } - else - { + } + else { memset (&ifr, '\0', sizeof (ifr)); - strcpy (ifr.ifr_name, ifname); + strlcpy (ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); sipx->sipx_type = IPX_FRAME_ETHERII; sipx->sipx_action = IPX_DLTITF; @@ -2598,43 +2280,15 @@ int cipxfaddr (int unit) /* * Set the IPX device */ - if (ioctl(skfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) - { + if (ioctl(skfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - { - syslog (LOG_INFO, - "ioctl(SIOCAIFADDR, IPX_DLTITF): %m(%d)", errno); - } + info("ioctl(SIOCSIFADDR, IPX_DLTITF): %m (%d)", errno); result = 0; - } + } close (skfd); - } + } #endif return result; - } - -/* - * daemon - Detach us from controlling terminal session. - */ -int -daemon(nochdir, noclose) - int nochdir, noclose; -{ - int pid; - - if ((pid = fork()) < 0) - return -1; - if (pid != 0) - exit(0); /* parent dies */ - setsid(); - if (!nochdir) - chdir("/"); - if (!noclose) { - fclose(stdin); /* don't need stdin, stdout, stderr */ - fclose(stdout); - fclose(stderr); - } - return 0; } /* @@ -2659,34 +2313,25 @@ get_host_seed() int sys_check_options(void) - { +{ #ifdef IPX_CHANGE - struct stat stat_buf; /* * Disable the IPX protocol if the support is not present in the kernel. - * If we disable it then ensure that IP support is enabled. - */ - while (ipxcp_protent.enabled_flag) - { - if (path_to_procfs()) - { - strcat (route_buffer, "/net/ipx_interface"); - if (lstat (route_buffer, &stat_buf) >= 0) - { - break; - } - } - syslog (LOG_ERR, "IPX support is not present in the kernel\n"); - ipxcp_protent.enabled_flag = 0; - ipcp_protent.enabled_flag = 1; - break; - } + */ + if (ipxcp_protent.enabled_flag) { + struct stat stat_buf; + if (!path_to_procfs("/net/ipx_interface") + || lstat (route_buffer, &stat_buf) < 0) { + error("IPX support is not present in the kernel\n"); + ipxcp_protent.enabled_flag = 0; + } + } #endif if (demand && driver_is_old) { - option_error("demand dialling is not supported by kernel driver version " - "%d.%d.%d", driver_version, driver_modification, - driver_patch); - return 0; + option_error("demand dialling is not supported by kernel driver " + "version %d.%d.%d", driver_version, driver_modification, + driver_patch); + return 0; } return 1; - } +}