GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-29 07:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1571 from fengzeroz/v2.5

Browse Source 
fix connection consume
This commit is contained in:
fengzeroz
2023-09-28 15:50:43 +08:00
committed by GitHub
parent faf78d3a02 7d929e9877
commit 02b8a18c0d
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/adapter/driver/driver.c
+1 -1
View File
@@ -1237,7 +1237,7 @@ static int read_callback(void *usr_data)
group_change);
}
if (group->grp.tags != NULL) {
if (group->grp.tags != NULL && utarray_len(group->grp.tags) > 0) {
int64_t spend = global_timestamp;
group->driver->adapter.module->intf_funs->driver.group_timer(
src/connection/connection.c
+10 -14
View File
@@ -1119,15 +1119,13 @@ int neu_conn_stream_consume(neu_conn_t *conn, void *context,
} else if (used == -1) {
neu_conn_disconnect(conn);
break;
} else {
conn->offset -= used;
memmove(conn->buf, conn->buf + used, conn->offset);
neu_protocol_unpack_buf_init(&protocol_buf, conn->buf,
conn->offset);
}
}
if (conn->offset != 0) {
conn->offset -= neu_protocol_unpack_buf_used_size(&protocol_buf);
memmove(conn->buf,
conn->buf +
neu_protocol_unpack_buf_used_size(&protocol_buf),
conn->offset);
}
}
return ret;
@@ -1150,15 +1148,13 @@ int neu_conn_stream_tcp_server_consume(neu_conn_t *conn, int fd, void *context,
} else if (used == -1) {
neu_conn_tcp_server_close_client(conn, fd);
break;
} else {
conn->offset -= used;
memmove(conn->buf, conn->buf + used, conn->offset);
neu_protocol_unpack_buf_init(&protocol_buf, conn->buf,
conn->offset);
}
}
if (conn->offset != 0) {
conn->offset -= neu_protocol_unpack_buf_used_size(&protocol_buf);
memmove(conn->buf,
conn->buf +
neu_protocol_unpack_buf_used_size(&protocol_buf),
conn->offset);
}
}
return ret;
}