X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=f790b8cdbe089698e11112e1ca59b66b3fd04b32;hp=8251f480f0dc8874d9c0082fa945b30e63492882;hb=88890fc13f9b346db647c882b376926686177112;hpb=a3396b002507d72b3e1f1169bd02ae018539654b diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 8251f48..f790b8c 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -22,43 +22,75 @@ * TODO: */ +#include +#include +#include +#include +#include + #include +#include #include #include #include #include #include -#include -#include -#include -#include -#include #include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include -#include #include "pppd.h" #include "fsm.h" #include "ipcp.h" static int initdisc = -1; /* Initial TTY discipline */ -static int prev_kdebugflag = 0; - -static int restore_term; /* 1 => we've munged the terminal */ +static int initfdflags = -1; /* Initial file descriptor flags for fd */ +static int prev_kdebugflag = 0; +static int has_default_route = 0; +static int has_proxy_arp = 0; +static int driver_version = 0; +static int driver_modification = 0; +static int driver_patch = 0; +static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ -static int driver_version = 0; -static int driver_modification = 0; -static int driver_patch = 0; +static int sockfd; /* socket for doing interface ioctls */ + +static int if_is_up; /* Interface has been marked up */ +static u_int32_t ipaddrs[2]; /* Local and remote addrs we've set */ +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; + +#define MAX_IFS 100 + +#define FLAGS_GOOD (IFF_UP | IFF_BROADCAST) +#define FLAGS_MASK (IFF_UP | IFF_BROADCAST | \ + 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 translate_speed (int bps); +static int baud_rate_of (int speed); +static char *path_to_route (void); +static void close_route_table (void); +static int open_route_table (void); +static int read_route_table (struct rtentry *rt); +static int defaultroute_exists (void); +static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr); +static void decode_version (char *buf, int *version, int *mod, int *patch); -#define MAX_IFS 32 /* * SET_SA_FAMILY - set the sa_family field of a struct sockaddr, @@ -69,30 +101,75 @@ static int driver_patch = 0; memset ((char *) &(addr), '\0', sizeof(addr)); \ addr.sa_family = (family); +/* + * Determine if the PPP connection should still be present. + */ + +extern int hungup; +#define still_ppp() (hungup == 0) + +/* + * Functions to read and set the flags value in the device driver + */ + +static int get_flags (void) + { + int flags; + + if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) + { + syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m"); + quit(); + } + + MAINDEBUG ((LOG_DEBUG, "get flags = %x\n", flags)); + return flags; + } + +static void set_flags (int flags) + { + MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags)); + + if (ioctl(ttyfd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) + { + syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags); + quit(); + } + } + /* * sys_init - System-dependent initialization. */ -void -sys_init() -{ - openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); - setlogmask(LOG_UPTO(LOG_INFO)); - if (debug) - setlogmask(LOG_UPTO(LOG_DEBUG)); -} + +void sys_init(void) + { + /* Get an internet socket for doing socket ioctls. */ + sockfd = socket(AF_INET, SOCK_DGRAM, 0); + if (sockfd < 0) + { + syslog(LOG_ERR, "Couldn't create IP socket: %m"); + die(1); + } + } /* - * note_debug_level - note a change in the debug level. + * 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(). */ -void -note_debug_level() +void sys_cleanup() { - if (debug) { - syslog(LOG_INFO, "Debug turned ON, Level %d", debug); - setlogmask(LOG_UPTO(LOG_DEBUG)); - } else { - setlogmask(LOG_UPTO(LOG_WARNING)); - } + struct ifreq ifr; + + if (if_is_up) + sifdown(0); + if (ipaddrs[0]) + cifaddr(0, ipaddrs[0], ipaddrs[1]); + /* XXX maybe we need to delete the route through the interface */ + if (has_default_route) + cifdefaultroute(0, default_route_gateway); + if (has_proxy_arp) + cifproxyarp(0, proxy_arp_addr); } /* @@ -100,114 +177,163 @@ note_debug_level() */ int set_kdebugflag (int requested_level) -{ - if (ioctl(fd, PPPIOCGDEBUG, &prev_kdebugflag) < 0) { + { + if (ioctl(ttyfd, PPPIOCGDEBUG, &prev_kdebugflag) < 0) + { syslog(LOG_ERR, "ioctl(PPPIOCGDEBUG): %m"); return (0); - } - - if (prev_kdebugflag != requested_level) { - if (ioctl(fd, PPPIOCSDEBUG, &requested_level) < 0) { + } + + if (prev_kdebugflag != requested_level) + { + if (ioctl(ttyfd, PPPIOCSDEBUG, &requested_level) < 0) + { syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m"); return (0); - } - syslog(LOG_INFO, "set kernel debugging level to %d", requested_level); - } + } + MAINDEBUG ((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 (void) -{ +void establish_ppp (int fd) + { int pppdisc = N_PPP; int sig = SIGIO; - if (ioctl(fd, TIOCEXCL, 0) < 0) { + if (ioctl(fd, TIOCEXCL, 0) < 0) + { syslog (LOG_WARNING, "ioctl(TIOCEXCL): %m"); - } - - if (ioctl(fd, TIOCGETD, &initdisc) < 0) { + } + + if (ioctl(fd, TIOCGETD, &initdisc) < 0) + { syslog(LOG_ERR, "ioctl(TIOCGETD): %m"); die (1); - } + } - if (ioctl(fd, TIOCSETD, &pppdisc) < 0) { + if (ioctl(fd, TIOCSETD, &pppdisc) < 0) + { syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); die (1); - } - if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) { + } + + if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) + { syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m"); die (1); - } - + } + set_kdebugflag (kdebugflag); - syslog (LOG_NOTICE, "Using version %d.%d.%d of PPP driver", - driver_version, driver_modification, driver_patch); -} + set_flags (get_flags() & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | + SC_RCV_EVNP | SC_RCV_ODDP)); + + MAINDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver", + driver_version, driver_modification, driver_patch)); + + /* + * Set device for non-blocking reads. + */ + if ((initfdflags = fcntl(fd, F_GETFL)) == -1 + || fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { + { + syslog(LOG_WARNING, "Couldn't set device to non-blocking mode: %m"); + } + } /* * disestablish_ppp - Restore the serial port to normal operation. * This shouldn't call die() because it's called from die(). */ -void disestablish_ppp(void) -{ +void disestablish_ppp(int fd) + { int x; char *s; - if (initdisc >= 0) { - set_kdebugflag (prev_kdebugflag); - /* - * Check whether the link seems not to be 8-bit clean. - */ - if (ioctl(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: - s = "bit 7 set to 1"; - break; - case SC_RCV_B7_1: - s = "bit 7 set to 0"; - break; - case SC_RCV_EVNP: - s = "odd parity"; - break; - case SC_RCV_ODDP: - s = "even parity"; - break; - } - if (s != NULL) { - syslog(LOG_WARNING, "Serial link is not 8-bit clean:"); - syslog(LOG_WARNING, "All received characters had %s", s); - } - } + /* Reset non-blocking mode on the file descriptor. */ + if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0) + syslog(LOG_WARNING, "Couldn't restore device fd flags: %m"); + initfdflags = -1; + if (still_ppp() && initdisc >= 0) + { + set_kdebugflag (prev_kdebugflag); + if (ioctl(fd, TIOCSETD, &initdisc) < 0) - syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); - + { + syslog(LOG_WARNING, "ioctl(TIOCSETD): %m"); + } + if (ioctl(fd, TIOCNXCL, 0) < 0) + { syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m"); + } + } + initdisc = -1; + } - initdisc = -1; - } -} - -#if B9600 == 9600 /* - * XXX assume speed_t values numerically equal bits per second - * (so we can ask for any speed). + * clean_check - Fetch the flags for the device and generate + * appropriate error messages. */ -#define translate_speed(bps) (bps) -#define baud_rate_of(speed) (speed) +void clean_check(void) + { + if (still_ppp() && initdisc >= 0) + { + if (ioctl(ttyfd, 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 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP: + s = "nothing was received"; + break; + + 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: + 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: + s = "all had bit 7 set to 0"; + break; + + case SC_RCV_EVNP: + s = "all had odd parity"; + break; + + 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); + } + } + } + } + -#else /* * List of valid speeds. */ + struct speed { int speed_int, speed_val; } speeds[] = { @@ -283,398 +409,479 @@ struct speed { /* * Translate from bits/second to a speed_t. */ -int -translate_speed(bps) - int bps; -{ + +static int translate_speed (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); + 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); + } 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; +static int baud_rate_of (int speed) + { + struct speed *speedp; + + if (speed != 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; -{ + +void set_up_tty (int fd, int local) + { int speed, x; struct termios tios; - - if (tcgetattr(fd, &tios) < 0) { + + if (tcgetattr(fd, &tios) < 0) + { syslog(LOG_ERR, "tcgetattr: %m"); die(1); - } - + } + if (!restore_term) + { inittermios = tios; + } + + tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); + tios.c_cflag |= CS8 | CREAD | HUPCL; + + tios.c_iflag = IGNBRK | IGNPAR; + tios.c_oflag = 0; + tios.c_lflag = 0; + tios.c_cc[VMIN] = 1; + tios.c_cc[VTIME] = 0; + + if (local || !modem) + { + tios.c_cflag ^= (CLOCAL | HUPCL); + } -#ifdef CRTSCTS - tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL | CRTSCTS); - if (crtscts == 1) + switch (crtscts) + { + case 1: tios.c_cflag |= CRTSCTS; -#else - tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); -#endif /* CRTSCTS */ + break; - 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 */ + case -2: + tios.c_iflag |= IXON | IXOFF; + tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */ tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */ - } + break; + + case -1: + tios.c_cflag &= ~CRTSCTS; + break; + default: + break; + } + speed = translate_speed(inspeed); - if (speed) { - cfsetospeed(&tios, speed); - cfsetispeed(&tios, speed); - } else { + 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 + { speed = cfgetospeed(&tios); - /* - * We can't proceed if the serial port speed is B0, - * since that implies that the serial port is disabled. - */ - if (speed == B0) { + if (speed == B0) + { syslog(LOG_ERR, "Baud rate for %s is 0; need explicit baud rate", devnam); - die(1); - } - } + die (1); + } + } - if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) { + if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) + { syslog(LOG_ERR, "tcsetattr: %m"); die(1); - } - - baud_rate = baud_rate_of(speed); + } + + baud_rate = 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; -{ + +void setdtr (int fd, int on) + { int modembits = TIOCM_DTR; - ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits); -} + ioctl(fd, (on ? TIOCMBIS : TIOCMBIC), &modembits); + } /* * restore_tty - restore the terminal to the saved settings. */ -void -restore_tty() -{ - if (restore_term) { + +void restore_tty (int fd) + { + if (restore_term) + { + restore_term = 0; +/* + * Turn off echoing, because otherwise we can get into + * a loop with the tty and the modem echoing to each other. + * We presume we are the sole user of this tty device, so + * when we close it, it will revert to its defaults anyway. + */ + if (!default_device) + { + inittermios.c_lflag &= ~(ECHO | ECHONL); + } + if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) - if (errno != ENXIO) + { + if (errno != EIO) + { syslog(LOG_WARNING, "tcsetattr: %m"); - restore_term = 0; - } -} + } + } + } + } /* * output - Output PPP packet. */ void output (int unit, unsigned char *p, int len) -{ - if (unit != 0) - MAINDEBUG((LOG_WARNING, "output: unit != 0!")); - + { if (debug) + { log_packet(p, len, "sent "); + } - if (write(fd, p, len) < 0) { - syslog(LOG_ERR, "write: %m"); - die(1); - } -} + if (write(ttyfd, p, len) < 0) + { + if (errno == EWOULDBLOCK || errno == ENOBUFS + || errno == ENXIO || errno == EIO) + { + syslog(LOG_WARNING, "write: warning: %m"); + } + else + { + syslog(LOG_ERR, "write: %m"); + die(1); + } + } + } /* - * wait_input - wait until there is data available on fd, + * wait_input - wait until there is data available on ttyfd, * for the length of time specified by *timo (indefinite * if timo is NULL). */ -wait_input(timo) - struct timeval *timo; -{ + +void wait_input (struct timeval *timo) + { fd_set ready; int n; - + FD_ZERO(&ready); - FD_SET(fd, &ready); - n = select(fd+1, &ready, NULL, &ready, timo); - if (n < 0 && errno != EINTR) { + FD_SET(ttyfd, &ready); + + n = select(ttyfd+1, &ready, NULL, &ready, timo); + if (n < 0 && errno != EINTR) + { syslog(LOG_ERR, "select: %m"); die(1); - } -} - + } + } /* * read_packet - get a PPP packet from the serial device. */ int read_packet (unsigned char *buf) -{ + { int len; - len = read(fd, buf, PPP_MTU + PPP_HDRLEN); - if (len < 0) { - if (errno == EWOULDBLOCK) { -#if 0 - MAINDEBUG((LOG_DEBUG, "read(fd): EWOULDBLOCK")); -#endif + len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN); + if (len < 0) + { + if (errno == EWOULDBLOCK) + { return -1; - } - syslog(LOG_ERR, "read(fd): %m"); + } + syslog(LOG_ERR, "read: %m"); die(1); - } + } return len; -} + } /* * ppp_send_config - configure the transmit characteristics of * the ppp interface. */ + void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) -{ + { u_int x; struct ifreq ifr; MAINDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu)); - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - ifr.ifr_mtu = mtu; - if (ioctl(s, SIOCSIFMTU, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m"); - quit(); - } - - MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); - if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m"); - quit(); - } +/* + * 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; + + if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0) + { + syslog(LOG_ERR, "ioctl(SIOCSIFMTU): %m"); + quit(); + } + + MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); + if (ioctl(ttyfd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) + { + syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m"); + quit(); + } - if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); - quit(); - } - - x = pcomp ? x | SC_COMP_PROT : x & ~SC_COMP_PROT; - x = accomp ? x | SC_COMP_AC : x & ~SC_COMP_AC; - - MAINDEBUG ((LOG_DEBUG, "send_config: flags = %x\n", x)); - if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); - quit(); - } -} + 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); + } + } /* * ppp_set_xaccm - set the extended transmit ACCM for the interface. */ -void -ppp_set_xaccm(unit, accm) - int unit; - ext_accm accm; -{ + +void ppp_set_xaccm (int unit, ext_accm accm) + { MAINDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n", accm[0], accm[1], accm[2], accm[3])); - if (ioctl(fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) + + if (ioctl(ttyfd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) + { syslog(LOG_WARNING, "ioctl(set extended ACCM): %m"); -} + } + } /* * ppp_recv_config - configure the receive-side characteristics of * the ppp interface. */ + void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) -{ + { u_int x; MAINDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru)); - if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0) +/* + * 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(ttyfd, PPPIOCSMRU, (caddr_t) &mru) < 0) + { syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m"); + } MAINDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap)); - if (ioctl(fd, PPPIOCRASYNCMAP, (caddr_t) &asyncmap) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCRASYNCMAP): %m"); - quit(); - } - - if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); + if (ioctl(ttyfd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) + { + syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m"); quit(); - } + } + x = get_flags(); x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC; - MAINDEBUG ((LOG_DEBUG, "recv_config: flags = %x\n", x)); - if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); - quit(); - } -} + set_flags (x); + } /* * ccp_test - ask kernel whether a given compression method * is acceptable for use. */ -int -ccp_test(unit, opt_ptr, opt_len, for_transmit) - int unit, opt_len, for_transmit; - u_char *opt_ptr; -{ - struct ppp_comp_data data; - data.ptr = opt_ptr; - data.length = opt_len; +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)); + data.ptr = opt_ptr; + data.length = opt_len; data.transmit = for_transmit; - return ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0; -} + + if (ioctl(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) + { + return 1; + } + + return (errno == ENOBUFS)? 0: -1; + } /* * ccp_flags_set - inform kernel about the current state of CCP. */ -void -ccp_flags_set(unit, isopen, isup) - int unit, isopen, isup; -{ - int x; - if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); - return; - } - x = isopen? x | SC_CCP_OPEN: x &~ SC_CCP_OPEN; - x = isup? x | SC_CCP_UP: x &~ SC_CCP_UP; - if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); -} +void ccp_flags_set (int unit, int isopen, int isup) + { + if (still_ppp()) + { + int x = get_flags(); + x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN; + x = isup? x | SC_CCP_UP : x &~ SC_CCP_UP; + set_flags (x); + } + } + +/* + * ccp_fatal_error - returns 1 if decompression was disabled as a + * result of an error detected after decompression of a packet, + * 0 otherwise. This is necessary because of patent nonsense. + */ + +int ccp_fatal_error (int unit) + { + int x = get_flags(); + + return x & SC_DC_FERROR; + } /* * sifvjcomp - config tcp header compression */ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) -{ - u_int x; + { + u_int x = get_flags(); - if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); - return 0; - } + if (vjcomp) + { + if (ioctl (ttyfd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) + { + syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); + vjcomp = 0; + } + } x = vjcomp ? x | SC_COMP_TCP : x &~ SC_COMP_TCP; x = cidcomp ? x & ~SC_NO_TCP_CCID : x | SC_NO_TCP_CCID; - - if(ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); - return 0; - } - - if (vjcomp) { - if (ioctl (fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { - syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); - return 0; - } - } + set_flags (x); return 1; -} + } /* * sifup - Config the interface up and enable IP packets to pass. */ int sifup (int u) -{ + { struct ifreq ifr; + memset (&ifr, '\0', sizeof (ifr)); strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) + { syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); return 0; - } + } ifr.ifr_flags |= (IFF_UP | IFF_POINTOPOINT); - if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) + { syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; - } + } + if_is_up = 1; return 1; -} + } /* * sifdown - Config the interface down and disable IP. */ int sifdown (int u) -{ + { struct ifreq ifr; + memset (&ifr, '\0', sizeof (ifr)); strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); - if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) + { syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); return 0; - } + } ifr.ifr_flags &= ~IFF_UP; ifr.ifr_flags |= IFF_POINTOPOINT; - if (ioctl(s, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) + { syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; - } + } + if_is_up = 0; return 1; -} + } /* * sifaddr - Config the interface IP addresses and netmask. */ int sifaddr (int unit, int our_adr, int his_adr, int net_mask) -{ + { struct ifreq ifr; struct rtentry rt; + memset (&ifr, '\0', sizeof (ifr)); + memset (&rt, '\0', sizeof (rt)); + SET_SA_FAMILY (ifr.ifr_addr, AF_INET); SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET); SET_SA_FAMILY (ifr.ifr_netmask, AF_INET); @@ -684,50 +891,60 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask) * Set our IP address */ ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = our_adr; - if (ioctl(s, SIOCSIFADDR, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) + { if (errno != EEXIST) + { syslog (LOG_ERR, "ioctl(SIOCAIFADDR): %m"); + } else + { syslog (LOG_WARNING, "ioctl(SIOCAIFADDR): Address already exists"); + } return (0); - } + } /* * Set the gateway address */ ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = his_adr; - if (ioctl(s, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) + { syslog (LOG_ERR, "ioctl(SIOCSIFDSTADDR): %m"); return (0); - } + } /* * Set the netmask */ - if (net_mask != 0) { + if (net_mask != 0) + { ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = net_mask; - if (ioctl(s, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { + if (ioctl(sockfd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) + { syslog (LOG_ERR, "ioctl(SIOCSIFNETMASK): %m"); return (0); - } - } + } + } /* * Add the device route */ - 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; /* MJC */ - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; + ((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 (ioctl(s, SIOCADDRT, &rt) < 0) { + if (ioctl(sockfd, SIOCADDRT, &rt) < 0) + { syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m"); return (0); - } + } + + ipaddrs[0] = our_adr; + ipaddrs[1] = his_adr; return 1; -} + } /* * cifaddr - Clear the interface IP addresses, and delete routes @@ -735,8 +952,10 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask) */ int cifaddr (int unit, int our_adr, int his_adr) -{ + { struct rtentry rt; + + ipaddrs[0] = 0; /* * Delete the route through the device */ @@ -750,19 +969,23 @@ int cifaddr (int unit, int our_adr, int his_adr) ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; rt.rt_flags = RTF_UP | RTF_HOST; - if (ioctl(s, SIOCDELRT, &rt) < 0) { - syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m"); - return (0); - } + if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH) + { + if (still_ppp()) + { + syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m"); + return (0); + } + } return 1; -} + } /* * path_to_route - determine the path to the proc file system data */ FILE *route_fd = (FILE *) 0; -static char route_buffer [100]; +static char route_buffer [512]; static char *path_to_route (void); static int open_route_table (void); @@ -775,97 +998,112 @@ static int defaultroute_exists (void); */ static char *path_to_route (void) -{ + { struct mntent *mntent; FILE *fp; fp = fopen (MOUNTED, "r"); - if (fp != 0) { - while ((mntent = getmntent (fp)) != 0) { - if (strcmp (mntent->mnt_type, MNTTYPE_IGNORE) == 0) - continue; - - if (strcmp (mntent->mnt_type, "proc") == 0) { - strncpy (route_buffer, mntent->mnt_dir, - sizeof (route_buffer)-10); - route_buffer [sizeof (route_buffer)-10] = '\0'; - strcat (route_buffer, "/net/route"); - - fclose (fp); - return (route_buffer); - } - } + if (fp != 0) + { + mntent = getmntent (fp); + while (mntent != (struct mntent *) 0) + { + if (strcmp (mntent->mnt_type, MNTTYPE_IGNORE) != 0) + { + if (strcmp (mntent->mnt_type, "proc") == 0) + { + strncpy (route_buffer, mntent->mnt_dir, + sizeof (route_buffer)-10); + route_buffer [sizeof (route_buffer)-10] = '\0'; + strcat (route_buffer, "/net/route"); + + fclose (fp); + return (route_buffer); + } + } + mntent = getmntent (fp); + } fclose (fp); - } + } + syslog (LOG_ERR, "proc file system not mounted"); return 0; -} + } + +/* + * close_route_table - close the interface to the route table + */ + +static void close_route_table (void) + { + if (route_fd != (FILE *) 0) + { + fclose (route_fd); + route_fd = (FILE *) 0; + } + } /* * open_route_table - open the interface to the route table */ static int open_route_table (void) -{ + { char *path; - if (route_fd != (FILE *) 0) - close_route_table(); + close_route_table(); path = path_to_route(); if (path == NULL) + { return 0; + } route_fd = fopen (path, "r"); - if (route_fd == (FILE *) 0) { + if (route_fd == (FILE *) 0) + { syslog (LOG_ERR, "can not open %s: %m", path); return 0; - } - - /* read and discard the header line. */ - if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0) { - close_route_table(); - return 0; - } + } return 1; -} - -/* - * close_route_table - close the interface to the route table - */ - -static void close_route_table (void) -{ - if (route_fd != (FILE *) 0) { - fclose (route_fd); - route_fd = (FILE *) 0; - } -} + } /* * read_route_table - read the next entry from the route table */ static int read_route_table (struct rtentry *rt) -{ + { static char delims[] = " \t\n"; char *dev_ptr, *ptr, *dst_ptr, *gw_ptr, *flag_ptr; - - if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0) - return 0; - + memset (rt, '\0', sizeof (struct rtentry)); - dev_ptr = strtok (route_buffer, delims); /* interface name */ - dst_ptr = strtok (NULL, delims); /* destination address */ - gw_ptr = strtok (NULL, delims); /* gateway */ - flag_ptr = strtok (NULL, delims); /* flags */ -#if 0 - ptr = strtok (NULL, delims); /* reference count */ - ptr = strtok (NULL, delims); /* useage count */ - ptr = strtok (NULL, delims); /* metric */ - ptr = strtok (NULL, delims); /* mask */ -#endif + for (;;) + { + if (fgets (route_buffer, sizeof (route_buffer), route_fd) == + (char *) 0) + { + return 0; + } + + dev_ptr = strtok (route_buffer, delims); /* interface name */ + dst_ptr = strtok (NULL, delims); /* destination address */ + gw_ptr = strtok (NULL, delims); /* gateway */ + flag_ptr = strtok (NULL, delims); /* flags */ + + if (flag_ptr == (char *) 0) /* assume that we failed, somewhere. */ + { + return 0; + } + + /* Discard that stupid header line which should never + * have been there in the first place !! */ + if (isxdigit (*dst_ptr) && isxdigit (*gw_ptr) && isxdigit (*flag_ptr)) + { + break; + } + } ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr = strtoul (dst_ptr, NULL, 16); @@ -877,25 +1115,31 @@ static int read_route_table (struct rtentry *rt) rt->rt_dev = dev_ptr; return 1; -} + } /* * defaultroute_exists - determine if there is a default route */ static int defaultroute_exists (void) -{ + { struct rtentry rt; int result = 0; if (!open_route_table()) + { return 0; + } - while (read_route_table(&rt) != 0) { - if (rt.rt_flags & RTF_UP == 0) + while (read_route_table(&rt) != 0) + { + if ((rt.rt_flags & RTF_UP) == 0) + { continue; + } - if (((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr == 0L) { + if (((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr == 0L) + { syslog (LOG_ERR, "ppp not replacing existing default route to %s[%s]", rt.rt_dev, @@ -903,111 +1147,142 @@ static int defaultroute_exists (void) sin_addr.s_addr)); result = 1; break; - } - } + } + } + close_route_table(); return result; -} + } /* * sifdefaultroute - assign a default route through the address given. */ int sifdefaultroute (int unit, int gateway) -{ + { struct rtentry rt; - if (defaultroute_exists()) - return 0; + if (has_default_route == 0) + { + if (defaultroute_exists()) + { + return 0; + } - memset (&rt, '\0', sizeof (rt)); - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; + memset (&rt, '\0', sizeof (rt)); + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(s, SIOCADDRT, &rt) < 0) { - syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m"); - return 0; - } + rt.rt_flags = RTF_UP | RTF_GATEWAY; + if (ioctl(sockfd, SIOCADDRT, &rt) < 0) + { + syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m"); + return 0; + } + } + has_default_route = 1; + default_route_gateway = g; return 1; -} + } /* * cifdefaultroute - delete a default route through the address given. */ int cifdefaultroute (int unit, int gateway) -{ + { struct rtentry rt; - - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; + + if (has_default_route) + { + memset (&rt, '\0', sizeof (rt)); + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(s, SIOCDELRT, &rt) < 0) { - syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m"); - return 0; - } + rt.rt_flags = RTF_UP | RTF_GATEWAY; + if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH) + { + if (still_ppp()) + { + syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m"); + return 0; + } + } + } + has_default_route = 0; return 1; -} + } /* * sifproxyarp - Make a proxy ARP entry for the peer. */ int sifproxyarp (int unit, u_int32_t his_adr) -{ + { struct arpreq arpreq; - memset (&arpreq, '\0', sizeof(arpreq)); + if (has_proxy_arp == 0) + { + memset (&arpreq, '\0', sizeof(arpreq)); /* * Get the hardware address of an interface on the same subnet * as our local address. */ - if (!get_ether_addr(his_adr, &arpreq.arp_ha)) { - syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); - return 0; - } - - 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; + if (!get_ether_addr(his_adr, &arpreq.arp_ha)) + { + syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); + return 0; + } - if (ioctl(s, SIOCSARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSARP): %m"); - return 0; - } + 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; + + if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) + { + syslog(LOG_ERR, "ioctl(SIOCSARP): %m"); + return 0; + } + } + + proxy_arp_addr = hisaddr; + has_proxy_arp = 1; return 1; -} + } /* * cifproxyarp - Delete the proxy ARP entry for the peer. */ int cifproxyarp (int unit, u_int32_t his_adr) -{ + { struct arpreq arpreq; - - memset (&arpreq, '\0', sizeof(arpreq)); - SET_SA_FAMILY(arpreq.arp_pa, AF_INET); + + if (has_proxy_arp == 1) + { + 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; - if (ioctl(s, SIOCDARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_WARNING, "ioctl(SIOCDARP): %m"); - return 0; - } + ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr; + if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) + { + syslog(LOG_WARNING, "ioctl(SIOCDARP): %m"); + return 0; + } + } + has_proxy_arp = 0; return 1; -} + } /* * get_ether_addr - get the hardware address of an interface on the * the same subnet as ipaddr. */ -int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) -{ +static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) + { struct ifreq *ifr, *ifend, *ifp; int i; u_int32_t ina, mask; @@ -1018,10 +1293,12 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; - if (ioctl(s, SIOCGIFCONF, &ifc) < 0) { + if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) + { syslog(LOG_ERR, "ioctl(SIOCGIFCONF): %m"); return 0; - } + } + MAINDEBUG ((LOG_DEBUG, "proxy arp: scanning %d interfaces for IP %s", ifc.ifc_len / sizeof(struct ifreq), ip_ntoa(ipaddr))); /* @@ -1029,65 +1306,167 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) * 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)); MAINDEBUG ((LOG_DEBUG, "proxy arp: examining interface %s", ifreq.ifr_name)); /* * Check that the interface is up, and not point-to-point - * or loopback. + * nor loopback. */ - if (ioctl(s, SIOCGIFFLAGS, &ifreq) < 0) + if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0) + { continue; - if ((ifreq.ifr_flags & - (IFF_UP|IFF_BROADCAST|IFF_POINTOPOINT|IFF_LOOPBACK|IFF_NOARP)) - != (IFF_UP|IFF_BROADCAST)) + } + + if (((ifreq.ifr_flags ^ FLAGS_GOOD) & FLAGS_MASK) != 0) + { continue; + } /* * Get its netmask and check that it's on the right subnet. */ - if (ioctl(s, SIOCGIFNETMASK, &ifreq) < 0) + if (ioctl(sockfd, SIOCGIFNETMASK, &ifreq) < 0) + { continue; + } + mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr; MAINDEBUG ((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; + } syslog(LOG_INFO, "found interface %s for proxy arp", ifreq.ifr_name); /* * Now get the hardware address. */ - if (ioctl (s, SIOCGIFHWADDR, &ifreq) < 0) { + memset (&ifreq.ifr_hwaddr, 0, sizeof (struct sockaddr)); + if (ioctl (sockfd, SIOCGIFHWADDR, &ifreq) < 0) + { syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m", ifreq.ifr_name); return 0; - } + } - hwaddr->sa_family = ARPHRD_ETHER; -#ifndef old_ifr_hwaddr - memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr, ETH_ALEN); -#else - memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN); -#endif + memcpy (hwaddr, + &ifreq.ifr_hwaddr, + sizeof (struct sockaddr)); MAINDEBUG ((LOG_DEBUG, - "proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x", + "proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", (int) ((unsigned char *) &hwaddr->sa_data)[0], (int) ((unsigned char *) &hwaddr->sa_data)[1], (int) ((unsigned char *) &hwaddr->sa_data)[2], (int) ((unsigned char *) &hwaddr->sa_data)[3], (int) ((unsigned char *) &hwaddr->sa_data)[4], - (int) ((unsigned char *) &hwaddr->sa_data)[5])); + (int) ((unsigned char *) &hwaddr->sa_data)[5], + (int) ((unsigned char *) &hwaddr->sa_data)[6], + (int) ((unsigned char *) &hwaddr->sa_data)[7])); return 1; -} + } + +/* + * Return user specified netmask, modified by any mask we might determine + * for address `addr' (in network byte order). + * Here we scan through the system's list of interfaces, looking for + * any non-point-to-point interfaces which might appear to be on the same + * network as `addr'. If we find any, we OR in their netmask to the + * user-specified netmask. + */ + +u_int32_t GetMask (u_int32_t addr) + { + u_int32_t mask, nmask, ina; + struct ifreq *ifr, *ifend, ifreq; + struct ifconf ifc; + struct ifreq ifs[MAX_IFS]; + + addr = ntohl(addr); + + if (IN_CLASSA(addr)) /* determine network mask for address class */ + { + nmask = IN_CLASSA_NET; + } + else + { + if (IN_CLASSB(addr)) + { + nmask = IN_CLASSB_NET; + } + else + { + nmask = IN_CLASSC_NET; + } + } + + /* class D nets are disallowed by bad_ip_adrs */ + mask = netmask | htonl(nmask); +/* + * Scan through the system's network interfaces. + */ + ifc.ifc_len = sizeof(ifs); + ifc.ifc_req = ifs; + if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) + { + syslog(LOG_WARNING, "ioctl(SIOCGIFCONF): %m"); + return mask; + } + + ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); + 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)); + if (ioctl(sockfd, 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(sockfd, SIOCGIFNETMASK, &ifreq) < 0) + { + continue; + } + mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr; + break; + } + return mask; + } /* * Internal routine to decode the version.modification.patch level @@ -1095,27 +1474,87 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) static void decode_version (char *buf, int *version, int *modification, int *patch) -{ + { + *version = (int) strtoul (buf, &buf, 10); + *modification = 0; + *patch = 0; + + if (*buf == '.') + { + ++buf; + *modification = (int) strtoul (buf, &buf, 10); + if (*buf == '.') + { + ++buf; + *patch = (int) strtoul (buf, &buf, 10); + } + } + + if (*buf != '\0') + { + *version = + *modification = + *patch = 0; + } + } + +/* + * Procedure to determine if the PPP line dicipline is registered. + */ - *version = (int) strtoul (buf, &buf, 10); - *modification = 0; - *patch = 0; +int +ppp_registered(void) + { + int local_fd; + int ppp_disc = N_PPP; + 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", devnam); + return 0; + } - if (*buf == '.') { - ++buf; - *modification = (int) strtoul (buf, &buf, 10); - if (*buf == '.') { - ++buf; - *patch = (int) strtoul (buf, &buf, 10); + initfdflags = fcntl(local_fd, F_GETFL); + if (initfdflags == -1) + { + syslog(LOG_ERR, "Couldn't get device fd flags: %m"); + close (local_fd); + return 0; } - } - if (*buf != '\0') { - *version = - *modification = - *patch = 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"); + close (local_fd); + return 0; + } + + if (ioctl(local_fd, TIOCSETD, &ppp_disc) < 0) + { + syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); + close (local_fd); + return 0; + } + + if (ioctl(local_fd, TIOCSETD, &init_disc) < 0) + { + syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); + close (local_fd); + return 0; + } + + close (local_fd); + return 1; } -} /* * ppp_available - check whether the system has any ppp interfaces @@ -1123,52 +1562,75 @@ static void decode_version (char *buf, int *version, */ int ppp_available(void) -{ + { int s, ok; struct ifreq ifr; - int my_version, my_modification, my_patch; + char abBuffer [1024]; + int size; + int my_version, my_modification, my_patch; /* * 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)); 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)); + ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0; + } + } /* * Ensure that the hardware address is for PPP and not something else */ - if (ok != 0) + if (ok) + { ok = ioctl (s, SIOCGIFHWADDR, (caddr_t) &ifr) >= 0; + } - if (ok != 0 && ifr.ifr_hwaddr.sa_family != ARPHRD_PPP) + if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) + { ok = 0; + } + + if (!ok) + { + return 0; + } /* * This is the PPP device. Validate the version of the driver at this * point to ensure that this program will work with the driver. */ - if (ok != 0) { - char abBuffer [1024]; - int size; - - ifr.ifr_data = abBuffer; - size = ioctl (s, SIOCDEVPRIVATE, (caddr_t) &ifr); - ok = size >= 0; - - if (ok != 0) { - decode_version (abBuffer, - &driver_version, - &driver_modification, - &driver_patch); - } - } - - if (ok == 0) { + ifr.ifr_data = abBuffer; + size = ioctl (s, SIOCGPPPVER, (caddr_t) &ifr); + ok = size >= 0; + + if (ok) + { + decode_version (abBuffer, + &driver_version, + &driver_modification, + &driver_patch); + } + + if (!ok) + { driver_version = driver_modification = driver_patch = 0; - } + } /* * Validate the version of the driver against the version that we used. */ @@ -1179,27 +1641,48 @@ 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 < my_modification) + { ok = 0; + } - if (ok == 0) { + if (!ok) + { fprintf(stderr, "Sorry - PPP driver version %d.%d.%d is out of date\n", driver_version, driver_modification, driver_patch); - } - + close (s); + exit (1); + } + close(s); return ok; -} + } -int -logwtmp(line, name, host) - char *line, *name, *host; -{ - struct utmp ut; +/* + * Update the wtmp file with the appropriate user name and tty device. + */ +int logwtmp (char *line, char *name, char *host) + { + struct utmp ut; + int mode; +/* + * Control the 'mesg' function based upon the state of the logon + * operation. + */ + mode = (*name != '\0') ? 0600 : 0622; + if (chmod (devnam, mode) < 0) + { + syslog (LOG_ERR, "chmod(\"%s\", 0%o): %m", devnam, mode); + } +/* + * Update the signon database for users. + */ memset (&ut, 0, sizeof (ut)); (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name)); @@ -1208,4 +1691,118 @@ logwtmp(line, name, host) pututline (&ut); /* Write the line to the proper place */ endutent(); /* Indicate operation is complete */ + } + +/* + * Code for locking/unlocking the serial device. + * This code is derived from chat.c. + */ + +#define LOCK_PREFIX "/var/lock/LCK.." + +/* + * lock - create a lock file for the named device + */ + +int lock (char *dev) + { + char hdb_lock_buffer[12]; + int fd, pid, n; + 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) + { + sprintf(hdb_lock_buffer, "%010d\n", getpid()); + write(fd, hdb_lock_buffer, 11); + 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) + { + hdb_lock_buffer[n] = '\0'; + sscanf (hdb_lock_buffer, " %d", &pid); + if (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", lock_file); + break; + } + + free(lock_file); + lock_file = NULL; + return -1; } + +/* + * unlock - remove our lockfile + */ + +void unlock(void) + { + if (lock_file) + { + unlink(lock_file); + free(lock_file); + lock_file = NULL; + } + }