X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-svr4.c;h=f82a2163e1d34707fe6a235f327d0d66943a1a81;hp=90a0b3bbfa581518ba8a8bc0b7ed4a0f35b26271;hb=98516bb41580f3d34d750165e9a65289bc5ad248;hpb=30fcae8f24d235c9a95084afeea3da29a6d896ee;ds=sidebyside

diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c
index 90a0b3b..f82a216 100644
--- a/pppd/sys-svr4.c
+++ b/pppd/sys-svr4.c
@@ -26,14 +26,18 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-svr4.c,v 1.12 1996/08/28 06:42:47 paulus Exp $";
+static char rcsid[] = "$Id: sys-svr4.c,v 1.15 1997/03/04 03:43:54 paulus Exp $";
 #endif
 
 #include <limits.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
+#if defined(SNI) || defined(__USLC__)
+extern void *alloca(size_t);
+#else
 #include <alloca.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -200,7 +204,7 @@ sys_cleanup()
     if (if_is_up)
 	sifdown(0);
     if (default_route_gateway)
-	cifdefaultroute(0, default_route_gateway);
+	cifdefaultroute(0, default_route_gateway, default_route_gateway);
     if (proxy_arp_addr)
 	cifproxyarp(0, proxy_arp_addr);
 }
@@ -1094,8 +1098,10 @@ cifaddr(u, o, h)
     int u;
     u_int32_t o, h;
 {
-#if 0
+#if defined(__USLC__)		/* was: #if 0 */
+    cifroute(unit, ouraddr, hisaddr);
     if (ipmuxid >= 0) {
+	syslog(LOG_NOTICE, "Removing ppp interface unit");
 	if (ioctl(ipfd, I_UNLINK, ipmuxid) < 0) {
 	    syslog(LOG_ERR, "Can't remove ppp interface unit: %m");
 	    return 0;
@@ -1110,12 +1116,15 @@ cifaddr(u, o, h)
  * sifdefaultroute - assign a default route through the address given.
  */
 int
-sifdefaultroute(u, g)
+sifdefaultroute(u, l, g)
     int u;
-    u_int32_t g;
+    u_int32_t l, g;
 {
     struct rtentry rt;
 
+#if defined(__USLC__)
+    g = l;			/* use the local address as gateway */
+#endif
     memset(&rt, 0, sizeof(rt));
     rt.rt_dst.sa_family = AF_INET;
     INET_ADDR(rt.rt_dst) = 0;
@@ -1136,12 +1145,15 @@ sifdefaultroute(u, g)
  * cifdefaultroute - delete a default route through the address given.
  */
 int
-cifdefaultroute(u, g)
+cifdefaultroute(u, l, g)
     int u;
-    u_int32_t g;
+    u_int32_t l, g;
 {
     struct rtentry rt;
 
+#if defined(__USLC__)
+    g = l;			/* use the local address as gateway */
+#endif
     memset(&rt, 0, sizeof(rt));
     rt.rt_dst.sa_family = AF_INET;
     INET_ADDR(rt.rt_dst) = 0;
@@ -1488,9 +1500,9 @@ GetMask(addr)
 /*
  * logwtmp - write an accounting record to the /var/adm/wtmp file.
  */
-int
+void
 logwtmp(line, name, host)
-    char *line, *name, *host;
+    const char *line, *name, *host;
 {
     static struct utmpx utmpx;
 
@@ -1506,7 +1518,6 @@ logwtmp(line, name, host)
     }
     gettimeofday(&utmpx.ut_tv, NULL);
     updwtmpx("/var/adm/wtmpx", &utmpx);
-    return 0;
 }
 
 /*
@@ -1619,3 +1630,29 @@ unlock()
 	lock_file[0] = 0;
     }
 }
+
+
+/*
+ * cifroute - delete a route through the addresses given.
+ */
+int
+cifroute(u, our, his)
+    int u;
+    u_int32_t our, his;
+{
+    struct rtentry rt;
+
+    memset(&rt, 0, sizeof(rt));
+    rt.rt_dst.sa_family = AF_INET;
+    INET_ADDR(rt.rt_dst) = his;
+    rt.rt_gateway.sa_family = AF_INET;
+    INET_ADDR(rt.rt_gateway) = our;
+    rt.rt_flags = RTF_HOST;
+
+    if (ioctl(ipfd, SIOCDELRT, &rt) < 0) {
+	syslog(LOG_ERR, "Can't delete route: %m");
+	return 0;
+    }
+
+    return 1;
+}