Fix return value of dccp_recv pre_select()

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index f56f58cbb2932ca95c0056f96df30ec5150b7519..168ddf4f18ba3e91ebdd290eeddbdb51b08930d2 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,3 +1,26 @@
+/*
+ * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+/*
+ * based on client.c of dccp-cs-0.01.tar.bz2,
+ * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
+ */
+
 #include "para.h"
 #include "error.h"
 #include "dccp.h"
@@ -96,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;
 }
 
@@ -113,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;
 }