summaryrefslogtreecommitdiff
path: root/src/lib/ipcp.c
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-08-09 18:39:03 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-08-09 18:40:54 +0200
commitb1d2e01f1c7c49bd2e1f926f4adb23b21ba36a4a (patch)
tree58ff91a7f218cd4d6d9795cf37c822620dd8b504 /src/lib/ipcp.c
parente302f7c490e8ffc9a5fe74069115340230a80266 (diff)
downloadouroboros-b1d2e01f1c7c49bd2e1f926f4adb23b21ba36a4a.tar.gz
ouroboros-b1d2e01f1c7c49bd2e1f926f4adb23b21ba36a4a.zip
lib: Fix cleanup for sending messages
Cleanup handlers were not always popped.
Diffstat (limited to 'src/lib/ipcp.c')
-rw-r--r--src/lib/ipcp.c22
1 files changed, 4 insertions, 18 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);