wangfq/vd_960
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix(vd960DBN): iot_mqtt_send 循环重试防 WCHNET 部分发送致 _raw

Browse Source 
root cause: WCHNET_SocketSend 返回部分发送(520/607B),
  剩余字节留在TCP发送队列, 与下一个MQTT包拼接,
  broker收到乱码 → _raw + RST断连

fix: iot_mqtt_send 加 while 循环, 指针偏移重试直到全部发出;
  最多10次重试, slen==0或错误时返回-1
This commit is contained in:
wangfq
2026-07-23 13:57:54 +08:00
parent a9c36e4c9d
commit 9e830639d3
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c
+17 -6
View File
@@ -290,13 +290,24 @@ static int iot_make_topic(char *out, uint16_t out_len, const char *direction,
* MQTT Packet Helpers * MQTT Packet Helpers
*===========================================================================*/ *===========================================================================*/
/* 发送 MQTT 报文到 broker */ /* 发送 MQTT 报文到 broker — 循环重试防 WCHNET 部分发送
(2026-07-23: SocketSend 只发 520/607B → 残留拼到下行 → broker 见垃圾 → _raw+RST) */
static int iot_mqtt_send(const uint8_t *buf, uint16_t len) { static int iot_mqtt_send(const uint8_t *buf, uint16_t len) {
uint32_t slen = len; /* 必须是 uint32_t: WCHNET_SocketSend 写 4 字节, uint16_t 会栈破坏致 hard fault */ uint16_t total_sent = 0;
PRINT("IOT: SocketSend sock=%d len=%lu\n", g_iot_socket, (unsigned long)slen); int retries = 0;
uint8_t ret = WCHNET_SocketSend(g_iot_socket, (uint8_t *)buf, &slen); PRINT("IOT: SocketSend sock=%d len=%u\n", g_iot_socket, len);
PRINT("IOT: SocketSend ret=0x%02X sent=%lu\n", ret, (unsigned long)slen); while (total_sent < len) {
return (ret == WCHNET_ERR_SUCCESS) ? 0 : -1; uint32_t slen = len - total_sent;
uint8_t ret = WCHNET_SocketSend(g_iot_socket, (uint8_t *)(buf + total_sent), &slen);
total_sent += (uint16_t)slen;
if (slen == 0 || ret != WCHNET_ERR_SUCCESS || ++retries > 10) {
PRINT("IOT: SocketSend PARTIAL ret=0x%02X sent=%u/%u retries=%d\n",
ret, total_sent, len, retries);
return -1;
}
}
PRINT("IOT: SocketSend OK sent=%u\n", total_sent);
return 0;
} }
/* 发送 MQTT CONNECT — 参考 net_srv.c mqtt_connect 实现 */ /* 发送 MQTT CONNECT — 参考 net_srv.c mqtt_connect 实现 */