From 314f34f916cd90674aa9257c4d503dde9ab4f6b5 Mon Sep 17 00:00:00 2001
From: braginini <bangvalo@gmail.com>
Date: Wed, 7 Sep 2022 18:40:42 +0200
Subject: [PATCH] Single Mux

---
 client/internal/engine.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/internal/engine.go b/client/internal/engine.go
index 9ba1be5c0..1e0337713 100644
--- a/client/internal/engine.go
+++ b/client/internal/engine.go
@@ -88,8 +88,7 @@ type Engine struct {
 
 	wgInterface *iface.WGIface
 
-	iceMux     ice.UniversalUDPMux
-	iceHostMux ice.UDPMux
+	iceMux ice.UniversalUDPMux
 
 	// networkSerial is the latest CurrentSerial (state ID) of the network sent by the Management service
 	networkSerial uint64
@@ -210,12 +209,6 @@ func (e *Engine) Start() error {
 	}
 	e.iceMux = iceMux
 
-	/*iceHostMux, err := bind.GetICEHostMux()
-	if err != nil {
-		return err
-	}*/
-	e.iceHostMux = iceMux
-
 	log.Infof("NetBird Engine started listening on WireGuard port %d", *port)
 
 	e.routeManager = routemanager.NewManager(e.ctx, e.config.WgPrivateKey.PublicKey().String(), e.wgInterface, e.statusRecorder)
@@ -739,7 +732,7 @@ func (e Engine) createPeerConn(pubKey string, allowedIPs string) (*peer.Conn, er
 		StunTurn:           stunTurn,
 		InterfaceBlackList: e.config.IFaceBlackList,
 		Timeout:            timeout,
-		UDPMux:             e.iceHostMux,
+		UDPMux:             e.iceMux,
 		UDPMuxSrflx:        e.iceMux,
 		ProxyConfig:        proxyConfig,
 		LocalWgPort:        e.config.WgPort,