mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 15:16:43 +00:00
revert challenge fix
Signed-off-by: Chen Kai <281165273grape@gmail.com>
This commit is contained in:
parent
8f1f4efd69
commit
65fa51e125
1 changed files with 12 additions and 17 deletions
|
|
@ -104,19 +104,18 @@ var DefaultProtocolID = [6]byte{'d', 'i', 's', 'c', 'v', '5'}
|
||||||
|
|
||||||
// Errors.
|
// Errors.
|
||||||
var (
|
var (
|
||||||
errTooShort = errors.New("packet too short")
|
errTooShort = errors.New("packet too short")
|
||||||
errInvalidHeader = errors.New("invalid packet header")
|
errInvalidHeader = errors.New("invalid packet header")
|
||||||
errInvalidFlag = errors.New("invalid flag value in header")
|
errInvalidFlag = errors.New("invalid flag value in header")
|
||||||
errMinVersion = errors.New("version of packet header below minimum")
|
errMinVersion = errors.New("version of packet header below minimum")
|
||||||
errMsgTooShort = errors.New("message/handshake packet below minimum size")
|
errMsgTooShort = errors.New("message/handshake packet below minimum size")
|
||||||
errAuthSize = errors.New("declared auth size is beyond packet length")
|
errAuthSize = errors.New("declared auth size is beyond packet length")
|
||||||
errUnexpectedHandshake = errors.New("unexpected auth response, not in handshake")
|
errUnexpectedHandshake = errors.New("unexpected auth response, not in handshake")
|
||||||
errInvalidAuthKey = errors.New("invalid ephemeral pubkey")
|
errInvalidAuthKey = errors.New("invalid ephemeral pubkey")
|
||||||
errNoRecord = errors.New("expected ENR in handshake but none sent")
|
errNoRecord = errors.New("expected ENR in handshake but none sent")
|
||||||
errInvalidNonceSig = errors.New("invalid ID nonce signature")
|
errInvalidNonceSig = errors.New("invalid ID nonce signature")
|
||||||
errMessageTooShort = errors.New("message contains no data")
|
errMessageTooShort = errors.New("message contains no data")
|
||||||
errMessageDecrypt = errors.New("cannot decrypt message")
|
errMessageDecrypt = errors.New("cannot decrypt message")
|
||||||
errChallengeAlreadySent = errors.New("challenge already sent to this node")
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Public errors.
|
// Public errors.
|
||||||
|
|
@ -218,10 +217,6 @@ func (c *Codec) Encode(id enode.ID, addr string, packet Packet, challenge *Whoar
|
||||||
|
|
||||||
// Store sent WHOAREYOU challenges.
|
// Store sent WHOAREYOU challenges.
|
||||||
if challenge, ok := packet.(*Whoareyou); ok {
|
if challenge, ok := packet.(*Whoareyou); ok {
|
||||||
// check if we already sent a challenge to this node
|
|
||||||
if c.sc.getHandshake(id, addr) != nil {
|
|
||||||
return nil, Nonce{}, errChallengeAlreadySent
|
|
||||||
}
|
|
||||||
challenge.ChallengeData = bytesCopy(&c.buf)
|
challenge.ChallengeData = bytesCopy(&c.buf)
|
||||||
c.sc.storeSentHandshake(id, addr, challenge)
|
c.sc.storeSentHandshake(id, addr, challenge)
|
||||||
} else if msgData == nil {
|
} else if msgData == nil {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue