X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=928a7207f806af13225107064536e87e549a1e17;hp=fedfccc02f9eb3a6c4ffb8a44f97b0021710ed31;hb=ce58910ee630d9485cbf712b4e14d4f4c2d4fa2a;hpb=2e53641535da26bf8c3c424172758ed81d908581

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index fedfccc..928a720 100644
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -145,6 +145,9 @@ 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 proxy_arp_dev[16];		/* Device for proxy arp entry */
+static u_int32_t our_old_addr;		/* for detecting address changes */
+static int	dynaddr_set;		/* 1 if ip_dynaddr set */
+static int	looped;			/* 1 if using loop */
 
 static struct utsname utsname;	/* for the kernel version */
 static int kernel_version;
@@ -156,12 +159,13 @@ static int kernel_version;
 #define FLAGS_MASK (IFF_UP          | IFF_BROADCAST | \
 		    IFF_POINTOPOINT | IFF_LOOPBACK  | IFF_NOARP)
 
+#define SIN_ADDR(x)	(((struct sockaddr_in *) (&(x)))->sin_addr.s_addr)
+
 /* Prototypes for procedures local to this file. */
 static int get_flags (int fd);
 static void set_flags (int fd, 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);
@@ -250,7 +254,6 @@ static void set_flags (int fd, int flags)
 
 void sys_init(void)
 {
-    int osmaj, osmin, ospatch;
     int flags;
 
     openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
@@ -281,11 +284,6 @@ void sys_init(void)
 
     FD_ZERO(&in_fds);
     max_in_fd = 0;
-
-    uname(&utsname);
-    osmaj = osmin = ospatch = 0;
-    sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
-    kernel_version = KVERSION(osmaj, osmin, ospatch);
 }
 
 /********************************************************************
@@ -362,6 +360,8 @@ int establish_ppp (int tty_fd)
  * The current PPP device will be the tty file.
  */
     set_ppp_fd (tty_fd);
+    if (new_style_driver)
+	add_fd(tty_fd);
 /*
  * Ensure that the tty device is in exclusive mode.
  */
@@ -372,12 +372,19 @@ int establish_ppp (int tty_fd)
 /*
  * Demand mode - prime the old ppp device to relinquish the unit.
  */
