Do not fill SetupTpChan in createTransport

skycoin · Jul 17, 2019 · 5f072c6 · 5f072c6
1 parent e9d9cc1
commit 5f072c6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/pkg/transport/manager.go b/pkg/transport/manager.go
@@ -339,23 +339,16 @@ func (tm *Manager) createTransport(ctx context.Context, remote cipher.PubKey, tp
 	tm.transports[entry.ID] = mTr
 	tm.mu.Unlock()
 
-	var setupTpChan chan Transport
-	var dataTpChan chan *ManagedTransport
-
 	if tm.IsSetupTransport(tr) {
-		setupTpChan = tm.SetupTpChan
-	} else {
-		dataTpChan = tm.DataTpChan
+		return mTr, nil
 	}
 
 	select {
 	case <-tm.doneChan:
 		return nil, io.ErrClosedPipe
-	case dataTpChan <- mTr:
+	case tm.DataTpChan <- mTr:
 		go tm.manageTransport(ctx, mTr, factory, remote)
 		return mTr, nil
-	case setupTpChan <- mTr:
-		return mTr, nil
 	}
 }
 

diff --git a/vendor/github.com/skycoin/dmsg/client.go b/vendor/github.com/skycoin/dmsg/client.go
diff --git a/vendor/github.com/skycoin/dmsg/transport.go b/vendor/github.com/skycoin/dmsg/transport.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -95,8 +95,8 @@ golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/poly1305
 # golang.org/x/net v0.0.0-20190620200207-3b0461eec859
 golang.org/x/net/context
-golang.org/x/net/proxy
 golang.org/x/net/nettest
+golang.org/x/net/proxy
 golang.org/x/net/internal/socks
 # golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb
 golang.org/x/sys/unix