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
a15ec594
Commit
a15ec594
authored
Jan 27, 2020
by
Janos Guljas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
return overlay address bu p2p Connect function
parent
18b2f6bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
libp2p.go
pkg/p2p/libp2p/libp2p.go
+9
-9
p2p.go
pkg/p2p/p2p.go
+1
-1
No files found.
pkg/p2p/libp2p/libp2p.go
View file @
a15ec594
...
@@ -240,9 +240,9 @@ func New(ctx context.Context, o Options) (*Service, error) {
...
@@ -240,9 +240,9 @@ func New(ctx context.Context, o Options) (*Service, error) {
return
nil
,
fmt
.
Errorf
(
"bootnode %s: %w"
,
a
,
err
)
return
nil
,
fmt
.
Errorf
(
"bootnode %s: %w"
,
a
,
err
)
}
}
err
=
s
.
Connect
(
ctx
,
addr
)
overlay
,
err
:
=
s
.
Connect
(
ctx
,
addr
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"connect to bootnode %s
: %w"
,
a
,
err
)
return
nil
,
fmt
.
Errorf
(
"connect to bootnode %s
%s: %w"
,
a
,
overlay
,
err
)
}
}
}
}
...
@@ -303,35 +303,35 @@ func (s *Service) Addresses() (addrs []string, err error) {
...
@@ -303,35 +303,35 @@ func (s *Service) Addresses() (addrs []string, err error) {
return
addrs
,
nil
return
addrs
,
nil
}
}
func
(
s
*
Service
)
Connect
(
ctx
context
.
Context
,
addr
ma
.
Multiaddr
)
(
err
error
)
{
func
(
s
*
Service
)
Connect
(
ctx
context
.
Context
,
addr
ma
.
Multiaddr
)
(
overlay
string
,
err
error
)
{
// Extract the peer ID from the multiaddr.
// Extract the peer ID from the multiaddr.
info
,
err
:=
libp2ppeer
.
AddrInfoFromP2pAddr
(
addr
)
info
,
err
:=
libp2ppeer
.
AddrInfoFromP2pAddr
(
addr
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
""
,
err
}
}
if
err
:=
s
.
host
.
Connect
(
ctx
,
*
info
);
err
!=
nil
{
if
err
:=
s
.
host
.
Connect
(
ctx
,
*
info
);
err
!=
nil
{
return
err
return
""
,
err
}
}
stream
,
err
:=
s
.
newStreamForPeerID
(
ctx
,
info
.
ID
,
handshake
.
ProtocolName
,
handshake
.
StreamName
,
handshake
.
StreamVersion
)
stream
,
err
:=
s
.
newStreamForPeerID
(
ctx
,
info
.
ID
,
handshake
.
ProtocolName
,
handshake
.
StreamName
,
handshake
.
StreamVersion
)
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"new stream: %w"
,
err
)
return
""
,
fmt
.
Errorf
(
"new stream: %w"
,
err
)
}
}
defer
stream
.
Close
()
defer
stream
.
Close
()
i
,
err
:=
s
.
handshakeService
.
Handshake
(
stream
)
i
,
err
:=
s
.
handshakeService
.
Handshake
(
stream
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
""
,
err
}
}
if
i
.
NetworkID
!=
s
.
networkID
{
if
i
.
NetworkID
!=
s
.
networkID
{
return
fmt
.
Errorf
(
"invalid network id %v"
,
i
.
NetworkID
)
return
""
,
fmt
.
Errorf
(
"invalid network id %v"
,
i
.
NetworkID
)
}
}
s
.
peers
.
add
(
info
.
ID
,
i
.
Address
)
s
.
peers
.
add
(
info
.
ID
,
i
.
Address
)
s
.
metrics
.
CreatedConnectionCount
.
Inc
()
s
.
metrics
.
CreatedConnectionCount
.
Inc
()
s
.
logger
.
Infof
(
"peer %q connected"
,
i
.
Address
)
s
.
logger
.
Infof
(
"peer %q connected"
,
i
.
Address
)
return
nil
return
i
.
Address
,
nil
}
}
func
(
s
*
Service
)
NewStream
(
ctx
context
.
Context
,
overlay
,
protocolName
,
streamName
,
version
string
)
(
p2p
.
Stream
,
error
)
{
func
(
s
*
Service
)
NewStream
(
ctx
context
.
Context
,
overlay
,
protocolName
,
streamName
,
version
string
)
(
p2p
.
Stream
,
error
)
{
peerID
,
found
:=
s
.
peers
.
peerID
(
overlay
)
peerID
,
found
:=
s
.
peers
.
peerID
(
overlay
)
...
...
pkg/p2p/p2p.go
View file @
a15ec594
...
@@ -14,7 +14,7 @@ import (
...
@@ -14,7 +14,7 @@ import (
type
Service
interface
{
type
Service
interface
{
AddProtocol
(
ProtocolSpec
)
error
AddProtocol
(
ProtocolSpec
)
error
Connect
(
ctx
context
.
Context
,
addr
ma
.
Multiaddr
)
(
err
error
)
Connect
(
ctx
context
.
Context
,
addr
ma
.
Multiaddr
)
(
overlay
string
,
err
error
)
}
}
type
Streamer
interface
{
type
Streamer
interface
{
...
...
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