From 83956b12d863924936a98c9dfbece37feb0cce9c Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 14:48:04 +0800
Subject: [PATCH] update
---
src/net/net_mod_socket_wrapper.cpp | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp
index be44751..4be2d5c 100644
--- a/src/net/net_mod_socket_wrapper.cpp
+++ b/src/net/net_mod_socket_wrapper.cpp
@@ -53,15 +53,14 @@
int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int key, int sec, int nsec){
NetModSocket *sockt = (NetModSocket *)_socket;
logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key);
- // return sockt->sendto_timeout(buf, size, key, sec, nsec);
- return sockt->sendto(buf, size, key);
+ return sockt->sendto_timeout(buf, size, key, sec, nsec);
+ // return sockt->sendto(buf, size, key);
}
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key){
NetModSocket *sockt = (NetModSocket *)_socket;
logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key);
- return sockt->sendto(buf, size, key);
- // return sockt->sendto_nowait(buf, size, key);
+ return sockt->sendto_nowait(buf, size, key);
}
/**
@@ -78,16 +77,17 @@
logger->debug(" %d net_mod_socket_recvfrom after. rv = %d", net_mod_socket_get_key(_socket), rv);
return rv;
}
+
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *key, int sec, int nsec){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvfrom(buf, size, key);
- // return sockt->recvfrom_timeout(buf, size, key, sec, nsec);
+ // return sockt->recvfrom(buf, size, key);
+ return sockt->recvfrom_timeout(buf, size, key, sec, nsec);
}
+
int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvfrom(buf, size, key);
- // return sockt->recvfrom_nowait(buf, size, key);
+ return sockt->recvfrom_nowait(buf, size, key);
}
int net_mod_socket_sendandrecv(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
@@ -95,6 +95,7 @@
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
}
+
/**
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
* @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
@@ -102,18 +103,35 @@
int net_mod_socket_sendandrecv_timeout(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, int timeout){
NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
- // return sockt->sendandrecv_timeout(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, timeout);
+ // return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
+ return sockt->sendandrecv_timeout(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, timeout);
}
int net_mod_socket_sendandrecv_nowait(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);
- // return sockt->sendandrecv_nowait(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
+ return sockt->sendandrecv_nowait(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
}
-
+
+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 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
--
Gitblit v1.8.0