From 32be9184bcab815ed1795889612a2c2c84a17334 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 13 十月 2020 19:24:28 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/socket/net_mod_socket.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
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;
--
Gitblit v1.8.0