X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=1c4b8f31c115f2041c6654b0849e2883afabfd09;hp=335f8a15325fd260b4c624a6e054baa64724db78;hb=bc45bd7903b4439e920bc2095b7543dc768f7ff8;hpb=d999c23548f44ff477c29d66eda18e1c787ecbe9 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 335f8a1..1c4b8f3 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -52,16 +52,16 @@ #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 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 */ + +int sockfd; /* socket for doing interface ioctls */ static char *lock_file; @@ -80,11 +80,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 +105,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); @@ -221,6 +229,15 @@ void disestablish_ppp(void) { int x; char *s; +/* + * 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. */ @@ -365,7 +382,7 @@ int translate_speed (int bps) { struct speed *speedp; - if (bps == 0) + if (bps != 0) { for (speedp = speeds; speedp->speed_int; speedp++) { @@ -521,7 +538,7 @@ void restore_tty (void) if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0) { - if (errno != ENXIO) + if (errno != EIO) { syslog(LOG_WARNING, "tcsetattr: %m"); } @@ -606,6 +623,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 +682,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,6 +719,7 @@ 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; @@ -692,10 +733,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 +787,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) { @@ -767,6 +812,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) { @@ -793,6 +839,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 +887,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 +982,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 +1003,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 +1027,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 +1076,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 +1105,26 @@ 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; return 1; } @@ -1087,17 +1135,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 +1165,31 @@ 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; + } } + + has_proxy_arp = 1; return 1; } @@ -1139,16 +1200,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; } @@ -1192,7 +1257,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 +1297,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 +1384,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 +1406,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 +1416,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 +1506,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 +1541,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 +1604,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 +1702,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);