Merge pull request #2345 from hxy7yx/v2.7-1

[v2.7]fix(modbus):clear recv buf before sending
emqx · Dec 23, 2024 · bb16e51 · bb16e51
2 parents f0dd9f7 + 3d755cd
commit bb16e51
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/include/neuron/connection/neu_connection.h b/include/neuron/connection/neu_connection.h
@@ -254,6 +254,8 @@ ssize_t neu_conn_recv(neu_conn_t *conn, uint8_t *buf, ssize_t len);
 ssize_t neu_conn_udp_recvfrom(neu_conn_t *conn, uint8_t *buf, ssize_t len,
                               void *src);
 
+void neu_conn_clear_recv_buffer(neu_conn_t *conn);
+
 /**
  * @brief Specify the client to send data.
  *

diff --git a/plugins/modbus/modbus_req.c b/plugins/modbus/modbus_req.c
@@ -104,6 +104,8 @@ int modbus_send_msg(void *ctx, uint16_t n_byte, uint8_t *bytes)
     neu_plugin_t *plugin = (neu_plugin_t *) ctx;
     int           ret    = 0;
 
+    neu_conn_clear_recv_buffer(plugin->conn);
+
     plog_send_protocol(plugin, bytes, n_byte);
 
     if (plugin->is_server) {

diff --git a/src/connection/connection.c b/src/connection/connection.c
@@ -407,6 +407,30 @@ ssize_t neu_conn_send(neu_conn_t *conn, uint8_t *buf, ssize_t len)
     return ret;
 }
 
+void neu_conn_clear_recv_buffer(neu_conn_t *conn)
+{
+    if (conn->is_connected && conn->param.type == NEU_CONN_TCP_CLIENT) {
+        uint8_t temp_buf[256];
+        ssize_t ret;
+        do {
+            ret = recv(conn->fd, temp_buf, sizeof(temp_buf), MSG_DONTWAIT);
+            if (ret > 0) {
+                continue;
+            } else if (ret == 0) {
+                zlog_info(conn->param.log,
+                          "Connection closed while clearing buffer.");
+                break;
+            } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                break;
+            } else {
+                zlog_error(conn->param.log, "Error clearing buffer: %s",
+                           strerror(errno));
+                break;
+            }
+        } while (ret > 0);
+    }
+}
+
 ssize_t neu_conn_recv(neu_conn_t *conn, uint8_t *buf, ssize_t len)
 {
     ssize_t ret = 0;