old DLPI doesn't have dl_sap_length

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

diff --git a/pppd/sys-osf.c b/pppd/sys-osf.c
index 8cd7710b7a4989e72c4c5b8782f33b20c4867f02..261019820f3dc6d450e380ee3963d391860eb2c9 100644 (file)
--- a/pppd/sys-osf.c
+++ b/pppd/sys-osf.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-osf.c,v 1.3 1995/04/28 06:26:23 paulus Exp $";
+static char rcsid[] = "$Id: sys-osf.c,v 1.5 1995/10/27 03:47:32 paulus Exp $";
 #endif
 
 /*
@@ -67,11 +67,22 @@ static int  closed_stdio;
 static int     restore_term;   /* 1 => we've munged the terminal */
 static struct termios inittermios; /* Initial TTY termios */
 static struct winsize wsinfo;      /* Initial window size info */
+static int     initfdflags = -1; /* Initial file descriptor flags for fd */
 
-int sockfd;                     /* socket for doing interface ioctls */
+static int sockfd;             /* socket for doing interface ioctls */
 
 int ttyfd = -1;   /*  Original ttyfd if we did a streamify()  */
 
+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 */
+
+/* Prototypes for procedures local to this file. */
+static int translate_speed __P((int));
+static int baud_rate_of __P((int));
+static int get_ether_addr __P((u_int32_t, struct sockaddr *));
+
+
 /*
  * sys_init - System-dependent initialization.
  */
@@ -90,6 +101,31 @@ sys_init()
     }
 }
 
+/*
+ * sys_cleanup - restore any system state we modified before exiting:
+ * mark the interface down, delete default route and/or proxy arp entry.
+ * This should call die() because it's called from die().
+ */
+void
+sys_cleanup()
+{
+    struct ifreq ifr;
+
+    if (if_is_up) {
+       strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+       if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) >= 0
+           && ((ifr.ifr_flags & IFF_UP) != 0)) {
+           ifr.ifr_flags &= ~IFF_UP;
+           ioctl(sockfd, SIOCSIFFLAGS, &ifr);
+       }
+    }
+
+    if (default_route_gateway)
+       cifdefaultroute(0, default_route_gateway);
+    if (proxy_arp_addr)
+       cifproxyarp(0, proxy_arp_addr);
+}
+
 /*
  * note_debug_level - note a change in the debug level.
  */
@@ -308,6 +344,14 @@ establish_ppp()
                close(i);
        closed_stdio = 1;
     }
+
+    /*
+     * Set device for non-blocking reads.
+     */
+    if ((initfdflags = fcntl(fd, F_GETFL)) == -1
+       || fcntl(fd, F_SETFL, initfdflags | O_NONBLOCK) == -1) {
+       syslog(LOG_WARNING, "Couldn't set device to non-blocking mode: %m");
+    }
 }
 
 /*  Debugging routine....  */
@@ -343,6 +387,11 @@ disestablish_ppp()
     int flags;
     char *s;
 
