diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-16 06:27:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-16 06:27:13 +0800 |
| commit | 1564f1a020b9edc78bc672f8f2df64b3d0dc55c3 (patch) | |
| tree | d898e2b20a6c2e0b5613ae7f669499c5db23b719 /p2p/peer.go | |
| parent | 8e24378cc1acb074b56de75bf0baf6feb7927677 (diff) | |
| parent | 7ea76fcf993f3fecb55233bdcc2409618d9080b9 (diff) | |
| download | dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.gz dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.bz2 dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.lz dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.xz dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.tar.zst dexon-1564f1a020b9edc78bc672f8f2df64b3d0dc55c3.zip | |
Merge branch 'release/0.9.21'
Diffstat (limited to 'p2p/peer.go')
| -rw-r--r-- | p2p/peer.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/p2p/peer.go b/p2p/peer.go index ac691f2ce..c7ec08887 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -131,10 +131,11 @@ func (p *Peer) run() DiscReason { case err := <-p.protoErr: reason = discReasonForError(err) case reason = <-p.disc: + p.politeDisconnect(reason) + reason = DiscRequested } close(p.closed) - p.politeDisconnect(reason) p.wg.Wait() glog.V(logger.Debug).Infof("%v: Disconnected: %v\n", p, reason) return reason @@ -191,7 +192,7 @@ func (p *Peer) handle(msg Msg) error { // check errors because, the connection will be closed after it. rlp.Decode(msg.Payload, &reason) glog.V(logger.Debug).Infof("%v: Disconnect Requested: %v\n", p, reason[0]) - return DiscRequested + return reason[0] case msg.Code < baseProtocolLength: // ignore other base protocol messages return msg.Discard() |