Add COMMAND_SHARE (SHARE_TYPE_YAMA) with the Windows semantics: the record goes into share_list and a second connection is opened to the target master while the main link stays where it is. main()'s connection state is all global, so each record is served by a forked "--share <entry>" child that reuses the whole login, heartbeat and command path; the parent only starts, tracks and reaps them. COMMAND_SHARE_CANCEL clears the list and stops the children right away (Linux can; Windows does it on the next start). Transfer now opens its connection immediately too, matching the Windows fallthrough that spawns a shared instance, and that temporary connection is dropped once the main link has actually moved to the target or when the transfer expires. common/host_endpoint.h holds the ip/port/shine/transport word list the two commands share; common/host_share.h holds the share payload, share_list encoding and the per-master dedup. Config writes now take a cross-process flock and replace the file by rename. The parent and every child write the same config.conf from their own snapshot, and a truncating overwrite could drop the other side's keys. Children ignore the commands that only mean something on the main link: share, transfer, upgrade, TLS anchor and group. Verified in WSL against fake masters: share start, cancel and restore, re-sharing with a different transport, share plus transfer on one master, and the transfer child disappearing after the main link moved. Co-Authored-By: deepseek-flash
70 lines
2.4 KiB
C++
70 lines
2.4 KiB
C++
#pragma once
|
||
#include <string>
|
||
#include <cstdlib>
|
||
#include "commands.h"
|
||
|
||
// ============== 主控端点的跨平台公共部分 ==============
|
||
//
|
||
// 「转移主机」和「分享主机」下发的是同一个概念:一个 ip:port,外加可选的
|
||
// Shine/HELL 头加密变体和传输方式(明文 / WS / WSS)。这段词表与具体命令无关,
|
||
// 单独放在这里,Linux 和 macOS 客户端的两个命令都复用(见 host_transfer.h、
|
||
// host_share.h)。
|
||
//
|
||
// 注意 CONNECT_ADDRESS 不参与跨线程同步(ServerIP() 读的时候还会就地解密),
|
||
// ApplyEndpoint/CaptureEndpoint 只能在连接生命周期的持有线程(主循环)调用。
|
||
namespace HostEndpoint {
|
||
|
||
// 一个连接端点。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) {}
|
||
};
|
||
|
||
// 只认合法值。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;
|
||
}
|
||
|
||
// 把端点写进连接参数。只在连接生命周期的持有线程调用(见文件头注释)。
|
||
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 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 HostEndpoint
|