From 09fdbecd7ce09d9988adcd079e886a21941666bf Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 14 十月 2020 11:30:53 +0800
Subject: [PATCH] udpate
---
test_net_socket/net_mod_socket.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/test_net_socket/net_mod_socket.c b/test_net_socket/net_mod_socket.c
index 873b225..22c04f5 100644
--- a/test_net_socket/net_mod_socket.c
+++ b/test_net_socket/net_mod_socket.c
@@ -1,16 +1,16 @@
-#include "net_mod_server_socket.h"
-#include "net_mod_socket.h"
+#include "net_mod_server_socket_wrapper.h"
+#include "net_mod_socket_wrapper.h"
#include "shm_mm.h"
#include "dgram_mod_socket.h"
#include "usg_common.h"
void server(int port) {
- NetModServerSocket *serverSocket = new NetModServerSocket(port);
- serverSocket->start();
+ void *serverSocket = net_mod_server_socket_open(port);
+ net_mod_server_socket_start(serverSocket);
}
void client(int port ){
- NetModSocket client;
+ void * client = net_mod_socket_open();
char content[MAXLINE];
char action[512];
char topic[512];
@@ -40,8 +40,8 @@
printf("Please input topic and content\n");
scanf("%s %s", topic, content);
- n = client.pub(pub_node_arr, pub_node_arr_size, topic, strlen(topic)+1, content, strlen(content)+1);
- printf("pub %d\n", n);
+ n = net_mod_socket_pub(client, pub_node_arr, pub_node_arr_size, topic, strlen(topic)+1, content, strlen(content)+1);
+ printf("pub %d nodes\n", n);
}
else if(strcmp(action, "send") == 0) {
getc(stdin);
@@ -49,7 +49,8 @@
if (fgets(content, MAXLINE, stdin) != NULL) {
// 鏀跺埌娑堟伅鐨勮妭鐐瑰嵆浣挎病鏈夊搴旂殑淇℃伅锛� 涔熻鍥炲涓�涓〃绀烘棤鐨勬秷鎭�,鍚﹀垯浼氫竴鐩寸瓑寰�
- n = client.sendandrecv( node_arr, node_arr_size, content, strlen(content), &recv_arr, &recv_arr_size);
+ n = net_mod_socket_sendandrecv(client, node_arr, node_arr_size, content, strlen(content), &recv_arr, &recv_arr_size);
+ printf("send %d nodes\n", n);
for(i=0; i<recv_arr_size; i++) {
printf("host:%s, port: %d, key:%d, content: %s\n",
recv_arr[i].host,
@@ -58,8 +59,9 @@
recv_arr[i].content
);
}
- //浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
- NetModSocket::free_recv_msg_arr(recv_arr, recv_arr_size);
+
+ // 浣跨敤瀹屽悗锛屼笉瑕佸繕璁伴噴鏀炬帀
+ net_mod_socket_free_recv_msg_arr(recv_arr, recv_arr_size);
}
}
else if(strcmp(action, "quit") == 0) {
@@ -70,7 +72,7 @@
}
}
-
+ net_mod_socket_close(client);
}
--
Gitblit v1.8.0