X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=dee2ed9902a1264eafe8ac4afd79bd082e3f0ef9;hp=cf034eb8284c9713df8ff8a198bfbca81783a021;hb=e28f47d5e53abe7317d9a82703bbbee044482d4f;hpb=ef42266dc1191f4ec2c858211544f568b4af4cdb diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index cf034eb..dee2ed9 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -37,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 @@ -47,11 +49,11 @@ #define MAX_ADDR_LEN 7 #endif -#include +#include #include -#include +#include #include -#include +#include #include #include @@ -59,10 +61,18 @@ #include "fsm.h" #include "ipcp.h" +#ifndef RTF_DEFAULT /* Normally in from */ +#define RTF_DEFAULT 0 +#endif + #ifdef IPX_CHANGE #include "ipxcp.h" #endif +#ifdef LOCKLIB +#include +#endif + #define ok_error(num) ((num)==EIO) static int tty_disc = N_TTY; /* The TTY discipline */ @@ -77,6 +87,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 */ @@ -89,6 +100,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) @@ -208,6 +221,8 @@ void sys_init(void) die(1); } } + + uname(&utsname); } /******************************************************************** @@ -232,7 +247,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) @@ -745,7 +760,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) @@ -1243,19 +1258,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)); } @@ -1265,9 +1280,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 )) @@ -1286,7 +1307,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; @@ -1295,9 +1316,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()) @@ -1368,8 +1395,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 )) @@ -1396,7 +1424,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]; @@ -1728,9 +1755,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.2 distribution.\n"; } /* * This is the PPP device. Validate the version of the driver at this @@ -1775,7 +1803,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); @@ -1796,7 +1829,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; @@ -1884,6 +1917,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(); @@ -1954,7 +2016,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; } @@ -1979,6 +2042,7 @@ int lock (char *dev) free(lock_file); lock_file = NULL; return -1; +#endif } @@ -1991,7 +2055,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; } @@ -2144,8 +2212,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; @@ -2161,22 +2232,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; } @@ -2189,27 +2267,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; } @@ -2222,15 +2308,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, 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, 0); + if (slave_fd < 0) { + syslog(LOG_ERR, "Couldn't open %s for loopback: %m", loop_name); + die(1); + } set_ppp_fd(slave_fd); @@ -2341,13 +2439,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) { @@ -2403,13 +2502,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) { @@ -2445,6 +2545,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 @@ -2475,4 +2599,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; + } }