GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-28 22:59:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1140 from fengzeroz/main

Browse Source 
chore(connection): return the result of conn recv
This commit is contained in:
fengzeroz
2023-03-24 16:56:45 +08:00
committed by GitHub
parent 4945c2a4ca 711088c802
commit ba0786d636
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/neuron/connection/neu_connection.h
+4 -4
View File
@@ -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);
src/connection/connection.c
+7 -4
View File
@@ -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,