sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add timeout while initiating conenction

Browse Source
This commit is contained in:
braginini
2021-04-19 22:56:01 +02:00
parent e71c623e33
commit ac871a5306
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
connection/engine.go
View File

@@ -77,14 +77,16 @@ func (e *Engine) Start(privateKey string, peers []Peer) error {
go func() {
operation := func() error {
_, closed, err := e.openConnection(*wgPort, myKey, peer)
_, closed, err := e.openPeerConnection(*wgPort, myKey, peer)
if err != nil {
e.conns[peer.WgPubKey] = nil
return err
}
select {
case _, ok := <-closed:
if !ok {
e.conns[peer.WgPubKey] = nil
return fmt.Errorf("connection to peer %s has been closed", peer.WgPubKey)
}
return nil
@@ -103,7 +105,8 @@ func (e *Engine) Start(privateKey string, peers []Peer) error {
return nil
}
func (e *Engine) openConnection(wgPort int, myKey wgtypes.Key, peer Peer) (*Connection, chan struct{}, error) {
func (e *Engine) openPeerConnection(wgPort int, myKey wgtypes.Key, peer Peer) (*Connection, chan struct{}, error) {
remoteKey, _ := wgtypes.ParseKey(peer.WgPubKey)
connConfig := &ConnConfig{
WgListenAddr: fmt.Sprintf("127.0.0.1:%d", wgPort),