Feature: Transfer a Linux host to another master
The Linux client ignored COMMAND_ASSIGN_MASTER, so a host could not be moved to a different controller the way the Windows client allows. The payload is host:port:days:shine[:transport]; the parsing, record encoding and address application live in a shared header so a macOS client can reuse them unchanged. An assignment only rewrites the connection target. The running session stays up and the next reconnect - a dropped link or a restart - goes to the new master, matching the Windows behaviour. The target and its expiry are stored in a single "transfer" config key, while the address the process started with is kept in memory only: the config's own master/port entries are never overwritten, so restarting mid-transfer still has the original to fall back to. When the expiry passes the client restores that address, clears the key and reconnects. Malformed payloads and zero-day assignments are rejected outright. The way back depends on an expiry time, so honouring a permanent move would strand a host on an address it cannot leave. Give the POSIX connect() a timeout as well (non-blocking connect plus poll, 10 seconds). A blocking connect waiting for SYN retransmission froze the main loop for about two minutes when the port was filtered, delaying both heartbeats and the expiry restore. The transfer state is initialised after daemonize() for the same reason it is logged: logging before the double fork can leave the child deadlocked on the logger mutex. Co-Authored-By: deepseek-flash
This commit is contained in:
1 parent
0b22d5e870
commit
3b3aed50e5
4 files changed
+346
-6
No files matched your search
+56
-3
@@ -11,6 +11,9 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h> // For struct sockaddr_in
|
||||
#include <unistd.h> // For close()
|
||||
#include <fcntl.h> // For fcntl():非阻塞 connect
|
||||
#include <poll.h> // For poll():连接超时
|
||||
#include <errno.h> // For EINPROGRESS/EINTR
|
||||
#include <cstring> // For memset()
|
||||
inline int WSAGetLastError()
|
||||
{
|
||||
@@ -387,6 +390,55 @@ BOOL ConnectWithTimeout(SOCKET sock, SOCKADDR *addr, int timeout_sec=5)
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
#else
|
||||
// POSIX 版超时连接。阻塞 connect() 在 SYN 被静默丢弃时(端口被防火墙 DROP、运营商
|
||||
// 黑洞、出口 ACL 丢包)不回 RST 也不回 ICMP,要等内核重传耗尽(Linux 默认
|
||||
// tcp_syn_retries=6,约 127 秒)才失败。这段时间里主循环完全停摆:到期检查、心跳、
|
||||
// g_bExit 都轮不到执行,「主机转移到期自动回原主控」这类兜底会迟到两分多钟——
|
||||
// 2026-11-07 在 Ubuntu 24.04 上用被公司出口过滤的 6543 端口实测。
|
||||
// 非阻塞 connect + poll,超时即按普通连接失败返回,让上层 5 秒后重试。
|
||||
BOOL ConnectWithTimeout(SOCKET sock, const struct sockaddr* addr, int timeout_sec=10)
|
||||
{
|
||||
int flags = fcntl(sock, F_GETFL, 0);
|
||||
if (flags < 0 || fcntl(sock, F_SETFL, flags | O_NONBLOCK) < 0) {
|
||||
Mprintf("[ERROR] connect: fcntl failed, errno=%d\n", errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
BOOL ok = FALSE;
|
||||
if (connect(sock, addr, sizeof(struct sockaddr_in)) == 0) {
|
||||
ok = TRUE; // 回环/同机端口,立即成功
|
||||
} else if (errno == EINPROGRESS || errno == EINTR) {
|
||||
struct pollfd pfd;
|
||||
pfd.fd = sock;
|
||||
pfd.events = POLLOUT;
|
||||
pfd.revents = 0;
|
||||
int rc;
|
||||
do {
|
||||
rc = poll(&pfd, 1, timeout_sec * 1000);
|
||||
} while (rc < 0 && errno == EINTR); // 信号打断不算失败
|
||||
// 连接失败时 revents 不保证带 POLLOUT(可能只有 POLLERR/POLLHUP),
|
||||
// 三种都当「有结果」处理,再统一从 SO_ERROR 读真正的结果。
|
||||
if (rc > 0 && (pfd.revents & (POLLOUT | POLLERR | POLLHUP))) {
|
||||
// 可写只代表「连接有结果」,失败也要在这里读出来
|
||||
int err = 0;
|
||||
socklen_t len = sizeof(err);
|
||||
ok = (getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &len) == 0 && err == 0);
|
||||
if (!ok) Mprintf("[ERROR] connect: %d\n", err);
|
||||
} else if (rc == 0) {
|
||||
Mprintf("[ERROR] connect timeout after %ds\n", timeout_sec);
|
||||
} else {
|
||||
Mprintf("[ERROR] connect: poll failed, errno=%d\n", errno);
|
||||
}
|
||||
} else {
|
||||
Mprintf("[ERROR] connect: errno=%d\n", errno);
|
||||
}
|
||||
|
||||
// 无论成败都恢复原阻塞标志:失败后 socket 会被关闭,成功时后续 recv/TLS 握手
|
||||
// 必须回到阻塞语义,否则接收线程会在 EAGAIN 上空转。
|
||||
fcntl(sock, F_SETFL, flags);
|
||||
return ok;
|
||||
}
|
||||
#endif
|
||||
|
||||
BOOL IOCPClient::ConnectServer(const char* szServerIP, unsigned short uPort)
|
||||
@@ -435,9 +487,10 @@ BOOL IOCPClient::ConnectServer(const char* szServerIP, unsigned short uPort)
|
||||
return false;
|
||||
}
|
||||
|
||||
// 连接到服务器
|
||||
if (connect(m_sClientSocket, (struct sockaddr*)&m_ServerAddr, sizeof(m_ServerAddr)) == -1) {
|
||||
Mprintf("Connection failed\n");
|
||||
// 连接到服务器(带超时:阻塞 connect 在 SYN 被丢弃时要等内核重传耗尽,
|
||||
// 期间主循环的心跳与到期检查全都停摆,见 ConnectWithTimeout 注释)
|
||||
if (!ConnectWithTimeout(m_sClientSocket, (struct sockaddr*)&m_ServerAddr)) {
|
||||
Mprintf("Connection failed: %s:%d\n", m_sCurIP.c_str(), (int)port);
|
||||
close(m_sClientSocket);
|
||||
m_sClientSocket = -1; // 标记套接字无效
|
||||
return false;
|
||||
|
||||
@@ -0,0 +1,153 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include "commands.h"
|
||||
|
||||
// ============== 主机转移(COMMAND_ASSIGN_MASTER)的跨平台公共部分 ==============
|
||||
//
|
||||
// 服务端「转移主机」下发的载荷是 host:port:days:shine[:transport](见
|
||||
// server/2015Remote/2015RemoteDlg.cpp assignFunction)。内核部分在
|
||||
// client/KernelManager.cpp 的 Windows 实现里。Linux / macOS 客户端共用这里的
|
||||
// 解析、记录编解码和地址应用,平台侧只需要:
|
||||
// 启动:CaptureEndpoint(g_SETTINGS) 存下原主控 → 读配置记录 → 未过期就 ApplyTarget
|
||||
// 收包:ParseAssignCommand() → 写配置记录 + 交给主线程 ApplyTarget
|
||||
// 心跳:now > validTo 时 ApplyEndpoint(原主控) 并重连
|
||||
//
|
||||
// 注意 CONNECT_ADDRESS 不参与跨线程同步(ServerIP() 读的时候还会就地解密),
|
||||
// ApplyTarget/ApplyEndpoint 只能在连接生命周期的持有线程(主循环)调用。
|
||||
namespace HostTransfer {
|
||||
|
||||
// 一个连接端点。transport/headerEnc 为 -1 表示「不改变现有值」。
|
||||
struct Endpoint {
|
||||
std::string ip;
|
||||
int port;
|
||||
int transport; // PROTO_TCP / PROTO_WS / PROTO_WSS
|
||||
int headerEnc; // PROTOCOL_SHINE / PROTOCOL_HELL(Windows 头加密变体)
|
||||
|
||||
Endpoint() : port(0), transport(-1), headerEnc(-1) {}
|
||||
};
|
||||
|
||||
// 一条转移记录:目标端点 + 到期时间(unix 秒)。
|
||||
struct Target {
|
||||
Endpoint ep;
|
||||
long long validTo; // <= 0 表示无效
|
||||
|
||||
Target() : validTo(0) {}
|
||||
bool Valid() const { return !ep.ip.empty() && ep.port > 0 && validTo > 0; }
|
||||
bool Active(long long now) const { return Valid() && now <= validTo; }
|
||||
};
|
||||
|
||||
// 只认合法值。atoi 对非法串返回 0(正是 PROTO_TCP),不校验就会把一条本该走
|
||||
// WSS 的链路静默降级成明文直连;headerEnc 同理由服务端决定,不能随意采信。
|
||||
inline bool ParseTransport(const std::string& s, int& out)
|
||||
{
|
||||
if (s != std::to_string(PROTO_TCP) && s != std::to_string(PROTO_WS)
|
||||
&& s != std::to_string(PROTO_WSS))
|
||||
return false;
|
||||
out = atoi(s.c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
inline bool ParseHeaderEnc(const std::string& s, int& out)
|
||||
{
|
||||
if (s != std::to_string(PROTOCOL_SHINE) && s != std::to_string(PROTOCOL_HELL))
|
||||
return false;
|
||||
out = atoi(s.c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
// 解析一条完整的 COMMAND_ASSIGN_MASTER 命令体(buf[0]=命令,buf[1]=转移类型)。
|
||||
// now 由调用方传入,便于测试和统一时间口径。days <= 0 视为无效:服务端只有在
|
||||
// 天数 > 0 时才写 valid_to,零天数的记录在 Windows 侧同样不会生效。
|
||||
inline bool ParseAssignCommand(const unsigned char* buf, unsigned long len,
|
||||
long long now, Target& out)
|
||||
{
|
||||
if (buf == NULL || len < 3)
|
||||
return false;
|
||||
if (buf[0] != COMMAND_ASSIGN_MASTER || buf[1] != SHARE_TYPE_YAMA_FOREVER)
|
||||
return false;
|
||||
|
||||
// 服务端发的是整块 sizeof(bToken) 缓冲,尾部零填充;先按 ulLength 截取,
|
||||
// 再在第一个 NUL 处截断,两个边界都守住才不会读到缓冲区外。
|
||||
std::string payload((const char*)buf + 2, (size_t)len - 2);
|
||||
size_t nul = payload.find('\0');
|
||||
if (nul != std::string::npos)
|
||||
payload.resize(nul);
|
||||
|
||||
auto v = StringToVector(payload, ':', 5);
|
||||
Target t;
|
||||
t.ep.ip = v[0];
|
||||
t.ep.port = atoi(v[1].c_str());
|
||||
if (t.ep.ip.empty() || t.ep.port <= 0 || t.ep.port > 65535)
|
||||
return false;
|
||||
|
||||
double days = atof(v[2].c_str());
|
||||
if (days <= 0)
|
||||
return false;
|
||||
t.validTo = now + (long long)(days * 86400.0);
|
||||
|
||||
if (!v[3].empty())
|
||||
ParseHeaderEnc(v[3], t.ep.headerEnc); // 非法值保持 -1:沿用现有设置
|
||||
if (!v[4].empty())
|
||||
ParseTransport(v[4], t.ep.transport);
|
||||
out = t;
|
||||
return true;
|
||||
}
|
||||
|
||||
// 持久化为单行:ip:port:transport:headerEnc:valid_to
|
||||
// 单键存储让平台侧只需定义「键名」和「存哪里」两件事,macOS 后续可直接复用。
|
||||
inline std::string EncodeRecord(const Target& t)
|
||||
{
|
||||
return t.ep.ip + ":" + std::to_string(t.ep.port) + ":" +
|
||||
std::to_string(t.ep.transport) + ":" +
|
||||
std::to_string(t.ep.headerEnc) + ":" +
|
||||
std::to_string(t.validTo);
|
||||
}
|
||||
|
||||
inline bool DecodeRecord(const std::string& s, Target& out)
|
||||
{
|
||||
if (s.empty())
|
||||
return false;
|
||||
auto v = StringToVector(s, ':', 5);
|
||||
Target t;
|
||||
t.ep.ip = v[0];
|
||||
t.ep.port = atoi(v[1].c_str());
|
||||
ParseTransport(v[2], t.ep.transport);
|
||||
ParseHeaderEnc(v[3], t.ep.headerEnc);
|
||||
t.validTo = atoll(v[4].c_str());
|
||||
if (!t.Valid())
|
||||
return false;
|
||||
out = t;
|
||||
return true;
|
||||
}
|
||||
|
||||
// 把端点写进连接参数。只在连接生命周期的持有线程调用(见文件头注释)。
|
||||
inline void ApplyEndpoint(CONNECT_ADDRESS& conn, const Endpoint& ep)
|
||||
{
|
||||
if (ep.ip.empty() || ep.port <= 0)
|
||||
return;
|
||||
conn.SetServer(ep.ip.c_str(), ep.port);
|
||||
if (ep.transport >= 0)
|
||||
conn.protoType = (char)ep.transport;
|
||||
if (ep.headerEnc >= 0)
|
||||
conn.iHeaderEnc = ep.headerEnc;
|
||||
}
|
||||
|
||||
inline void ApplyTarget(CONNECT_ADDRESS& conn, const Target& t)
|
||||
{
|
||||
ApplyEndpoint(conn, t.ep);
|
||||
}
|
||||
|
||||
// 记下当前连接参数作为「原主控」,转移过期后靠它恢复。
|
||||
inline Endpoint CaptureEndpoint(CONNECT_ADDRESS& conn)
|
||||
{
|
||||
Endpoint ep;
|
||||
ep.ip = conn.ServerIP();
|
||||
ep.port = conn.ServerPort();
|
||||
ep.transport = (int)(unsigned char)conn.protoType;
|
||||
ep.headerEnc = conn.iHeaderEnc;
|
||||
return ep;
|
||||
}
|
||||
|
||||
} // namespace HostTransfer
|
||||
@@ -29,6 +29,7 @@ SimpleRemoter 的 Linux 客户端,支持远程桌面、远程终端、文件
|
||||
| 屏幕预览(缩略图) | `ScreenPreview.cpp` | `client/ScreenPreview.cpp` | ✅ 完整(X11 抓屏 → 缩放 → 原始 BGRA 上报,由服务端统一编码 JPEG;双击预览、列表缩略图、MCP `get_screenshot` 均可用。无 `DISPLAY` 时不声明能力位,服务端不会发请求) |
|
||||
| V2 文件传输 | `FileTransferV2.h` | `file_upload.h` | ✅ 服务端↔Linux(含 MCP `upload_file`/`download_file`:发送完成包带流式 SHA-256,路径不存在/无权限回 `TOKEN_DOWNLOAD_ERROR`) |
|
||||
| C2C 文件接收 | `FileTransferV2.h` | `file_upload.h` | ✅ Windows/MCP → Linux(目标目录由服务端 `dst_dir` 指定,落盘后回执) |
|
||||
| 主机转移 | `common/host_transfer.h` + main.cpp | `KernelManager.cpp` | ✅ 完整(`COMMAND_ASSIGN_MASTER`,重连生效;到期自动回原主控。主机分享未实现) |
|
||||
| 配置持久化 | `LinuxConfig` | INI 文件 | ✅ 完整 |
|
||||
| MCP 远程管理 | 复用 `SystemManager.h` / `PTYHandler.h` / `ScreenHandler.h` | 服务端 MCP | ✅ 档 1:`kill_process`、`exec_command`、`terminal_open/exec/close`、`remote_open/close/mouse/keyboard/clipboard`(服务端放开门禁,客户端协议本已实现) |
|
||||
|
||||
@@ -211,6 +212,22 @@ Windows 客户端的同名命令没有摘要(走内存加载器/更新器)
|
||||
|
||||
回滚:把 `ghost.old` 拷回 `ghost` 并重启即可(它会在下次升级时被覆盖)。
|
||||
|
||||
## 主机转移
|
||||
|
||||
服务端选中一台主机后点「转移主机」,选目标主控和有效天数,客户端会:
|
||||
|
||||
1. 把目标写进 `~/.config/ghost/config.conf` 的 `transfer` 键(`ip:port:transport:shine:valid_to`);
|
||||
2. **不立刻断开**,当前连接照常维持,下一次重连(断线重连、客户端重启)才连到新主控;
|
||||
3. 过了有效天数自动回到转移前的原主控——原地址只记在内存里(启动参数或编译期默认),
|
||||
不写回配置,所以重启后仍然有效。
|
||||
|
||||
注意事项:
|
||||
|
||||
- 目标是永久转移(天数填 0)时客户端会拒绝,避免把主机改到一个不可达的地址后无法回退;
|
||||
- 有效期内重复下发会被忽略(与 Windows 客户端一致);
|
||||
- 转移期间切换传输方式(明文 / WS / WSS)会跟随服务端下发的 `transport` 段;
|
||||
- 只想把主机要回来,直接把 `transfer` 键清空并重启客户端即可。
|
||||
|
||||
## 常见问题
|
||||
|
||||
### Q: 远程桌面功能不工作
|
||||
@@ -313,6 +330,7 @@ loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type
|
||||
| `PublicIP` | 公网 IP 缓存 | `1.2.3.4` |
|
||||
| `GeoLocation` | 地理位置缓存 | `北京市` |
|
||||
| `QualityLevel` | 屏幕质量等级 | `2` (Good / H264 1080P) |
|
||||
| `transfer` | 主机转移记录(空 = 未转移),见「主机转移」 | `1.2.3.4:443:6:0:1790000000` |
|
||||
|
||||
### 质量等级说明
|
||||
|
||||
|
||||
+119
-3
@@ -10,6 +10,7 @@
|
||||
#include <thread>
|
||||
#include <fcntl.h>
|
||||
#include <atomic>
|
||||
#include <mutex>
|
||||
#include <cerrno>
|
||||
#include <csignal>
|
||||
#include <sys/wait.h>
|
||||
@@ -39,6 +40,7 @@
|
||||
#include "common/client_auth_state.h"
|
||||
#include "common/posix_net_helpers.h"
|
||||
#include "common/sub_conn_thread.h"
|
||||
#include "common/host_transfer.h"
|
||||
#include "LinuxConfig.h"
|
||||
#include <openssl/evp.h>
|
||||
#include <cctype>
|
||||
@@ -58,6 +60,17 @@ static std::atomic<bool> g_needResendLogin(false); // 分组变更后需要重
|
||||
// 由主心跳循环择机 Disconnect 并重连。
|
||||
static std::atomic<bool> g_needReconnect(false);
|
||||
|
||||
// ============== 主机转移(COMMAND_ASSIGN_MASTER)==============
|
||||
// 服务端「转移主机」把目标写进 config.conf 的 transfer 键,之后每次重连都连新主控;
|
||||
// valid_to 到期后恢复本进程启动时的原主控。原主控只存在内存里(argv 或编译期默认),
|
||||
// 不能写回配置——恢复时读到的若还是转移目标,就成了原地打转。
|
||||
// 解析/编解码/地址应用在 common/host_transfer.h(macOS 客户端可直接复用)。
|
||||
static HostTransfer::Endpoint g_transferOrig; // 启动时的主控,过期恢复用
|
||||
static std::atomic<long long> g_transferValidTo(0); // >0 = 处于转移状态(到期时刻)
|
||||
static std::atomic<bool> g_transferPending(false); // 接收线程已写下新目标,待主循环应用
|
||||
static std::mutex g_transferMu; // 保护 g_transferPendingTarget
|
||||
static HostTransfer::Target g_transferPendingTarget;
|
||||
|
||||
// 自升级(COMMAND_UPDATE):fork+execv 重启自己时需要原始命令行,
|
||||
// 失败回报需要主连接(DataProcess 的 user 参数为 NULL,只能靠全局)。
|
||||
static int g_argc = 0;
|
||||
@@ -466,6 +479,65 @@ static void ApplyTlsAnchorChange(void* user)
|
||||
user, after ? "TLS" : "plaintext");
|
||||
}
|
||||
|
||||
// ============== 主机转移(COMMAND_ASSIGN_MASTER)==============
|
||||
|
||||
// 启动时读取转移记录:未过期就把连接地址改成转移目标(与 Windows
|
||||
// ClientDll.cpp StartClient 的启动处理一致)。必须在 daemonize 之后调用(见 main()
|
||||
// 里的说明),启动日志里打印的就是本次实际要连的地址。
|
||||
static void InitTransferState()
|
||||
{
|
||||
g_transferOrig = HostTransfer::CaptureEndpoint(g_SETTINGS);
|
||||
|
||||
LinuxConfig cfg;
|
||||
HostTransfer::Target t;
|
||||
long long now = (long long)time(nullptr);
|
||||
if (!HostTransfer::DecodeRecord(cfg.GetStr("transfer"), t))
|
||||
return;
|
||||
if (!t.Active(now)) {
|
||||
Mprintf("Transfer record already expired (%lld), ignored\n", t.validTo);
|
||||
return;
|
||||
}
|
||||
HostTransfer::ApplyTarget(g_SETTINGS, t);
|
||||
g_transferValidTo.store(t.validTo);
|
||||
Mprintf("Transfer active: %s:%d (transport=%d), %llds left\n",
|
||||
t.ep.ip.c_str(), t.ep.port, t.ep.transport, t.validTo - now);
|
||||
}
|
||||
|
||||
// 把接收线程记下的目标应用到全局连接参数。只在主线程调用:CONNECT_ADDRESS 没有
|
||||
// 跨线程同步,ConnectServer 读的就是它。只改地址、不主动断开——与 Windows 一致,
|
||||
// 下一次重连才生效。
|
||||
static void ApplyPendingTransfer()
|
||||
{
|
||||
if (!g_transferPending.load(std::memory_order_acquire))
|
||||
return;
|
||||
HostTransfer::Target t;
|
||||
{
|
||||
std::lock_guard<std::mutex> lk(g_transferMu);
|
||||
t = g_transferPendingTarget;
|
||||
g_transferPending.store(false, std::memory_order_release);
|
||||
}
|
||||
HostTransfer::ApplyTarget(g_SETTINGS, t);
|
||||
long long left = t.validTo - (long long)time(nullptr);
|
||||
Mprintf(">>> Transfer armed: next reconnect -> %s:%d (transport=%d), %llds left\n",
|
||||
t.ep.ip.c_str(), t.ep.port, t.ep.transport, left);
|
||||
}
|
||||
|
||||
// 转移到期:恢复原主控并重连。目标不可达时这是唯一的退路;days=0 的永久转移
|
||||
// 没有到期时间,也就没有这条退路——与 Windows 行为一致。
|
||||
static void CheckTransferExpiry()
|
||||
{
|
||||
long long validTo = g_transferValidTo.load(std::memory_order_relaxed);
|
||||
if (validTo <= 0 || (long long)time(nullptr) <= validTo)
|
||||
return;
|
||||
g_transferValidTo.store(0, std::memory_order_relaxed);
|
||||
HostTransfer::ApplyEndpoint(g_SETTINGS, g_transferOrig);
|
||||
LinuxConfig cfg;
|
||||
cfg.SetStr("transfer", ""); // 记录作废,重启后也不会再回到已过期的目标
|
||||
g_needReconnect.store(true, std::memory_order_relaxed);
|
||||
Mprintf(">>> Transfer expired: restoring %s:%d\n",
|
||||
g_transferOrig.ip.c_str(), g_transferOrig.port);
|
||||
}
|
||||
|
||||
int DataProcess(void* user, PBYTE szBuffer, ULONG ulLength)
|
||||
{
|
||||
if (szBuffer == nullptr || ulLength == 0)
|
||||
@@ -616,6 +688,35 @@ int DataProcess(void* user, PBYTE szBuffer, ULONG ulLength)
|
||||
} else {
|
||||
Mprintf("** [%p] TLS trust anchor removal: %s ***\n", user, err.c_str());
|
||||
}
|
||||
} else if (szBuffer[0] == COMMAND_ASSIGN_MASTER) {
|
||||
// 「转移主机」:host:port:days:shine[:transport],解析见 common/host_transfer.h。
|
||||
// 载荷非法时什么都不做——绝不能把脏数据当成有效转移,否则一台上线中的主机会
|
||||
// 被改到一个不存在的地址上去。
|
||||
HostTransfer::Target t;
|
||||
long long now = (long long)time(nullptr);
|
||||
if (!HostTransfer::ParseAssignCommand(szBuffer, ulLength, now, t)) {
|
||||
Mprintf("** [%p] ASSIGN: malformed payload, ignored ***\n", user);
|
||||
return TRUE;
|
||||
}
|
||||
// 有效期内重复下发忽略(与 Windows KernelManager 的 now <= valid_to 判断一致)。
|
||||
// 用原子变量而不是再读一次配置:状态以本进程为准,避免和主线程的写入交错。
|
||||
long long active = g_transferValidTo.load(std::memory_order_relaxed);
|
||||
if (now <= active) {
|
||||
Mprintf("** [%p] ASSIGN to %s:%d ignored: already assigned until %lld ***\n",
|
||||
user, t.ep.ip.c_str(), t.ep.port, active);
|
||||
return TRUE;
|
||||
}
|
||||
{
|
||||
std::lock_guard<std::mutex> lk(g_transferMu);
|
||||
g_transferPendingTarget = t;
|
||||
g_transferPending.store(true, std::memory_order_release);
|
||||
}
|
||||
// 先挡住后续重复下发,再落盘:落盘失败也不至于被第二条命令覆盖。
|
||||
g_transferValidTo.store(t.validTo, std::memory_order_relaxed);
|
||||
LinuxConfig cfg;
|
||||
cfg.SetStr("transfer", HostTransfer::EncodeRecord(t));
|
||||
Mprintf("** [%p] ASSIGN to %s:%d for %llds, applying on next reconnect ***\n",
|
||||
user, t.ep.ip.c_str(), t.ep.port, t.validTo - now);
|
||||
} else if (szBuffer[0] == COMMAND_UPDATE) {
|
||||
// 服务端"升级程序"菜单下发新版本 ELF
|
||||
Mprintf("** [%p] Received 'UPDATE' command (%u bytes) ***\n", user, (unsigned)ulLength);
|
||||
@@ -1247,6 +1348,12 @@ int main(int argc, char* argv[])
|
||||
// 写 PID 文件(守护进程模式下 PID 已变为子进程的)
|
||||
writePidFile();
|
||||
|
||||
// 上次的「转移主机」还没到期就改连目标主控(原地址记在内存里,过期后恢复)。
|
||||
// 必须在 daemonize() 之后:它在有记录时会打日志,而 fork 时若日志线程正持有
|
||||
// 内部锁,子进程会永远卡在那把锁上(实测 -d 启动后只剩一行 fork 前的日志,
|
||||
// 父子进程都停在 futex)。fork 之前一律不碰 Logger。
|
||||
InitTransferState();
|
||||
|
||||
Mprintf("Server: %s:%d (PID: %d%s)\n",
|
||||
g_SETTINGS.ServerIP(), g_SETTINGS.ServerPort(),
|
||||
getpid(), daemon_mode ? ", daemon" : "");
|
||||
@@ -1381,13 +1488,18 @@ int main(int argc, char* argv[])
|
||||
ClientObject->setManagerCallBack(NULL, DataProcess, NULL);
|
||||
// 不传 conn 的构造路径拿不到注入的 CONNECT_ADDRESS,协议只能显式喂进去:否则哪怕
|
||||
// g_SETTINGS.protoType 配成 WS/WSS,也会静默按明文 TCP 直连(日志里一个字都没有)。
|
||||
ClientObject->SetDefaultProto((int)(unsigned char)g_SETTINGS.protoType);
|
||||
// 喂动作在循环内(见下):转移/到期恢复都会改传输方式,只喂一次会按旧协议重连。
|
||||
if (g_SETTINGS.protoType == PROTO_WS || g_SETTINGS.protoType == PROTO_WSS) {
|
||||
Mprintf("[WS] 按配置的传输协议连接: proto=%d(WSS 需要 TLS 支持,不支持的平台会 fail-closed)\n",
|
||||
(int)(unsigned char)g_SETTINGS.protoType);
|
||||
}
|
||||
g_pMainClient = ClientObject.get(); // 自升级失败回报用
|
||||
while (!g_bExit) {
|
||||
// 转移目标要在用之前应用;上一次重连留下的「请断开」标志在此已无意义
|
||||
ApplyPendingTransfer();
|
||||
CheckTransferExpiry();
|
||||
g_needReconnect.store(false, std::memory_order_relaxed);
|
||||
ClientObject->SetDefaultProto((int)(unsigned char)g_SETTINGS.protoType);
|
||||
clock_t c = clock();
|
||||
if (!ClientObject->ConnectServer(g_SETTINGS.ServerIP(), g_SETTINGS.ServerPort())) {
|
||||
Sleep(5000);
|
||||
@@ -1427,15 +1539,19 @@ int main(int argc, char* argv[])
|
||||
// 等待心跳间隔(每秒检查一次退出条件,保证及时响应)
|
||||
int interval = g_heartbeatInterval > 0 ? g_heartbeatInterval : 30;
|
||||
for (int i = 0; i < interval; ++i) {
|
||||
// 转移生效只改地址(下次重连才用),到期则改回原主控并置重连标志
|
||||
ApplyPendingTransfer();
|
||||
CheckTransferExpiry();
|
||||
if (g_needReconnect.load(std::memory_order_relaxed))
|
||||
break;
|
||||
if (!ClientObject->IsRunning() || !ClientObject->IsConnected() || g_bExit != S_CLIENT_NORMAL)
|
||||
break;
|
||||
Sleep(1000);
|
||||
}
|
||||
// 信任锚热切换(COMMAND_TLS_ENABLE/DISABLE):断开后由外层循环用新传输方式重连。
|
||||
// 信任锚热切换(COMMAND_TLS_ENABLE/DISABLE)与转移到期都会置这个标志:
|
||||
// 断开后由外层循环用新地址、新传输方式重连。
|
||||
if (g_needReconnect.exchange(false)) {
|
||||
Mprintf(">>> Reconnecting to apply the TLS transport change\n");
|
||||
Mprintf(">>> Reconnecting to apply the address/transport change\n");
|
||||
ClientObject->Disconnect();
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user