From d8e48790913af2e735d34de2c673374f21a2d3eb Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期五, 05 二月 2021 17:59:08 +0800 Subject: [PATCH] update --- src/net/net_mod_socket_wrapper.cpp | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp index 4be2d5c..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); } /** @@ -114,20 +119,20 @@ } -int net_mod_socket_recvandsend(void *_socket, recvandsend_callback_fn callback, void * user_data) { +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_fn callback, +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_fn callback, void * 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); } @@ -230,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