extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-23 11:12:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the active conn type logic

Browse Source
This commit is contained in:
Zoltán Papp 2024-06-21 19:13:41 +02:00
parent 7581bbd925
commit 69d8d5aa86
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/internal/peer/conn.go
View File

@ -89,8 +89,9 @@ type Conn struct {
onConnected func(remoteWireGuardKey string, remoteRosenpassPubKey []byte, wireGuardIP string, remoteRosenpassAddr string)
onDisconnected func(remotePeer string, wgIP string)
statusRelay ConnStatus
statusICE ConnStatus
statusRelay ConnStatus
statusICE ConnStatus
currentConnType ConnPriority
workerICE *WorkerICE
workerRelay *WorkerRelay
@ -99,8 +100,6 @@ type Conn struct {
beforeAddPeerHooks []BeforeAddPeerHookFunc
afterRemovePeerHooks []AfterRemovePeerHookFunc
currentConnType ConnPriority
endpointRelay *net.UDPAddr
}
@ -366,8 +365,12 @@ func (conn *Conn) relayConnectionIsReady(rci RelayConnInfo) {
conn.statusRelay = stateConnected
// todo review this condition
if conn.currentConnType > connPriorityRelay {
return
if conn.statusICE == StatusConnected {
log.Debugf("do not switch to relay because current priority is: %v", conn.currentConnType)
return
}
}
if conn.currentConnType != 0 {
@ -430,6 +433,7 @@ func (conn *Conn) iCEConnectionIsReady(priority ConnPriority, iceConnInfo ICECon
conn.statusICE = stateConnected
// todo review this condition
if conn.currentConnType > priority {
return
}