Skip to content

Commit 65fa51e

Browse files
committed
revert challenge fix
Signed-off-by: Chen Kai <281165273grape@gmail.com>
1 parent 8f1f4ef commit 65fa51e

1 file changed

Lines changed: 12 additions & 17 deletions

File tree

p2p/discover/v5wire/encoding.go

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,18 @@ var DefaultProtocolID = [6]byte{'d', 'i', 's', 'c', 'v', '5'}
104104

105105
// Errors.
106106
var (
107-
errTooShort = errors.New("packet too short")
108-
errInvalidHeader = errors.New("invalid packet header")
109-
errInvalidFlag = errors.New("invalid flag value in header")
110-
errMinVersion = errors.New("version of packet header below minimum")
111-
errMsgTooShort = errors.New("message/handshake packet below minimum size")
112-
errAuthSize = errors.New("declared auth size is beyond packet length")
113-
errUnexpectedHandshake = errors.New("unexpected auth response, not in handshake")
114-
errInvalidAuthKey = errors.New("invalid ephemeral pubkey")
115-
errNoRecord = errors.New("expected ENR in handshake but none sent")
116-
errInvalidNonceSig = errors.New("invalid ID nonce signature")
117-
errMessageTooShort = errors.New("message contains no data")
118-
errMessageDecrypt = errors.New("cannot decrypt message")
119-
errChallengeAlreadySent = errors.New("challenge already sent to this node")
107+
errTooShort = errors.New("packet too short")
108+
errInvalidHeader = errors.New("invalid packet header")
109+
errInvalidFlag = errors.New("invalid flag value in header")
110+
errMinVersion = errors.New("version of packet header below minimum")
111+
errMsgTooShort = errors.New("message/handshake packet below minimum size")
112+
errAuthSize = errors.New("declared auth size is beyond packet length")
113+
errUnexpectedHandshake = errors.New("unexpected auth response, not in handshake")
114+
errInvalidAuthKey = errors.New("invalid ephemeral pubkey")
115+
errNoRecord = errors.New("expected ENR in handshake but none sent")
116+
errInvalidNonceSig = errors.New("invalid ID nonce signature")
117+
errMessageTooShort = errors.New("message contains no data")
118+
errMessageDecrypt = errors.New("cannot decrypt message")
120119
)
121120

122121
// Public errors.
@@ -218,10 +217,6 @@ func (c *Codec) Encode(id enode.ID, addr string, packet Packet, challenge *Whoar
218217

219218
// Store sent WHOAREYOU challenges.
220219
if challenge, ok := packet.(*Whoareyou); ok {
221-
// check if we already sent a challenge to this node
222-
if c.sc.getHandshake(id, addr) != nil {
223-
return nil, Nonce{}, errChallengeAlreadySent
224-
}
225220
challenge.ChallengeData = bytesCopy(&c.buf)
226221
c.sc.storeSentHandshake(id, addr, challenge)
227222
} else if msgData == nil {

0 commit comments

Comments
 (0)