github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve network proximity calculation

Browse Source
This commit is contained in:
Daniel
2021-09-29 15:43:35 +02:00
parent 4848e27966
commit 9cb7fe346e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intel/geoip/location.go
View File

@@ -84,9 +84,8 @@ func (l *Location) EstimateNetworkProximity(to *Location) (proximity int) {
case l.Coordinates.Latitude == 0 && l.Coordinates.Longitude == 0: case l.Coordinates.Latitude == 0 && l.Coordinates.Longitude == 0:
fallthrough fallthrough
case to.Coordinates.Latitude == 0 && to.Coordinates.Longitude == 0: case to.Coordinates.Latitude == 0 && to.Coordinates.Longitude == 0:
// If we don't have any on any side coordinates, set accuracy to worst // If we don't have any coordinates, return.
// effective value. return proximity
accuracy = 1000
case to.Coordinates.AccuracyRadius > accuracy: case to.Coordinates.AccuracyRadius > accuracy:
// If the destination accuracy is worse, use that one. // If the destination accuracy is worse, use that one.
accuracy = to.Coordinates.AccuracyRadius accuracy = to.Coordinates.AccuracyRadius
@@ -98,11 +97,11 @@ func (l *Location) EstimateNetworkProximity(to *Location) (proximity int) {
distanceInPercent := (earthCircumferenceInKm - km) * 100 / earthCircumferenceInKm distanceInPercent := (earthCircumferenceInKm - km) * 100 / earthCircumferenceInKm
// apply penalty for locations with low accuracy (targeting accuracy radius >100) // apply penalty for locations with low accuracy (targeting accuracy radius >100)
accuracyModifier := 1 - float64(accuracy)/1000 accuracyModifier := 1 - float64(accuracy)/2000
proximity += int(distanceInPercent * 0.10 * accuracyModifier) proximity += int(distanceInPercent * 0.10 * accuracyModifier)
} }
return //nolint:nakedret return proximity
} }
// PrimitiveNetworkProximity calculates the numerical distance between two IP addresses. Returns a proximity value between 0 (far away) and 100 (nearby). // PrimitiveNetworkProximity calculates the numerical distance between two IP addresses. Returns a proximity value between 0 (far away) and 100 (nearby).