cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 14:10:28 +00:00
Code Releases Activity

Use HJSON instead of JSON

Browse Source
This commit is contained in:
Neil Alexander 2018-05-09 13:54:31 +01:00
parent fcf7fe71af
commit 45b106168e
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/yggdrasil/config/config.go
View File

@ -2,20 +2,20 @@ package config
// NodeConfig defines all configuration values needed to run a signle yggdrasil node // NodeConfig defines all configuration values needed to run a signle yggdrasil node
type NodeConfig struct { type NodeConfig struct {
Listen string Listen string `comment:"Listen address for peer connections (default is to listen for all\nconnections over IPv4 and IPv6)"`
AdminListen string AdminListen string `comment:"Listen address for admin connections (default is to listen only\nfor local connections)"`
Peers []string Peers []string `comment:"List of connection strings for static peers (i.e. tcp://a.b.c.d:e)"`
AllowedBoxPubs []string AllowedBoxPubs []string `comment:"List of peer BoxPubs to allow UDP incoming TCP connections from"`
BoxPub string BoxPub string `comment:"Your public encryption key (your peers may ask you for this to put\ninto their AllowedBoxPubs configuration)"`
BoxPriv string BoxPriv string `comment:"Your private encryption key (do not share this with anyone!)"`
SigPub string SigPub string `comment:"Your public signing key"`
SigPriv string SigPriv string `comment:"Your private signing key (do not share this with anyone!)"`
Multicast bool Multicast bool `comment:"Enable or disable automatic peer discovery on the same LAN using multicast"`
LinkLocal string LinkLocal string `comment:"Regex for which interfaces multicast peer discovery should be enabled on"`
IfName string IfName string `comment:"Local network interface name for TUN/TAP adapter, or \"auto\", or \"none\""`
IfTAPMode bool IfTAPMode bool `comment:"Set local network interface to TAP mode rather than TUN mode (if supported\nby your platform, option will be ignored if not)"`
IfMTU int IfMTU int `comment:"Maximux Transmission Unit (MTU) size for your local network interface"`
Net NetConfig Net NetConfig `comment:"Incomplete options for configuring peerings over Tor/I2P"`
} }
// NetConfig defines network/proxy related configuration values // NetConfig defines network/proxy related configuration values

15
yggdrasil.go
View File

@ -1,8 +1,6 @@
package main package main
import "bytes"
import "encoding/hex" import "encoding/hex"
import "encoding/json"
import "flag" import "flag"
import "fmt" import "fmt"
import "io/ioutil" import "io/ioutil"
@ -25,6 +23,8 @@ import "yggdrasil"
import "yggdrasil/config" import "yggdrasil/config"
import "github.com/kardianos/minwinsvc" import "github.com/kardianos/minwinsvc"
import "github.com/neilalexander/hjson-go"
import "github.com/mitchellh/mapstructure"
type nodeConfig = config.NodeConfig type nodeConfig = config.NodeConfig
type Core = yggdrasil.Core type Core = yggdrasil.Core
@ -112,8 +112,9 @@ func generateConfig(isAutoconf bool) *nodeConfig {
} }
func doGenconf() string { func doGenconf() string {
cfg := generateConfig(false) cfg := generateConfig(false)
bs, err := json.MarshalIndent(cfg, "", " ") bs, err := hjson.Marshal(cfg)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -235,10 +236,12 @@ func main() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
decoder := json.NewDecoder(bytes.NewReader(config))
cfg = generateConfig(false) cfg = generateConfig(false)
err = decoder.Decode(cfg) var dat map[string]interface{}
if err != nil { if err := hjson.Unmarshal(config, &dat); err != nil {
panic(err)
}
if err = mapstructure.Decode(dat, &cfg); err != nil {
panic(err) panic(err)
} }
case *genconf: case *genconf: