From 711088c802545e6a0a9aeee8e56ac26da3af595c Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 24 Mar 2023 08:15:08 +0000 Subject: [PATCH] chore(connection): return the result of conn recv --- include/neuron/connection/neu_connection.h | 8 ++++---- src/connection/connection.c | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/neuron/connection/neu_connection.h b/include/neuron/connection/neu_connection.h index 549e3007..c3999c3c 100644 --- a/include/neuron/connection/neu_connection.h +++ b/include/neuron/connection/neu_connection.h @@ -266,11 +266,11 @@ ssize_t neu_conn_tcp_server_recv(neu_conn_t *conn, int fd, uint8_t *buf, typedef int (*neu_conn_stream_consume_fn)( void *context, neu_protocol_unpack_buf_t *protocol_buf); -void neu_conn_stream_consume(neu_conn_t *conn, void *context, - neu_conn_stream_consume_fn fn); +int neu_conn_stream_consume(neu_conn_t *conn, void *context, + neu_conn_stream_consume_fn fn); -void neu_conn_stream_tcp_server_consume(neu_conn_t *conn, int fd, void *context, - neu_conn_stream_consume_fn fn); +int neu_conn_stream_tcp_server_consume(neu_conn_t *conn, int fd, void *context, + neu_conn_stream_consume_fn fn); typedef neu_buf_result_t (*neu_conn_process_msg)( void *context, neu_protocol_unpack_buf_t *protocol_buf); diff --git a/src/connection/connection.c b/src/connection/connection.c index 72bef9c3..77ecbe89 100644 --- a/src/connection/connection.c +++ b/src/connection/connection.c @@ -867,8 +867,8 @@ static void conn_tcp_server_del_client(neu_conn_t *conn, int fd) } } -void neu_conn_stream_consume(neu_conn_t *conn, void *context, - neu_conn_stream_consume_fn fn) +int neu_conn_stream_consume(neu_conn_t *conn, void *context, + neu_conn_stream_consume_fn fn) { ssize_t ret = neu_conn_recv(conn, conn->buf + conn->offset, conn->buf_size - conn->offset); @@ -898,10 +898,12 @@ void neu_conn_stream_consume(neu_conn_t *conn, void *context, conn->offset); } } + + return ret; } -void neu_conn_stream_tcp_server_consume(neu_conn_t *conn, int fd, void *context, - neu_conn_stream_consume_fn fn) +int neu_conn_stream_tcp_server_consume(neu_conn_t *conn, int fd, void *context, + neu_conn_stream_consume_fn fn) { ssize_t ret = neu_conn_tcp_server_recv(conn, fd, conn->buf + conn->offset, conn->buf_size - conn->offset); @@ -928,6 +930,7 @@ void neu_conn_stream_tcp_server_consume(neu_conn_t *conn, int fd, void *context, conn->offset); } } + return ret; } int neu_conn_wait_msg(neu_conn_t *conn, void *context, uint16_t n_byte,