-    if (!new_style_driver && demand
+    if (!new_style_driver && looped
 	&& ioctl(slave_fd, PPPIOCXFERUNIT, 0) < 0)
 	fatal("ioctl(transfer ppp unit): %m(%d)", errno);
 /*
  * Set the current tty to the PPP discpline
  */
+
+#ifndef N_SYNC_PPP
+#define N_SYNC_PPP 14
+#endif
+    if (new_style_driver)
+	    ppp_disc = sync_serial ? N_SYNC_PPP:N_PPP;
+
     if (ioctl(tty_fd, TIOCSETD, &ppp_disc) < 0) {
 	if ( ! ok_error (errno) )
 	    fatal("ioctl(TIOCSETD): %m(%d)", errno);
@@ -386,7 +393,7 @@ int establish_ppp (int tty_fd)
  * Find out which interface we were given.
  */
     if (new_style_driver) {
-	if (!demand) {
+	if (!looped) {
 	    /* allocate ourselves a ppp unit */
 	    ifunit = -1;
 	    if (ioctl(ppp_dev_fd, PPPIOCNEWUNIT, &ifunit) < 0)
@@ -406,7 +413,7 @@ int establish_ppp (int tty_fd)
 		fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno);
 	}
 	/* Check that we got the same unit again. */
-	if (demand && x != ifunit)
+	if (looped && x != ifunit)
 	    fatal("transfer_ppp failed: wanted unit %d, got %d", ifunit, x);
 	ifunit = x;
     }
@@ -414,8 +421,9 @@ int establish_ppp (int tty_fd)
 /*
  * Enable debug in the driver if requested.
  */
-    if (!demand)
+    if (!looped)
 	set_kdebugflag (kdebugflag);
+    looped = 0;
 
     set_flags(tty_fd, get_flags(tty_fd) & ~(SC_RCV_B7_0 | SC_RCV_B7_1 |
 					    SC_RCV_EVNP | SC_RCV_ODDP));
@@ -444,6 +452,8 @@ int establish_ppp (int tty_fd)
 
 void disestablish_ppp(int tty_fd)
 {
+    if (new_style_driver)
+	remove_fd(tty_fd);
     if (!hungup) {
 /*
  * Flush the tty output buffer so that the TIOCSETD doesn't hang.
@@ -470,8 +480,25 @@ void disestablish_ppp(int tty_fd)
 	}
     }
     initfdflags = -1;
-    if (new_style_driver)
+    if (new_style_driver && !looped) {
+	if (ioctl(ppp_dev_fd, PPPIOCDETACH) < 0) {
+	    if (errno == ENOTTY) {
+		/* first version of new driver didn't have PPPIOCDETACH */
+		int flags;
+
+		close(ppp_dev_fd);
+		ppp_dev_fd = open("/dev/ppp", O_RDWR);
+		if (ppp_dev_fd < 0)
+		    fatal("Couldn't reopen /dev/ppp: %m");
+		flags = fcntl(ppp_dev_fd, F_GETFL);
+		if (flags == -1
+		    || fcntl(ppp_dev_fd, F_SETFL, flags | O_NONBLOCK) == -1)
+		    warn("Couldn't set /dev/ppp to nonblock: %m");
+	    } else
+		error("Couldn't release PPP unit: %m");
+	}
 	set_ppp_fd(-1);
+    }
 }
 
 /********************************************************************
@@ -816,7 +843,7 @@ void remove_fd(int fd)
 
 int read_packet (unsigned char *buf)
 {
-    int len;
+    int len, nr;
 
     len = PPP_MRU + PPP_HDRLEN;
     if (new_style_driver) {
@@ -824,13 +851,18 @@ int read_packet (unsigned char *buf)
 	*buf++ = PPP_UI;
 	len -= 2;
     }
-    len = read(ppp_dev_fd, buf, len);
-    if (len < 0) {
-	if (errno == EWOULDBLOCK || errno == EIO)
-	    return -1;
-	fatal("read: %m(%d)", errno);
+    nr = -1;
+    if (new_style_driver) {
+	nr = read(ppp_dev_fd, buf, len);
+	if (nr < 0 && errno != EWOULDBLOCK && errno != EIO)
+	    error("read /dev/ppp: %m");
+    }
+    if (nr < 0 && ppp_fd >= 0) {
+	nr = read(ppp_fd, buf, len);
+	if (nr < 0 && errno != EWOULDBLOCK && errno != EIO)
+	    error("read: %m");
     }
-    return new_style_driver? len+2: len;
+    return (new_style_driver && nr > 0)? nr+2: nr;
 }
 
 /********************************************************************
@@ -1052,39 +1084,31 @@ static char *path_to_procfs(const char *tail)
     FILE *fp;
 
     if (proc_path_len == 0) {
+	/* Default the mount location of /proc */
+	strlcpy (proc_path, "/proc", sizeof(proc_path));
+	proc_path_len = 5;
 	fp = fopen(MOUNTED, "r");
-	if (fp == NULL) {
-	    /* Default the mount location of /proc */
-	    strlcpy (proc_path, "/proc", sizeof(proc_path));
-	    proc_path_len = 5;
-
-	} else {
+	if (fp != NULL) {
 	    while ((mntent = getmntent(fp)) != NULL) {
 		if (strcmp(mntent->mnt_type, MNTTYPE_IGNORE) == 0)
 		    continue;
-		if (strcmp(mntent->mnt_type, "proc") == 0)
+		if (strcmp(mntent->mnt_type, "proc") == 0) {
+		    strlcpy(proc_path, mntent->mnt_dir, sizeof(proc_path));
+		    proc_path_len = strlen(proc_path);
 		    break;
+		}
 	    }
 	    fclose (fp);
-	    if (mntent == 0)
-		proc_path_len = -1;
-	    else {
-		strlcpy(proc_path, mntent->mnt_dir, sizeof(proc_path));
-		proc_path_len = strlen(proc_path);
-	    }
 	}
     }
 
-    if (proc_path_len < 0)
-	return 0;
-
     strlcpy(proc_path + proc_path_len, tail,
 	    sizeof(proc_path) - proc_path_len);
     return proc_path;
 }
 
 /*
- * path_to_route - determine the path to the proc file system data
+ * /proc/net/route parsing stuff.
  */
 #define ROUTE_MAX_COLS	12
 FILE *route_fd = (FILE *) 0;
