mirror of
https://github.com/yggdrasil-network/yggdrasil-go.git
synced 2025-04-29 22:55:06 +03:00
Reorder code
This commit is contained in:
Alex Kotov
parent
3b7bb9274d
commit
dc79a71d91
1 changed files with 73 additions and 73 deletions
|
|
@ -38,79 +38,6 @@ func main() {
|
||||||
os.Exit(run())
|
os.Exit(run())
|
||||||
}
|
}
|
||||||
|
|
||||||
func createCmdLineEnv() CmdLineEnv {
|
|
||||||
var cmdLineEnv CmdLineEnv
|
|
||||||
cmdLineEnv.endpoint = defaults.GetDefaults().DefaultAdminListen
|
|
||||||
return cmdLineEnv
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseFlagsAndArgs(cmdLineEnv *CmdLineEnv) {
|
|
||||||
flag.Usage = func() {
|
|
||||||
fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n\n", os.Args[0])
|
|
||||||
fmt.Println("Options:")
|
|
||||||
flag.PrintDefaults()
|
|
||||||
fmt.Println()
|
|
||||||
fmt.Println("Please note that options must always specified BEFORE the command\non the command line or they will be ignored.")
|
|
||||||
fmt.Println()
|
|
||||||
fmt.Println("Commands:\n - Use \"list\" for a list of available commands")
|
|
||||||
fmt.Println()
|
|
||||||
fmt.Println("Examples:")
|
|
||||||
fmt.Println(" - ", os.Args[0], "list")
|
|
||||||
fmt.Println(" - ", os.Args[0], "getPeers")
|
|
||||||
fmt.Println(" - ", os.Args[0], "-v getSelf")
|
|
||||||
fmt.Println(" - ", os.Args[0], "setTunTap name=auto mtu=1500 tap_mode=false")
|
|
||||||
fmt.Println(" - ", os.Args[0], "-endpoint=tcp://localhost:9001 getDHT")
|
|
||||||
fmt.Println(" - ", os.Args[0], "-endpoint=unix:///var/run/ygg.sock getDHT")
|
|
||||||
}
|
|
||||||
|
|
||||||
server := flag.String("endpoint", cmdLineEnv.endpoint, "Admin socket endpoint")
|
|
||||||
injson := flag.Bool("json", false, "Output in JSON format (as opposed to pretty-print)")
|
|
||||||
verbose := flag.Bool("v", false, "Verbose output (includes public keys)")
|
|
||||||
ver := flag.Bool("version", false, "Prints the version of this build")
|
|
||||||
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
cmdLineEnv.args = flag.Args()
|
|
||||||
cmdLineEnv.server = *server
|
|
||||||
cmdLineEnv.injson = *injson
|
|
||||||
cmdLineEnv.verbose = *verbose
|
|
||||||
cmdLineEnv.ver = *ver
|
|
||||||
}
|
|
||||||
|
|
||||||
func setEndpoint(cmdLineEnv *CmdLineEnv, logger *log.Logger) {
|
|
||||||
if cmdLineEnv.server == cmdLineEnv.endpoint {
|
|
||||||
if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil {
|
|
||||||
if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) ||
|
|
||||||
bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) {
|
|
||||||
utf := unicode.UTF16(unicode.BigEndian, unicode.UseBOM)
|
|
||||||
decoder := utf.NewDecoder()
|
|
||||||
config, err = decoder.Bytes(config)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var dat map[string]interface{}
|
|
||||||
if err := hjson.Unmarshal(config, &dat); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
if ep, ok := dat["AdminListen"].(string); ok && (ep != "none" && ep != "") {
|
|
||||||
cmdLineEnv.endpoint = ep
|
|
||||||
logger.Println("Found platform default config file", defaults.GetDefaults().DefaultConfigFile)
|
|
||||||
logger.Println("Using endpoint", cmdLineEnv.endpoint, "from AdminListen")
|
|
||||||
} else {
|
|
||||||
logger.Println("Configuration file doesn't contain appropriate AdminListen option")
|
|
||||||
logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logger.Println("Can't open config file from default location", defaults.GetDefaults().DefaultConfigFile)
|
|
||||||
logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
cmdLineEnv.endpoint = cmdLineEnv.server
|
|
||||||
logger.Println("Using endpoint", cmdLineEnv.endpoint, "from command line")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func run() int {
|
func run() int {
|
||||||
logbuffer := &bytes.Buffer{}
|
logbuffer := &bytes.Buffer{}
|
||||||
logger := log.New(logbuffer, "", log.Flags())
|
logger := log.New(logbuffer, "", log.Flags())
|
||||||
|
|
@ -252,6 +179,79 @@ func run() int {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func createCmdLineEnv() CmdLineEnv {
|
||||||
|
var cmdLineEnv CmdLineEnv
|
||||||
|
cmdLineEnv.endpoint = defaults.GetDefaults().DefaultAdminListen
|
||||||
|
return cmdLineEnv
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseFlagsAndArgs(cmdLineEnv *CmdLineEnv) {
|
||||||
|
flag.Usage = func() {
|
||||||
|
fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n\n", os.Args[0])
|
||||||
|
fmt.Println("Options:")
|
||||||
|
flag.PrintDefaults()
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Println("Please note that options must always specified BEFORE the command\non the command line or they will be ignored.")
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Println("Commands:\n - Use \"list\" for a list of available commands")
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Println("Examples:")
|
||||||
|
fmt.Println(" - ", os.Args[0], "list")
|
||||||
|
fmt.Println(" - ", os.Args[0], "getPeers")
|
||||||
|
fmt.Println(" - ", os.Args[0], "-v getSelf")
|
||||||
|
fmt.Println(" - ", os.Args[0], "setTunTap name=auto mtu=1500 tap_mode=false")
|
||||||
|
fmt.Println(" - ", os.Args[0], "-endpoint=tcp://localhost:9001 getDHT")
|
||||||
|
fmt.Println(" - ", os.Args[0], "-endpoint=unix:///var/run/ygg.sock getDHT")
|
||||||
|
}
|
||||||
|
|
||||||
|
server := flag.String("endpoint", cmdLineEnv.endpoint, "Admin socket endpoint")
|
||||||
|
injson := flag.Bool("json", false, "Output in JSON format (as opposed to pretty-print)")
|
||||||
|
verbose := flag.Bool("v", false, "Verbose output (includes public keys)")
|
||||||
|
ver := flag.Bool("version", false, "Prints the version of this build")
|
||||||
|
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
cmdLineEnv.args = flag.Args()
|
||||||
|
cmdLineEnv.server = *server
|
||||||
|
cmdLineEnv.injson = *injson
|
||||||
|
cmdLineEnv.verbose = *verbose
|
||||||
|
cmdLineEnv.ver = *ver
|
||||||
|
}
|
||||||
|
|
||||||
|
func setEndpoint(cmdLineEnv *CmdLineEnv, logger *log.Logger) {
|
||||||
|
if cmdLineEnv.server == cmdLineEnv.endpoint {
|
||||||
|
if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil {
|
||||||
|
if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) ||
|
||||||
|
bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) {
|
||||||
|
utf := unicode.UTF16(unicode.BigEndian, unicode.UseBOM)
|
||||||
|
decoder := utf.NewDecoder()
|
||||||
|
config, err = decoder.Bytes(config)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var dat map[string]interface{}
|
||||||
|
if err := hjson.Unmarshal(config, &dat); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
if ep, ok := dat["AdminListen"].(string); ok && (ep != "none" && ep != "") {
|
||||||
|
cmdLineEnv.endpoint = ep
|
||||||
|
logger.Println("Found platform default config file", defaults.GetDefaults().DefaultConfigFile)
|
||||||
|
logger.Println("Using endpoint", cmdLineEnv.endpoint, "from AdminListen")
|
||||||
|
} else {
|
||||||
|
logger.Println("Configuration file doesn't contain appropriate AdminListen option")
|
||||||
|
logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.Println("Can't open config file from default location", defaults.GetDefaults().DefaultConfigFile)
|
||||||
|
logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
cmdLineEnv.endpoint = cmdLineEnv.server
|
||||||
|
logger.Println("Using endpoint", cmdLineEnv.endpoint, "from command line")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func runAll(recv map[string]interface{}, verbose bool) {
|
func runAll(recv map[string]interface{}, verbose bool) {
|
||||||
req := recv["request"].(map[string]interface{})
|
req := recv["request"].(map[string]interface{})
|
||||||
res := recv["response"].(map[string]interface{})
|
res := recv["response"].(map[string]interface{})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue