apps/frp-panel
1
0
Fork 0
mirror of https://github.com/VaalaCat/frp-panel.git synced 2025-12-24 11:51:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add virt ping map to route

Browse Source
This commit is contained in:
VaalaCat
2025-11-12 15:43:28 +00:00
parent d50af4335e
commit db6070db7b
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/wg/topology_cache.go
View File

@@ -16,7 +16,7 @@ var (
type networkTopologyCache struct {
wireguardRuntimeInfoMap *utils.SyncMap[uint, *pb.WGDeviceRuntimeInfo] // wireguardId -> peerRuntimeInfo
fromToLatencyMap *utils.SyncMap[string, uint32] // fromWGID::toWGID -> latencyMs
virtAddrPingMap *utils.SyncMap[string, uint32] // virtAddr -> pingMs
virtAddrPingMap *utils.SyncMap[string, uint32] // fromWGID::toWGID -> pingMs
}
func NewNetworkTopologyCache() *networkTopologyCache {
@@ -36,8 +36,9 @@ func (c *networkTopologyCache) SetRuntimeInfo(wireguardId uint, runtimeInfo *pb.
for toWireGuardId, latencyMs := range runtimeInfo.GetPingMap() {
c.fromToLatencyMap.Store(parseFromToLatencyKey(wireguardId, uint(toWireGuardId)), latencyMs)
}
for virtAddr, pingMs := range runtimeInfo.GetVirtAddrPingMap() {
c.virtAddrPingMap.Store(virtAddr, pingMs)
c.virtAddrPingMap.Store(parseFromToLatencyKey(wireguardId, uint(runtimeInfo.PeerVirtAddrMap[virtAddr])), pingMs)
}
}
@@ -46,11 +47,24 @@ func (c *networkTopologyCache) DeleteRuntimeInfo(wireguardId uint) {
}
func (c *networkTopologyCache) GetLatencyMs(fromWGID, toWGID uint) (uint32, bool) {
v1, ok := c.fromToLatencyMap.Load(parseFromToLatencyKey(fromWGID, toWGID))
endpointLatency, ok := c.fromToLatencyMap.Load(parseFromToLatencyKey(fromWGID, toWGID))
if !ok {
return c.fromToLatencyMap.Load(parseFromToLatencyKey(toWGID, fromWGID))
endpointLatency, ok = c.fromToLatencyMap.Load(parseFromToLatencyKey(toWGID, fromWGID))
if !ok {
return 0, false
}
}
return v1, true
virtAddrLatency, ok := c.virtAddrPingMap.Load(parseFromToLatencyKey(fromWGID, toWGID))
if !ok {
virtAddrLatency, ok = c.virtAddrPingMap.Load(parseFromToLatencyKey(toWGID, fromWGID))
if !ok {
return endpointLatency, false
}
}
return (endpointLatency + virtAddrLatency) / 2, true
}
func parseFromToLatencyKey(fromWGID, toWGID uint) string {

11
services/wg/wireguard.go
View File

@@ -676,6 +676,8 @@ func (w *wireGuard) pingPeers() {
return
}
log.Debugf("start to ping peers, len: %d", len(ifceConfig.Peers))
peers := ifceConfig.Peers
var waitGroup conc.WaitGroup
@@ -699,6 +701,7 @@ func (w *wireGuard) pingPeers() {
}
epPinger.Count = 5
epPinger.Timeout = 10 * time.Second
epPinger.OnFinish = func(stats *probing.Statistics) {
// stats.PacketsSent, stats.PacketsRecv, stats.PacketLoss
@@ -725,8 +728,10 @@ func (w *wireGuard) pingPeers() {
waitGroup.Go(func() {
if err := epPinger.Run(); err != nil {
log.WithError(err).Errorf("failed to run pinger for %s", addr)
w.endpointPingMap.Store(peer.Id, math.MaxUint32)
return
}
log.Debugf("ping endpoint [%s] completed", addr)
})
}
@@ -744,6 +749,8 @@ func (w *wireGuard) pingPeers() {
}
virtAddrPinger.Count = 5
virtAddrPinger.InterfaceName = w.ifce.GetInterfaceName()
virtAddrPinger.Timeout = 10 * time.Second
virtAddrPinger.OnFinish = func(stats *probing.Statistics) {
log.Tracef("ping stats for %s: %v", addr, stats)
avgRttMs := uint32(stats.AvgRtt.Milliseconds())
@@ -764,11 +771,15 @@ func (w *wireGuard) pingPeers() {
waitGroup.Go(func() {
if err := virtAddrPinger.Run(); err != nil {
log.WithError(err).Errorf("failed to run pinger for %s", addr)
w.virtAddrPingMap.Store(addr, math.MaxUint32)
return
}
log.Debugf("ping virt addr [%s] completed", addr)
})
}
log.Debugf("wait for pingers to complete")
rcs := waitGroup.WaitAndRecover()
if rcs != nil {
log.WithError(rcs.AsError()).Errorf("failed to wait for pingers")