X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=pppd%2Fsys-linux.c;h=189b809cc97d128ed8944fc012f3b6424369c4b0;hb=ffa027207fff95bd19cb529105bd549fb6ae1709;hp=4d24a5c24c9b582e33b6f6d6a3f75d99b1c780a9;hpb=c0b7020b16ee6bb99992d277a92480810f76b0ce;p=ppp.git diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 4d24a5c..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" @@ -264,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) @@ -359,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; @@ -475,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)); @@ -493,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) { /* @@ -529,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); } } @@ -563,7 +569,6 @@ static int make_ppp_unit() void cfg_bundle(int mrru, int mtru, int rssn, int tssn) { int flags; - struct ifreq ifr; if (!new_style_driver) return; @@ -573,16 +578,8 @@ void cfg_bundle(int mrru, int mtru, int rssn, int tssn) 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); @@ -608,7 +605,7 @@ void make_new_bundle(int mrru, int mtru, int rssn, int tssn) if (make_ppp_unit() < 0) die(1); - /* set the mrru, mtu and flags */ + /* set the mrru and flags */ cfg_bundle(mrru, mtru, rssn, tssn); } @@ -1002,12 +999,16 @@ int read_packet (unsigned char *buf) nr = read(ppp_fd, buf, len); 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 && errno != EINTR) error("read /dev/ppp: %m"); + if (nr < 0 && errno == ENXIO) + return 0; } return (new_style_driver && nr > 0)? nr+2: nr; } @@ -1044,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)) @@ -1085,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])); @@ -1103,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)); /* @@ -1162,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; @@ -1230,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; } @@ -1814,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; - } } /******************************************************************** @@ -1926,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. @@ -2545,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.