web console

2022-02-03 23:43:28 +08:00
parent 7686af39e0
commit 95b46f51d0
17 changed files with 406 additions and 343 deletions
@@ -2,7 +2,9 @@ package main

 import (
 	"encoding/json"
+	"flag"
 	"io/ioutil"
+	"os"
 	"sync"
 	"time"
 )
@@ -13,14 +15,14 @@ const IntValueNotSet int = -99999999

 type AppConfig struct {
 	// required
-	AppName      string
-	Protocol     string
-	SrcPort      int
-	PeerNode     string
-	DstPort      int
-	DstHost      string
-	PeerUser     string
-	PeerPassword string
+	AppName  string
+	Protocol string
+	SrcPort  int
+	PeerNode string
+	DstPort  int
+	DstHost  string
+	PeerUser string
+	Enabled  int // default:1
 	// runtime info
 	peerToken       uint64
 	peerNatType     int
@@ -40,14 +42,29 @@ type Config struct {
 	mtx sync.Mutex
 }

-func (c *Config) add(app AppConfig) {
+func (c *Config) switchApp(app AppConfig, enabled int) {
+	c.mtx.Lock()
+	defer c.mtx.Unlock()
+	for i := 0; i < len(c.Apps); i++ {
+		if c.Apps[i].Protocol == app.Protocol && c.Apps[i].SrcPort == app.SrcPort {
+			c.Apps[i].Enabled = enabled
+			return
+		}
+	}
+}
+
+func (c *Config) add(app AppConfig, force bool) {
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
 	if app.SrcPort == 0 || app.DstPort == 0 {
+		gLog.Println(LevelERROR, "invalid app ", app)
 		return
 	}
 	for i := 0; i < len(c.Apps); i++ {
 		if c.Apps[i].Protocol == app.Protocol && c.Apps[i].SrcPort == app.SrcPort {
+			if force {
+				c.Apps[i] = app
+			}
 			return
 		}
 	}
@@ -85,7 +102,7 @@ func (c *Config) load() error {
 	defer c.mtx.Unlock()
 	data, err := ioutil.ReadFile("config.json")
 	if err != nil {
-		gLog.Println(LevelERROR, "read config.json error:", err)
+		// gLog.Println(LevelERROR, "read config.json error:", err)
 		return err
 	}
 	err = json.Unmarshal(data, &c)
@@ -97,9 +114,9 @@ func (c *Config) load() error {

 type NetworkConfig struct {
 	// local info
+	Token          uint64
 	Node           string
 	User           string
-	Password       string
 	localIP        string
 	ipv6           string
 	hostName       string
@@ -114,3 +131,80 @@ type NetworkConfig struct {
 	UDPPort1   int
 	UDPPort2   int
 }
+
+func parseParams() {
+	serverHost := flag.String("serverhost", "api.openp2p.cn", "server host ")
+	// serverHost := flag.String("serverhost", "127.0.0.1", "server host ") // for debug
+	node := flag.String("node", "", "node name. 8-31 characters")
+	token := flag.Uint64("token", 0, "token")
+	peerNode := flag.String("peernode", "", "peer node name that you want to connect")
+	dstIP := flag.String("dstip", "127.0.0.1", "destination ip ")
+	dstPort := flag.Int("dstport", 0, "destination port ")
+	srcPort := flag.Int("srcport", 0, "source port ")
+	protocol := flag.String("protocol", "tcp", "tcp or udp")
+	appName := flag.String("appname", "", "app name")
+	flag.Bool("noshare", false, "deprecated. uses -sharebandwidth -1") // Deprecated, rm later
+	shareBandwidth := flag.Int("sharebandwidth", 10, "N mbps share bandwidth limit, private node no limit")
+	flag.Bool("f", false, "deprecated. config file") // Deprecated, rm later
+	daemonMode := flag.Bool("d", false, "daemonMode")
+	flag.Bool("bydaemon", false, "start by daemon") // Deprecated, rm later
+	logLevel := flag.Int("loglevel", 1, "0:debug 1:info 2:warn 3:error")
+	flag.Parse()
+
+	config := AppConfig{Enabled: 1}
+	config.PeerNode = *peerNode
+	config.DstHost = *dstIP
+	config.DstPort = *dstPort
+	config.SrcPort = *srcPort
+	config.Protocol = *protocol
+	config.AppName = *appName
+	gConf.load()
+	if config.SrcPort != 0 {
+		gConf.add(config, true)
+	}
+	gConf.mtx.Lock()
+
+	// spec paramters in commandline will always be used
+	flag.Visit(func(f *flag.Flag) {
+		if f.Name == "sharebandwidth" {
+			gConf.Network.ShareBandwidth = *shareBandwidth
+		}
+		if f.Name == "node" {
+			gConf.Network.Node = *node
+		}
+		if f.Name == "serverhost" {
+			gConf.Network.ServerHost = *serverHost
+		}
+		if f.Name == "loglevel" {
+			gConf.LogLevel = *logLevel
+		}
+	})
+
+	if gConf.Network.ServerHost == "" {
+		gConf.Network.ServerHost = *serverHost
+	}
+	if gConf.Network.Node == "" {
+		gConf.Network.Node = *node
+	}
+	if *token != 0 {
+		gConf.Network.Token = *token
+	}
+	if gConf.LogLevel == IntValueNotSet {
+		gConf.LogLevel = *logLevel
+	}
+	if gConf.Network.ShareBandwidth == IntValueNotSet {
+		gConf.Network.ShareBandwidth = *shareBandwidth
+	}
+
+	gConf.Network.ServerPort = 27183
+	gConf.Network.UDPPort1 = 27182
+	gConf.Network.UDPPort2 = 27183
+	gLog.setLevel(LogLevel(gConf.LogLevel))
+	gConf.mtx.Unlock()
+	gConf.save()
+	if *daemonMode {
+		d := daemon{}
+		d.run()
+		os.Exit(0)
+	}
+}