Merge pull request #650 from tomc797/feature/set_tun_name

Allocate tun network device with name "ziti0"
openziti · May 24, 2023 · 065f12a · 065f12a
2 parents d67faef + 02c9f3f
commit 065f12a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/programs/ziti-edge-tunnel/netif_driver/linux/tun.c b/programs/ziti-edge-tunnel/netif_driver/linux/tun.c
@@ -396,11 +396,10 @@ netif_driver tun_open(uv_loop_t *loop, uint32_t tun_ip, uint32_t dns_ip, const c
         return NULL;
     }
 
-    struct ifreq ifr;
-    memset(&ifr, 0, sizeof(ifr));
-    ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
+    struct ifreq ifr = { .ifr_name = "ziti%d",
+                         .ifr_flags = IFF_TUN | IFF_NO_PI };
 
-    if (ioctl(tun->fd, TUNSETIFF, (void *) &ifr) < 0) {
+    if (ioctl(tun->fd, TUNSETIFF, &ifr) < 0) {
         if (error != NULL) {
             snprintf(error, error_len, "failed to open tun device:%s", strerror(errno));
         }