From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001 From: fujuntang <fujuntang@aiot.com> Date: 星期三, 11 八月 2021 09:50:20 +0800 Subject: [PATCH] fix from 3.1 first commit --- src/net/net_mod_socket_wrapper.cpp | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp index e72297a..6f9a66e 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 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 @@ -140,15 +145,15 @@ * @content 鍐呭锛孈content_size 鍐呭闀垮害 * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟 */ -int net_mod_socket_pub(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size) { +int net_mod_socket_pub(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size) { NetModSocket *sockt = (NetModSocket *)_socket; return sockt->pub(node_arr, node_arr_len, topic, topic_size, content, content_size); } -int net_mod_socket_pub_timeout(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size, int msec){ +int net_mod_socket_pub_timeout(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size, int msec){ NetModSocket *sockt = (NetModSocket *)_socket; return sockt->pub_timeout(node_arr, node_arr_len, topic, topic_size, content, content_size, msec); } -int net_mod_socket_pub_nowait(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size){ +int net_mod_socket_pub_nowait(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size){ NetModSocket *sockt = (NetModSocket *)_socket; return sockt->pub_nowait(node_arr, node_arr_len, topic, topic_size, content, content_size); } @@ -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