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

update to bugfixed ironwood, fix broken core test, add getPaths handler to admin socket

Browse source
This commit is contained in:
Arceliar 2023-05-13 16:15:04 -05:00
parent 5e95246c26
commit 669e61af9a
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -3,7 +3,7 @@ module github.com/yggdrasil-network/yggdrasil-go
go 1.19 go 1.19
require ( require (
github.com/Arceliar/ironwood v0.0.0-20230513191034-495699d87ae4 github.com/Arceliar/ironwood v0.0.0-20230513211242-fac5b9486c3c
github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d
github.com/cheggaaa/pb/v3 v3.0.8 github.com/cheggaaa/pb/v3 v3.0.8
github.com/gologme/log v1.2.0 github.com/gologme/log v1.2.0

4
go.sum
View file

@ -1,5 +1,5 @@
github.com/Arceliar/ironwood v0.0.0-20230513191034-495699d87ae4 h1:I2IlZA7DQAZCR3xasKDJ2YgHbXh1fbyOu0Jqn1i4Zi8= github.com/Arceliar/ironwood v0.0.0-20230513211242-fac5b9486c3c h1:+MCqerP9VlZw/ECZaDItAgihDDcDGAszgKu/n14WjP0=
github.com/Arceliar/ironwood v0.0.0-20230513191034-495699d87ae4/go.mod h1:MIfrhR4b+U6gurd5pln622Zwaf2kzpIvXcnvRZMvlRI= github.com/Arceliar/ironwood v0.0.0-20230513211242-fac5b9486c3c/go.mod h1:MIfrhR4b+U6gurd5pln622Zwaf2kzpIvXcnvRZMvlRI=
github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d h1:UK9fsWbWqwIQkMCz1CP+v5pGbsGoWAw6g4AyvMpm1EM= github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d h1:UK9fsWbWqwIQkMCz1CP+v5pGbsGoWAw6g4AyvMpm1EM=
github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d/go.mod h1:BCnxhRf47C/dy/e/D2pmB8NkB3dQVIrkD98b220rx5Q= github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d/go.mod h1:BCnxhRf47C/dy/e/D2pmB8NkB3dQVIrkD98b220rx5Q=
github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=

30
src/admin/admin.go
View file

@ -145,22 +145,20 @@ func (a *AdminSocket) SetupAdminHandlers() {
return res, nil return res, nil
}, },
) )
/* _ = a.AddHandler(
_ = a.AddHandler( "getPaths", "Show established paths through this node", []string{},
"getPaths", "Show established paths through this node", []string{}, func(in json.RawMessage) (interface{}, error) {
func(in json.RawMessage) (interface{}, error) { req := &GetPathsRequest{}
req := &GetPathsRequest{} res := &GetPathsResponse{}
res := &GetPathsResponse{} if err := json.Unmarshal(in, &req); err != nil {
if err := json.Unmarshal(in, &req); err != nil { return nil, err
return nil, err }
} if err := a.getPathsHandler(req, res); err != nil {
if err := a.getPathsHandler(req, res); err != nil { return nil, err
return nil, err }
} return res, nil
return res, nil },
}, )
)
*/
_ = a.AddHandler( _ = a.AddHandler(
"getSessions", "Show established traffic sessions with remote nodes", []string{}, "getSessions", "Show established traffic sessions with remote nodes", []string{},
func(in json.RawMessage) (interface{}, error) { func(in json.RawMessage) (interface{}, error) {

3
src/core/core_test.go
View file

@ -75,7 +75,8 @@ func WaitConnected(nodeA, nodeB *Core) bool {
return true return true
} }
*/ */
if len(nodeA.GetDHT()) > 1 && len(nodeB.GetDHT()) > 1 { if len(nodeA.GetTree()) > 1 && len(nodeB.GetTree()) > 1 {
time.Sleep(3*time.Second) // FIXME hack, there's still stuff happening internally
return true return true
} }
} }