diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-09 19:51:44 +0200 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-08-09 19:51:44 +0200 |
commit | 3eb6acfd135cdfb82d19a4f445776ea2f13fd4e1 (patch) | |
tree | 96fe9ca4332c43b620f64f3f7bb4550c52191a97 /src/lib | |
parent | fa719e594be2a6d3132706c11166fd4ad4d57e01 (diff) | |
parent | 1c67b4cd199f9efed96468a2a2ee69fd755bcf7c (diff) | |
download | ouroboros-3eb6acfd135cdfb82d19a4f445776ea2f13fd4e1.tar.gz ouroboros-3eb6acfd135cdfb82d19a4f445776ea2f13fd4e1.zip |
Merged in dstaesse/ouroboros/be-bugfixing (pull request #197)
irmd: Close filedescriptor on exit
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/ipcp.c | 22 | ||||
-rw-r--r-- | src/lib/sockets.c | 21 |
2 files changed, 8 insertions, 35 deletions
diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index 76098691..141db43d 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -81,25 +81,11 @@ static ipcp_msg_t * send_recv_ipcp_msg(pid_t api, ipcp_msg__pack(msg, buf.data); - if (write(sockfd, buf.data, buf.len) == -1) { - free(buf.data); - close(sockfd); - return NULL; - } - - count = read(sockfd, buf.data, IPCP_MSG_BUF_SIZE); - if (count <= 0) { - free(buf.data); - close(sockfd); - return NULL; - } + if (write(sockfd, buf.data, buf.len) != -1) + count = read(sockfd, buf.data, IPCP_MSG_BUF_SIZE); - recv_msg = ipcp_msg__unpack(NULL, count, buf.data); - if (recv_msg == NULL) { - free(buf.data); - close(sockfd); - return NULL; - } + if (count > 0) + recv_msg = ipcp_msg__unpack(NULL, count, buf.data); pthread_cleanup_pop(true); pthread_cleanup_pop(true); diff --git a/src/lib/sockets.c b/src/lib/sockets.c index 5d861cdf..0d93c0a9 100644 --- a/src/lib/sockets.c +++ b/src/lib/sockets.c @@ -134,25 +134,12 @@ irm_msg_t * send_recv_irm_msg(irm_msg_t * msg) irm_msg__pack(msg, buf.data); - if (write(sockfd, buf.data, buf.len) == -1) { - free(buf.data); - close(sockfd); - return NULL; - } + if (write(sockfd, buf.data, buf.len) != -1) + count = read(sockfd, buf.data, IRM_MSG_BUF_SIZE); - count = read(sockfd, buf.data, IRM_MSG_BUF_SIZE); - if (count <= 0) { - free(buf.data); - close(sockfd); - return NULL; - } - recv_msg = irm_msg__unpack(NULL, count, buf.data); - if (recv_msg == NULL) { - free(buf.data); - close(sockfd); - return NULL; - } + if (count > 0) + recv_msg = irm_msg__unpack(NULL, count, buf.data); pthread_cleanup_pop(true); pthread_cleanup_pop(true); |