yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 11:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix core tests and run gofmt on src

Browse source
This commit is contained in:
Arceliar 2023-03-26 16:34:49 -05:00
parent fc632c5caa
commit abbe94fa80
2 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/core_test.go
View file

@ -70,7 +70,12 @@ func WaitConnected(nodeA, nodeB *Core) bool {
// It may take up to 3 seconds, but let's wait 5. // It may take up to 3 seconds, but let's wait 5.
for i := 0; i < 50; i++ { for i := 0; i < 50; i++ {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
if len(nodeA.GetPeers()) > 0 && len(nodeB.GetPeers()) > 0 { /*
if len(nodeA.GetPeers()) > 0 && len(nodeB.GetPeers()) > 0 {
return true
}
*/
if len(nodeA.GetPaths()) > 1 && len(nodeB.GetPaths()) > 1 {
return true return true
} }
} }

30
src/ipv6rwc/ipv6rwc.go
View file

@ -31,16 +31,16 @@ const (
type keyArray [ed25519.PublicKeySize]byte type keyArray [ed25519.PublicKeySize]byte
type keyStore struct { type keyStore struct {
core *core.Core core *core.Core
address address.Address address address.Address
subnet address.Subnet subnet address.Subnet
mutex sync.Mutex mutex sync.Mutex
keyToInfo map[keyArray]*keyInfo keyToInfo map[keyArray]*keyInfo
addrToInfo map[address.Address]*keyInfo addrToInfo map[address.Address]*keyInfo
//addrBuffer map[address.Address]*buffer //addrBuffer map[address.Address]*buffer
subnetToInfo map[address.Subnet]*keyInfo subnetToInfo map[address.Subnet]*keyInfo
//subnetBuffer map[address.Subnet]*buffer //subnetBuffer map[address.Subnet]*buffer
mtu uint64 mtu uint64
} }
type keyInfo struct { type keyInfo struct {
@ -162,14 +162,14 @@ func (k *keyStore) update(key ed25519.PublicKey) *keyInfo {
k.addrToInfo[info.address] = info k.addrToInfo[info.address] = info
k.subnetToInfo[info.subnet] = info k.subnetToInfo[info.subnet] = info
/* /*
if buf := k.addrBuffer[info.address]; buf != nil { if buf := k.addrBuffer[info.address]; buf != nil {
packets = append(packets, buf.packet) packets = append(packets, buf.packet)
delete(k.addrBuffer, info.address) delete(k.addrBuffer, info.address)
} }
if buf := k.subnetBuffer[info.subnet]; buf != nil { if buf := k.subnetBuffer[info.subnet]; buf != nil {
packets = append(packets, buf.packet) packets = append(packets, buf.packet)
delete(k.subnetBuffer, info.subnet) delete(k.subnetBuffer, info.subnet)
} }
*/ */
} }
k.resetTimeout(info) k.resetTimeout(info)