Fix: Make the WebSocket transport reachable and bounded on every platform
The POSIX clients were built without a connection config - Linux, macOS and Android all construct IOCPClient without the injected CONNECT_ADDRESS - so ConnectServer saw protoType -1 and quietly dialled the master port in plain TCP. Setting protoType to WS in their settings did nothing and logged nothing, and since CLIENT_CAP_PROTO_SWITCH is Windows-only the server could not move them either. Give the client a SetDefaultProto() for that construction path and call it from all three mains before the reconnect loop, with a one-shot log when neither a conn nor a default protocol is available so the silent fallback becomes visible next time. Bound what a peer can make the client read. ReadHeader accepted the 8-byte extended length and rejected only the sign bit, so a frame length of nearly 2^63 kept the connection streaming into a frame that would never end - alive but never delivering another packet. Cap single frames at 256 MB, the same value ServerWsSession already applies to client frames, and drop the connection past it; real traffic is far below that. Stop Reset() from writing the receive thread's frame state. Disconnect() can run from the heartbeat or command thread, not just the receive thread, so Reset() now only flips the atomic ready flag and a new ResetFrames() clears m_remaining, m_masked and m_maskPos from Handshake() alone, before the receive thread starts reading the socket. Those fields keep a single owner without adding a lock to the receive hot path. Finish a dead WS session instead of leaving it to the keepalive timer. When the session had closed but wsState was still WS_Ready, sends were dropped and nothing woke the pending recv, so a peer that closed and then went quiet held the context for the 3-minute keepalive. shutdown() the socket there so the recv returns zero bytes and the normal -2 teardown runs; RemoveStaleContext would deadlock against the caller's own IoRefCount and can hand back a reused context. That shutdown only finishes the connection if a zero-byte read still tears it down, and on the plain path it no longer did. DispatchPlain answers an empty buffer with "handled", so a peer's FIN left the connection in CLOSE_WAIT until keepalive - holding an IOCP context, a pending WSARecv and a rate-limit slot - where the pre-WS code called ParseReceivedData and tore down at once. Restore that teardown on the TLS_Plain branch, matching the other two. Checked against a Debug server: a plain socket that half-closes used to sit in CLOSE_WAIT with the peer's recv timing out, and now disappears immediately with recv returning zero. Two smaller cleanups from the same review. Give the WS upgrade its own prefix buffer (wsPreClassify) instead of borrowing the TLS sniffer's, which was serially reused for two state machines and read as if it were one. And stop deriving the build dialog's protoType from the combo box index: items now carry the protocol value as item data, keyed off the index AddString returns, so inserting an option in the middle can no longer write the wrong number into the generated client without any error. ApplyProtoSwitch loses its bool return, which contradicted its own side effects and was ignored by every caller. Co-Authored-By: deepseek-flash
This commit was merged in pull request #5.
This commit is contained in:
1 parent
50a489e316
commit
46f4bf2dfb
12 files changed
+149
-38
No files matched your search
@@ -1258,6 +1258,16 @@ BOOL IOCPServer::OnClientReceiving(PCONTEXT_OBJECT ContextObject, DWORD dwTrans
|
||||
}
|
||||
|
||||
// TLS_Plain:明文直通(原路径)。WS 连接在这里先解帧。
|
||||
// dwTrans == 0 是对端干净关闭(FIN)。WS 改造前这条分支直接调 ParseReceivedData,
|
||||
// 它对 dataLen == 0 返回 FALSE 从而拆连接;换成 DispatchPlain 后该语义丢了——0 字节
|
||||
// 一路返回 1 → PostRecv,而 FIN 已经消费掉,这条连接就停在 CLOSE_WAIT 里,直到
|
||||
// keepalive(3 分钟)才回收(实测:对端 FIN 后连接一直留在 CLOSE_WAIT,进程不空转)。
|
||||
// 期间它占着 IOCP 上下文、挂着一枚 WSARecv 和限流槽。这里补回与另外两条分支一致的收尾。
|
||||
if (dwTrans == 0) {
|
||||
ContextObject->IoRefCount.fetch_sub(1);
|
||||
RemoveStaleContext(ContextObject);
|
||||
return -2;
|
||||
}
|
||||
{
|
||||
int r = DispatchPlain(ContextObject, (const BYTE*)ContextObject->szBuffer, dwTrans, ctx, z);
|
||||
if (r < 0) {
|
||||
@@ -1290,13 +1300,14 @@ int IOCPServer::DispatchPlain(CONTEXT_OBJECT* ContextObject, const BYTE* data, D
|
||||
}
|
||||
|
||||
if (ws == WS_Undecided) {
|
||||
ContextObject->tlsPreClassify.insert(ContextObject->tlsPreClassify.end(), data, data + len);
|
||||
if (ContextObject->tlsPreClassify.size() < 6) {
|
||||
// WS 有自己的缓冲(该状态机在 HTTPS 升级 / 反代路径上也会用到),不再借 tlsPreClassify。
|
||||
ContextObject->wsPreClassify.insert(ContextObject->wsPreClassify.end(), data, data + len);
|
||||
if (ContextObject->wsPreClassify.size() < 6) {
|
||||
return 1; // 头还没攒够,继续收
|
||||
}
|
||||
std::vector<BYTE> first;
|
||||
first.swap(ContextObject->tlsPreClassify);
|
||||
ContextObject->tlsPreClassify.clear();
|
||||
first.swap(ContextObject->wsPreClassify);
|
||||
ContextObject->wsPreClassify.clear();
|
||||
if (first.size() >= 4 && memcmp(first.data(), "GET ", 4) == 0) {
|
||||
if (!StartWsHandshake(ContextObject, first)) {
|
||||
Mprintf("[WS] StartWsHandshake failed for %s (fail-closed)\n",
|
||||
@@ -1440,8 +1451,16 @@ BOOL IOCPServer::OnClientPreSending(CONTEXT_OBJECT* ContextObject, PBYTE szBuffe
|
||||
const bool wsStateReady = (ContextObject->wsState.load(std::memory_order_acquire) == WS_Ready);
|
||||
if (wsStateReady && (ContextObject->ws == NULL || !ContextObject->ws->IsOpen())) {
|
||||
// 升级过 WS 但会话已关(Feed 报错 / 收到 close)而状态还没降级:绝不能把应用字节
|
||||
// 当裸字节发出去,对端会解帧错位。丢弃本次发送,由接收路径的 RemoveStaleContext 收尾。
|
||||
// 当裸字节发出去,对端会解帧错位。丢弃本次发送,并主动 shutdown 让挂起的 recv
|
||||
// 立刻返回 0 字节——否则接收路径要等对端 FIN 才醒,期间这条连接既发不出也收不到,
|
||||
// 只能靠心跳超时兜底(最坏要几分钟)。
|
||||
//
|
||||
// 这里不能直接调 RemoveStaleContext:它会等待 IoRefCount 归零,而本函数的调用方
|
||||
// 常常就处在一个 IoRef 里(发送失败→兜底发送),等于自己等自己,5 秒后超时放行,
|
||||
// 反而可能把已回收复用的 CONTEXT_OBJECT 交回给调用者。shutdown 是异步且无阻塞的,
|
||||
// 真正的收尾仍由接收路径的 -2 返回值触发。
|
||||
Mprintf("[WS] session closed for %s, dropping send\n", ContextObject->GetPeerName().c_str());
|
||||
shutdown(ContextObject->sClientSocket, SD_BOTH);
|
||||
return FALSE;
|
||||
}
|
||||
bool wsReady = wsStateReady;
|
||||
|
||||
Reference in new issue
Block a user