@@ -1093,26 +1117,10 @@ static int route_dev_col, route_dest_col, route_gw_col;
 static int route_flags_col, route_mask_col;
 static int route_num_cols;
 
-static char *path_to_route (void);
 static int open_route_table (void);
 static void close_route_table (void);
 static int read_route_table (struct rtentry *rt);
 
-/********************************************************************
- *
- * path_to_route - find the path to the route tables in the proc file system
- */
-
-static char *path_to_route (void)
-{
-    char *path;
-
-    path = path_to_procfs("/net/route");
-    if (path == 0)
-	error("proc file system not mounted");
-    return path;
-}
-
 /********************************************************************
  *
  * close_route_table - close the interface to the route table
@@ -1138,13 +1146,10 @@ static int open_route_table (void)
 
     close_route_table();
 
-    path = path_to_route();
-    if (path == NULL)
-        return 0;
-
+    path = path_to_procfs("/net/route");
     route_fd = fopen (path, "r");
     if (route_fd == NULL) {
-        error("can't open %s: %m (%d)", path, errno);
+        error("can't open routing table %s: %m", path);
         return 0;
     }
 
@@ -1207,14 +1212,9 @@ static int read_route_table(struct rtentry *rt)
 	p = NULL;
     }
 
-    ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr =
-	strtoul(cols[route_dest_col], NULL, 16);
-
-    ((struct sockaddr_in *) &rt->rt_gateway)->sin_addr.s_addr =
-	strtoul(cols[route_gw_col], NULL, 16);
-
-    ((struct sockaddr_in *) &rt->rt_genmask)->sin_addr.s_addr =
-	strtoul(cols[route_mask_col], NULL, 16);
+    SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
+    SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
+    SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
 
     rt->rt_flags = (short) strtoul(cols[route_flags_col], NULL, 16);
     rt->rt_dev   = cols[route_dev_col];
@@ -1238,7 +1238,9 @@ static int defaultroute_exists (struct rtentry *rt)
         if ((rt->rt_flags & RTF_UP) == 0)
 	    continue;
 
-        if (((struct sockaddr_in *) (&rt->rt_dst))->sin_addr.s_addr == 0L) {
+	if (kernel_version > KVERSION(2,1,0) && SIN_ADDR(rt->rt_genmask) != 0)
+	    continue;
+        if (SIN_ADDR(rt->rt_dst) == 0L) {
 	    result = 1;
 	    break;
 	}
@@ -1266,8 +1268,7 @@ int have_route_to(u_int32_t addr)
     while (read_route_table(&rt)) {
 	if ((rt.rt_flags & RTF_UP) == 0 || strcmp(rt.rt_dev, ifname) == 0)
 	    continue;
-	if ((addr & ((struct sockaddr_in *)&rt.rt_genmask)->sin_addr.s_addr)
-	    == ((struct sockaddr_in *)&rt.rt_dst)->sin_addr.s_addr) {
+	if ((addr & SIN_ADDR(rt.rt_genmask)) == SIN_ADDR(rt.rt_dst)) {
 	    result = 1;
 	    break;
 	}
@@ -1287,10 +1288,9 @@ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
     struct rtentry rt;
 
     if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
-	struct in_addr old_gateway =
-	  ((struct sockaddr_in *) (&rt.rt_gateway))-> sin_addr;
+	u_int32_t old_gateway = SIN_ADDR(rt.rt_gateway);
 
-	if (old_gateway.s_addr != gateway)
+	if (old_gateway != gateway)
 	    error("not replacing existing default route to %s [%I]",
 		  rt.rt_dev, old_gateway);
 	return 0;
@@ -1302,10 +1302,10 @@ int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
 
     if (kernel_version > KVERSION(2,1,0)) {
 	SET_SA_FAMILY (rt.rt_genmask, AF_INET);
-	((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L;
+	SIN_ADDR(rt.rt_genmask) = 0L;
     }
 
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
+    SIN_ADDR(rt.rt_gateway) = gateway;
     
     rt.rt_flags = RTF_UP | RTF_GATEWAY;
     if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) {
@@ -1335,10 +1335,10 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
 
     if (kernel_version > KVERSION(2,1,0)) {
 	SET_SA_FAMILY (rt.rt_genmask, AF_INET);
-	((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = 0L;
+	SIN_ADDR(rt.rt_genmask) = 0L;
     }
 
-    ((struct sockaddr_in *) &rt.rt_gateway)->sin_addr.s_addr = gateway;
+    SIN_ADDR(rt.rt_gateway) = gateway;
     
     rt.rt_flags = RTF_UP | RTF_GATEWAY;
     if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) {
@@ -1366,7 +1366,7 @@ int sifproxyarp (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;
+	SIN_ADDR(arpreq.arp_pa) = his_adr;
 	arpreq.arp_flags = ATF_PERM | ATF_PUBL;
 /*
  * Get the hardware address of an interface on the same subnet
@@ -1387,12 +1387,15 @@ int sifproxyarp (int unit, u_int32_t his_adr)
 	proxy_arp_addr = his_adr;
 	has_proxy_arp = 1;
 
-	forw_path = path_to_procfs("/sys/net/ipv4/ip_forward");
-	if (forw_path != 0) {
-	    int fd = open(forw_path, O_WRONLY);
-	    if (fd >= 0) {
-		write(fd, "1", 1);
-		close(fd);
+	if (tune_kernel) {
+	    forw_path = path_to_procfs("/sys/net/ipv4/ip_forward");
+	    if (forw_path != 0) {
+		int fd = open(forw_path, O_WRONLY);
+		if (fd >= 0) {
+		    if (write(fd, "1", 1) != 1)
+			error("Couldn't enable IP forwarding: %m");
+		    close(fd);
+		}
 	    }
 	}
     }
@@ -1413,7 +1416,7 @@ int cifproxyarp (int unit, u_int32_t his_adr)
 	has_proxy_arp = 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;
+	SIN_ADDR(arpreq.arp_pa) = his_adr;
 	arpreq.arp_flags = ATF_PERM | ATF_PUBL;
 	strlcpy(arpreq.arp_dev, proxy_arp_dev, sizeof(arpreq.arp_dev));
 
@@ -1460,7 +1463,7 @@ static int get_ether_addr (u_int32_t ipaddr,
     ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
     for (ifr = ifc.ifc_req; ifr < ifend; ifr++) {
 	if (ifr->ifr_addr.sa_family == AF_INET) {
-	    ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
+	    ina = SIN_ADDR(ifr->ifr_addr);
 	    strlcpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
             SYSDEBUG ((LOG_DEBUG, "proxy arp: examining interface %s",
 			ifreq.ifr_name));
@@ -1479,7 +1482,7 @@ static int get_ether_addr (u_int32_t ipaddr,
 	    if (ioctl(sock_fd, SIOCGIFNETMASK, &ifreq) < 0)
 	        continue;
 
-	    mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr;
+	    mask = SIN_ADDR(ifreq.ifr_addr);
 	    SYSDEBUG ((LOG_DEBUG, "proxy arp: interface addr %s mask %lx",
 			ip_ntoa(ina), ntohl(mask)));
 
@@ -1572,7 +1575,7 @@ u_int32_t GetMask (u_int32_t addr)
  */
 	if (ifr->ifr_addr.sa_family != AF_INET)
 	    continue;
