From c19319df5e4e773d8668d5a5b4999a639c8113c0 Mon Sep 17 00:00:00 2001 From: Rubikoid Date: Thu, 17 Mar 2022 02:43:28 +0300 Subject: [PATCH 1/2] Fix coords print --- cmd/yggdrasilctl/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 788b4f1..180bea0 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -300,7 +300,7 @@ func handleGetSelf(res map[string]interface{}, verbose bool) { if boxSigKey, ok := v.(map[string]interface{})["key"].(string); ok { fmt.Println("Public key:", boxSigKey) } - if coords, ok := v.(map[string]interface{})["coords"].(string); ok { + if coords, ok := v.(map[string]interface{})["coords"].([]interface{}); ok { fmt.Println("Coords:", coords) } if verbose { From 88a0a3e8fbdb174938f7222acc1dad41eca76df0 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 7 Jul 2022 17:03:29 +0100 Subject: [PATCH 2/2] Fix data races in `handleProto` (observed by @majestrate) --- src/core/proto.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/proto.go b/src/core/proto.go index 5af59cc..3c68c0e 100644 --- a/src/core/proto.go +++ b/src/core/proto.go @@ -65,10 +65,16 @@ func (p *protoHandler) handleProto(from phony.Actor, key keyArray, bs []byte) { case typeProtoNodeInfoResponse: p.nodeinfo.handleRes(p, key, bs[1:]) case typeProtoDebug: - p._handleDebug(key, bs[1:]) + p.handleDebug(from, key, bs[1:]) } } +func (p *protoHandler) handleDebug(from phony.Actor, key keyArray, bs []byte) { + p.Act(from, func() { + p._handleDebug(key, bs) + }) +} + func (p *protoHandler) _handleDebug(key keyArray, bs []byte) { if len(bs) == 0 { return