Feature: transfer a Go-managed host to the MFC master from the web console

A Go-managed host cannot receive the client upgrade that only the MFC master
can push. Transfer moves its main link there and brings it back after N days;
MFC has no reason to return it.

Transfer is not share: ASSIGN writes the target and drops the current
connection, so the old master sees the host go offline and the new master gets
a normal main link it can remote control and upgrade. While a transfer is live
the client refuses a second transfer and any share, so no host is handed to a
third master that expiry would orphan.

Server: admin-only `transfer_device` WS command, COMMAND_ASSIGN_MASTER +
SHARE_TYPE_YAMA_FOREVER as `host:port:days::transport\0`, byte-compatible with
the MFC dialog. The transport segment is always present (YAMA_TRANSFER_TRANSPORT,
default 0/TCP) because clients keep their current link when it is missing: a
WSS-managed host would otherwise retry WSS against the MFC master's raw TCP
port and never connect. The empty shine segment keeps the host's header
encryption. The button only renders when `device_list.transfer` is present,
which MFC never sends, so no MFC change is needed. devicehistory keeps
transfer_to/transfer_until for the card badge and drops the marker on expiry or
on a fresh login here.

Client: KernelManager.cpp writes the registry and disconnects; ClientDll.cpp
re-reads the registry at the top of every reconnect, so a mid-session transfer
lands on the next round. Expiry is checked before every connect attempt as well
as inside the heartbeat loop, so an unreachable target cannot pin the host to
an expired address until a restart; restoring rebuilds the link captured on
entry (address, header encryption, transport). linux/main.cpp applies the
transfer on the main loop and restores the captured endpoint at expiry; Android
does the same; macOS has neither share nor transfer.
This commit is contained in:
yuanyuanxiang committed 2026-11-20 12:23:08 +01:00
1 parent b466f568ab
commit 63c7cdf588
18 files changed
+1024 -177

No files matched your search

+42 -18
View File
@@ -1368,7 +1368,21 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
break;
auto now = time(nullptr);
auto valid_to = atoi(m_cfg->GetStr("settings", "valid_to").c_str());
if (now <= valid_to) break; // Avoid assign again
if (now <= valid_to) {
// 转移期间不接受第二次转移:主机此刻只连着新主控,它无权再改归属,
// 否则到期按原主控复原时中间那一跳就成了谁也不认的孤儿。
Mprintf("Assign ignored: already assigned until %lld\n", (long long)valid_to);
ClientMsg msg("转移主机", "Host is already transferred, ignored");
SendData((LPBYTE)&msg, sizeof(msg));
break;
}
// 先校验天数再落盘:天数非法时一个键都不改,避免留下「master 换了但
// 没有 valid_to」的半截记录(重启后 assigned 为假,地址却已经变了)。
float days = atof(v[2].c_str());
if (days <= 0) {
Mprintf("Assign ignored: invalid days '%s'\n", v[2].c_str());
break;
}
m_cfg->SetStr("settings", "master", v[0]);
m_cfg->SetStr("settings", "port", v[1]);
if (shareProto == PROTOCOL_SHINE || shareProto == PROTOCOL_HELL)
@@ -1379,12 +1393,19 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
m_cfg->SetStr("settings", "master_transport", std::to_string(shareTransport));
else
m_cfg->SetStr("settings", "master_transport", "");
float days = atof(v[2].c_str());
if (days > 0) {
auto valid_to = time(0) + days*86400;
// overflow after 2038-01-19
m_cfg->SetStr("settings", "valid_to", std::to_string(valid_to));
}
auto valid_to_new = (long long)(time(0) + days*86400);
// overflow after 2038-01-19
m_cfg->SetStr("settings", "valid_to", std::to_string(valid_to_new));
// 真转移:断开当前主控,主连接立刻连到新主控(旧主控上这台主机随即
// 离线)。不另起分享实例——那只是「分享」,新主控拿到的是一条不能
// 升级、也不真正属于它的旁路连接。新地址由 StartClient 的重连循环
// 在下一轮开头从注册表应用(CONNECT_ADDRESS 不参与跨线程同步,
// 不能在收包线程里改)。
Mprintf("Assign to %s:%s for %llds, moving the main link now\n",
v[0].c_str(), v[1].c_str(), (long long)days*86400);
if (m_ClientObject)
m_ClientObject->Disconnect();
break;
}
case SHARE_TYPE_YAMA: {
// 目标键(host:port)只解析一次,share_list 归并与实例登记共用。
@@ -1397,6 +1418,15 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
SendData((LPBYTE)&msg, sizeof(msg));
break;
}
// 转移期间不接受分享:主机此刻只连着新主控,新主控无权再把它分出去。
// 放行的话,到期按原主控复原后这条分享连接还挂在别处,等于凭空多出
// 一条谁也不认的链路(Linux 客户端同样拒绝)。
if (time(0) <= atoi(m_cfg->GetStr("settings", "valid_to").c_str())) {
Mprintf("Share ignored: host is transferred\n");
ClientMsg msg("分享主机", "Host is transferred, sharing is not allowed");
SendData((LPBYTE)&msg, sizeof(msg));
break;
}
if (targetKey.empty())
break;
auto share = targetKey;
@@ -1437,17 +1467,11 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
break;
}
// 登记后起线程。同一目标只留一条连接(与 Linux 的 SpawnManagedChild
// 一致):分享要顶掉同目标上的旧分享,以及会被长期分享接管的转移临时
// 连接;转移目标已有分享实例时不再多连一条,否则同一 clientID 互踢。
const bool transfer = szBuffer[1] == SHARE_TYPE_YAMA_FOREVER;
if (transfer && HasSharedInstanceForTarget(targetKey, SHARED_KIND_SHARE)) {
Mprintf("Transfer target %s already reachable via a share instance; extra connection skipped\n",
targetKey.c_str());
break;
}
// 一致):重复下发同一目标只替换记录,旧连接先停掉再起新的,否则同一
// clientID 会有两条连接互相踢。
StopSharedInstancesForTarget(targetKey);
auto a = NewClientStartArg((char*)szBuffer + 2, IsSharedRunning, TRUE, shareProto, shareTransport);
StartSharedClient(a, transfer ? SHARED_KIND_TRANSFER : SHARED_KIND_SHARE, targetKey);
StartSharedClient(a, SHARED_KIND_SHARE, targetKey);
break;
}
case SHARE_TYPE_HOLDINGHANDS:
@@ -1460,8 +1484,8 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
int stopped = 0;
if (m_ClientApp->IsMainInstance()) {
m_cfg->SetStr("settings", "share_list", "");
// 分享实例是同进程里的线程,停掉后连接立即断开;转移顺带起的那条
// (SHARED_KIND_TRANSFER) 不动,取消分享撤销不了转移。
// 分享实例是同进程里的线程,停掉后连接立即断开。取消分享只停分享实例,
// 撤销不了转移(转移改的是主连接自己连的地址,不涉及分享线程)。
stopped = StopSharedInstances(SHARED_KIND_SHARE);
Mprintf("Share cancel: stopping %d share instance(s)\n", stopped);
}