1 files changed, 31 insertions, 27 deletions

diff --git a/misc.c b/misc.c
index ddd2b2db4..de7e1facd 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.97 2015/04/24 01:36:00 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.101 2016/01/20 09:22:39 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/un.h>
 
 #include <limits.h>
@@ -604,6 +605,8 @@ percent_expand(const char *string, ...)
                 /* %% case */
                 if (*string == '%')
                         goto append;
+                if (*string == '\0')
+                        fatal("%s: invalid format", __func__);
                 for (j = 0; j < num_keys; j++) {
                         if (strchr(keys[j].key, *string) != NULL) {
                                 i = strlcat(buf, keys[j].repl, sizeof(buf));
@@ -653,62 +656,63 @@ tun_open(int tun, int mode)
         struct ifreq ifr;
         char name[100];
         int fd = -1, sock;
+        const char *tunbase = "tun";
+
+        if (mode == SSH_TUNMODE_ETHERNET)
+                tunbase = "tap";
 
         /* Open the tunnel device */
         if (tun <= SSH_TUNID_MAX) {
-                snprintf(name, sizeof(name), "/dev/tun%d", tun);
+                snprintf(name, sizeof(name), "/dev/%s%d", tunbase, tun);
                 fd = open(name, O_RDWR);
         } else if (tun == SSH_TUNID_ANY) {
                 for (tun = 100; tun >= 0; tun--) {
-                        snprintf(name, sizeof(name), "/dev/tun%d", tun);
+                        snprintf(name, sizeof(name), "/dev/%s%d",
+                            tunbase, tun);
                         if ((fd = open(name, O_RDWR)) >= 0)
                                 break;
                 }
         } else {
                 debug("%s: invalid tunnel %u", __func__, tun);
-                return (-1);
+                return -1;
         }
 
         if (fd < 0) {
-                debug("%s: %s open failed: %s", __func__, name, strerror(errno));
-                return (-1);
+                debug("%s: %s open: %s", __func__, name, strerror(errno));
+                return -1;
         }
 
         debug("%s: %s mode %d fd %d", __func__, name, mode, fd);
 
-        /* Set the tunnel device operation mode */
-        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "tun%d", tun);
+        /* Bring interface up if it is not already */
+        snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s%d", tunbase, tun);
         if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
                 goto failed;
 
-        if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1)
-                goto failed;
-
-        /* Set interface mode */
-        ifr.ifr_flags &= ~IFF_UP;
-        if (mode == SSH_TUNMODE_ETHERNET)
-                ifr.ifr_flags |= IFF_LINK0;
-        else
-                ifr.ifr_flags &= ~IFF_LINK0;
-        if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
+        if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) {
+                debug("%s: get interface %s flags: %s", __func__,
+                    ifr.ifr_name, strerror(errno));
                 goto failed;
+        }
 
-        /* Bring interface up */
-        ifr.ifr_flags |= IFF_UP;
-        if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1)
-                goto failed;
+        if (!(ifr.ifr_flags & IFF_UP)) {
+                ifr.ifr_flags |= IFF_UP;
+                if (ioctl(sock, SIOCSIFFLAGS, &ifr) == -1) {
+                        debug("%s: activate interface %s: %s", __func__,
+                            ifr.ifr_name, strerror(errno));
+                        goto failed;
+                }
+        }
 
         close(sock);
-        return (fd);
+        return fd;
 
  failed:
         if (fd >= 0)
                 close(fd);
         if (sock >= 0)
                 close(sock);
-        debug("%s: failed to set %s mode %d: %s", __func__, name,
-            mode, strerror(errno));
-        return (-1);
+        return -1;
 #else
         error("Tunnel interfaces are not supported on this platform");
         return (-1);
@@ -1107,7 +1111,7 @@ unix_listener(const char *path, int backlog, int unlink_first)
 void
 sock_set_v6only(int s)
 {
-#ifdef IPV6_V6ONLY
+#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
         int on = 1;
 
         debug3("%s: set socket %d IPV6_V6ONLY", __func__, s);