X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=705fa30378e938a18fff8172218efc932a561421;hb=afc02dc8a376c730fd1f08c5b6c1fa6f6923ca15;hp=455d74a7e764eeadf17f007b0a892b4ec2b6b693;hpb=2a09df9e052a1e395d7864ff5865fdea94cadfa3;p=ppp.git diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 455d74a..705fa30 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -52,16 +52,21 @@ #include "ipcp.h" static int initdisc = -1; /* Initial TTY discipline */ -static int prev_kdebugflag = 0; - -static int restore_term; /* 1 => we've munged the terminal */ -static struct termios inittermios; /* Initial TTY termios */ - -int sockfd; /* socket for doing interface ioctls */ - +static int initfdflags = -1; /* Initial file descriptor flags for fd */ +static int prev_kdebugflag = 0; +static int has_default_route = 0; +static int has_proxy_arp = 0; static int driver_version = 0; static int driver_modification = 0; static int driver_patch = 0; +static int restore_term = 0; /* 1 => we've munged the terminal */ +static struct termios inittermios; /* Initial TTY termios */ + +static int sockfd; /* socket for doing interface ioctls */ + +static int if_is_up; /* Interface has been marked up */ +static u_int32_t default_route_gateway; /* Gateway for default route added */ +static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static char *lock_file; @@ -71,6 +76,20 @@ static char *lock_file; #define FLAGS_MASK (IFF_UP | IFF_BROADCAST | \ IFF_POINTOPOINT | IFF_LOOPBACK | IFF_NOARP) +/* Prototypes for procedures local to this file. */ +static int get_flags (void); +static void set_flags (int flags); +static int translate_speed (int bps); +static int baud_rate_of (int speed); +static char *path_to_route (void); +static void close_route_table (void); +static int open_route_table (void); +static int read_route_table (struct rtentry *rt); +static int defaultroute_exists (void); +static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr); +static void decode_version (char *buf, int *version, int *mod, int *patch); + + /* * SET_SA_FAMILY - set the sa_family field of a struct sockaddr, * if it exists. @@ -80,11 +99,18 @@ static char *lock_file; memset ((char *) &(addr), '\0', sizeof(addr)); \ addr.sa_family = (family); +/* + * Determine if the PPP connection should still be present. + */ + +extern int hungup; +#define still_ppp() (hungup == 0) + /* * Functions to read and set the flags value in the device driver */ -int get_flags (void) +static int get_flags (void) { int flags; @@ -98,9 +124,10 @@ int get_flags (void) return flags; } -void set_flags (int flags) +static void set_flags (int flags) { MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags)); + if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0) { syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags); @@ -130,6 +157,24 @@ void sys_init(void) } } +/* + * sys_cleanup - restore any system state we modified before exiting: + * mark the interface down, delete default route and/or proxy arp entry. + * This should call die() because it's called from die(). + */ +void sys_cleanup() +{ + struct ifreq ifr; + + if (if_is_up) + sifdown(0); + /* XXX maybe we need to delete the route through the interface */ + if (has_default_route) + cifdefaultroute(0, default_route_gateway); + if (has_proxy_arp) + cifproxyarp(0, proxy_arp_addr); +} + /* * note_debug_level - note a change in the debug level. */ @@ -210,6 +255,15 @@ void establish_ppp (void) MAINDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver", driver_version, driver_modification, driver_patch)); + + /* + * Set device for non-blocking reads. + */ + 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"); + } } /* @@ -221,6 +275,21 @@ void disestablish_ppp(void) { int x; char *s; + + /* Reset non-blocking mode on the file descriptor. */ + if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0) + 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()) + { + initdisc = -1; + return; + } /* * Check whether the link seems not to be 8-bit clean. */ @@ -361,11 +430,11 @@ struct speed { * Translate from bits/second to a speed_t. */ -int translate_speed (int bps) +static int translate_speed (int bps) { struct speed *speedp; - if (bps == 0) + if (bps != 0) { for (speedp = speeds; speedp->speed_int; speedp++) { @@ -383,7 +452,7 @@ int translate_speed (int bps) * Translate from a speed_t to bits/second. */ -int baud_rate_of (int speed) +static int baud_rate_of (int speed) { struct speed *speedp; @@ -442,8 +511,8 @@ void set_up_tty (int fd, int local) tios.c_cflag |= CRTSCTS; break; - case 2: - tios.c_iflag |= IXOFF; + case -2: + tios.c_iflag |= IXON | IXOFF; tios.c_cc[VSTOP] = 0x13; /* DC3 = XOFF = ^S */ tios.c_cc[VSTART] = 0x11; /* DC1 = XON = ^Q */ break; @@ -521,7 +590,7 @@ void restore_tty (void) if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) { - if (errno != ENXIO) + if (errno != EIO) { syslog(LOG_WARNING, "tcsetattr: %m"); } @@ -535,11 +604,6 @@ void restore_tty (void) void output (int unit, unsigned char *p, int len) { - if (unit != 0) - { - MAINDEBUG((LOG_WARNING, "output: unit != 0!")); - } - if (debug) { log_packet(p, len, "sent "); @@ -547,8 +611,16 @@ void output (int unit, unsigned char *p, int len) if (write(fd, p, len) < 0) { - syslog(LOG_ERR, "write: %m"); - die(1); + if (errno == EWOULDBLOCK || errno == ENOBUFS + || errno == ENXIO || errno == EIO) + { + syslog(LOG_WARNING, "write: warning: %m"); + } + else + { + syslog(LOG_ERR, "write: %m"); + die(1); + } } } @@ -606,6 +678,18 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp) struct ifreq ifr; 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. + */ + 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; @@ -653,6 +737,17 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp) u_int x; MAINDEBUG ((LOG_DEBUG, "recv_config: mru = %d\n", mru)); +/* + * If we were called because the link has gone down then there is nothing + * which may be done. Just return without incident. + */ + if (!still_ppp()) + { + return; + } +/* + * Set the receiver parameters + */ if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0) { syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m"); @@ -679,11 +774,15 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit) { struct ppp_option_data data; + memset (&data, '\0', sizeof (data)); data.ptr = opt_ptr; data.length = opt_len; data.transmit = for_transmit; - return ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0; + if (ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0) + return 1; + + return (errno == ENOBUFS)? 0: -1; } /* @@ -692,10 +791,13 @@ 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) { - int x = get_flags(); - x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN; - x = isup? x | SC_CCP_UP : x &~ SC_CCP_UP; - set_flags (x); + if (still_ppp()) + { + int x = get_flags(); + x = isopen? x | SC_CCP_OPEN : x &~ SC_CCP_OPEN; + x = isup? x | SC_CCP_UP : x &~ SC_CCP_UP; + set_flags (x); + } } /* @@ -743,6 +845,7 @@ int sifup (int u) { struct ifreq ifr; + memset (&ifr, '\0', sizeof (ifr)); strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -756,6 +859,7 @@ int sifup (int u) syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; } + if_is_up = 1; return 1; } @@ -767,6 +871,7 @@ int sifdown (int u) { struct ifreq ifr; + memset (&ifr, '\0', sizeof (ifr)); strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) { @@ -781,6 +886,7 @@ int sifdown (int u) syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m"); return 0; } + if_is_up = 0; return 1; } @@ -793,6 +899,9 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask) struct ifreq ifr; struct rtentry rt; + memset (&ifr, '\0', sizeof (ifr)); + memset (&rt, '\0', sizeof (rt)); + SET_SA_FAMILY (ifr.ifr_addr, AF_INET); SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET); SET_SA_FAMILY (ifr.ifr_netmask, AF_INET); @@ -838,13 +947,11 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask) /* * Add the device route */ - memset (&rt, '\0', sizeof (rt)); - SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); rt.rt_dev = ifname; /* MJC */ - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0L; ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; rt.rt_flags = RTF_UP | RTF_HOST; @@ -935,6 +1042,19 @@ static char *path_to_route (void) return 0; } +/* + * close_route_table - close the interface to the route table + */ + +static void close_route_table (void) + { + if (route_fd != (FILE *) 0) + { + fclose (route_fd); + route_fd = (FILE *) 0; + } + } + /* * open_route_table - open the interface to the route table */ @@ -943,10 +1063,7 @@ static int open_route_table (void) { char *path; - if (route_fd != (FILE *) 0) - { - close_route_table(); - } + close_route_table(); path = path_to_route(); if (path == NULL) @@ -970,19 +1087,6 @@ static int open_route_table (void) return 1; } -/* - * close_route_table - close the interface to the route table - */ - -static void close_route_table (void) - { - if (route_fd != (FILE *) 0) - { - fclose (route_fd); - route_fd = (FILE *) 0; - } - } - /* * read_route_table - read the next entry from the route table */ @@ -1032,7 +1136,7 @@ static int defaultroute_exists (void) while (read_route_table(&rt) != 0) { - if (rt.rt_flags & RTF_UP == 0) + if ((rt.rt_flags & RTF_UP) == 0) { continue; } @@ -1061,22 +1165,27 @@ int sifdefaultroute (int unit, int gateway) { struct rtentry rt; - if (defaultroute_exists()) + if (has_default_route == 0) { - return 0; - } + if (defaultroute_exists()) + { + return 0; + } - memset (&rt, '\0', sizeof (rt)); - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; + memset (&rt, '\0', sizeof (rt)); + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY; - if (ioctl(sockfd, SIOCADDRT, &rt) < 0) - { - syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m"); - return 0; + rt.rt_flags = RTF_UP | RTF_GATEWAY; + if (ioctl(sockfd, SIOCADDRT, &rt) < 0) + { + syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m"); + return 0; + } } + has_default_route = 1; + default_route_gateway = g; return 1; } @@ -1087,17 +1196,25 @@ int sifdefaultroute (int unit, int gateway) int cifdefaultroute (int unit, int gateway) { struct rtentry rt; - - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - ((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 (has_default_route) { - syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m"); - return 0; + memset (&rt, '\0', sizeof (rt)); + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + ((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 (errno != ENOENT || still_ppp()) + { + syslog (LOG_ERR, "default route ioctl(SIOCDELRT): %m"); + return 0; + } + } } + has_default_route = 0; return 1; } @@ -1109,26 +1226,32 @@ int sifproxyarp (int unit, u_int32_t his_adr) { struct arpreq arpreq; - memset (&arpreq, '\0', sizeof(arpreq)); + if (has_proxy_arp == 0) + { + memset (&arpreq, '\0', sizeof(arpreq)); /* * Get the hardware address of an interface on the same subnet * as our local address. */ - if (!get_ether_addr(his_adr, &arpreq.arp_ha)) - { - syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); - return 0; - } - - SET_SA_FAMILY(arpreq.arp_pa, AF_INET); - ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr; - arpreq.arp_flags = ATF_PERM | ATF_PUBL; + if (!get_ether_addr(his_adr, &arpreq.arp_ha)) + { + syslog(LOG_ERR, "Cannot determine ethernet address for proxy ARP"); + return 0; + } - if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) - { - syslog(LOG_ERR, "ioctl(SIOCSARP): %m"); - return 0; + SET_SA_FAMILY(arpreq.arp_pa, AF_INET); + ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr; + arpreq.arp_flags = ATF_PERM | ATF_PUBL; + + if (ioctl(sockfd, SIOCSARP, (caddr_t)&arpreq) < 0) + { + syslog(LOG_ERR, "ioctl(SIOCSARP): %m"); + return 0; + } } + + proxy_arp_addr = hisaddr; + has_proxy_arp = 1; return 1; } @@ -1139,16 +1262,20 @@ int sifproxyarp (int unit, u_int32_t his_adr) int cifproxyarp (int unit, u_int32_t his_adr) { struct arpreq arpreq; - - memset (&arpreq, '\0', sizeof(arpreq)); - SET_SA_FAMILY(arpreq.arp_pa, AF_INET); - - ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr; - if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) + + if (has_proxy_arp == 1) { - syslog(LOG_WARNING, "ioctl(SIOCDARP): %m"); - return 0; + memset (&arpreq, '\0', sizeof(arpreq)); + SET_SA_FAMILY(arpreq.arp_pa, AF_INET); + + ((struct sockaddr_in *) &arpreq.arp_pa)->sin_addr.s_addr = his_adr; + if (ioctl(sockfd, SIOCDARP, (caddr_t)&arpreq) < 0) + { + syslog(LOG_WARNING, "ioctl(SIOCDARP): %m"); + return 0; + } } + has_proxy_arp = 0; return 1; } @@ -1157,7 +1284,7 @@ int cifproxyarp (int unit, u_int32_t his_adr) * the same subnet as ipaddr. */ -int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) +static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) { struct ifreq *ifr, *ifend, *ifp; int i; @@ -1192,7 +1319,7 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) ifreq.ifr_name)); /* * Check that the interface is up, and not point-to-point - * or loopback. + * nor loopback. */ if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0) { @@ -1232,23 +1359,27 @@ int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr) /* * Now get the hardware address. */ + memset (&ifreq.ifr_hwaddr, 0, sizeof (struct sockaddr)); if (ioctl (sockfd, SIOCGIFHWADDR, &ifreq) < 0) { syslog(LOG_ERR, "SIOCGIFHWADDR(%s): %m", ifreq.ifr_name); return 0; } - hwaddr->sa_family = ARPHRD_ETHER; - memcpy (&hwaddr->sa_data, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN); + memcpy (hwaddr, + &ifreq.ifr_hwaddr, + sizeof (struct sockaddr)); MAINDEBUG ((LOG_DEBUG, - "proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x", + "proxy arp: found hwaddr %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", (int) ((unsigned char *) &hwaddr->sa_data)[0], (int) ((unsigned char *) &hwaddr->sa_data)[1], (int) ((unsigned char *) &hwaddr->sa_data)[2], (int) ((unsigned char *) &hwaddr->sa_data)[3], (int) ((unsigned char *) &hwaddr->sa_data)[4], - (int) ((unsigned char *) &hwaddr->sa_data)[5])); + (int) ((unsigned char *) &hwaddr->sa_data)[5], + (int) ((unsigned char *) &hwaddr->sa_data)[6], + (int) ((unsigned char *) &hwaddr->sa_data)[7])); return 1; } @@ -1315,7 +1446,7 @@ u_int32_t GetMask (u_int32_t addr) continue; } /* - * Check that the interface is up, and not point-to-point or loopback. + * Check that the interface is up, and not point-to-point nor loopback. */ strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); if (ioctl(sockfd, SIOCGIFFLAGS, &ifreq) < 0) @@ -1337,7 +1468,6 @@ u_int32_t GetMask (u_int32_t addr) mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr; break; } - return mask; } @@ -1348,7 +1478,6 @@ 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); *modification = 0; *patch = 0; @@ -1439,7 +1568,9 @@ int ppp_available(void) { int s, ok; struct ifreq ifr; - int my_version, my_modification, my_patch; + char abBuffer [1024]; + int size; + int my_version, my_modification, my_patch; /* * Open a socket for doing the ioctl operations. */ @@ -1472,30 +1603,29 @@ int ppp_available(void) ok = ioctl (s, SIOCGIFHWADDR, (caddr_t) &ifr) >= 0; } - if (ok && ifr.ifr_hwaddr.sa_family != ARPHRD_PPP) + if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) { ok = 0; } + + if (!ok) + { + return 0; + } /* * This is the PPP device. Validate the version of the driver at this * point to ensure that this program will work with the driver. */ + ifr.ifr_data = abBuffer; + size = ioctl (s, SIOCGPPPVER, (caddr_t) &ifr); + ok = size >= 0; + if (ok) { - char abBuffer [1024]; - int size; - - ifr.ifr_data = abBuffer; - size = ioctl (s, SIOCGPPPVER, (caddr_t) &ifr); - ok = size >= 0; - - if (ok) - { - decode_version (abBuffer, - &driver_version, - &driver_modification, - &driver_patch); - } + decode_version (abBuffer, + &driver_version, + &driver_modification, + &driver_patch); } if (!ok) @@ -1536,6 +1666,10 @@ int ppp_available(void) return ok; } +/* + * Update the wtmp file with the appropriate user name and tty device. + */ + int logwtmp (char *line, char *name, char *host) { struct utmp ut; @@ -1630,25 +1764,23 @@ int lock (char *dev) break; } - if (n == 0) + /* See the process still exists. */ + if (n > 0) { - unlink (lock_file); - syslog (LOG_NOTICE, "Removed stale lock on %s", lock_file); - continue; + hdb_lock_buffer[n] = '\0'; + sscanf (hdb_lock_buffer, " %d", &pid); + if (kill(pid, 0) == -1 && errno == ESRCH) + { + n = 0; + } } - hdb_lock_buffer[n] = '\0'; - sscanf (hdb_lock_buffer, " %d", &pid); - - if (kill(pid, 0) == -1 && errno == ESRCH) + /* If the process does not exist then try to remove the lock */ + if (n == 0 && unlink (lock_file) == 0) { - /* pid no longer exists - remove the lock file */ - if (unlink (lock_file) == 0) - { - syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)", - dev, pid); - continue; - } + syslog (LOG_NOTICE, "Removed stale lock on %s (pid %d)", + dev, pid); + continue; } syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, pid);