Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
33198376
Unverified
Commit
33198376
authored
Jun 18, 2020
by
Petar Radovic
Committed by
GitHub
Jun 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
full close timeout handle (#321)
parent
5587d466
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
hive.go
pkg/hive/hive.go
+2
-2
kademlia.go
pkg/kademlia/kademlia.go
+2
-2
libp2p.go
pkg/p2p/libp2p/libp2p.go
+12
-2
full.go
pkg/topology/full/full.go
+2
-2
No files found.
pkg/hive/hive.go
View file @
33198376
...
...
@@ -118,7 +118,7 @@ func (s *Service) sendPeers(ctx context.Context, peer swarm.Address, peers []swa
return
stream
.
FullClose
()
}
func
(
s
*
Service
)
peersHandler
(
_
context
.
Context
,
peer
p2p
.
Peer
,
stream
p2p
.
Stream
)
error
{
func
(
s
*
Service
)
peersHandler
(
ctx
context
.
Context
,
peer
p2p
.
Peer
,
stream
p2p
.
Stream
)
error
{
_
,
r
:=
protobuf
.
NewWriterAndReader
(
stream
)
var
peersReq
pb
.
Peers
if
err
:=
r
.
ReadMsgWithTimeout
(
messageTimeout
,
&
peersReq
);
err
!=
nil
{
...
...
@@ -143,7 +143,7 @@ func (s *Service) peersHandler(_ context.Context, peer p2p.Peer, stream p2p.Stre
}
if
s
.
peerHandler
!=
nil
{
if
err
:=
s
.
peerHandler
(
c
ontext
.
Background
()
,
bzzAddress
.
Overlay
);
err
!=
nil
{
if
err
:=
s
.
peerHandler
(
c
tx
,
bzzAddress
.
Overlay
);
err
!=
nil
{
return
err
}
}
...
...
pkg/kademlia/kademlia.go
View file @
33198376
...
...
@@ -297,7 +297,7 @@ func (k *Kad) announce(ctx context.Context, peer swarm.Address) error {
return
false
,
false
,
nil
}
addrs
=
append
(
addrs
,
connectedPeer
)
if
err
:=
k
.
discovery
.
BroadcastPeers
(
c
ontext
.
Background
()
,
connectedPeer
,
peer
);
err
!=
nil
{
if
err
:=
k
.
discovery
.
BroadcastPeers
(
c
tx
,
connectedPeer
,
peer
);
err
!=
nil
{
// we don't want to fail the whole process because of this, keep on gossiping
k
.
logger
.
Debugf
(
"error gossiping peer %s to peer %s: %v"
,
peer
,
connectedPeer
,
err
)
return
false
,
false
,
nil
...
...
@@ -309,7 +309,7 @@ func (k *Kad) announce(ctx context.Context, peer swarm.Address) error {
return
nil
}
err
:=
k
.
discovery
.
BroadcastPeers
(
c
ontext
.
Background
()
,
peer
,
addrs
...
)
err
:=
k
.
discovery
.
BroadcastPeers
(
c
tx
,
peer
,
addrs
...
)
if
err
!=
nil
{
_
=
k
.
p2p
.
Disconnect
(
peer
)
}
...
...
pkg/p2p/libp2p/libp2p.go
View file @
33198376
...
...
@@ -220,11 +220,19 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
}
if
exists
:=
s
.
peers
.
addIfNotExists
(
stream
.
Conn
(),
i
.
BzzAddress
.
Overlay
);
exists
{
_
=
stream
.
Close
()
if
err
=
stream
.
Close
();
err
!=
nil
{
s
.
logger
.
Debugf
(
"handshake: could not close stream %s: %v"
,
peerID
,
err
)
s
.
logger
.
Errorf
(
"unable to handshake with peer %v"
,
peerID
)
_
=
s
.
disconnect
(
peerID
)
}
return
}
_
=
stream
.
Close
()
if
err
=
stream
.
Close
();
err
!=
nil
{
s
.
logger
.
Debugf
(
"handshake: could not close stream %s: %v"
,
peerID
,
err
)
s
.
logger
.
Errorf
(
"unable to handshake with peer %v"
,
peerID
)
_
=
s
.
disconnect
(
peerID
)
}
err
=
s
.
addressbook
.
Put
(
i
.
BzzAddress
.
Overlay
,
*
i
.
BzzAddress
)
if
err
!=
nil
{
...
...
@@ -366,6 +374,7 @@ func (s *Service) Connect(ctx context.Context, addr ma.Multiaddr) (address *bzz.
if
exists
:=
s
.
peers
.
addIfNotExists
(
stream
.
Conn
(),
i
.
BzzAddress
.
Overlay
);
exists
{
if
err
:=
helpers
.
FullClose
(
stream
);
err
!=
nil
{
_
=
s
.
disconnect
(
info
.
ID
)
return
nil
,
err
}
...
...
@@ -373,6 +382,7 @@ func (s *Service) Connect(ctx context.Context, addr ma.Multiaddr) (address *bzz.
}
if
err
:=
helpers
.
FullClose
(
stream
);
err
!=
nil
{
_
=
s
.
disconnect
(
info
.
ID
)
return
nil
,
err
}
...
...
pkg/topology/full/full.go
View file @
33198376
...
...
@@ -100,7 +100,7 @@ func (d *driver) AddPeer(ctx context.Context, addr swarm.Address) error {
}
connectedAddrs
=
append
(
connectedAddrs
,
addressee
.
Address
)
if
err
:=
d
.
discovery
.
BroadcastPeers
(
c
ontext
.
Background
()
,
addressee
.
Address
,
addr
);
err
!=
nil
{
if
err
:=
d
.
discovery
.
BroadcastPeers
(
c
tx
,
addressee
.
Address
,
addr
);
err
!=
nil
{
return
err
}
}
...
...
@@ -109,7 +109,7 @@ func (d *driver) AddPeer(ctx context.Context, addr swarm.Address) error {
return
nil
}
return
d
.
discovery
.
BroadcastPeers
(
c
ontext
.
Background
()
,
addr
,
connectedAddrs
...
)
return
d
.
discovery
.
BroadcastPeers
(
c
tx
,
addr
,
connectedAddrs
...
)
}
// ClosestPeer returns the closest connected peer we have in relation to a
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment