TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-27 12:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

move wire_encode_locator logic into getBytesForSig, since that's the only place it's used

Browse Source
This commit is contained in:
Arceliar 2018-06-06 23:00:17 -05:00
parent 1e7d34492d
commit 5dc0cb5544
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/yggdrasil/peer.go
View File

@ -347,11 +347,9 @@ func (p *peer) handleSwitchMsg(packet []byte) {
} }
func getBytesForSig(next *sigPubKey, loc *switchLocator) []byte { func getBytesForSig(next *sigPubKey, loc *switchLocator) []byte {
//bs, err := wire_encode_locator(loc)
//if err != nil { panic(err) }
bs := append([]byte(nil), next[:]...) bs := append([]byte(nil), next[:]...)
bs = append(bs, wire_encode_locator(loc)...) bs = append(bs, loc.root[:]...)
//bs := wire_encode_locator(loc) bs = append(bs, wire_encode_uint64(wire_intToUint(loc.tstamp))...)
//bs = append(next[:], bs...) bs = append(bs, wire_encode_coords(loc.getCoords())...)
return bs return bs
} }

11
src/yggdrasil/wire.go
View File

@ -170,17 +170,6 @@ func (m *switchMsg) decode(bs []byte) bool {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Format used to check signatures only, so no need to also support decoding
// TODO something else for signatures
func wire_encode_locator(loc *switchLocator) []byte {
coords := wire_encode_coords(loc.getCoords())
var bs []byte
bs = append(bs, loc.root[:]...)
bs = append(bs, wire_encode_uint64(wire_intToUint(loc.tstamp))...)
bs = append(bs, coords...)
return bs
}
func wire_chop_slice(toSlice []byte, fromSlice *[]byte) bool { func wire_chop_slice(toSlice []byte, fromSlice *[]byte) bool {
if len(*fromSlice) < len(toSlice) { if len(*fromSlice) < len(toSlice) {
return false return false