diff options
Diffstat (limited to '')
| -rw-r--r-- | c/src/libnetworking/pppd/sys-rtems.c (renamed from c/src/libnetworking/pppd/rtems-ppp.c) | 733 |
1 files changed, 267 insertions, 466 deletions
diff --git a/c/src/libnetworking/pppd/rtems-ppp.c b/c/src/libnetworking/pppd/sys-rtems.c index 12ca0eb9fb..bfc80d50a6 100644 --- a/c/src/libnetworking/pppd/rtems-ppp.c +++ b/c/src/libnetworking/pppd/sys-rtems.c @@ -1,6 +1,6 @@ /* * sys-bsd.c - System-dependent procedures for setting up - * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, RTEMS, etc.) + * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.) * * Copyright (c) 1989 Carnegie Mellon University. * Copyright (c) 1995 The Australian National University. @@ -20,19 +20,11 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -/* static char rcsid[] = "$Id$"; */ -/* $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */ -#endif - -/* - * TODO: - */ +#define RCSID "$Id$" #include <stdio.h> -#include <syslog.h> #include <string.h> -#include <stdlib.h> +#include <stdlib.h> #include <unistd.h> #include <errno.h> #include <fcntl.h> @@ -44,9 +36,6 @@ #include <sys/time.h> #include <sys/stat.h> #include <sys/param.h> -#ifdef NetBSD1_2 -#include <util.h> -#endif #ifdef PPP_FILTER #include <net/bpf.h> #endif @@ -67,10 +56,19 @@ #endif #endif +#include <rtems.h> +#include <rtems/rtems_bsdnet.h> +#include <rtems/termiostypes.h> +extern int rtems_bsdnet_microseconds_per_tick; +extern rtems_id rtems_pppd_taskid; + #include "pppd.h" #include "fsm.h" #include "ipcp.h" +static const char rcsid[] = RCSID; + + static int initdisc = -1; /* Initial TTY discipline for ppp_fd */ static int initfdflags = -1; /* Initial file descriptor flags for ppp_fd */ static int ppp_fd = -1; /* fd which is set to PPP discipline */ @@ -80,15 +78,8 @@ static int restore_term; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ static struct winsize wsinfo; /* Initial window size info */ -#if 0 -static char *lock_file; /* name of lock file created */ -#endif - static int loop_slave = -1; static int loop_master; -#if 0 -static char loop_name[20]; -#endif static unsigned char inbuf[512]; /* buffer for chars read from loopback */ @@ -104,6 +95,12 @@ static int dodefaultroute __P((u_int32_t, int)); static int get_ether_addr __P((u_int32_t, struct sockaddr_dl *)); +void +sys_serialcallback(struct termios *tty, void *arg) +{ + rtems_event_send(rtems_pppd_taskid, RTEMS_EVENT_31); +} + /* * sys_init - System-dependent initialization. */ @@ -111,10 +108,8 @@ void sys_init() { /* Get an internet socket for doing socket ioctl's on. */ - if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - syslog(LOG_ERR, "Couldn't create IP socket: %m"); - die(1); - } + if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + fatal("Couldn't create IP socket: %m"); } /* @@ -128,7 +123,7 @@ sys_cleanup() struct ifreq ifr; if (if_is_up) { - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) >= 0 && ((ifr.ifr_flags & IFF_UP) != 0)) { ifr.ifr_flags &= ~IFF_UP; @@ -159,9 +154,10 @@ sys_close() /* * sys_check_options - check the options that the user specified */ -void +int sys_check_options() { + return 1; } /* @@ -173,26 +169,21 @@ ppp_available() { int s, ok; struct ifreq ifr; - extern char *no_ppp_msg; if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) return 1; /* can't tell */ - 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; close(s); - no_ppp_msg = "\ -This system lacks kernel support for PPP. To include PPP support\n\ -in the kernel, please follow the steps detailed in the README.bsd\n\ -file in the ppp-2.2 distribution.\n"; return ok; } /* * establish_ppp - Turn the serial port into a ppp interface. */ -void +int establish_ppp(fd) int fd; { @@ -203,46 +194,32 @@ establish_ppp(fd) /* * Demand mode - prime the old ppp device to relinquish the unit. */ - if (ioctl(ppp_fd, PPPIOCXFERUNIT, 0) < 0) { - syslog(LOG_ERR, "ioctl(transfer ppp unit): %m"); - die(1); - } + if (ioctl(ppp_fd, PPPIOCXFERUNIT, 0) < 0) + fatal("ioctl(transfer ppp unit): %m"); } /* * Save the old line discipline of fd, and set it to PPP. */ - if (ioctl(fd, TIOCGETD, &initdisc) < 0) { - syslog(LOG_ERR, "ioctl(TIOCGETD): %m"); - die(1); - } - if (ioctl(fd, TIOCSETD, &pppdisc) < 0) { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); - die(1); - } + if (ioctl(fd, TIOCGETD, &initdisc) < 0) + fatal("ioctl(TIOCGETD): %m"); + if (ioctl(fd, TIOCSETD, &pppdisc) < 0) + fatal("ioctl(TIOCSETD): %m"); if (!demand) { /* * Find out which interface we were given. */ - if (ioctl(fd, PPPIOCGUNIT, &interfunit) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m"); - die(1); - } + if (ioctl(fd, PPPIOCGUNIT, &pppifunit) < 0) + fatal("ioctl(PPPIOCGUNIT): %m"); } else { /* * Check that we got the same unit again. */ - - if (ioctl(fd, PPPIOCGUNIT, &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m"); - die(1); - } - if (x != interfunit) { - syslog(LOG_ERR, "transfer_ppp failed: wanted unit %d, got %d", - interfunit, x); - die(1); - } + if (ioctl(fd, PPPIOCGUNIT, &x) < 0) + fatal("ioctl(PPPIOCGUNIT): %m"); + if (x != pppifunit) + fatal("transfer_ppp failed: wanted unit %d, got %d", pppifunit, x); x = TTYDISC; ioctl(loop_slave, TIOCSETD, &x); } @@ -254,26 +231,23 @@ establish_ppp(fd) */ if (kdebugflag) { if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_WARNING, "ioctl (PPPIOCGFLAGS): %m"); + warn("ioctl (PPPIOCGFLAGS): %m"); } else { x |= (kdebugflag & 0xFF) * SC_DEBUG; if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) - syslog(LOG_WARNING, "ioctl(PPPIOCSFLAGS): %m") -; + warn("ioctl(PPPIOCSFLAGS): %m"); } } /* * Set device for non-blocking reads. */ -#define fcntl(a) - - -/* if ((initfdflags = fcntl(fd, F_GETFL)) == -1 + 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"); -*/ /*}*/ + warn("Couldn't set device to non-blocking mode: %m"); + } + + return fd; } /* @@ -287,28 +261,19 @@ restore_loop() /* * Transfer the ppp interface back to the loopback. */ - if (ioctl(ppp_fd, PPPIOCXFERUNIT, 0) < 0) { - syslog(LOG_ERR, "ioctl(transfer ppp unit): %m"); - die(1); - } + if (ioctl(ppp_fd, PPPIOCXFERUNIT, 0) < 0) + fatal("ioctl(transfer ppp unit): %m"); x = PPPDISC; - if (ioctl(loop_slave, TIOCSETD, &x) < 0) { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); - die(1); - } + if (ioctl(loop_slave, TIOCSETD, &x) < 0) + fatal("ioctl(TIOCSETD): %m"); /* * Check that we got the same unit again. */ - if (ioctl(loop_slave, PPPIOCGUNIT, &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m"); - die(1); - } - if (x != interfunit) { - syslog(LOG_ERR, "transfer_ppp failed: wanted unit %d, got %d", - interfunit, x); - die(1); - } + if (ioctl(loop_slave, PPPIOCGUNIT, &x) < 0) + fatal("ioctl(PPPIOCGUNIT): %m"); + if (x != pppifunit) + fatal("transfer_ppp failed: wanted unit %d, got %d", pppifunit, x); ppp_fd = loop_slave; } @@ -322,14 +287,14 @@ disestablish_ppp(fd) int fd; { /* Reset non-blocking mode on fd. */ -/* if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)*/ -/* syslog(LOG_WARNING, "Couldn't restore device fd flags: %m"); -*/ initfdflags = -1; + if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0) + warn("Couldn't restore device fd flags: %m"); + initfdflags = -1; /* Restore old line discipline. */ if (initdisc >= 0 && ioctl(fd, TIOCSETD, &initdisc) < 0) -/* syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); -*/ initdisc = -1; + error("ioctl(TIOCSETD): %m"); + initdisc = -1; if (fd == ppp_fd) ppp_fd = -1; @@ -360,11 +325,11 @@ clean_check() 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); + if (s != NULL) { + warn("Serial link is not 8-bit clean:"); + warn("All received characters had %s", s); } -*/ } + } } /* @@ -378,12 +343,11 @@ void set_up_tty(fd, local) int fd, local; { - struct termios tios; + struct termios tios; + struct ttywakeup wakeup; - if (tcgetattr(fd, &tios) < 0) { - syslog(LOG_ERR, "tcgetattr: %m"); - die(1); - } + if (tcgetattr(fd, &tios) < 0) + fatal("tcgetattr: %m"); if (!restore_term) { inittermios = tios; @@ -391,10 +355,19 @@ set_up_tty(fd, local) } tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL); - if (crtscts > 0 && !local) - tios.c_cflag |= CRTSCTS; - else if (crtscts < 0) + if (crtscts > 0 && !local) { + if (crtscts == 2) { +#ifdef CDTRCTS + tios.c_cflag |= CDTRCTS; +#endif + } else + tios.c_cflag |= CRTSCTS; + } else if (crtscts < 0) { tios.c_cflag &= ~CRTSCTS; +#ifdef CDTRCTS + tios.c_cflag &= ~CDTRCTS; +#endif + } tios.c_cflag |= CS8 | CREAD | HUPCL; if (local || !modem) @@ -407,8 +380,8 @@ set_up_tty(fd, local) if (crtscts == -2) { tios.c_iflag |= IXON | IXOFF; - tios.c_cc[VSTOP] = 0x13; - tios.c_cc[VSTART] = 0x11; + tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */ + tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */ } if (inspeed) { @@ -420,19 +393,21 @@ set_up_tty(fd, local) * We can't proceed if the serial port speed is 0, * since that implies that the serial port is disabled. */ - if (inspeed == 0) { - syslog(LOG_ERR, "Baud rate for %s is 0; need explicit baud rate", - devnam); - die(1); - } + if (inspeed == 0) + fatal("Baud rate for %s is 0; need explicit baud rate", devnam); } -/* baud_rate = 9600;*/ -/* we hardcode it temporarily */ - if (tcsetattr(fd, TCSANOW, &tios) < 0) { - syslog(LOG_ERR, "tcsetattr: %m"); - die(1); + baud_rate = inspeed; + +/* if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) { */ + if (tcsetattr(fd, TCSADRAIN, &tios) < 0) { + fatal("tcsetattr: %m"); } + /* set up callback function */ + wakeup.sw_pfn = sys_serialcallback; + wakeup.sw_arg = (void *)fd; + ioctl(fd, RTEMS_IO_RCVWAKEUP, &wakeup); + restore_term = 1; } @@ -443,26 +418,28 @@ void restore_tty(fd) int fd; { -/* if (restore_term) { + if (restore_term) { if (!default_device) { -*/ /* + /* * 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. */ -/* inittermios.c_lflag &= ~(ECHO | ECHONL); + inittermios.c_lflag &= ~(ECHO | ECHONL); } - if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) +/* if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) { */ + if (tcsetattr(fd, TCSADRAIN, &inittermios) < 0) { if (errno != ENXIO) - syslog(LOG_WARNING, "tcsetattr: %m"); + warn("tcsetattr: %m"); + } ioctl(fd, TIOCSWINSZ, &wsinfo); restore_term = 0; } -*/} +} /* - * - control the DTR line on the serial port. + * setdtr - control the DTR line on the serial port. * This is called from die(), so it shouldn't call die(). */ void @@ -474,16 +451,30 @@ int fd, on; ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits); } +/* + * get_pty - get a pty master/slave pair and chown the slave side + * to the uid given. Assumes slave_name points to >= 12 bytes of space. + */ +int +get_pty(master_fdp, slave_fdp, slave_name, uid) + int *master_fdp; + int *slave_fdp; + char *slave_name; + int uid; +{ + return 1; +} + /* * open_ppp_loopback - open the device we use for getting * packets in demand mode, and connect it to a ppp interface. * Here we use a pty. */ -void +int open_ppp_loopback() { - + return loop_master; } @@ -497,66 +488,33 @@ output(unit, p, len) int len; { if (debug); - syslog(LOG_DEBUG, "sent %d bytes ", len ); + dbglog("sent %P", p, len); if (write(ttyfd, p, len) < 0) { -/* if (errno != EIO) - syslog(LOG_ERR, "write: %m"); -*/ } -} - -extern int rtems_bsdnet_microseconds_per_tick; -#include <rtems.h> -#include <rtems/rtems_bsdnet.h> -/* - * wait_input - wait until there is data available on ttyfd, - * for the length of time specified by *timo (indefinite - * if timo is NULL). - */ - -/* - * 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). - */ -void -wait_loop_output(timo) - struct timeval *timo; -{ -/* - fd_set ready; - int n; -*/ - -/* FD_ZERO(&ready); - FD_SET(loop_master, &ready); - n = select(loop_master + 1, &ready, NULL, &ready, timo); - if (n < 0 && errno != EINTR) { -*/ -/* syslog(LOG_ERR, "select: %m");*/ -/* die(1); + if (errno != EIO) + error("write: %m"); } -*/ } /* - * wait_time - wait for a given length of time or until a - * signal is received. + * wait_input - wait until there is data available, + * for the length of time specified by *timo (indefinite + * if timo is NULL). */ void -wait_time(timo) +wait_input(timo) struct timeval *timo; { - rtems_status_code status; - rtems_interval ticks; + rtems_interval ticks; + rtems_event_set events; - ticks = - (timo->tv_sec*1000000+timo->tv_usec)/rtems_bsdnet_microseconds_per_tick; - status = rtems_task_wake_after( ticks ); + ticks = ((timo->tv_sec*1000000)+timo->tv_usec)/rtems_bsdnet_microseconds_per_tick; + if ( ticks > 0 ) { + rtems_event_receive(RTEMS_EVENT_31, (RTEMS_EVENT_ANY|RTEMS_WAIT), ticks, &events); + } } - /* * read_packet - get a PPP packet from the serial device. */ @@ -567,9 +525,9 @@ read_packet(buf) int len; if ((len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN)) < 0) { - if (errno == EWOULDBLOCK || errno == EINTR || errno == ETIMEDOUT) + if (errno == EWOULDBLOCK || errno == EINTR) return -1; - syslog(LOG_ERR, "read: %m"); + /*fatal("read: %m"); */ } return len; } @@ -591,13 +549,10 @@ get_loop_output() rv = 1; } - if (n == 0) { - syslog(LOG_ERR, "eof on loopback"); - die(1); - } else if (errno != EWOULDBLOCK){ - syslog(LOG_ERR, "read from loopback: %m"); - die(1); - } + if (n == 0) + fatal("eof on loopback"); + if (errno != EWOULDBLOCK) + fatal("read from loopback: %m"); return rv; } @@ -616,28 +571,21 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp) u_int x; struct ifreq ifr; - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy(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(); - } + if (ioctl(sockfd, SIOCSIFMTU, (caddr_t) &ifr) < 0) + fatal("ioctl(SIOCSIFMTU): %m"); - if (ioctl(ppp_fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m"); - quit(); - } + if (ioctl(ppp_fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) + fatal("ioctl(PPPIOCSASYNCMAP): %m"); - if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); - quit(); - } + if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) + fatal("ioctl (PPPIOCGFLAGS): %m"); x = pcomp? x | SC_COMP_PROT: x &~ SC_COMP_PROT; x = accomp? x | SC_COMP_AC: x &~ SC_COMP_AC; - if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); - quit(); - } +/* x = sync_serial ? x | SC_SYNC : x & ~SC_SYNC; */ + if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) + fatal("ioctl(PPPIOCSFLAGS): %m"); } @@ -650,7 +598,7 @@ ppp_set_xaccm(unit, accm) ext_accm accm; { if (ioctl(ppp_fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) - /*syslog(LOG_WARNING, "ioctl(set extended ACCM): %m")*/; + warn("ioctl(set extended ACCM): %m"); } @@ -664,31 +612,17 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp) u_int32_t asyncmap; int pcomp, accomp; { -/* int x; -*/ -/* if (ioctl(ppp_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m"); - quit(); - } -*/ -/* if (ioctl(ppp_fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m"); - quit(); - } -*/ -/* if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); - quit(); - } -*/ -/* x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC; - if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); - quit(); - } -*/ + if (ioctl(ppp_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) + fatal("ioctl(PPPIOCSMRU): %m"); + if (ioctl(ppp_fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) + fatal("ioctl(PPPIOCSRASYNCMAP): %m"); + if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) + fatal("ioctl (PPPIOCGFLAGS): %m"); + x = !accomp? x | SC_REJ_COMP_AC: x &~ SC_REJ_COMP_AC; + if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) + fatal("ioctl(PPPIOCSFLAGS): %m"); } /* @@ -722,13 +656,13 @@ ccp_flags_set(unit, isopen, isup) int x; if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { -/* syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); -*/ return; + error("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(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) -/* syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m")*/; + error("ioctl(PPPIOCSFLAGS): %m"); } /* @@ -743,7 +677,7 @@ ccp_fatal_error(unit) int x; if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { -/* syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m");*/ + error("ioctl(PPPIOCGFLAGS): %m"); return 0; } return x & SC_DC_FERROR; @@ -760,6 +694,27 @@ get_idle_time(u, ip) return ioctl(ppp_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)); + strlcpy(req.ifr_name, ifname, sizeof(req.ifr_name)); + if (ioctl(sockfd, 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; +} + #ifdef PPP_FILTER /* @@ -773,13 +728,13 @@ set_filters(pass, active) if (pass->bf_len > 0) { if (ioctl(ppp_fd, PPPIOCSPASS, pass) < 0) { - syslog(LOG_ERR, "Couldn't set pass-filter in kernel: %m"); + error("Couldn't set pass-filter in kernel: %m"); ret = 0; } } if (active->bf_len > 0) { if (ioctl(ppp_fd, PPPIOCSACTIVE, active) < 0) { - syslog(LOG_ERR, "Couldn't set active-filter in kernel: %m"); + error("Couldn't set active-filter in kernel: %m"); ret = 0; } } @@ -797,17 +752,17 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid) u_int x; if (ioctl(ppp_fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m"); + error("ioctl (PPPIOCGFLAGS): %m"); return 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(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); + error("ioctl(PPPIOCSFLAGS): %m"); return 0; } if (vjcomp && ioctl(ppp_fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { - syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); + error("ioctl(PPPIOCSFLAGS): %m"); return 0; } return 1; @@ -822,14 +777,14 @@ sifup(u) { struct ifreq ifr; - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m"); + error("ioctl (SIOCGIFFLAGS): %m"); return 0; } ifr.ifr_flags |= IFF_UP; if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); + error("ioctl(SIOCSIFFLAGS): %m"); return 0; } if_is_up = 1; @@ -850,7 +805,7 @@ sifnpmode(u, proto, mode) npi.protocol = proto; npi.mode = mode; if (ioctl(ppp_fd, PPPIOCSNPMODE, &npi) < 0) { -/* syslog(LOG_ERR, "ioctl(set NP %d mode to %d): %m", proto, mode);*/ + error("ioctl(set NP %d mode to %d): %m", proto, mode); return 0; } return 1; @@ -873,14 +828,14 @@ sifdown(u) ioctl(ppp_fd, PPPIOCSNPMODE, (caddr_t) &npi); /* ignore errors, because ppp_fd might have been closed by now. */ - strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); + strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { -/* syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");*/ + error("ioctl (SIOCGIFFLAGS): %m"); rv = 0; } else { ifr.ifr_flags &= ~IFF_UP; if (ioctl(sockfd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { -/* syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");*/ + error("ioctl(SIOCSIFFLAGS): %m"); rv = 0; } else if_is_up = 0; @@ -907,43 +862,8 @@ sifaddr(u, o, h, m) { struct ifaliasreq ifra; struct ifreq ifr; -/* struct sockaddr_in address; - struct sockaddr_in netmask; - struct sockaddr_in broadcast; - - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - memset (&address, '\0', sizeof address); - address.sin_len = sizeof address; - address.sin_family = AF_INET; - address.sin_addr.s_addr = o; - memcpy (&ifr.ifr_addr, &address, sizeof address); - if (ioctl(sockfd, SIOCDIFADDR, (caddr_t) &ifr) < 0) { - if (errno != EADDRNOTAVAIL) - syslog(LOG_WARNING, "Couldn't remove interface address: %m"); - } - - if (ioctl (sockfd, SIOCSIFADDR, &ifr) < 0) - syslog(LOG_ERR, "Can't set address: "); - - memset (&netmask, '\0', sizeof netmask); - netmask.sin_len = sizeof netmask; - netmask.sin_family = AF_INET; - netmask.sin_addr.s_addr = m ; - memcpy (&ifr.ifr_addr, &netmask, sizeof netmask); - - if (ioctl (sockfd, SIOCSIFNETMASK, &ifr) < 0) - syslog(LOG_ERR,"Can't set netmask: "); - memset (&broadcast, '\0', sizeof broadcast); - broadcast.sin_len = sizeof broadcast; - broadcast.sin_family = AF_INET; - broadcast.sin_addr.s_addr = h; - memcpy (&ifr.ifr_broadaddr, &broadcast, sizeof broadcast); - if (ioctl (sockfd, SIOCSIFBRDADDR, &ifr) < 0) - syslog(LOG_ERR,"Can't set broadcast address: "); - -*/ - strncpy(ifra.ifra_name, ifname, sizeof(ifra.ifra_name)); + strlcpy(ifra.ifra_name, ifname, sizeof(ifra.ifra_name)); SET_SA_FAMILY(ifra.ifra_addr, AF_INET); ((struct sockaddr_in *) &ifra.ifra_addr)->sin_addr.s_addr = o; SET_SA_FAMILY(ifra.ifra_broadaddr, AF_INET); @@ -954,25 +874,18 @@ sifaddr(u, o, h, m) } else BZERO(&ifra.ifra_mask, sizeof(ifra.ifra_mask)); BZERO(&ifr, sizeof(ifr)); - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(sockfd, SIOCDIFADDR, (caddr_t) &ifr) < 0) { -/* if (errno != EADDRNOTAVAIL) - syslog(LOG_WARNING, "Couldn't remove interface address: %m"); -*/ + if (errno != EADDRNOTAVAIL) + warn("Couldn't remove interface address: %m"); } - - - if (ioctl(sockfd, SIOCAIFADDR, (caddr_t) &ifra) < 0) { if (errno != EEXIST) { - syslog(LOG_ERR, "Couldn't set interface address: %m"); + error("Couldn't set interface address: %m"); return 0; } -/* syslog(LOG_WARNING, - "Couldn't set interface address: Address %s already exists", - ip_ntoa(o)); -*/ } + warn("Couldn't set interface address: Address %I already exists", o); + } ifaddrs[0] = o; ifaddrs[1] = h; return 1; @@ -990,16 +903,16 @@ cifaddr(u, o, h) struct ifaliasreq ifra; ifaddrs[0] = 0; - strncpy(ifra.ifra_name, ifname, sizeof(ifra.ifra_name)); + strlcpy(ifra.ifra_name, ifname, sizeof(ifra.ifra_name)); SET_SA_FAMILY(ifra.ifra_addr, AF_INET); ((struct sockaddr_in *) &ifra.ifra_addr)->sin_addr.s_addr = o; SET_SA_FAMILY(ifra.ifra_broadaddr, AF_INET); ((struct sockaddr_in *) &ifra.ifra_broadaddr)->sin_addr.s_addr = h; BZERO(&ifra.ifra_mask, sizeof(ifra.ifra_mask)); if (ioctl(sockfd, SIOCDIFADDR, (caddr_t) &ifra) < 0) { -/* if (errno != EADDRNOTAVAIL) - syslog(LOG_WARNING, "Couldn't delete interface address: %m"); -*/ return 0; + if (errno != EADDRNOTAVAIL) + warn("Couldn't delete interface address: %m"); + return 0; } return 1; } @@ -1034,95 +947,48 @@ dodefaultroute(g, cmd) u_int32_t g; int cmd; { -/* int routes;*/ - - struct sockaddr_in address; - struct sockaddr_in netmask; - /* struct sockaddr_in broadcast; */ - struct sockaddr_in gateway; - -/* struct { - struct rt_msghdr hdr; - struct sockaddr_in dst; - struct sockaddr_in gway; - struct sockaddr_in mask; - } rtmsg; -*/ -/* if ((routes = socket(PF_ROUTE, SOCK_RAW, AF_INET)) < 0) { - syslog(LOG_ERR, "Couldn't %s default route: socket: %m", - cmd=='s'? "add": "delete"); - return 0; + int status; + struct sockaddr_in address; + struct sockaddr_in netmask; + struct sockaddr_in gateway; + + memset((void *) &address, 0, sizeof(address)); + address.sin_len = sizeof address; + address.sin_family = AF_INET; + address.sin_addr.s_addr = INADDR_ANY; + + memset((void *) &netmask, 0, sizeof(netmask)); + netmask.sin_len = sizeof netmask; + netmask.sin_addr.s_addr = INADDR_ANY; + netmask.sin_family = AF_INET; + + if (cmd=='s') { + memset((void *) &gateway, 0, sizeof(gateway)); + gateway.sin_len = sizeof gateway; + gateway.sin_family = AF_INET; + gateway.sin_addr.s_addr = g; + + rtems_bsdnet_rtrequest(RTM_ADD, + (struct sockaddr *)&address, + (struct sockaddr *)&gateway, + (struct sockaddr *)&netmask, + (RTF_UP|RTF_GATEWAY|RTF_STATIC), NULL); } -*/ - memset((void *) &address, 0, sizeof(address)); - address.sin_len = sizeof address; - address.sin_family = AF_INET; - address.sin_addr.s_addr = INADDR_ANY; - - memset((void *) &netmask, 0, sizeof(netmask)); - netmask.sin_len = sizeof netmask; - netmask.sin_addr.s_addr = INADDR_ANY; - netmask.sin_family = AF_INET; - - - if (cmd=='s') - { - memset((void *) &gateway, 0, sizeof(gateway)); - gateway.sin_len = sizeof gateway; - gateway.sin_family = AF_INET; - gateway.sin_addr.s_addr = htons(g) ; - - - if (rtems_bsdnet_rtrequest (RTM_ADD, - (struct sockaddr *)&address, - (struct sockaddr *)&gateway, - (struct sockaddr *)&netmask, - (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL) < 0) - /*syslog(LOG_WARNING,"Can't set default route: ")*/ - ; - } - else - { - memset((void *) &gateway, 0, sizeof(gateway)); - gateway.sin_len = sizeof gateway; - gateway.sin_family = AF_INET; - gateway.sin_addr.s_addr = INADDR_ANY; - - if (rtems_bsdnet_rtrequest (RTM_DELETE, - (struct sockaddr *)&address, - (struct sockaddr *)&gateway, - (struct sockaddr *)&netmask, - (RTF_UP | RTF_STATIC), NULL) < 0) - /*syslog(LOG_WARNING,"Can't set default route: ")*/ - ; - } - -/* - rtmsg.hdr.rtm_type = cmd == 's'? RTM_ADD: RTM_DELETE; - rtmsg.hdr.rtm_flags = RTF_UP | RTF_GATEWAY; - rtmsg.hdr.rtm_version = RTM_VERSION; - rtmsg.hdr.rtm_seq = ++rtm_seq; - rtmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY | RTA_NETMASK; - rtmsg.dst.sin_len = sizeof(rtmsg.dst); - rtmsg.dst.sin_family = AF_INET; - rtmsg.gway.sin_len = sizeof(rtmsg.gway); - rtmsg.gway.sin_family = AF_INET; - rtmsg.gway.sin_addr.s_addr = g; - rtmsg.mask.sin_len = sizeof(rtmsg.dst); - rtmsg.mask.sin_family = AF_INET; - - rtmsg.hdr.rtm_msglen = sizeof(rtmsg); - - - if (write(routes, &rtmsg, sizeof(rtmsg)) < 0) { - syslog(LOG_ERR, "Couldn't %s default route: %m", - cmd=='s'? "add": "delete"); - close(routes); - return 0; + else { + memset((void *) &gateway, 0, sizeof(gateway)); + gateway.sin_len = sizeof gateway; + gateway.sin_family = AF_INET; + gateway.sin_addr.s_addr = INADDR_ANY; + + rtems_bsdnet_rtrequest(RTM_DELETE, + (struct sockaddr *)&address, + (struct sockaddr *)&gateway, + (struct sockaddr *)&netmask, + (RTF_UP|RTF_STATIC), NULL); } - close(routes);*/ - default_route_gateway = (cmd == 's')? g: 0; + default_route_gateway = (cmd == 's')? g: 0; + return 1; } @@ -1146,8 +1012,6 @@ sifproxyarp(unit, hisaddr) u_int32_t hisaddr; { int routes; - return 0; - /* * Get the hardware address of an interface on the same subnet @@ -1155,13 +1019,13 @@ sifproxyarp(unit, hisaddr) */ memset(&arpmsg, 0, sizeof(arpmsg)); if (!get_ether_addr(hisaddr, &arpmsg.hwa)) { -/* syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); -*/ return 0; + error("Cannot determine ethernet address for proxy ARP"); + return 0; } if ((routes = socket(PF_ROUTE, SOCK_RAW, AF_INET)) < 0) { -/* syslog(LOG_ERR, "Couldn't add proxy arp entry: socket: %m"); -*/ return 0; + error("Couldn't add proxy arp entry: socket: %m"); + return 0; } arpmsg.hdr.rtm_type = RTM_ADD; @@ -1178,8 +1042,8 @@ sifproxyarp(unit, hisaddr) arpmsg.hdr.rtm_msglen = (char *) &arpmsg.hwa - (char *) &arpmsg + arpmsg.hwa.sdl_len; if (write(routes, &arpmsg, arpmsg.hdr.rtm_msglen) < 0) { -/* syslog(LOG_ERR, "Couldn't add proxy arp entry: %m"); -*/ close(routes); + error("Couldn't add proxy arp entry: %m"); + close(routes); return 0; } @@ -1207,12 +1071,12 @@ cifproxyarp(unit, hisaddr) arpmsg.hdr.rtm_seq = ++rtm_seq; if ((routes = socket(PF_ROUTE, SOCK_RAW, AF_INET)) < 0) { - syslog(LOG_ERR, "Couldn't delete proxy arp entry: socket: %m"); + error("Couldn't delete proxy arp entry: socket: %m"); return 0; } if (write(routes, &arpmsg, arpmsg.hdr.rtm_msglen) < 0) { - syslog(LOG_ERR, "Couldn't delete proxy arp entry: %m"); + error("Couldn't delete proxy arp entry: %m"); close(routes); return 0; } @@ -1245,7 +1109,7 @@ sifproxyarp(unit, hisaddr) * as our local address. */ if (!get_ether_addr(hisaddr, &dls.sdl)) { - syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); + error("Cannot determine ethernet address for proxy ARP"); return 0; } @@ -1256,7 +1120,7 @@ sifproxyarp(unit, hisaddr) ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr; arpreq.arp_flags = ATF_PERM | ATF_PUBL; if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_ERR, "Couldn't add proxy arp entry: %m"); + error("Couldn't add proxy arp entry: %m"); return 0; } @@ -1278,7 +1142,7 @@ cifproxyarp(unit, hisaddr) SET_SA_FAMILY(arpreq.arp_pa, AF_INET); ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = hisaddr; if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) { - syslog(LOG_WARNING, "Couldn't delete proxy arp entry: %m"); + warn("Couldn't delete proxy arp entry: %m"); return 0; } proxy_arp_addr = 0; @@ -1308,7 +1172,7 @@ get_ether_addr(ipaddr, hwaddr) ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) { - syslog(LOG_ERR, "ioctl(SIOCGIFCONF): %m"); + error("ioctl(SIOCGIFCONF): %m"); return 0; } @@ -1321,7 +1185,7 @@ get_ether_addr(ipaddr, hwaddr) ((char *)&ifr->ifr_addr + ifr->ifr_addr.sa_len)) { 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)); /* * Check that the interface is up, and not point-to-point * or loopback. @@ -1347,7 +1211,7 @@ get_ether_addr(ipaddr, hwaddr) if (ifr >= ifend) return 0; - syslog(LOG_INFO, "found interface %s for proxy arp", ifr->ifr_name); + info("found interface %s for proxy arp", ifr->ifr_name); /* * Now scan through again looking for a link-level address @@ -1403,7 +1267,7 @@ GetMask(addr) ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; if (ioctl(sockfd, SIOCGIFCONF, &ifc) < 0) { - syslog(LOG_WARNING, "ioctl(SIOCGIFCONF): %m"); + warn("ioctl(SIOCGIFCONF): %m"); return mask; } ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); @@ -1420,7 +1284,7 @@ GetMask(addr) /* * Check that the interface is up, and not point-to-point or 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(sockfd, SIOCGIFFLAGS, &ifreq) < 0) continue; if ((ifreq.ifr_flags & (IFF_UP|IFF_POINTOPOINT|IFF_LOOPBACK)) @@ -1438,84 +1302,21 @@ GetMask(addr) } /* - * Use the hostid as part of the random number seed. + * have_route_to - determine if the system has any route to + * a given IP address. + * For demand mode to work properly, we have to ignore routes + * through our own interface. */ -int -get_host_seed() +int have_route_to(u_int32_t addr) { - return 33; -/* return gethostid();*/ + return -1; } /* - * lock - create a lock file for the named lock device + * Use the hostid as part of the random number seed. */ -#define LOCK_PREFIX "/var/spool/lock/LCK.." - int -lock(dev) - char *dev; +get_host_seed() { -/* char hdb_lock_buffer[12]; - int fd, pid, n; - char *p; - - if ((p = strrchr(dev, '/')) != NULL) - dev = p + 1; - lock_file = malloc(strlen(LOCK_PREFIX) + strlen(dev) + 1); - if (lock_file == NULL) - novm("lock file name"); - strcat(strcpy(lock_file, LOCK_PREFIX), dev); - - while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) { - if (errno == EEXIST - && (fd = open(lock_file, O_RDONLY, 0)) >= 0) { - - n = read(fd, hdb_lock_buffer, 11); - if (n <= 0) { - syslog(LOG_ERR, "Can't read pid from lock file %s", lock_file); - close(fd); - } else { - hdb_lock_buffer[n] = 0; - pid = atoi(hdb_lock_buffer); - if (kill(pid, 0) == -1 && errno == ESRCH) { - - if (unlink(lock_file) == 0) { - close(fd); - syslog(LOG_NOTICE, "Removed stale lock on %s (pid %d)", - dev, pid); - continue; - } else - syslog(LOG_WARNING, "Couldn't remove stale lock on %s", - dev); - } else - syslog(LOG_NOTICE, "Device %s is locked by pid %d", - dev, pid); - } - close(fd); - } else - syslog(LOG_ERR, "Can't create lock file %s: %m", lock_file); - free(lock_file); - lock_file = NULL; - return -1; - } - - sprintf(hdb_lock_buffer, "%10d\n", getpid()); - write(fd, hdb_lock_buffer, 11); - - close(fd); -*/ return 0; + return 17; } - -/* - * unlock - remove our lockfile - */ -void -unlock() -{ -/* if (lock_file) { - unlink(lock_file); - free(lock_file); - lock_file = NULL; - } -*/} |