diff --git a/main_cmd.go b/main_cmd.go index d6361e7..599fd11 100644 --- a/main_cmd.go +++ b/main_cmd.go @@ -7,7 +7,7 @@ import ( "goodlink/pro" _ "goodlink/pro" "goodlink/stun2" - "goodlink/tools" + "goodlink/utils" "log" "net/http" _ "net/http/pprof" @@ -63,11 +63,11 @@ func main2() { func main() { config.Help() - tools.GuardStart(main2, 500*time.Millisecond, func(err error) { + utils.GuardStart(main2, 500*time.Millisecond, func(err error) { // if 0: err==nil; -1: err==255; -2: err==254; err==1: 1; err==2 if err != nil { log.Printf(" 异常退出: %v", err) - tools.DingF("error: %v", err) + utils.DingF("error: %v", err) } }) } diff --git a/main_windows.go b/main_windows.go index afc9f9d..539ed84 100644 --- a/main_windows.go +++ b/main_windows.go @@ -6,8 +6,8 @@ import ( "goodlink/config" _ "goodlink/pro" "goodlink/theme" - "goodlink/tools" "goodlink/ui2" + "goodlink/utils" "log" "os" "time" @@ -51,12 +51,12 @@ func main2() { func main() { config.Help() - tools.GuardStart(main2, 500*time.Millisecond, func(err error) { + utils.GuardStart(main2, 500*time.Millisecond, func(err error) { // if 0: err==nil; -1: err==255; -2: err==254; err==1: 1; err==2 if err == nil { os.Exit(0) } log.Printf(" 异常退出: %v", err) - tools.DingF("error: %v", err) + utils.DingF("error: %v", err) }) } diff --git a/pro/local.go b/pro/local.go index c80d74c..e81898e 100644 --- a/pro/local.go +++ b/pro/local.go @@ -5,7 +5,7 @@ import ( "goodlink/md5" "goodlink/proxy" "goodlink/stun2" - "goodlink/tools" + "goodlink/utils" "goodlink2/tun" _ "goodlink2/tun" "log" @@ -27,14 +27,14 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream, e ConnectCount: count, } - conn := tools.GetListenUDP() + conn := utils.GetListenUDP() ClientIP, ClientPort1, ClientPort2 := stun2.GetWanIpPort2(conn) if ClientPort1 == ClientPort2 { conn_type = 0 } - SessionID := string(tools.RandomBytes(24)) + SessionID := string(utils.RandomBytes(24)) redisJson.SessionID = SessionID gogo.Log().DebugF(" 会话ID: %s", SessionID) diff --git a/pro/remote.go b/pro/remote.go index 3c1d6a5..7396533 100644 --- a/pro/remote.go +++ b/pro/remote.go @@ -5,7 +5,7 @@ import ( "goodlink/md5" "goodlink/proxy" "goodlink/stun2" - "goodlink/tools" + "goodlink/utils" "goodlink2/tun" _ "goodlink2/tun" "log" @@ -69,7 +69,7 @@ func GetRemoteQuicConn(time_out time.Duration) (quic.Connection, quic.Stream) { case 0: gogo.Log().DebugF("%d: 收到对端请求: %v", redisJson.State, redisJson) - conn := tools.GetListenUDP() + conn := utils.GetListenUDP() redisJson.ServerIP, redisJson.ServerPort1, redisJson.ServerPort2 = stun2.GetWanIpPort2(conn) switch redisJson.ClientPort1 { @@ -171,7 +171,7 @@ func RunRemote(remote_addr string, tun_key string, time_out time.Duration) error if remote_addr == "" { log.Println(" 开启本地代理") - remote_addr = tools.GetFreeLocalAddr() + remote_addr = utils.GetFreeLocalAddr() if remote_addr == "" { return errors.New(" 获取本地端口失败") } diff --git a/stun2/cli.go b/stun2/cli.go index 3d4cafb..a96ae95 100644 --- a/stun2/cli.go +++ b/stun2/cli.go @@ -6,7 +6,7 @@ import ( "encoding/binary" "fmt" "goodlink/config" - "goodlink/tools" + "goodlink/utils" "log" "math/big" "net" @@ -224,13 +224,13 @@ func GetWanIpPort2(conn *net.UDPConn) (string, int, int) { } func GetWanIpPort() (string, int, int) { - conn := tools.GetListenUDP() + conn := utils.GetListenUDP() defer conn.Close() return GetWanIpPort2(conn) } func TestStun() { - conn := tools.GetListenUDP() + conn := utils.GetListenUDP() for { for _, stun_svr := range config.GetConfig().StunList { diff --git a/ui2/ui.go b/ui2/ui.go index d7a1347..fd8cd98 100644 --- a/ui2/ui.go +++ b/ui2/ui.go @@ -13,7 +13,7 @@ import ( "goodlink/config" "goodlink/pro" _ "goodlink/pro" - "goodlink/tools" + "goodlink/utils" _ "embed" _ "net/http/pprof" @@ -84,7 +84,7 @@ func GetMainUI(myWindow *fyne.Window) *fyne.Container { } m_button_key_create = widget.NewButton("生成密钥", func() { - m_validated_key.SetText(string(tools.RandomBytes(24))) + m_validated_key.SetText(string(utils.RandomBytes(24))) }) key_copy_button := widget.NewButton("复制密钥", func() { clipboard.WriteAll(m_validated_key.Text) diff --git a/tools/dingding.go b/utils/dingding.go similarity index 94% rename from tools/dingding.go rename to utils/dingding.go index be15549..c0b65cf 100644 --- a/tools/dingding.go +++ b/utils/dingding.go @@ -1,4 +1,4 @@ -package tools +package utils import ( "fmt" diff --git a/tools/guard.go b/utils/guard.go similarity index 93% rename from tools/guard.go rename to utils/guard.go index 0ccd255..e7611d7 100644 --- a/tools/guard.go +++ b/utils/guard.go @@ -1,4 +1,4 @@ -package tools +package utils import ( "log" diff --git a/tools/net.go b/utils/net.go similarity index 97% rename from tools/net.go rename to utils/net.go index f261e2b..631e036 100644 --- a/tools/net.go +++ b/utils/net.go @@ -1,4 +1,4 @@ -package tools +package utils import ( "fmt" diff --git a/tools/tools.go b/utils/tools.go similarity index 93% rename from tools/tools.go rename to utils/tools.go index 02880cb..6892e2a 100644 --- a/tools/tools.go +++ b/utils/tools.go @@ -1,4 +1,4 @@ -package tools +package utils import ( "crypto/rand"