refactor: 按 WCH 官方 TCPServer 例程重写 TCP JSON server

核心变更:去掉 g_json_socket_client,listen socket 直接承载收发数据。

参考 EVT/EXAM/ETH/TCPServer 例程:
- 创建 PROTO_TYPE_TCP socket → WCHNET_SocketListen
- 同一 socket 处理 CONNECT + RECV + DISCONNECT + TIMEOUT
- 不需要 'accepted socket' 检测

移除的复杂逻辑:
- g_json_socket_client 变量及所有 'newly accepted' 检测代码
- WCHNET_HandleSockInt 第二路由条件(socketid!=listen,!=TCP,!=UDP 那串)
- tcp_json_handle_sock_int 中 listen/client 分离处理
- listen==client overlap 的迂回保护

修改文件:
- tcp_json_srv.h: 移除 g_json_socket_client extern
- tcp_json_srv.c: 移除 g_json_socket_client,handler 简化为 4 个 if
- net_srv.c: 路由简化为仅 socketid==g_json_socket_listen
This commit is contained in:
wangfq
2026-07-01 11:18:43 +08:00
parent 7804d97a45
commit ba35ea8ae3
4 changed files with 34 additions and 71 deletions

View File

@@ -481,15 +481,8 @@ void WCHNET_HandleSockInt(uint8_t socketid, uint8_t intstat)
{
uint8_t i;
// Route JSON protocol socket events (listen socket, client socket)
if (socketid == g_json_socket_listen || socketid == g_json_socket_client) {
tcp_json_handle_sock_int(socketid, intstat);
return;
}
// Also catch newly accepted TCP connections that might be JSON clients
// Exclude: listen socket, SSC TCP, UDP
if ((intstat & SINT_STAT_CONNECT) && socketid != g_json_socket_listen
&& socketid != SocketId_TCP && socketid != SocketId_UDP) {
// Route JSON protocol socket events (same socket handles listen + data)
if (socketid == g_json_socket_listen) {
tcp_json_handle_sock_int(socketid, intstat);
return;
}