X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=caaf3a9adb7bd291c9eea814d7512a4bcc42019b;hb=e38fa6a29a90a514ad7dfa8fa873d5fd49bc9ca1;hp=88ab9ddba54b50a0bd2e31175844611e299f87f6;hpb=3f2fe49d822135c209e9896f666b748cf2234f2e;p=ppp.git diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 88ab9dd..caaf3a9 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 @@ -137,7 +141,7 @@ static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ -static int new_style_driver = 0; +int new_style_driver = 0; static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ @@ -231,7 +235,7 @@ static int get_flags (int fd) if ( ok_error (errno) ) flags = 0; else - fatal("ioctl(PPPIOCGFLAGS): %m"); + fatal("ioctl(PPPIOCGFLAGS): %m (line %d)", __LINE__); } SYSDEBUG ((LOG_DEBUG, "get flags = %x\n", flags)); @@ -246,7 +250,7 @@ static void set_flags (int fd, int flags) if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) { if (! ok_error (errno) ) - fatal("ioctl(PPPIOCSFLAGS, %x): %m", flags, errno); + fatal("ioctl(PPPIOCSFLAGS, %x): %m (line %d)", flags, errno, __LINE__); } } @@ -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); @@ -344,7 +343,7 @@ static int set_kdebugflag (int requested_level) return 1; if (ioctl(ppp_dev_fd, PPPIOCSDEBUG, &requested_level) < 0) { if ( ! ok_error (errno) ) - error("ioctl(PPPIOCSDEBUG): %m"); + error("ioctl(PPPIOCSDEBUG): %m (line %d)", __LINE__); return (0); } SYSDEBUG ((LOG_INFO, "set kernel debugging level to %d", @@ -354,13 +353,12 @@ 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; + int ret_fd; /* * Ensure that the tty device is in exclusive mode. @@ -374,7 +372,7 @@ int establish_ppp (int tty_fd) */ if (!new_style_driver && looped && ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0) { - error("ioctl(transfer ppp unit): %m"); + error("ioctl(transfer ppp unit): %m, line %d", __LINE__); return -1; } /* @@ -392,11 +390,36 @@ int establish_ppp (int tty_fd) } } + ret_fd = generic_establish_ppp(tty_fd); + +#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) + + if (ret_fd >= 0) { + set_flags(ppp_fd, ((get_flags(ppp_fd) & ~(SC_RCVB | SC_LOGB)) + | ((kdebugflag * SC_DEBUG) & SC_LOGB))); + } else { + if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0 && !ok_error(errno)) + warn("Couldn't reset tty to normal line discipline: %m"); + } + + return ret_fd; +} + +/******************************************************************** + * + * generic_establish_ppp - Turn the fd into a ppp interface. + */ +int generic_establish_ppp (int fd) +{ + int x; + if (new_style_driver) { /* Open another instance of /dev/ppp and connect the channel to it */ int flags; - if (ioctl(tty_fd, PPPIOCGCHAN, &chindex) == -1) { + if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) { error("Couldn't get channel number: %m"); goto err; } @@ -415,7 +438,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. @@ -439,10 +463,11 @@ int establish_ppp (int tty_fd) /* * Old-style driver: find out which interface we were given. */ - set_ppp_fd (tty_fd); - if (ioctl(tty_fd, PPPIOCGUNIT, &x) < 0) { - if ( ! ok_error (errno)) - fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); + set_ppp_fd (fd); + if (ioctl(fd, PPPIOCGUNIT, &x) < 0) { + if (ok_error (errno)) + goto err; + fatal("ioctl(PPPIOCGUNIT): %m (line %d)", __LINE__); } /* Check that we got the same unit again. */ if (looped && x != ifunit) @@ -452,9 +477,9 @@ int establish_ppp (int tty_fd) /* * Fetch the initial file flags and reset blocking mode on the file. */ - initfdflags = fcntl(tty_fd, F_GETFL); + initfdflags = fcntl(fd, F_GETFL); if (initfdflags == -1 || - fcntl(tty_fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { + fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) { if ( ! ok_error (errno)) warn("Couldn't set device to non-blocking mode: %m"); } @@ -468,9 +493,6 @@ 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)); - SYSDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver", driver_version, driver_modification, driver_patch)); @@ -479,18 +501,16 @@ int establish_ppp (int tty_fd) err_close: close(fd); err: - if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0 && !ok_error(errno)) - warn("Couldn't reset tty to normal line discipline: %m"); return -1; } /******************************************************************** * - * disestablish_ppp - Restore the serial port to normal operation. + * tty_disestablish_ppp - Restore the serial port to normal operation. * 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) { /* @@ -503,12 +523,12 @@ void disestablish_ppp(int tty_fd) */ if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0) { if ( ! ok_error (errno)) - error("ioctl(TIOCSETD, N_TTY): %m"); + error("ioctl(TIOCSETD, N_TTY): %m (line %d)", __LINE__); } if (ioctl(tty_fd, TIOCNXCL, 0) < 0) { if ( ! ok_error (errno)) - warn("ioctl(TIOCNXCL): %m(%d)", errno); + warn("ioctl(TIOCNXCL): %m (line %d)", __LINE__); } /* Reset non-blocking mode on fd. */ @@ -519,13 +539,31 @@ void disestablish_ppp(int tty_fd) } initfdflags = -1; + generic_disestablish_ppp(tty_fd); +} + +/******************************************************************** + * + * generic_disestablish_ppp - Restore device components 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 generic_disestablish_ppp(int dev_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 +588,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 +614,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 +653,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 +760,9 @@ struct speed { #ifdef B57600 { 57600, B57600 }, #endif +#ifdef B76800 + { 76800, B76800 }, +#endif #ifdef B115200 { 115200, B115200 }, #endif @@ -731,6 +777,9 @@ struct speed { #endif #ifdef B460800 { 460800, B460800 }, +#endif +#ifdef B921600 + { 921600, B921600 }, #endif { 0, 0 } }; @@ -787,7 +836,7 @@ void set_up_tty(int tty_fd, int local) setdtr(tty_fd, 1); if (tcgetattr(tty_fd, &tios) < 0) { if (!ok_error(errno)) - fatal("tcgetattr: %m(%d)", errno); + fatal("tcgetattr: %m (line %d)", __LINE__); return; } @@ -842,7 +891,7 @@ void set_up_tty(int tty_fd, int local) if (tcsetattr(tty_fd, TCSAFLUSH, &tios) < 0) if (!ok_error(errno)) - fatal("tcsetattr: %m"); + fatal("tcsetattr: %m (line %d)", __LINE__); baud_rate = baud_rate_of(speed); restore_term = 1; @@ -881,7 +930,7 @@ void restore_tty (int tty_fd) if (tcsetattr(tty_fd, TCSAFLUSH, &inittermios) < 0) { if (! ok_error (errno)) - warn("tcsetattr: %m"); + warn("tcsetattr: %m (line %d)", __LINE__); } } } @@ -896,8 +945,7 @@ void output (int unit, unsigned char *p, int len) int fd = ppp_fd; int proto; - if (debug) - dbglog("sent %P", p, len); + dump_packet("sent", p, len); if (len < PPP_HDRLEN) return; @@ -933,7 +981,7 @@ void wait_input(struct timeval *timo) exc = in_fds; n = select(max_in_fd + 1, &ready, NULL, &exc, timo); if (n < 0 && errno != EINTR) - fatal("select: %m(%d)", errno); + fatal("select: %m"); } /* @@ -973,14 +1021,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,35 +1069,44 @@ 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; + error("ioctl(SIOCSIFMTU): %m (line %d)", __LINE__); +} + +/******************************************************************** + * + * 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)) - fatal("ioctl(PPPIOCSASYNCMAP): %m(%d)", errno); + fatal("ioctl(PPPIOCSASYNCMAP): %m (line %d)", __LINE__); return; } @@ -1058,10 +1119,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])); @@ -1070,17 +1131,17 @@ void ppp_set_xaccm (int unit, ext_accm accm) return; if (ioctl(ppp_fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY) { if ( ! ok_error (errno)) - warn("ioctl(set extended ACCM): %m(%d)", errno); + warn("ioctl(set extended ACCM): %m (line %d)", __LINE__); } } /******************************************************************** * - * 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)); /* @@ -1094,7 +1155,7 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) */ if (ioctl(ppp_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) { if ( ! ok_error (errno)) - error("ioctl(PPPIOCSMRU): %m(%d)", errno); + error("ioctl(PPPIOCSMRU): %m (line %d)", __LINE__); } if (new_style_driver && ifunit >= 0 && ioctl(ppp_dev_fd, PPPIOCSMRU, (caddr_t) &mru) < 0) @@ -1103,7 +1164,7 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) SYSDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap)); if (ioctl(ppp_fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) { if (!ok_error(errno)) - error("ioctl(PPPIOCSRASYNCMAP): %m(%d)", errno); + error("ioctl(PPPIOCSRASYNCMAP): %m (line %d)", __LINE__); } } @@ -1135,7 +1196,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 +1204,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 +1264,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; } @@ -1432,7 +1522,7 @@ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) rt.rt_flags = RTF_UP | RTF_GATEWAY; if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { if ( ! ok_error ( errno )) - error("default route ioctl(SIOCADDRT): %m(%d)", errno); + error("default route ioctl(SIOCADDRT): %m"); return 0; } @@ -1466,7 +1556,7 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { if (still_ppp()) { if ( ! ok_error ( errno )) - error("default route ioctl(SIOCDELRT): %m (%d)", errno); + error("default route ioctl(SIOCDELRT): %m"); return 0; } } @@ -1503,7 +1593,7 @@ int sifproxyarp (int unit, u_int32_t his_adr) if (ioctl(sock_fd, SIOCSARP, (caddr_t)&arpreq) < 0) { if ( ! ok_error ( errno )) - error("ioctl(SIOCSARP): %m(%d)", errno); + error("ioctl(SIOCSARP): %m"); return 0; } proxy_arp_addr = his_adr; @@ -1544,7 +1634,7 @@ int cifproxyarp (int unit, u_int32_t his_adr) if (ioctl(sock_fd, SIOCDARP, (caddr_t)&arpreq) < 0) { if ( ! ok_error ( errno )) - warn("ioctl(SIOCDARP): %m(%d)", errno); + warn("ioctl(SIOCDARP): %m"); return 0; } } @@ -1572,7 +1662,7 @@ static int get_ether_addr (u_int32_t ipaddr, ifc.ifc_req = ifs; if (ioctl(sock_fd, SIOCGIFCONF, &ifc) < 0) { if ( ! ok_error ( errno )) - error("ioctl(SIOCGIFCONF): %m(%d)", errno); + error("ioctl(SIOCGIFCONF): %m (line %d)", __LINE__); return 0; } @@ -1630,7 +1720,7 @@ static int get_ether_addr (u_int32_t ipaddr, */ memset (&ifreq.ifr_hwaddr, 0, sizeof (struct sockaddr)); if (ioctl (sock_fd, SIOCGIFHWADDR, &ifreq) < 0) { - error("SIOCGIFHWADDR(%s): %m(%d)", ifreq.ifr_name, errno); + error("SIOCGIFHWADDR(%s): %m", ifreq.ifr_name); return 0; } @@ -1718,7 +1808,7 @@ u_int32_t GetMask (u_int32_t addr) ifc.ifc_req = ifs; if (ioctl(sock_fd, SIOCGIFCONF, &ifc) < 0) { if ( ! ok_error ( errno )) - warn("ioctl(SIOCGIFCONF): %m(%d)", errno); + warn("ioctl(SIOCGIFCONF): %m (line %d)", __LINE__); return mask; } @@ -1760,24 +1850,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; - } } /******************************************************************** @@ -1809,7 +1895,7 @@ ppp_registered(void) * Try to put the device into the PPP discipline. */ if (ioctl(local_fd, TIOCSETD, &ppp_disc) < 0) { - error("ioctl(TIOCSETD(PPP)): %m(%d)", errno); + error("ioctl(TIOCSETD(PPP)): %m (line %d)", __LINE__); } else ret = 1; @@ -1872,8 +1958,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. @@ -1980,9 +2073,6 @@ void logwtmp (const char *line, const char *name, const char *host) while ((utp = getutent()) && (utp->ut_pid != mypid)) /* nothing */; - /* Is this call really necessary? There is another one after the 'put' */ - endutent(); - if (utp) memcpy(&ut, utp, sizeof(ut)); else @@ -2048,7 +2138,7 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) if (vjcomp) { if (ioctl (ppp_dev_fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { if (! ok_error (errno)) - error("ioctl(PPPIOCSMAXCID): %m(%d)", errno); + error("ioctl(PPPIOCSMAXCID): %m (line %d)", __LINE__); vjcomp = 0; } } @@ -2073,14 +2163,14 @@ int sifup(int u) strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - error("ioctl (SIOCGIFFLAGS): %m(%d)", errno); + error("ioctl (SIOCGIFFLAGS): %m (line %d)", __LINE__); return 0; } ifr.ifr_flags |= (IFF_UP | IFF_POINTOPOINT); if (ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - error("ioctl(SIOCSIFFLAGS): %m(%d)", errno); + error("ioctl(SIOCSIFFLAGS): %m (line %d)", __LINE__); return 0; } if_is_up++; @@ -2105,7 +2195,7 @@ int sifdown (int u) strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sock_fd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - error("ioctl (SIOCGIFFLAGS): %m(%d)", errno); + error("ioctl (SIOCGIFFLAGS): %m (line %d)", __LINE__); return 0; } @@ -2113,7 +2203,7 @@ int sifdown (int u) ifr.ifr_flags |= IFF_POINTOPOINT; if (ioctl(sock_fd, SIOCSIFFLAGS, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - error("ioctl(SIOCSIFFLAGS): %m(%d)", errno); + error("ioctl(SIOCSIFFLAGS): %m (line %d)", __LINE__); return 0; } return 1; @@ -2145,7 +2235,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { if (errno != EEXIST) { if (! ok_error (errno)) - error("ioctl(SIOCSIFADDR): %m(%d)", errno); + error("ioctl(SIOCSIFADDR): %m (line %d)", __LINE__); } else { warn("ioctl(SIOCSIFADDR): Address already exists"); @@ -2158,7 +2248,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, SIN_ADDR(ifr.ifr_dstaddr) = his_adr; if (ioctl(sock_fd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - error("ioctl(SIOCSIFDSTADDR): %m(%d)", errno); + error("ioctl(SIOCSIFDSTADDR): %m (line %d)", __LINE__); return (0); } /* @@ -2171,7 +2261,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, SIN_ADDR(ifr.ifr_netmask) = net_mask; if (ioctl(sock_fd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - error("ioctl(SIOCSIFNETMASK): %m(%d)", errno); + error("ioctl(SIOCSIFNETMASK): %m (line %d)", __LINE__); return (0); } } @@ -2194,7 +2284,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { if (! ok_error (errno)) - error("ioctl(SIOCADDRT) device route: %m(%d)", errno); + error("ioctl(SIOCADDRT) device route: %m (line %d)", __LINE__); return (0); } } @@ -2251,7 +2341,7 @@ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { if (still_ppp() && ! ok_error (errno)) - error("ioctl(SIOCDELRT) device route: %m(%d)", errno); + error("ioctl(SIOCDELRT) device route: %m (line %d)", __LINE__); return (0); } } @@ -2263,7 +2353,7 @@ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) { - error("ioctl(SIOCSIFADDR): %m(%d)", errno); + error("ioctl(SIOCSIFADDR): %m (line %d)", __LINE__); return 0; } } @@ -2284,10 +2374,15 @@ 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) { - error("sif6addr: ioctl(SIOCGIFINDEX): %m (%d)", errno); + error("sif6addr: ioctl(SIOCGIFINDEX): %m (line %d)", __LINE__); return 0; } @@ -2298,7 +2393,7 @@ int sif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) ifr6.ifr6_prefixlen = 10; if (ioctl(sock6_fd, SIOCSIFADDR, &ifr6) < 0) { - error("sif6addr: ioctl(SIOCSIFADDR): %m (%d)", errno); + error("sif6addr: ioctl(SIOCSIFADDR): %m (line %d)", __LINE__); return 0; } @@ -2311,7 +2406,7 @@ int sif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) rt6.rtmsg_metric = 1; if (ioctl(sock6_fd, SIOCADDRT, &rt6) < 0) { - error("sif6addr: ioctl(SIOCADDRT): %m (%d)", errno); + error("sif6addr: ioctl(SIOCADDRT): %m (line %d)", __LINE__); return 0; } @@ -2328,10 +2423,15 @@ 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) { - error("cif6addr: ioctl(SIOCGIFINDEX): %m (%d)", errno); + error("cif6addr: ioctl(SIOCGIFINDEX): %m (line %d)", __LINE__); return 0; } @@ -2343,7 +2443,7 @@ int cif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64) if (ioctl(sock6_fd, SIOCDIFADDR, &ifr6) < 0) { if (errno != EADDRNOTAVAIL) { if (! ok_error (errno)) - error("cif6addr: ioctl(SIOCDIFADDR): %m (%d)", errno); + error("cif6addr: ioctl(SIOCDIFADDR): %m (line %d)", __LINE__); } else { warn("cif6addr: ioctl(SIOCDIFADDR): No such address"); @@ -2417,8 +2517,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) @@ -2459,20 +2559,20 @@ open_ppp_loopback(void) flags = fcntl(master_fd, F_GETFL); if (flags == -1 || fcntl(master_fd, F_SETFL, flags | O_NONBLOCK) == -1) - warn("couldn't set master loopback to nonblock: %m(%d)", errno); + warn("couldn't set master loopback to nonblock: %m"); flags = fcntl(ppp_fd, F_GETFL); if (flags == -1 || fcntl(ppp_fd, F_SETFL, flags | O_NONBLOCK) == -1) - warn("couldn't set slave loopback to nonblock: %m(%d)", errno); + warn("couldn't set slave loopback to nonblock: %m"); if (ioctl(ppp_fd, TIOCSETD, &ppp_disc) < 0) - fatal("ioctl(TIOCSETD): %m(%d)", errno); + fatal("ioctl(TIOCSETD): %m (line %d)", __LINE__); /* * Find out which interface we were given. */ if (ioctl(ppp_fd, PPPIOCGUNIT, &ifunit) < 0) - fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno); + fatal("ioctl(PPPIOCGUNIT): %m (line %d)", __LINE__); /* * Enable debug in the driver if requested. */ @@ -2481,33 +2581,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. @@ -2525,8 +2598,7 @@ sifnpmode(u, proto, mode) npi.mode = mode; if (ioctl(ppp_dev_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) { if (! ok_error (errno)) - error("ioctl(PPPIOCSNPMODE, %d, %d): %m (%d)", - proto, mode, errno); + error("ioctl(PPPIOCSNPMODE, %d, %d): %m", proto, mode); return 0; } return 1; @@ -2550,7 +2622,7 @@ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) skfd = socket (AF_IPX, SOCK_DGRAM, 0); if (skfd < 0) { if (! ok_error (errno)) - dbglog("socket(AF_IPX): %m (%d)", errno); + dbglog("socket(AF_IPX): %m (line %d)", __LINE__); result = 0; } else { @@ -2570,7 +2642,7 @@ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) result = 0; if (errno != EEXIST) { if (! ok_error (errno)) - dbglog("ioctl(SIOCSIFADDR, CRTITF): %m (%d)", errno); + dbglog("ioctl(SIOCSIFADDR, CRTITF): %m (line %d)", __LINE__); } else { warn("ioctl(SIOCSIFADDR, CRTITF): Address already exists"); @@ -2601,7 +2673,7 @@ int cipxfaddr (int unit) skfd = socket (AF_IPX, SOCK_DGRAM, 0); if (skfd < 0) { if (! ok_error (errno)) - dbglog("socket(AF_IPX): %m (%d)", errno); + dbglog("socket(AF_IPX): %m (line %d)", __LINE__); result = 0; } else { @@ -2616,7 +2688,7 @@ int cipxfaddr (int unit) */ if (ioctl(skfd, SIOCSIFADDR, (caddr_t) &ifr) < 0) { if (! ok_error (errno)) - info("ioctl(SIOCSIFADDR, IPX_DLTITF): %m (%d)", errno); + info("ioctl(SIOCSIFADDR, IPX_DLTITF): %m (line %d)", __LINE__); result = 0; } close (skfd);