Merge branch 'develop' into contrib/license

2018-06-26 12:29:17 +02:00 · 2018-06-26 12:29:17 +02:00 · 2bbaecb4c8
parent 05455f949c 98c6580e6f
commit 2bbaecb4c8
1 changed files with 11 additions and 0 deletions
--- a/tools/serial-io/tunslip6.c
+++ b/tools/serial-io/tunslip6.c
@ -885,6 +885,17 @@ exit(1);
    }
  }

+#ifdef __APPLE__
+  if(*tundev == '\0') {
+    /* Use default. */
+    if(tap) {
+      strcpy(tundev, "tap0");
+    } else {
+      strcpy(tundev, "tun0");
+    }
+  }
+#endif
+
  if(host != NULL) {
    struct addrinfo hints, *servinfo, *p;
    int rv;