apps/goodlink
1
0
Fork 0
mirror of https://gitee.com/konyshe/goodlink.git synced 2025-12-24 08:13:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
kony
2024-12-30 16:16:07 +08:00
parent 3795d55d03
commit c2952d30b8
2 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pro/local.go
View File

@@ -138,13 +138,13 @@ func StopLocal() error {
func RunLocal(conn_type int, tun_local_addr string, tun_key string) error {
m_local_state = 1
log.Printf(" 本地监听地址: %v", tun_local_addr)
log.Printf(" 绑定端口: %v", tun_local_addr)
chain := make(chan int, 1)
listener, err := net.Listen("tcp", tun_local_addr)
if listener == nil || err != nil {
return fmt.Errorf("地址监听失败: %v", tun_local_addr)
return fmt.Errorf("绑定端口失败: %v", tun_local_addr)
}
defer func() {
listener.Close()

100
ui2/start.go
View File

@@ -27,7 +27,7 @@ var (
m_stats_start_button int
)
func start_button_click_1(content string) {
func disable_other(content string) {
m_radio_work_type.Disable()
m_validated_key.Disable()
m_ui_local.Disable()
@@ -39,7 +39,7 @@ func start_button_click_1(content string) {
m_stats_start_button = 1
}
func start_button_click_0() {
func enable_other() {
m_radio_work_type.Enable()
m_validated_key.Enable()
m_ui_local.Enable()
@@ -77,8 +77,7 @@ func start_button_click() {
}
}
log.Println(remote_addr)
// 保存配置文件, 下次启动加载
configByte, _ := json.Marshal(&config.ConfigInfo{
WorkType: m_radio_work_type.Selected,
TunKey: m_validated_key.Text,
@@ -97,32 +96,37 @@ func start_button_click() {
switch m_stats_start_button {
case 0:
m_button_start.Disable()
start_button_click_1("正在启动...")
m_mg_start.Add(1)
go func() {
defer m_mg_start.Done()
time.Sleep(time.Second * 1)
m_button_start.Enable()
m_button_start.Importance = widget.WarningImportance
m_button_start.Refresh()
m_button_start.SetText("点击停止")
for m_stats_start_button == 1 {
if pro.GetLocalStats() == 2 {
m_view_log.SetText("连接成功")
m_button_start.Importance = widget.SuccessImportance
m_button_start.Refresh()
break
}
time.Sleep(time.Millisecond * 200)
}
m_activity_start_button.Stop()
m_activity_start_button.Hide()
}()
disable_other("正在连接...")
switch m_radio_work_type.Selected {
case "Local":
m_mg_start.Add(1)
go func() {
defer m_mg_start.Done()
time.Sleep(time.Second * 1)
m_button_start.Enable()
if m_stats_start_button == 1 {
m_button_start.Importance = widget.WarningImportance
m_button_start.SetText("点击断开")
}
for m_stats_start_button == 1 {
if pro.GetLocalStats() == 2 {
m_view_log.SetText("连接成功")
m_button_start.Importance = widget.SuccessImportance
m_button_start.Refresh()
break
}
time.Sleep(time.Millisecond * 200)
}
m_activity_start_button.Stop()
m_activity_start_button.Hide()
if m_stats_start_button == 0 {
enable_other()
}
}()
m_mg_start.Add(1)
go func() {
defer m_mg_start.Done()
@@ -130,6 +134,42 @@ func start_button_click() {
SetLogLabel(err.Error())
}
m_stats_start_button = 0
m_button_start.Importance = widget.HighImportance
m_button_start.SetText("点击连接")
}()
case "Remote":
m_mg_start.Add(1)
go func() {
defer m_mg_start.Done()
time.Sleep(time.Second * 1)
m_button_start.Enable()
m_button_start.Importance = widget.WarningImportance
m_button_start.Refresh()
m_button_start.SetText("点击断开")
for m_stats_start_button == 1 {
if pro.GetLocalStats() == 2 {
m_view_log.SetText("连接成功")
m_button_start.Importance = widget.SuccessImportance
m_button_start.Refresh()
break
}
time.Sleep(time.Millisecond * 200)
}
m_activity_start_button.Stop()
m_activity_start_button.Hide()
}()
m_mg_start.Add(1)
go func() {
defer m_mg_start.Done()
if err := pro.RunRemote(remote_addr, m_validated_key.Text, 30*time.Second); err != nil {
SetLogLabel(err.Error())
}
m_stats_start_button = 0
m_button_start.Importance = widget.HighImportance
m_button_start.SetText("点击连接")
}()
}
@@ -143,9 +183,9 @@ func start_button_click() {
go func() {
pro.StopLocal()
m_mg_start.Wait()
start_button_click_0()
m_view_log.SetText("等待开始")
m_button_start.SetText("点击开始")
enable_other()
m_view_log.SetText("等待连接")
m_button_start.SetText("点击连接")
m_button_start.Importance = widget.HighImportance
m_button_start.Refresh()
m_button_start.Enable()