diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-14 06:38:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-14 06:38:53 +0800 |
| commit | b7e1b686aa1fc2c44fd6827b08c546629607d1a2 (patch) | |
| tree | 6cf0951e6da696b879d1f82cbaafb14bff84271c /p2p/handshake.go | |
| parent | 07eebc38b207e435d2397cefd1412a7ec9c1e32e (diff) | |
| parent | 2ea98d9b74ac2d66dce6eeb92c371c0237245d79 (diff) | |
| download | dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.gz dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.bz2 dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.lz dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.xz dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.zst dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'p2p/handshake.go')
| -rw-r--r-- | p2p/handshake.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/p2p/handshake.go b/p2p/handshake.go index 43361364f..79395f23f 100644 --- a/p2p/handshake.go +++ b/p2p/handshake.go @@ -115,7 +115,7 @@ func setupOutboundConn(fd net.Conn, prv *ecdsa.PrivateKey, our *protoHandshake, // returning the handshake read error. If the remote side // disconnects us early with a valid reason, we should return it // as the error so it can be tracked elsewhere. - werr := make(chan error) + werr := make(chan error, 1) go func() { werr <- Send(rw, handshakeMsg, our) }() rhs, err := readProtocolHandshake(rw, secrets.RemoteID, our) if err != nil { |