Dont configure server iface if local ip-config is off (#168)

Doridian · Feb 21, 2023 · a11ce41 · a11ce41
1 parent c267f67
commit a11ce41
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/client/clients/commands.go b/client/clients/commands.go
@@ -87,7 +87,7 @@ func (c *Client) registerCommandHandlers() {
 		if c.doIPConfig {
 			err = c.iface.Configure(c.remoteNet.GetRawIP(), c.remoteNet, c.remoteNet.GetServerIP())
 		} else {
-			err = c.iface.Configure(nil, c.remoteNet, c.remoteNet.GetServerIP())
+			err = c.iface.Configure(nil, nil, nil)
 		}
 		if err != nil {
 			return err

diff --git a/server/servers/main_iface.go b/server/servers/main_iface.go
@@ -58,9 +58,12 @@ func (s *Server) createMainIface() error {
 
 	s.ifaceCreationMutex.Unlock()
 
-	serverIP := s.VPNNet.GetServerIP()
-
-	err = s.mainIface.Configure(serverIP, s.VPNNet, serverIP)
+	if s.DoLocalIPConfig {
+		serverIP := s.VPNNet.GetServerIP()
+		err = s.mainIface.Configure(serverIP, s.VPNNet, serverIP)
+	} else {
+		err = s.mainIface.Configure(nil, nil, nil)
+	}
 	if err != nil {
 		return err
 	}

diff --git a/server/servers/sockets.go b/server/servers/sockets.go
@@ -152,7 +152,11 @@ func (s *Server) serveSocket(w http.ResponseWriter, r *http.Request) {
 
 		clientLogger.Printf("Assigned interface %s", localIfaceW.Name())
 
-		err = localIface.Configure(s.VPNNet.GetServerIP(), nil, ipClient)
+		if s.DoLocalIPConfig {
+			err = localIface.Configure(s.VPNNet.GetServerIP(), nil, ipClient)
+		} else {
+			err = localIface.Configure(nil, nil, nil)
+		}
 		if err != nil {
 			clientLogger.Printf("Error configuring interface: %v", err)
 			return