opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 09:34:03 +08:00
Code Issues Projects Releases Wiki Activity

handshake: error out while sending + dbg

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-09-23 05:17:16 -07:00
parent 7228786981
commit eaffabec4f
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/spipe/handshake.go
View File

@ -67,8 +67,12 @@ func (s *SecurePipe) handshake() error {
return err return err
} }
// u.POut("sending encoded handshake\n") // Send our Propose packet
s.insecure.Out <- encoded select {
case s.insecure.Out <- encoded:
case <-s.ctx.Done():
return ErrClosed
}
// Parse their Propose packet and generate an Exchange packet. // Parse their Propose packet and generate an Exchange packet.
// Exchange = (EphemeralPubKey, Signature) // Exchange = (EphemeralPubKey, Signature)
@ -137,7 +141,12 @@ func (s *SecurePipe) handshake() error {
exEncoded, err := proto.Marshal(exPacket) exEncoded, err := proto.Marshal(exPacket)
s.insecure.Out <- exEncoded // send out Exchange packet
select {
case s.insecure.Out <- exEncoded:
case <-s.ctx.Done():
return ErrClosed
}
// Parse their Exchange packet and generate a Finish packet. // Parse their Exchange packet and generate a Finish packet.
// Finish = E('Finish') // Finish = E('Finish')
@ -182,7 +191,14 @@ func (s *SecurePipe) handshake() error {
finished := []byte("Finished") finished := []byte("Finished")
s.Out <- finished // send finished msg
select {
case <-s.ctx.Done():
return ErrClosed
case s.Out <- finished:
}
// recv finished msg
var resp2 []byte var resp2 []byte
select { select {
case <-s.ctx.Done(): case <-s.ctx.Done():
@ -194,7 +210,7 @@ func (s *SecurePipe) handshake() error {
return errors.New("Negotiation failed.") return errors.New("Negotiation failed.")
} }
u.DOut("[%s] identify: Got node id: %s\n", s.local.ID.Pretty(), s.remote.ID.Pretty()) u.DOut("[%s] handshake: Got node id: %s\n", s.local.ID.Pretty(), s.remote.ID.Pretty())
return nil return nil
} }