bitswap net: always close
Juan Batiz-Benet committed
Jan 3, 2015 at 06:16 UTC
71ada4696fe16c3923fb7dae7bf31e6eda6bcf13
1 file changed
+10
-13
exchange/bitswap/network/ipfs_impl.go
+10
-13
@@ -97,23 +97,20 @@ func (bsnet *impl) Provide(ctx context.Context, k util.Key) error {
97
98
// handleNewStream receives a new stream from the network.
99
func (bsnet *impl) handleNewStream(s inet.Stream) {
100
+ defer s.Close()
101
102
if bsnet.receiver == nil {
103
return
104
}
105
105
- go func() {
106
- defer s.Close()
107
-
108
- received, err := bsmsg.FromNet(s)
109
- if err != nil {
110
- go bsnet.receiver.ReceiveError(err)
111
- return
112
- }
113
-
114
- p := s.Conn().RemotePeer()
115
- ctx := context.Background()
116
- bsnet.receiver.ReceiveMessage(ctx, p, received)
117
- }()
106
+ received, err := bsmsg.FromNet(s)
107
+ if err != nil {
108
+ go bsnet.receiver.ReceiveError(err)
109
+ return
110
+ }
111
112
+ p := s.Conn().RemotePeer()
113
+ ctx := context.Background()
114
+ log.Debugf("bsnet handleNewStream from %s", s.Conn().RemotePeer())
115
+ bsnet.receiver.ReceiveMessage(ctx, p, received)
116
}