From a148f4cfecd92d4464da9431a1416ad413b4f76d Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 19 Mar 2023 10:33:07 +0000 Subject: [PATCH] More updates for Ygg v0.5 --- cmd/yggdrasilctl/main.go | 6 +++--- contrib/mobile/mobile.go | 4 ++-- go.mod | 2 ++ go.sum | 4 ++-- src/admin/getpaths.go | 8 ++++---- src/admin/getpeers.go | 2 -- src/admin/getself.go | 14 +++++++------- src/core/api.go | 34 +++++++++++++++++----------------- src/core/link.go | 2 +- src/core/proto.go | 4 ++-- src/ipv6rwc/ipv6rwc.go | 10 ++++++---- 11 files changed, 46 insertions(+), 44 deletions(-) diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index c9b1522a..6aed8ac5 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -165,7 +165,7 @@ func run() int { table.Append([]string{"Build version:", resp.BuildVersion}) table.Append([]string{"IPv6 address:", resp.IPAddress}) table.Append([]string{"IPv6 subnet:", resp.Subnet}) - table.Append([]string{"Coordinates:", fmt.Sprintf("%v", resp.Coords)}) + table.Append([]string{"Routing table size:", fmt.Sprintf("%d", resp.RoutingEntries)}) table.Append([]string{"Public key:", resp.PublicKey}) table.Render() @@ -210,12 +210,12 @@ func run() int { if err := json.Unmarshal(recv.Response, &resp); err != nil { panic(err) } - table.SetHeader([]string{"Public Key", "IP Address", "Path"}) + table.SetHeader([]string{"Public Key", "IP Address", "Seq"}) for _, p := range resp.Paths { table.Append([]string{ p.PublicKey, p.IPAddress, - fmt.Sprintf("%v", p.Path), + fmt.Sprintf("%d", p.Sequence), }) } table.Render() diff --git a/contrib/mobile/mobile.go b/contrib/mobile/mobile.go index 3b3227bd..79937997 100644 --- a/contrib/mobile/mobile.go +++ b/contrib/mobile/mobile.go @@ -3,7 +3,6 @@ package mobile import ( "encoding/hex" "encoding/json" - "fmt" "net" "regexp" @@ -193,7 +192,8 @@ func (m *Yggdrasil) GetPublicKeyString() string { // GetCoordsString gets the node's coordinates func (m *Yggdrasil) GetCoordsString() string { - return fmt.Sprintf("%v", m.core.GetSelf().Coords) + return "N/A" + // return fmt.Sprintf("%v", m.core.GetSelf().Coords) } func (m *Yggdrasil) GetPeersJSON() (result string) { diff --git a/go.mod b/go.mod index 4b4e19f9..5ee3b140 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/yggdrasil-network/yggdrasil-go go 1.17 +replace github.com/Arceliar/ironwood => github.com/neilalexander/ironwood v0.0.0-20230319103146-3ffd3d07e834 + require ( github.com/Arceliar/ironwood v0.0.0-20230318003210-65aa386cab13 github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979 diff --git a/go.sum b/go.sum index e6e4a3ed..1a06a7c2 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/Arceliar/ironwood v0.0.0-20230318003210-65aa386cab13 h1:z0PVz7aDDW5c+JVEW7b00N2JMGAfV6BHtTcOJ8zHKcU= -github.com/Arceliar/ironwood v0.0.0-20230318003210-65aa386cab13/go.mod h1:RP72rucOFm5udrnEzTmIWLRVGQiV/fSUAQXJ0RST/nk= github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979 h1:WndgpSW13S32VLQ3ugUxx2EnnWmgba1kCqPkd4Gk1yQ= github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979/go.mod h1:6Lkn+/zJilRMsKmbmG1RPoamiArC6HS73xbwRyp3UyI= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -32,6 +30,8 @@ github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/neilalexander/ironwood v0.0.0-20230319103146-3ffd3d07e834 h1:HwRcrQhhthIPKBVZVHlwkKpxZxwNv0QcwIA0Gb+5Dtk= +github.com/neilalexander/ironwood v0.0.0-20230319103146-3ffd3d07e834/go.mod h1:RP72rucOFm5udrnEzTmIWLRVGQiV/fSUAQXJ0RST/nk= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= diff --git a/src/admin/getpaths.go b/src/admin/getpaths.go index fbd52481..2d5db0fb 100644 --- a/src/admin/getpaths.go +++ b/src/admin/getpaths.go @@ -17,9 +17,9 @@ type GetPathsResponse struct { } type PathEntry struct { - IPAddress string `json:"address"` - PublicKey string `json:"key"` - Path []uint64 `json:"path"` + IPAddress string `json:"address"` + PublicKey string `json:"key"` + Sequence uint64 `json:"sequence"` } func (a *AdminSocket) getPathsHandler(req *GetPathsRequest, res *GetPathsResponse) error { @@ -30,7 +30,7 @@ func (a *AdminSocket) getPathsHandler(req *GetPathsRequest, res *GetPathsRespons res.Paths = append(res.Paths, PathEntry{ IPAddress: net.IP(addr[:]).String(), PublicKey: hex.EncodeToString(p.Key), - Path: p.Path, + Sequence: p.Sequence, }) } sort.SliceStable(res.Paths, func(i, j int) bool { diff --git a/src/admin/getpeers.go b/src/admin/getpeers.go index d51b184d..3d522fb9 100644 --- a/src/admin/getpeers.go +++ b/src/admin/getpeers.go @@ -20,7 +20,6 @@ type PeerEntry struct { PublicKey string `json:"key"` Port uint64 `json:"port"` Priority uint64 `json:"priority"` - Coords []uint64 `json:"coords"` Remote string `json:"remote"` RXBytes DataUnit `json:"bytes_recvd"` TXBytes DataUnit `json:"bytes_sent"` @@ -37,7 +36,6 @@ func (a *AdminSocket) getPeersHandler(req *GetPeersRequest, res *GetPeersRespons PublicKey: hex.EncodeToString(p.Key), Port: p.Port, Priority: uint64(p.Priority), // can't be uint8 thanks to gobind - Coords: p.Coords, Remote: p.Remote, RXBytes: DataUnit(p.RXBytes), TXBytes: DataUnit(p.TXBytes), diff --git a/src/admin/getself.go b/src/admin/getself.go index f42dc750..9b052101 100644 --- a/src/admin/getself.go +++ b/src/admin/getself.go @@ -9,12 +9,12 @@ import ( type GetSelfRequest struct{} type GetSelfResponse struct { - BuildName string `json:"build_name"` - BuildVersion string `json:"build_version"` - PublicKey string `json:"key"` - IPAddress string `json:"address"` - Coords []uint64 `json:"coords"` - Subnet string `json:"subnet"` + BuildName string `json:"build_name"` + BuildVersion string `json:"build_version"` + PublicKey string `json:"key"` + IPAddress string `json:"address"` + RoutingEntries uint64 `json:"routing_entries"` + Subnet string `json:"subnet"` } func (a *AdminSocket) getSelfHandler(req *GetSelfRequest, res *GetSelfResponse) error { @@ -25,6 +25,6 @@ func (a *AdminSocket) getSelfHandler(req *GetSelfRequest, res *GetSelfResponse) res.PublicKey = hex.EncodeToString(self.Key[:]) res.IPAddress = a.core.Address().String() res.Subnet = snet.String() - res.Coords = self.Coords + res.RoutingEntries = self.RoutingEntries return nil } diff --git a/src/core/api.go b/src/core/api.go index fc06b9c6..c617a209 100644 --- a/src/core/api.go +++ b/src/core/api.go @@ -14,9 +14,8 @@ import ( ) type SelfInfo struct { - Key ed25519.PublicKey - Root ed25519.PublicKey - Coords []uint64 + Key ed25519.PublicKey + RoutingEntries uint64 } type PeerInfo struct { @@ -38,8 +37,8 @@ type DHTEntryInfo struct { } type PathEntryInfo struct { - Key ed25519.PublicKey - Path []uint64 + Key ed25519.PublicKey + Sequence uint64 } type SessionInfo struct { @@ -53,13 +52,12 @@ func (c *Core) GetSelf() SelfInfo { var self SelfInfo s := c.PacketConn.PacketConn.Debug.GetSelf() self.Key = s.Key - self.Root = s.Root - self.Coords = s.Coords + self.RoutingEntries = s.RoutingEntries return self } func (c *Core) GetPeers() []PeerInfo { - var peers []PeerInfo + peers := []PeerInfo{} names := make(map[net.Conn]string) phony.Block(&c.links, func() { for _, info := range c.links._links { @@ -74,17 +72,18 @@ func (c *Core) GetPeers() []PeerInfo { var info PeerInfo info.Key = p.Key info.Root = p.Root - info.Coords = p.Coords info.Port = p.Port info.Priority = p.Priority - info.Remote = p.Conn.RemoteAddr().String() - if name := names[p.Conn]; name != "" { - info.Remote = name - } - if linkconn, ok := p.Conn.(*linkConn); ok { - info.RXBytes = atomic.LoadUint64(&linkconn.rx) - info.TXBytes = atomic.LoadUint64(&linkconn.tx) - info.Uptime = time.Since(linkconn.up) + if p.Conn != nil { + info.Remote = p.Conn.RemoteAddr().String() + if linkconn, ok := p.Conn.(*linkConn); ok { + info.RXBytes = atomic.LoadUint64(&linkconn.rx) + info.TXBytes = atomic.LoadUint64(&linkconn.tx) + info.Uptime = time.Since(linkconn.up) + } + if name := names[p.Conn]; name != "" { + info.Remote = name + } } peers = append(peers, info) } @@ -110,6 +109,7 @@ func (c *Core) GetPaths() []PathEntryInfo { for _, p := range ps { var info PathEntryInfo info.Key = p.Key + info.Sequence = p.Sequence //info.Path = p.Path paths = append(paths, info) } diff --git a/src/core/link.go b/src/core/link.go index 06776618..4ca854b3 100644 --- a/src/core/link.go +++ b/src/core/link.go @@ -253,7 +253,7 @@ func (l *links) create(conn net.Conn, dial *linkDial, name string, info linkInfo } go func() { if err := intf.handler(dial); err != nil { - l.core.log.Errorf("Link handler %s error (%s): %s", name, conn.RemoteAddr(), err) + //l.core.log.Errorf("Link handler %s error (%s): %s", name, conn.RemoteAddr(), err) } }() return nil diff --git a/src/core/proto.go b/src/core/proto.go index 3c68c0e3..186e9b8d 100644 --- a/src/core/proto.go +++ b/src/core/proto.go @@ -126,8 +126,8 @@ func (p *protoHandler) sendGetSelfRequest(key keyArray, callback func([]byte)) { func (p *protoHandler) _handleGetSelfRequest(key keyArray) { self := p.core.GetSelf() res := map[string]string{ - "key": hex.EncodeToString(self.Key[:]), - "coords": fmt.Sprintf("%v", self.Coords), + "key": hex.EncodeToString(self.Key[:]), + "routing_entries": fmt.Sprintf("%v", self.RoutingEntries), } bs, err := json.Marshal(res) // FIXME this puts keys in base64, not hex if err != nil { diff --git a/src/ipv6rwc/ipv6rwc.go b/src/ipv6rwc/ipv6rwc.go index bbaa8707..a3d65b61 100644 --- a/src/ipv6rwc/ipv6rwc.go +++ b/src/ipv6rwc/ipv6rwc.go @@ -57,10 +57,10 @@ func (k *keyStore) init(c *core.Core) { k.core = c k.address = *address.AddrForKey(k.core.PublicKey()) k.subnet = *address.SubnetForKey(k.core.PublicKey()) - if err := k.core.SetOutOfBandHandler(k.oobHandler); err != nil { + /*if err := k.core.SetOutOfBandHandler(k.oobHandler); err != nil { err = fmt.Errorf("tun.core.SetOutOfBandHander: %w", err) panic(err) - } + }*/ k.keyToInfo = make(map[keyArray]*keyInfo) k.addrToInfo = make(map[address.Address]*keyInfo) k.addrBuffer = make(map[address.Address]*buffer) @@ -202,13 +202,15 @@ func (k *keyStore) oobHandler(fromKey, toKey ed25519.PublicKey, data []byte) { func (k *keyStore) sendKeyLookup(partial ed25519.PublicKey) { sig := ed25519.Sign(k.core.PrivateKey(), partial[:]) bs := append([]byte{typeKeyLookup}, sig...) - _ = k.core.SendOutOfBand(partial, bs) + //_ = k.core.SendOutOfBand(partial, bs) + _ = bs } func (k *keyStore) sendKeyResponse(dest ed25519.PublicKey) { sig := ed25519.Sign(k.core.PrivateKey(), dest[:]) bs := append([]byte{typeKeyResponse}, sig...) - _ = k.core.SendOutOfBand(dest, bs) + //_ = k.core.SendOutOfBand(dest, bs) + _ = bs } func (k *keyStore) readPC(p []byte) (int, error) {