From ddbeeaaffeab5bc997a0b7a7e8dcac863610feee Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 05 八月 2020 20:04:52 +0800
Subject: [PATCH] udpate
---
src/socket/shm_socket.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index f95379a..be69413 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -267,6 +267,12 @@
return -1;
}
+ SHMQueue<shm_msg_t> *remoteQueue;
+ if ((remoteQueue = _attach_remote_queue(port)) == NULL) {
+ err_msg(0, "shm_sendto failed, the other end has been closed, or has not been opened!");
+ return SHM_SOCKET_ECONNFAILED;
+ }
+
shm_msg_t dest;
dest.type = SHM_COMMON_MSG;
dest.port = socket->port;
@@ -274,11 +280,6 @@
dest.buf = mm_malloc(size);
memcpy(dest.buf, buf, size);
- SHMQueue<shm_msg_t> *remoteQueue;
- if ((remoteQueue = _attach_remote_queue(port)) == NULL) {
- err_msg(0, "shm_sendto failed, the other end has been closed, or has not been opened!");
- return -1;
- }
// printf("shm_sendto push before\n");
bool rv;
if(flags & SHM_MSG_NOWAIT != 0) {
@@ -295,6 +296,7 @@
return 0;
} else {
delete remoteQueue;
+ mm_free(dest.buf);
err_msg(errno, "sendto port %d failed!", port);
return -1;
}
@@ -356,10 +358,13 @@
int rv;
shm_socket_t *tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
- if (shm_sendto(tmp_socket, send_buf, send_size, send_port, timeout, flags) == 0) {
+ if ((rv = shm_sendto(tmp_socket, send_buf, send_size, send_port, timeout, flags)) == 0) {
rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_port, timeout, flags);
shm_close_socket(tmp_socket);
return rv;
+ } else {
+ shm_close_socket(tmp_socket);
+ return rv;
}
return -1;
}
--
Gitblit v1.8.0