From 14be935a4f8231233487d510c8db0b544bcf0f69 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 17:40:29 +0800
Subject: [PATCH] fix conflict

---
 README.md |   96 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ba8d825..36dae67 100644
--- a/README.md
+++ b/README.md
@@ -102,24 +102,49 @@
 SEND HEART:9
 
 ```
- 
+
+# 1.3 缃戠粶娴嬭瘯
+
+
+
+鍦ㄤ笁涓妭鐐逛笂node1 node2 node3 鍒嗗埆鎵ц涓嬮潰鐨勭▼搴�
+```
+
+# 鎵撳紑璇锋眰搴旂瓟鐨剆erver
+./dgram_mod_req_rep server 11 &
+
+# 寮�鍚痓us
+./dgram_mod_bus server 8 &
+
+# 寮�鍚綉缁渟erver
+./net_mod_socket server 5000 &
+
+# 璁㈤槄bus
+./dgram_mod_bus client 8 
+```
+
+鍦ㄥ叾涓竴涓妭鐐规墽琛岀綉缁滃鎴风绋嬪簭锛屽悜鍏朵粬涓変釜鑺傜偣鍙戦�佹秷鎭�
+
+```
+./net_mod_socket client 5000
+```
 
 # 2. 鎺ュ彛璇存槑
 
-shm_mm.h
+shm_mm_wraper.h
 ```
 /**
  * 鍒濆鍖栧叡浜唴瀛�
  * @size 鍏变韩鍐呭瓨澶у皬, 鍗曚綅M
  * 
  */
-void shm_init(int size);
+void shm_mm_wrapper_init(int size);
 
 /**
  * 閿�姣佸叡浜唴瀛�
  * 鏁翠釜杩涚▼閫�鍑烘椂闇�瑕佹墽琛岃繖涓柟娉曪紝璇ユ柟娉曢鍏堜細妫�鏌ユ槸鍚﹁繕鏈夊叾浠栬繘绋嬪湪浣跨敤璇ュ叡浜唴瀛橈紝濡傛灉杩樻湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ氨鍙槸detach,濡傛灉娌℃湁鍏朵粬杩涚▼鍦ㄤ娇鐢ㄥ垯閿�姣佹暣鍧楀唴瀛樸��
  */
-void shm_destroy();
+void shm_mm_wrapper_destroy();
 ```
 
 dgram_mod_socket.h
@@ -202,4 +227,67 @@
 void dgram_mod_free(void *buf) ;
 ```
 
+net_mod_server_socket_wrapper.h
+
+```
+
+/**
+ * 鍒涘缓
+ */
+void *net_mod_server_socket_open(int port) ;
+
+/**
+ * 鍏抽棴
+ */
+void net_mod_server_socket_close(void *_sockt) ;
+
+/**
+ * 鍚姩
+ */
+void net_mod_server_socket_start(void *_sockt);
+
+```
+
+net_mod_socket_wrapper.h
+
+```
+
+/**
+ * 鍒涘缓
+ */
+void * net_mod_socket_open();
+
+/**
+ * 鍏抽棴
+ */
+void net_mod_socket_close(void *_sockt);
+
+/**
+ * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂閫佽姹傛秷鎭紝鑺傜偣鐨勮繑鍥炰俊鎭眹鎬诲苟瀛樺偍鍦╮ecv_arr涓�
+ * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
+ * @send_buf 鍙戦�佺殑娑堟伅锛孈send_size 璇ユ秷鎭綋鐨勯暱搴�
+ * @recv_arr 杩斿洖鐨勫簲绛旀秷鎭粍锛孈recv_arr_size 璇ユ暟缁勯暱搴�
+ * @return 鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
+ */
+int net_mod_socket_sendandrecv(void *_sockt, 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);
+
+/**
+ * 閿�姣乻endandrecv鏂规硶杩斿洖鐨勬秷鎭粍 
+ * @arr 娑堟伅缁�
+ * @size 娑堟伅缁勭殑闀垮害
+ */
+void  net_mod_socket_free_recv_msg_arr(net_mod_recv_msg_t * arr, int size);
+
+ /**
+ * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
+ * @node_arr 缃戠粶鑺傜偣缁�, @node_arr_len璇ユ暟缁勯暱搴�
+ * @topic 涓婚锛孈topic_size 璇ヤ富棰樼殑闀垮害
+ * @content 鍐呭锛孈content_size 鍐呭闀垮害
+ * @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟
+ */
+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);
+
+```
+
  

--
Gitblit v1.8.0