From 973ea7eaee914ba2e296d97bdb0457b6732891e1 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 27 十一月 2020 18:55:58 +0800
Subject: [PATCH] update

---
 src/socket/net_mod_socket_wrapper.h |   59 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/socket/net_mod_socket_wrapper.h b/src/socket/net_mod_socket_wrapper.h
index 1a15003..562ce1d 100644
--- a/src/socket/net_mod_socket_wrapper.h
+++ b/src/socket/net_mod_socket_wrapper.h
@@ -28,33 +28,34 @@
  * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-int net_mod_socket_bind(void * _socket, int port);
+int net_mod_socket_bind(void * _socket, int key);
 
 /**
  * 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-int net_mod_socket_force_bind(void * _socket, int port);
+int net_mod_socket_force_bind(void * _socket, int key);
+
 /**
  * 鍙戦�佷俊鎭�
- * @port 鍙戦�佺粰璋�
+ * @key 鍙戦�佺粰璋�
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
  */
-int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int port);
+int net_mod_socket_sendto(void *_socket, const void *buf, const int size, const int key);
 // 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
-int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int port, int sec, int nsec);
+int net_mod_socket_sendto_timeout(void *_socket, const void *buf, const int size, const int key, int sec, int nsec);
 // 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
-int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int port);
+int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key);
 
 /**
  * 鎺ユ敹淇℃伅
- * @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
+ * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *port);
+int net_mod_socket_recvfrom(void *_socket, void **buf, int *size, int *key);
 // 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *port, int sec, int nsec);
-int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *port);
+int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *key, int sec, int nsec);
+int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key);
 
 
   
@@ -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);
 
 
  /**
@@ -97,42 +105,33 @@
 
 
 /**
- * 鍚姩bus
- * 
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-*/
-int  net_mod_socket_start_bus(void * _socket);
-
-/**
  * 璁㈤槄鎸囧畾涓婚
  * @topic 涓婚
  * @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
  */
-int  net_mod_socket_sub(void * _socket, void *topic, int size, int port);
+int  net_mod_socket_sub(void * _socket, void *topic, int size, int key);
 // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int  net_mod_socket_sub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec);
-int  net_mod_socket_sub_nowait(void * _socket, void *topic, int size, int port);
+int  net_mod_socket_sub_timeout(void * _socket, void *topic, int size, int key, int sec, int nsec);
+int  net_mod_socket_sub_nowait(void * _socket, void *topic, int size, int key);
 
 
 /**
  * 鍙栨秷璁㈤槄鎸囧畾涓婚
  * @topic 涓婚,涓婚涓虹┖鏃跺彇娑堝叏閮ㄨ闃�
  * @size 涓婚闀垮害
- * @port 鎬荤嚎绔彛
+ * @key 鎬荤嚎绔彛
  */
-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);
-
+int  net_mod_socket_desub_timeout(void * _socket, void *topic, int size, int key, int sec, int nsec);
+int  net_mod_socket_desub_nowait(void * _socket, void *topic, int size, int key);
 
 
 /**
  * 鑾峰彇soket绔彛鍙�
  */
-int net_mod_socket_get_port(void * _socket) ;
-
+int net_mod_socket_get_key(void * _socket) ;
 
 
 /**

--
Gitblit v1.8.0