Large patch from Frank Cusack <fcusack@fcusack.com> to add proper

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

diff --git a/pppd/sys-osf.c b/pppd/sys-osf.c
index 9ee243473694cd6affc9df8e69dfde6bcbf6af80..f487cda69de8f05729321f6b534c8f7a593eeb10 100644 (file)
--- a/pppd/sys-osf.c
+++ b/pppd/sys-osf.c
@@ -25,10 +25,9 @@
  * OR MODIFICATIONS.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: sys-osf.c,v 1.26 1999/04/27 22:33:09 varadhan Exp $";
-#endif
+#define RCSID  "$Id: sys-osf.c,v 1.31 1999/12/23 01:35:28 paulus Exp $"
 
+#include <syslog.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -61,6 +60,8 @@ static char rcsid[] = "$Id: sys-osf.c,v 1.26 1999/04/27 22:33:09 varadhan Exp $"
 
 #include "pppd.h"
 
+static const char rcsid[] = RCSID;
+
 static int     pppfd;
 static int     fdmuxid = -1;
 static int     iffd;
@@ -375,6 +376,13 @@ establish_ppp(fd)
             if (i != fd && i != sockfd)
                 close(i);
         closed_stdio = 1;
+       /* make sure 0, 1, 2 are open to /dev/null */
+       while ((i = open("/dev/null", O_RDWR)) >= 0) {
+           if (i > 2) {
+               close(i);
+               break;
+           }
+       }
     }
 
     /*
@@ -802,11 +810,13 @@ wait_loop_output(timo)
     wait_input(timo);
 }
 
+#endif
+
 /*
  * wait_time - wait for a given length of time or until a
- * signal is received.
+ * signal is received. Called by ccp_test
  */
-void
+static void
 wait_time(timo)
     struct timeval *timo;
 {
@@ -816,7 +826,6 @@ wait_time(timo)
     if (n < 0 && errno != EINTR)
        fatal("select: %m");
 }
-#endif
 
 /*
  * read_packet - get a PPP packet from the serial device.
@@ -837,7 +846,7 @@ read_packet(buf)
        flags = 0;
        len = getmsg(pppfd, &ctrl, &data, &flags);
        if (len < 0) {
-           if (errno = EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
+           if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR)
                return -1;
            fatal("Error reading packet: %m");
        }
@@ -1526,61 +1535,7 @@ GetMask(addr)
  */
 int have_route_to(u_int32_t addr)
 {
-       char buf[sizeof(struct rt_msghdr) + (sizeof(struct sockaddr_in))];
-       int status;
-       int s, n;
-       struct rt_msghdr *rtm;
-       struct sockaddr_in *sin;
-       int msglen = sizeof(*rtm) + (sizeof(*sin));
-       char *cp;
-       char msg[2048];
-
-       rtm = (struct rt_msghdr *)buf;
-       memset(rtm, 0, msglen);
-       rtm->rtm_msglen = msglen;
-       rtm->rtm_version = RTM_VERSION;
-       rtm->rtm_type = RTM_GET;
-       rtm->rtm_addrs = RTA_DST;
-       /* rtm->rtm_addrs, rtm_flags  should be set on output */
-
-       sin = (struct sockaddr_in *)((u_char *)rtm + sizeof(*rtm));
-       sin->sin_len = sizeof(*sin);
-       sin->sin_family = AF_INET;
-       sin->sin_addr.s_addr = addr;
-
-        status = 0;
-
-       if ((s = socket(PF_ROUTE, SOCK_RAW, 0)) < 0)
-               return -1;
-       if (write(s, (char *)rtm, msglen) != msglen) {
-               close(s);
-               return status == ESRCH? 0: -1;
-       }
-
-       n = read(s, msg, 2048);
-       close(s);
-       if (n <= 0)
-               return -1;
-
-       rtm = (struct rt_msghdr *) msg;
-       if (rtm->rtm_version != RTM_VERSION)
-               return -1;
-
-       /* here we try to work out if the route is through our own interface */
-       cp = (char *)(rtm + 1);
-       if (rtm->rtm_addrs & RTA_DST) {
-               struct sockaddr *sa = (struct sockaddr *) cp;
-               cp = (char *)(((unsigned long)cp + sa->sa_len
-                              + sizeof(long) - 1) & ~(sizeof(long) - 1));
-       }
-       if (rtm->rtm_addrs & RTA_GATEWAY) {
-               sin = (struct sockaddr_in *) cp;
-               if (sin->sin_addr.s_addr == ifaddrs[0]
-                   || sin->sin_addr.s_addr == ifaddrs[1])
-                       return 0;       /* route is through our interface */
-       }
-
-       return 1;
+       return -1; 
 }
 
 static int