mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-10 00:30:26 +00:00
Remove module package, it didn't really give us anything anyway
This commit is contained in:
parent
cb536a7322
commit
99973b2757
@ -27,7 +27,6 @@ import (
|
|||||||
"github.com/yggdrasil-network/yggdrasil-go/src/config"
|
"github.com/yggdrasil-network/yggdrasil-go/src/config"
|
||||||
|
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/core"
|
"github.com/yggdrasil-network/yggdrasil-go/src/core"
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/module"
|
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/multicast"
|
"github.com/yggdrasil-network/yggdrasil-go/src/multicast"
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/tuntap"
|
"github.com/yggdrasil-network/yggdrasil-go/src/tuntap"
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/version"
|
"github.com/yggdrasil-network/yggdrasil-go/src/version"
|
||||||
@ -36,9 +35,9 @@ import (
|
|||||||
type node struct {
|
type node struct {
|
||||||
core core.Core
|
core core.Core
|
||||||
config *config.NodeConfig
|
config *config.NodeConfig
|
||||||
tuntap module.Module // tuntap.TunAdapter
|
tuntap *tuntap.TunAdapter
|
||||||
multicast module.Module // multicast.Multicast
|
multicast *multicast.Multicast
|
||||||
admin module.Module // admin.AdminSocket
|
admin *admin.AdminSocket
|
||||||
}
|
}
|
||||||
|
|
||||||
func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *config.NodeConfig {
|
func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *config.NodeConfig {
|
||||||
@ -283,28 +282,28 @@ func main() {
|
|||||||
n.admin = &admin.AdminSocket{}
|
n.admin = &admin.AdminSocket{}
|
||||||
n.multicast = &multicast.Multicast{}
|
n.multicast = &multicast.Multicast{}
|
||||||
n.tuntap = &tuntap.TunAdapter{}
|
n.tuntap = &tuntap.TunAdapter{}
|
||||||
n.tuntap.(*tuntap.TunAdapter).SetSessionGatekeeper(n.sessionFirewall)
|
n.tuntap.SetSessionGatekeeper(n.sessionFirewall)
|
||||||
// Start the admin socket
|
// Start the admin socket
|
||||||
if err := n.admin.Init(&n.core, cfg, logger, nil); err != nil {
|
if err := n.admin.Init(&n.core, cfg, logger, nil); err != nil {
|
||||||
logger.Errorln("An error occured initialising admin socket:", err)
|
logger.Errorln("An error occured initialising admin socket:", err)
|
||||||
} else if err := n.admin.Start(); err != nil {
|
} else if err := n.admin.Start(); err != nil {
|
||||||
logger.Errorln("An error occurred starting admin socket:", err)
|
logger.Errorln("An error occurred starting admin socket:", err)
|
||||||
}
|
}
|
||||||
n.admin.SetupAdminHandlers(n.admin.(*admin.AdminSocket))
|
n.admin.SetupAdminHandlers(n.admin)
|
||||||
// Start the multicast interface
|
// Start the multicast interface
|
||||||
if err := n.multicast.Init(&n.core, cfg, logger, nil); err != nil {
|
if err := n.multicast.Init(&n.core, cfg, logger, nil); err != nil {
|
||||||
logger.Errorln("An error occured initialising multicast:", err)
|
logger.Errorln("An error occured initialising multicast:", err)
|
||||||
} else if err := n.multicast.Start(); err != nil {
|
} else if err := n.multicast.Start(); err != nil {
|
||||||
logger.Errorln("An error occurred starting multicast:", err)
|
logger.Errorln("An error occurred starting multicast:", err)
|
||||||
}
|
}
|
||||||
n.multicast.SetupAdminHandlers(n.admin.(*admin.AdminSocket))
|
n.multicast.SetupAdminHandlers(n.admin)
|
||||||
// Start the TUN/TAP interface
|
// Start the TUN/TAP interface
|
||||||
if err := n.tuntap.Init(&n.core, cfg, logger, nil); err != nil {
|
if err := n.tuntap.Init(&n.core, cfg, logger, nil); err != nil {
|
||||||
logger.Errorln("An error occurred initialising TUN/TAP:", err)
|
logger.Errorln("An error occurred initialising TUN/TAP:", err)
|
||||||
} else if err := n.tuntap.Start(); err != nil {
|
} else if err := n.tuntap.Start(); err != nil {
|
||||||
logger.Errorln("An error occurred starting TUN/TAP:", err)
|
logger.Errorln("An error occurred starting TUN/TAP:", err)
|
||||||
}
|
}
|
||||||
n.tuntap.SetupAdminHandlers(n.admin.(*admin.AdminSocket))
|
n.tuntap.SetupAdminHandlers(n.admin)
|
||||||
// Make some nice output that tells us what our IPv6 address and subnet are.
|
// Make some nice output that tells us what our IPv6 address and subnet are.
|
||||||
// This is just logged to stdout for the user.
|
// This is just logged to stdout for the user.
|
||||||
address := n.core.Address()
|
address := n.core.Address()
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
package module
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/gologme/log"
|
|
||||||
|
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/admin"
|
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/config"
|
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/core"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Module is an interface that defines which functions must be supported by a
|
|
||||||
// given Yggdrasil module.
|
|
||||||
type Module interface {
|
|
||||||
Init(core *core.Core, state *config.NodeConfig, log *log.Logger, options interface{}) error
|
|
||||||
Start() error
|
|
||||||
Stop() error
|
|
||||||
SetupAdminHandlers(a *admin.AdminSocket)
|
|
||||||
IsStarted() bool
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user