From 5822049cf164e167125dd425cb302fe4d8d56814 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 05 二月 2021 18:41:00 +0800
Subject: [PATCH] update
---
src/net/net_mod_socket_wrapper.cpp | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp
index 6f244af..7b7369a 100644
--- a/src/net/net_mod_socket_wrapper.cpp
+++ b/src/net/net_mod_socket_wrapper.cpp
@@ -20,6 +20,11 @@
delete sockt;
}
+int net_mod_socket_stop(void *_socket) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->stop();
+}
+
/**
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
@@ -35,8 +40,8 @@
*/
int net_mod_socket_force_bind(void * _socket, int key) {
NetModSocket *sockt = (NetModSocket *)_socket;
- // return sockt->force_bind(key);
- return sockt->bind(key);
+ return sockt->force_bind(key);
+ // return sockt->bind(key);
}
/**
@@ -90,34 +95,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) {
- NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvandsend( recvbuf, recvsize, key, callback);
-
-}
-
-int net_mod_socket_recvandsend_timeout(void *_socket, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
- int sec, int nsec ) {
- NetModSocket *sockt = (NetModSocket *)_socket;
- struct timespec timeout = {sec, nsec};
- return sockt->recvandsend_timeout( recvbuf, recvsize, key, callback, &timeout);
-}
-
-int net_mod_socket_recvandsend_nowait(void *_socket, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback) {
- NetModSocket *sockt = (NetModSocket *)_socket;
- return sockt->recvandsend_nowait( recvbuf, recvsize, key, callback);
-}
-
-
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鐨勬椂闂村悗杩斿洖
@@ -134,6 +116,25 @@
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) {
NetModSocket *sockt = (NetModSocket *)_socket;
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_wrapper_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_wrapper_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_wrapper_fn callback, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->recvandsend( callback, NULL, BUS_NOWAIT_FLAG, user_data);
}
@@ -234,10 +235,9 @@
int shm_mod_socket_remove_keys(int keys[], int length){
- return ShmModSocket::remove_keys(keys, length);
+ return 0;
}
int shm_mod_socket_remove_key(int key){
- int keys[] = {key};
- return ShmModSocket::remove_keys(keys, 1);
+ return 0;
}
--
Gitblit v1.8.0