MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-20 01:40:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refine direct connection validation logic in TestPingAllByIPDirectConnections

Browse Source 
Co-authored-by: kradalby <98431+kradalby@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-11-01 08:22:28 +00:00
parent 2ac534dd30
commit aafe727cb9
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
integration/general_test.go
View File

@@ -164,23 +164,18 @@ func TestPingAllByIPDirectConnections(t *testing.T) {
peerStatus := status.Peer[peerKey]
// CurAddr indicates the current address being used to communicate with this peer
// If CurAddr is not empty and doesn't start with the DERP region ID, it's a direct connection
if peerStatus.CurAddr != "" {
// Direct connections will have an IP:port format
// Relayed connections typically show up differently or are empty
if !strings.Contains(peerStatus.CurAddr, "127.3.3.40") { // DERP relay address pattern
directCount++
t.Logf("Client %s -> Peer %s: DIRECT connection via %s",
client.Hostname(), peerStatus.HostName, peerStatus.CurAddr)
} else {
relayedCount++
t.Logf("Client %s -> Peer %s: RELAYED connection via %s",
client.Hostname(), peerStatus.HostName, peerStatus.CurAddr)
}
// Direct connections have CurAddr set to an actual IP:port
// DERP-relayed connections either have no CurAddr or it contains the DERP magic IP
if peerStatus.CurAddr != "" && !strings.Contains(peerStatus.CurAddr, "127.3.3.40") {
// This is a direct connection - CurAddr contains the actual peer IP:port
directCount++
t.Logf("Client %s -> Peer %s: DIRECT connection via %s (relay: %s)",
client.Hostname(), peerStatus.HostName, peerStatus.CurAddr, peerStatus.Relay)
} else {
// This is a relayed connection through DERP
relayedCount++
t.Logf("Client %s -> Peer %s: No CurAddr (likely relayed via %s)",
client.Hostname(), peerStatus.HostName, peerStatus.Relay)
t.Logf("Client %s -> Peer %s: RELAYED connection (CurAddr: %s, relay: %s)",
client.Hostname(), peerStatus.HostName, peerStatus.CurAddr, peerStatus.Relay)
}
}