-	ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
+	ina = SIN_ADDR(ifr->ifr_addr);
 	if (((ntohl(ina) ^ addr) & nmask) != 0)
 	    continue;
 /*
@@ -1589,7 +1592,7 @@ u_int32_t GetMask (u_int32_t addr)
  */
 	if (ioctl(sock_fd, SIOCGIFNETMASK, &ifreq) < 0)
 	    continue;
-	mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr;
+	mask |= SIN_ADDR(ifreq.ifr_addr);
 	break;
     }
     return mask;
@@ -1673,6 +1676,7 @@ int ppp_available(void)
     struct ifreq ifr;
     int    size;
     int    my_version, my_modification, my_patch;
+    int osmaj, osmin, ospatch;
 
     no_ppp_msg = 
 	"This system lacks kernel support for PPP.  This could be because\n"
@@ -1682,29 +1686,37 @@ int ppp_available(void)
 	"ppp.o exists in /lib/modules/`uname -r`/net.\n"
 	"See README.linux file in the ppp distribution for more details.\n";
 
-    fd = open("/dev/ppp", O_RDWR);
-    if (fd < 0 && errno == ENOENT) {
-	/* try making it and see if that helps. */
-	if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR,
-		  makedev(108, 0)) >= 0) {
-	    fd = open("/dev/ppp", O_RDWR);
-	    if (fd >= 0)
-		info("Created /dev/ppp device node");
-	    else
-		unlink("/dev/ppp");	/* didn't work, undo the mknod */
-	} else if (errno == EEXIST) {
-	    fd = open("/dev/ppp", O_RDWR);
+    /* get the kernel version now, since we are called before sys_init */
+    uname(&utsname);
+    osmaj = osmin = ospatch = 0;
+    sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
+    kernel_version = KVERSION(osmaj, osmin, ospatch);
+
+    if (kernel_version >= KVERSION(2,3,13)) {
+	fd = open("/dev/ppp", O_RDWR);
+	if (fd < 0 && errno == ENOENT) {
+	    /* try making it and see if that helps. */
+	    if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR,
+		      makedev(108, 0)) >= 0) {
+		fd = open("/dev/ppp", O_RDWR);
+		if (fd >= 0)
+		    info("Created /dev/ppp device node");
+		else
+		    unlink("/dev/ppp");	/* didn't work, undo the mknod */
+	    } else if (errno == EEXIST) {
+		fd = open("/dev/ppp", O_RDWR);
+	    }
 	}
