octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-02 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(stdiscosrv): calculate IPv6 GUA

Browse Source
This commit is contained in:
Jakob Borg 2024-09-15 10:45:03 +02:00
parent a156e88eef
commit c8ee2a5cf6
No known key found for this signature in database
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/stdiscosrv/database.go
View File

@ -159,7 +159,7 @@ func (s *inMemoryStore) calculateStatistics() {
now := s.clock.Now() now := s.clock.Now()
cutoff24h := now.Add(-24 * time.Hour).UnixNano() cutoff24h := now.Add(-24 * time.Hour).UnixNano()
cutoff1w := now.Add(-7 * 24 * time.Hour).UnixNano() cutoff1w := now.Add(-7 * 24 * time.Hour).UnixNano()
current, currentIPv4, currentIPv6, last24h, last1w := 0, 0, 0, 0, 0 current, currentIPv4, currentIPv6, currentIPv6GUA, last24h, last1w := 0, 0, 0, 0, 0, 0
n := 0 n := 0
s.m.Range(func(key protocol.DeviceID, rec DatabaseRecord) bool { s.m.Range(func(key protocol.DeviceID, rec DatabaseRecord) bool {
@ -172,14 +172,20 @@ func (s *inMemoryStore) calculateStatistics() {
switch { switch {
case len(addresses) > 0: case len(addresses) > 0:
current++ current++
seenIPv4, seenIPv6 := false, false seenIPv4, seenIPv6, seenIPv6GUA := false, false, false
for _, addr := range rec.Addresses { for _, addr := range rec.Addresses {
// We do fast and loose matching on strings here instead of
// parsing the address and the IP and doing "proper" checks,
// to keep things fast and generate less garbage.
if strings.Contains(addr.Address, "[") { if strings.Contains(addr.Address, "[") {
seenIPv6 = true seenIPv6 = true
if strings.Contains(addr.Address, "[2") {
seenIPv6GUA = true
}
} else { } else {
seenIPv4 = true seenIPv4 = true
} }
if seenIPv4 && seenIPv6 { if seenIPv4 && seenIPv6 && seenIPv6GUA {
break break
} }
} }
@ -189,6 +195,9 @@ func (s *inMemoryStore) calculateStatistics() {
if seenIPv6 { if seenIPv6 {
currentIPv6++ currentIPv6++
} }
if seenIPv6GUA {
currentIPv6GUA++
}
case rec.Seen > cutoff24h: case rec.Seen > cutoff24h:
last24h++ last24h++
case rec.Seen > cutoff1w: case rec.Seen > cutoff1w:
@ -203,6 +212,7 @@ func (s *inMemoryStore) calculateStatistics() {
databaseKeys.WithLabelValues("current").Set(float64(current)) databaseKeys.WithLabelValues("current").Set(float64(current))
databaseKeys.WithLabelValues("currentIPv4").Set(float64(currentIPv4)) databaseKeys.WithLabelValues("currentIPv4").Set(float64(currentIPv4))
databaseKeys.WithLabelValues("currentIPv6").Set(float64(currentIPv6)) databaseKeys.WithLabelValues("currentIPv6").Set(float64(currentIPv6))
databaseKeys.WithLabelValues("currentIPv6GUA").Set(float64(currentIPv6GUA))
databaseKeys.WithLabelValues("last24h").Set(float64(last24h)) databaseKeys.WithLabelValues("last24h").Set(float64(last24h))
databaseKeys.WithLabelValues("last1w").Set(float64(last1w)) databaseKeys.WithLabelValues("last1w").Set(float64(last1w))
databaseStatisticsSeconds.Set(time.Since(now).Seconds()) databaseStatisticsSeconds.Set(time.Since(now).Seconds())