X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsys-ultrix.c;h=cb1303bad47fa5c015e13ca245c8c57b5b0178c7;hb=ac19750e0fb64986870e9bd9bad52d5ae46e2551;hp=92cde071d2a7907d72357e5a4b7515a8e063d63f;hpb=249bc0ca32eed685e3bf4bcce5cb888f25b4f650;p=ppp.git

diff --git a/pppd/sys-ultrix.c b/pppd/sys-ultrix.c
index 92cde07..cb1303b 100644
--- a/pppd/sys-ultrix.c
+++ b/pppd/sys-ultrix.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-ultrix.c,v 1.18 1996/07/01 01:20:29 paulus Exp $";
+static char rcsid[] = "$Id: sys-ultrix.c,v 1.24 1999/03/08 01:46:24 paulus Exp $";
 #endif
 
 /*
@@ -116,7 +116,7 @@ sys_cleanup()
     if (ifaddrs[0])
 	cifaddr(0, ifaddrs[0], ifaddrs[1]);
     if (default_route_gateway)
-	cifdefaultroute(0, default_route_gateway);
+	cifdefaultroute(0, 0, default_route_gateway);
     if (proxy_arp_addr)
 	cifproxyarp(0, proxy_arp_addr);
 }
@@ -137,14 +137,14 @@ sys_close()
 /*
  * sys_check_options - check the options that the user specified
  */
-void
+int
 sys_check_options()
 {
     if (demand) {
-	fprintf(stderr,
-		"Sorry - demand-dialling is not supported under Ultrix\n");
-	exit(1);
+	option_error("Sorry - demand-dialling is not supported under Ultrix\n");
+	return 0;
     }
+    return 1;
 }
 
 
@@ -563,7 +563,7 @@ output(unit, p, len)
     int len;
 {
     if (debug)
-	log_packet(p, len, "sent ");
+	log_packet(p, len, "sent ", LOG_DEBUG);
 
     if (write(ttyfd, p, len) < 0) {
 	if (errno != EIO)
@@ -980,7 +980,9 @@ 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 l, g;
 {
     struct rtentry rt;
 
@@ -1001,7 +1003,9 @@ 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 l, g;
 {
     struct rtentry rt;
 
@@ -1213,6 +1217,27 @@ GetMask(addr)
     return mask;
 }
 
+/*
+ * have_route_to - determine if the system has any route to
+ * a given IP address.
+ * For demand mode to work properly, we have to ignore routes
+ * through our own interface.
+ */
+int have_route_to(u_int32_t addr)
+{
+    return -1;
+}
+
+
+/*
+ * Use the hostid as part of the random number seed.
+ */
+int
+get_host_seed()
+{
+    return gethostid();
+}
+
 
 /*
   Seems like strdup() is not part of string package in Ultrix.
@@ -1250,9 +1275,9 @@ char *strdup( in ) char *in;
 
 #define	WTMPFILE	"/usr/adm/wtmp"
 
-int
+void
 logwtmp(line, name, host)
-    char *line, *name, *host;
+    const char *line, *name, *host;
 {
     int fd;
     struct stat buf;