From 2d44fab94cdf6cf8a58e20e5dd68043340cbdb63 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期五, 27 十一月 2020 16:04:51 +0800 Subject: [PATCH] update --- src/socket/net_mod_socket_wrapper.h | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/socket/net_mod_socket_wrapper.h b/src/socket/net_mod_socket_wrapper.h index 1a15003..ff5915d 100644 --- a/src/socket/net_mod_socket_wrapper.h +++ b/src/socket/net_mod_socket_wrapper.h @@ -35,6 +35,7 @@ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ int net_mod_socket_force_bind(void * _socket, int port); + /** * 鍙戦�佷俊鎭� * @port 鍙戦�佺粰璋� @@ -74,8 +75,8 @@ * 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖 * @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉� */ -int net_mod_socket_sendandrecv_timout(void *_sockt, 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); +int net_mod_socket_sendandrecv_timeout(void *_sockt, 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); /** * 涓嶇瓑寰呯珛鍗宠繑鍥� @@ -83,6 +84,13 @@ int net_mod_socket_sendandrecv_nowait(void *_sockt, net_node_t *node_arr, int arrlen, void *send_buf, int send_size, net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ; + +/** + * 鍚姩bus + * + * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 +*/ +int net_mod_socket_start_bus(void * _socket); /** @@ -95,13 +103,6 @@ int net_mod_socket_pub(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size); - -/** - * 鍚姩bus - * - * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 -*/ -int net_mod_socket_start_bus(void * _socket); /** * 璁㈤槄鎸囧畾涓婚 @@ -121,18 +122,16 @@ * @size 涓婚闀垮害 * @port 鎬荤嚎绔彛 */ -int net_mod_socket_desub(void * _socket, void *topic, int size, int port); +int net_mod_socket_desub(void * _socket, void *topic, int size, int key); // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 int net_mod_socket_desub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec); int net_mod_socket_desub_nowait(void * _socket, void *topic, int size, int port); - /** * 鑾峰彇soket绔彛鍙� */ -int net_mod_socket_get_port(void * _socket) ; - +int net_mod_socket_get_key(void * _socket) ; /** -- Gitblit v1.8.0