Repository : ssh://git@open-mesh.org/alfred

On branch : master

commit 4a77be45885342192a852bf2ebe5e70126c766f2 Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Fri Aug 9 17:17:25 2013 +0200

alfred: handle failing write() in unix sockets

This is not really critical, but some compilers seem to complain about that.

Reported-by: Braden Aran bradenaran@gmail.com Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

4a77be45885342192a852bf2ebe5e70126c766f2 unix_sock.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/unix_sock.c b/unix_sock.c index b29f635..c778a61 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -158,7 +158,7 @@ static int unix_sock_req_data_reply(struct globals *globals, int client_sock, struct alfred_push_data_v0 *push; struct hash_it_t *hashit = NULL; uint8_t buf[MAX_PAYLOAD]; - uint16_t seqno = 0; + uint16_t seqno = 0, ret = 0;

/* send some data back through the unix socket */

@@ -184,12 +184,15 @@ static int unix_sock_req_data_reply(struct globals *globals, int client_sock, push->header.length = htons(len); push->tx.seqno = htons(seqno++);

- write(client_sock, buf, sizeof(push->header) + len); + if (write(client_sock, buf, sizeof(push->header) + len) < 0) { + ret = -1; + break; + } }

close(client_sock);

- return 0; + return ret; }

static int unix_sock_req_data(struct globals *globals, @@ -234,7 +237,7 @@ int unix_sock_req_data_finish(struct globals *globals, struct transaction_head *head) { struct alfred_status_v0 status; - int send_data = 1; + int ret = 0, send_data = 1; int client_sock; uint16_t id; uint8_t requested_type; @@ -258,10 +261,11 @@ int unix_sock_req_data_finish(struct globals *globals, status.header.length = htons(sizeof(status) - sizeof(status.header)); status.tx.id = htons(id); status.tx.seqno = 1; - write(client_sock, &status, sizeof(status)); + if (write(client_sock, &status, sizeof(status)) < 0) + ret = -1;

close(client_sock); - return 0; + return ret; }

int unix_sock_read(struct globals *globals)