X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=d176edf2d01db235718b7874052fc1bc3758486d;hp=705fa30378e938a18fff8172218efc932a561421;hb=faa01ae951ca6a5809283693548a6176fbde13a3;hpb=65445bac89a82ee68c6d66ab1afc271e56543f12 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 705fa30..d176edf 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -70,7 +71,7 @@ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static char *lock_file; -#define MAX_IFS 32 +#define MAX_IFS 100 #define FLAGS_GOOD (IFF_UP | IFF_BROADCAST) #define FLAGS_MASK (IFF_UP | IFF_BROADCAST | \ @@ -114,7 +115,7 @@ static int get_flags (void) { int flags; - if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) + if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &flags) < 0) { syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m"); quit(); @@ -128,7 +129,7 @@ static void set_flags (int flags) { MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags)); - if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) + if (ioctl(ttyfd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) { syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags); quit(); @@ -198,7 +199,7 @@ void note_debug_level (void) 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); @@ -206,12 +207,13 @@ int set_kdebugflag (int requested_level) if (prev_kdebugflag != requested_level) { - if (ioctl(fd, PPPIOCSDEBUG, &requested_level) < 0) + if (ioctl(ttyfd, PPPIOCSDEBUG, &requested_level) < 0) { syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m"); return (0); } - MAINDEBUG ((LOG_INFO, "set kernel debugging level to %d", requested_level)); + MAINDEBUG ((LOG_INFO, "set kernel debugging level to %d", + requested_level)); } return (1); } @@ -220,7 +222,7 @@ int set_kdebugflag (int requested_level) * 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; @@ -271,7 +273,7 @@ void establish_ppp (void) * This shouldn't call die() because it's called from die(). */ -void disestablish_ppp(void) +void disestablish_ppp(int fd) { int x; char *s; @@ -281,74 +283,73 @@ void disestablish_ppp(void) syslog(LOG_WARNING, "Couldn't restore device fd flags: %m"); initfdflags = -1; -/* - * If this is no longer PPP mode then there is nothing that can be done - * about restoring the previous mode. - */ - if (!still_ppp()) + if (still_ppp() && initdisc >= 0) { - initdisc = -1; - return; + set_kdebugflag (prev_kdebugflag); + + if (ioctl(fd, TIOCSETD, &initdisc) < 0) + { + syslog(LOG_WARNING, "ioctl(TIOCSETD): %m"); + } + + if (ioctl(fd, TIOCNXCL, 0) < 0) + { + syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m"); + } } + initdisc = -1; + } + /* - * Check whether the link seems not to be 8-bit clean. + * clean_check - Fetch the flags for the device and generate + * appropriate error messages. */ - if (initdisc >= 0) +void clean_check(void) + { + if (still_ppp() && initdisc >= 0) { - if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 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: + 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: + + 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: + + 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: + + case SC_RCV_EVNP: s = "all had odd parity"; break; - - case SC_RCV_ODDP: + + 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, "Receive serial link is not" + " 8-bit clean:"); syslog(LOG_WARNING, "Problem: %s", s); } } - - set_kdebugflag (prev_kdebugflag); - - if (ioctl(fd, TIOCSETD, &initdisc) < 0) - { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m"); - } - - if (ioctl(fd, TIOCNXCL, 0) < 0) - { - syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m"); - } - - initdisc = -1; } } + /* * List of valid speeds. @@ -572,7 +573,7 @@ void setdtr (int fd, int on) * restore_tty - restore the terminal to the saved settings. */ -void restore_tty (void) +void restore_tty (int fd) { if (restore_term) { @@ -609,7 +610,7 @@ void output (int unit, unsigned char *p, int len) log_packet(p, len, "sent "); } - if (write(fd, p, len) < 0) + if (write(ttyfd, p, len) < 0) { if (errno == EWOULDBLOCK || errno == ENOBUFS || errno == ENXIO || errno == EIO) @@ -625,7 +626,7 @@ void output (int unit, unsigned char *p, int len) } /* - * 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). */ @@ -636,9 +637,9 @@ void wait_input (struct timeval *timo) int n; FD_ZERO(&ready); - FD_SET(fd, &ready); + FD_SET(ttyfd, &ready); - n = select(fd+1, &ready, NULL, &ready, timo); + n = select(ttyfd+1, &ready, NULL, &ready, timo); if (n < 0 && errno != EINTR) { syslog(LOG_ERR, "select: %m"); @@ -654,14 +655,14 @@ int read_packet (unsigned char *buf) { int len; - len = read(fd, buf, PPP_MTU + PPP_HDRLEN); + 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; @@ -679,37 +680,35 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) MAINDEBUG ((LOG_DEBUG, "send_config: mtu = %d\n", mtu)); /* - * If we were called because the link has gone down then there is nothing - * which may be done. Just return without incident. + * Ensure that the link is still up. */ - if (!still_ppp()) + if (still_ppp()) { - return; - } /* * 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(); - } + 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(); + } - MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap)); - if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0) - { - syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %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); } - - 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); } /* @@ -721,7 +720,7 @@ 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"); } @@ -748,13 +747,13 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) /* * Set the receiver parameters */ - if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0) + 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, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) + if (ioctl(ttyfd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0) { syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m"); quit(); @@ -779,8 +778,10 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) data.length = opt_len; data.transmit = for_transmit; - if (ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) - return 1; + if (ioctl(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) + { + return 1; + } return (errno == ENOBUFS)? 0: -1; } @@ -823,7 +824,7 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid) if (vjcomp) { - if (ioctl (fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) + if (ioctl (ttyfd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0) { syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m"); vjcomp = 0; @@ -984,10 +985,13 @@ 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(sockfd, SIOCDELRT, &rt) < 0) + if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { - syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m"); - return (0); + if (still_ppp()) + { + syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m"); + return (0); + } } return 1; } @@ -997,7 +1001,7 @@ int cifaddr (int unit, int our_adr, int his_adr) */ 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); @@ -1077,13 +1081,6 @@ static int open_route_table (void) 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; } @@ -1095,18 +1092,34 @@ static int read_route_table (struct rtentry *rt) { static char delims[] = " \t\n"; char *dev_ptr, *ptr, *dst_ptr, *gw_ptr, *flag_ptr; + + memset (rt, '\0', sizeof (struct rtentry)); - if (fgets (route_buffer, sizeof (route_buffer), route_fd) == (char *) 0) + for (;;) { - return 0; - } - - memset (rt, '\0', sizeof (struct rtentry)); + 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 */ + 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); @@ -1205,9 +1218,9 @@ int cifdefaultroute (int unit, int gateway) ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(sockfd, SIOCDELRT, &rt) < 0) + if (ioctl(sockfd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { - if (errno != ENOENT || still_ppp()) + if (still_ppp()) { syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m"); return 0;