From df78272858e47aa1d0d46f5daf47fefb2846ec95 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 13 十月 2020 19:24:16 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket.c | 8 +++++++-
src/libshm_queue.a | 0
test_net_socket/firwall.sh | 6 +++++-
test_net_socket/net_mod_socket.c | 12 ++++++------
test_net_socket/net_mod_socket.sh | 2 +-
src/socket/net_mod_server_socket.c | 1 +
6 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/libshm_queue.a b/src/libshm_queue.a
index ceab04f..5c41321 100644
--- a/src/libshm_queue.a
+++ b/src/libshm_queue.a
Binary files differ
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 73a2a5a..f475b3a 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -175,6 +175,7 @@
{
pool.nready--;
if(process_client(connfd) != 0) {
+ LoggerFactory::getLogger()->debug("===server close client %d\n", connfd);
Close(connfd); //line:conc:echoservers:closeconnfd
FD_CLR(connfd, &pool.read_set);
pool.clientfd[i] = -1;
diff --git a/src/socket/net_mod_socket.c b/src/socket/net_mod_socket.c
index c123c87..1c324d5 100644
--- a/src/socket/net_mod_socket.c
+++ b/src/socket/net_mod_socket.c
@@ -15,6 +15,7 @@
rio_t * rio;
for (auto map_iter = connectionMap.begin(); map_iter != connectionMap.end(); map_iter++) {
rio = map_iter->second;
+ Close(rio->rio_fd);
if(rio != NULL) {
free(rio);
}
@@ -91,7 +92,12 @@
}
LABEL_ARR_PUSH:
- strcpy( ret_arr[i].host, node->host);
+ if(node->host != NULL) {
+ strcpy( ret_arr[i].host, node->host);
+ } else {
+ strcpy( ret_arr[i].host, "local");
+ }
+
ret_arr[i].port = node->port;
ret_arr[i].key = node->key;
ret_arr[i].content = recv_buf;
diff --git a/test_net_socket/firwall.sh b/test_net_socket/firwall.sh
index c6cda95..2fce601 100644
--- a/test_net_socket/firwall.sh
+++ b/test_net_socket/firwall.sh
@@ -3,4 +3,8 @@
# 鏌ョ湅闃茬伀澧欑姸鎬�
firewall-cmd --state
# 鍏抽棴闃茬伀澧�
-systemctl stop firewalld.service
\ No newline at end of file
+systemctl stop firewalld.service
+
+
+ssh -p 100 basic@192.168.5.22:/data/disk2/test/build
+ssh basic@192.168.20.10:/data3/workspace/wzq/build
\ No newline at end of file
diff --git a/test_net_socket/net_mod_socket.c b/test_net_socket/net_mod_socket.c
index df33bf0..873b225 100644
--- a/test_net_socket/net_mod_socket.c
+++ b/test_net_socket/net_mod_socket.c
@@ -19,16 +19,16 @@
int node_arr_size = 3;
//192.168.20.104
net_node_t node_arr[] = {
- {"192.168.20.104", port, 11},
- {"192.168.20.104", port, 12},
- {"192.168.20.104", port, 13}
+ {"192.168.5.22", port, 11},
+ {"192.168.20.10", port, 12},
+ {"localhost", port, 13}
};
int pub_node_arr_size = 3;
net_node_t pub_node_arr[] = {
- {"192.168.20.104", port, 8},
- {"192.168.20.104", port, 8},
- {"192.168.20.104", port, 8}
+ {"192.168.5.22", port, 8},
+ {"192.168.20.10", port, 8},
+ {"localhost", port, 8}
};
while (true) {
diff --git a/test_net_socket/net_mod_socket.sh b/test_net_socket/net_mod_socket.sh
index 2b14632..1eecd98 100755
--- a/test_net_socket/net_mod_socket.sh
+++ b/test_net_socket/net_mod_socket.sh
@@ -3,7 +3,7 @@
./dgram_mod_req_rep server 11 &
./dgram_mod_req_rep server 12 &
./dgram_mod_req_rep server 13 &
- ./dgram_mod_req_rep server 14 &
+
./dgram_mod_bus server 8 &
--
Gitblit v1.8.0