extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-11 16:14:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update network map diff logic with custom comparators

Browse Source
This commit is contained in:
bcmmbaga
2024-08-15 10:49:45 +03:00
parent 441136e2c6
commit 151969bdd7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
management/server/updatechannel.go
View File

@ -6,6 +6,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/netbirdio/netbird/management/server/differs"
"github.com/netbirdio/netbird/management/server/posture" "github.com/netbirdio/netbird/management/server/posture"
"github.com/r3labs/diff" "github.com/r3labs/diff"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -236,13 +237,17 @@ func isNewPeerUpdateMessage(lastSentUpdate, currUpdateToSend *UpdateMessage) (bo
return true, nil return true, nil
} }
changelog, err = diff.Diff(lastSentUpdate.NetworkMap, currUpdateToSend.NetworkMap) differ, err := diff.NewDiffer(
diff.SliceOrdering(true),
diff.CustomValueDiffers(differs.NewNameServerComparator(), differs.NewRouteComparator()),
)
if err != nil {
return false, err
}
changelog, err = differ.Diff(lastSentUpdate.NetworkMap, currUpdateToSend.NetworkMap)
if err != nil { if err != nil {
return false, fmt.Errorf("failed to diff network map: %v", err) return false, fmt.Errorf("failed to diff network map: %v", err)
} }
if len(changelog) > 0 { return len(changelog) > 0, nil
return true, nil
}
return false, nil
} }