From cdd27a9fe56932bb1b780e39fbaa112e475dd155 Mon Sep 17 00:00:00 2001 From: Zoltan Papp Date: Tue, 27 May 2025 13:32:54 +0200 Subject: [PATCH] [client, android] Fix/android enable server route (#3806) Enable the server route; otherwise, the manager throws an error and the engine will restart. --- .../{server_nonandroid.go => server.go} | 2 -- .../internal/routemanager/server_android.go | 27 ------------------- 2 files changed, 29 deletions(-) rename client/internal/routemanager/{server_nonandroid.go => server.go} (99%) delete mode 100644 client/internal/routemanager/server_android.go diff --git a/client/internal/routemanager/server_nonandroid.go b/client/internal/routemanager/server.go similarity index 99% rename from client/internal/routemanager/server_nonandroid.go rename to client/internal/routemanager/server.go index 131d4c170..5bacb856c 100644 --- a/client/internal/routemanager/server_nonandroid.go +++ b/client/internal/routemanager/server.go @@ -1,5 +1,3 @@ -//go:build !android - package routemanager import ( diff --git a/client/internal/routemanager/server_android.go b/client/internal/routemanager/server_android.go deleted file mode 100644 index 953210e9e..000000000 --- a/client/internal/routemanager/server_android.go +++ /dev/null @@ -1,27 +0,0 @@ -//go:build android - -package routemanager - -import ( - "context" - "fmt" - - firewall "github.com/netbirdio/netbird/client/firewall/manager" - "github.com/netbirdio/netbird/client/internal/peer" - "github.com/netbirdio/netbird/client/internal/routemanager/iface" - "github.com/netbirdio/netbird/route" -) - -type serverRouter struct { -} - -func (r serverRouter) cleanUp() { -} - -func (r serverRouter) updateRoutes(map[route.ID]*route.Route, bool) error { - return nil -} - -func newServerRouter(context.Context, iface.WGIface, firewall.Manager, *peer.Status) (*serverRouter, error) { - return nil, fmt.Errorf("server route not supported on this os") -}