diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
| commit | bab78bbeb691d95bdd0222435af0c11cb3485a79 (patch) | |
| tree | 804c9689546ce362a2862b00bb4e76160052f5d6 /p2p/protocol.go | |
| parent | 7a79428278412ab1f73708af51bce063b000b7a7 (diff) | |
| parent | 1360f027d9e365242466ca346b2b56f421729d91 (diff) | |
| download | dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.gz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.bz2 dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.lz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.xz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.zst dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.zip | |
Merge branch 'tests' of github.com:ethereum/go-ethereum into tests
Diffstat (limited to 'p2p/protocol.go')
| -rw-r--r-- | p2p/protocol.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/p2p/protocol.go b/p2p/protocol.go index 28eab87cd..3f52205f5 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -154,12 +154,11 @@ func (bp *baseProtocol) handle(rw MsgReadWriter) error { return newPeerError(errProtocolBreach, "extra handshake received") case discMsg: - var reason DiscReason + var reason [1]DiscReason if err := msg.Decode(&reason); err != nil { return err } - bp.peer.Disconnect(reason) - return nil + return discRequestedError(reason[0]) case pingMsg: return bp.rw.EncodeMsg(pongMsg) |