+    /* Reset non-blocking mode on the file descriptor. */
+    if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) < 0)
+       syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
+    initfdflags = -1;
+
     if (hungup) {
        /* we can't push or pop modules after the stream has hung up */
        str_module_count = 0;
@@ -479,7 +528,7 @@ struct speed {
 /*
  * Translate from bits/second to a speed_t.
  */
-int
+static int
 translate_speed(bps)
     int bps;
 {
@@ -497,7 +546,7 @@ translate_speed(bps)
 /*
  * Translate from a speed_t to bits/second.
  */
-int
+static int
 baud_rate_of(speed)
     int speed;
 {
@@ -548,8 +597,8 @@ set_up_tty(fd, local)
     tios.c_cc[VMIN] = 1;
     tios.c_cc[VTIME] = 0;
 
-    if (crtscts == 2) {
-       tios.c_iflag |= IXOFF;
+    if (crtscts == -2) {
+       tios.c_iflag |= IXON | IXOFF;
        tios.c_cc[VSTOP] = 0x13;        /* DC3 = XOFF = ^S */
        tios.c_cc[VSTART] = 0x11;       /* DC1 = XON  = ^Q */
     }
@@ -587,6 +636,15 @@ void
 restore_tty()
 {
     if (restore_term) {
+       if (!default_device) {
+           /*
+            * Turn off echoing, because otherwise we can get into
+            * a loop with the tty and the modem echoing to each other.
+            * We presume we are the sole user of this tty device, so
+            * when we close it, it will revert to its defaults anyway.
+            */
+           inittermios.c_lflag &= ~(ECHO | ECHONL);
+       }
        if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
            if (errno != ENXIO)
                syslog(LOG_WARNING, "tcsetattr: %m");
@@ -618,20 +676,25 @@ output(unit, p, len)
     u_char *p;
     int len;
 {
-    struct strbuf      str;
+    struct strbuf str;
+    int retries;
+    struct pollfd pfd;
 
-    if (unit != 0)
-       MAINDEBUG((LOG_WARNING, "output: unit != 0!"));
     if (debug)
        log_packet(p, len, "sent ");
 
     str.len = len;
     str.buf = (caddr_t) p;
-    if (putmsg(fd, NULL, &str, 0) < 0) {
-       if (errno != ENXIO) {
-           syslog(LOG_ERR, "putmsg: %m");
-           die(1);
+    retries = 4;
+    while (putmsg(fd, NULL, &str, 0) < 0) {
+       if (--retries < 0 || (errno != EWOULDBLOCK && errno != EAGAIN)) {
+           if (errno != ENXIO)
+               syslog(LOG_ERR, "Couldn't send packet: %m");
+           break;
        }
+       pfd.fd = fd;
+       pfd.events = POLLOUT;
+       poll(&pfd, 1, 250);     /* wait for up to 0.25 seconds */
     }
 }
 
@@ -792,7 +855,9 @@ ccp_test(unit, opt_ptr, opt_len, for_transmit)
     data.length = opt_len;
     data.transmit = for_transmit;
     BCOPY(opt_ptr, data.opt_data, opt_len);
-    return ioctl(fd, (int)SIOCSCOMPRESS, (caddr_t) &data) >= 0;
+    if (ioctl(fd, (int)SIOCSCOMPRESS, (caddr_t) &data) >= 0)
+       return 1;
+    return (errno == ENOSR)? 0: -1;
 }
 
 /*
@@ -864,6 +929,7 @@ sifup(u)
        syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
        return 0;
     }
+    if_is_up = 1;
     npi.protocol = PPP_IP;
     npi.mode = NPMODE_PASS;
     if (ioctl(fd, (int)SIOCSETNPMODE, &npi) < 0) {
@@ -905,7 +971,8 @@ sifdown(u)
        if (ioctl(sockfd, (int)SIOCSIFFLAGS, (caddr_t) &ifr) < 0) {
            syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
            rv = 0;
-       }
+       } else
+           if_is_up = 0;
     }
     return rv;
 }
@@ -1002,6 +1069,7 @@ sifdefaultroute(u, g)
        syslog(LOG_ERR, "default route ioctl(SIOCADDRT): %m");
        return 0;
     }
+    default_route_gateway = g;
     return 1;
 }
 
@@ -1023,6 +1091,7 @@ cifdefaultroute(u, g)
        syslog(LOG_ERR, "default route ioctl(SIOCDELRT): %m");
        return 0;
     }
+    default_route_gateway = 0;
     return 1;
 }
 
@@ -1055,6 +1124,7 @@ sifproxyarp(unit, hisaddr)
        return 0;
     }
 
+    proxy_arp_addr = hisaddr;
     return 1;
 }
 
@@ -1075,6 +1145,7 @@ cifproxyarp(unit, hisaddr)
        syslog(LOG_ERR, "ioctl(SIOCDARP): %m");
        return 0;
     }
+    proxy_arp_addr = 0;
     return 1;
 }
 
@@ -1086,7 +1157,7 @@ cifproxyarp(unit, hisaddr)
 
 int s;
 
-int
+static int
 get_ether_addr(ipaddr, hwaddr)
     u_int ipaddr;
     struct sockaddr *hwaddr;