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

[relay-client] Fix Relay disconnection handling (#2680)

Browse Source 
* Fix Relay disconnection handling

If has an active P2P connection meanwhile the Relay connection broken with the server then we removed the WireGuard peer configuration.

* Change logs
This commit is contained in:
Zoltan Papp 2024-10-01 16:22:18 +02:00 committed by GitHub
parent 24c0aaa745
commit ee0ea86a0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,13 +586,17 @@ func (conn *Conn) onWorkerRelayStateDisconnected() {
return return
} }
if conn.wgProxyRelay != nil { log.Debugf("relay connection is disconnected")
log.Debugf("relayed connection is closed, clean up WireGuard config")
if conn.currentConnPriority == connPriorityRelay {
log.Debugf("clean up WireGuard config")
err := conn.config.WgConfig.WgInterface.RemovePeer(conn.config.WgConfig.RemoteKey) err := conn.config.WgConfig.WgInterface.RemovePeer(conn.config.WgConfig.RemoteKey)
if err != nil { if err != nil {
conn.log.Errorf("failed to remove wg endpoint: %v", err) conn.log.Errorf("failed to remove wg endpoint: %v", err)
} }
}
if conn.wgProxyRelay != nil {
conn.endpointRelay = nil conn.endpointRelay = nil
_ = conn.wgProxyRelay.CloseConn() _ = conn.wgProxyRelay.CloseConn()
conn.wgProxyRelay = nil conn.wgProxyRelay = nil