X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=189b809cc97d128ed8944fc012f3b6424369c4b0;hp=88ab9ddba54b50a0bd2e31175844611e299f87f6;hb=ffa027207fff95bd19cb529105bd549fb6ae1709;hpb=3f2fe49d822135c209e9896f666b748cf2234f2e diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 88ab9dd..189b809 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -73,7 +73,6 @@ #include "pppd.h" #include "fsm.h" #include "ipcp.h" -#include "patchlevel.h" #ifdef IPX_CHANGE #include "ipxcp.h" @@ -85,6 +84,11 @@ #endif #endif /* IPX_CHANGE */ +#ifdef PPP_FILTER +#include +#include +#endif /* PPP_FILTER */ + #ifdef LOCKLIB #include #endif @@ -259,11 +263,6 @@ void sys_init(void) { 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) @@ -282,7 +281,7 @@ void sys_init(void) #ifdef INET6 sock6_fd = socket(AF_INET6, SOCK_DGRAM, 0); if (sock6_fd < 0) - fatal("Couldn't create IPv6 socket: %m(%d)", errno); + sock6_fd = -errno; /* save errno for later */ #endif FD_ZERO(&in_fds); @@ -354,10 +353,10 @@ static int set_kdebugflag (int requested_level) /******************************************************************** * - * establish_ppp - Turn the serial port into a ppp interface. + * tty_establish_ppp - Turn the serial port into a ppp interface. */ -int establish_ppp (int tty_fd) +int tty_establish_ppp (int tty_fd) { int x; int fd = -1; @@ -415,7 +414,8 @@ int establish_ppp (int tty_fd) warn("Couldn't set /dev/ppp (channel) to nonblock: %m"); set_ppp_fd(fd); - ifunit = -1; + if (!looped) + ifunit = -1; if (!looped && !multilink) { /* * Create a new PPP unit. @@ -441,8 +441,9 @@ int establish_ppp (int tty_fd) */ set_ppp_fd (tty_fd); if (ioctl(tty_fd, PPPIOCGUNIT, &x) < 0) { - if ( ! ok_error (errno)) - fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); + if (ok_error (errno)) + goto err; + fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); } /* Check that we got the same unit again. */ if (looped && x != ifunit) @@ -468,8 +469,12 @@ int establish_ppp (int tty_fd) if (!looped) set_kdebugflag (kdebugflag); - set_flags(ppp_fd, get_flags(ppp_fd) & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | - SC_RCV_EVNP | SC_RCV_ODDP)); +#define SC_RCVB (SC_RCV_B7_0 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP) +#define SC_LOGB (SC_DEBUG | SC_LOG_INPKT | SC_LOG_OUTPKT | SC_LOG_RAWIN \ + | SC_LOG_FLUSH) + + set_flags(ppp_fd, ((get_flags(ppp_fd) & ~(SC_RCVB | SC_LOGB)) + | ((kdebugflag * SC_DEBUG) & SC_LOGB))); SYSDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver", driver_version, driver_modification, driver_patch)); @@ -486,11 +491,12 @@ int establish_ppp (int tty_fd) /******************************************************************** * - * disestablish_ppp - Restore the serial port to normal operation. + * tty_disestablish_ppp - Restore the serial port to normal operation, + * and reconnect the ppp unit to the loopback if in demand mode. * This shouldn't call die() because it's called from die(). */ -void disestablish_ppp(int tty_fd) +void tty_disestablish_ppp(int tty_fd) { if (!hungup) { /* @@ -522,10 +528,17 @@ void disestablish_ppp(int tty_fd) if (new_style_driver) { close(ppp_fd); ppp_fd = -1; - if (!looped && ifunit >= 0 && ioctl(ppp_dev_fd, PPPIOCDETACH) < 0) + if (demand) { + set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) | SC_LOOP_TRAFFIC); + looped = 1; + } else if (ifunit >= 0 && ioctl(ppp_dev_fd, PPPIOCDETACH) < 0) error("Couldn't release PPP unit: %m"); if (!multilink) remove_fd(ppp_dev_fd); + } else { + /* old-style driver */ + if (demand) + set_ppp_fd(slave_fd); } } @@ -550,38 +563,23 @@ static int make_ppp_unit() } /* - * make_new_bundle - create a new PPP unit (i.e. a bundle) - * and connect our channel to it. This should only get called - * if `multilink' was set at the time establish_ppp was called. + * cfg_bundle - configure the existing bundle. + * Used in demand mode. */ -void make_new_bundle(int mrru, int mtru, int rssn, int tssn) +void cfg_bundle(int mrru, int mtru, int rssn, int tssn) { int flags; - struct ifreq ifr; - if (looped || !new_style_driver) + if (!new_style_driver) return; - dbglog("make_new_bundle(%d,%d,%d,%d)", mrru, mtru, rssn, tssn); - - /* make us a ppp unit */ - if (make_ppp_unit() < 0) - die(1); /* set the mrru, mtu and flags */ if (ioctl(ppp_dev_fd, PPPIOCSMRRU, &mrru) < 0) error("Couldn't set MRRU: %m"); flags = get_flags(ppp_dev_fd); flags &= ~(SC_MP_SHORTSEQ | SC_MP_XSHORTSEQ); - flags |= (rssn? SC_MP_SHORTSEQ: 0) | (tssn? SC_MP_XSHORTSEQ: 0); - - if (mtru > 0 && mtru != link_mtu) { - memset(&ifr, 0, sizeof(ifr)); - slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "ppp%d", ifunit); - ifr.ifr_mtu = mtru; - if (ioctl(sock_fd, SIOCSIFMTU, &ifr) < 0) - error("Couldn't set interface MTU: %m"); - flags |= SC_MULTILINK; - } + flags |= (rssn? SC_MP_SHORTSEQ: 0) | (tssn? SC_MP_XSHORTSEQ: 0) + | (mrru? SC_MULTILINK: 0); set_flags(ppp_dev_fd, flags); @@ -591,8 +589,29 @@ void make_new_bundle(int mrru, int mtru, int rssn, int tssn) add_fd(ppp_dev_fd); } +/* + * make_new_bundle - create a new PPP unit (i.e. a bundle) + * and connect our channel to it. This should only get called + * if `multilink' was set at the time establish_ppp was called. + * In demand mode this uses our existing bundle instead of making + * a new one. + */ +void make_new_bundle(int mrru, int mtru, int rssn, int tssn) +{ + if (!new_style_driver) + return; + + /* make us a ppp unit */ + if (make_ppp_unit() < 0) + die(1); + + /* set the mrru and flags */ + cfg_bundle(mrru, mtru, rssn, tssn); +} + /* * bundle_attach - attach our link to a given PPP unit. + * We assume the unit is controlled by another pppd. */ int bundle_attach(int ifnum) { @@ -609,7 +628,6 @@ int bundle_attach(int ifnum) set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) | SC_MULTILINK); ifunit = ifnum; - dbglog("bundle_attach succeeded"); return 1; } @@ -717,6 +735,9 @@ struct speed { #ifdef B57600 { 57600, B57600 }, #endif +#ifdef B76800 + { 76800, B76800 }, +#endif #ifdef B115200 { 115200, B115200 }, #endif @@ -731,6 +752,9 @@ struct speed { #endif #ifdef B460800 { 460800, B460800 }, +#endif +#ifdef B921600 + { 921600, B921600 }, #endif { 0, 0 } }; @@ -973,14 +997,18 @@ int read_packet (unsigned char *buf) nr = -1; if (ppp_fd >= 0) { nr = read(ppp_fd, buf, len); - if (nr < 0 && errno != EWOULDBLOCK && errno != EIO) + if (nr < 0 && errno != EWOULDBLOCK && errno != EIO && errno != EINTR) error("read: %m"); + if (nr < 0 && errno == ENXIO) + return 0; } if (nr < 0 && new_style_driver && ifunit >= 0) { /* N.B. we read ppp_fd first since LCP packets come in there. */ nr = read(ppp_dev_fd, buf, len); - if (nr < 0 && errno != EWOULDBLOCK && errno != EIO) + if (nr < 0 && errno != EWOULDBLOCK && errno != EIO && errno != EINTR) error("read /dev/ppp: %m"); + if (nr < 0 && errno == ENXIO) + return 0; } return (new_style_driver && nr > 0)? nr+2: nr; } @@ -1017,31 +1045,40 @@ get_loop_output(void) return rv; } -/******************************************************************** - * - * ppp_send_config - configure the transmit characteristics of - * the ppp interface. +/* + * netif_set_mtu - set the MTU on the PPP network interface. */ - -void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) +void +netif_set_mtu(int unit, int mtu) { - u_int x; struct ifreq ifr; - - SYSDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu)); -/* - * Set the MTU and other parameters for the ppp device - */ + + SYSDEBUG ((LOG_DEBUG, "netif_set_mtu: mtu = %d\n", mtu)); + memset (&ifr, '\0', sizeof (ifr)); strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); ifr.ifr_mtu = mtu; if (ifunit >= 0 && ioctl(sock_fd, SIOCSIFMTU, (caddr_t) &ifr) < 0) - fatal("ioctl(SIOCSIFMTU): %m(%d)", errno); - link_mtu = mtu; + fatal("ioctl(SIOCSIFMTU): %m"); +} + +/******************************************************************** + * + * tty_send_config - configure the transmit characteristics of + * the ppp interface. + */ +void tty_send_config (int mtu,u_int32_t asyncmap,int pcomp,int accomp) +{ + u_int x; + +/* + * Set the asyncmap and other parameters for the ppp device + */ if (!still_ppp()) return; + link_mtu = mtu; SYSDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); if (ioctl(ppp_fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) { if (!ok_error(errno)) @@ -1058,10 +1095,10 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) /******************************************************************** * - * ppp_set_xaccm - set the extended transmit ACCM for the interface. + * tty_set_xaccm - set the extended transmit ACCM for the interface. */ -void ppp_set_xaccm (int unit, ext_accm accm) +void tty_set_xaccm (ext_accm accm) { SYSDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n", accm[0], accm[1], accm[2], accm[3])); @@ -1076,11 +1113,11 @@ void ppp_set_xaccm (int unit, ext_accm accm) /******************************************************************** * - * ppp_recv_config - configure the receive-side characteristics of + * tty_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) +void tty_recv_config (int mru,u_int32_t asyncmap,int pcomp,int accomp) { SYSDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru)); /* @@ -1135,7 +1172,7 @@ 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()) { + if (still_ppp() && ifunit >= 0) { 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; @@ -1143,6 +1180,33 @@ void ccp_flags_set (int unit, int isopen, int isup) } } +#ifdef PPP_FILTER +/* + * set_filters - set the active and pass filters in the kernel driver. + */ +int set_filters(struct bpf_program *pass, struct bpf_program *active) +{ + struct sock_fprog fp; + + fp.len = pass->bf_len; + fp.filter = (struct sock_filter *) pass->bf_insns; + if (ioctl(ppp_dev_fd, PPPIOCSPASS, &fp) < 0) { + if (errno == ENOTTY) + warn("kernel does not support PPP filtering"); + else + error("Couldn't set pass-filter in kernel: %m"); + return 0; + } + fp.len = active->bf_len; + fp.filter = (struct sock_filter *) active->bf_insns; + if (ioctl(ppp_dev_fd, PPPIOCSACTIVE, &fp) < 0) { + error("Couldn't set active-filter in kernel: %m"); + return 0; + } + return 1; +} +#endif /* PPP_FILTER */ + /******************************************************************** * * get_idle_time - return how long the link has been idle. @@ -1176,6 +1240,8 @@ get_ppp_stats(u, stats) } stats->bytes_in = req.stats.p.ppp_ibytes; stats->bytes_out = req.stats.p.ppp_obytes; + stats->pkts_in = req.stats.p.ppp_ipackets; + stats->pkts_out = req.stats.p.ppp_opackets; return 1; } @@ -1760,24 +1826,20 @@ 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); + char *endp; + + *version = (int) strtoul (buf, &endp, 10); *modification = 0; *patch = 0; - if (*buf == '.') { - ++buf; - *modification = (int) strtoul (buf, &buf, 10); - if (*buf == '.') { - ++buf; + if (endp != buf && *endp == '.') { + buf = endp + 1; + *modification = (int) strtoul (buf, &endp, 10); + if (endp != buf && *endp == '.') { + buf = endp + 1; *patch = (int) strtoul (buf, &buf, 10); } } - - if (*buf != '\0') { - *version = - *modification = - *patch = 0; - } } /******************************************************************** @@ -1872,8 +1934,15 @@ int ppp_available(void) close(fd); return 1; } - if (kernel_version >= KVERSION(2,3,13)) + if (kernel_version >= KVERSION(2,3,13)) { + if (errno == ENOENT) + no_ppp_msg = + "pppd is unable to open the /dev/ppp device.\n" + "You need to create the /dev/ppp device node by\n" + "executing the following command as root:\n" + " mknod /dev/ppp c 108 0\n"; return 0; + } /* * Open a socket for doing the ioctl operations. @@ -2284,6 +2353,11 @@ int sif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) struct ifreq ifr; struct in6_rtmsg rt6; + if (sock6_fd < 0) { + errno = -sock6_fd; + error("IPv6 socket creation failed: %m"); + return 0; + } memset(&ifr, 0, sizeof (ifr)); strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(sock6_fd, SIOCGIFINDEX, (caddr_t) &ifr) < 0) { @@ -2328,6 +2402,11 @@ int cif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) struct ifreq ifr; struct in6_ifreq ifr6; + if (sock6_fd < 0) { + errno = -sock6_fd; + error("IPv6 socket creation failed: %m"); + return 0; + } memset(&ifr, 0, sizeof(ifr)); strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(sock6_fd, SIOCGIFINDEX, (caddr_t) &ifr) < 0) { @@ -2417,8 +2496,8 @@ get_pty(master_fdp, slave_fdp, slave_name, uid) *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_cflag |= CS8 | CREAD | CLOCAL; + tios.c_iflag = IGNPAR; tios.c_oflag = 0; tios.c_lflag = 0; if (tcsetattr(sfd, TCSAFLUSH, &tios) < 0) @@ -2481,33 +2560,6 @@ open_ppp_loopback(void) return master_fd; } -/******************************************************************** - * - * restore_loop - reattach the ppp unit to the loopback. - * - * The kernel ppp driver automatically reattaches the ppp unit to - * the loopback if the serial port is set to a line discipline other - * than ppp, or if it detects a modem hangup. The former will happen - * in disestablish_ppp if the latter hasn't already happened, so we - * shouldn't need to do anything. - * - * Just to be sure, set the real serial port to the normal discipline. - */ - -void -restore_loop(void) -{ - looped = 1; - 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); - } -} - /******************************************************************** * * sifnpmode - Set the mode for handling packets for a given NP.