-    }
-    if (fd >= 0) {
-	new_style_driver = 1;
+	if (fd >= 0) {
+	    new_style_driver = 1;
 
-	/* XXX should get from driver */
-	driver_version = 2;
-	driver_modification = 4;
-	driver_patch = 0;
-	close(fd);
-	return 1;
+	    /* XXX should get from driver */
+	    driver_version = 2;
+	    driver_modification = 4;
+	    driver_patch = 0;
+	    close(fd);
+	    return 1;
+	}
     }
 
 /*
@@ -1973,7 +1985,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr,
 /*
  *  Set our IP address
  */
-    ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = our_adr;
+    SIN_ADDR(ifr.ifr_addr) = our_adr;
     if (ioctl(sock_fd, SIOCSIFADDR, (caddr_t) &ifr) < 0) {
 	if (errno != EEXIST) {
 	    if (! ok_error (errno))
@@ -1987,7 +1999,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr,
 /*
  *  Set the gateway address
  */
-    ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_addr.s_addr = his_adr;
+    SIN_ADDR(ifr.ifr_dstaddr) = his_adr;
     if (ioctl(sock_fd, SIOCSIFDSTADDR, (caddr_t) &ifr) < 0) {
 	if (! ok_error (errno))
 	    error("ioctl(SIOCSIFDSTADDR): %m(%d)", errno); 
@@ -2000,7 +2012,7 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr,
     if (kernel_version >= KVERSION(2,1,16))
 	net_mask = ~0L;
     if (net_mask != 0) {
-	((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = net_mask;
+	SIN_ADDR(ifr.ifr_netmask) = net_mask;
 	if (ioctl(sock_fd, SIOCSIFNETMASK, (caddr_t) &ifr) < 0) {
 	    if (! ok_error (errno))
 		error("ioctl(SIOCSIFNETMASK): %m(%d)", errno); 
@@ -2015,13 +2027,13 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr,
 	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;
+	SIN_ADDR(rt.rt_gateway) = 0L;
+	SIN_ADDR(rt.rt_dst)     = his_adr;
 	rt.rt_flags = RTF_UP | RTF_HOST;
 
 	if (kernel_version > KVERSION(2,1,0)) {
 	    SET_SA_FAMILY (rt.rt_genmask, AF_INET);
-	    ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L;
+	    SIN_ADDR(rt.rt_genmask) = -1L;
 	}
 
 	if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) {
@@ -2030,6 +2042,24 @@ int sifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr,
 	    return (0);
 	}
     }
+
+    /* set ip_dynaddr in demand mode if address changes */
+    if (demand && tune_kernel && !dynaddr_set
+	&& our_old_addr && our_old_addr != our_adr) {
+	/* set ip_dynaddr if possible */
+	char *path;
+	int fd;
+
+	path = path_to_procfs("/sys/net/ipv4/ip_dynaddr");
+	if (path != 0 && (fd = open(path, O_WRONLY)) >= 0) {
+	    if (write(fd, "1", 1) != 1)
+		error("Couldn't enable dynamic IP addressing: %m");
+	    close(fd);
+	}
+	dynaddr_set = 1;	/* only 1 attempt */
+    }
+    our_old_addr = 0;
+
     return 1;
 }
 
@@ -2054,13 +2084,13 @@ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr)
 	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;
+	SIN_ADDR(rt.rt_gateway) = 0;
+	SIN_ADDR(rt.rt_dst)     = his_adr;
 	rt.rt_flags = RTF_UP | RTF_HOST;
 
 	if (kernel_version > KVERSION(2,1,0)) {
 	    SET_SA_FAMILY (rt.rt_genmask, AF_INET);
-	    ((struct sockaddr_in *) &rt.rt_genmask)->sin_addr.s_addr = -1L;
+	    SIN_ADDR(rt.rt_genmask) = -1L;
 	}
 
 	if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) {
@@ -2082,6 +2112,8 @@ int cifaddr (int unit, u_int32_t our_adr, u_int32_t his_adr)
 	}
     }
 
+    our_old_addr = our_adr;
+
     return 1;
 }
 
