Merge branch 'develop' into nodeconfig

This commit is contained in:
Neil Alexander 2019-01-14 14:01:38 +00:00
commit 738a9da796
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
22 changed files with 734 additions and 85 deletions

View file

@ -46,6 +46,7 @@ type Core struct {
multicast multicast
nodeinfo nodeinfo
tcp tcpInterface
awdl awdl
log *log.Logger
ifceExpr []*regexp.Regexp // the zone of link-local IPv6 peers must match this
}
@ -171,6 +172,16 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) error {
c.nodeinfo.setNodeInfo(nc.NodeInfo, nc.NodeInfoPrivacy)
if err := c.tcp.init(c); err != nil {
c.log.Println("Failed to start TCP interface")
return err
}
if err := c.awdl.init(c); err != nil {
c.log.Println("Failed to start AWDL interface")
return err
}
if nc.SwitchOptions.MaxTotalQueueSize >= SwitchQueueTotalMinSize {
c.switchTable.queueTotalMaxSize = nc.SwitchOptions.MaxTotalQueueSize
}