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

Fix changing alias

Browse Source
This commit is contained in:
Owen
2025-12-05 12:05:48 -05:00
parent 0f8c6b2e17
commit 0391106477
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
olm/olm.go
View File

@@ -670,20 +670,22 @@ func StartTunnel(config TunnelConfig) {
}
}
// Remove old aliases
for _, alias := range updateSubnetsData.OldAliases {
if err := peerManager.RemoveAlias(updateSubnetsData.SiteId, alias.Alias); err != nil {
logger.Error("Failed to remove alias %s: %v", alias.Alias, err)
}
}
// Add new aliases
// 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
// temporarily removed from the allowed IPs list
for _, alias := range updateSubnetsData.NewAliases {
if err := peerManager.AddAlias(updateSubnetsData.SiteId, alias); err != nil {
logger.Error("Failed to add alias %s: %v", alias.Alias, err)
}
}
// Remove old aliases after new ones are added
for _, alias := range updateSubnetsData.OldAliases {
if err := peerManager.RemoveAlias(updateSubnetsData.SiteId, alias.Alias); err != nil {
logger.Error("Failed to remove alias %s: %v", alias.Alias, err)
}
}
logger.Info("Successfully updated remote subnets and aliases for peer %d", updateSubnetsData.SiteId)
})