From 8a2ca58a24757489add3d7ec3b697c3a7dccd25a Mon Sep 17 00:00:00 2001 From: kony <2312708932@qq.com> Date: Sun, 5 Jan 2025 17:15:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A4=84=E7=90=86=E5=81=B6=E7=84=B6?= =?UTF-8?q?=E6=96=AD=E5=BC=80=E9=87=8D=E8=BF=9E=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88=E8=87=AA=E6=B5=8B=E5=BE=85=E8=A7=82=E5=AF=9F=EF=BC=89?= =?UTF-8?q?=202.=20=E5=8F=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=EF=BC=8C=E5=87=BA=E7=8E=B0=E6=AE=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FyneApp.toml | 2 +- LICENSE | 314 +++++++++++++++++++++++++------------------------- README.md | 7 +- pro/comm.go | 4 + pro/local.go | 36 ++++-- pro/remote.go | 12 +- tools/net.go | 10 ++ 7 files changed, 209 insertions(+), 176 deletions(-) diff --git a/FyneApp.toml b/FyneApp.toml index f22aa1e..d1c2a15 100644 --- a/FyneApp.toml +++ b/FyneApp.toml @@ -5,4 +5,4 @@ Website = "https://goodlink.kony.vip" Name = "goodlink-windows-ui-amd64" ID = "goodlink.kony.vip" Version = "1.14.18" - Build = 13 + Build = 15 diff --git a/LICENSE b/LICENSE index 29f81d8..599f617 100644 --- a/LICENSE +++ b/LICENSE @@ -2,180 +2,180 @@ Version 2.0, January 2004 http://www.apache.org/licenses/ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - 1. Definitions. +1. Definitions. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. - END OF TERMS AND CONDITIONS +END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. +APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" @@ -186,16 +186,16 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] +Copyright [2024-2025] [Kony] - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/README.md b/README.md index c58578a..421f1d3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 是否可以无需远程桌面, 直接浏览器访问公司的内网 WEB, 登录内网 GIT, 内网 SSH, 远程 VS CODE 调试等等, 就跟在公司一模一样？ - **注: 作者开发该项目的初衷，是方便自己的同时，方便大家，提升热度，希望对未来有所帮助。本项目仅用于学习研究, 目前没有任何商业合作，更没有任何恶意行为。如果将来有广告之类盈利的行为，会在这里郑重告知大家。另外声明：严禁用于违法行为！！！** +**注: 作者开发该项目的初衷，是方便自己的同时，方便大家，提升热度，希望对未来有所帮助。该项目仅用于学习研究, 目前没有任何商业合作，更没有任何恶意行为。如果未来有广告之类盈利的行为，会郑重告知大家。另外声明：严禁用于违法行为！！！** # 特点 @@ -40,7 +40,9 @@ 10. 1.4.17 版本开始, windows 版本新增了 UI, 目前还在测试阶段, 可能不太稳定。如果影响使用, 可先使用 1.3.17 之前的 windows 版本 -11. 1024 以下是操作系统的保留端口, 基本都被占用了, local 端请使用 1024 以上端口。linux 系统可以使用命令 `netstat -anp|grep 22` 判断 22 端口是否已被占用。 +11. 1024 以下是操作系统的保留端口, 基本都被占用了, local 端请使用 1024 以上端口。例如 linux 系统可以使用命令 `netstat -anp|grep 22` 判断 22 端口是否已被占用 + +12. 该项目刚刚起步, 功能还不完善, 欢迎到 Issues 上提出问题和建议, 帮忙测试的同学将保证永久免费使用 @@ -51,7 +53,6 @@
Remote端Local端P2P成功
NAT3-4NAT4YES
- # 简单使用 ## 工作模式 - 介绍 diff --git a/pro/comm.go b/pro/comm.go index 945c9de..2adcffe 100644 --- a/pro/comm.go +++ b/pro/comm.go @@ -95,3 +95,7 @@ func RedisGet(redisJson *RedisJsonType) error { return nil } + +func RedisDel() { + m_redis_db.Del(m_md5_tun_key) +} diff --git a/pro/local.go b/pro/local.go index 834284f..7f28580 100644 --- a/pro/local.go +++ b/pro/local.go @@ -21,7 +21,7 @@ var ( m_local_state = 0 //0: 停止, 1: 启动, 2: 连接成功 ) -func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) { +func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream, error) { var err error redisJson := RedisJsonType{ @@ -61,21 +61,25 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) { err = RedisGet(&redisJson) if err != nil { gogo.Log().Debug(err) - return nil, nil + return nil, nil, nil } switch redisJson.State { case 1: + gogo.Log().DebugF("%d: 收到对端地址: %v", redisJson.State, redisJson) + switch conn_type { case 0: - gogo.Log().DebugF("%d: 收到对端地址: %v", redisJson.State, redisJson) - if m_tun_passive != nil { m_tun_passive.Release() } m_tun_active = nil redisJson.ClientIP, redisJson.ClientPort = <-wan_ip_chain, <-wan_port_chain + if redisJson.ClientIP == redisJson.ServerIP { + RedisDel() + return nil, nil, fmt.Errorf("已经和对端处在同一个公网下") + } m_tun_passive = tun.CteateTunPassive(conn, redisJson.ServerIP, redisJson.ServerPort, redisJson.SendPortCount) m_tun_passive.Start() @@ -85,14 +89,18 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) { RedisSet(redisJson.RedisTimeOut, &redisJson) default: - gogo.Log().DebugF("%d: 收到对端地址: %v", redisJson.State, redisJson) if m_tun_active != nil { m_tun_active.Release() } m_tun_passive = nil + if redisJson.ClientIP == redisJson.ServerIP { + RedisDel() + return nil, nil, fmt.Errorf("已经和对端处在同一个公网下") + } + m_tun_active = tun.CreateTunActive(conn, 15*time.Second) - m_tun_active.Start(redisJson.ServerIP, redisJson.ServerPort, redisJson.SocketTimeOut) + m_tun_active.Start(redisJson.ClientPort, redisJson.ServerIP, redisJson.ServerPort, redisJson.SocketTimeOut) redisJson.State = 2 RedisSet(redisJson.RedisTimeOut, &redisJson) } @@ -101,28 +109,28 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) { if m_tun_passive != nil { if m_tun_passive.TunQuicConn != nil { gogo.Log().DebugF("%d: 连接成功", redisJson.State) - return m_tun_passive.TunQuicConn, m_tun_passive.TunHealthStream + return m_tun_passive.TunQuicConn, m_tun_passive.TunHealthStream, nil } } if m_tun_active != nil { if m_tun_active.TunQuicConn != nil { gogo.Log().DebugF("%d: 连接成功", redisJson.State) - return m_tun_active.TunQuicConn, m_tun_active.TunHealthStream + return m_tun_active.TunQuicConn, m_tun_active.TunHealthStream, nil } } gogo.Log().Debug(" 连接失败") - return nil, nil + return nil, nil, nil case 4: gogo.Log().DebugF("%d: 连接超时", redisJson.State) - return nil, nil + return nil, nil, nil default: gogo.Log().DebugF("%d: 等待对端状态", redisJson.State) } } - return nil, nil + return nil, nil, nil } func GetLocalStats() int { @@ -160,7 +168,11 @@ func RunLocal(conn_type int, tun_local_addr string, tun_key string) error { count++ - conn, health := GetLocalQuicConn(conn_type, count) + conn, health, err := GetLocalQuicConn(conn_type, count) + if err != nil { + Release() + return err + } if conn == nil { Release() continue diff --git a/pro/remote.go b/pro/remote.go index c76542a..e480a89 100644 --- a/pro/remote.go +++ b/pro/remote.go @@ -98,7 +98,7 @@ func GetRemoteQuicConn(time_out time.Duration) (quic.Connection, quic.Stream) { switch conn_type { case 0: gogo.Log().DebugF("%d: 收到对端地址: %v", redisJson.State, redisJson) - m_tun_active.Start(redisJson.ClientIP, redisJson.ClientPort, redisJson.SocketTimeOut) + m_tun_active.Start(redisJson.ServerPort, redisJson.ClientIP, redisJson.ClientPort, redisJson.SocketTimeOut) case 1: gogo.Log().DebugF("%d: 收到对端地址, 等待连接: %v", redisJson.State, redisJson) @@ -109,13 +109,19 @@ func GetRemoteQuicConn(time_out time.Duration) (quic.Connection, quic.Stream) { redisJson.State = 3 gogo.Log().DebugF("%d: 通知对端, 连接成功", redisJson.State) RedisSet(redisJson.RedisTimeOut, &redisJson) - return m_tun_active.TunQuicConn, m_tun_active.TunHealthStream + if m_tun_active != nil { + return m_tun_active.TunQuicConn, m_tun_active.TunHealthStream + } + return nil, nil case <-tun_passive_chain: redisJson.State = 3 gogo.Log().DebugF("%d: 通知对端, 连接成功", redisJson.State) RedisSet(redisJson.RedisTimeOut, &redisJson) - return m_tun_passive.TunQuicConn, m_tun_passive.TunHealthStream + if m_tun_passive != nil { + return m_tun_passive.TunQuicConn, m_tun_passive.TunHealthStream + } + return nil, nil case <-time.After(time_out): redisJson.State = 4 diff --git a/tools/net.go b/tools/net.go index c945cde..f261e2b 100644 --- a/tools/net.go +++ b/tools/net.go @@ -1,6 +1,7 @@ package tools import ( + "fmt" "net" "gogo" @@ -13,3 +14,12 @@ func GetListenUDP() *net.UDPConn { } return conn } + +func GetListenUDP2(port int) *net.UDPConn { + if addr, err := net.ResolveUDPAddr("udp", fmt.Sprintf(":%d", port)); addr != nil && err == nil { + if conn, err := net.ListenUDP("udp", addr); conn != nil && err == nil { + return conn + } + } + return nil +}