Update to new pppd with new option parsing stuff

[ppp.git] / pppd / sys-NeXT.c

diff --git a/pppd/sys-NeXT.c b/pppd/sys-NeXT.c
index 589504ab5812905c7387ada1fdd8f3b8db20db4b..e0c790e298d66b10f98e32656f91ce6eaa6b8ee4 100644 (file)
--- a/pppd/sys-NeXT.c
+++ b/pppd/sys-NeXT.c
@@ -20,7 +20,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-NeXT.c,v 1.7 1997/03/04 03:34:48 paulus Exp $";
+static char rcsid[] = "$Id: sys-NeXT.c,v 1.10 1998/11/07 06:59:30 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -29,6 +29,7 @@ static char rcsid[] = "$Id: sys-NeXT.c,v 1.7 1997/03/04 03:34:48 paulus Exp $";
 #include <utmp.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <libc.h>
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/file.h>
@@ -46,7 +47,10 @@ static char rcsid[] = "$Id: sys-NeXT.c,v 1.7 1997/03/04 03:34:48 paulus Exp $";
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
+#if !(NS_TARGET >= 40)
+/* XXX get an error "duplicate member ip_v under 4.1 GAMMA */
 #include <netinet/ip.h>
+#endif /* NS_TARGET */
 #include <netinet/if_ether.h>
 #include <net/route.h>
 #include <netinet/in.h>
@@ -70,6 +74,7 @@ static struct termios inittermios; /* Initial TTY termios */
 static char *lock_file;
 
 static int sockfd;             /* socket for doing interface ioctls */
+static int pppdev;  /* +++ */
 
 #if defined(i386) && defined(HAS_BROKEN_IOCTL)
 #define        ioctl   myioctl
@@ -101,6 +106,13 @@ sys_init()
        syslog(LOG_ERR, "Couldn't create IP socket: %m");
        die(1);
     }
+
+    if((pppdev = open("/dev/ppp0", O_RDWR, O_NONBLOCK)) == NULL)
+      {
+       syslog(LOG_ERR, "Couldn't open /dev/ppp0: %m");
+       die(1);
+      }
+      
 }
 
 /*
@@ -126,6 +138,8 @@ sys_cleanup()
        cifdefaultroute(0, 0, default_route_gateway);
     if (proxy_arp_addr)
        cifproxyarp(0, proxy_arp_addr);
+
+    close(pppdev);
 }
 
 /*
@@ -518,7 +532,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 == EWOULDBLOCK || errno == ENOBUFS
@@ -1609,20 +1623,31 @@ restore_loop()
 }
 
 
+/*
+ * Use the hostid as part of the random number seed.
+ */
+int
+get_host_seed()
+{
+    return gethostid();
+}
+
+
 /*
  * sys_check_options - check the options that the user specified
  */
-void
+int
 sys_check_options()
 {
   /*
    * We don't support demand dialing yet.
    */
-  if(demand)
+  if (demand)
     {
       syslog(LOG_WARNING, "PPP-2.3 for NeXTSTEP does not yet support demand dialing\n");
-      demand = 0;
+      return 0;
     }
+  return 1;
 }