Просмотр исходного кода

docs(readme): Up readme

Connection timeout issues move to #92
lejianwen 1 год назад
Родитель
Сommit
8dc5f82a0e
2 измененных файлов с 0 добавлено и 91 удалено
  1. 0 45
      README.md
  2. 0 46
      README_EN.md

+ 0 - 45
README.md

@@ -43,51 +43,6 @@
43 43
 - CLI
44 44
     - 重置管理员密码
45 45
 
46
-## 使用前准备
47
-
48
-### [Rustdesk](https://github.com/rustdesk/rustdesk)
49
-
50
-#### PC客户端使用的是 ***1.3.0***,经测试 ***1.2.6+*** 都可以
51
-
52
-#### 关于PC端链接超时或者链接不上的问题以及解决方案
53
-##### 链接不上或者超时
54
-因为server端相对于客户端落后版本,server不会响应客户端的`secure_tcp`请求,所以客户端超时。
55
-相关代码代码位置在`https://github.com/rustdesk/rustdesk/blob/master/src/client.rs#L322`
56
-  ```rust
57
-    if !key.is_empty() && !token.is_empty() {
58
-    // mainly for the security of token
59
-    allow_err!(secure_tcp(&mut socket, key).await);
60
-    }
61
-  ```
62
-  可看到当`key`和`token`都不为空时,会调用`secure_tcp`,但是server端不会响应,所以客户端超时
63
-  `secure_tcp` 代码位置在 `https://github.com/rustdesk/rustdesk/blob/master/src/common.rs#L1203`
64
-  
65
-##### 4种解决方案
66
-1. server端指定key。
67
-    - 优点:简单
68
-    - 缺点:链接不是加密的
69
-       ```bash
70
-       hbbs -r <relay-server-ip[:port]> -k <key>
71
-       hbbr -k <key>
72
-       ```
73
-       比如
74
-       ```bash
75
-         hbbs -r <relay-server-ip[:port]> -k abc1234567
76
-         hbbr -k abc1234567
77
-       ```
78
-2. server端使用系统生成的key,或者自定义的密钥对,但如果client已登录,链接时容易超时或者链接不上,可以退出登录后再链接就可以了,webclient可以不用退出登录
79
-    - 优点:链接加密
80
-    - 缺点:操作麻烦
81
-3. server端使用系统生成的key,或者自定义的密钥对,fork官方客户端的代码将`secure_tcp`修改成直接返回,然后通过`Github Actions`编译,下载编译后的客户端。
82
-参考[官方文档](https://rustdesk.com/docs/en/dev/build/all/)
83
-    - 优点:链接加密,可以自定义客户端一些功能,编译后直接可用
84
-    - 缺点:需要自己fork代码,编译,有点难度
85
-4. 使用[我fork的代码](https://github.com/lejianwen/rustdesk),已经修改了`secure_tcp`,可以直接下载使用,[下载地址](https://github.com/lejianwen/rustdesk/releases)
86
-    - 优点:代码改动可查看,`Github Actions`编译,链接加密,直接下载使用
87
-    - 缺点:可能跟不上官方版本更新
88
-     
89
-***对链接加密要求不高的可以使用`1`,对链接加密要求高的可以使用`3`或`4`***
90
-
91 46
 ## 功能
92 47
 
93 48
 ### API 服务 

+ 0 - 46
README_EN.md

@@ -40,52 +40,6 @@ desktop software that provides self-hosted solutions.
40 40
     - Visitors are remotely to the device via a temporary sharing link
41 41
 - CLI
42 42
     - Reset admin password
43
-## Prerequisites
44
-
45
-### [Rustdesk](https://github.com/rustdesk/rustdesk)
46
-
47
-
48
-#### The PC client uses version ***1.3.0***, and versions ***1.2.6+*** have been tested to work.
49
-
50
-#### Solutions for PC client connection timeout or connection issues
51
-##### Connection issues or timeouts
52
-Because the server version lags behind the client version, the server does not respond to the client's `secure_tcp` request, causing the client to timeout.
53
-  Relevant code can be found at `https://github.com/rustdesk/rustdesk/blob/master/src/client.rs#L322`
54
-  ```rust
55
-    if !key.is_empty() && !token.is_empty() {
56
-    // mainly for the security of token
57
-    allow_err!(secure_tcp(&mut socket, key).await);
58
-    }
59
-  ```
60
-  
61
-As seen, when both `key` and `token` are not empty, `secure_tcp` is called, but the server does not respond, causing the client to timeout.
62
-The `secure_tcp` code is located at `https://github.com/rustdesk/rustdesk/blob/master/src/common.rs#L1203`
63
-
64
-##### Four Solutions
65
-1. Specify the key on the server.
66
-    - Advantage: Simple
67
-    - Disadvantage: The connection is not encrypted
68
-       ```bash
69
-       hbbs -r <relay-server-ip[:port]> -k <key>
70
-       hbbr -k <key>
71
-       ```
72
-      For example
73
-       ```bash
74
-         hbbs -r <relay-server-ip[:port]> -k abc1234567
75
-         hbbr -k abc1234567
76
-       ```
77
-2. Use a system-generated key or a custom key pair on the server. If the client is already logged in, it may timeout or fail to connect. Logging out and reconnecting usually resolves the issue, and the web client does not need to log out.
78
-    - Advantage: Encrypted connection
79
-    - Disadvantage: Complicated operation
80
-3. Use a system-generated key or a custom key pair on the server, fork the official client code to modify `secure_tcp` to return directly, then compile using `Github Actions` and download the compiled client.
81
-   Refer to [official documentation](https://rustdesk.com/docs/en/dev/build/all/)
82
-    - Advantage: Encrypted connection, customizable client features, ready to use after compilation
83
-    - Disadvantage: Requires forking code and compiling, which can be challenging
84
-4. Use [my forked code](https://github.com/lejianwen/rustdesk), which has already modified `secure_tcp`. You can download and use it directly from [here](https://github.com/lejianwen/rustdesk/releases)
85
-    - Advantage: Code changes are viewable, compiled with `Github Actions`, encrypted connection, ready to use
86
-    - Disadvantage: May not keep up with official version updates
87
-   
88
-***If encryption is not a high priority, use `1`. If encryption is important, use `3` or `4`.***
89 43
 
90 44
 ## Overview
91 45