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

Don't crash if Yggdrasil is started with no router adapter

Browse source
This commit is contained in:
Neil Alexander 2019-03-29 08:38:09 +00:00
parent dd05a7f2a8
commit a830521078
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/yggdrasil/core.go
View file

@ -220,9 +220,11 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) (*config.NodeState,
return nil, err
}
if err := c.router.adapter.Start(c.router.addr, c.router.subnet); err != nil {
c.log.Errorln("Failed to start TUN/TAP")
return nil, err
if c.router.adapter != nil {
if err := c.router.adapter.Start(c.router.addr, c.router.subnet); err != nil {
c.log.Errorln("Failed to start TUN/TAP")
return nil, err
}
}
go c.addPeerLoop()
@ -234,7 +236,9 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) (*config.NodeState,
// Stops the Yggdrasil node.
func (c *Core) Stop() {
c.log.Infoln("Stopping...")
c.router.adapter.Close()
if c.router.adapter != nil {
c.router.adapter.Close()
}
c.admin.close()
}

4
src/yggdrasil/router.go
View file

@ -128,7 +128,9 @@ func (r *router) init(core *Core) {
r.nodeinfo.setNodeInfo(r.core.config.Current.NodeInfo, r.core.config.Current.NodeInfoPrivacy)
r.core.config.Mutex.RUnlock()
r.cryptokey.init(r.core)
r.adapter.Init(&r.core.config, r.core.log, send, recv, reject)
if r.adapter != nil {
r.adapter.Init(&r.core.config, r.core.log, send, recv, reject)
}
}
// Starts the mainLoop goroutine.