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