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
19fbbf77
Unverified
Commit
19fbbf77
authored
Oct 20, 2020
by
Janoš Guljaš
Committed by
GitHub
Oct 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
expose nat underlay address by p2p service (#820)
parent
6d8d74b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
libp2p.go
pkg/p2p/libp2p/libp2p.go
+12
-1
static_resolver.go
pkg/p2p/libp2p/static_resolver.go
+1
-2
No files found.
pkg/p2p/libp2p/libp2p.go
View file @
19fbbf77
...
...
@@ -50,6 +50,7 @@ type Service struct {
ctx
context
.
Context
host
host
.
Host
natManager
basichost
.
NATManager
natAddrResolver
*
staticAddressResolver
libp2pPeerstore
peerstore
.
Peerstore
metrics
metrics
networkID
uint64
...
...
@@ -179,15 +180,17 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
}
var
advertisableAddresser
handshake
.
AdvertisableAddressResolver
var
natAddrResolver
*
staticAddressResolver
if
o
.
NATAddr
==
""
{
advertisableAddresser
=
&
UpnpAddressResolver
{
host
:
h
,
}
}
else
{
advertisableAddress
er
,
err
=
newStaticAddressResolver
(
o
.
NATAddr
)
natAddrResolv
er
,
err
=
newStaticAddressResolver
(
o
.
NATAddr
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"static nat: %w"
,
err
)
}
advertisableAddresser
=
natAddrResolver
}
handshakeService
,
err
:=
handshake
.
New
(
signer
,
advertisableAddresser
,
overlay
,
networkID
,
o
.
LightNode
,
o
.
WelcomeMessage
,
logger
)
...
...
@@ -200,6 +203,7 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
ctx
:
ctx
,
host
:
h
,
natManager
:
natManager
,
natAddrResolver
:
natAddrResolver
,
handshakeService
:
handshakeService
,
libp2pPeerstore
:
libp2pPeerstore
,
metrics
:
newMetrics
(),
...
...
@@ -390,6 +394,13 @@ func (s *Service) Addresses() (addreses []ma.Multiaddr, err error) {
addreses
=
append
(
addreses
,
a
)
}
if
s
.
natAddrResolver
!=
nil
&&
len
(
addreses
)
>
0
{
a
,
err
:=
s
.
natAddrResolver
.
Resolve
(
addreses
[
0
])
if
err
!=
nil
{
return
nil
,
err
}
addreses
=
append
(
addreses
,
a
)
}
return
addreses
,
nil
}
...
...
pkg/p2p/libp2p/static_resolver.go
View file @
19fbbf77
...
...
@@ -10,7 +10,6 @@ import (
"net"
"strings"
"github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake"
libp2ppeer
"github.com/libp2p/go-libp2p-core/peer"
ma
"github.com/multiformats/go-multiaddr"
)
...
...
@@ -20,7 +19,7 @@ type staticAddressResolver struct {
port
string
}
func
newStaticAddressResolver
(
addr
string
)
(
handshake
.
Advertisable
AddressResolver
,
error
)
{
func
newStaticAddressResolver
(
addr
string
)
(
*
static
AddressResolver
,
error
)
{
host
,
port
,
err
:=
net
.
SplitHostPort
(
addr
)
if
err
!=
nil
{
return
nil
,
err
...
...
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