pangolin_mirror/olm
1
0
Fork 0
mirror of https://github.com/fosrl/olm.git synced 2026-02-27 15:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder operations

Browse Source
This commit is contained in:
Owen
2025-12-05 16:34:09 -05:00
parent 10eda0aec7
commit ef49089160
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
olm/olm.go
View File

@@ -656,20 +656,22 @@ func StartTunnel(config TunnelConfig) {
return return
} }
// Remove old subnets // Add new subnets BEFORE removing old ones to preserve shared subnets
for _, subnet := range updateSubnetsData.OldRemoteSubnets { // This ensures that if an old and new subnet are the same on different peers,
if err := peerManager.RemoveRemoteSubnet(updateSubnetsData.SiteId, subnet); err != nil { // the route won't be temporarily removed
logger.Error("Failed to remove allowed IP %s: %v", subnet, err)
}
}
// Add new subnets
for _, subnet := range updateSubnetsData.NewRemoteSubnets { for _, subnet := range updateSubnetsData.NewRemoteSubnets {
if err := peerManager.AddRemoteSubnet(updateSubnetsData.SiteId, subnet); err != nil { if err := peerManager.AddRemoteSubnet(updateSubnetsData.SiteId, subnet); err != nil {
logger.Error("Failed to add allowed IP %s: %v", subnet, err) logger.Error("Failed to add allowed IP %s: %v", subnet, err)
} }
} }
// Remove old subnets after new ones are added
for _, subnet := range updateSubnetsData.OldRemoteSubnets {
if err := peerManager.RemoveRemoteSubnet(updateSubnetsData.SiteId, subnet); err != nil {
logger.Error("Failed to remove allowed IP %s: %v", subnet, err)
}
}
// Add new aliases BEFORE removing old ones to preserve shared IP addresses // Add new aliases BEFORE removing old ones to preserve shared IP addresses
// This ensures that if an old and new alias share the same IP, the IP won't be // This ensures that if an old and new alias share the same IP, the IP won't be
// temporarily removed from the allowed IPs list // temporarily removed from the allowed IPs list