peer online count in report
This commit is contained in:
parent
1fd9e03509
commit
17b0ad74ae
2
add.go
2
add.go
@ -3,8 +3,8 @@ package dsnet
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
|
||||||
"text/template"
|
"text/template"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Add() {
|
func Add() {
|
||||||
|
@ -60,12 +60,15 @@ type DsnetReport struct {
|
|||||||
Network JSONIPNet
|
Network JSONIPNet
|
||||||
DNS net.IP
|
DNS net.IP
|
||||||
Peers []PeerReport
|
Peers []PeerReport
|
||||||
|
PeersOnline int
|
||||||
|
PeersTotal int
|
||||||
}
|
}
|
||||||
|
|
||||||
func GenerateReport(dev *wgtypes.Device, conf *DsnetConfig, oldReport *DsnetReport) DsnetReport {
|
func GenerateReport(dev *wgtypes.Device, conf *DsnetConfig, oldReport *DsnetReport) DsnetReport {
|
||||||
wgPeerIndex := make(map[wgtypes.Key]wgtypes.Peer)
|
wgPeerIndex := make(map[wgtypes.Key]wgtypes.Peer)
|
||||||
peerReports := make([]PeerReport, len(conf.Peers))
|
peerReports := make([]PeerReport, len(conf.Peers))
|
||||||
oldPeerReportIndex := make(map[string]PeerReport)
|
oldPeerReportIndex := make(map[string]PeerReport)
|
||||||
|
peersOnline := 0
|
||||||
|
|
||||||
for _, peer := range dev.Peers {
|
for _, peer := range dev.Peers {
|
||||||
wgPeerIndex[peer.PublicKey] = peer
|
wgPeerIndex[peer.PublicKey] = peer
|
||||||
@ -86,6 +89,7 @@ func GenerateReport(dev *wgtypes.Device, conf *DsnetConfig, oldReport *DsnetRepo
|
|||||||
status = StatusSyncRequired
|
status = StatusSyncRequired
|
||||||
} else if time.Since(wgPeer.LastHandshakeTime) < TIMEOUT {
|
} else if time.Since(wgPeer.LastHandshakeTime) < TIMEOUT {
|
||||||
status = StatusOnline
|
status = StatusOnline
|
||||||
|
peersOnline += 1
|
||||||
// TODO same test but with rx byte data from last report (otherwise
|
// TODO same test but with rx byte data from last report (otherwise
|
||||||
// peer can fake online status by disabling handshake)
|
// peer can fake online status by disabling handshake)
|
||||||
} else if !wgPeer.LastHandshakeTime.IsZero() && time.Since(wgPeer.LastHandshakeTime) > EXPIRY {
|
} else if !wgPeer.LastHandshakeTime.IsZero() && time.Since(wgPeer.LastHandshakeTime) > EXPIRY {
|
||||||
@ -118,6 +122,8 @@ func GenerateReport(dev *wgtypes.Device, conf *DsnetConfig, oldReport *DsnetRepo
|
|||||||
Network: conf.Network,
|
Network: conf.Network,
|
||||||
DNS: conf.DNS,
|
DNS: conf.DNS,
|
||||||
Peers: peerReports,
|
Peers: peerReports,
|
||||||
|
PeersOnline: peersOnline,
|
||||||
|
PeersTotal: len(peerReports),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user