From 34b460e6b2180ef5e42cdc0455b3ac1a0afd912c Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Fri, 25 Sep 2009 15:23:22 -0400 Subject: [PATCH] ustcomm: improve error handling, and don't panic for nothing --- libustcomm/ustcomm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c index 6e93a026..8b459df3 100644 --- a/libustcomm/ustcomm.c +++ b/libustcomm/ustcomm.c @@ -390,13 +390,24 @@ static int init_named_socket(const char *name, char **path_out) return -1; } +/* + * Return value: + * 0: Success, but no reply because recv() returned 0 + * 1: Success + * -1: Error + * + * On error, the error message is printed, except on + * ECONNRESET, which is normal when the application dies. + */ + int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char **reply) { int result; - result = send(conn->fd, req, strlen(req), 0); + result = send(conn->fd, req, strlen(req), MSG_NOSIGNAL); if(result == -1) { - PERROR("send"); + if(errno != ECONNRESET) + PERROR("send"); return -1; } @@ -406,7 +417,8 @@ int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char *reply = (char *) malloc(MSG_MAX+1); result = recv(conn->fd, *reply, MSG_MAX, 0); if(result == -1) { - PERROR("recv"); + if(errno != ECONNRESET) + PERROR("recv"); return -1; } else if(result == 0) { -- 2.34.1