From 546bdaa58724ec6a19b56e800ad60963bd3bd1bc Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 11:42:24 +0800
Subject: [PATCH] modify callback function
---
src/net/net_mod_socket_wrapper.cpp | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp
index 72fd0d2..4be2d5c 100644
--- a/src/net/net_mod_socket_wrapper.cpp
+++ b/src/net/net_mod_socket_wrapper.cpp
@@ -90,34 +90,11 @@
return sockt->recvfrom_nowait(buf, size, key);
}
-
-int net_mod_socket_recvandsend(void *_socket, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback, void * user_data) {
- NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvandsend( recvbuf, recvsize, key, callback, NULL, 0, user_data);
-
-}
-
-int net_mod_socket_recvandsend_timeout(void *_socket, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
- int sec, int nsec, void * user_data) {
- NetModSocket *sockt = (NetModSocket *)_socket;
- struct timespec timeout = {sec, nsec};
- return sockt->recvandsend( recvbuf, recvsize, key, callback, &timeout, BUS_TIMEOUT_FLAG, user_data);
-}
-
-int net_mod_socket_recvandsend_nowait(void *_socket, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback, void * user_data) {
- NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvandsend( recvbuf, recvsize, key, callback, NULL, BUS_NOWAIT_FLAG, user_data);
-}
-
-
int net_mod_socket_sendandrecv(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size){
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
}
-
-
-
/**
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
@@ -137,6 +114,25 @@
}
+int net_mod_socket_recvandsend(void *_socket, recvandsend_callback_fn callback, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->recvandsend( callback, NULL, 0, user_data);
+
+}
+
+int net_mod_socket_recvandsend_timeout(void *_socket, recvandsend_callback_fn callback,
+ int sec, int nsec, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ struct timespec timeout = {sec, nsec};
+ return sockt->recvandsend( callback, &timeout, BUS_TIMEOUT_FLAG, user_data);
+}
+
+int net_mod_socket_recvandsend_nowait(void *_socket, recvandsend_callback_fn callback, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->recvandsend( callback, NULL, BUS_NOWAIT_FLAG, user_data);
+}
+
+
/**
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
* @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
--
Gitblit v1.8.0