anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-08 05:47:07 +09:00
Code Activity

GO-3908 p2p: support sorting on android

Browse source
This commit is contained in:
Roman Khafizianov 2024-08-15 12:07:29 +02:00
parent a579929231
commit ce23acf64c
No known key found for this signature in database
GPG key ID: F07A7D55A2684852
3 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
net/addrs/common.go
View file

@ -5,6 +5,7 @@ import (
"regexp"
"strconv"
"github.com/ethereum/go-ethereum/log"
"golang.org/x/exp/slices"
"github.com/anyproto/anytype-heart/util/slice"
@ -20,20 +21,26 @@ type InterfaceAddr struct {
Prefix int
}
type InterfaceWithAddr struct {
type NetInterfaceWithAddrCache struct {
net.Interface
cachedAddrs []net.Addr // ipv4 addresses
cachedErr error
}
type InterfacesAddrs struct {
Interfaces []InterfaceWithAddr
Interfaces []NetInterfaceWithAddrCache
Addrs []net.Addr // addrs without attachment to specific interface. Used as a fallback mechanism
}
func WrapInterfaces(ifaces []net.Interface) []InterfaceWithAddr {
var m = make([]InterfaceWithAddr, 0, len(ifaces))
func WrapInterface(iface net.Interface) NetInterfaceWithAddrCache {
return NetInterfaceWithAddrCache{
Interface: iface,
}
}
func WrapInterfaces(ifaces []net.Interface) []NetInterfaceWithAddrCache {
var m = make([]NetInterfaceWithAddrCache, 0, len(ifaces))
for i := range ifaces {
m = append(m, InterfaceWithAddr{
m = append(m, NetInterfaceWithAddrCache{
Interface: ifaces[i],
})
}
@ -41,7 +48,7 @@ func WrapInterfaces(ifaces []net.Interface) []InterfaceWithAddr {
}
// GetAddr returns ipv4 only addresses for interface or cached one if set
func (i InterfaceWithAddr) GetAddr() []net.Addr {
func (i NetInterfaceWithAddrCache) GetAddr() []net.Addr {
if i.cachedAddrs != nil {
return i.cachedAddrs
}
@ -49,6 +56,9 @@ func (i InterfaceWithAddr) GetAddr() []net.Addr {
return nil
}
i.cachedAddrs, i.cachedErr = i.Addrs()
if i.cachedErr != nil {
log.Warn("interface GetAddr error: %v", i.cachedErr)
}
// filter-out ipv6
i.cachedAddrs = slice.Filter(i.cachedAddrs, func(addr net.Addr) bool {
if ip, ok := addr.(*net.IPNet); ok {
@ -107,7 +117,7 @@ func parseInterfaceName(name string) (prefix string, bus int, num int64) {
}
func (i InterfacesAddrs) SortWithPriority(priority []string) {
less := func(a, b InterfaceWithAddr) bool {
less := func(a, b NetInterfaceWithAddrCache) bool {
aPrefix, aBus, aNum := parseInterfaceName(a.Name)
bPrefix, bBus, bNum := parseInterfaceName(b.Name)
@ -136,7 +146,7 @@ func (i InterfacesAddrs) SortWithPriority(priority []string) {
return false
}
}
slices.SortFunc(i.Interfaces, func(a, b InterfaceWithAddr) int {
slices.SortFunc(i.Interfaces, func(a, b NetInterfaceWithAddrCache) int {
if less(a, b) {
return -1
}
@ -174,20 +184,27 @@ func (i InterfacesAddrs) GetInterfaceByAddr(addr net.Addr) (net.Interface, bool)
return net.Interface{}, false
}
// SortIPsLikeInterfaces sort IPs in a way they match sorted interface addresses(via mask matching)
// e.g. we have interfaces
// - en0: 192.168.1.10/24
// - lo0: 127.0.0.1/8
// we pass IPs: 10.124.22.1, 127.0.0.1, 192.168.1.25
// we will get: 192.168.1.25, 127.0.0.1, 10.124.22.1
// 10.124.22.1 does not match any interface, so it will be at the end
func (i InterfacesAddrs) SortIPsLikeInterfaces(ips []net.IP) {
slices.SortFunc(ips, func(a, b net.IP) int {
pa, _ := i.findInterfacePosByIP(a)
pb, _ := i.findInterfacePosByIP(b)
posA, _ := i.findInterfacePosByIP(a)
posB, _ := i.findInterfacePosByIP(b)
if pa == -1 && pb != -1 {
if posA == -1 && posB != -1 {
return 1
}
if pa != -1 && pb == -1 {
if posA != -1 && posB == -1 {
return -1
}
if pa < pb {
if posA < posB {
return -1
} else if pa > pb {
} else if posA > posB {
return 1
}
return 0

2
net/addrs/interface.go
View file

@ -34,7 +34,7 @@ func GetInterfacesAddrs() (iAddrs InterfacesAddrs, err error) {
}
iAddrs.Interfaces = WrapInterfaces(ifaces)
iAddrs.Interfaces = slice.Filter(iAddrs.Interfaces, func(iface InterfaceWithAddr) bool {
iAddrs.Interfaces = slice.Filter(iAddrs.Interfaces, func(iface NetInterfaceWithAddrCache) bool {
return iface.Flags&net.FlagUp != 0 && iface.Flags&net.FlagMulticast != 0
})
return

9
net/addrs/interface_android.go
View file

@ -57,8 +57,10 @@ func GetInterfacesAddrs() (addrs InterfacesAddrs, err error) {
}
lock.Unlock()
for _, iface := range interfaceGetter.Interfaces() {
addrs.Interfaces = append(addrs.Interfaces, iface.Interface)
ifaceWrapped := WrapInterface(iface.Interface)
addrs.Interfaces = append(addrs.Interfaces, WrapInterface(iface.Interface))
unmaskedAddrs := iface.Addrs
ifaceAddrs := make([]net.Addr, 0, len(unmaskedAddrs))
for _, addr := range unmaskedAddrs {
var mask []byte
if len(addr.Ip) == 4 {
@ -66,11 +68,14 @@ func GetInterfacesAddrs() (addrs InterfacesAddrs, err error) {
} else {
mask = ipV6MaskFromPrefix(addr.Prefix)
}
addrs.Addrs = append(addrs.Addrs, &net.IPNet{
ifaceAddrs = append(ifaceAddrs, &net.IPNet{
IP: addr.Ip,
Mask: mask,
})
}
// inject cached addresses, because we can't get them from net.Interface's Addrs() on android
ifaceWrapped.cachedAddrs = ifaceAddrs
addrs.Addrs = append(addrs.Addrs, ifaceAddrs...)
}
return
}