From e71e94a2adb14051a60d35b1aa25bf5dc65de32b Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Thu, 12 Dec 2024 11:44:03 +0100 Subject: [PATCH] Fix iOS --- client/ios/NetBirdSDK/client.go | 10 +++++----- client/server/route.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/ios/NetBirdSDK/client.go b/client/ios/NetBirdSDK/client.go index 6f501e0c6..1b4413141 100644 --- a/client/ios/NetBirdSDK/client.go +++ b/client/ios/NetBirdSDK/client.go @@ -272,8 +272,8 @@ func (c *Client) GetRoutesSelectionDetails() (*RoutesSelectionDetails, error) { return nil, fmt.Errorf("not connected") } - routesMap := engine.GetClientRoutesWithNetID() routeManager := engine.GetRouteManager() + routesMap := routeManager.GetClientRoutesWithNetID() if routeManager == nil { return nil, fmt.Errorf("could not get route manager") } @@ -365,12 +365,12 @@ func (c *Client) SelectRoute(id string) error { } else { log.Debugf("select route with id: %s", id) routes := toNetIDs([]string{id}) - if err := routeSelector.SelectRoutes(routes, true, maps.Keys(engine.GetClientRoutesWithNetID())); err != nil { + if err := routeSelector.SelectRoutes(routes, true, maps.Keys(routeManager.GetClientRoutesWithNetID())); err != nil { log.Debugf("error when selecting routes: %s", err) return fmt.Errorf("select routes: %w", err) } } - routeManager.TriggerSelection(engine.GetClientRoutes()) + routeManager.TriggerSelection(routeManager.GetClientRoutes()) return nil } @@ -392,12 +392,12 @@ func (c *Client) DeselectRoute(id string) error { } else { log.Debugf("deselect route with id: %s", id) routes := toNetIDs([]string{id}) - if err := routeSelector.DeselectRoutes(routes, maps.Keys(engine.GetClientRoutesWithNetID())); err != nil { + if err := routeSelector.DeselectRoutes(routes, maps.Keys(routeManager.GetClientRoutesWithNetID())); err != nil { log.Debugf("error when deselecting routes: %s", err) return fmt.Errorf("deselect routes: %w", err) } } - routeManager.TriggerSelection(engine.GetClientRoutes()) + routeManager.TriggerSelection(routeManager.GetClientRoutes()) return nil } diff --git a/client/server/route.go b/client/server/route.go index f1312a5f3..1033ae7d3 100644 --- a/client/server/route.go +++ b/client/server/route.go @@ -116,12 +116,12 @@ func (s *Server) SelectRoutes(_ context.Context, req *proto.SelectRoutesRequest) routeSelector.SelectAllRoutes() } else { routes := toNetIDs(req.GetRouteIDs()) - netIdRoutes := maps.Keys(engine.GetRouteManager().GetClientRoutesWithNetID()) + netIdRoutes := maps.Keys(routeManager.GetClientRoutesWithNetID()) if err := routeSelector.SelectRoutes(routes, req.GetAppend(), netIdRoutes); err != nil { return nil, fmt.Errorf("select routes: %w", err) } } - routeManager.TriggerSelection(engine.GetRouteManager().GetClientRoutes()) + routeManager.TriggerSelection(routeManager.GetClientRoutes()) return &proto.SelectRoutesResponse{}, nil } @@ -146,12 +146,12 @@ func (s *Server) DeselectRoutes(_ context.Context, req *proto.SelectRoutesReques routeSelector.DeselectAllRoutes() } else { routes := toNetIDs(req.GetRouteIDs()) - netIdRoutes := maps.Keys(engine.GetRouteManager().GetClientRoutesWithNetID()) + netIdRoutes := maps.Keys(routeManager.GetClientRoutesWithNetID()) if err := routeSelector.DeselectRoutes(routes, netIdRoutes); err != nil { return nil, fmt.Errorf("deselect routes: %w", err) } } - routeManager.TriggerSelection(engine.GetRouteManager().GetClientRoutes()) + routeManager.TriggerSelection(routeManager.GetClientRoutes()) return &proto.SelectRoutesResponse{}, nil }