From 74a6b7e900a7ca84103000028fe7e3ab56dbbcf3 Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 23 Mar 2006 15:01:08 +0100 Subject: [PATCH] Fix return value of dccp_recv pre_select() Also, add a log message on errors/eof. --- dccp_recv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dccp_recv.c b/dccp_recv.c index 95d2ba8a..168ddf4f 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -119,8 +119,9 @@ static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds, { struct private_dccp_recv_data *pdd = rn->private_data; - if (pdd) - FD_SET(pdd->fd, rfds); + if (!pdd) + return -1; + FD_SET(pdd->fd, rfds); return pdd->fd; } @@ -136,8 +137,10 @@ static int dccp_recv_post_select(struct receiver_node *rn, int select_ret, return -E_DCCP_OVERRUN; ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded, DCCP_BUFSIZE - rn->loaded); - if (ret <= 0) + if (ret <= 0) { + PARA_INFO_LOG("%s\n", ret? PARA_STRERROR(-ret) : "eof"); return ret; + } rn->loaded += ret; return 1; } -- 2.39.2