@@ -2117,8 +2149,8 @@ int sif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64)
     /* Route to remote host */
     memset(&rt6, 0, sizeof(rt6));
     IN6_LLADDR_FROM_EUI64(rt6.rtmsg_dst, his_eui64);
-    rt6.rtmsg_flags = RTF_UP | RTF_HOST;
-    rt6.rtmsg_dst_len = 128;
+    rt6.rtmsg_flags = RTF_UP;
+    rt6.rtmsg_dst_len = 10;
     rt6.rtmsg_ifindex = ifr.ifr_ifindex;
     rt6.rtmsg_metric = 1;
     
@@ -2196,7 +2228,7 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
 	    if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0)
 		warn("Couldn't unlock pty slave %s: %m", pty_name);
 #endif
-	    if ((sfd = open(pty_name, O_RDWR)) < 0)
+	    if ((sfd = open(pty_name, O_RDWR | O_NOCTTY)) < 0)
 		warn("Couldn't open pty slave %s: %m", pty_name);
 	}
     }
@@ -2251,6 +2283,7 @@ open_ppp_loopback(void)
 {
     int flags;
 
+    looped = 1;
     if (new_style_driver) {
 	/* allocate ourselves a ppp unit */
 	ifunit = -1;
@@ -2309,6 +2342,7 @@ open_ppp_loopback(void)
 void
 restore_loop(void)
 {
+    looped = 1;
     if (new_style_driver) {
 	set_flags(ppp_dev_fd, get_flags(ppp_dev_fd) | SC_LOOP_TRAFFIC);
 	return;
@@ -2335,11 +2369,9 @@ sifnpmode(u, proto, mode)
     npi.protocol = proto;
     npi.mode     = mode;
     if (ioctl(ppp_dev_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) {
-	if (! ok_error (errno)) {
+	if (! ok_error (errno))
 	    error("ioctl(PPPIOCSNPMODE, %d, %d): %m (%d)",
 		   proto, mode, errno);
-	    error("ppp_dev_fd=%d slave_fd=%d\n", ppp_dev_fd, slave_fd);
-	}
 	return 0;
     }
     return 1;
@@ -2466,7 +2498,6 @@ sys_check_options(void)
  * Disable the IPX protocol if the support is not present in the kernel.
  */
     char *path;
-    int fd;
 
     if (ipxcp_protent.enabled_flag) {
 	struct stat stat_buf;
@@ -2483,13 +2514,5 @@ sys_check_options(void)
 		     driver_patch);
 	return 0;
     }
-    if (demand) {
-	/* set ip_dynaddr if possible */
-	path = path_to_procfs("/sys/net/ipv4/ip_dynaddr");
-	if (path != 0 && (fd = open(path, O_WRONLY)) >= 0) {
-	    write(fd, "1", 1);
-	    close(fd);
-	}
-    }
     return 1;
 }