yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 14:15:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix configuration reloading support

Browse source
This commit is contained in:
Neil Alexander 2019-05-17 22:29:52 +01:00
parent 71ccaf753e
commit ae2cc13d14
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 71 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

65
cmd/yggdrasil/main.go
View file

@ -280,69 +280,6 @@ func main() {
defer func() {
n.core.Stop()
}()
// Listen for new sessions
/*
go func() {
listener, err := n.core.ListenConn()
if err != nil {
logger.Errorln("Unable to listen for sessions:", err)
return
}
for {
conn, err := listener.Accept()
if err != nil {
logger.Errorln("Accept:", err)
continue
}
logger.Println("Accepted")
for {
b := make([]byte, 100)
if n, err := conn.Read(b); err != nil {
logger.Errorln("Read failed:", err)
time.Sleep(time.Second * 2)
} else {
logger.Println("Read", n, "bytes:", b)
b = []byte{5, 5, 5}
if n, err := conn.Write(b); err != nil {
logger.Errorln("Write failed:", err)
time.Sleep(time.Second * 2)
} else {
logger.Println("Wrote", n, "bytes:", b)
}
}
}
}
}()
// Try creating new sessions
go func() {
if cfg.EncryptionPublicKey != "533574224115f835b7c7db6433986bc5aef855ff9c9568c01abeb0fbed3e8810" {
return
}
time.Sleep(time.Second * 2)
conn, err := n.core.Dial("nodeid", "9890e135604e8aa6039a909e40c629824d852042a70e51957d5b9d700195663d50552e8e869af132b4617d76f8ef00314d94cce23aa8d6b051b3b952a32a4966")
if err != nil {
logger.Errorln("Dial:", err)
return
}
go func() {
for {
time.Sleep(time.Second * 2)
b := []byte{1, 2, 3, 4, 5}
if n, err := conn.Write(b); err != nil {
logger.Errorln("Write failed:", err)
} else {
logger.Println("Wrote", n, "bytes:", b)
b = make([]byte, 100)
if n, err := conn.Read(b); err != nil {
logger.Errorln("Read failed:", err)
} else {
logger.Println("Read", n, "bytes:", b)
}
}
}
}()
}()
*/
// Make some nice output that tells us what our IPv6 address and subnet are.
// This is just logged to stdout for the user.
address := n.core.Address()
@ -367,6 +304,8 @@ func main() {
if *useconffile != "" {
cfg = readConfig(useconf, useconffile, normaliseconf)
n.core.UpdateConfig(cfg)
n.tuntap.UpdateConfig(cfg)
n.multicast.UpdateConfig(cfg)
} else {
logger.Errorln("Reloading config at runtime is only possible with -useconffile")
}