From 36e6a90a33983154633c99f7ac95d09dd68f7bcb Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期三, 24 二月 2021 16:53:06 +0800 Subject: [PATCH] update --- src/net/net_mod_socket.h | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/net/net_mod_socket.h b/src/net/net_mod_socket.h index 11e0ebe..b02ea6e 100644 --- a/src/net/net_mod_socket.h +++ b/src/net/net_mod_socket.h @@ -55,6 +55,14 @@ }; +struct net_mod_recv_err_t +{ + char host[NI_MAXHOST]; + int port; + int key; + int code; +}; + class NetModSocket { @@ -83,14 +91,14 @@ NetConnPool* _get_pool(); //璇诲彇杩斿洖淇℃伅 - int read_response(int clientfd, net_mod_recv_msg_t *recv_msg); + int read_response(int clientfd, net_mod_recv_msg_t *recv_msg, net_mod_recv_err_t *err_arr); // 鍙戦�佽姹備俊鎭� - int write_request(int clientfd, net_mod_request_head_t &request_head, void *send_buf, int send_size, void *topic_buf, int topic_size); + int write_request(int clientfd, net_mod_request_head_t &request_head, const void *send_buf, int send_size, const void *topic_buf, int topic_size); int _sendandrecv_(net_node_t *node_arr, int node_arr_len, void *send_buf, int send_size, net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int timeout); - int _pub_(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int timeout) ; + int _pub_(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size, int timeout) ; public: @@ -98,7 +106,7 @@ NetModSocket(); ~NetModSocket(); - + int stop(); /** * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓� * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 @@ -206,13 +214,13 @@ * @content 鍐呭锛孈content_size 鍐呭闀垮害 * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟 */ - int pub(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size) ; + int pub(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size) ; - int pub_nowait(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size); + int pub_nowait(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size); /** * @msec 姣 锛堝崈鍒嗕箣涓�绉掞級 */ - int pub_timeout(net_node_t *node_arr, int arrlen, char *topic, int topic_size, void *content, int content_size, int msec); + int pub_timeout(net_node_t *node_arr, int arrlen, const char *topic, int topic_size, const void *content, int content_size, int msec); /** * 璁㈤槄鎸囧畾涓婚 * @topic 涓婚 @@ -247,10 +255,6 @@ int pub_timeout( char *topic, int topic_size, void *content, int content_size, int key, int sec, int nsec); int pub_nowait( char *topic, int topic_size, void *content, int content_size, int key); - - - - /** * 鑾峰彇soket key -- Gitblit v1.8.0