mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-22 21:10:29 +00:00
Fix merge conflicts with endpoints branch
This commit is contained in:
commit
20c4b7027a
@ -50,7 +50,7 @@ func StartProfiler(log *log.Logger) error {
|
||||
func (c *Core) Init() {
|
||||
bpub, bpriv := newBoxKeys()
|
||||
spub, spriv := newSigKeys()
|
||||
c.init(bpub, bpriv, spub, spriv, "(simulator)")
|
||||
c.init(bpub, bpriv, spub, spriv, metadata{})
|
||||
c.switchTable.start()
|
||||
c.router.start()
|
||||
}
|
||||
@ -84,7 +84,7 @@ func (c *Core) DEBUG_getPeers() *peers {
|
||||
func (ps *peers) DEBUG_newPeer(box boxPubKey, sig sigPubKey, link boxSharedKey) *peer {
|
||||
//in <-chan []byte,
|
||||
//out chan<- []byte) *peer {
|
||||
return ps.newPeer(&box, &sig, &link, "(simulator)", "(simulator)") //, in, out)
|
||||
return ps.newPeer(&box, &sig, &link, "(simulator)", metadata{}) //, in, out)
|
||||
}
|
||||
|
||||
/*
|
||||
@ -358,7 +358,7 @@ func (c *Core) DEBUG_init(bpub []byte,
|
||||
copy(boxPriv[:], bpriv)
|
||||
copy(sigPub[:], spub)
|
||||
copy(sigPriv[:], spriv)
|
||||
c.init(&boxPub, &boxPriv, &sigPub, &sigPriv, "(simulator)")
|
||||
c.init(&boxPub, &boxPriv, &sigPub, &sigPriv, metadata{})
|
||||
|
||||
if err := c.router.start(); err != nil {
|
||||
panic(err)
|
||||
|
@ -155,12 +155,6 @@ func main() {
|
||||
minutes := uint(preformatted.(float64)/60) % 60
|
||||
hours := uint(preformatted.(float64) / 60 / 60)
|
||||
formatted = fmt.Sprintf("%02d:%02d:%02d", hours, minutes, seconds)
|
||||
case "friendly_name":
|
||||
if len(preformatted.(string)) > 32 {
|
||||
formatted = fmt.Sprintf("%s...", preformatted.(string)[:32])
|
||||
} else {
|
||||
formatted = preformatted.(string)
|
||||
}
|
||||
default:
|
||||
formatted = fmt.Sprint(preformatted)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user