sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-01 22:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor route handling to simplify route information and improve state management

Browse Source
This commit is contained in:
Hakan Sariman
2025-03-08 12:25:35 +03:00
parent d08a629f9e
commit 86492b88c4
9 changed files with 72 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/internal/routemanager/server_nonandroid.go
View File

@@ -104,10 +104,7 @@ func (m *serverRouter) removeFromServerNetwork(route *route.Route) error {
delete(m.routes, route.ID)
state := m.statusRecorder.GetLocalPeerState()
delete(state.Routes, peer.RouteWithResourceId{
Route: route.Network.String(),
ResourceId: route.GetResourceID(),
})
delete(state.Routes, route.Network.String())
m.statusRecorder.UpdateLocalPeerState(state)
return nil
@@ -136,17 +133,14 @@ func (m *serverRouter) addToServerNetwork(route *route.Route) error {
state := m.statusRecorder.GetLocalPeerState()
if state.Routes == nil {
state.Routes = map[peer.RouteWithResourceId]struct{}{}
state.Routes = map[string]struct{}{}
}
routeStr := route.Network.String()
if route.IsDynamic() {
routeStr = route.Domains.SafeString()
}
state.Routes[peer.RouteWithResourceId{
Route: routeStr,
ResourceId: route.GetResourceID(),
}] = struct{}{}
state.Routes[routeStr] = struct{}{}
m.statusRecorder.UpdateLocalPeerState(state)