coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-12 03:37:59 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

merge wind HoC

Browse Source
This commit is contained in:
Juan Batiz-Benet 2014-09-14 04:28:38 -07:00 committed by Brian Tiger Chow
parent 5684fa2362
commit f71be6e9cc
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/conn/conn.go
View File

@ -6,6 +6,8 @@ import (
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
spipe "github.com/jbenet/go-ipfs/crypto/spipe"
peer "github.com/jbenet/go-ipfs/peer"
u "github.com/jbenet/go-ipfs/util"
)
@ -25,8 +27,7 @@ type Conn struct {
Closed chan bool
Outgoing *msgio.Chan
Incoming *msgio.Chan
secIn <-chan []byte
secOut chan<- []byte
Secure *spipe.SecurePipe
}
// Map maps Keys (Peer.IDs) to Connections.

30
net/swarm/conn.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"net"
ident "github.com/jbenet/go-ipfs/identify"
spipe "github.com/jbenet/go-ipfs/crypto/spipe"
conn "github.com/jbenet/go-ipfs/net/conn"
msg "github.com/jbenet/go-ipfs/net/message"
u "github.com/jbenet/go-ipfs/util"
@ -103,10 +103,9 @@ func (s *Swarm) connSetup(c *conn.Conn) error {
u.DOut("Starting connection: %s\n", c.Peer.Key().Pretty())
// handshake TODO(jbenet) enable handshake
// if err := s.connHandshake(c); err != nil {
// return fmt.Errorf("Conn handshake error: %v", err)
// }
if err := s.connSecure(c); err != nil {
return fmt.Errorf("Conn securing error: %v", err)
}
// add to conns
s.connsLock.Lock()
@ -122,12 +121,23 @@ func (s *Swarm) connSetup(c *conn.Conn) error {
return nil
}
// connHandshake runs the handshake with the remote connection.
func (s *Swarm) connHandshake(c *conn.Conn) error {
// connSecure setups a secure remote connection.
func (s *Swarm) connSecure(c *conn.Conn) error {
//TODO(jbenet) this Handshake stuff should be moved elsewhere.
// needs cleanup. needs context. use msg.Pipe.
return ident.Handshake(s.local, c.Peer, c.Incoming.MsgChan, c.Outgoing.MsgChan)
sp, err := spipe.NewSecurePipe(s.ctx, 10, s.local, c.Peer)
if err != nil {
return err
}
err = sp.Wrap(s.ctx, spipe.Duplex{
In: c.Incoming.MsgChan,
Out: c.Outgoing.MsgChan,
})
if err != nil {
return err
}
return nil
}
// Handles the unwrapping + sending of messages to the right connection.