TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 95 Pull requests 4 Projects Releases 1 Activity Actions

[#271] pkg/network: Add multiaddr to ipaddr converter

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-12-23 11:45:36 +03:00 committed by Alex Vanin
parent 2ebcbe70fb
commit a8c26378b1
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/innerring/processors/audit/process.go
View file

@ -113,9 +113,11 @@ func (ap *Processor) findStorageGroups(cid *container.ID, shuffled netmap.Nodes)
zap.Int("total_tries", ln), zap.Int("total_tries", ln),
) )
addr, err := ipAddr(shuffled[i].Address()) addr, err := network.IPAddrFromMultiaddr(shuffled[i].Address())
if err != nil { if err != nil {
log.Warn("can't parse remote address", zap.String("error", err.Error())) log.Warn("can't parse remote address", zap.String("error", err.Error()))
continue
} }
cli, err := ap.clientCache.Get(addr) cli, err := ap.clientCache.Get(addr)
@ -146,12 +148,3 @@ func (ap *Processor) findStorageGroups(cid *container.ID, shuffled netmap.Nodes)
return sg return sg
} }
func ipAddr(multiaddr string) (string, error) {
address, err := network.AddressFromString(multiaddr)
if err != nil {
return "", err
}
return address.IPAddrString()
}

10
pkg/network/address.go
View file

@ -95,3 +95,13 @@ func multiaddrStringFromHostAddr(host string) (string, error) {
func IsLocalAddress(src LocalAddressSource, addr *Address) bool { func IsLocalAddress(src LocalAddressSource, addr *Address) bool {
return src.LocalAddress().ma.Equal(addr.ma) return src.LocalAddress().ma.Equal(addr.ma)
} }
// IPAddrFromMultiaddr converts "/dns4/localhost/tcp/8080" to "192.168.0.1:8080".
func IPAddrFromMultiaddr(multiaddr string) (string, error) {
address, err := AddressFromString(multiaddr)
if err != nil {
return "", err
}
return address.IPAddrString()
}