add infrastructure to support packet filtering

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

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 676839bf359ad52d6b2d8715fa60cdfa0cb27dc8..154f2a74b552613b5928c7c4fad70372e4aa8868 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -282,7 +282,7 @@ void sys_init(void)
 #ifdef INET6
     sock6_fd = socket(AF_INET6, SOCK_DGRAM, 0);
     if (sock6_fd < 0)
-       fatal("Couldn't create IPv6 socket: %m(%d)", errno);
+       sock6_fd = -errno;      /* save errno for later */
 #endif
 
     FD_ZERO(&in_fds);
@@ -442,8 +442,9 @@ int establish_ppp (int tty_fd)
         */
        set_ppp_fd (tty_fd);
        if (ioctl(tty_fd, PPPIOCGUNIT, &x) < 0) {       
-           if ( ! ok_error (errno))
-               fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno);
+           if (ok_error (errno))
+               goto err;
+           fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno);
        }
        /* Check that we got the same unit again. */
        if (looped && x != ifunit)
@@ -2299,6 +2300,11 @@ int sif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64)
     struct ifreq ifr;
     struct in6_rtmsg rt6;
 
+    if (sock6_fd < 0) {
+       errno = -sock6_fd;
+       error("IPv6 socket creation failed: %m");
+       return 0;
+    }
     memset(&ifr, 0, sizeof (ifr));
     strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
     if (ioctl(sock6_fd, SIOCGIFINDEX, (caddr_t) &ifr) < 0) {
@@ -2343,6 +2349,11 @@ int cif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64)
     struct ifreq ifr;
     struct in6_ifreq ifr6;
 
+    if (sock6_fd < 0) {
+       errno = -sock6_fd;
+       error("IPv6 socket creation failed: %m");
+       return 0;
+    }
     memset(&ifr, 0, sizeof(ifr));
     strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
     if (ioctl(sock6_fd, SIOCGIFINDEX, (caddr_t) &ifr) < 0) {