mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-22 10:57:42 +08:00
92d08db7a5
- updated go-ctxgroup and goprocess ctxgroup: AddChildGroup was changed to AddChild. Used in two files: - p2p/net/mock/mock_net.go - routing/dht/dht.go - updated context from hg repo to git prev. commit in hg was ad01a6fcc8a19d3a4478c836895ffe883bd2ceab. (context: make parentCancelCtx iterative) represents commit 84f8955a887232b6308d79c68b8db44f64df455c in git repo - updated context to master (b6fdb7d8a4ccefede406f8fe0f017fb58265054c) Aaron Jacobs (2): net/context: Don't accept a context in the DoSomethingSlow example. context: Be clear that users must cancel the result of WithCancel. Andrew Gerrand (1): go.net: use golang.org/x/... import paths Bryan C. Mills (1): net/context: Don't leak goroutines in Done example. Damien Neil (1): context: fix removal of cancelled timer contexts from parent David Symonds (2): context: Fix WithValue example code. net: add import comments. Sameer Ajmani (1): context: fix TestAllocs to account for ints in interfaces
64 lines
1.3 KiB
Go
64 lines
1.3 KiB
Go
package corenet
|
|
|
|
import (
|
|
"time"
|
|
|
|
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
|
|
core "github.com/jbenet/go-ipfs/core"
|
|
net "github.com/jbenet/go-ipfs/p2p/net"
|
|
peer "github.com/jbenet/go-ipfs/p2p/peer"
|
|
pro "github.com/jbenet/go-ipfs/p2p/protocol"
|
|
)
|
|
|
|
type ipfsListener struct {
|
|
conCh chan net.Stream
|
|
proto pro.ID
|
|
ctx context.Context
|
|
cancel func()
|
|
}
|
|
|
|
func (il *ipfsListener) Accept() (net.Stream, error) {
|
|
select {
|
|
case c := <-il.conCh:
|
|
return c, nil
|
|
case <-il.ctx.Done():
|
|
return nil, il.ctx.Err()
|
|
}
|
|
}
|
|
|
|
func (il *ipfsListener) Close() error {
|
|
il.cancel()
|
|
// TODO: unregister handler from peerhost
|
|
return nil
|
|
}
|
|
|
|
func Listen(nd *core.IpfsNode, protocol string) (*ipfsListener, error) {
|
|
ctx, cancel := context.WithCancel(nd.Context())
|
|
|
|
list := &ipfsListener{
|
|
proto: pro.ID(protocol),
|
|
conCh: make(chan net.Stream),
|
|
ctx: ctx,
|
|
cancel: cancel,
|
|
}
|
|
|
|
nd.PeerHost.SetStreamHandler(list.proto, func(s net.Stream) {
|
|
select {
|
|
case list.conCh <- s:
|
|
case <-ctx.Done():
|
|
s.Close()
|
|
}
|
|
})
|
|
|
|
return list, nil
|
|
}
|
|
|
|
func Dial(nd *core.IpfsNode, p peer.ID, protocol string) (net.Stream, error) {
|
|
ctx, _ := context.WithTimeout(nd.Context(), time.Second*30)
|
|
err := nd.PeerHost.Connect(ctx, peer.PeerInfo{ID: p})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return nd.PeerHost.NewStream(pro.ID(protocol), p)
|
|
}
|