From 0b6ee986b3ad47eb31e537d20ce267c0ca347a9b Mon Sep 17 00:00:00 2001
From: W192547975 <138874985+W192547975@users.noreply.github.com>
Date: Sat, 18 Nov 2023 12:22:59 +0800
Subject: [PATCH 1/3] Update log.go

---
 core/log.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/log.go b/core/log.go
index 19d3c37..3b3f070 100644
--- a/core/log.go
+++ b/core/log.go
@@ -106,6 +106,11 @@ func (l *logger) setMode(mode int) {
 	defer l.mtx.Unlock()
 	l.mode = mode
 }
+func (l *logger) Mode() int {
+	l.mtx.Lock()
+	defer l.mtx.Unlock()
+	return l.mode
+}
 
 func (l *logger) checkFile() {
 	if l.maxLogSize <= 0 {

From 1af74a90c44343c8d2a7ea57df4c18c4f40c7720 Mon Sep 17 00:00:00 2001
From: W192547975 <W192547975@163.com>
Date: Sat, 23 Nov 2024 08:32:35 +0800
Subject: [PATCH 2/3] Update config.go

Stop writing ServerPort in init because it is never used and will be overwritten in parseParams.
Give FlagSet value written by init.
Correct the behavior of notVerbose.
---
 core/config.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/config.go b/core/config.go
index ed8783a..a27cd15 100644
--- a/core/config.go
+++ b/core/config.go
@@ -267,8 +267,6 @@ func init() {
 	gConf.LogLevel = int(LvINFO)
 	gConf.Network.ShareBandwidth = 10
 	gConf.Network.ServerHost = "api.openp2p.cn"
-	gConf.Network.ServerPort = WsPort
-
 }
 
 func (c *Config) load() error {
@@ -380,7 +378,7 @@ type NetworkConfig struct {
 
 func parseParams(subCommand string, cmd string) {
 	fset := flag.NewFlagSet(subCommand, flag.ExitOnError)
-	serverHost := fset.String("serverhost", "api.openp2p.cn", "server host ")
+	serverHost := fset.String("serverhost", gConf.Network.ServerHost, "server host ")
 	serverPort := fset.Int("serverport", WsPort, "server port ")
 	// serverHost := flag.String("serverhost", "127.0.0.1", "server host ") // for debug
 	token := fset.Uint64("token", 0, "token")
@@ -396,11 +394,11 @@ func parseParams(subCommand string, cmd string) {
 	punchPriority := fset.Int("punch_priority", 0, "bitwise DisableTCP|DisableUDP|UDPFirst  0:tcp and udp both enable, tcp first")
 	appName := fset.String("appname", "", "app name")
 	relayNode := fset.String("relaynode", "", "relaynode")
-	shareBandwidth := fset.Int("sharebandwidth", 10, "N mbps share bandwidth limit, private network no limit")
+	shareBandwidth := fset.Int("sharebandwidth", gConf.Network.ShareBandwidth, "N mbps share bandwidth limit, private network no limit")
 	daemonMode := fset.Bool("d", false, "daemonMode")
 	notVerbose := fset.Bool("nv", false, "not log console")
 	newconfig := fset.Bool("newconfig", false, "not load existing config.json")
-	logLevel := fset.Int("loglevel", 1, "0:debug 1:info 2:warn 3:error")
+	logLevel := fset.Int("loglevel", gConf.LogLevel, "0:debug 1:info 2:warn 3:error")
 	maxLogSize := fset.Int("maxlogsize", 1024*1024, "default 1MB")
 	if cmd == "" {
 		if subCommand == "" { // no subcommand
@@ -490,7 +488,7 @@ func parseParams(subCommand string, cmd string) {
 	gConf.Network.UDPPort2 = UDPPort2
 	gLog.setLevel(LogLevel(gConf.LogLevel))
 	if *notVerbose {
-		gLog.setMode(LogFile)
+		gLog.setMode(gLog.Mode() &^ LogConsole)
 	}
 	// gConf.mtx.Unlock()
 	gConf.save()

From 792e462df6c44c01745236a793d2b040e537112c Mon Sep 17 00:00:00 2001
From: W192547975 <W192547975@163.com>
Date: Sat, 23 Nov 2024 08:35:33 +0800
Subject: [PATCH 3/3] Update log.go

A iota==1 bug.
---
 core/log.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/log.go b/core/log.go
index 3b3f070..d303c90 100644
--- a/core/log.go
+++ b/core/log.go
@@ -13,8 +13,8 @@ type LogLevel int
 var gLog *logger
 
 const (
-	LvDev   LogLevel = -1
-	LvDEBUG LogLevel = iota
+	LvDev LogLevel = iota + -1
+	LvDEBUG
 	LvINFO
 	LvWARN
 	LvERROR