diff --git a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/net_srv.c b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/net_srv.c index 23c6c62..c162030 100644 --- a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/net_srv.c +++ b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/net_srv.c @@ -484,15 +484,15 @@ void WCHNET_DataManage(uint8_t id) */ void WCHNET_HandleSockInt(uint8_t socketid, uint8_t intstat) { +#if NET_SSC_ENABLE uint8_t i; - // Route JSON protocol socket events (same socket handles listen + data) - if (socketid == g_json_socket_listen) { + // Route JSON protocol socket events (both TCP + TCP_LISTEN internal) + if (socketid == g_json_socket_listen || socketid == (g_json_socket_listen + 1)) { tcp_json_handle_sock_int(socketid, intstat); return; } -#if NET_SSC_ENABLE g_net_state.intstat = intstat; if (intstat & SINT_STAT_RECV) //receive data @@ -539,7 +539,9 @@ void WCHNET_HandleSockInt(uint8_t socketid, uint8_t intstat) g_net_state.flag = 1; // WCHNET_CreateTcpSocket(); } -#endif /* NET_SSC_ENABLE */ +#else /* !NET_SSC_ENABLE — all sockets belong to JSON handler */ + tcp_json_handle_sock_int(socketid, intstat); +#endif } diff --git a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/tcp_json_srv.c b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/tcp_json_srv.c index 78f3048..694cecb 100644 --- a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/tcp_json_srv.c +++ b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/tcp_json_srv.c @@ -623,9 +623,6 @@ void tcp_json_srv_init(void) { } void tcp_json_handle_sock_int(uint8_t socketid, uint8_t intstat) { - // Only process events on our TCP listen/data socket - if (socketid != g_json_socket_listen) return; - // === CONNECT: client connected — configure recv buffer, init auth state === if (intstat & SINT_STAT_CONNECT) { WCHNET_ModifyRecvBuf(socketid, (uint32_t)g_json_wchnet_buf, RECE_BUF_LEN);