sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-21 09:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into braginini/wasm

Browse Source 
# Conflicts:
#	signal/client/client.go
This commit is contained in:
braginini
2021-11-15 15:45:37 +01:00
parent 6457c48281 7bf9793f85
commit ed63dd516c
15 changed files with 133 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/internal/engine.go
View File

@@ -148,6 +148,11 @@ func (e *Engine) initializePeer(peer Peer) {
}, e.ctx)
operation := func() error {
if e.signal.GetStatus() != signal.StreamConnected {
return fmt.Errorf("not opening connection to peer because Signal is unavailable")
}
_, err := e.openPeerConnection(e.wgPort, e.config.WgPrivateKey, peer)
e.peerMux.Lock()
defer e.peerMux.Unlock()
@@ -157,7 +162,7 @@ func (e *Engine) initializePeer(peer Peer) {
}
if err != nil {
log.Infof("retrying connection because of error: %s", err.Error())
log.Debugf("retrying connection because of error: %s", err.Error())
return err
}
return nil