From bb147c2a7c5b8cbe1d64c13808acc871af757245 Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Mon, 17 Apr 2023 11:50:12 +0200
Subject: [PATCH] Remove unnecessary uapi open (#807)

Remove unnecessary uapi open from Android implementation
---
 iface/tun_android.go | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/iface/tun_android.go b/iface/tun_android.go
index 09eef48e6..d49de66c8 100644
--- a/iface/tun_android.go
+++ b/iface/tun_android.go
@@ -1,18 +1,15 @@
 package iface
 
 import (
-	"net"
 	"strings"
 
 	"github.com/pion/transport/v2"
-
-	"github.com/netbirdio/netbird/iface/bind"
-
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"golang.zx2c4.com/wireguard/device"
-	"golang.zx2c4.com/wireguard/ipc"
 	"golang.zx2c4.com/wireguard/tun"
+
+	"github.com/netbirdio/netbird/iface/bind"
 )
 
 type tunDevice struct {
@@ -24,7 +21,6 @@ type tunDevice struct {
 	fd      int
 	name    string
 	device  *device.Device
-	uapi    net.Listener
 	iceBind *bind.ICEBind
 }
 
@@ -58,32 +54,8 @@ func (t *tunDevice) Create() error {
 	t.device = device.NewDevice(tunDevice, t.iceBind, device.NewLogger(device.LogLevelSilent, "[wiretrustee] "))
 	t.device.DisableSomeRoamingForBrokenMobileSemantics()
 
-	log.Debugf("create uapi")
-	tunSock, err := ipc.UAPIOpen(name)
-	if err != nil {
-		return err
-	}
-
-	t.uapi, err = ipc.UAPIListen(name, tunSock)
-	if err != nil {
-		tunSock.Close()
-		unix.Close(t.fd)
-		return err
-	}
-
-	go func() {
-		for {
-			uapiConn, err := t.uapi.Accept()
-			if err != nil {
-				return
-			}
-			go t.device.IpcHandle(uapiConn)
-		}
-	}()
-
 	err = t.device.Up()
 	if err != nil {
-		tunSock.Close()
 		t.device.Close()
 		return err
 	}
@@ -109,10 +81,6 @@ func (t *tunDevice) UpdateAddr(addr WGAddress) error {
 }
 
 func (t *tunDevice) Close() (err error) {
-	if t.uapi != nil {
-		err = t.uapi.Close()
-	}
-
 	if t.device != nil {
 		t.device.Close()
 	}