X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=9647365eda2dfd229799eb2a3768273e6de77ba2;hp=946380709588b11692b2cd8588c8fb6cddd4fe1c;hb=7ecd94f94b5e81f5a4b15beaae1f917f0874bea6;hpb=9c6dee6df51dbf3da3dbc289eab479921ec3c662 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 9463807..9647365 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include @@ -36,6 +38,7 @@ #include #include #include +#include /* This is in netdevice.h. However, this compile will fail miserably if you attempt to include netdevice.h because it has so many references @@ -46,20 +49,38 @@ #define MAX_ADDR_LEN 7 #endif -#include -#include +#if __GLIBC__ >= 2 +#include #include -#include +#include #include +#include +#else +#include +#include +#include +#include +#include #include +#endif #include #include "pppd.h" #include "fsm.h" #include "ipcp.h" +#include "patchlevel.h" #ifdef IPX_CHANGE #include "ipxcp.h" +#include +#endif /* IPX_CHANGE */ + +#ifdef LOCKLIB +#include +#endif + +#ifndef RTF_DEFAULT /* Normally in from */ +#define RTF_DEFAULT 0 #endif #define ok_error(num) ((num)==EIO) @@ -76,6 +97,7 @@ static int has_proxy_arp = 0; static int driver_version = 0; static int driver_modification = 0; static int driver_patch = 0; +static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ @@ -88,6 +110,8 @@ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static char *lock_file; +static struct utsname utsname; /* for the kernel version */ + #define MAX_IFS 100 #define FLAGS_GOOD (IFF_UP | IFF_BROADCAST) @@ -124,22 +148,27 @@ extern u_char inpacket_buf[]; /* borrowed from main.c */ */ extern int hungup; -#define still_ppp() (hungup == 0) #ifndef LOCK_PREFIX #define LOCK_PREFIX "/var/lock/LCK.." #endif -/******************************************************************** - * - * Functions to read and set the flags value in the device driver - */ - static void set_ppp_fd (int new_fd) - { - SYSDEBUG ((LOG_DEBUG, "setting ppp_fd to %d\n", ppp_fd)); - ppp_fd = new_fd; - } +{ + SYSDEBUG ((LOG_DEBUG, "setting ppp_fd to %d\n", ppp_fd)); + ppp_fd = new_fd; +} + +static int still_ppp(void) +{ + if (!hungup || ppp_fd == slave_fd) + return 1; + if (slave_fd >= 0) { + set_ppp_fd(slave_fd); + return 1; + } + return 0; +} /******************************************************************** * @@ -207,6 +236,8 @@ void sys_init(void) die(1); } } + + uname(&utsname); } /******************************************************************** @@ -231,7 +262,7 @@ void sys_cleanup(void) */ if (default_route_gateway != 0) { - cifdefaultroute(0, default_route_gateway); + cifdefaultroute(0, 0, default_route_gateway); } if (has_proxy_arp) @@ -317,11 +348,8 @@ void establish_ppp (int tty_fd) */ if (demand && ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0) { - if ( ! ok_error ( errno )) - { - syslog(LOG_ERR, "ioctl(transfer ppp unit): %m(%d)", errno); - die(1); - } + syslog(LOG_ERR, "ioctl(transfer ppp unit): %m(%d)", errno); + die(1); } /* * Set the current tty to the PPP discpline @@ -356,14 +384,14 @@ void establish_ppp (int tty_fd) ifunit, x); die(1); } - ioctl(slave_fd, TIOCSETD, &tty_disc); } ifunit = x; /* * Enable debug in the driver if requested. */ - set_kdebugflag (kdebugflag); + if (!demand) + set_kdebugflag (kdebugflag); set_flags (get_flags() & ~(SC_RCV_B7_0 | SC_RCV_B7_1 | SC_RCV_EVNP | SC_RCV_ODDP)); @@ -396,23 +424,16 @@ void disestablish_ppp(int tty_fd) { int x; char *s; -/* - * Do nothing if the PPP device is controlled by the loopback device - */ - if (tty_fd != ppp_fd) - { - return; - } + /* * Attempt to restore the previous tty settings */ - if (still_ppp()) + if (!hungup) { - set_kdebugflag (0); /* * Restore the previous line discipline */ - if (ioctl(ppp_fd, TIOCSETD, &tty_disc) < 0) + if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0) { if ( ! ok_error (errno)) { @@ -420,7 +441,7 @@ void disestablish_ppp(int tty_fd) } } - if (ioctl(ppp_fd, TIOCNXCL, 0) < 0) + if (ioctl(tty_fd, TIOCNXCL, 0) < 0) { if ( ! ok_error (errno)) { @@ -429,7 +450,7 @@ void disestablish_ppp(int tty_fd) } /* Reset non-blocking mode on fd. */ - if (initfdflags != -1 && fcntl(ppp_fd, F_SETFL, initfdflags) < 0) + if (initfdflags != -1 && fcntl(tty_fd, F_SETFL, initfdflags) < 0) { if ( ! ok_error (errno)) { @@ -458,10 +479,6 @@ void clean_check(void) 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: - 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: @@ -568,6 +585,12 @@ struct speed { #endif #ifdef EXTB { 38400, EXTB }, +#endif +#ifdef B230400 + { 230400, B230400 }, +#endif +#ifdef B460800 + { 460800, B460800 }, #endif { 0, 0 } }; @@ -758,7 +781,7 @@ void output (int unit, unsigned char *p, int len) { if (debug) { - log_packet(p, len, "sent "); + log_packet(p, len, "sent ", LOG_DEBUG); } if (write(ppp_fd, p, len) < 0) @@ -1256,19 +1279,19 @@ static int defaultroute_exists (struct rtentry *rt) * sifdefaultroute - assign a default route through the address given. */ -int sifdefaultroute (int unit, u_int32_t gateway) +int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) { struct rtentry rt; if (defaultroute_exists(&rt)) { - u_int32_t old_gateway = ((struct sockaddr_in *) (&rt.rt_gateway))-> - sin_addr.s_addr; + struct in_addr old_gateway = + ((struct sockaddr_in *) (&rt.rt_gateway))-> sin_addr; - if (old_gateway != gateway) + if (old_gateway.s_addr != gateway) { syslog (LOG_ERR, - "ppp not replacing existing default route to %s[%s]", + "not replacing existing default route to %s [%s]", rt.rt_dev, inet_ntoa (old_gateway)); } @@ -1278,9 +1301,15 @@ int sifdefaultroute (int unit, u_int32_t gateway) memset (&rt, '\0', sizeof (rt)); SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); + + if (strcmp(utsname.release, "2.1.0") > 0) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; + } + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY; + rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT; if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { if ( ! ok_error ( errno )) @@ -1299,7 +1328,7 @@ int sifdefaultroute (int unit, u_int32_t gateway) * cifdefaultroute - delete a default route through the address given. */ -int cifdefaultroute (int unit, u_int32_t gateway) +int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) { struct rtentry rt; @@ -1308,9 +1337,15 @@ int cifdefaultroute (int unit, u_int32_t gateway) memset (&rt, '\0', sizeof (rt)); SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); + + if (strcmp(utsname.release, "2.1.0") > 0) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L; + } + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway; - rt.rt_flags = RTF_UP | RTF_GATEWAY; + rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DEFAULT; if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { if (still_ppp()) @@ -1381,8 +1416,9 @@ int cifproxyarp (int unit, u_int32_t his_adr) { 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; + arpreq.arp_flags = ATF_PERM | ATF_PUBL; + if (ioctl(sock_fd, SIOCDARP, (caddr_t)&arpreq) < 0) { if ( ! ok_error ( errno )) @@ -1409,7 +1445,6 @@ static int get_ether_addr (u_int32_t ipaddr, struct ifreq *ifr, *ifend, *ifp; int i; u_int32_t ina, mask; - struct sockaddr_dl *dla; struct ifreq ifreq; struct ifconf ifc; struct ifreq ifs[MAX_IFS]; @@ -1632,7 +1667,7 @@ static void decode_version (char *buf, int *version, /******************************************************************** * - * Procedure to determine if the PPP line dicipline is registered. + * Procedure to determine if the PPP line discipline is registered. */ int @@ -1741,9 +1776,10 @@ int ppp_available(void) if (!ok) { no_ppp_msg = - "This system lacks kernel support for PPP. To include PPP support\n" - "in the kernel, please follow the steps detailed in the " - "README.linux\nfile in the ppp-2.3 distribution.\n"; + "This system lacks kernel support for PPP. This could be because\n" + "the PPP kernel module is not loaded, or because the kernel is\n" + "not configured for PPP. See the README.linux file in the\n" + "ppp-2.3.3 distribution.\n"; } /* * This is the PPP device. Validate the version of the driver at this @@ -1774,7 +1810,7 @@ int ppp_available(void) /* * Validate the version of the driver against the version that we used. */ - decode_version (PPP_VERSION, + decode_version (VERSION, &my_version, &my_modification, &my_patch); @@ -1788,7 +1824,12 @@ int ppp_available(void) /* The modification levels must be legal */ if (driver_modification < my_modification) { - ok = 0; + if (driver_modification >= 2) { + /* we can cope with 2.2.0 and above */ + driver_is_old = 1; + } else { + ok = 0; + } } close (s); @@ -1809,7 +1850,7 @@ int ppp_available(void) * Update the wtmp file with the appropriate user name and tty device. */ -int logwtmp (char *line, char *name, char *host) +void logwtmp (const char *line, const char *name, const char *host) { int wtmp; struct utmp ut, *utp; @@ -1897,6 +1938,35 @@ int logwtmp (char *line, char *name, char *host) int lock (char *dev) { +#ifdef LOCKLIB + int result; + lock_file = malloc(strlen(dev) + 1); + if (lock_file == NULL) + { + novm("lock file name"); + } + strcpy (lock_file, dev); + result = mklock (dev, (void *) 0); + + if (result > 0) + { + syslog (LOG_NOTICE, "Device %s is locked by pid %d", dev, result); + free (lock_file); + lock_file = NULL; + result = -1; + } + else + { + if (result < 0) + { + syslog (LOG_ERR, "Can't create lock file %s", lock_file); + free (lock_file); + lock_file = NULL; + result = -1; + } + } + return (result); +#else char hdb_lock_buffer[12]; int fd, n; int pid = getpid(); @@ -1967,7 +2037,8 @@ int lock (char *dev) #else pid = ((int *) hdb_lock_buffer)[0]; #endif - if (pid == 0 || (kill(pid, 0) == -1 && errno == ESRCH)) + if (pid == 0 || pid == getpid() + || (kill(pid, 0) == -1 && errno == ESRCH)) { n = 0; } @@ -1992,6 +2063,7 @@ int lock (char *dev) free(lock_file); lock_file = NULL; return -1; +#endif } @@ -2004,7 +2076,11 @@ void unlock(void) { if (lock_file) { +#ifdef LOCKLIB + (void) rmlock (lock_file, (void *) 0); +#else unlink(lock_file); +#endif free(lock_file); lock_file = NULL; } @@ -2157,8 +2233,11 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, return (0); } /* - * Set the netmask + * Set the netmask. + * For recent kernels, force the netmask to 255.255.255.255. */ + if (strcmp(utsname.release, "2.1.16") >= 0) + net_mask = ~0L; if (net_mask != 0) { ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = net_mask; @@ -2174,22 +2253,29 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, /* * Add the device route */ - SET_SA_FAMILY (rt.rt_dst, AF_INET); - SET_SA_FAMILY (rt.rt_gateway, AF_INET); - rt.rt_dev = ifname; /* MJC */ + if (strcmp(utsname.release, "2.1.16") < 0) { + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + rt.rt_dev = ifname; - ((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; + ((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; - if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) - { - if (! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m(%d)", errno); - } - return (0); + if (strcmp(utsname.release, "2.1.0") > 0) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; } + + if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) + { + if (! ok_error (errno)) + { + syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m(%d)", errno); + } + return (0); + } + } return 1; } @@ -2202,27 +2288,35 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr, int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) { struct rtentry rt; + + if (strcmp(utsname.release, "2.1.16") < 0) { /* * Delete the route through the device */ - memset (&rt, '\0', sizeof (rt)); + 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 */ + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + rt.rt_dev = ifname; - ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; - ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; - rt.rt_flags = RTF_UP | RTF_HOST; + ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = 0; + ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr = his_adr; + rt.rt_flags = RTF_UP | RTF_HOST; - if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) - { - if (still_ppp() && ! ok_error (errno)) - { - syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m(%d)", errno); - } - return (0); + if (strcmp(utsname.release, "2.1.0") > 0) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L; } + + if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) + { + if (still_ppp() && ! ok_error (errno)) + { + syslog (LOG_ERR, "ioctl(SIOCDELRT) device route: %m(%d)", errno); + } + return (0); + } + } return 1; } @@ -2235,15 +2329,27 @@ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr) void open_ppp_loopback(void) { - int flags; + int flags, i; struct termios tios; - if (openpty (&master_fd, &slave_fd, loop_name, NULL, NULL) < 0) - { - syslog(LOG_ERR, "No free pty for loopback"); - die(1); - } + master_fd = -1; + for (i = 0; i < 64; ++i) { + sprintf(loop_name, "/dev/pty%c%x", 'p' + i / 16, i % 16); + master_fd = open(loop_name, O_RDWR | O_NOCTTY, 0); + if (master_fd >= 0) + break; + } + if (master_fd < 0) { + syslog(LOG_ERR, "No free pty for loopback"); + die(1); + } SYSDEBUG((LOG_DEBUG, "using %s for loopback", loop_name)); + loop_name[5] = 't'; + slave_fd = open(loop_name, O_RDWR | O_NOCTTY, 0); + if (slave_fd < 0) { + syslog(LOG_ERR, "Couldn't open %s for loopback: %m", loop_name); + die(1); + } set_ppp_fd(slave_fd); @@ -2297,81 +2403,23 @@ open_ppp_loopback(void) * * restore_loop - reattach the ppp unit to the loopback. * - * The problem with the Linux variant is that the POSIX tty drivers will - * sieze the line when it is disconnected. In addition, when the device - * goes down all of the routes are deleted. This means that the tty needs - * to be re-opened, reconfigured, and the device reconfigured and the routes - * restored. + * 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) { - int x; - int fdflags; - char fname [30]; -/* - * Take down the existing interface - */ - sifdown (0); - (void) ioctl(ppp_fd, TIOCSETD, &tty_disc); -/* - * Find the existing flags. This works even if the tty has stolen the - * line discipline. - */ - fdflags = fcntl(ppp_fd, F_GETFL); - if (fdflags < 0) - { - syslog (LOG_ERR, "retrieve file flags failed: %m(%d)", errno); - fdflags = O_NONBLOCK | O_RDWR; - } -/* - * Re-open the file so the we can re-establish the previous discipline - */ - sprintf (fname, "/proc/self/fd/%d", ppp_fd); - x = open (fname, O_RDWR | O_NONBLOCK, 0); - if (x < 0) + if (ppp_fd != slave_fd) { - syslog (LOG_ERR, "reopen of tty file failed: %m(%d)", errno); + (void) ioctl(ppp_fd, TIOCSETD, &tty_disc); + set_ppp_fd(slave_fd); } -/* - * Transfer the newly opened file (to the same tty) back to the tty - * file handle. - */ - else - { - dup2 (x, ppp_fd); - close (x); - fcntl (ppp_fd, F_SETFL, fdflags); - set_up_tty(ppp_fd, 0); - } -/* - * Switch to the tty slave and put that into the PPP discipline. - */ - set_ppp_fd(slave_fd); - - if (ioctl(ppp_fd, TIOCSETD, &ppp_disc) < 0) - { - syslog(LOG_ERR, "ioctl(TIOCSETD): %m(%d)", errno); - die(1); - } -/* - * Fetch the current unit identifier. - */ - if (ioctl(ppp_fd, PPPIOCGUNIT, &ifunit) < 0) - { - syslog(LOG_ERR, "ioctl(PPPIOCGUNIT): %m(%d)", errno); - die(1); - } -/* - * Restore the parameters for the PPP link. - */ - ppp_send_config(0, PPP_MRU, (u_int32_t) 0, 0, 0); - ppp_recv_config(0, PPP_MRU, (u_int32_t) 0, 0, 0); -/* - * Reconfigure the IP addresses for the demand dial system. - */ - ip_demand_conf (0); } /******************************************************************** @@ -2395,6 +2443,7 @@ sifnpmode(u, proto, mode) { syslog(LOG_ERR, "ioctl(PPPIOCSNPMODE, %d, %d): %m(%d)", proto, mode, errno); + syslog(LOG_ERR, "ppp_fd=%d slave_fd=%d\n", ppp_fd, slave_fd); } return 0; } @@ -2402,8 +2451,6 @@ sifnpmode(u, proto, mode) } -#include - /******************************************************************** * * sipxfaddr - Config the interface IPX networknumber @@ -2411,13 +2458,14 @@ sifnpmode(u, proto, mode) int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) { - int skfd; int result = 1; + +#ifdef IPX_CHANGE + int skfd; struct sockaddr_ipx ipx_addr; struct ifreq ifr; struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) &ifr.ifr_addr; -#ifdef IPX_CHANGE skfd = socket (AF_IPX, SOCK_DGRAM, 0); if (skfd < 0) { @@ -2473,13 +2521,14 @@ int sipxfaddr (int unit, unsigned long int network, unsigned char * node ) int cipxfaddr (int unit) { - int skfd; int result = 1; + +#ifdef IPX_CHANGE + int skfd; struct sockaddr_ipx ipx_addr; struct ifreq ifr; struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) &ifr.ifr_addr; -#ifdef IPX_CHANGE skfd = socket (AF_IPX, SOCK_DGRAM, 0); if (skfd < 0) { @@ -2515,6 +2564,30 @@ int cipxfaddr (int unit) return result; } +/* + * daemon - Detach us from controlling terminal session. + */ +int +daemon(nochdir, noclose) + int nochdir, noclose; +{ + int pid; + + if ((pid = fork()) < 0) + return -1; + if (pid != 0) + exit(0); /* parent dies */ + setsid(); + if (!nochdir) + chdir("/"); + if (!noclose) { + fclose(stdin); /* don't need stdin, stdout, stderr */ + fclose(stdout); + fclose(stderr); + } + return 0; +} + /******************************************************************** * * sys_check_options - check the options that the user specified @@ -2545,4 +2618,10 @@ sys_check_options(void) break; } #endif + if (demand && driver_is_old) { + option_error("demand dialling is not supported by kernel driver version " + "%d.%d.%d", driver_version, driver_modification, + driver_patch); + demand = 0; + } }