pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add function sf_send_and_recv_response_ex1

connection_manager
YuQing 2020-10-10 15:05:57 +08:00
parent 6ccf936ee5
commit 730ed9db6e
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/sf_proto.c
View File

@ -105,9 +105,8 @@ int sf_send_and_recv_response_ex(ConnectionInfo *conn, char *send_data,
int recv_bytes;
int i;
if ((result=sf_send_and_check_response_header(conn,
send_data, send_len, response,
network_timeout, expect_cmd)) != 0)
if ((result=sf_send_and_check_response_header(conn, send_data, send_len,
response, network_timeout, expect_cmd)) != 0)
{
return result;
}
@ -165,6 +164,45 @@ int sf_send_and_recv_response_ex(ConnectionInfo *conn, char *send_data,
return result;
}
int sf_send_and_recv_response_ex1(ConnectionInfo *conn, char *send_data,
const int send_len, SFResponseInfo *response,
const int network_timeout, const unsigned char expect_cmd,
char *recv_data, const int buff_size, int *body_len)
{
int result;
if ((result=sf_send_and_check_response_header(conn, send_data, send_len,
response, network_timeout, expect_cmd)) != 0)
{
*body_len = 0;
return result;
}
if (response->header.body_len == 0) {
*body_len = 0;
return 0;
}
if (response->header.body_len > buff_size) {
response->error.length = sprintf(response->error.message,
"response body length: %d exceeds buffer size: %d",
response->header.body_len, buff_size);
*body_len = 0;
return EOVERFLOW;
}
if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
header.body_len, network_timeout, body_len)) != 0)
{
response->error.length = snprintf(response->error.message,
sizeof(response->error.message),
"recv body fail, recv bytes: %d, expect body length: %d, "
"errno: %d, error info: %s", *body_len, response->
header.body_len, result, STRERROR(result));
}
return result;
}
int sf_recv_response(ConnectionInfo *conn, SFResponseInfo *response,
const int network_timeout, const unsigned char expect_cmd,
char *recv_data, const int expect_body_len)

5
src/sf_proto.h
View File

@ -215,6 +215,11 @@ static inline int sf_send_and_check_response_header(ConnectionInfo *conn,
return 0;
}
int sf_send_and_recv_response_ex1(ConnectionInfo *conn, char *send_data,
const int send_len, SFResponseInfo *response,
const int network_timeout, const unsigned char expect_cmd,
char *recv_data, const int buff_size, int *body_len);
int sf_send_and_recv_response_ex(ConnectionInfo *conn, char *send_data,
const int send_len, SFResponseInfo *response,
const int network_timeout, const unsigned char expect_cmd,